Introduce EnumUtils header (#23407)

src/openrct2-ui/CursorData.cpp

@@ -10,8 +10,8 @@
 #include "CursorData.h"
 
 #include <cassert>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/interface/Cursors.h>
-#include <openrct2/util/Util.h>
 
 namespace OpenRCT2::Ui
 {

src/openrct2-ui/CursorRepository.h

@@ -12,8 +12,8 @@
 #include <SDL.h>
 #include <functional>
 #include <map>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/interface/Cursors.h>
-#include <openrct2/util/Util.h>
 
 struct SDL_Cursor;
 

src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp

@@ -13,9 +13,9 @@
 
     #include <algorithm>
     #include <openrct2/Diagnostic.h>
+    #include <openrct2/core/EnumUtils.hpp>
     #include <openrct2/drawing/Drawing.h>
     #include <openrct2/interface/Colour.h>
-    #include <openrct2/util/Util.h>
     #include <openrct2/world/Location.hpp>
     #include <stdexcept>
     #include <vector>

src/openrct2-ui/input/Shortcuts.cpp

@@ -30,6 +30,7 @@
 #include <openrct2/actions/TileModifyAction.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/interface/Chat.h>
 #include <openrct2/interface/Screenshot.h>
 #include <openrct2/network/network.h>
@@ -39,7 +40,6 @@
 #include <openrct2/ride/TrackPaint.h>
 #include <openrct2/scenario/Scenario.h>
 #include <openrct2/scenes/title/TitleScene.h>
-#include <openrct2/util/Util.h>
 #include <openrct2/windows/Intent.h>
 #include <openrct2/windows/TileInspectorGlobals.h>
 #include <openrct2/world/Park.h>

src/openrct2-ui/interface/Dropdown.h

@@ -11,8 +11,8 @@
 
 #include <openrct2-ui/UiStringIds.h>
 #include <openrct2-ui/interface/Window.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/drawing/ImageId.hpp>
-#include <openrct2/util/Util.h>
 
 namespace OpenRCT2::Dropdown
 {

src/openrct2-ui/ride/Construction.h

@@ -9,9 +9,9 @@
 
 #pragma once
 
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/ride/RideTypes.h>
 #include <openrct2/ride/Track.h>
-#include <openrct2/util/Util.h>
 
 namespace OpenRCT2
 {

src/openrct2-ui/ride/VehicleSounds.cpp

@@ -15,6 +15,7 @@
 #include <openrct2/profiling/Profiling.h>
 #include <openrct2/ride/TrainManager.h>
 #include <openrct2/ride/Vehicle.h>
+#include <openrct2/util/Util.h>
 #include <openrct2/world/tile_element/SurfaceElement.h>
 #include <sfl/static_vector.hpp>
 

src/openrct2-ui/windows/Cheats.cpp

@@ -19,6 +19,7 @@
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/actions/CheatSetAction.h>
 #include <openrct2/actions/ParkSetDateAction.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/localisation/Currency.h>
 #include <openrct2/localisation/Formatter.h>
 #include <openrct2/localisation/Localisation.Date.h>

src/openrct2-ui/windows/CustomCurrency.cpp

@@ -12,12 +12,12 @@
 #include <openrct2-ui/interface/Widget.h>
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/core/String.hpp>
 #include <openrct2/drawing/Text.h>
 #include <openrct2/interface/Colour.h>
 #include <openrct2/localisation/Currency.h>
 #include <openrct2/localisation/Formatter.h>
-#include <openrct2/util/Util.h>
 
 namespace OpenRCT2::Ui::Windows
 {

src/openrct2-ui/windows/EditorObjectSelection.cpp

@@ -22,6 +22,7 @@
 #include <openrct2/actions/LoadOrQuitAction.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/core/Path.hpp>
 #include <openrct2/core/String.hpp>
 #include <openrct2/drawing/Text.h>
@@ -37,7 +38,6 @@
 #include <openrct2/scenario/Scenario.h>
 #include <openrct2/scenes/title/TitleScene.h>
 #include <openrct2/sprites.h>
-#include <openrct2/util/Util.h>
 #include <openrct2/windows/Intent.h>
 #include <span>
 #include <string>

src/openrct2-ui/windows/Guest.cpp

@@ -22,6 +22,7 @@
 #include <openrct2/actions/GuestSetNameAction.h>
 #include <openrct2/actions/PeepPickupAction.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/core/String.hpp>
 #include <openrct2/entity/Guest.h>
 #include <openrct2/entity/Staff.h>

src/openrct2-ui/windows/Options.cpp

@@ -27,6 +27,7 @@
 #include <openrct2/audio/AudioMixer.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/core/File.h>
 #include <openrct2/core/String.hpp>
 #include <openrct2/drawing/IDrawingEngine.h>
@@ -44,7 +45,6 @@
 #include <openrct2/scenes/title/TitleSequenceManager.h>
 #include <openrct2/sprites.h>
 #include <openrct2/ui/UiContext.h>
-#include <openrct2/util/Util.h>
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Audio;

src/openrct2-ui/windows/Ride.cpp

@@ -64,6 +64,7 @@
 #include <openrct2/ride/TrackDesignRepository.h>
 #include <openrct2/ride/Vehicle.h>
 #include <openrct2/sprites.h>
+#include <openrct2/util/Util.h>
 #include <openrct2/windows/Intent.h>
 #include <openrct2/world/Park.h>
 #include <openrct2/world/tile_element/EntranceElement.h>

src/openrct2-ui/windows/Scenery.cpp

@@ -49,6 +49,7 @@
 #include <openrct2/object/WallSceneryEntry.h>
 #include <openrct2/paint/VirtualFloor.h>
 #include <openrct2/sprites.h>
+#include <openrct2/util/Util.h>
 #include <openrct2/world/ConstructionClearance.h>
 #include <openrct2/world/Footpath.h>
 #include <openrct2/world/Park.h>

src/openrct2-ui/windows/StaffList.cpp

@@ -24,6 +24,7 @@
 #include <openrct2/actions/StaffHireNewAction.h>
 #include <openrct2/actions/StaffSetColourAction.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/core/String.hpp>
 #include <openrct2/drawing/Drawing.h>
 #include <openrct2/entity/EntityList.h>

src/openrct2/Diagnostic.cpp

@@ -10,8 +10,8 @@
 #include "Diagnostic.h"
 
 #include "core/Console.hpp"
+#include "core/EnumUtils.hpp"
 #include "core/String.hpp"
-#include "util/Util.h"
 
 #include <cstdarg>
 #include <cstdio>

src/openrct2/Editor.cpp

@@ -20,6 +20,7 @@
 #include "actions/LandSetRightsAction.h"
 #include "actions/ResultWithMessage.h"
 #include "audio/audio.h"
+#include "core/EnumUtils.hpp"
 #include "core/Path.hpp"
 #include "core/String.hpp"
 #include "entity/EntityList.h"
@@ -39,7 +40,6 @@
 #include "scenario/Scenario.h"
 #include "ui/UiContext.h"
 #include "ui/WindowManager.h"
-#include "util/Util.h"
 #include "windows/Intent.h"
 #include "world/Climate.h"
 #include "world/Entrance.h"

src/openrct2/EditorObjectSelectionSession.h

@@ -9,8 +9,8 @@
 
 #pragma once
 
+#include "core/EnumUtils.hpp"
 #include "object/Object.h"
-#include "util/Util.h"
 
 #include <vector>
 

src/openrct2/GameState.h

@@ -13,6 +13,7 @@
 #include "Date.h"
 #include "Editor.h"
 #include "Limits.h"
+#include "core/EnumUtils.hpp"
 #include "interface/ZoomLevel.h"
 #include "management/Award.h"
 #include "management/Finance.h"
@@ -21,7 +22,6 @@
 #include "ride/Ride.h"
 #include "ride/RideRatings.h"
 #include "scenario/Scenario.h"
-#include "util/Util.h"
 #include "world/Banner.h"
 #include "world/Climate.h"
 #include "world/Location.hpp"

src/openrct2/PlatformEnvironment.cpp

@@ -12,11 +12,11 @@
 #include "Diagnostic.h"
 #include "OpenRCT2.h"
 #include "config/Config.h"
+#include "core/EnumUtils.hpp"
 #include "core/File.h"
 #include "core/Path.hpp"
 #include "core/String.hpp"
 #include "platform/Platform.h"
-#include "util/Util.h"
 
 using namespace OpenRCT2;