Convert all includes to relative paths.

2025-07-23 06:09:50 -06:00 · 2014-02-17 05:18:15 -05:00
parent 73691a8587
commit 2afe215271
893 changed files with 4628 additions and 4957 deletions
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Android.h"
+#include "InputCommon/ControllerInterface/Android/Android.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@ -4,8 +4,8 @@

 #pragma once

-#include "../Device.h"
-#include "Android/ButtonManager.h"
+#include "DolphinWX/Android/ButtonManager.h"
+#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@ -2,36 +2,35 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "ControllerInterface.h"
+#include "Common/Thread.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"

 #if USE_EGL
-#include "GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
 #endif

 #ifdef CIFACE_USE_XINPUT
-	#include "XInput/XInput.h"
+	#include "InputCommon/ControllerInterface/XInput/XInput.h"
 #endif
 #ifdef CIFACE_USE_DINPUT
-	#include "DInput/DInput.h"
+	#include "InputCommon/ControllerInterface/DInput/DInput.h"
 #endif
 #ifdef CIFACE_USE_XLIB
-	#include "Xlib/Xlib.h"
+	#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
 	#ifdef CIFACE_USE_X11_XINPUT2
-		#include "Xlib/XInput2.h"
+		#include "InputCommon/ControllerInterface/Xlib/XInput2.h"
 	#endif
 #endif
 #ifdef CIFACE_USE_OSX
-	#include "OSX/OSX.h"
+	#include "InputCommon/ControllerInterface/OSX/OSX.h"
 #endif
 #ifdef CIFACE_USE_SDL
-	#include "SDL/SDL.h"
+	#include "InputCommon/ControllerInterface/SDL/SDL.h"
 #endif
 #ifdef CIFACE_USE_ANDROID
-	#include "Android/Android.h"
+	#include "InputCommon/ControllerInterface/Android/Android.h"
 #endif

-#include "Thread.h"
-
 using namespace ciface::ExpressionParser;

 namespace
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@ -4,16 +4,17 @@

 #pragma once

-#include <vector>
-#include <string>
-#include <sstream>
-#include <map>
 #include <algorithm>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>

-#include "Common.h"
-#include "Thread.h"
-#include "ExpressionParser.h"
-#include "Device.h"
+
+#include "Common/Common.h"
+#include "Common/Thread.h"
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
+#include "InputCommon/ControllerInterface/Device.h"

 // enable disable sources
 #ifdef _WIN32
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "DInput.h"
+#include "Common/StringUtil.h"

-#include "StringUtil.h"
+#include "InputCommon/ControllerInterface/DInput/DInput.h"

-#include "DInputJoystick.h"
-#include "DInputKeyboardMouse.h"
+#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"
+#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h"

 #pragma comment(lib, "Dinput8.lib")
 #pragma comment(lib, "dxguid.lib")
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
@ -4,7 +4,7 @@

 #pragma once

-#include "../Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 #define DINPUT_SOURCE_NAME "DInput"

--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "DInputJoystick.h"
-#include "DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"

+#include <algorithm>
 #include <map>
 #include <sstream>
-#include <algorithm>

 #include <wbemidl.h>
 #include <oleauto.h>
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
@ -4,8 +4,8 @@

 #pragma once

-#include "../Device.h"
-#include "../ForceFeedback/ForceFeedbackDevice.h"
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@ -2,8 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "DInputKeyboardMouse.h"
-#include "DInput.h"
+#include <algorithm>
+#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h"
+#include "InputCommon/ControllerInterface/DInput/DInput.h"

 	// (lower would be more sensitive) user can lower sensitivity by setting range
 	// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
@ -25,7 +26,7 @@ static const struct
 	const char* const name;
 } named_keys[] =
 {
-#include "NamedKeys.h"
+#include "InputCommon/ControllerInterface/DInput/NamedKeys.h"
 };

 static const struct
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@ -4,7 +4,7 @@

 #pragma once

-#include "../Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 #define DIRECTINPUT_VERSION 0x0800
 #define WIN32_LEAN_AND_MEAN
--- a/Source/Core/InputCommon/ControllerInterface/Device.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp
@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Device.h"
-
-#include <string>
 #include <sstream>
+#include <string>
+
+#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@ -7,7 +7,7 @@
 #include <string>
 #include <vector>

-#include "Common.h"
+#include "Common/Common.h"

 // idk in case I wanted to change it to double or something, idk what's best
 typedef float ControlState;
--- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
@ -2,14 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "ExpressionParser.h"
-
+#include <algorithm>
 #include <cassert>
 #include <iostream>
-#include <string>
 #include <map>
+#include <string>
 #include <vector>

+#include "InputCommon/ControllerInterface/ExpressionParser.h"
+
 using namespace ciface::Core;

 namespace ciface
--- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
@ -5,7 +5,7 @@
 #pragma once

 #include <string>
-#include "Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "ForceFeedbackDevice.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
@ -4,7 +4,9 @@

 #pragma once

-#include "../Device.h"
+#include <list>
+
+#include "InputCommon/ControllerInterface/Device.h"

 #ifdef _WIN32
 #define DIRECTINPUT_VERSION 0x0800
@ -13,11 +15,9 @@
 #include <Windows.h>
 #include <dinput.h>
 #elif __APPLE__
-#include "OSX/DirectInputAdapter.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h"
 #endif

-#include <list>
-
 namespace ciface
 {
 namespace ForceFeedback
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
@ -4,7 +4,7 @@

 #pragma once

-#include "../Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
@ -6,9 +6,9 @@
 #include <IOKit/hid/IOHIDLib.h>
 #include <Cocoa/Cocoa.h>

-#include "OSX.h"
-#include "OSXKeyboard.h"
-#include "OSXJoystick.h"
+#include "InputCommon/ControllerInterface/OSX/OSX.h"
+#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h"
+#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"

 #include <map>

--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@ -6,8 +6,8 @@

 #include <IOKit/hid/IOHIDLib.h>

-#include "../Device.h"
-#include "../ForceFeedback/ForceFeedbackDevice.h"
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

+#include <sstream>
+
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>

-#include "OSXJoystick.h"
-
-#include <sstream>
+#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@ -6,7 +6,7 @@

 #include <IOKit/hid/IOHIDLib.h>

-#include "../Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
@ -2,14 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

+#include <sstream>
+
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <Cocoa/Cocoa.h>
 #include <wx/wx.h> // wxWidgets

-#include "OSXKeyboard.h"
-
-#include <sstream>
+#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "SDL.h"
-#include <StringUtil.h>
-
+#include <algorithm>
 #include <map>
 #include <sstream>
-#include <algorithm>
+
+#include "Common/StringUtil.h"
+#include "InputCommon/ControllerInterface/SDL/SDL.h"

 #ifdef _WIN32
 #pragma comment(lib, "SDL2.lib")
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
@ -4,12 +4,13 @@

 #pragma once

-#include "../Device.h"
-
 #include <list>

 #include <SDL.h>

+#include "InputCommon/ControllerInterface/Device.h"
+
+
 #if SDL_VERSION_ATLEAST(1, 3, 0)
 	#define USE_SDL_HAPTIC
 #endif
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
@ -1,5 +1,5 @@

-#include "XInput.h"
+#include "InputCommon/ControllerInterface/XInput/XInput.h"

 namespace ciface
 {
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
@ -5,7 +5,7 @@

 #pragma once

-#include "../Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 #define NOMINMAX
 #include <Windows.h>
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@ -2,10 +2,10 @@
 // Licensed under the GNU General Public License, version 2 or higher.
 // Refer to the license.txt file included.

-
-#include "XInput2.h"
-#include <X11/XKBlib.h>
 #include <cmath>
+#include <X11/XKBlib.h>
+
+#include "InputCommon/ControllerInterface/Xlib/XInput2.h"

 // This is an input plugin using the XInput 2.0 extension to the X11 protocol,
 // loosely based on the old XLib plugin. (Has nothing to do with the XInput
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@ -6,7 +6,7 @@

 #pragma once

-#include "../Device.h"
+#include "InputCommon/ControllerInterface/Device.h"

 extern "C" {
 #include <X11/Xlib.h>
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@ -1,4 +1,4 @@
-#include "Xlib.h"
+#include "InputCommon/ControllerInterface/Xlib/Xlib.h"

 #include <X11/XKBlib.h>

--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
@ -1,9 +1,9 @@
 #pragma once

-#include "../Device.h"
-
-#include <X11/Xlib.h>
 #include <X11/keysym.h>
+#include <X11/Xlib.h>
+
+#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface
 {