diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index c93dcc5c3d60..414a5aa888c0 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -248,7 +248,7 @@ ParseStatus Lexer::Tokenize(std::vector& tokens) class ControlExpression : public Expression { public: - explicit ControlExpression(ControlQualifier qualifier) : m_qualifier(qualifier) {} + explicit ControlExpression(ControlQualifier qualifier) : m_qualifier(std::move(qualifier)) {} ControlState GetValue() const override { @@ -438,7 +438,7 @@ class LiteralExpression : public Expression class LiteralReal : public LiteralExpression { public: - LiteralReal(ControlState value) : m_value(value) {} + explicit LiteralReal(ControlState value) : m_value(value) {} ControlState GetValue() const override { return m_value; } @@ -448,7 +448,7 @@ class LiteralReal : public LiteralExpression const ControlState m_value{}; }; -static ParseResult MakeLiteralExpression(Token token) +static ParseResult MakeLiteralExpression(const Token& token) { ControlState val{}; if (TryParse(token.data, &val)) @@ -460,7 +460,7 @@ static ParseResult MakeLiteralExpression(Token token) class VariableExpression : public Expression { public: - VariableExpression(std::string name) : m_name(name) {} + explicit VariableExpression(std::string name) : m_name(std::move(name)) {} ControlState GetValue() const override { return m_variable_ptr ? *m_variable_ptr : 0; } @@ -485,7 +485,7 @@ class VariableExpression : public Expression class HotkeyExpression : public Expression { public: - HotkeyExpression(std::vector> inputs) + explicit HotkeyExpression(std::vector> inputs) : m_modifiers(std::move(inputs)) { m_final_input = std::move(m_modifiers.back()); @@ -600,7 +600,7 @@ class CoalesceExpression : public Expression std::unique_ptr m_rhs; }; -std::shared_ptr ControlEnvironment::FindDevice(ControlQualifier qualifier) const +std::shared_ptr ControlEnvironment::FindDevice(const ControlQualifier& qualifier) const { if (qualifier.has_device) return container.FindDevice(qualifier.device_qualifier); @@ -608,7 +608,7 @@ std::shared_ptr ControlEnvironment::FindDevice(ControlQualifier qualifie return container.FindDevice(default_device); } -Device::Input* ControlEnvironment::FindInput(ControlQualifier qualifier) const +Device::Input* ControlEnvironment::FindInput(const ControlQualifier& qualifier) const { const std::shared_ptr device = FindDevice(qualifier); if (!device) @@ -617,7 +617,7 @@ Device::Input* ControlEnvironment::FindInput(ControlQualifier qualifier) const return device->FindInput(qualifier.control_name); } -Device::Output* ControlEnvironment::FindOutput(ControlQualifier qualifier) const +Device::Output* ControlEnvironment::FindOutput(const ControlQualifier& qualifier) const { const std::shared_ptr device = FindDevice(qualifier); if (!device) diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h index 405445b8a06e..bc3976212738 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h @@ -150,9 +150,9 @@ class ControlEnvironment { } - std::shared_ptr FindDevice(ControlQualifier qualifier) const; - Core::Device::Input* FindInput(ControlQualifier qualifier) const; - Core::Device::Output* FindOutput(ControlQualifier qualifier) const; + std::shared_ptr FindDevice(const ControlQualifier& qualifier) const; + Core::Device::Input* FindInput(const ControlQualifier& qualifier) const; + Core::Device::Output* FindOutput(const ControlQualifier& qualifier) const; // Returns an existing variable by the specified name if already existing. Creates it otherwise. std::shared_ptr GetVariablePtr(const std::string& name);