Made code -Wshadow clean, missed a bunch of issues in the last commit

[supertux.git] / src / control / joystick_manager.cpp

diff --git a/src/control/joystick_manager.cpp b/src/control/joystick_manager.cpp
index f6fbbe4..5043b60 100644 (file)
--- a/src/control/joystick_manager.cpp
+++ b/src/control/joystick_manager.cpp
@@ -27,8 +27,8 @@
 #include "util/log.hpp"
 #include "util/writer.hpp"
 
-JoystickManager::JoystickManager(InputManager* parent) :
-  parent(parent),
+JoystickManager::JoystickManager(InputManager* parent_) :
+  parent(parent_),
   joy_button_map(),
   joy_axis_map(),
   joy_hat_map(),