From 26f17a172353098740d97cce531f4c7c06abd4e4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Feb 2017 00:35:02 -0500 Subject: ControlGroup: Convert group type enum into an enum class Gets some constants out of the ControllerEmu namespace, and modifies ControlGroup so that it uses the enum type itself to represent the underlying type, rather than a u32 value. --- .../Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp index cd730697a5..0b8b7f19d9 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp @@ -14,12 +14,13 @@ namespace ControllerEmu { -ControlGroup::ControlGroup(const std::string& name_, const u32 type_) +ControlGroup::ControlGroup(const std::string& name_, const GroupType type_) : name(name_), ui_name(name_), type(type_) { } -ControlGroup::ControlGroup(const std::string& name_, const std::string& ui_name_, const u32 type_) +ControlGroup::ControlGroup(const std::string& name_, const std::string& ui_name_, + const GroupType type_) : name(name_), ui_name(ui_name_), type(type_) { } @@ -62,7 +63,7 @@ void ControlGroup::LoadConfig(IniFile::Section* sec, const std::string& defdev, } // extensions - if (type == GROUP_TYPE_EXTENSION) + if (type == GroupType::Extension) { Extension* const ext = (Extension*)this; @@ -115,7 +116,7 @@ void ControlGroup::SaveConfig(IniFile::Section* sec, const std::string& defdev, } // extensions - if (type == GROUP_TYPE_EXTENSION) + if (type == GroupType::Extension) { Extension* const ext = (Extension*)this; sec->Set(base + name, ext->attachments[ext->switch_extension]->GetName(), "None"); -- cgit v1.2.3