From 02634350500bd4e7b85425cae7bb43a050b5aee4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 29 May 2019 19:23:51 -0400 Subject: [PATCH] ControllerInterface/Device: Make DetectInput() a const member function This doesn't actually modify object instance state, so it can be made const. --- Source/Core/InputCommon/ControllerInterface/Device.cpp | 2 +- Source/Core/InputCommon/ControllerInterface/Device.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 9fbeae22cf..954d933ad8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -256,7 +256,7 @@ bool DeviceContainer::HasConnectedDevice(const DeviceQualifier& qualifier) const // and also properly handles detection when using "FullAnalogSurface" inputs. // Upon input, return the detected Device and Input, else return nullptrs std::pair, Device::Input*> -DeviceContainer::DetectInput(u32 wait_ms, const std::vector& device_strings) +DeviceContainer::DetectInput(u32 wait_ms, const std::vector& device_strings) const { struct InputState { diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index fd947ee654..a2cf0a329a 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -188,7 +188,7 @@ public: bool HasConnectedDevice(const DeviceQualifier& qualifier) const; std::pair, Device::Input*> - DetectInput(u32 wait_ms, const std::vector& device_strings); + DetectInput(u32 wait_ms, const std::vector& device_strings) const; protected: mutable std::mutex m_devices_mutex;