diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-05-10 19:16:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 19:16:40 -0700 |
| commit | 3ab06dcd02ea6040c2620a8ce8be144c65534c2d (patch) | |
| tree | d695cb4bb2c7f9573c99ee91bfcc54bad81f98dc /Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h | |
| parent | 46561cc242237c22fe24b6c990fbaeaba241f8fd (diff) | |
| parent | 374585f12806886f9ad8b117dfc4811033dad4f3 (diff) | |
Merge pull request #8016 from jordan-woyak/emu-wm-ir-rename
WiimoteEmu/DolphinQt: Rename "IR" to "Point" and eliminate redundant Forward/Backward actions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h index 146dc16fcb..9383ec07f0 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h @@ -44,9 +44,8 @@ enum class GroupType class ControlGroup { public: - explicit ControlGroup(const std::string& name, GroupType type = GroupType::Other); - ControlGroup(const std::string& name, const std::string& ui_name, - GroupType type = GroupType::Other); + explicit ControlGroup(std::string name, GroupType type = GroupType::Other); + ControlGroup(std::string name, std::string ui_name, GroupType type = GroupType::Other); virtual ~ControlGroup(); virtual void LoadConfig(IniFile::Section* sec, const std::string& defdev = "", |