Merge pull request #8638 from jordan-woyak/is-detectable-constify

InputCommon: Constify Device::Input::IsDetectable function.
dolphin-emu · Feb 22, 2020 · edad018 · edad018
2 parents 2b6a1ee + da12f3e
commit edad018
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -69,7 +69,7 @@ class KeyboardMouse : public Core::Device
     {
     }
     std::string GetName() const override;
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
     ControlState GetState() const override;
 
   private:

diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -70,7 +70,7 @@ class Device
   public:
     // Things like absolute axes/ absolute mouse position should override this to prevent
     // undesirable behavior in our mapping logic.
-    virtual bool IsDetectable() { return true; }
+    virtual bool IsDetectable() const { return true; }
 
     // Implementations should return a value from 0.0 to 1.0 across their normal range.
     // One input should be provided for each "direction". (e.g. 2 for each axis)

diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
@@ -87,14 +87,14 @@ class Device final : public Core::Device
   {
   public:
     using AnalogInput::AnalogInput;
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
   };
 
   class MotionInput final : public AnalogInput<float>
   {
   public:
     using AnalogInput::AnalogInput;
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
   };
 
   using AccelerometerInput = MotionInput;
@@ -121,7 +121,7 @@ class Device final : public Core::Device
       }
     }
 
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
 
   private:
     const BatteryState& m_battery;

diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
@@ -36,7 +36,7 @@ class KeyboardAndMouse : public Core::Device
     {
     }
     std::string GetName() const override;
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
     ControlState GetState() const override;
 
   private:

diff --git a/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.h b/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.h
@@ -27,7 +27,7 @@ class Touchscreen : public Core::Device
   {
   public:
     std::string GetName() const;
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
     Axis(int pad_id, ButtonManager::ButtonType index, float neg = 1.0f)
         : m_pad_id(pad_id), m_index(index), m_neg(neg)
     {

diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp
@@ -48,7 +48,7 @@ class GenericInput : public Core::Device::Input
   {
   }
 
-  bool IsDetectable() override { return Detectable; }
+  bool IsDetectable() const override { return Detectable; }
 
   std::string GetName() const override { return m_name; }
 

diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
@@ -118,7 +118,7 @@ class Battery final : public Core::Device::Input
   Battery(const ControlState* level) : m_level(*level) {}
   std::string GetName() const override { return "Battery"; }
   ControlState GetState() const override { return m_level; }
-  bool IsDetectable() override { return false; }
+  bool IsDetectable() const override { return false; }
 
 private:
   const ControlState& m_level;

diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -63,7 +63,7 @@ class KeyboardMouse : public Core::Device
   {
   public:
     std::string GetName() const override { return name; }
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
     Cursor(u8 index, bool positive, const float* cursor);
     ControlState GetState() const override;
 
@@ -78,7 +78,7 @@ class KeyboardMouse : public Core::Device
   {
   public:
     std::string GetName() const override { return name; }
-    bool IsDetectable() override { return false; }
+    bool IsDetectable() const override { return false; }
     Axis(u8 index, bool positive, const float* axis);
     ControlState GetState() const override;
 

diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
@@ -178,7 +178,7 @@ class MotionDataInput final : public AnalogInput
     return std::string(motion_data_names[m_code]) + (m_range < 0 ? '-' : '+');
   }
 
-  bool IsDetectable() override { return false; }
+  bool IsDetectable() const override { return false; }
 };
 
 class CursorInput final : public Axis
@@ -192,7 +192,7 @@ class CursorInput final : public Axis
     return std::string("Cursor ") + char('X' + m_code) + (m_range < 0 ? '-' : '+');
   }
 
-  bool IsDetectable() override { return false; }
+  bool IsDetectable() const override { return false; }
 };
 
 static std::thread s_hotplug_thread;