From a24dc2e60a283e39b4949b8e6fffcf2430924491 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Wed, 11 Dec 2024 17:02:40 +0100 Subject: [PATCH] Reduce includes in and of Util.h/cpp --- .../drawing/engines/opengl/OpenGLDrawingEngine.cpp | 1 - src/openrct2-ui/interface/Widget.cpp | 1 - src/openrct2-ui/scripting/CustomListView.cpp | 1 - src/openrct2-ui/windows/Changelog.cpp | 1 - src/openrct2-ui/windows/EditorInventionsList.cpp | 1 - src/openrct2-ui/windows/Footpath.cpp | 1 - src/openrct2-ui/windows/GuestList.cpp | 1 - src/openrct2-ui/windows/LoadSave.cpp | 1 - src/openrct2-ui/windows/Multiplayer.cpp | 1 - src/openrct2-ui/windows/NetworkStatus.cpp | 1 - src/openrct2-ui/windows/NewRide.cpp | 1 - src/openrct2-ui/windows/Player.cpp | 1 - src/openrct2-ui/windows/RideList.cpp | 1 - src/openrct2-ui/windows/ScenarioSelect.cpp | 1 - src/openrct2-ui/windows/ServerList.cpp | 1 - src/openrct2-ui/windows/ServerStart.cpp | 1 - src/openrct2-ui/windows/TextInput.cpp | 1 - src/openrct2-ui/windows/Transparency.cpp | 1 - src/openrct2/Game.cpp | 1 - src/openrct2/actions/TrackPlaceAction.cpp | 1 + src/openrct2/core/File.cpp | 1 - src/openrct2/core/Path.cpp | 1 - src/openrct2/core/String.cpp | 1 - src/openrct2/core/StringReader.cpp | 1 - src/openrct2/drawing/ImageImporter.cpp | 1 - src/openrct2/interface/Chat.cpp | 1 - src/openrct2/paint/VirtualFloor.cpp | 1 - src/openrct2/paint/track/gentle/Dodgems.cpp | 1 - src/openrct2/ride/RideConstruction.h | 1 + src/openrct2/ride/TrackDesign.cpp | 1 - src/openrct2/scenes/title/TitleScene.cpp | 1 - src/openrct2/scenes/title/TitleSequence.cpp | 1 - src/openrct2/scripting/bindings/entity/ScEntity.hpp | 1 - src/openrct2/util/Util.cpp | 11 ----------- src/openrct2/util/Util.h | 4 +++- src/openrct2/world/Park.cpp | 1 - 36 files changed, 5 insertions(+), 44 deletions(-) diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index c7790b0bc8..fcc7e7fa46 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -35,7 +35,6 @@ #include #include #include - #include #include using namespace OpenRCT2; diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 88b31421c9..a9834b86ac 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -21,7 +21,6 @@ #include #include #include -#include using namespace OpenRCT2; diff --git a/src/openrct2-ui/scripting/CustomListView.cpp b/src/openrct2-ui/scripting/CustomListView.cpp index e6f8812736..cf7f63330c 100644 --- a/src/openrct2-ui/scripting/CustomListView.cpp +++ b/src/openrct2-ui/scripting/CustomListView.cpp @@ -20,7 +20,6 @@ #include #include #include - #include using namespace OpenRCT2::Scripting; using namespace OpenRCT2::Ui::Windows; diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 8c1e08bcb2..0ae5909930 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 0913c75f02..c466fc1fc3 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 6b4a28726e..a9266e5983 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 6fbe95f44e..b1f827209b 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 113d061577..00629e0b7c 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index d92b4d6844..002593272c 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -18,7 +18,6 @@ #include #include #include -#include namespace OpenRCT2::Ui::Windows { diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 50255cd6b5..35d68f0142 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -12,7 +12,6 @@ #include #include #include -#include namespace OpenRCT2::Ui::Windows { diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 0ffcfd8ab5..f837986c1c 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 86bbd2daba..00ffeb493a 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 63b7ec92ee..767b69481c 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index f78a753e72..2d2b7692e3 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 196d48728d..3af78923e0 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -25,7 +25,6 @@ #include #include #include - #include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 442395b8d4..b06b9e6abe 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -19,7 +19,6 @@ #include #include #include - #include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 7dcc186370..858897bc84 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -18,7 +18,6 @@ #include #include #include -#include namespace OpenRCT2::Ui::Windows { diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index e2bc14eec5..c3ca76bdfd 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 0216a36fb9..01df90b533 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -61,7 +61,6 @@ #include "scripting/ScriptEngine.h" #include "ui/UiContext.h" #include "ui/WindowManager.h" -#include "util/Util.h" #include "windows/Intent.h" #include "world/Banner.h" #include "world/Climate.h" diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 9562536028..a0fe1e5608 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -11,6 +11,7 @@ #include "../Diagnostic.h" #include "../GameState.h" +#include "../core/Money.hpp" #include "../core/Numerics.hpp" #include "../management/Finance.h" #include "../ride/RideData.h" diff --git a/src/openrct2/core/File.cpp b/src/openrct2/core/File.cpp index dcd5fb4a30..8107f8d911 100644 --- a/src/openrct2/core/File.cpp +++ b/src/openrct2/core/File.cpp @@ -15,7 +15,6 @@ #include "../Diagnostic.h" #include "../platform/Platform.h" -#include "../util/Util.h" #include "File.h" #include "FileStream.h" #include "String.hpp" diff --git a/src/openrct2/core/Path.cpp b/src/openrct2/core/Path.cpp index cf50b7a0b6..530a42755c 100644 --- a/src/openrct2/core/Path.cpp +++ b/src/openrct2/core/Path.cpp @@ -11,7 +11,6 @@ #include "../localisation/Language.h" #include "../platform/Platform.h" -#include "../util/Util.h" #include "File.h" #include "FileSystem.hpp" #include "Memory.hpp" diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 45e02cd0b6..fe09e2279f 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -28,7 +28,6 @@ #include #endif -#include "../util/Util.h" #include "Memory.hpp" #include "String.hpp" #include "StringBuilder.h" diff --git a/src/openrct2/core/StringReader.cpp b/src/openrct2/core/StringReader.cpp index 96acb035a1..fa61a2f65a 100644 --- a/src/openrct2/core/StringReader.cpp +++ b/src/openrct2/core/StringReader.cpp @@ -9,7 +9,6 @@ #include "StringReader.h" -#include "../util/Util.h" #include "String.hpp" using namespace OpenRCT2; diff --git a/src/openrct2/drawing/ImageImporter.cpp b/src/openrct2/drawing/ImageImporter.cpp index f841535156..e4573630e3 100644 --- a/src/openrct2/drawing/ImageImporter.cpp +++ b/src/openrct2/drawing/ImageImporter.cpp @@ -11,7 +11,6 @@ #include "../core/Imaging.h" #include "../core/Json.hpp" -#include "../util/Util.h" #include #include diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index b6ba76bc6e..c9e144061f 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -19,7 +19,6 @@ #include "../localisation/Formatting.h" #include "../network/network.h" #include "../platform/Platform.h" -#include "../util/Util.h" #include "../world/Location.hpp" using namespace OpenRCT2; diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index 5122c58823..9e450858b6 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -17,7 +17,6 @@ #include "../interface/Viewport.h" #include "../profiling/Profiling.h" #include "../sprites.h" -#include "../util/Util.h" #include "../world/Location.hpp" #include "../world/Map.h" #include "../world/TileElementsView.h" diff --git a/src/openrct2/paint/track/gentle/Dodgems.cpp b/src/openrct2/paint/track/gentle/Dodgems.cpp index d0dc980b24..3ec9f17e06 100644 --- a/src/openrct2/paint/track/gentle/Dodgems.cpp +++ b/src/openrct2/paint/track/gentle/Dodgems.cpp @@ -12,7 +12,6 @@ #include "../../../ride/Ride.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../util/Util.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" #include "../../tile_element/Segment.h" diff --git a/src/openrct2/ride/RideConstruction.h b/src/openrct2/ride/RideConstruction.h index 502d81d90f..960a4a5fc2 100644 --- a/src/openrct2/ride/RideConstruction.h +++ b/src/openrct2/ride/RideConstruction.h @@ -11,6 +11,7 @@ #include "../Identifiers.h" #include "../core/FlagHolder.hpp" +#include "../core/Money.hpp" #include "../world/Location.hpp" #include "Station.h" #include "Track.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index ed61e08155..378ce5b961 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -54,7 +54,6 @@ #include "../object/StationObject.h" #include "../rct2/RCT2.h" #include "../ride/RideConstruction.h" -#include "../util/Util.h" #include "../world/Footpath.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/scenes/title/TitleScene.cpp b/src/openrct2/scenes/title/TitleScene.cpp index c2bf692cbf..c1f9e1ade8 100644 --- a/src/openrct2/scenes/title/TitleScene.cpp +++ b/src/openrct2/scenes/title/TitleScene.cpp @@ -27,7 +27,6 @@ #include "../../scenario/Scenario.h" #include "../../scenario/ScenarioRepository.h" #include "../../ui/UiContext.h" -#include "../../util/Util.h" #include "../../windows/Intent.h" #include "TitleSequence.h" #include "TitleSequenceManager.h" diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index 375902905a..c65dca8942 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -24,7 +24,6 @@ #include "../../core/Zip.h" #include "../../scenario/ScenarioRepository.h" #include "../../scenario/ScenarioSources.h" -#include "../../util/Util.h" #include #include diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index 2126a52842..2ae3192d73 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -15,7 +15,6 @@ #include "../../../entity/EntityList.h" #include "../../../entity/EntityRegistry.h" #include "../../../entity/Peep.h" - #include "../../../util/Util.h" #include "../../Duktape.hpp" #include "../../ScriptEngine.h" diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index 4444c6cade..28e44859c5 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -9,18 +9,7 @@ #include "Util.h" -#include "../Diagnostic.h" -#include "../core/Guard.hpp" -#include "../core/Path.hpp" -#include "../core/UTF8.h" -#include "../interface/Window.h" -#include "../platform/Platform.h" -#include "../scenes/title/TitleScene.h" - #include -#include -#include -#include #include uint32_t UtilRand() diff --git a/src/openrct2/util/Util.h b/src/openrct2/util/Util.h index 5b35eb3f6d..437fbf2681 100644 --- a/src/openrct2/util/Util.h +++ b/src/openrct2/util/Util.h @@ -10,7 +10,9 @@ #pragma once #include "../core/Money.hpp" -#include "../core/StringTypes.h" + +#include +#include uint32_t UtilRand(); float UtilRandNormalDistributed(); diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index ca6f8cac5f..1253d14aaa 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -35,7 +35,6 @@ #include "../ride/ShopItem.h" #include "../scenario/Scenario.h" #include "../scripting/ScriptEngine.h" -#include "../util/Util.h" #include "../windows/Intent.h" #include "Entrance.h" #include "Map.h"