From 4b9b203c09e2cfb3405bb44b7ac266b91b90c837 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 28 Aug 2020 19:11:14 -0400
Subject: input_common/main: Remove unimplemented prototype

I forgot to remove this in the rebase when removing most of the global
variables within the input common codebase.
---
 src/input_common/main.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/input_common/main.h b/src/input_common/main.h
index f66308163..ef52983e2 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -40,9 +40,6 @@ public:
      */
     virtual Common::ParamPackage GetNextInput() = 0;
 };
-
-// Get all DevicePoller from all backends for a specific device type
-std::vector<std::unique_ptr<DevicePoller>> GetPollers(DeviceType type);
 } // namespace Polling
 
 class GCAnalogFactory;
-- 
cgit v1.2.3


From 98f5d8a713966e960f0e4d4f520b67786ebad9d9 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 28 Aug 2020 19:15:06 -0400
Subject: input_common/main: Remove unnecessary headers

---
 src/input_common/main.h           | 10 ++++++++--
 src/input_common/sdl/sdl_impl.cpp |  2 +-
 src/input_common/settings.h       |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/input_common/main.h b/src/input_common/main.h
index ef52983e2..58e5dc250 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -8,13 +8,19 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include "input_common/gcadapter/gc_poller.h"
-#include "input_common/settings.h"
 
 namespace Common {
 class ParamPackage;
 }
 
+namespace Settings::NativeAnalog {
+enum Values : int;
+}
+
+namespace Settings::NativeButton {
+enum Values : int;
+}
+
 namespace InputCommon {
 namespace Polling {
 
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp
index 7605c884d..c8d9eb2bc 100644
--- a/src/input_common/sdl/sdl_impl.cpp
+++ b/src/input_common/sdl/sdl_impl.cpp
@@ -17,11 +17,11 @@
 #include <vector>
 #include <SDL.h>
 #include "common/logging/log.h"
-#include "common/math_util.h"
 #include "common/param_package.h"
 #include "common/threadsafe_queue.h"
 #include "core/frontend/input.h"
 #include "input_common/sdl/sdl_impl.h"
+#include "input_common/settings.h"
 
 namespace InputCommon::SDL {
 
diff --git a/src/input_common/settings.h b/src/input_common/settings.h
index 8e481a7fe..2d258960b 100644
--- a/src/input_common/settings.h
+++ b/src/input_common/settings.h
@@ -10,7 +10,7 @@
 
 namespace Settings {
 namespace NativeButton {
-enum Values {
+enum Values : int {
     A,
     B,
     X,
@@ -52,7 +52,7 @@ extern const std::array<const char*, NumButtons> mapping;
 } // namespace NativeButton
 
 namespace NativeAnalog {
-enum Values {
+enum Values : int {
     LStick,
     RStick,
 
-- 
cgit v1.2.3