From 7ed6058b993e1cd9b5a03f98aacd191faa1ef5e8 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 29 Dec 2024 17:43:28 +0100 Subject: [PATCH] Clean up includes --- source/NotificationsUtils.cpp | 5 +++- source/NotificationsUtils.h | 2 +- source/PluginManagement.cpp | 19 +++++++++++--- source/PluginManagement.h | 12 ++++++--- source/config/WUPSConfig.h | 1 + source/config/WUPSConfigAPI.cpp | 10 +++++--- source/config/WUPSConfigAPI.h | 8 +++--- source/config/WUPSConfigAPIDeprecated.cpp | 4 ++- source/config/WUPSConfigCategory.cpp | 4 +++ source/config/WUPSConfigCategory.h | 2 +- source/config/WUPSConfigItem.cpp | 2 ++ source/config/WUPSConfigItem.h | 3 ++- source/config/WUPSConfigItemV1.cpp | 5 ++++ source/config/WUPSConfigItemV1.h | 3 ++- source/config/WUPSConfigItemV2.cpp | 5 ++-- source/config/WUPSConfigItemV2.h | 4 ++- source/fs/CFile.cpp | 6 +++-- source/fs/CFile.hpp | 10 ++++---- source/fs/DirList.cpp | 12 ++++----- source/fs/DirList.h | 3 ++- source/fs/FSUtils.cpp | 6 +++-- source/fs/FSUtils.h | 3 ++- source/globals.cpp | 8 ++++++ source/globals.h | 5 +++- source/hooks.cpp | 7 +++++- source/hooks.h | 5 ++-- source/main.cpp | 24 +++++++++++++----- source/patcher/hooks_patcher_static.cpp | 6 ++++- source/patcher/hooks_patcher_static.h | 2 ++ source/plugin/ButtonComboManager.cpp | 6 +++-- source/plugin/ButtonComboManager.h | 7 ++++-- source/plugin/FunctionData.cpp | 1 + source/plugin/FunctionData.h | 1 + source/plugin/FunctionSymbolData.h | 3 ++- source/plugin/PluginConfigData.cpp | 4 +-- source/plugin/PluginConfigData.h | 5 ++-- source/plugin/PluginContainer.cpp | 10 +++++++- source/plugin/PluginContainer.h | 6 +++-- source/plugin/PluginData.h | 3 ++- source/plugin/PluginDataFactory.cpp | 2 ++ source/plugin/PluginDataFactory.h | 5 ++-- source/plugin/PluginLinkInformation.cpp | 7 +++++- source/plugin/PluginLinkInformation.h | 15 +++++------ .../plugin/PluginLinkInformationFactory.cpp | 11 +++++++- source/plugin/PluginLinkInformationFactory.h | 10 +++++--- source/plugin/PluginLoadWrapper.h | 4 ++- source/plugin/PluginMetaInformation.cpp | 2 ++ source/plugin/PluginMetaInformation.h | 5 ++++ .../plugin/PluginMetaInformationFactory.cpp | 2 +- source/plugin/PluginMetaInformationFactory.h | 8 +++--- source/plugin/RelocationData.h | 4 ++- source/plugin/SectionInfo.h | 3 ++- source/plugin/WUPSVersion.h | 5 +++- source/utils/DrawUtils.cpp | 10 +++++--- source/utils/DrawUtils.h | 4 ++- source/utils/ElfUtils.h | 3 ++- source/utils/HeapMemoryFixedSize.cpp | 1 + source/utils/HeapMemoryFixedSize.h | 3 ++- source/utils/StorageUtilsDeprecated.h | 1 + source/utils/StringTools.cpp | 5 ++-- source/utils/StringTools.h | 2 ++ source/utils/WUPSBackendSettings.cpp | 3 ++- source/utils/WUPSBackendSettings.h | 1 - source/utils/buttoncombo/ButtonComboUtils.cpp | 11 ++++---- source/utils/buttoncombo/ButtonComboUtils.h | 2 ++ source/utils/config/CategoryRenderer.cpp | 12 ++++++++- source/utils/config/CategoryRenderer.h | 25 ++++++++++++------- source/utils/config/ConfigDefines.h | 3 ++- source/utils/config/ConfigDisplayItem.cpp | 5 ++++ source/utils/config/ConfigDisplayItem.h | 1 + source/utils/config/ConfigRenderer.cpp | 24 +++++++++++------- source/utils/config/ConfigRenderer.h | 24 +++++++++++------- source/utils/config/ConfigRendererItem.cpp | 3 +++ source/utils/config/ConfigRendererItem.h | 9 ++++--- .../utils/config/ConfigRendererItemCategory.h | 6 +++-- .../config/ConfigRendererItemGeneric.cpp | 4 ++- .../utils/config/ConfigRendererItemGeneric.h | 6 +++-- source/utils/config/ConfigUtils.cpp | 21 ++++++++++------ source/utils/config/ConfigUtils.h | 6 +++-- source/utils/exports.cpp | 5 +++- source/utils/input/CombinedInput.h | 1 + source/utils/input/WPADInput.h | 1 + source/utils/storage/StorageItem.h | 3 ++- source/utils/storage/StorageItemRoot.h | 1 + source/utils/storage/StorageSubItem.cpp | 2 +- source/utils/storage/StorageSubItem.h | 3 ++- source/utils/storage/StorageUtils.cpp | 8 +++--- source/utils/storage/StorageUtils.h | 6 +++-- source/utils/utils.cpp | 11 +++++--- source/utils/utils.h | 7 ++++-- 90 files changed, 393 insertions(+), 165 deletions(-) diff --git a/source/NotificationsUtils.cpp b/source/NotificationsUtils.cpp index b17d5e0..d9b0c9c 100644 --- a/source/NotificationsUtils.cpp +++ b/source/NotificationsUtils.cpp @@ -1,9 +1,12 @@ #include "NotificationsUtils.h" + #include "globals.h" #include "utils/logger.h" -#include + #include +#include + bool DisplayNotificationMessage(std::string_view text, NotificationModuleNotificationType type, float duration) { if (!gNotificationModuleLoaded) { return false; diff --git a/source/NotificationsUtils.h b/source/NotificationsUtils.h index ef77b94..787d127 100644 --- a/source/NotificationsUtils.h +++ b/source/NotificationsUtils.h @@ -1,6 +1,6 @@ #pragma once -#include +#include bool DisplayInfoNotificationMessage(std::string_view text, float duration); diff --git a/source/PluginManagement.cpp b/source/PluginManagement.cpp index dc8270b..65b3fbd 100644 --- a/source/PluginManagement.cpp +++ b/source/PluginManagement.cpp @@ -1,17 +1,28 @@ #include "PluginManagement.h" + #include "NotificationsUtils.h" #include "hooks.h" +#include "plugin/FunctionData.h" +#include "plugin/HookData.h" +#include "plugin/PluginConfigData.h" #include "plugin/PluginContainer.h" +#include "plugin/PluginData.h" #include "plugin/PluginLinkInformationFactory.h" #include "plugin/PluginLoadWrapper.h" #include "plugin/PluginMetaInformationFactory.h" +#include "plugin/RelocationData.h" +#include "plugin/SectionInfo.h" #include "utils/ElfUtils.h" #include "utils/StringTools.h" -#include "utils/utils.h" +#include "utils/logger.h" + +#include + #include -#include -#include -#include + +#include + +#include static uint32_t sTrampolineID = 0; diff --git a/source/PluginManagement.h b/source/PluginManagement.h index 4d1c170..2060897 100644 --- a/source/PluginManagement.h +++ b/source/PluginManagement.h @@ -1,12 +1,16 @@ #pragma once -#include "plugin/PluginContainer.h" -#include "plugin/PluginLoadWrapper.h" +#include + #include + #include #include -#include -#include +#include + +class RelocationData; +class PluginLoadWrapper; +class PluginContainer; class PluginManagement { public: diff --git a/source/config/WUPSConfig.h b/source/config/WUPSConfig.h index 0791414..0bccdfb 100644 --- a/source/config/WUPSConfig.h +++ b/source/config/WUPSConfig.h @@ -18,6 +18,7 @@ #pragma once #include "WUPSConfigCategory.h" + #include namespace WUPSConfigAPIBackend { diff --git a/source/config/WUPSConfigAPI.cpp b/source/config/WUPSConfigAPI.cpp index 0200239..b758ade 100644 --- a/source/config/WUPSConfigAPI.cpp +++ b/source/config/WUPSConfigAPI.cpp @@ -1,4 +1,5 @@ #include "WUPSConfigAPI.h" + #include "WUPSConfig.h" #include "WUPSConfigCategory.h" #include "WUPSConfigItem.h" @@ -10,13 +11,14 @@ #include "utils/logger.h" #include "utils/utils.h" -#include -#include -#include #include -#include #include +#include +#include +#include +#include + namespace WUPSConfigAPIBackend { std::vector> sConfigs; diff --git a/source/config/WUPSConfigAPI.h b/source/config/WUPSConfigAPI.h index d34518f..f294281 100644 --- a/source/config/WUPSConfigAPI.h +++ b/source/config/WUPSConfigAPI.h @@ -1,11 +1,13 @@ #pragma once -#include "WUPSConfig.h" -#include "WUPSConfigCategory.h" -#include "WUPSConfigItem.h" #include +#include + namespace WUPSConfigAPIBackend { + class WUPSConfigItem; + class WUPSConfig; + class WUPSConfigCategory; namespace Intern { /** * @brief Retrieves a WUPSConfig pointer based on a given handle. diff --git a/source/config/WUPSConfigAPIDeprecated.cpp b/source/config/WUPSConfigAPIDeprecated.cpp index 865beaf..980c60d 100644 --- a/source/config/WUPSConfigAPIDeprecated.cpp +++ b/source/config/WUPSConfigAPIDeprecated.cpp @@ -1,7 +1,9 @@ #include "WUPSConfig.h" #include "WUPSConfigAPI.h" +#include "WUPSConfigItem.h" #include "utils/logger.h" -#include + +#include #include int32_t WUPSConfig_Create(void **out, const char *name) { diff --git a/source/config/WUPSConfigCategory.cpp b/source/config/WUPSConfigCategory.cpp index a16a390..8a55fae 100644 --- a/source/config/WUPSConfigCategory.cpp +++ b/source/config/WUPSConfigCategory.cpp @@ -1,5 +1,9 @@ #include "WUPSConfigCategory.h" +#include "WUPSConfigItem.h" +#include +#include +#include namespace WUPSConfigAPIBackend { diff --git a/source/config/WUPSConfigCategory.h b/source/config/WUPSConfigCategory.h index 4da7327..fa0b040 100644 --- a/source/config/WUPSConfigCategory.h +++ b/source/config/WUPSConfigCategory.h @@ -16,13 +16,13 @@ ****************************************************************************/ #pragma once -#include "WUPSConfigItem.h" #include #include #include namespace WUPSConfigAPIBackend { + class WUPSConfigItem; class WUPSConfigCategory { public: explicit WUPSConfigCategory(std::string_view name); diff --git a/source/config/WUPSConfigItem.cpp b/source/config/WUPSConfigItem.cpp index 99f5ec6..d2c862a 100644 --- a/source/config/WUPSConfigItem.cpp +++ b/source/config/WUPSConfigItem.cpp @@ -1,5 +1,7 @@ #include "WUPSConfigItem.h" +#include + namespace WUPSConfigAPIBackend { WUPSConfigItem::WUPSConfigItem(std::string displayName) : mDisplayName(std::move(displayName)) { } diff --git a/source/config/WUPSConfigItem.h b/source/config/WUPSConfigItem.h index 6ed0b37..ad3f3b1 100644 --- a/source/config/WUPSConfigItem.h +++ b/source/config/WUPSConfigItem.h @@ -17,9 +17,10 @@ #pragma once -#include #include +#include + namespace WUPSConfigAPIBackend { class WUPSConfigItem { public: diff --git a/source/config/WUPSConfigItemV1.cpp b/source/config/WUPSConfigItemV1.cpp index 12b35b7..25bd1b2 100644 --- a/source/config/WUPSConfigItemV1.cpp +++ b/source/config/WUPSConfigItemV1.cpp @@ -1,7 +1,12 @@ #include "WUPSConfigItemV1.h" + #include "utils/StringTools.h" #include "utils/logger.h" +#include + +#include + namespace WUPSConfigAPIBackend { WUPSConfigItemV1::WUPSConfigItemV1(const std::string_view configId, const std::string_view displayName, diff --git a/source/config/WUPSConfigItemV1.h b/source/config/WUPSConfigItemV1.h index 0895811..07deabe 100644 --- a/source/config/WUPSConfigItemV1.h +++ b/source/config/WUPSConfigItemV1.h @@ -1,9 +1,10 @@ #pragma once #include "WUPSConfigItem.h" -#include + #include +#include namespace WUPSConfigAPIBackend { class WUPSConfigItemV1 final : public WUPSConfigItem { public: diff --git a/source/config/WUPSConfigItemV2.cpp b/source/config/WUPSConfigItemV2.cpp index f4d45d1..2f9ff18 100644 --- a/source/config/WUPSConfigItemV2.cpp +++ b/source/config/WUPSConfigItemV2.cpp @@ -1,9 +1,10 @@ #include "WUPSConfigItemV2.h" + +#include + #include "utils/StringTools.h" #include "utils/logger.h" - #include -#include namespace WUPSConfigAPIBackend { WUPSConfigItemV2::WUPSConfigItemV2(const std::string_view displayName, diff --git a/source/config/WUPSConfigItemV2.h b/source/config/WUPSConfigItemV2.h index c50db39..2492c5e 100644 --- a/source/config/WUPSConfigItemV2.h +++ b/source/config/WUPSConfigItemV2.h @@ -1,9 +1,11 @@ #pragma once #include "WUPSConfigItem.h" -#include + #include +#include + namespace WUPSConfigAPIBackend { class WUPSConfigItemV2 final : public WUPSConfigItem { public: diff --git a/source/fs/CFile.cpp b/source/fs/CFile.cpp index e4b0fe8..b105a2c 100644 --- a/source/fs/CFile.cpp +++ b/source/fs/CFile.cpp @@ -1,9 +1,11 @@ +#include "fs/CFile.hpp" #include "utils/utils.h" + #include #include -#include -#include +#include + CFile::CFile() { iFd = -1; diff --git a/source/fs/CFile.hpp b/source/fs/CFile.hpp index c225322..257fb3c 100644 --- a/source/fs/CFile.hpp +++ b/source/fs/CFile.hpp @@ -1,12 +1,12 @@ #pragma once -#include -#include -#include -#include -#include #include +#include + +#include +#include + class CFile { public: enum eOpenTypes { diff --git a/source/fs/DirList.cpp b/source/fs/DirList.cpp index b4e959a..60c4f14 100644 --- a/source/fs/DirList.cpp +++ b/source/fs/DirList.cpp @@ -24,18 +24,18 @@ * DirList Class * for WiiXplorer 2010 ***************************************************************************/ +#include "fs/DirList.h" +#include "utils/StringTools.h" + #include -#include -#include -#include #include + +#include +#include #include #include #include -#include -#include - DirList::DirList() { Flags = 0; Filter = 0; diff --git a/source/fs/DirList.h b/source/fs/DirList.h index 3cc62e1..2734e9e 100644 --- a/source/fs/DirList.h +++ b/source/fs/DirList.h @@ -27,9 +27,10 @@ #ifndef ___DIRLIST_H_ #define ___DIRLIST_H_ +#include + #include #include -#include typedef struct { char *FilePath; diff --git a/source/fs/FSUtils.cpp b/source/fs/FSUtils.cpp index de79899..70a82ac 100644 --- a/source/fs/FSUtils.cpp +++ b/source/fs/FSUtils.cpp @@ -1,12 +1,14 @@ #include "fs/FSUtils.h" #include "utils/logger.h" + #include "utils/utils.h" +#include +#include + #include #include #include -#include #include -#include int32_t FSUtils::LoadFileToMem(std::string_view filepath, std::vector &buffer) { //! always initialize input diff --git a/source/fs/FSUtils.h b/source/fs/FSUtils.h index 698df58..985cfde 100644 --- a/source/fs/FSUtils.h +++ b/source/fs/FSUtils.h @@ -1,8 +1,9 @@ #pragma once +#include + #include #include -#include class FSUtils { public: diff --git a/source/globals.cpp b/source/globals.cpp index 5411a8b..d602a96 100644 --- a/source/globals.cpp +++ b/source/globals.cpp @@ -1,7 +1,15 @@ #include "globals.h" + +#include "plugin/FunctionData.h" +#include "plugin/HookData.h" +#include "plugin/PluginConfigData.h" #include "plugin/PluginContainer.h" #include "plugin/PluginData.h" +#include "plugin/PluginLinkInformation.h" #include "plugin/PluginLoadWrapper.h" +#include "plugin/RelocationData.h" +#include "plugin/SectionInfo.h" + StoredBuffer gStoredTVBuffer = {}; StoredBuffer gStoredDRCBuffer = {}; diff --git a/source/globals.h b/source/globals.h index 299cd7f..19e36b1 100644 --- a/source/globals.h +++ b/source/globals.h @@ -2,13 +2,16 @@ #include "utils/config/ConfigDefines.h" #include "version.h" + +#include + #include #include + #include #include #include #include -#include #define MODULE_VERSION "v0.3.5" #define MODULE_VERSION_FULL MODULE_VERSION MODULE_VERSION_EXTRA diff --git a/source/hooks.cpp b/source/hooks.cpp index 477d9af..9a0f32c 100644 --- a/source/hooks.cpp +++ b/source/hooks.cpp @@ -1,15 +1,20 @@ #include "hooks.h" + +#include "plugin/HookData.h" +#include "plugin/PluginConfigData.h" #include "plugin/PluginContainer.h" +#include "plugin/PluginData.h" #include "utils/StorageUtilsDeprecated.h" #include "utils/buttoncombo/ButtonComboUtils.h" #include "utils/logger.h" #include "utils/storage/StorageUtils.h" -#include #include #include #include +#include + static const char **hook_names = (const char *[]){ "WUPS_LOADER_HOOK_INIT_WUT_MALLOC", "WUPS_LOADER_HOOK_FINI_WUT_MALLOC", diff --git a/source/hooks.h b/source/hooks.h index 8ce5297..87d9bc5 100644 --- a/source/hooks.h +++ b/source/hooks.h @@ -1,10 +1,11 @@ #pragma once -#include "plugin/PluginContainer.h" +#include #include #include -#include + +class PluginContainer; void CallHook(const std::vector &plugins, wups_loader_hook_type_t hook_type, const std::function &pred); diff --git a/source/main.cpp b/source/main.cpp index bdda1b0..7cb81a8 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,22 +1,34 @@ #include "PluginManagement.h" -#include "coreinit/interrupts.h" -#include "coreinit/scheduler.h" #include "globals.h" #include "hooks.h" #include "patcher/hooks_patcher_static.h" +#include "plugin/FunctionData.h" +#include "plugin/HookData.h" +#include "plugin/PluginConfigData.h" +#include "plugin/PluginContainer.h" +#include "plugin/PluginData.h" #include "plugin/PluginDataFactory.h" +#include "plugin/PluginLoadWrapper.h" +#include "plugin/RelocationData.h" +#include "plugin/SectionInfo.h" #include "utils/DrawUtils.h" #include "utils/WUPSBackendSettings.h" #include "utils/input/VPADInput.h" #include "utils/logger.h" #include "utils/utils.h" -#include "version.h" #include -#include +#include +#include #include -#include -#include + +#include +#include + +#include +#include + +#include WUMS_MODULE_EXPORT_NAME("homebrew_wupsbackend"); WUMS_USE_WUT_DEVOPTAB(); diff --git a/source/patcher/hooks_patcher_static.cpp b/source/patcher/hooks_patcher_static.cpp index bc0ced4..7cce514 100644 --- a/source/patcher/hooks_patcher_static.cpp +++ b/source/patcher/hooks_patcher_static.cpp @@ -1,11 +1,15 @@ #include "hooks_patcher_static.h" #include "globals.h" +#include "hooks.h" +#include "plugin/PluginConfigData.h" +#include "plugin/PluginContainer.h" +#include "plugin/PluginData.h" +#include "plugin/SectionInfo.h" #include "utils/config/ConfigUtils.h" #include #include -#include #include #include diff --git a/source/patcher/hooks_patcher_static.h b/source/patcher/hooks_patcher_static.h index 9ca5579..f15d07f 100644 --- a/source/patcher/hooks_patcher_static.h +++ b/source/patcher/hooks_patcher_static.h @@ -2,6 +2,8 @@ #include +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/source/plugin/ButtonComboManager.cpp b/source/plugin/ButtonComboManager.cpp index 6fd4f14..9590776 100644 --- a/source/plugin/ButtonComboManager.cpp +++ b/source/plugin/ButtonComboManager.cpp @@ -1,7 +1,9 @@ #include "ButtonComboManager.h" +#include "utils/logger.h" +#include "utils/utils.h" + #include -#include -#include + #include namespace { diff --git a/source/plugin/ButtonComboManager.h b/source/plugin/ButtonComboManager.h index f700017..8bd50ff 100644 --- a/source/plugin/ButtonComboManager.h +++ b/source/plugin/ButtonComboManager.h @@ -1,11 +1,14 @@ #pragma once #include -#include + +#include + #include #include #include -#include + +#include class ButtonComboWrapper; diff --git a/source/plugin/FunctionData.cpp b/source/plugin/FunctionData.cpp index b26de92..6aacd0b 100644 --- a/source/plugin/FunctionData.cpp +++ b/source/plugin/FunctionData.cpp @@ -2,6 +2,7 @@ #include "utils/logger.h" #include + #include FunctionData::FunctionData(void *paddress, void *vaddress, diff --git a/source/plugin/FunctionData.h b/source/plugin/FunctionData.h index 82f39d8..fb89fc9 100644 --- a/source/plugin/FunctionData.h +++ b/source/plugin/FunctionData.h @@ -17,6 +17,7 @@ #pragma once #include + #include class FunctionData { diff --git a/source/plugin/FunctionSymbolData.h b/source/plugin/FunctionSymbolData.h index e6270be..4b03d37 100644 --- a/source/plugin/FunctionSymbolData.h +++ b/source/plugin/FunctionSymbolData.h @@ -17,9 +17,10 @@ #pragma once -#include #include +#include + class FunctionSymbolData { public: diff --git a/source/plugin/PluginConfigData.cpp b/source/plugin/PluginConfigData.cpp index 60b5dd6..6762a02 100644 --- a/source/plugin/PluginConfigData.cpp +++ b/source/plugin/PluginConfigData.cpp @@ -1,6 +1,6 @@ #include "PluginConfigData.h" - -#include +#include "config/WUPSConfigAPI.h" +#include "plugin/PluginData.h" PluginConfigData::PluginConfigData(const std::string_view name, const WUPSConfigAPI_MenuOpenedCallback openedCallback, diff --git a/source/plugin/PluginConfigData.h b/source/plugin/PluginConfigData.h index fcedca0..1e21290 100644 --- a/source/plugin/PluginConfigData.h +++ b/source/plugin/PluginConfigData.h @@ -1,9 +1,10 @@ #pragma once +#include +#include + #include #include -#include -#include class PluginConfigData { public: diff --git a/source/plugin/PluginContainer.cpp b/source/plugin/PluginContainer.cpp index 0f926b3..7dc0951 100644 --- a/source/plugin/PluginContainer.cpp +++ b/source/plugin/PluginContainer.cpp @@ -1,7 +1,15 @@ #include "PluginContainer.h" +#include "plugin/FunctionData.h" +#include "plugin/HookData.h" +#include "plugin/PluginConfigData.h" +#include "plugin/PluginData.h" +#include "plugin/PluginLinkInformation.h" +#include "plugin/RelocationData.h" +#include "plugin/SectionInfo.h" +#include "utils/buttoncombo/ButtonComboUtils.h" #include "utils/storage/StorageUtils.h" -#include +#include PluginContainer::PluginContainer(PluginMetaInformation metaInformation, PluginLinkInformation pluginLinkInformation, std::shared_ptr pluginData) : mMetaInformation(std::move(metaInformation)), diff --git a/source/plugin/PluginContainer.h b/source/plugin/PluginContainer.h index df25217..3aa3a4f 100644 --- a/source/plugin/PluginContainer.h +++ b/source/plugin/PluginContainer.h @@ -18,13 +18,15 @@ #pragma once #include "PluginConfigData.h" -#include "PluginData.h" #include "PluginLinkInformation.h" #include "PluginMetaInformation.h" +#include + #include #include -#include + +class PluginData; class PluginContainer { public: diff --git a/source/plugin/PluginData.h b/source/plugin/PluginData.h index 6dcb65b..0e9df01 100644 --- a/source/plugin/PluginData.h +++ b/source/plugin/PluginData.h @@ -17,12 +17,13 @@ #pragma once -#include #include #include #include #include +#include + class PluginData { public: explicit PluginData(std::vector &&buffer, std::string_view source); diff --git a/source/plugin/PluginDataFactory.cpp b/source/plugin/PluginDataFactory.cpp index e5b1d17..3814f71 100644 --- a/source/plugin/PluginDataFactory.cpp +++ b/source/plugin/PluginDataFactory.cpp @@ -17,6 +17,7 @@ #include "PluginDataFactory.h" #include "NotificationsUtils.h" +#include "PluginData.h" #include "PluginLoadWrapper.h" #include "fs/FSUtils.h" #include "utils/StringTools.h" @@ -24,6 +25,7 @@ #include #include + #include std::vector PluginDataFactory::loadDir(const std::string_view path, const std::set &inactivePluginsFilenames) { diff --git a/source/plugin/PluginDataFactory.h b/source/plugin/PluginDataFactory.h index 97fc999..86fcf60 100644 --- a/source/plugin/PluginDataFactory.h +++ b/source/plugin/PluginDataFactory.h @@ -16,13 +16,14 @@ ****************************************************************************/ #pragma once -#include "PluginData.h" -#include "PluginLoadWrapper.h" #include #include #include +class PluginData; +class PluginLoadWrapper; + class PluginDataFactory { public: static std::vector loadDir(std::string_view path, const std::set &inactivePluginsFilenames); diff --git a/source/plugin/PluginLinkInformation.cpp b/source/plugin/PluginLinkInformation.cpp index fd62f8d..0ff18ba 100644 --- a/source/plugin/PluginLinkInformation.cpp +++ b/source/plugin/PluginLinkInformation.cpp @@ -1,5 +1,10 @@ #include "PluginLinkInformation.h" +#include "FunctionData.h" +#include "HookData.h" +#include "RelocationData.h" +#include "SectionInfo.h" + PluginLinkInformation::PluginLinkInformation(PluginLinkInformation &&src) : mHookDataList(std::move(src.mHookDataList)), mFunctionDataList(std::move(src.mFunctionDataList)), mRelocationDataList(std::move(src.mRelocationDataList)), @@ -13,7 +18,7 @@ PluginLinkInformation::PluginLinkInformation(PluginLinkInformation &&src) : mHoo src.mTrampolineId = {}; } -PluginLinkInformation &PluginLinkInformation::operator=(PluginLinkInformation &&src) { +PluginLinkInformation &PluginLinkInformation::operator=(PluginLinkInformation &&src) noexcept { if (this != &src) { this->mHookDataList = std::move(src.mHookDataList); this->mFunctionDataList = std::move(src.mFunctionDataList); diff --git a/source/plugin/PluginLinkInformation.h b/source/plugin/PluginLinkInformation.h index f38bce3..0d948c3 100644 --- a/source/plugin/PluginLinkInformation.h +++ b/source/plugin/PluginLinkInformation.h @@ -17,19 +17,20 @@ #pragma once -#include "FunctionData.h" #include "FunctionSymbolData.h" -#include "HookData.h" -#include "RelocationData.h" -#include "SectionInfo.h" #include "utils/HeapMemoryFixedSize.h" -#include + #include #include #include -#include #include +class HeapMemoryFixedSize; +class SectionInfo; +class RelocationData; +class FunctionData; +class HookData; + struct FunctionSymbolDataComparator { bool operator()(const FunctionSymbolData &lhs, const FunctionSymbolData &rhs) const { @@ -45,7 +46,7 @@ public: PluginLinkInformation(PluginLinkInformation &&src) noexcept; - PluginLinkInformation &operator=(PluginLinkInformation &&src); + PluginLinkInformation &operator=(PluginLinkInformation &&src) noexcept; [[nodiscard]] const std::vector &getHookDataList() const; diff --git a/source/plugin/PluginLinkInformationFactory.cpp b/source/plugin/PluginLinkInformationFactory.cpp index 73eb784..f4ebc5e 100644 --- a/source/plugin/PluginLinkInformationFactory.cpp +++ b/source/plugin/PluginLinkInformationFactory.cpp @@ -16,14 +16,23 @@ ****************************************************************************/ #include "PluginLinkInformationFactory.h" + +#include "FunctionData.h" +#include "HookData.h" +#include "PluginData.h" +#include "PluginLinkInformation.h" +#include "RelocationData.h" +#include "SectionInfo.h" #include "utils/ElfUtils.h" +#include "utils/HeapMemoryFixedSize.h" #include "utils/logger.h" #include "utils/utils.h" #include "utils/wiiu_zlib.hpp" -#include #include +#include + using namespace ELFIO; std::optional diff --git a/source/plugin/PluginLinkInformationFactory.h b/source/plugin/PluginLinkInformationFactory.h index 022b0b3..7f9cbe3 100644 --- a/source/plugin/PluginLinkInformationFactory.h +++ b/source/plugin/PluginLinkInformationFactory.h @@ -16,12 +16,16 @@ ****************************************************************************/ #pragma once -#include "PluginData.h" -#include "PluginLinkInformation.h" + +#include #include + #include -#include +#include + +class PluginData; +class PluginLinkInformation; class PluginLinkInformationFactory { public: diff --git a/source/plugin/PluginLoadWrapper.h b/source/plugin/PluginLoadWrapper.h index 3ac3ec4..879a148 100644 --- a/source/plugin/PluginLoadWrapper.h +++ b/source/plugin/PluginLoadWrapper.h @@ -1,7 +1,9 @@ #pragma once -#include "PluginData.h" + #include +class PluginData; + class PluginLoadWrapper { public: PluginLoadWrapper(std::shared_ptr pluginData, const bool linkAndLoad) : mPluginData(std::move(pluginData)), mIsLoadAndLink(linkAndLoad) { diff --git a/source/plugin/PluginMetaInformation.cpp b/source/plugin/PluginMetaInformation.cpp index 5f05cea..fd87657 100644 --- a/source/plugin/PluginMetaInformation.cpp +++ b/source/plugin/PluginMetaInformation.cpp @@ -1,5 +1,7 @@ #include "PluginMetaInformation.h" +#include + [[nodiscard]] const std::string &PluginMetaInformation::getName() const { return mName; } diff --git a/source/plugin/PluginMetaInformation.h b/source/plugin/PluginMetaInformation.h index 96ebcfd..a5764f1 100644 --- a/source/plugin/PluginMetaInformation.h +++ b/source/plugin/PluginMetaInformation.h @@ -18,8 +18,13 @@ #pragma once #include "WUPSVersion.h" + #include +#include + +class WUPSVersion; + class PluginMetaInformation { public: [[nodiscard]] const std::string &getName() const; diff --git a/source/plugin/PluginMetaInformationFactory.cpp b/source/plugin/PluginMetaInformationFactory.cpp index b3b67a3..c577ee9 100644 --- a/source/plugin/PluginMetaInformationFactory.cpp +++ b/source/plugin/PluginMetaInformationFactory.cpp @@ -19,11 +19,11 @@ #include "PluginData.h" #include "PluginMetaInformation.h" +#include "elfio/elfio.hpp" #include "fs/FSUtils.h" #include "utils/logger.h" #include "utils/wiiu_zlib.hpp" -#include #include std::optional PluginMetaInformationFactory::loadPlugin(const PluginData &pluginData, PluginParseErrors &error) { diff --git a/source/plugin/PluginMetaInformationFactory.h b/source/plugin/PluginMetaInformationFactory.h index 06c037b..f44f1e9 100644 --- a/source/plugin/PluginMetaInformationFactory.h +++ b/source/plugin/PluginMetaInformationFactory.h @@ -17,13 +17,15 @@ #pragma once -#include "PluginData.h" -#include "PluginMetaInformation.h" - #include #include #include +#include + +class PluginData; +class PluginMetaInformation; + enum PluginParseErrors { PLUGIN_PARSE_ERROR_NONE, PLUGIN_PARSE_ERROR_UNKNOWN, diff --git a/source/plugin/RelocationData.h b/source/plugin/RelocationData.h index fb054d4..36edb30 100644 --- a/source/plugin/RelocationData.h +++ b/source/plugin/RelocationData.h @@ -18,10 +18,12 @@ #pragma once #include "ImportRPLInformation.h" -#include + #include #include +#include + class RelocationData { public: diff --git a/source/plugin/SectionInfo.h b/source/plugin/SectionInfo.h index e6226fe..13fae4f 100644 --- a/source/plugin/SectionInfo.h +++ b/source/plugin/SectionInfo.h @@ -17,9 +17,10 @@ #pragma once -#include #include +#include + class SectionInfo { public: diff --git a/source/plugin/WUPSVersion.h b/source/plugin/WUPSVersion.h index b8e0b57..7e162ec 100644 --- a/source/plugin/WUPSVersion.h +++ b/source/plugin/WUPSVersion.h @@ -1,7 +1,10 @@ -#include +#pragma once + #include #include +#include + class WUPSVersion { public: WUPSVersion(int major, int minor, int revision); diff --git a/source/utils/DrawUtils.cpp b/source/utils/DrawUtils.cpp index 12a9c1f..6ea74cb 100644 --- a/source/utils/DrawUtils.cpp +++ b/source/utils/DrawUtils.cpp @@ -4,14 +4,18 @@ #include "globals.h" #include "logger.h" #include "utils.h" + +#include + +#include + #include #include #include #include -#include -#include #include -#include + +#include // buffer width #define DRC_WIDTH 0x380 diff --git a/source/utils/DrawUtils.h b/source/utils/DrawUtils.h index 22055fb..f9179d5 100644 --- a/source/utils/DrawUtils.h +++ b/source/utils/DrawUtils.h @@ -1,9 +1,11 @@ #pragma once #include "schrift.h" -#include + #include +#include + // visible screen sizes #define SCREEN_WIDTH 854 #define SCREEN_HEIGHT 480 diff --git a/source/utils/ElfUtils.h b/source/utils/ElfUtils.h index cbe6575..9f20286 100644 --- a/source/utils/ElfUtils.h +++ b/source/utils/ElfUtils.h @@ -1,8 +1,9 @@ #pragma once -#include #include +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/source/utils/HeapMemoryFixedSize.cpp b/source/utils/HeapMemoryFixedSize.cpp index b9de681..b730e11 100644 --- a/source/utils/HeapMemoryFixedSize.cpp +++ b/source/utils/HeapMemoryFixedSize.cpp @@ -1,4 +1,5 @@ #include "HeapMemoryFixedSize.h" + #include "utils.h" HeapMemoryFixedSize::HeapMemoryFixedSize() = default; diff --git a/source/utils/HeapMemoryFixedSize.h b/source/utils/HeapMemoryFixedSize.h index 33bd10e..715fca8 100644 --- a/source/utils/HeapMemoryFixedSize.h +++ b/source/utils/HeapMemoryFixedSize.h @@ -1,8 +1,9 @@ #pragma once -#include #include +#include + class HeapMemoryFixedSize { public: HeapMemoryFixedSize(); diff --git a/source/utils/StorageUtilsDeprecated.h b/source/utils/StorageUtilsDeprecated.h index 76f884c..3c46ee1 100644 --- a/source/utils/StorageUtilsDeprecated.h +++ b/source/utils/StorageUtilsDeprecated.h @@ -1,4 +1,5 @@ #pragma once + #include namespace WUPSStorageDeprecated { diff --git a/source/utils/StringTools.cpp b/source/utils/StringTools.cpp index ebef73c..021b256 100644 --- a/source/utils/StringTools.cpp +++ b/source/utils/StringTools.cpp @@ -25,9 +25,10 @@ ***************************************************************************/ #include "StringTools.h" -#include + #include -#include + +#include std::string StringTools::truncate(const std::string &str, const size_t width, const bool show_ellipsis) { if (str.length() > width - 3) { diff --git a/source/utils/StringTools.h b/source/utils/StringTools.h index 3c5db90..013ad31 100644 --- a/source/utils/StringTools.h +++ b/source/utils/StringTools.h @@ -27,7 +27,9 @@ #include "logger.h" #include "utils.h" + #include + #include #include diff --git a/source/utils/WUPSBackendSettings.cpp b/source/utils/WUPSBackendSettings.cpp index b3e8b84..9a39b15 100644 --- a/source/utils/WUPSBackendSettings.cpp +++ b/source/utils/WUPSBackendSettings.cpp @@ -1,9 +1,10 @@ #include "WUPSBackendSettings.h" + #include "fs/CFile.hpp" #include "fs/FSUtils.h" #include "utils/logger.h" #include "utils/utils.h" -#include + #include #include diff --git a/source/utils/WUPSBackendSettings.h b/source/utils/WUPSBackendSettings.h index 6438d1d..842c50a 100644 --- a/source/utils/WUPSBackendSettings.h +++ b/source/utils/WUPSBackendSettings.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include namespace WUPSBackendSettings { diff --git a/source/utils/buttoncombo/ButtonComboUtils.cpp b/source/utils/buttoncombo/ButtonComboUtils.cpp index a0a43e0..50f8a14 100644 --- a/source/utils/buttoncombo/ButtonComboUtils.cpp +++ b/source/utils/buttoncombo/ButtonComboUtils.cpp @@ -1,11 +1,12 @@ #include "ButtonComboUtils.h" +#include "plugin/ButtonComboManager.h" +#include "plugin/PluginContainer.h" +#include "utils/logger.h" +#include "utils/utils.h" + #include #include -#include -#include -#include -#include namespace ButtonComboUtils::API { static std::forward_list sButtonComboManager; @@ -118,7 +119,7 @@ namespace ButtonComboUtils::API { WUPSButtonCombo_Error UpdateButtonCombo(void *identifier, const WUPSButtonCombo_ComboHandle handle, - WUPSButtonCombo_Buttons combo, + const WUPSButtonCombo_Buttons combo, WUPSButtonCombo_ComboStatus *outStatus) { WUPSButtonCombo_ComboStatus tmpStatus; const auto res = ExecuteForIdentifierLocked(identifier, diff --git a/source/utils/buttoncombo/ButtonComboUtils.h b/source/utils/buttoncombo/ButtonComboUtils.h index 0b3467a..c46cb6e 100644 --- a/source/utils/buttoncombo/ButtonComboUtils.h +++ b/source/utils/buttoncombo/ButtonComboUtils.h @@ -2,6 +2,8 @@ #include +#include + namespace ButtonComboUtils::API { namespace Internal { uint32_t CreateButtonComboData(); diff --git a/source/utils/config/CategoryRenderer.cpp b/source/utils/config/CategoryRenderer.cpp index 25991c9..3d9a41a 100644 --- a/source/utils/config/CategoryRenderer.cpp +++ b/source/utils/config/CategoryRenderer.cpp @@ -1,11 +1,21 @@ #include "CategoryRenderer.h" + +#include "ConfigDefines.h" #include "ConfigRendererItem.h" #include "ConfigRendererItemCategory.h" +#include "ConfigRendererItemGeneric.h" #include "ConfigUtils.h" #include "utils/DrawUtils.h" #include "utils/StringTools.h" +#include "utils/input/Input.h" #include "utils/logger.h" -#include "utils/utils.h" + +#include + +#include + +#include +#include CategoryRenderer::CategoryRenderer(const GeneralConfigInformation *info, const WUPSConfigAPIBackend::WUPSConfigCategory *cat, const bool isRoot) : mInfo(info), mCat(cat), mIsRoot(isRoot) { diff --git a/source/utils/config/CategoryRenderer.h b/source/utils/config/CategoryRenderer.h index e67a09d..5327db1 100644 --- a/source/utils/config/CategoryRenderer.h +++ b/source/utils/config/CategoryRenderer.h @@ -2,14 +2,21 @@ #include "ConfigDefines.h" #include "ConfigDisplayItem.h" -#include "ConfigRendererItemGeneric.h" -#include "config/WUPSConfigCategory.h" -#include "utils/input/Input.h" -#include +#include + #include #include +#include + +namespace WUPSConfigAPIBackend { + class WUPSConfigCategory; +} + +class Input; +class ConfigRendererItemGeneric; + class CategoryRenderer { public: @@ -45,9 +52,9 @@ private: const GeneralConfigInformation *mInfo = {}; const WUPSConfigAPIBackend::WUPSConfigCategory *mCat = {}; - std::vector> mItemRenderer = {}; - bool mIsItemMovementAllowed = true; - bool mFirstFrame = true; - bool mIsRoot = false; - bool mNeedsRedraw = true; + std::vector> mItemRenderer; + bool mIsItemMovementAllowed = true; + bool mFirstFrame = true; + bool mIsRoot = false; + bool mNeedsRedraw = true; }; diff --git a/source/utils/config/ConfigDefines.h b/source/utils/config/ConfigDefines.h index a702632..28f362b 100644 --- a/source/utils/config/ConfigDefines.h +++ b/source/utils/config/ConfigDefines.h @@ -1,8 +1,9 @@ #pragma once -#include #include +#include + #define MAX_BUTTONS_ON_SCREEN 8 struct StoredBuffer { diff --git a/source/utils/config/ConfigDisplayItem.cpp b/source/utils/config/ConfigDisplayItem.cpp index 1869f09..126d257 100644 --- a/source/utils/config/ConfigDisplayItem.cpp +++ b/source/utils/config/ConfigDisplayItem.cpp @@ -1,6 +1,11 @@ #include "ConfigDisplayItem.h" + #include "config/WUPSConfig.h" +#include + +#include + ConfigDisplayItem::ConfigDisplayItem(GeneralConfigInformation &info, std::unique_ptr config, const bool isActive) : mConfig(std::move(config)), diff --git a/source/utils/config/ConfigDisplayItem.h b/source/utils/config/ConfigDisplayItem.h index 28913f6..acc286b 100644 --- a/source/utils/config/ConfigDisplayItem.h +++ b/source/utils/config/ConfigDisplayItem.h @@ -2,6 +2,7 @@ #include "config/WUPSConfig.h" #include "plugin/PluginData.h" + #include #include diff --git a/source/utils/config/ConfigRenderer.cpp b/source/utils/config/ConfigRenderer.cpp index 670a4c0..c29280c 100644 --- a/source/utils/config/ConfigRenderer.cpp +++ b/source/utils/config/ConfigRenderer.cpp @@ -1,19 +1,25 @@ #include "ConfigRenderer.h" + +#include "CategoryRenderer.h" +#include "ConfigDisplayItem.h" +#include "config/WUPSConfigItem.h" #include "globals.h" #include "plugin/PluginLoadWrapper.h" #include "utils/DrawUtils.h" #include "utils/StringTools.h" +#include "utils/input/Input.h" #include "utils/logger.h" -#include "utils/utils.h" + +#include ConfigRenderer::ConfigRenderer(std::vector &&vec) : mConfigs(std::move(vec)) { - std::copy(mConfigs.begin(), mConfigs.end(), - std::back_inserter(mAllConfigs)); - std::copy_if(mConfigs.begin(), mConfigs.end(), - std::back_inserter(mActiveConfigs), - [&](const auto &value) { - return value.isActivePlugin(); - }); + std::ranges::copy(mConfigs, + std::back_inserter(mAllConfigs)); + std::ranges::copy_if(mConfigs, + std::back_inserter(mActiveConfigs), + [&](const auto &value) { + return value.isActivePlugin(); + }); } ConfigRenderer::~ConfigRenderer() = default; @@ -205,7 +211,7 @@ void ConfigRenderer::RenderStateMain() const { auto countInactivePlugins = mAllConfigs.size() - mActiveConfigs.size(); if (countInactivePlugins > 0) { DrawUtils::setFontSize(14); - std::string plugin_unloaded = string_format("Found %d inactive plugins", countInactivePlugins); + const std::string plugin_unloaded = string_format("Found %d inactive plugins", countInactivePlugins); DrawUtils::print(SCREEN_WIDTH - 16 - DrawUtils::getTextWidth(MODULE_VERSION_FULL) - 32, 8 + 24, plugin_unloaded.c_str(), true); } } diff --git a/source/utils/config/ConfigRenderer.h b/source/utils/config/ConfigRenderer.h index 14881a7..1600e85 100644 --- a/source/utils/config/ConfigRenderer.h +++ b/source/utils/config/ConfigRenderer.h @@ -1,17 +1,23 @@ #pragma once -#include "CategoryRenderer.h" #include "ConfigDefines.h" #include "ConfigDisplayItem.h" -#include "plugin/PluginLoadWrapper.h" -#include "utils/input/Input.h" -#include -#include -#include -#include #include +#include +#include + +#include + +namespace WUPSConfigAPIBackend { + class WUPSConfig; + class WUPSConfigCategory; +} // namespace WUPSConfigAPIBackend +class PluginLoadWrapper; +class Input; +class CategoryRenderer; +class ConfigDisplayItem; class ConfigRenderer { public: @@ -39,7 +45,7 @@ private: void CallOnCloseCallback(const GeneralConfigInformation &info, const std::vector> &categories); void CallOnCloseCallback(const GeneralConfigInformation &info, const WUPSConfigAPIBackend::WUPSConfig &config); - const std::vector> &GetConfigList() const; + [[nodiscard]] const std::vector> &GetConfigList() const; enum State { STATE_MAIN = 0, @@ -49,7 +55,7 @@ private: std::vector mConfigs; std::vector> mAllConfigs; std::vector> mActiveConfigs; - std::unique_ptr mCategoryRenderer = {}; + std::unique_ptr mCategoryRenderer; State mState = STATE_MAIN; diff --git a/source/utils/config/ConfigRendererItem.cpp b/source/utils/config/ConfigRendererItem.cpp index 7068a70..9fd8a3b 100644 --- a/source/utils/config/ConfigRendererItem.cpp +++ b/source/utils/config/ConfigRendererItem.cpp @@ -1,5 +1,8 @@ #include "ConfigRendererItem.h" + #include "utils/DrawUtils.h" +#include + #include ConfigRendererItem::ConfigRendererItem(const WUPSConfigAPIBackend::WUPSConfigItem *item) : mItem(item) { diff --git a/source/utils/config/ConfigRendererItem.h b/source/utils/config/ConfigRendererItem.h index 284568b..1055f86 100644 --- a/source/utils/config/ConfigRendererItem.h +++ b/source/utils/config/ConfigRendererItem.h @@ -1,11 +1,14 @@ #pragma once #include "ConfigRendererItemGeneric.h" -#include "config/WUPSConfigItem.h" + +#include #include -#include -#include + +namespace WUPSConfigAPIBackend { + class WUPSConfigItem; +} class ConfigRendererItem final : public ConfigRendererItemGeneric { public: diff --git a/source/utils/config/ConfigRendererItemCategory.h b/source/utils/config/ConfigRendererItemCategory.h index fedab80..1896752 100644 --- a/source/utils/config/ConfigRendererItemCategory.h +++ b/source/utils/config/ConfigRendererItemCategory.h @@ -1,6 +1,8 @@ #pragma once -#include "ConfigRendererItemGeneric.h" -#include "config/WUPSConfigCategory.h" + +//#include "ConfigRendererItemGeneric.h" +//#include "config/WUPSConfigCategory.h" + #include class ConfigRendererItemCategory final : public ConfigRendererItemGeneric { diff --git a/source/utils/config/ConfigRendererItemGeneric.cpp b/source/utils/config/ConfigRendererItemGeneric.cpp index 7f2e5ec..1e70443 100644 --- a/source/utils/config/ConfigRendererItemGeneric.cpp +++ b/source/utils/config/ConfigRendererItemGeneric.cpp @@ -1,8 +1,10 @@ #include "ConfigRendererItemGeneric.h" -#include "ConfigDefines.h" #include "utils/DrawUtils.h" +#include +#include + ConfigRendererItemGeneric::~ConfigRendererItemGeneric() = default; void ConfigRendererItemGeneric::drawGenericBoxAndText(const uint32_t yOffset, const std::string &displayName, const bool isHighlighted) const { diff --git a/source/utils/config/ConfigRendererItemGeneric.h b/source/utils/config/ConfigRendererItemGeneric.h index 0e86fa1..993be4f 100644 --- a/source/utils/config/ConfigRendererItemGeneric.h +++ b/source/utils/config/ConfigRendererItemGeneric.h @@ -1,9 +1,11 @@ #pragma once -#include -#include #include +#include + +#include + class ConfigRendererItemGeneric { public: virtual ~ConfigRendererItemGeneric(); diff --git a/source/utils/config/ConfigUtils.cpp b/source/utils/config/ConfigUtils.cpp index d9af0f7..c644203 100644 --- a/source/utils/config/ConfigUtils.cpp +++ b/source/utils/config/ConfigUtils.cpp @@ -1,26 +1,31 @@ #include "ConfigUtils.h" + +#include "ConfigDisplayItem.h" #include "ConfigRenderer.h" #include "config/WUPSConfigAPI.h" +#include "globals.h" #include "hooks.h" +#include "plugin/HookData.h" +#include "plugin/PluginContainer.h" #include "plugin/PluginLoadWrapper.h" #include "utils/DrawUtils.h" #include "utils/WUPSBackendSettings.h" -#include "utils/dc.h" #include "utils/input/CombinedInput.h" #include "utils/input/Input.h" #include "utils/input/VPADInput.h" #include "utils/input/WPADInput.h" #include "utils/logger.h" #include "utils/utils.h" -#include "version.h" -#include -#include -#include -#include -#include -#include #include +#include + +#include +#include + +#include +#include +#include WUPS_CONFIG_SIMPLE_INPUT ConfigUtils::convertInputs(const uint32_t buttons) { WUPSConfigButtons pressedButtons = WUPS_CONFIG_BUTTON_NONE; diff --git a/source/utils/config/ConfigUtils.h b/source/utils/config/ConfigUtils.h index b4ab82b..4a5dad5 100644 --- a/source/utils/config/ConfigUtils.h +++ b/source/utils/config/ConfigUtils.h @@ -1,9 +1,11 @@ #pragma once -#include -#include #include +#include + +#include + #define MOVE_ITEM_INPUT_MASK (WUPS_CONFIG_BUTTON_B | WUPS_CONFIG_BUTTON_DOWN | WUPS_CONFIG_BUTTON_UP) class ConfigUtils { diff --git a/source/utils/exports.cpp b/source/utils/exports.cpp index b1e557d..08dcd47 100644 --- a/source/utils/exports.cpp +++ b/source/utils/exports.cpp @@ -3,14 +3,17 @@ #include "plugin/PluginContainer.h" #include "plugin/PluginData.h" #include "plugin/PluginDataFactory.h" +#include "plugin/PluginLoadWrapper.h" #include "plugin/PluginMetaInformation.h" #include "plugin/PluginMetaInformationFactory.h" +#include "plugin/SectionInfo.h" #include "utils.h" -#include #include #include +#include + static void fillPluginInformation(wups_backend_plugin_information *out, const PluginMetaInformation &metaInformation) { out->plugin_information_version = WUPS_BACKEND_PLUGIN_INFORMATION_VERSION; strncpy(out->author, metaInformation.getAuthor().c_str(), sizeof(out->author) - 1); diff --git a/source/utils/input/CombinedInput.h b/source/utils/input/CombinedInput.h index f99064b..9e652de 100644 --- a/source/utils/input/CombinedInput.h +++ b/source/utils/input/CombinedInput.h @@ -1,5 +1,6 @@ #pragma once #include "Input.h" + class CombinedInput final : public Input { public: void combine(const Input &b) { diff --git a/source/utils/input/WPADInput.h b/source/utils/input/WPADInput.h index a303803..19f4278 100644 --- a/source/utils/input/WPADInput.h +++ b/source/utils/input/WPADInput.h @@ -17,6 +17,7 @@ ****************************************************************************/ #include "Input.h" + #include #include diff --git a/source/utils/storage/StorageItem.h b/source/utils/storage/StorageItem.h index e681d63..eb858be 100644 --- a/source/utils/storage/StorageItem.h +++ b/source/utils/storage/StorageItem.h @@ -1,10 +1,11 @@ #pragma once -#include + #include #include #include #include +#include enum class StorageItemType { None, Boolean, diff --git a/source/utils/storage/StorageItemRoot.h b/source/utils/storage/StorageItemRoot.h index 52fbb33..f8ec6bc 100644 --- a/source/utils/storage/StorageItemRoot.h +++ b/source/utils/storage/StorageItemRoot.h @@ -1,6 +1,7 @@ #pragma once #include "StorageSubItem.h" + #include class StorageItemRoot : public StorageSubItem { diff --git a/source/utils/storage/StorageSubItem.cpp b/source/utils/storage/StorageSubItem.cpp index bb3ea0f..d5ec048 100644 --- a/source/utils/storage/StorageSubItem.cpp +++ b/source/utils/storage/StorageSubItem.cpp @@ -1,6 +1,6 @@ #include "StorageSubItem.h" -#include +#include "utils/utils.h" StorageSubItem::StorageSubItem(const std::string_view key) : StorageItem(key) { } diff --git a/source/utils/storage/StorageSubItem.h b/source/utils/storage/StorageSubItem.h index 7188b3b..53304b8 100644 --- a/source/utils/storage/StorageSubItem.h +++ b/source/utils/storage/StorageSubItem.h @@ -2,10 +2,11 @@ #include "StorageItem.h" +#include + #include #include #include -#include class StorageSubItem : public StorageItem { public: diff --git a/source/utils/storage/StorageUtils.cpp b/source/utils/storage/StorageUtils.cpp index 59b68de..3450923 100644 --- a/source/utils/storage/StorageUtils.cpp +++ b/source/utils/storage/StorageUtils.cpp @@ -1,6 +1,6 @@ -#include "StorageItem.h" +#include "StorageUtils.h" + #include "StorageItemRoot.h" -#include "StorageSubItem.h" #include "fs/CFile.hpp" #include "fs/FSUtils.h" #include "utils/base64.h" @@ -9,9 +9,9 @@ #include "utils/utils.h" #include -#include #include -#include + +#include namespace StorageUtils { std::forward_list gStorage; diff --git a/source/utils/storage/StorageUtils.h b/source/utils/storage/StorageUtils.h index 9dc51c2..995fd25 100644 --- a/source/utils/storage/StorageUtils.h +++ b/source/utils/storage/StorageUtils.h @@ -1,9 +1,11 @@ #pragma once -#include -#include #include +#include + +#include + namespace StorageUtils::API { namespace Internal { WUPSStorageError OpenStorage(std::string_view plugin_id, wups_storage_root_item &outItem); diff --git a/source/utils/utils.cpp b/source/utils/utils.cpp index 8f3a80b..4b6b0f5 100644 --- a/source/utils/utils.cpp +++ b/source/utils/utils.cpp @@ -6,13 +6,16 @@ #include "json.hpp" #include "logger.h" -#include #include -#include -#include -#include + #include +#include +#include + +#include +#include + static std::string sPluginPath; static std::string sModulePath; static std::string sEnvironmentPath; diff --git a/source/utils/utils.h b/source/utils/utils.h index dafdd3d..d801977 100644 --- a/source/utils/utils.h +++ b/source/utils/utils.h @@ -1,15 +1,18 @@ #pragma once #include "json.hpp" -#include + #include -#include + +#include #include #include #include #include #include +#include + #ifdef __cplusplus extern "C" { #endif