diff options
author | german77 <juangerman-13@hotmail.com> | 2021-10-15 19:07:47 -0500 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-24 20:30:24 -0600 |
commit | e0da5c1bbcdf85676f968b63c8ae2587f0464193 (patch) | |
tree | 588837d1181d6b9d3bd4536fd4d2c5877335632d /src/input_common/helpers | |
parent | 06a5ef5874144a70e30e577a83ba68d1dad79e78 (diff) |
kraken: Fix errors from rebase and format files
Diffstat (limited to 'src/input_common/helpers')
-rw-r--r-- | src/input_common/helpers/stick_from_buttons.cpp | 3 | ||||
-rw-r--r-- | src/input_common/helpers/stick_from_buttons.h | 3 | ||||
-rw-r--r-- | src/input_common/helpers/touch_from_buttons.cpp | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp index 89ba4aeb1..38f150746 100644 --- a/src/input_common/helpers/stick_from_buttons.cpp +++ b/src/input_common/helpers/stick_from_buttons.cpp @@ -251,8 +251,7 @@ private: std::chrono::time_point<std::chrono::steady_clock> last_update; }; -std::unique_ptr<Input::InputDevice> StickFromButton::Create( - const Common::ParamPackage& params) { +std::unique_ptr<Input::InputDevice> StickFromButton::Create(const Common::ParamPackage& params) { const std::string null_engine = Common::ParamPackage{{"engine", "null"}}.Serialize(); auto up = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("up", null_engine)); auto down = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("down", null_engine)); diff --git a/src/input_common/helpers/stick_from_buttons.h b/src/input_common/helpers/stick_from_buttons.h index 87165e022..1d6e24c98 100644 --- a/src/input_common/helpers/stick_from_buttons.h +++ b/src/input_common/helpers/stick_from_buttons.h @@ -25,8 +25,7 @@ public: * - "modifier": a serialized ParamPackage for creating a button device as the modifier * - "modifier_scale": a float for the multiplier the modifier gives to the position */ - std::unique_ptr<Input::InputDevice> Create( - const Common::ParamPackage& params) override; + std::unique_ptr<Input::InputDevice> Create(const Common::ParamPackage& params) override; }; } // namespace InputCommon diff --git a/src/input_common/helpers/touch_from_buttons.cpp b/src/input_common/helpers/touch_from_buttons.cpp index 6c9046ffb..2abfaf841 100644 --- a/src/input_common/helpers/touch_from_buttons.cpp +++ b/src/input_common/helpers/touch_from_buttons.cpp @@ -57,9 +57,7 @@ private: const Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false}; }; - -std::unique_ptr<Input::InputDevice> TouchFromButton::Create( - const Common::ParamPackage& params) { +std::unique_ptr<Input::InputDevice> TouchFromButton::Create(const Common::ParamPackage& params) { const std::string null_engine = Common::ParamPackage{{"engine", "null"}}.Serialize(); auto button = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("button", null_engine)); |