diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-05-30 14:33:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 14:33:53 +0200 |
| commit | 00ecfb3c598ec08e5863db9c697e91ab5a4965bf (patch) | |
| tree | 94f153e7a4d0e2d3b6a39b1e5c95bd80aa426f24 /Source/Core/InputCommon/ControllerInterface/Device.cpp | |
| parent | 4e7a790648770bbe0c12b6bc1278111af524df9c (diff) | |
| parent | 02634350500bd4e7b85425cae7bb43a050b5aee4 (diff) | |
Merge pull request #8138 from lioncash/input-string
ControllerInterface/Device: Minor cleanup
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 38b11a932b..954d933ad8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -52,7 +52,7 @@ std::string Device::GetQualifiedName() const return StringFromFormat("%s/%i/%s", this->GetSource().c_str(), GetId(), this->GetName().c_str()); } -Device::Input* Device::FindInput(const std::string& name) const +Device::Input* Device::FindInput(std::string_view name) const { for (Input* input : m_inputs) { @@ -63,7 +63,7 @@ Device::Input* Device::FindInput(const std::string& name) const return nullptr; } -Device::Output* Device::FindOutput(const std::string& name) const +Device::Output* Device::FindOutput(std::string_view name) const { for (Output* output : m_outputs) { @@ -74,7 +74,7 @@ Device::Output* Device::FindOutput(const std::string& name) const return nullptr; } -bool Device::Control::IsMatchingName(const std::string& name) const +bool Device::Control::IsMatchingName(std::string_view name) const { return GetName() == name; } @@ -90,7 +90,7 @@ std::string Device::FullAnalogSurface::GetName() const return "Full " + m_high.GetName(); } -bool Device::FullAnalogSurface::IsMatchingName(const std::string& name) const +bool Device::FullAnalogSurface::IsMatchingName(std::string_view name) const { if (Control::IsMatchingName(name)) return true; @@ -218,7 +218,7 @@ std::string DeviceContainer::GetDefaultDeviceString() const return device_qualifier.ToString(); } -Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* def_dev) const +Device::Input* DeviceContainer::FindInput(std::string_view name, const Device* def_dev) const { if (def_dev) { @@ -239,7 +239,7 @@ Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* return nullptr; } -Device::Output* DeviceContainer::FindOutput(const std::string& name, const Device* def_dev) const +Device::Output* DeviceContainer::FindOutput(std::string_view name, const Device* def_dev) const { return def_dev->FindOutput(name); } @@ -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, std::vector<std::string> device_strings) +DeviceContainer::DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings) const { struct InputState { @@ -273,7 +273,7 @@ DeviceContainer::DetectInput(u32 wait_ms, std::vector<std::string> device_string // Acquire devices and initial input states. std::vector<DeviceState> device_states; - for (auto& device_string : device_strings) + for (const auto& device_string : device_strings) { DeviceQualifier dq; dq.FromString(device_string); |