diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2017-12-19 11:21:27 +0100 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2017-12-19 12:05:06 +0100 |
| commit | f5dc8e77375b6fd332b339f9fc388a1f8ef894e7 (patch) | |
| tree | 823bda9d0f9bb50c7b1cedce54df7838001d3b3c /Source/Core/InputCommon | |
| parent | 0bf24f549a2cc6146e138bd03dd1338689d96b3f (diff) | |
Rename constructor parameters to avoid shadowing members
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h | 4 |
2 files changed, 5 insertions, 5 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_) { } diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h index 0d77b1662a..fb038cd931 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h @@ -13,8 +13,8 @@ namespace ControllerEmu class Slider : public ControlGroup { public: - Slider(const std::string& name, const std::string& ui_name); - explicit Slider(const std::string& name); + Slider(const std::string& name_, const std::string& ui_name_); + explicit Slider(const std::string& name_); void GetState(ControlState* slider); }; |
