diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-12-19 12:23:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 12:23:32 +0100 |
| commit | 5006ac5c518a4e52599e09eb5fc80010d25c2c01 (patch) | |
| tree | 8b681e5e35eb1f311da0987f2b86925b0250fa2e /Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | |
| parent | 873e7370a8b427545e4e95168fa10d70a71f7d6e (diff) | |
| parent | f5dc8e77375b6fd332b339f9fc388a1f8ef894e7 (diff) | |
Merge pull request #6262 from linkmauve/no-shadow
Rename constructor parameters to avoid shadowing members
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<Input>("Left")); controls.emplace_back(std::make_unique<Input>("Right")); @@ -26,7 +26,7 @@ Slider::Slider(const std::string& name, const std::string& ui_name) numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); } -Slider::Slider(const std::string& name) : Slider(name, name) +Slider::Slider(const std::string& name_) : Slider(name_, name_) { } |