From 2cd78297274e1173d64f8f6e78383bfd6da88c7e Mon Sep 17 00:00:00 2001 From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:13:52 +0200 Subject: Define `fs` alias in source file where used (#747) for filesystem namespace instead of relying on implicit include Co-authored-by: Jan --- primedev/client/audio.cpp | 2 ++ primedev/client/audio.h | 2 ++ primedev/client/languagehooks.cpp | 2 ++ primedev/core/hooks.cpp | 2 ++ primedev/mods/autodownload/moddownloader.h | 2 ++ primedev/mods/modmanager.h | 2 ++ primedev/plugins/pluginmanager.cpp | 2 ++ primedev/plugins/pluginmanager.h | 2 ++ primedev/server/buildainfile.cpp | 2 ++ primedev/squirrel/squirrel.h | 2 ++ 10 files changed, 20 insertions(+) diff --git a/primedev/client/audio.cpp b/primedev/client/audio.cpp index e5989f5c..63501414 100644 --- a/primedev/client/audio.cpp +++ b/primedev/client/audio.cpp @@ -9,6 +9,8 @@ #include #include +namespace fs = std::filesystem; + AUTOHOOK_INIT() static const char* pszAudioEventName; diff --git a/primedev/client/audio.h b/primedev/client/audio.h index 7cd0ddd1..22bcf3f0 100644 --- a/primedev/client/audio.h +++ b/primedev/client/audio.h @@ -5,6 +5,8 @@ #include #include +namespace fs = std::filesystem; + enum class AudioSelectionStrategy { INVALID = -1, diff --git a/primedev/client/languagehooks.cpp b/primedev/client/languagehooks.cpp index 0146d1d4..36b5d5ae 100644 --- a/primedev/client/languagehooks.cpp +++ b/primedev/client/languagehooks.cpp @@ -3,6 +3,8 @@ #include #include +namespace fs = std::filesystem; + AUTOHOOK_INIT() typedef LANGID (*Tier0_DetectDefaultLanguageType)(); diff --git a/primedev/core/hooks.cpp b/primedev/core/hooks.cpp index 6e849291..fef8bbcf 100644 --- a/primedev/core/hooks.cpp +++ b/primedev/core/hooks.cpp @@ -12,6 +12,8 @@ #define XINPUT1_3_DLL "XInput1_3.dll" +namespace fs = std::filesystem; + AUTOHOOK_INIT() // called from the ON_DLL_LOAD macros diff --git a/primedev/mods/autodownload/moddownloader.h b/primedev/mods/autodownload/moddownloader.h index 10df39ce..0d851e2f 100644 --- a/primedev/mods/autodownload/moddownloader.h +++ b/primedev/mods/autodownload/moddownloader.h @@ -1,3 +1,5 @@ +namespace fs = std::filesystem; + class ModDownloader { private: diff --git a/primedev/mods/modmanager.h b/primedev/mods/modmanager.h index 233f004d..95a8fe12 100644 --- a/primedev/mods/modmanager.h +++ b/primedev/mods/modmanager.h @@ -9,6 +9,8 @@ #include #include +namespace fs = std::filesystem; + const std::string MOD_FOLDER_SUFFIX = "\\mods"; const std::string THUNDERSTORE_MOD_FOLDER_SUFFIX = "\\packages"; const std::string REMOTE_MOD_FOLDER_SUFFIX = "\\runtime\\remote\\mods"; diff --git a/primedev/plugins/pluginmanager.cpp b/primedev/plugins/pluginmanager.cpp index 718e6956..14d5692b 100644 --- a/primedev/plugins/pluginmanager.cpp +++ b/primedev/plugins/pluginmanager.cpp @@ -5,6 +5,8 @@ #include "config/profile.h" #include "core/convar/concommand.h" +namespace fs = std::filesystem; + PluginManager* g_pPluginManager; const std::vector& PluginManager::GetLoadedPlugins() const diff --git a/primedev/plugins/pluginmanager.h b/primedev/plugins/pluginmanager.h index 8c021851..7993cbb8 100644 --- a/primedev/plugins/pluginmanager.h +++ b/primedev/plugins/pluginmanager.h @@ -3,6 +3,8 @@ #include +namespace fs = std::filesystem; + class Plugin; class PluginManager diff --git a/primedev/server/buildainfile.cpp b/primedev/server/buildainfile.cpp index a7f59961..19a6d0e3 100644 --- a/primedev/server/buildainfile.cpp +++ b/primedev/server/buildainfile.cpp @@ -5,6 +5,8 @@ #include #include +namespace fs = std::filesystem; + AUTOHOOK_INIT() const int AINET_VERSION_NUMBER = 57; diff --git a/primedev/squirrel/squirrel.h b/primedev/squirrel/squirrel.h index 1225f909..d747bce3 100644 --- a/primedev/squirrel/squirrel.h +++ b/primedev/squirrel/squirrel.h @@ -5,6 +5,8 @@ #include "core/math/vector.h" #include "mods/modmanager.h" +namespace fs = std::filesystem; + /* definitions from hell required to function -- cgit v1.2.3