Revert changes moved to other PRs

dolphin-emu · May 7, 2021 · 6800d1a · 6800d1a
1 parent 9f59bae
commit 6800d1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp b/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp
@@ -675,7 +675,7 @@ void Init(const std::string& game_id)
   }
 }
 
-bool GetButtonPressed(int pad_id, ButtonType button) const
+bool GetButtonPressed(int pad_id, ButtonType button)
 {
   bool pressed = m_controllers[TOUCHSCREEN_KEY]->ButtonValue(pad_id, button);
 
@@ -685,7 +685,7 @@ bool GetButtonPressed(int pad_id, ButtonType button) const
   return pressed;
 }
 
-float GetAxisValue(int pad_id, ButtonType axis) const
+float GetAxisValue(int pad_id, ButtonType axis)
 {
   float value = m_controllers[TOUCHSCREEN_KEY]->AxisValue(pad_id, axis);
   if (value == 0.0f)
@@ -700,7 +700,7 @@ float GetAxisValue(int pad_id, ButtonType axis) const
   return value;
 }
 
-double GetInputRadiusAtAngle(int pad_id, ButtonType stick, double angle) const
+double GetInputRadiusAtAngle(int pad_id, ButtonType stick, double angle)
 {
   // To avoid a crash, don't access controllers before they've been initialized by the boot process
   if (!Core::IsRunningAndStarted())
@@ -787,7 +787,7 @@ void InputDevice::AxisEvent(int axis, float value)
   }
 }
 
-bool InputDevice::ButtonValue(int pad_id, ButtonType button) const
+bool InputDevice::ButtonValue(int pad_id, ButtonType button)
 {
   const auto& binding = m_input_binds.find(std::make_pair(pad_id, button));
   if (binding == m_input_binds.end())
@@ -799,7 +799,7 @@ bool InputDevice::ButtonValue(int pad_id, ButtonType button) const
     return (m_axises[binding->second->m_button_type] * binding->second->m_neg) > 0.5f;
 }
 
-float InputDevice::AxisValue(int pad_id, ButtonType axis) const
+float InputDevice::AxisValue(int pad_id, ButtonType axis)
 {
   const auto& binding = m_input_binds.find(std::make_pair(pad_id, axis));
   if (binding == m_input_binds.end())

diff --git a/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.h b/Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.h
@@ -263,18 +263,18 @@ class InputDevice
   }
   bool PressEvent(int button, int action);
   void AxisEvent(int axis, float value);
-  bool ButtonValue(int pad_id, ButtonType button) const;
-  float AxisValue(int pad_id, ButtonType axis) const;
+  bool ButtonValue(int pad_id, ButtonType button);
+  float AxisValue(int pad_id, ButtonType axis);
 };
 
 void Init(const std::string&);
 
 // pad_id is numbered 0 to 3 for GC pads and 4 to 7 for Wiimotes
-bool GetButtonPressed(int pad_id, ButtonType button) const;
-float GetAxisValue(int pad_id, ButtonType axis) const;
+bool GetButtonPressed(int pad_id, ButtonType button);
+float GetAxisValue(int pad_id, ButtonType axis);
 
 // emu_pad_id is numbered 0 to 3 for both GC pads and Wiimotes
-double GetInputRadiusAtAngle(int emu_pad_id, ButtonType stick, double angle) const;
+double GetInputRadiusAtAngle(int emu_pad_id, ButtonType stick, double angle);
 
 bool GamepadEvent(const std::string& dev, int button, int action);
 void GamepadAxisEvent(const std::string& dev, int axis, float value);