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. --- Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp index ce09966d2d..6de5042aaf 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp @@ -39,7 +39,7 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi) control->control_ref.get()->UpdateReference(devi, default_device); // extension - if (ctrlGroup->type == GROUP_TYPE_EXTENSION) + if (ctrlGroup->type == GroupType::Extension) { for (auto& attachment : ((Extension*)ctrlGroup.get())->attachments) attachment->UpdateReferences(devi); @@ -52,7 +52,7 @@ void EmulatedController::UpdateDefaultDevice() for (auto& ctrlGroup : groups) { // extension - if (ctrlGroup->type == GROUP_TYPE_EXTENSION) + if (ctrlGroup->type == GroupType::Extension) { for (auto& ai : ((Extension*)ctrlGroup.get())->attachments) { -- cgit v1.2.3