Merge pull request #4895 from lioncash/const

ControllerEmu: Add const to UpdateReferences() first reference parameter
dolphin-emu · Feb 11, 2017 · d19aabb · d19aabb
2 parents e568d57 + 98145d2
commit d19aabb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -26,7 +26,7 @@ bool ControlReference::InputGateOn()
 // Updates a controlreference's binded devices/controls
 // need to call this to re-parse a control reference's expression after changing it
 //
-void ControlReference::UpdateReference(ciface::Core::DeviceContainer& devices,
+void ControlReference::UpdateReference(const ciface::Core::DeviceContainer& devices,
                                        const ciface::Core::DeviceQualifier& default_device)
 {
   Expression* expr;

diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h
@@ -32,7 +32,7 @@ class ControlReference
 
   int BoundCount() const;
   ciface::ExpressionParser::ExpressionParseStatus GetParseStatus() const;
-  void UpdateReference(ciface::Core::DeviceContainer& devices,
+  void UpdateReference(const ciface::Core::DeviceContainer& devices,
                        const ciface::Core::DeviceQualifier& default_device);
 
   ControlState range;

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -30,7 +30,7 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock()
   return lock;
 }
 
-void EmulatedController::UpdateReferences(ControllerInterface& devi)
+void EmulatedController::UpdateReferences(const ControllerInterface& devi)
 {
   const auto lock = GetStateLock();
   for (auto& ctrlGroup : groups)

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
@@ -33,7 +33,7 @@ class EmulatedController
   virtual void SaveConfig(IniFile::Section* sec, const std::string& base = "");
   void UpdateDefaultDevice();
 
-  void UpdateReferences(ControllerInterface& devi);
+  void UpdateReferences(const ControllerInterface& devi);
 
   // This returns a lock that should be held before calling State() on any control
   // references and GetState(), by extension. This prevents a race condition