From b4e08ba92bff8d915fc103ea7314222b8eb03db3 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 10 Jan 2022 18:56:04 +0100 Subject: [PATCH] Renamed Platform to utils/PlatformUtil --- es-app/src/FileData.cpp | 2 +- es-app/src/SystemData.cpp | 1 - es-app/src/guis/GuiMenu.cpp | 2 +- es-app/src/main.cpp | 2 +- es-core/CMakeLists.txt | 4 ++-- es-core/src/InputManager.cpp | 2 +- es-core/src/Scripting.cpp | 2 +- es-core/src/Settings.cpp | 1 - es-core/src/ThemeData.cpp | 1 - es-core/src/resources/ResourceManager.cpp | 2 +- es-core/src/{Platform.cpp => utils/PlatformUtil.cpp} | 5 +---- es-core/src/{Platform.h => utils/PlatformUtil.h} | 6 +++--- 12 files changed, 12 insertions(+), 18 deletions(-) rename es-core/src/{Platform.cpp => utils/PlatformUtil.cpp} (99%) rename es-core/src/{Platform.h => utils/PlatformUtil.h} (92%) diff --git a/es-app/src/FileData.cpp b/es-app/src/FileData.cpp index 93021117e..75ade3117 100644 --- a/es-app/src/FileData.cpp +++ b/es-app/src/FileData.cpp @@ -15,11 +15,11 @@ #include "FileSorts.h" #include "Log.h" #include "MameNames.h" -#include "Platform.h" #include "Scripting.h" #include "SystemData.h" #include "Window.h" #include "utils/FileSystemUtil.h" +#include "utils/PlatformUtil.h" #include "utils/StringUtil.h" #include "utils/TimeUtil.h" #include "views/UIModeController.h" diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp index 93dd56f9b..1f5780e23 100644 --- a/es-app/src/SystemData.cpp +++ b/es-app/src/SystemData.cpp @@ -16,7 +16,6 @@ #include "FileSorts.h" #include "Gamelist.h" #include "Log.h" -#include "Platform.h" #include "Settings.h" #include "ThemeData.h" #include "resources/ResourceManager.h" diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 4442910d9..dddcd6ef8 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -13,7 +13,6 @@ #include "EmulationStation.h" #include "FileFilterIndex.h" #include "FileSorts.h" -#include "Platform.h" #include "Scripting.h" #include "SystemData.h" #include "VolumeControl.h" @@ -29,6 +28,7 @@ #include "guis/GuiScreensaverOptions.h" #include "guis/GuiTextEditKeyboardPopup.h" #include "guis/GuiTextEditPopup.h" +#include "utils/PlatformUtil.h" #include "views/UIModeController.h" #include "views/ViewController.h" #include "views/gamelist/IGameListView.h" diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp index 647ea2b8e..0db112b53 100644 --- a/es-app/src/main.cpp +++ b/es-app/src/main.cpp @@ -24,7 +24,6 @@ #include "Log.h" #include "MameNames.h" #include "MediaViewer.h" -#include "Platform.h" #include "Settings.h" #include "Sound.h" #include "SystemData.h" @@ -33,6 +32,7 @@ #include "guis/GuiLaunchScreen.h" #include "guis/GuiMsgBox.h" #include "utils/FileSystemUtil.h" +#include "utils/PlatformUtil.h" #include "utils/StringUtil.h" #include "views/ViewController.h" diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt index 614b8a415..5d440c124 100644 --- a/es-core/CMakeLists.txt +++ b/es-core/CMakeLists.txt @@ -20,7 +20,6 @@ set(CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/InputManager.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Log.h ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNames.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Settings.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Sound.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeData.h @@ -85,6 +84,7 @@ set(CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/CImgUtil.h ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.h ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/MathUtil.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/PlatformUtil.h ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/StringUtil.h ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/TimeUtil.h ) @@ -100,7 +100,6 @@ set(CORE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/InputManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Log.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNames.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Scripting.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Settings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Sound.cpp @@ -160,6 +159,7 @@ set(CORE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/CImgUtil.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/MathUtil.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/PlatformUtil.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/StringUtil.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/TimeUtil.cpp ) diff --git a/es-core/src/InputManager.cpp b/es-core/src/InputManager.cpp index bc985b4dc..56c8a6ad6 100644 --- a/es-core/src/InputManager.cpp +++ b/es-core/src/InputManager.cpp @@ -11,11 +11,11 @@ #include "InputManager.h" #include "Log.h" -#include "Platform.h" #include "Scripting.h" #include "Window.h" #include "resources/ResourceManager.h" #include "utils/FileSystemUtil.h" +#include "utils/PlatformUtil.h" #include "utils/StringUtil.h" #include diff --git a/es-core/src/Scripting.cpp b/es-core/src/Scripting.cpp index 6bdeaf03d..292299c7c 100644 --- a/es-core/src/Scripting.cpp +++ b/es-core/src/Scripting.cpp @@ -15,9 +15,9 @@ #include "Scripting.h" #include "Log.h" -#include "Platform.h" #include "Settings.h" #include "utils/FileSystemUtil.h" +#include "utils/PlatformUtil.h" namespace Scripting { diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index e216e62c5..6642e961f 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -10,7 +10,6 @@ #include "Settings.h" #include "Log.h" -#include "Platform.h" #include "Scripting.h" #include "utils/FileSystemUtil.h" #include "utils/StringUtil.h" diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp index e9e070a2d..6dd152a28 100644 --- a/es-core/src/ThemeData.cpp +++ b/es-core/src/ThemeData.cpp @@ -11,7 +11,6 @@ #include "ThemeData.h" #include "Log.h" -#include "Platform.h" #include "Settings.h" #include "components/ImageComponent.h" #include "components/LottieComponent.h" diff --git a/es-core/src/resources/ResourceManager.cpp b/es-core/src/resources/ResourceManager.cpp index 4a64c0377..209bb1ebc 100644 --- a/es-core/src/resources/ResourceManager.cpp +++ b/es-core/src/resources/ResourceManager.cpp @@ -10,9 +10,9 @@ #include "ResourceManager.h" #include "Log.h" -#include "Platform.h" #include "Scripting.h" #include "utils/FileSystemUtil.h" +#include "utils/PlatformUtil.h" #include "utils/StringUtil.h" #include diff --git a/es-core/src/Platform.cpp b/es-core/src/utils/PlatformUtil.cpp similarity index 99% rename from es-core/src/Platform.cpp rename to es-core/src/utils/PlatformUtil.cpp index 5fb96350d..b11336c3b 100644 --- a/es-core/src/Platform.cpp +++ b/es-core/src/utils/PlatformUtil.cpp @@ -6,13 +6,10 @@ // Platform utility functions. // -#include "Platform.h" +#include "utils/PlatformUtil.h" #include "Log.h" -#include "MameNames.h" -#include "Settings.h" #include "Window.h" -#include "utils/StringUtil.h" #include diff --git a/es-core/src/Platform.h b/es-core/src/utils/PlatformUtil.h similarity index 92% rename from es-core/src/Platform.h rename to es-core/src/utils/PlatformUtil.h index 97b3effd5..9e1fccf6d 100644 --- a/es-core/src/Platform.h +++ b/es-core/src/utils/PlatformUtil.h @@ -6,8 +6,8 @@ // Platform utility functions. // -#ifndef ES_CORE_PLATFORM_H -#define ES_CORE_PLATFORM_H +#ifndef ES_CORE_UTILS_PLATFORM_UTIL_H +#define ES_CORE_UTILS_PLATFORM_UTIL_H #include @@ -55,4 +55,4 @@ namespace Utils } // namespace Utils -#endif // ES_CORE_PLATFORM_H +#endif // ES_CORE_UTILS_PLATFORM_UTIL_H