diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-03-03 15:17:25 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 15:17:25 +1300 |
| commit | 51e932b4ec24b0225a80c66a39c906f6e95f7519 (patch) | |
| tree | 80caad500844500871f06ff2e26af57f1acb4b73 /Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp | |
| parent | 1392b88879a624ad9ac689a539260f664dc86372 (diff) | |
| parent | 1539ff669119ad796201c72052113e84862e1e98 (diff) | |
Merge pull request #4975 from ligfx/controlsetting
InputCommon: move Setting classes out of ControlGroup
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp index 0b8b7f19d9..fd905ccf1e 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp @@ -11,6 +11,8 @@ #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/ControlGroup/Extension.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" +#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" +#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" namespace ControllerEmu { @@ -27,8 +29,6 @@ ControlGroup::ControlGroup(const std::string& name_, const std::string& ui_name_ ControlGroup::~ControlGroup() = default; -ControlGroup::BooleanSetting::~BooleanSetting() = default; - void ControlGroup::LoadConfig(IniFile::Section* sec, const std::string& defdev, const std::string& base) { |