From da12f3eebc47f3928f7a8e9176549267e579df68 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 22 Feb 2020 10:27:43 -0600 Subject: [PATCH] InputCommon: Constify Device::Input::IsDetectable function. --- .../ControllerInterface/DInput/DInputKeyboardMouse.h | 2 +- Source/Core/InputCommon/ControllerInterface/Device.h | 2 +- .../DualShockUDPClient/DualShockUDPClient.cpp | 6 +++--- .../ControllerInterface/Quartz/QuartzKeyboardAndMouse.h | 2 +- .../InputCommon/ControllerInterface/Touch/Touchscreen.h | 2 +- .../InputCommon/ControllerInterface/Wiimote/Wiimote.cpp | 2 +- .../Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 2 +- Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h | 4 ++-- Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 711c9461e6..0ae81fb6be 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -69,7 +69,7 @@ private: { } 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 index 39ff6e9bb5..d923d97076 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -70,7 +70,7 @@ public: 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 index b2258b1542..3dff8cf309 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp @@ -87,14 +87,14 @@ private: { public: using AnalogInput::AnalogInput; - bool IsDetectable() override { return false; } + bool IsDetectable() const override { return false; } }; class MotionInput final : public AnalogInput { public: using AnalogInput::AnalogInput; - bool IsDetectable() override { return false; } + bool IsDetectable() const override { return false; } }; using AccelerometerInput = MotionInput; @@ -121,7 +121,7 @@ private: } } - 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 index 5d3ea86f3e..39516035a3 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h @@ -36,7 +36,7 @@ private: { } 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 index 26091c4b38..ec060040d4 100644 --- a/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.h +++ b/Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.h @@ -27,7 +27,7 @@ private: { 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 index 34a169aa83..059138e52a 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp @@ -48,7 +48,7 @@ public: { } - 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 index 14462165fa..875cce4730 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -118,7 +118,7 @@ public: 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 index 52c424a3e6..f8e1e734c9 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -63,7 +63,7 @@ private: { 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 @@ private: { 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 index f372812388..029ea22d3c 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -178,7 +178,7 @@ public: 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 @@ public: 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;