From 5f80c764b0266c27568c312504708ad1c36246ed Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Jan 2022 11:37:48 -0500 Subject: input_common/input_mapping: Default constructor --- src/input_common/input_mapping.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input_common/input_mapping.cpp') diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 475257f422..38bf475752 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -9,7 +9,7 @@ namespace InputCommon { -MappingFactory::MappingFactory() {} +MappingFactory::MappingFactory() = default; void MappingFactory::BeginMapping(Polling::InputType type) { is_enabled = true; -- cgit v1.2.3 From cec9e4ec77651a219076b862e0a2cbbde0c38a24 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Jan 2022 11:39:17 -0500 Subject: input_common/input_mapping: Remove const from return value Top-level const on a return by value can inhibit move semantics, and is unnecessary. --- src/input_common/input_mapping.cpp | 2 +- src/input_common/input_mapping.h | 2 +- src/input_common/main.cpp | 2 +- src/input_common/main.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/input_common/input_mapping.cpp') diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 38bf475752..263c24771d 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -19,7 +19,7 @@ void MappingFactory::BeginMapping(Polling::InputType type) { second_axis = -1; } -[[nodiscard]] const Common::ParamPackage MappingFactory::GetNextInput() { +Common::ParamPackage MappingFactory::GetNextInput() { Common::ParamPackage input; input_queue.Pop(input); return input; diff --git a/src/input_common/input_mapping.h b/src/input_common/input_mapping.h index 93564b5f8c..aac9aee64a 100644 --- a/src/input_common/input_mapping.h +++ b/src/input_common/input_mapping.h @@ -20,7 +20,7 @@ public: void BeginMapping(Polling::InputType type); /// Returns an input event with mapping information from the input_queue - [[nodiscard]] const Common::ParamPackage GetNextInput(); + [[nodiscard]] Common::ParamPackage GetNextInput(); /** * Registers mapping input data from the driver diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index e2b415bf6f..a4d7ed645b 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -394,7 +394,7 @@ void InputSubsystem::BeginMapping(Polling::InputType type) { impl->mapping_factory->BeginMapping(type); } -const Common::ParamPackage InputSubsystem::GetNextInput() const { +Common::ParamPackage InputSubsystem::GetNextInput() const { return impl->mapping_factory->GetNextInput(); } diff --git a/src/input_common/main.h b/src/input_common/main.h index c6f97f6918..baf107e0f7 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -126,7 +126,7 @@ public: void BeginMapping(Polling::InputType type); /// Returns an input event with mapping information. - [[nodiscard]] const Common::ParamPackage GetNextInput() const; + [[nodiscard]] Common::ParamPackage GetNextInput() const; /// Stop polling from all backends. void StopMapping() const; -- cgit v1.2.3 From 04a33bc652d37a6004fa2d3c980a007efe732722 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Jan 2022 11:42:05 -0500 Subject: input_common/input_mapping: Add missing includes Ensures that the class always sees the types it needs. --- src/input_common/input_mapping.cpp | 1 - src/input_common/input_mapping.h | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/input_common/input_mapping.cpp') diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 263c24771d..02c7ccff72 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included -#include "common/common_types.h" #include "common/settings.h" #include "input_common/input_engine.h" #include "input_common/input_mapping.h" diff --git a/src/input_common/input_mapping.h b/src/input_common/input_mapping.h index aac9aee64a..e0dfbc7ad1 100644 --- a/src/input_common/input_mapping.h +++ b/src/input_common/input_mapping.h @@ -3,8 +3,14 @@ // Refer to the license.txt file included #pragma once + +#include "common/param_package.h" #include "common/threadsafe_queue.h" +namespace InputCommon::Polling { +enum class InputType; +} + namespace InputCommon { class InputEngine; struct MappingData; -- cgit v1.2.3 From f02a9e4d81a4230eabb91d77e80295c466bde807 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Jan 2022 11:48:59 -0500 Subject: input_common/input_mapping: Simplify UUID validity checks Makes the checks a little more intuitive to read and doesn't construct an extra UUID instance --- src/input_common/input_mapping.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input_common/input_mapping.cpp') diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 02c7ccff72..a7a6ad8c20 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -56,7 +56,7 @@ void MappingFactory::StopMapping() { void MappingFactory::RegisterButton(const MappingData& data) { Common::ParamPackage new_input; new_input.Set("engine", data.engine); - if (data.pad.guid != Common::UUID{}) { + if (data.pad.guid.IsValid()) { new_input.Set("guid", data.pad.guid.Format()); } new_input.Set("port", static_cast(data.pad.port)); @@ -92,7 +92,7 @@ void MappingFactory::RegisterButton(const MappingData& data) { void MappingFactory::RegisterStick(const MappingData& data) { Common::ParamPackage new_input; new_input.Set("engine", data.engine); - if (data.pad.guid != Common::UUID{}) { + if (data.pad.guid.IsValid()) { new_input.Set("guid", data.pad.guid.Format()); } new_input.Set("port", static_cast(data.pad.port)); @@ -137,7 +137,7 @@ void MappingFactory::RegisterStick(const MappingData& data) { void MappingFactory::RegisterMotion(const MappingData& data) { Common::ParamPackage new_input; new_input.Set("engine", data.engine); - if (data.pad.guid != Common::UUID{}) { + if (data.pad.guid.IsValid()) { new_input.Set("guid", data.pad.guid.Format()); } new_input.Set("port", static_cast(data.pad.port)); -- cgit v1.2.3