From 3fd91038c3fe10dd55a10c9270d4bc68b62c60ce Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 12 Jul 2024 22:18:43 +0200 Subject: [PATCH] Rename Date.h to Localisation.Date.h to match unit file --- src/openrct2-ui/interface/Graph.cpp | 2 +- src/openrct2-ui/interface/Objective.cpp | 2 +- src/openrct2-ui/windows/Cheats.cpp | 2 +- src/openrct2-ui/windows/EditorObjectiveOptions.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/ScenarioSelect.cpp | 2 +- src/openrct2-ui/windows/Transparency.cpp | 2 +- src/openrct2/Context.cpp | 2 +- src/openrct2/Date.cpp | 4 ++-- src/openrct2/GameState.cpp | 2 +- src/openrct2/actions/RideCreateAction.cpp | 2 +- src/openrct2/entity/Duck.cpp | 1 - src/openrct2/entity/Staff.cpp | 2 +- src/openrct2/libopenrct2.vcxproj | 2 +- src/openrct2/localisation/Formatting.cpp | 2 +- src/openrct2/localisation/Localisation.Date.cpp | 3 ++- src/openrct2/localisation/{Date.h => Localisation.Date.h} | 0 src/openrct2/localisation/Localisation.cpp | 2 +- src/openrct2/management/Finance.cpp | 2 +- src/openrct2/management/NewsItem.cpp | 2 +- src/openrct2/management/Research.cpp | 2 +- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/network/NetworkServerAdvertiser.cpp | 2 +- src/openrct2/paint/tile_element/Paint.SmallScenery.cpp | 2 +- src/openrct2/park/ParkFile.cpp | 2 +- src/openrct2/platform/Platform.Win32.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 2 +- src/openrct2/ride/RideRatings.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 2 +- src/openrct2/scripting/bindings/world/ScDate.hpp | 2 +- src/openrct2/world/Climate.cpp | 2 +- src/openrct2/world/Map.cpp | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) rename src/openrct2/localisation/{Date.h => Localisation.Date.h} (100%) diff --git a/src/openrct2-ui/interface/Graph.cpp b/src/openrct2-ui/interface/Graph.cpp index 975bacefc6..0e3ddde737 100644 --- a/src/openrct2-ui/interface/Graph.cpp +++ b/src/openrct2-ui/interface/Graph.cpp @@ -12,8 +12,8 @@ #include #include #include -#include #include +#include using namespace OpenRCT2; diff --git a/src/openrct2-ui/interface/Objective.cpp b/src/openrct2-ui/interface/Objective.cpp index 76c12071d5..c970dd6398 100644 --- a/src/openrct2-ui/interface/Objective.cpp +++ b/src/openrct2-ui/interface/Objective.cpp @@ -10,8 +10,8 @@ #include "Objective.h" #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 74978cdcc1..31cce69ad7 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -19,8 +19,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index fca949b06f..130d496683 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 2cccab1b92..c8c7f0bfbb 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -16,8 +16,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 697baa6ce4..6db8fd66b5 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index c9e1a3d415..79d883b7c5 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -16,8 +16,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 0e393c9903..fc77466235 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -31,9 +31,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 0e122b2231..e71cfaeb99 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 692620b7ee..2e7e4fe2ff 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -14,8 +14,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 6a40dc2011..39c3a3307f 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -40,8 +40,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index 25cfc23ce2..f64b54b693 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -16,9 +16,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 57e18fe124..11858d41ad 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index b5e827e00f..173ceccbe0 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -48,8 +48,8 @@ #include "interface/InteractiveConsole.h" #include "interface/StdInOutConsole.h" #include "interface/Viewport.h" -#include "localisation/Date.h" #include "localisation/Formatter.h" +#include "localisation/Localisation.Date.h" #include "localisation/Localisation.h" #include "localisation/LocalisationService.h" #include "network/DiscordService.h" diff --git a/src/openrct2/Date.cpp b/src/openrct2/Date.cpp index b753756493..e0af8445a4 100644 --- a/src/openrct2/Date.cpp +++ b/src/openrct2/Date.cpp @@ -7,13 +7,13 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "localisation/Date.h" +#include "Date.h" #include "Context.h" -#include "Date.h" #include "Game.h" #include "GameState.h" #include "core/Guard.hpp" +#include "localisation/Localisation.Date.h" using namespace OpenRCT2; diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index ae59a0a87b..3a7f4e0bad 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -26,7 +26,7 @@ #include "entity/PatrolArea.h" #include "entity/Staff.h" #include "interface/Screenshot.h" -#include "localisation/Date.h" +#include "localisation/Localisation.Date.h" #include "localisation/Localisation.h" #include "management/NewsItem.h" #include "network/network.h" diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index ef532c73bc..04333589a0 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -16,7 +16,7 @@ #include "../core/Memory.hpp" #include "../core/MemoryStream.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/StringIds.h" #include "../object/ObjectManager.h" #include "../rct1/RCT1.h" diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp index f08bc1ffc0..a19f7c0be9 100644 --- a/src/openrct2/entity/Duck.cpp +++ b/src/openrct2/entity/Duck.cpp @@ -12,7 +12,6 @@ #include "../GameState.h" #include "../audio/audio.h" #include "../core/DataSerialiser.h" -#include "../localisation/Date.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 2f98cc5088..6851addd96 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -19,7 +19,7 @@ #include "../core/DataSerialiser.h" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 6261afd5a4..01194dd7ca 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -284,12 +284,12 @@ - + diff --git a/src/openrct2/localisation/Formatting.cpp b/src/openrct2/localisation/Formatting.cpp index cedf288bf4..648b5d8ca2 100644 --- a/src/openrct2/localisation/Formatting.cpp +++ b/src/openrct2/localisation/Formatting.cpp @@ -12,9 +12,9 @@ #include "../config/Config.h" #include "../util/Util.h" #include "Currency.h" -#include "Date.h" #include "FormatCodes.h" #include "Formatter.h" +#include "Localisation.Date.h" #include "Localisation.h" #include "StringIds.h" diff --git a/src/openrct2/localisation/Localisation.Date.cpp b/src/openrct2/localisation/Localisation.Date.cpp index 1b3fa404d4..3d3f6737b0 100644 --- a/src/openrct2/localisation/Localisation.Date.cpp +++ b/src/openrct2/localisation/Localisation.Date.cpp @@ -7,7 +7,8 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "Date.h" +#include "Localisation.Date.h" + #include "StringIds.h" const StringId DateDayNames[] = { diff --git a/src/openrct2/localisation/Date.h b/src/openrct2/localisation/Localisation.Date.h similarity index 100% rename from src/openrct2/localisation/Date.h rename to src/openrct2/localisation/Localisation.Date.h diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 23e3030c02..f978ec06fe 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -17,9 +17,9 @@ #include "../ride/Ride.h" #include "../util/Util.h" #include "Currency.h" -#include "Date.h" #include "FormatCodes.h" #include "Formatting.h" +#include "Localisation.Date.h" #include "StringIds.h" #include diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index cf3b0de93e..2af74e5d39 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -16,7 +16,7 @@ #include "../entity/Peep.h" #include "../entity/Staff.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../profiling/Profiling.h" #include "../ride/Ride.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 82f8896da4..059c611c4f 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -19,9 +19,9 @@ #include "../entity/Peep.h" #include "../interface/Window.h" #include "../interface/Window_internal.h" -#include "../localisation/Date.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../management/Research.h" #include "../profiling/Profiling.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 0f546c64e0..3583c8fb05 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -20,8 +20,8 @@ #include "../core/Guard.hpp" #include "../core/Memory.hpp" #include "../interface/Window.h" -#include "../localisation/Date.h" #include "../localisation/Formatter.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../object/ObjectEntryManager.h" diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index edef384b05..591d33e0c7 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -78,7 +78,7 @@ static constexpr uint32_t MaxPacketsPerUpdate = 100; # include "../core/String.hpp" # include "../interface/Chat.h" # include "../interface/Window.h" -# include "../localisation/Date.h" +# include "../localisation/Localisation.Date.h" # include "../localisation/Localisation.h" # include "../object/ObjectManager.h" # include "../object/ObjectRepository.h" diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 10084d7134..0d4c42b60d 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -20,7 +20,7 @@ # include "../core/Json.hpp" # include "../core/String.hpp" # include "../entity/Guest.h" -# include "../localisation/Date.h" +# include "../localisation/Localisation.Date.h" # include "../management/Finance.h" # include "../platform/Platform.h" # include "../util/Util.h" diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index b3098ef31d..981fb48435 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -12,7 +12,7 @@ #include "../../Game.h" #include "../../GameState.h" #include "../../interface/Viewport.h" -#include "../../localisation/Date.h" +#include "../../localisation/Localisation.Date.h" #include "../../object/SmallSceneryEntry.h" #include "../../profiling/Profiling.h" #include "../../ride/TrackDesign.h" diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 14050f231f..accd45add7 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -36,7 +36,7 @@ #include "../entity/Staff.h" #include "../interface/Viewport.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../management/Award.h" #include "../management/Finance.h" diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index b22db8b07d..846c9ee693 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -31,8 +31,8 @@ # include "../OpenRCT2.h" # include "../core/Path.hpp" # include "../core/String.hpp" -# include "../localisation/Date.h" # include "../localisation/Language.h" +# include "../localisation/Localisation.Date.h" # include "Platform.h" # include diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ade14719de..2675684605 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -37,7 +37,7 @@ #include "../entity/Peep.h" #include "../entity/Staff.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../management/Award.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index ce39a4a8dd..6c1c7d5793 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -35,7 +35,7 @@ #include "../entity/PatrolArea.h" #include "../entity/Staff.h" #include "../interface/Viewport.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../management/Award.h" #include "../management/Finance.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 0fe57ba38a..56917291bd 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -32,9 +32,9 @@ #include "../entity/Peep.h" #include "../entity/Staff.h" #include "../interface/Window_internal.h" -#include "../localisation/Date.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index d38e10272b..3754679fad 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -23,8 +23,8 @@ #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" #include "../interface/Window_internal.h" -#include "../localisation/Date.h" #include "../localisation/Formatter.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../network/network.h" #include "../paint/VirtualFloor.h" diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index fe824c68ad..8c029ad4ad 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -14,7 +14,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../profiling/Profiling.h" #include "../scripting/ScriptEngine.h" #include "../world/Footpath.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 8735a6ee15..8a742c0eb7 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -28,7 +28,7 @@ #include "../entity/Guest.h" #include "../entity/Staff.h" #include "../interface/Viewport.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../management/Award.h" #include "../management/Finance.h" diff --git a/src/openrct2/scripting/bindings/world/ScDate.hpp b/src/openrct2/scripting/bindings/world/ScDate.hpp index b36ee2f8e2..a04b0a201f 100644 --- a/src/openrct2/scripting/bindings/world/ScDate.hpp +++ b/src/openrct2/scripting/bindings/world/ScDate.hpp @@ -15,7 +15,7 @@ # include "../../../Date.h" # include "../../../Game.h" # include "../../../GameState.h" -# include "../../../localisation/Date.h" +# include "../../../localisation/Localisation.Date.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 216aa9778d..127ae7f172 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -20,7 +20,7 @@ #include "../config/Config.h" #include "../drawing/Drawing.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" #include "../sprites.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index b3f50c0ffe..cdf7eef6f0 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -30,7 +30,7 @@ #include "../interface/Cursors.h" #include "../interface/Viewport.h" #include "../interface/Window.h" -#include "../localisation/Date.h" +#include "../localisation/Localisation.Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../network/network.h"