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/ControllerEmu/ControlGroup | |
| 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/ControllerEmu/ControlGroup')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp index 0b69c7e6c2..2896acd070 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp @@ -50,7 +50,7 @@ void ControlGroup::AddDeadzoneSetting(SettingValue<double>* value, double maximu ControlGroup::~ControlGroup() = default; -void ControlGroup::LoadConfig(IniFile::Section* sec, const std::string& defdev, +void ControlGroup::LoadConfig(Common::IniFile::Section* sec, const std::string& defdev, const std::string& base) { const std::string group(base + name + "/"); @@ -103,7 +103,7 @@ void ControlGroup::LoadConfig(IniFile::Section* sec, const std::string& defdev, } } -void ControlGroup::SaveConfig(IniFile::Section* sec, const std::string& defdev, +void ControlGroup::SaveConfig(Common::IniFile::Section* sec, const std::string& defdev, const std::string& base) { const std::string group(base + name + "/"); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h index fb10bab074..f51fff6015 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h @@ -68,9 +68,9 @@ public: DefaultValue default_value = DefaultValue::AlwaysEnabled); virtual ~ControlGroup(); - virtual void LoadConfig(IniFile::Section* sec, const std::string& defdev = "", + virtual void LoadConfig(Common::IniFile::Section* sec, const std::string& defdev = "", const std::string& base = ""); - virtual void SaveConfig(IniFile::Section* sec, const std::string& defdev = "", + virtual void SaveConfig(Common::IniFile::Section* sec, const std::string& defdev = "", const std::string& base = ""); void SetControlExpression(int index, const std::string& expression); |