From cf0d01a5d775f318f7cf1045a2a2a792b15111e6 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 3 Jun 2019 15:50:04 -0400
Subject: [PATCH] input_common/sdl: Remove unused header includes and forward
declarations
Gets rid of a few unnecessary inclusion dependencies. It also uncovered
a few indirect inclusion dependencies being relied upon.
---
src/input_common/sdl/sdl.h | 7 -------
src/input_common/sdl/sdl_impl.cpp | 2 --
src/input_common/sdl/sdl_impl.h | 7 +++++--
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h
index d7f24c68a7..5306daa700 100644
--- a/src/input_common/sdl/sdl.h
+++ b/src/input_common/sdl/sdl.h
@@ -6,15 +6,8 @@
#include <memory>
#include <vector>
-#include "core/frontend/input.h"
#include "input_common/main.h"
-union SDL_Event;
-
-namespace Common {
-class ParamPackage;
-} // namespace Common
-
namespace InputCommon::Polling {
class DevicePoller;
enum class DeviceType;
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp
index 5b849283ae..24252279d1 100644
--- a/src/input_common/sdl/sdl_impl.cpp
+++ b/src/input_common/sdl/sdl_impl.cpp
@@ -6,7 +6,6 @@
#include <atomic>
#include <cmath>
#include <functional>
-#include <iterator>
#include <mutex>
#include <string>
#include <thread>
@@ -15,7 +14,6 @@
#include <utility>
#include <vector>
#include <SDL.h>
-#include "common/assert.h"
#include "common/logging/log.h"
#include "common/math_util.h"
#include "common/param_package.h"
diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h
index 2579741d65..fadcf3139e 100644
--- a/src/input_common/sdl/sdl_impl.h
+++ b/src/input_common/sdl/sdl_impl.h
@@ -6,7 +6,10 @@
#include <atomic>
#include <memory>
+#include <mutex>
#include <thread>
+#include <unordered_map>
+#include "common/common_types.h"
#include "common/threadsafe_queue.h"
#include "input_common/sdl/sdl.h"
@@ -16,9 +19,9 @@ using SDL_JoystickID = s32;
namespace InputCommon::SDL {
-class SDLJoystick;
-class SDLButtonFactory;
class SDLAnalogFactory;
+class SDLButtonFactory;
+class SDLJoystick;
class SDLState : public State {
public:
--
GitLab