From 9118f24778906e63f5daf40fbb1355185dfab6c5 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 22 Oct 2016 19:11:37 +0100 Subject: [PATCH] Rename FileEnumerator to FileScanner --- OpenRCT2.xcodeproj/project.pbxproj | 12 ++++++------ openrct2.vcxproj | 4 ++-- src/ScenarioRepository.cpp | 2 +- src/core/{FileEnumerator.cpp => FileScanner.cpp} | 2 +- src/core/{FileEnumerator.h => FileScanner.h} | 0 src/object/ObjectRepository.cpp | 2 +- src/ride/TrackDesignRepository.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename src/core/{FileEnumerator.cpp => FileScanner.cpp} (99%) rename src/core/{FileEnumerator.h => FileScanner.h} (100%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 5f221925e4..4bd377f238 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -414,7 +414,7 @@ D45A395E1CF300AF00659A24 /* libSDL2.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38B81CF3006400659A24 /* libSDL2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; D45A395F1CF300AF00659A24 /* libspeexdsp.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38B91CF3006400659A24 /* libspeexdsp.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; D45B202D1D1E92DB00B67CC7 /* custom_currency.c in Sources */ = {isa = PBXBuildFile; fileRef = D45B202C1D1E92DB00B67CC7 /* custom_currency.c */; }; - D464FEB91D31A64100CBABAC /* FileEnumerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D464FEB71D31A64100CBABAC /* FileEnumerator.cpp */; }; + D464FEB91D31A64100CBABAC /* FileScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D464FEB71D31A64100CBABAC /* FileScanner.cpp */; }; D464FEBB1D31A65300CBABAC /* IStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D464FEBA1D31A65300CBABAC /* IStream.cpp */; }; D464FEBE1D31A66E00CBABAC /* MemoryStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D464FEBC1D31A66E00CBABAC /* MemoryStream.cpp */; }; D464FEC01D31A68800CBABAC /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D464FEBF1D31A68800CBABAC /* Image.cpp */; }; @@ -1089,8 +1089,8 @@ D45A39571CF3007A00659A24 /* speexdsp_config_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speexdsp_config_types.h; sourceTree = ""; }; D45A39581CF3007A00659A24 /* speexdsp_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speexdsp_types.h; sourceTree = ""; }; D45B202C1D1E92DB00B67CC7 /* custom_currency.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = custom_currency.c; sourceTree = ""; }; - D464FEB71D31A64100CBABAC /* FileEnumerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileEnumerator.cpp; sourceTree = ""; }; - D464FEB81D31A64100CBABAC /* FileEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileEnumerator.h; sourceTree = ""; }; + D464FEB71D31A64100CBABAC /* FileScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileScanner.cpp; sourceTree = ""; }; + D464FEB81D31A64100CBABAC /* FileScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileScanner.h; sourceTree = ""; }; D464FEBA1D31A65300CBABAC /* IStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IStream.cpp; sourceTree = ""; }; D464FEBC1D31A66E00CBABAC /* MemoryStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryStream.cpp; sourceTree = ""; }; D464FEBD1D31A66E00CBABAC /* MemoryStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryStream.h; sourceTree = ""; }; @@ -1547,8 +1547,8 @@ D44270E31CC81B3200D84D28 /* Diagnostics.cpp */, D44270E41CC81B3200D84D28 /* Diagnostics.hpp */, D44270E51CC81B3200D84D28 /* Exception.hpp */, - D464FEB71D31A64100CBABAC /* FileEnumerator.cpp */, - D464FEB81D31A64100CBABAC /* FileEnumerator.h */, + D464FEB71D31A64100CBABAC /* FileScanner.cpp */, + D464FEB81D31A64100CBABAC /* FileScanner.h */, D44270E61CC81B3200D84D28 /* FileStream.hpp */, D44270E71CC81B3200D84D28 /* Guard.cpp */, D44270E81CC81B3200D84D28 /* Guard.hpp */, @@ -2584,7 +2584,7 @@ D44272361CC81B3200D84D28 /* object_list.c in Sources */, D44272581CC81B3200D84D28 /* demolish_ride_prompt.c in Sources */, D442723E1CC81B3200D84D28 /* posix.c in Sources */, - D464FEB91D31A64100CBABAC /* FileEnumerator.cpp in Sources */, + D464FEB91D31A64100CBABAC /* FileScanner.cpp in Sources */, D44271F91CC81B3200D84D28 /* CommandLine.cpp in Sources */, 00EFEE721CF1D80B0035213B /* NetworkKey.cpp in Sources */, C686F90B1CDBC3B7009F9BFC /* air_powered_vertical_coaster.c in Sources */, diff --git a/openrct2.vcxproj b/openrct2.vcxproj index 68818ff390..e21d50399d 100644 --- a/openrct2.vcxproj +++ b/openrct2.vcxproj @@ -46,7 +46,7 @@ - + @@ -370,7 +370,7 @@ - + diff --git a/src/ScenarioRepository.cpp b/src/ScenarioRepository.cpp index bd4a0c4fc8..20fa95a456 100644 --- a/src/ScenarioRepository.cpp +++ b/src/ScenarioRepository.cpp @@ -18,7 +18,7 @@ #include #include #include "core/Console.hpp" -#include "core/FileEnumerator.h" +#include "core/FileScanner.h" #include "core/FileStream.hpp" #include "core/Math.hpp" #include "core/Path.hpp" diff --git a/src/core/FileEnumerator.cpp b/src/core/FileScanner.cpp similarity index 99% rename from src/core/FileEnumerator.cpp rename to src/core/FileScanner.cpp index c21243f6a8..6bc5e1e8a8 100644 --- a/src/core/FileEnumerator.cpp +++ b/src/core/FileScanner.cpp @@ -15,7 +15,7 @@ #pragma endregion #include -#include "FileEnumerator.h" +#include "FileScanner.h" #include "Memory.hpp" #include "Path.hpp" #include "String.hpp" diff --git a/src/core/FileEnumerator.h b/src/core/FileScanner.h similarity index 100% rename from src/core/FileEnumerator.h rename to src/core/FileScanner.h diff --git a/src/object/ObjectRepository.cpp b/src/object/ObjectRepository.cpp index 9ddc4eecd0..b749ae0394 100644 --- a/src/object/ObjectRepository.cpp +++ b/src/object/ObjectRepository.cpp @@ -21,7 +21,7 @@ #include "../common.h" #include "../core/Console.hpp" -#include "../core/FileEnumerator.h" +#include "../core/FileScanner.h" #include "../core/FileStream.hpp" #include "../core/Guard.hpp" #include "../core/IStream.hpp" diff --git a/src/ride/TrackDesignRepository.cpp b/src/ride/TrackDesignRepository.cpp index 4adb2ca8dc..fda8a56660 100644 --- a/src/ride/TrackDesignRepository.cpp +++ b/src/ride/TrackDesignRepository.cpp @@ -18,7 +18,7 @@ #include #include #include "../core/Console.hpp" -#include "../core/FileEnumerator.h" +#include "../core/FileScanner.h" #include "../core/FileStream.hpp" #include "../core/Path.hpp" #include "../core/String.hpp"