moved sdl2manager to input-plugins

2025-03-11 16:13:16 +01:00 · 2015-07-07 15:24:39 -07:00 · 2015-07-07 15:24:39 -07:00 · 4f8cf0af8c
commit 4f8cf0af8c
parent d75353eeb2
5 changed files with 4 additions and 8 deletions
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -122,8 +122,8 @@
 #include "devices/Faceshift.h"
 #include "devices/Leapmotion.h"
 #include "devices/RealSense.h"
-#include "devices/SDL2Manager.h"
 #include "devices/MIDIManager.h"
+#include <input-plugins/SDL2Manager.h>
 #include <input-plugins/ViveControllerManager.h>
 #include "RenderDeferredTask.h"
 #include "scripting/AccountScriptingInterface.h"
--- a/libraries/input-plugins/src/input-plugins/Joystick.cpp
+++ b/libraries/input-plugins/src/input-plugins/Joystick.cpp
@ -13,8 +13,6 @@

 #include <glm/glm.hpp>

-#include "Application.h"
-
 #include "Joystick.h"

 const float CONTROLLER_THRESHOLD = 0.3f;
--- a/libraries/input-plugins/src/input-plugins/Joystick.h
+++ b/libraries/input-plugins/src/input-plugins/Joystick.h
@ -20,7 +20,7 @@
 #undef main
 #endif

-#include <input-plugins/UserInputMapper.h>
+#include "UserInputMapper.h"

 class Joystick : public QObject {
    Q_OBJECT
--- a/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
+++ b/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
@ -15,8 +15,6 @@
 #include <HFBackEvent.h>
 #include <PerfStat.h>

-#include "Application.h"
-
 #include "SDL2Manager.h"

 #ifdef HAVE_SDL2
--- a/libraries/input-plugins/src/input-plugins/SDL2Manager.h
+++ b/libraries/input-plugins/src/input-plugins/SDL2Manager.h
@ -16,9 +16,9 @@
 #include <SDL.h>
 #endif

-#include <input-plugins/UserInputMapper.h>
+#include "UserInputMapper.h"

-#include "devices/Joystick.h"
+#include "Joystick.h"

 class SDL2Manager : public QObject {
    Q_OBJECT