summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-29 19:23:51 -0400
committerLioncash <mathew1800@gmail.com>2019-05-29 19:23:54 -0400
commit02634350500bd4e7b85425cae7bb43a050b5aee4 (patch)
treee8ca6184781dc86b0847562545a0ba35686bc96f /Source/Core/InputCommon/ControllerInterface
parent27346fee8a5466503f32493510da98846f2efb01 (diff)
ControllerInterface/Device: Make DetectInput() a const member function
This doesn't actually modify object instance state, so it can be made const.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Device.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Device.h2
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<std::shared_ptr<Device>, Device::Input*>
-DeviceContainer::DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings)
+DeviceContainer::DetectInput(u32 wait_ms, const std::vector<std::string>& 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<std::shared_ptr<Device>, Device::Input*>
- DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings);
+ DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings) const;
protected:
mutable std::mutex m_devices_mutex;