Merge pull request #6262 from linkmauve/no-shadow

Rename constructor parameters to avoid shadowing members
dolphin-emu · Dec 19, 2017 · 5006ac5 · 5006ac5
2 parents 873e737 + f5dc8e7
commit 5006ac5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
@@ -17,16 +17,16 @@
 
 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"));
 
   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
@@ -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);
 };