Merge pull request #4960 from lioncash/type

ControlGroup: Convert group type enum into an enum class

1 files changed, 5 insertions, 4 deletions

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");