summaryrefslogtreecommitdiff
path: root/src/input_common
diff options
context:
space:
mode:
Diffstat (limited to 'src/input_common')
-rw-r--r--src/input_common/keyboard.cpp3
-rw-r--r--src/input_common/sdl/sdl.cpp8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/input_common/keyboard.cpp b/src/input_common/keyboard.cpp
index 0410ff328..525fe6abc 100644
--- a/src/input_common/keyboard.cpp
+++ b/src/input_common/keyboard.cpp
@@ -5,6 +5,7 @@
5#include <atomic> 5#include <atomic>
6#include <list> 6#include <list>
7#include <mutex> 7#include <mutex>
8#include <utility>
8#include "input_common/keyboard.h" 9#include "input_common/keyboard.h"
9 10
10namespace InputCommon { 11namespace InputCommon {
@@ -12,7 +13,7 @@ namespace InputCommon {
12class KeyButton final : public Input::ButtonDevice { 13class KeyButton final : public Input::ButtonDevice {
13public: 14public:
14 explicit KeyButton(std::shared_ptr<KeyButtonList> key_button_list_) 15 explicit KeyButton(std::shared_ptr<KeyButtonList> key_button_list_)
15 : key_button_list(key_button_list_) {} 16 : key_button_list(std::move(key_button_list_)) {}
16 17
17 ~KeyButton() override; 18 ~KeyButton() override;
18 19
diff --git a/src/input_common/sdl/sdl.cpp b/src/input_common/sdl/sdl.cpp
index 604d9a7d9..d1b960fd7 100644
--- a/src/input_common/sdl/sdl.cpp
+++ b/src/input_common/sdl/sdl.cpp
@@ -82,7 +82,7 @@ private:
82class SDLButton final : public Input::ButtonDevice { 82class SDLButton final : public Input::ButtonDevice {
83public: 83public:
84 explicit SDLButton(std::shared_ptr<SDLJoystick> joystick_, int button_) 84 explicit SDLButton(std::shared_ptr<SDLJoystick> joystick_, int button_)
85 : joystick(joystick_), button(button_) {} 85 : joystick(std::move(joystick_)), button(button_) {}
86 86
87 bool GetStatus() const override { 87 bool GetStatus() const override {
88 return joystick->GetButton(button); 88 return joystick->GetButton(button);
@@ -96,7 +96,7 @@ private:
96class SDLDirectionButton final : public Input::ButtonDevice { 96class SDLDirectionButton final : public Input::ButtonDevice {
97public: 97public:
98 explicit SDLDirectionButton(std::shared_ptr<SDLJoystick> joystick_, int hat_, Uint8 direction_) 98 explicit SDLDirectionButton(std::shared_ptr<SDLJoystick> joystick_, int hat_, Uint8 direction_)
99 : joystick(joystick_), hat(hat_), direction(direction_) {} 99 : joystick(std::move(joystick_)), hat(hat_), direction(direction_) {}
100 100
101 bool GetStatus() const override { 101 bool GetStatus() const override {
102 return joystick->GetHatDirection(hat, direction); 102 return joystick->GetHatDirection(hat, direction);
@@ -112,7 +112,7 @@ class SDLAxisButton final : public Input::ButtonDevice {
112public: 112public:
113 explicit SDLAxisButton(std::shared_ptr<SDLJoystick> joystick_, int axis_, float threshold_, 113 explicit SDLAxisButton(std::shared_ptr<SDLJoystick> joystick_, int axis_, float threshold_,
114 bool trigger_if_greater_) 114 bool trigger_if_greater_)
115 : joystick(joystick_), axis(axis_), threshold(threshold_), 115 : joystick(std::move(joystick_)), axis(axis_), threshold(threshold_),
116 trigger_if_greater(trigger_if_greater_) {} 116 trigger_if_greater(trigger_if_greater_) {}
117 117
118 bool GetStatus() const override { 118 bool GetStatus() const override {
@@ -132,7 +132,7 @@ private:
132class SDLAnalog final : public Input::AnalogDevice { 132class SDLAnalog final : public Input::AnalogDevice {
133public: 133public:
134 SDLAnalog(std::shared_ptr<SDLJoystick> joystick_, int axis_x_, int axis_y_) 134 SDLAnalog(std::shared_ptr<SDLJoystick> joystick_, int axis_x_, int axis_y_)
135 : joystick(joystick_), axis_x(axis_x_), axis_y(axis_y_) {} 135 : joystick(std::move(joystick_)), axis_x(axis_x_), axis_y(axis_y_) {}
136 136
137 std::tuple<float, float> GetStatus() const override { 137 std::tuple<float, float> GetStatus() const override {
138 return joystick->GetAnalog(axis_x, axis_y); 138 return joystick->GetAnalog(axis_x, axis_y);