diff --git a/src/openrct2-ui/interface/Window.h b/src/openrct2-ui/interface/Window.h index d8c781013b..87cc54e876 100644 --- a/src/openrct2-ui/interface/Window.h +++ b/src/openrct2-ui/interface/Window.h @@ -10,7 +10,7 @@ #pragma once #include -#include +#include struct TextInputSession; diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp index 2f41b5621d..c497a7c673 100644 --- a/src/openrct2-ui/scripting/ScWindow.hpp +++ b/src/openrct2-ui/scripting/ScWindow.hpp @@ -14,7 +14,7 @@ #include "ScWidget.hpp" #include - #include + #include #include namespace OpenRCT2::Scripting diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index aa3bd0d772..bf41107246 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -29,7 +29,7 @@ #include "entity/PatrolArea.h" #include "entity/Staff.h" #include "interface/Viewport.h" -#include "interface/Window_internal.h" +#include "interface/WindowBase.h" #include "localisation/LocalisationService.h" #include "management/Finance.h" #include "management/NewsItem.h" diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index c2b896a9e2..f3c0083b9e 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -16,7 +16,7 @@ #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" #include "../interface/Window.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../paint/Paint.h" #include "../ride/Ride.h" #include "../ride/RideData.h" diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 71c5d3d1de..5e633d77eb 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -26,7 +26,7 @@ #include "../entity/EntityRegistry.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" #include "../management/Finance.h" diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index c4ebf8c157..35e0539fa9 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -31,7 +31,7 @@ #include "../entity/EntityRegistry.h" #include "../entity/EntityTweener.h" #include "../interface/Viewport.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" #include "../management/Finance.h" diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index cf94ea1b3b..264b2fb4b9 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -43,7 +43,7 @@ #include "../interface/Chat.h" #include "../interface/Colour.h" #include "../interface/Viewport.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../localisation/Formatting.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 7c7c1a8431..bf529df8b7 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -44,7 +44,7 @@ #include "../world/tile_element/WallElement.h" #include "Colour.h" #include "Window.h" -#include "Window_internal.h" +#include "WindowBase.h" #include #include diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index bc696678b0..aaadad021a 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -25,7 +25,7 @@ #include "../ui/WindowManager.h" #include "Viewport.h" #include "Widget.h" -#include "Window_internal.h" +#include "WindowBase.h" #include #include diff --git a/src/openrct2/interface/Window_internal.cpp b/src/openrct2/interface/WindowBase.cpp similarity index 97% rename from src/openrct2/interface/Window_internal.cpp rename to src/openrct2/interface/WindowBase.cpp index bded773da8..439464eec1 100644 --- a/src/openrct2/interface/Window_internal.cpp +++ b/src/openrct2/interface/WindowBase.cpp @@ -1,4 +1,4 @@ -#include "Window_internal.h" +#include "WindowBase.h" #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/WindowBase.h similarity index 100% rename from src/openrct2/interface/Window_internal.h rename to src/openrct2/interface/WindowBase.h diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 1329c65536..565d22e105 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -287,8 +287,8 @@ + - @@ -840,7 +840,7 @@ - + diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 2bbfa043f3..db60d1142b 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -33,7 +33,7 @@ #include "../entity/Peep.h" #include "../entity/Staff.h" #include "../interface/Viewport.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" #include "../management/Finance.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index a9762f22d6..56788ea36c 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -21,7 +21,7 @@ #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../localisation/Formatter.h" #include "../network/Network.h" #include "../ui/WindowManager.h" diff --git a/src/openrct2/scenes/title/Command/SetLocation.cpp b/src/openrct2/scenes/title/Command/SetLocation.cpp index 8d4556cb67..0a5945a59f 100644 --- a/src/openrct2/scenes/title/Command/SetLocation.cpp +++ b/src/openrct2/scenes/title/Command/SetLocation.cpp @@ -12,7 +12,7 @@ #include "../../../OpenRCT2.h" #include "../../../interface/Viewport.h" #include "../../../interface/Window.h" -#include "../../../interface/Window_internal.h" +#include "../../../interface/WindowBase.h" #include "../../../world/Map.h" namespace OpenRCT2::Title diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 6cd92279f3..764d03df87 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -21,7 +21,7 @@ #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" -#include "../interface/Window_internal.h" +#include "../interface/WindowBase.h" #include "../object/FootpathObject.h" #include "../object/FootpathRailingsObject.h" #include "../object/FootpathSurfaceObject.h"