From e4caace6bb6213851b979cdd76f9f44ef6d9cd09 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 13 Apr 2023 09:38:09 -0400 Subject: Common/IniFile: Move interface into Common namespace Gets this out of the global namespace and into the Common namespace --- Source/Core/InputCommon/InputConfig.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/InputCommon/InputConfig.cpp') 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 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 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 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 controller_names; for (auto& controller : m_controllers) -- cgit v1.2.3