From f5dc8e77375b6fd332b339f9fc388a1f8ef894e7 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 19 Dec 2017 11:21:27 +0100 Subject: Rename constructor parameters to avoid shadowing members --- Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index 024161d4e8..b5e7ff5a1a 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -17,8 +17,8 @@ namespace ControllerEmu { -Slider::Slider(const std::string& name, const std::string& ui_name) - : ControlGroup(name, ui_name, GroupType::Slider) +Slider::Slider(const std::string& name_, const std::string& ui_name_) + : ControlGroup(name_, ui_name_, GroupType::Slider) { controls.emplace_back(std::make_unique("Left")); controls.emplace_back(std::make_unique("Right")); @@ -26,7 +26,7 @@ Slider::Slider(const std::string& name, const std::string& ui_name) numeric_settings.emplace_back(std::make_unique(_trans("Dead Zone"), 0, 0, 50)); } -Slider::Slider(const std::string& name) : Slider(name, name) +Slider::Slider(const std::string& name_) : Slider(name_, name_) { } -- cgit v1.2.3