ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4895 from lioncash/const 

ControllerEmu: Add const to UpdateReferences() first reference parameter
This commit is contained in:
JosJuice 2017-02-11 09:27:37 +01:00 committed by GitHub
parent e568d57022 98145d2160
commit d19aabb55b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/ControlReference/ControlReference.cpp
View File

@ -26,7 +26,7 @@ bool ControlReference::InputGateOn()
// Updates a controlreference's binded devices/controls // Updates a controlreference's binded devices/controls
// need to call this to re-parse a control reference's expression after changing it // 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) const ciface::Core::DeviceQualifier& default_device)
{ {
Expression* expr; Expression* expr;

2
Source/Core/InputCommon/ControlReference/ControlReference.h
View File

@ -32,7 +32,7 @@ public:
int BoundCount() const; int BoundCount() const;
ciface::ExpressionParser::ExpressionParseStatus GetParseStatus() 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); const ciface::Core::DeviceQualifier& default_device);
ControlState range; ControlState range;

2
Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
View File

@ -30,7 +30,7 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock()
return lock; return lock;
} }
void EmulatedController::UpdateReferences(ControllerInterface& devi) void EmulatedController::UpdateReferences(const ControllerInterface& devi)
{ {
const auto lock = GetStateLock(); const auto lock = GetStateLock();
for (auto& ctrlGroup : groups) for (auto& ctrlGroup : groups)

2
Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
View File

@ -33,7 +33,7 @@ public:
virtual void SaveConfig(IniFile::Section* sec, const std::string& base = ""); virtual void SaveConfig(IniFile::Section* sec, const std::string& base = "");
void UpdateDefaultDevice(); 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 // This returns a lock that should be held before calling State() on any control
// references and GetState(), by extension. This prevents a race condition // references and GetState(), by extension. This prevents a race condition