diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
9 files changed, 13 insertions, 16 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h index f30dd4f405..95f9f5b88e 100644 --- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h @@ -117,7 +117,7 @@ public: class Output : public Control { public: - virtual ~Output() = default; + ~Output() override = default; virtual void SetState(ControlState state) = 0; Output* ToOutput() override { return this; } }; diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index cb73f373f8..bf1f9aa91b 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -60,13 +60,13 @@ public: Core::DeviceRemoval UpdateInput() override; Joystick(const LPDIRECTINPUTDEVICE8 device); - ~Joystick(); + ~Joystick() override; std::string GetName() const override; std::string GetSource() const override; int GetSortPriority() const override { return -3; } - bool IsValid() const final override; + bool IsValid() const final; private: const LPDIRECTINPUTDEVICE8 m_device; diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index e7187849f6..67721e3301 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -97,7 +97,7 @@ public: Core::DeviceRemoval UpdateInput() override; KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device); - ~KeyboardMouse(); + ~KeyboardMouse() override; std::string GetName() const override; std::string GetSource() const override; diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp index ea24800762..cac67e1b8a 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp @@ -71,11 +71,8 @@ private: : m_name(name), m_input(input), m_range(range), m_offset(offset) { } - std::string GetName() const final override { return m_name; } - ControlState GetState() const final override - { - return (ControlState(m_input) + m_offset) / m_range; - } + std::string GetName() const final { return m_name; } + ControlState GetState() const final { return (ControlState(m_input) + m_offset) / m_range; } private: const char* m_name; @@ -203,7 +200,7 @@ class InputBackend final : public ciface::InputBackend { public: InputBackend(ControllerInterface* controller_interface); - ~InputBackend(); + ~InputBackend() override; void PopulateDevices() override; private: diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 07a38b0289..efa3bfa997 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -26,7 +26,7 @@ class InputBackend final : public ciface::InputBackend { public: InputBackend(ControllerInterface* controller_interface); - ~InputBackend(); + ~InputBackend() override; void PopulateDevices() override; void UpdateInput(std::vector<std::weak_ptr<ciface::Core::Device>>& devices_to_remove) override; diff --git a/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp b/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp index 2ffd741d01..f8615d138b 100644 --- a/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp @@ -93,8 +93,8 @@ private: : m_name(name), m_input(input), m_range(range) { } - std::string GetName() const final override { return m_name; } - ControlState GetState() const final override { return ControlState(m_input) / m_range; } + std::string GetName() const final { return m_name; } + ControlState GetState() const final { return ControlState(m_input) / m_range; } private: const char* m_name; diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp index c4e5fe028f..9b5fe3c1e9 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp @@ -51,7 +51,7 @@ public: std::string GetName() const override { return m_name; } - ControlState GetState() const final override { return ControlState(m_value) / m_extent; } + ControlState GetState() const final { return ControlState(m_value) / m_extent; } protected: const T& m_value; diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h index bc60a1405e..c09a8da5db 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h @@ -29,7 +29,7 @@ class Device final : public Core::Device { public: Device(std::unique_ptr<WiimoteReal::Wiimote> wiimote); - ~Device(); + ~Device() override; std::string GetName() const override; std::string GetSource() const override; diff --git a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp index 36b847aa91..2e69fc80e6 100644 --- a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp @@ -31,7 +31,7 @@ class InputBackend final : public ciface::InputBackend { public: InputBackend(ControllerInterface* controller_interface); - ~InputBackend(); + ~InputBackend() override; void PopulateDevices() override; void HandleWindowChange() override; |
