diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-04-14 20:52:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 20:52:30 +0200 |
| commit | e9dbb93cb56bb48666295c211364f47857cfdaa3 (patch) | |
| tree | 144f659a26c95a2d3db33389b9efc6558c321c7f /Source/Core/InputCommon/InputConfig.cpp | |
| parent | ae18aa0639bdf2d51c8bf738bd7f794d89aa22e4 (diff) | |
| parent | e4caace6bb6213851b979cdd76f9f44ef6d9cd09 (diff) | |
Merge pull request #11756 from lioncash/ini
Common/IniFile: Move interface into Common namespace
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 9605aa8c33..64610ba768 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -29,7 +29,7 @@ InputConfig::~InputConfig() = default; bool InputConfig::LoadConfig(InputClass type) { - IniFile inifile; + Common::IniFile inifile; bool useProfile[MAX_BBMOTES] = {false, false, false, false, false}; static constexpr std::array<std::string_view, MAX_BBMOTES> num = {"1", "2", "3", "4", "BB"}; std::string profile[MAX_BBMOTES]; @@ -57,8 +57,8 @@ bool InputConfig::LoadConfig(InputClass type) break; } - IniFile game_ini = SConfig::GetInstance().LoadGameIni(); - IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls"); + Common::IniFile game_ini = SConfig::GetInstance().LoadGameIni(); + auto* control_section = game_ini.GetOrCreateSection("Controls"); for (int i = 0; i < 4; i++) { @@ -95,7 +95,7 @@ bool InputConfig::LoadConfig(InputClass type) std::vector<std::string> controller_names; for (auto& controller : m_controllers) { - IniFile::Section config; + Common::IniFile::Section config; // Load settings from ini if (useProfile[n]) { @@ -146,7 +146,7 @@ void InputConfig::SaveConfig() { std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + m_ini_name + ".ini"; - IniFile inifile; + Common::IniFile inifile; inifile.Load(ini_filename); std::vector<std::string> controller_names; @@ -212,7 +212,7 @@ bool InputConfig::IsControllerControlledByGamepadDevice(int index) const controller.name == "Keyboard Mouse")); // Windows Keyboard/Mouse } -void InputConfig::GenerateControllerTextures(const IniFile& file) +void InputConfig::GenerateControllerTextures(const Common::IniFile& file) { std::vector<std::string> controller_names; for (auto& controller : m_controllers) |