From 92af19098c8612577a167b1e352fb0ab6c5d4a06 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 15 Sep 2016 19:24:59 -0400 Subject: [PATCH] Improved file naming. --- .../Clock Signal.xcodeproj/project.pbxproj | 24 +++++++++---------- .../{AcornAnalyser.cpp => StaticAnalyser.cpp} | 2 +- .../{AcornAnalyser.hpp => StaticAnalyser.hpp} | 4 ++-- ...mmodoreAnalyser.cpp => StaticAnalyser.cpp} | 2 +- ...mmodoreAnalyser.hpp => StaticAnalyser.hpp} | 4 ++-- StaticAnalyser/StaticAnalyser.cpp | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) rename StaticAnalyser/Acorn/{AcornAnalyser.cpp => StaticAnalyser.cpp} (99%) rename StaticAnalyser/Acorn/{AcornAnalyser.hpp => StaticAnalyser.hpp} (84%) rename StaticAnalyser/Commodore/{CommodoreAnalyser.cpp => StaticAnalyser.cpp} (99%) rename StaticAnalyser/Commodore/{CommodoreAnalyser.hpp => StaticAnalyser.hpp} (83%) diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index d6856d087..3caa89e2d 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -336,7 +336,7 @@ 4BBF99181C8FBA6F0075DAFB /* TextureTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBF99121C8FBA6F0075DAFB /* TextureTarget.cpp */; }; 4BC3B74F1CD194CC00F86E85 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B74D1CD194CC00F86E85 /* Shader.cpp */; }; 4BC3B7521CD1956900F86E85 /* OutputShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B7501CD1956900F86E85 /* OutputShader.cpp */; }; - 4BC5E4921D7ED365008CF980 /* CommodoreAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC5E4901D7ED365008CF980 /* CommodoreAnalyser.cpp */; }; + 4BC5E4921D7ED365008CF980 /* StaticAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC5E4901D7ED365008CF980 /* StaticAnalyser.cpp */; }; 4BC5E4951D7EE0E0008CF980 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC5E4931D7EE0E0008CF980 /* Utilities.cpp */; }; 4BC751B21D157E61006C31D9 /* 6522Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC751B11D157E61006C31D9 /* 6522Tests.swift */; }; 4BC76E691C98E31700E6EF73 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC76E671C98E31700E6EF73 /* FIRFilter.cpp */; }; @@ -346,7 +346,7 @@ 4BC9DF451D044FCA00F44158 /* ROMImages in Resources */ = {isa = PBXBuildFile; fileRef = 4BC9DF441D044FCA00F44158 /* ROMImages */; }; 4BC9DF4F1D04691600F44158 /* 6560.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC9DF4D1D04691600F44158 /* 6560.cpp */; }; 4BC9E1EE1D23449A003FCEE4 /* 6502InterruptTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */; }; - 4BD14B111D74627C0088EAD6 /* AcornAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD14B0F1D74627C0088EAD6 /* AcornAnalyser.cpp */; }; + 4BD14B111D74627C0088EAD6 /* StaticAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD14B0F1D74627C0088EAD6 /* StaticAnalyser.cpp */; }; 4BD5F1951D13528900631CD1 /* CSBestEffortUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.m */; }; 4BE77A2E1D84ADFB00BC3827 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE77A2C1D84ADFB00BC3827 /* File.cpp */; }; 4BEE0A6F1D72496600532C7B /* Cartridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE0A6A1D72496600532C7B /* Cartridge.cpp */; }; @@ -768,8 +768,8 @@ 4BC3B74E1CD194CC00F86E85 /* Shader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Shader.hpp; sourceTree = ""; }; 4BC3B7501CD1956900F86E85 /* OutputShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OutputShader.cpp; sourceTree = ""; }; 4BC3B7511CD1956900F86E85 /* OutputShader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OutputShader.hpp; sourceTree = ""; }; - 4BC5E4901D7ED365008CF980 /* CommodoreAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommodoreAnalyser.cpp; path = ../../StaticAnalyser/Commodore/CommodoreAnalyser.cpp; sourceTree = ""; }; - 4BC5E4911D7ED365008CF980 /* CommodoreAnalyser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CommodoreAnalyser.hpp; path = ../../StaticAnalyser/Commodore/CommodoreAnalyser.hpp; sourceTree = ""; }; + 4BC5E4901D7ED365008CF980 /* StaticAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticAnalyser.cpp; path = ../../StaticAnalyser/Commodore/StaticAnalyser.cpp; sourceTree = ""; }; + 4BC5E4911D7ED365008CF980 /* StaticAnalyser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = StaticAnalyser.hpp; path = ../../StaticAnalyser/Commodore/StaticAnalyser.hpp; sourceTree = ""; }; 4BC5E4931D7EE0E0008CF980 /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utilities.cpp; path = ../../StaticAnalyser/Commodore/Utilities.cpp; sourceTree = ""; }; 4BC5E4941D7EE0E0008CF980 /* Utilities.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Utilities.hpp; path = ../../StaticAnalyser/Commodore/Utilities.hpp; sourceTree = ""; }; 4BC751B11D157E61006C31D9 /* 6522Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 6522Tests.swift; sourceTree = ""; }; @@ -785,8 +785,8 @@ 4BC9DF4E1D04691600F44158 /* 6560.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 6560.hpp; sourceTree = ""; }; 4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 6502InterruptTests.swift; sourceTree = ""; }; 4BCA98C21D065CA20062F44C /* 6522.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 6522.hpp; sourceTree = ""; }; - 4BD14B0F1D74627C0088EAD6 /* AcornAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AcornAnalyser.cpp; path = ../../StaticAnalyser/Acorn/AcornAnalyser.cpp; sourceTree = ""; }; - 4BD14B101D74627C0088EAD6 /* AcornAnalyser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = AcornAnalyser.hpp; path = ../../StaticAnalyser/Acorn/AcornAnalyser.hpp; sourceTree = ""; }; + 4BD14B0F1D74627C0088EAD6 /* StaticAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticAnalyser.cpp; path = ../../StaticAnalyser/Acorn/StaticAnalyser.cpp; sourceTree = ""; }; + 4BD14B101D74627C0088EAD6 /* StaticAnalyser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = StaticAnalyser.hpp; path = ../../StaticAnalyser/Acorn/StaticAnalyser.hpp; sourceTree = ""; }; 4BD328FD1D7E3EB5003B8C44 /* TapeParser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = TapeParser.hpp; path = ../../StaticAnalyser/TapeParser.hpp; sourceTree = ""; }; 4BD5F1931D13528900631CD1 /* CSBestEffortUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSBestEffortUpdater.h; path = Updater/CSBestEffortUpdater.h; sourceTree = ""; }; 4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSBestEffortUpdater.m; path = Updater/CSBestEffortUpdater.m; sourceTree = ""; }; @@ -1529,8 +1529,8 @@ 4BC830D21D6E7C6D0000A26F /* Commodore */ = { isa = PBXGroup; children = ( - 4BC5E4901D7ED365008CF980 /* CommodoreAnalyser.cpp */, - 4BC5E4911D7ED365008CF980 /* CommodoreAnalyser.hpp */, + 4BC5E4901D7ED365008CF980 /* StaticAnalyser.cpp */, + 4BC5E4911D7ED365008CF980 /* StaticAnalyser.hpp */, 4BC830CF1D6E7C690000A26F /* Tape.cpp */, 4BC830D01D6E7C690000A26F /* Tape.hpp */, 4BC5E4931D7EE0E0008CF980 /* Utilities.cpp */, @@ -1574,8 +1574,8 @@ 4BD14B121D7462810088EAD6 /* Acorn */ = { isa = PBXGroup; children = ( - 4BD14B0F1D74627C0088EAD6 /* AcornAnalyser.cpp */, - 4BD14B101D74627C0088EAD6 /* AcornAnalyser.hpp */, + 4BD14B0F1D74627C0088EAD6 /* StaticAnalyser.cpp */, + 4BD14B101D74627C0088EAD6 /* StaticAnalyser.hpp */, 4B96F7201D75119A0058BB2D /* Tape.cpp */, 4B96F7211D75119A0058BB2D /* Tape.hpp */, ); @@ -2043,7 +2043,7 @@ 4BC9DF4F1D04691600F44158 /* 6560.cpp in Sources */, 4BC5E4951D7EE0E0008CF980 /* Utilities.cpp in Sources */, 4BB697CE1D4BA44400248BDF /* CommodoreGCR.cpp in Sources */, - 4BD14B111D74627C0088EAD6 /* AcornAnalyser.cpp in Sources */, + 4BD14B111D74627C0088EAD6 /* StaticAnalyser.cpp in Sources */, 4BBF99151C8FBA6F0075DAFB /* CRTOpenGL.cpp in Sources */, 4B0CCC451C62D0B3001CAC5F /* CRT.cpp in Sources */, 4B643F3F1D77B88000D431D6 /* DocumentController.swift in Sources */, @@ -2061,7 +2061,7 @@ 4BC76E691C98E31700E6EF73 /* FIRFilter.cpp in Sources */, 4B55CE5F1C3B7D960093A61B /* MachineDocument.swift in Sources */, 4B2A53A11D117D36003C6002 /* CSAtari2600.mm in Sources */, - 4BC5E4921D7ED365008CF980 /* CommodoreAnalyser.cpp in Sources */, + 4BC5E4921D7ED365008CF980 /* StaticAnalyser.cpp in Sources */, 4BC830D11D6E7C690000A26F /* Tape.cpp in Sources */, 4B69FB441C4D941400B5F0AA /* TapeUEF.cpp in Sources */, 4B4DC8211D2C2425003C5BF8 /* Vic20.cpp in Sources */, diff --git a/StaticAnalyser/Acorn/AcornAnalyser.cpp b/StaticAnalyser/Acorn/StaticAnalyser.cpp similarity index 99% rename from StaticAnalyser/Acorn/AcornAnalyser.cpp rename to StaticAnalyser/Acorn/StaticAnalyser.cpp index 0803c39a2..42efa33be 100644 --- a/StaticAnalyser/Acorn/AcornAnalyser.cpp +++ b/StaticAnalyser/Acorn/StaticAnalyser.cpp @@ -6,7 +6,7 @@ // Copyright © 2016 Thomas Harte. All rights reserved. // -#include "AcornAnalyser.hpp" +#include "StaticAnalyser.hpp" #include "Tape.hpp" diff --git a/StaticAnalyser/Acorn/AcornAnalyser.hpp b/StaticAnalyser/Acorn/StaticAnalyser.hpp similarity index 84% rename from StaticAnalyser/Acorn/AcornAnalyser.hpp rename to StaticAnalyser/Acorn/StaticAnalyser.hpp index ccfaa75f3..240abcffa 100644 --- a/StaticAnalyser/Acorn/AcornAnalyser.hpp +++ b/StaticAnalyser/Acorn/StaticAnalyser.hpp @@ -6,8 +6,8 @@ // Copyright © 2016 Thomas Harte. All rights reserved. // -#ifndef AcornAnalyser_hpp -#define AcornAnalyser_hpp +#ifndef StaticAnalyser_Acorn_StaticAnalyser_hpp +#define StaticAnalyser_Acorn_StaticAnalyser_hpp #include "../StaticAnalyser.hpp" diff --git a/StaticAnalyser/Commodore/CommodoreAnalyser.cpp b/StaticAnalyser/Commodore/StaticAnalyser.cpp similarity index 99% rename from StaticAnalyser/Commodore/CommodoreAnalyser.cpp rename to StaticAnalyser/Commodore/StaticAnalyser.cpp index 2c88a6fbf..28e5f1dba 100644 --- a/StaticAnalyser/Commodore/CommodoreAnalyser.cpp +++ b/StaticAnalyser/Commodore/StaticAnalyser.cpp @@ -6,7 +6,7 @@ // Copyright © 2016 Thomas Harte. All rights reserved. // -#include "CommodoreAnalyser.hpp" +#include "StaticAnalyser.hpp" #include "File.hpp" #include "Tape.hpp" diff --git a/StaticAnalyser/Commodore/CommodoreAnalyser.hpp b/StaticAnalyser/Commodore/StaticAnalyser.hpp similarity index 83% rename from StaticAnalyser/Commodore/CommodoreAnalyser.hpp rename to StaticAnalyser/Commodore/StaticAnalyser.hpp index 003f1cc83..e06fb57f3 100644 --- a/StaticAnalyser/Commodore/CommodoreAnalyser.hpp +++ b/StaticAnalyser/Commodore/StaticAnalyser.hpp @@ -6,8 +6,8 @@ // Copyright © 2016 Thomas Harte. All rights reserved. // -#ifndef CommodoreAnalyser_hpp -#define CommodoreAnalyser_hpp +#ifndef StaticAnalyser_Commodore_StaticAnalyser_hpp +#define StaticAnalyser_Commodore_StaticAnalyser_hpp #include "../StaticAnalyser.hpp" diff --git a/StaticAnalyser/StaticAnalyser.cpp b/StaticAnalyser/StaticAnalyser.cpp index 9a56221a4..5e8af04d6 100644 --- a/StaticAnalyser/StaticAnalyser.cpp +++ b/StaticAnalyser/StaticAnalyser.cpp @@ -11,8 +11,8 @@ #include // Analysers -#include "Acorn/AcornAnalyser.hpp" -#include "Commodore/CommodoreAnalyser.hpp" +#include "Acorn/StaticAnalyser.hpp" +#include "Commodore/StaticAnalyser.hpp" // Cartridges #include "../Storage/Cartridge/Formats/BinaryDump.hpp"