summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/Control
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-10-27 11:04:08 -0500
committerJordan Woyak <jordan.woyak@gmail.com>2020-02-09 19:08:26 -0600
commit47877ecf2c3b173d77bc55242a22ae9adbabf2be (patch)
treeabf5a0198bf40f731a8f11411112548e141ff5b1 /Source/Core/InputCommon/ControllerEmu/Control
parent01d69ba81a0a6ece04befa6cf5f14f14c65792e7 (diff)
InputCommon: Clean up creation of inputs.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/Control')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Control.cpp9
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Control.h7
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Input.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Input.h4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Output.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Output.h2
6 files changed, 17 insertions, 17 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
index 20ae3a3cda..dbf12b4570 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
@@ -10,14 +10,15 @@
namespace ControllerEmu
{
Control::Control(std::unique_ptr<ControlReference> ref, Translatability translate_,
- const std::string& name_, const std::string& ui_name_)
- : control_ref(std::move(ref)), translate(translate_), name(name_), ui_name(ui_name_)
+ std::string name_, std::string ui_name_)
+ : control_ref(std::move(ref)), translate(translate_), name(std::move(name_)),
+ ui_name(std::move(ui_name_))
{
}
Control::Control(std::unique_ptr<ControlReference> ref, Translatability translate_,
- const std::string& name_)
- : Control(std::move(ref), translate_, name_, name_)
+ std::string name_)
+ : control_ref(std::move(ref)), translate(translate_), name(name_), ui_name(std::move(name_))
{
}
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.h b/Source/Core/InputCommon/ControllerEmu/Control/Control.h
index 18aa529a6c..bfdd54dd60 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Control.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.h
@@ -34,10 +34,9 @@ public:
const std::string ui_name;
protected:
- Control(std::unique_ptr<ControlReference> ref, Translatability translate, const std::string& name,
- const std::string& ui_name);
- Control(std::unique_ptr<ControlReference> ref, Translatability translate,
- const std::string& name);
+ Control(std::unique_ptr<ControlReference> ref, Translatability translate, std::string name,
+ std::string ui_name);
+ Control(std::unique_ptr<ControlReference> ref, Translatability translate, std::string name);
};
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
index 69f817705e..edda668ea0 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
@@ -10,13 +10,13 @@
namespace ControllerEmu
{
-Input::Input(Translatability translate_, const std::string& name_, const std::string& ui_name_)
- : Control(std::make_unique<InputReference>(), translate_, name_, ui_name_)
+Input::Input(Translatability translate_, std::string name_, std::string ui_name_)
+ : Control(std::make_unique<InputReference>(), translate_, std::move(name_), std::move(ui_name_))
{
}
-Input::Input(Translatability translate_, const std::string& name_)
- : Control(std::make_unique<InputReference>(), translate_, name_)
+Input::Input(Translatability translate_, std::string name_)
+ : Control(std::make_unique<InputReference>(), translate_, std::move(name_))
{
}
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.h b/Source/Core/InputCommon/ControllerEmu/Control/Input.h
index 3fd301ae65..57eb26c082 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Input.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.h
@@ -12,7 +12,7 @@ namespace ControllerEmu
class Input : public Control
{
public:
- Input(Translatability translate, const std::string& name, const std::string& ui_name);
- Input(Translatability translate, const std::string& name);
+ Input(Translatability translate, std::string name, std::string ui_name);
+ Input(Translatability translate, std::string name);
};
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
index 568035d106..945b3b6596 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
@@ -10,8 +10,8 @@
namespace ControllerEmu
{
-Output::Output(Translatability translate_, const std::string& name_)
- : Control(std::make_unique<OutputReference>(), translate_, name_)
+Output::Output(Translatability translate_, std::string name_)
+ : Control(std::make_unique<OutputReference>(), translate_, std::move(name_))
{
}
} // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.h b/Source/Core/InputCommon/ControllerEmu/Control/Output.h
index 7970c26ad0..6f616ca279 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Output.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.h
@@ -12,6 +12,6 @@ namespace ControllerEmu
class Output : public Control
{
public:
- Output(Translatability translate, const std::string& name);
+ Output(Translatability translate, std::string name);
};
} // namespace ControllerEmu