Просмотр исходного кода

input_common/main: Remove unnecessary headers

Lioncash 5 лет назад
Родитель
Сommit
98f5d8a713
3 измененных файлов с 11 добавлено и 5 удалено
  1. 8 2
      src/input_common/main.h
  2. 1 1
      src/input_common/sdl/sdl_impl.cpp
  3. 2 2
      src/input_common/settings.h

+ 8 - 2
src/input_common/main.h

@@ -8,13 +8,19 @@
 #include <string>
 #include <string>
 #include <unordered_map>
 #include <unordered_map>
 #include <vector>
 #include <vector>
-#include "input_common/gcadapter/gc_poller.h"
-#include "input_common/settings.h"
 
 
 namespace Common {
 namespace Common {
 class ParamPackage;
 class ParamPackage;
 }
 }
 
 
+namespace Settings::NativeAnalog {
+enum Values : int;
+}
+
+namespace Settings::NativeButton {
+enum Values : int;
+}
+
 namespace InputCommon {
 namespace InputCommon {
 namespace Polling {
 namespace Polling {
 
 

+ 1 - 1
src/input_common/sdl/sdl_impl.cpp

@@ -17,11 +17,11 @@
 #include <vector>
 #include <vector>
 #include <SDL.h>
 #include <SDL.h>
 #include "common/logging/log.h"
 #include "common/logging/log.h"
-#include "common/math_util.h"
 #include "common/param_package.h"
 #include "common/param_package.h"
 #include "common/threadsafe_queue.h"
 #include "common/threadsafe_queue.h"
 #include "core/frontend/input.h"
 #include "core/frontend/input.h"
 #include "input_common/sdl/sdl_impl.h"
 #include "input_common/sdl/sdl_impl.h"
+#include "input_common/settings.h"
 
 
 namespace InputCommon::SDL {
 namespace InputCommon::SDL {
 
 

+ 2 - 2
src/input_common/settings.h

@@ -10,7 +10,7 @@
 
 
 namespace Settings {
 namespace Settings {
 namespace NativeButton {
 namespace NativeButton {
-enum Values {
+enum Values : int {
     A,
     A,
     B,
     B,
     X,
     X,
@@ -52,7 +52,7 @@ extern const std::array<const char*, NumButtons> mapping;
 } // namespace NativeButton
 } // namespace NativeButton
 
 
 namespace NativeAnalog {
 namespace NativeAnalog {
-enum Values {
+enum Values : int {
     LStick,
     LStick,
     RStick,
     RStick,