diff options
Diffstat (limited to 'Source/Core/InputCommon/DynamicInputTextures')
| -rw-r--r-- | Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp index fcdf879e8d..8b12fdff10 100644 --- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp @@ -11,6 +11,7 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" +#include "Common/IniFile.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" @@ -86,7 +87,7 @@ Configuration::Configuration(const std::string& json_file) Configuration::~Configuration() = default; -bool Configuration::GenerateTextures(const IniFile& file, +bool Configuration::GenerateTextures(const Common::IniFile& file, const std::vector<std::string>& controller_names) const { bool any_dirty = false; @@ -98,7 +99,7 @@ bool Configuration::GenerateTextures(const IniFile& file, return any_dirty; } -bool Configuration::GenerateTexture(const IniFile& file, +bool Configuration::GenerateTexture(const Common::IniFile& file, const std::vector<std::string>& controller_names, const Data& texture_data) const { diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h index 635e1883a1..4835fa6619 100644 --- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h +++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h @@ -4,13 +4,16 @@ #pragma once #include <string> -#include <unordered_map> #include <vector> #include "Common/CommonTypes.h" -#include "Common/IniFile.h" #include "InputCommon/DynamicInputTextures/DITData.h" +namespace Common +{ +class IniFile; +} + namespace InputCommon::DynamicInputTextures { class Configuration @@ -18,11 +21,12 @@ class Configuration public: explicit Configuration(const std::string& json_file); ~Configuration(); - bool GenerateTextures(const IniFile& file, + bool GenerateTextures(const Common::IniFile& file, const std::vector<std::string>& controller_names) const; private: - bool GenerateTexture(const IniFile& file, const std::vector<std::string>& controller_names, + bool GenerateTexture(const Common::IniFile& file, + const std::vector<std::string>& controller_names, const Data& texture_data) const; std::vector<Data> m_dynamic_input_textures; |
