ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6262 from linkmauve/no-shadow 

Rename constructor parameters to avoid shadowing members
This commit is contained in:
Markus Wick 2017-12-19 12:23:32 +01:00 committed by GitHub
parent 873e7370a8 f5dc8e7737
commit 5006ac5c51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
View File

@ -17,8 +17,8 @@
namespace ControllerEmu namespace ControllerEmu
{ {
Slider::Slider(const std::string& name, const std::string& ui_name) Slider::Slider(const std::string& name_, const std::string& ui_name_)
: ControlGroup(name, ui_name, GroupType::Slider) : ControlGroup(name_, ui_name_, GroupType::Slider)
{ {
controls.emplace_back(std::make_unique<Input>("Left")); controls.emplace_back(std::make_unique<Input>("Left"));
controls.emplace_back(std::make_unique<Input>("Right")); 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)); 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_)
{ {
} }

4
Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
View File

@ -13,8 +13,8 @@ namespace ControllerEmu
class Slider : public ControlGroup class Slider : public ControlGroup
{ {
public: public:
Slider(const std::string& name, const std::string& ui_name); Slider(const std::string& name_, const std::string& ui_name_);
explicit Slider(const std::string& name); explicit Slider(const std::string& name_);
void GetState(ControlState* slider); void GetState(ControlState* slider);
}; };