From 12e7d3b254828fcaf2dda3906ae0e80723eeffa4 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
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 475257f42..38bf47575 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 8bb39750a1f0ebe9b9a30b58188198123e69598a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
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 +-
 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 38bf47575..263c24771 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;
-- 
cgit v1.2.3


From 0849be094e8bd55ee9d81bcc545238af134410e7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
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 -
 1 file changed, 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 263c24771..02c7ccff7 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"
-- 
cgit v1.2.3


From 187c9d7e33220dd100abf5d5b76f9d9cab7f3084 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
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 02c7ccff7..a7a6ad8c2 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<int>(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<int>(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<int>(data.pad.port));
-- 
cgit v1.2.3