summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
commit6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch)
treecfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/InputCommon
parentafba0d736d363fa4c71b86d84a1caad3d52f147e (diff)
parent24ba058404d8036a977a41e55c58a7326302cb34 (diff)
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControllerEmu.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu.h11
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Android/Android.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Android/Android.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp21
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h16
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInput.h7
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp10
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Device.cpp6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Device.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ExpressionParser.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h8
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSX.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerInterface/SDL/SDL.h5
-rw-r--r--Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/XInput/XInput.h6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h6
-rw-r--r--Source/Core/InputCommon/InputConfig.cpp8
-rw-r--r--Source/Core/InputCommon/InputConfig.h14
-rw-r--r--Source/Core/InputCommon/UDPWiimote.cpp21
-rw-r--r--Source/Core/InputCommon/UDPWiimote.h2
-rw-r--r--Source/Core/InputCommon/UDPWrapper.cpp8
-rw-r--r--Source/Core/InputCommon/UDPWrapper.h10
-rw-r--r--Source/Core/InputCommon/X11InputBase.cpp8
-rw-r--r--Source/Core/InputCommon/X11InputBase.h6
-rw-r--r--Source/Core/InputCommon/stdafx.cpp2
41 files changed, 138 insertions, 136 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index 8224e8146c..34b8695ebd 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "ControllerEmu.h"
+#include "InputCommon/ControllerEmu.h"
#if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h>
diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h
index e7ccabd8ca..9f8f2db497 100644
--- a/Source/Core/InputCommon/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu.h
@@ -7,16 +7,15 @@
// windows crap
#define NOMINMAX
+#include <algorithm>
#include <cmath>
#include <memory>
-#include <vector>
#include <string>
-#include <algorithm>
-
-#include "GCPadStatus.h"
+#include <vector>
-#include "ControllerInterface/ControllerInterface.h"
-#include "IniFile.h"
+#include "Common/IniFile.h"
+#include "InputCommon/GCPadStatus.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
#define sign(x) ((x)?(x)<0?-1:1:0)
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 6ad7b13ad7..fa97e8f222 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
index 992bec80b1..aea09ac97c 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index f1e2136ba9..7153a8d7f7 100644
--- 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
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index b63ee9f793..affabafc9b 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -4,16 +4,16 @@
#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/Device.h"
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
// enable disable sources
#ifdef _WIN32
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
index b9f483da4d..f2d2460ee6 100644
--- 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")
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
index 939f9d6da3..b4f1b27199 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
@@ -4,17 +4,16 @@
#pragma once
-#include "../Device.h"
-
#define DINPUT_SOURCE_NAME "DInput"
#define DIRECTINPUT_VERSION 0x0800
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
-#include <Windows.h>
#include <dinput.h>
-
#include <list>
+#include <windows.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
namespace ciface
{
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index 07e439e4eb..e98c13df88 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -2,15 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "DInputJoystick.h"
-#include "DInput.h"
-
+#include <algorithm>
#include <map>
#include <sstream>
-#include <algorithm>
-
#include <wbemidl.h>
-#include <oleauto.h>
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"
namespace ciface
{
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
index 045a8febc6..0ac535cdfe 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index 4b17574d7b..c9dd9034fe 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -2,8 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "DInputKeyboardMouse.h"
-#include "DInput.h"
+#include <algorithm>
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.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 +27,7 @@ static const struct
const char* const name;
} named_keys[] =
{
-#include "NamedKeys.h"
+#include "InputCommon/ControllerInterface/DInput/NamedKeys.h" // NOLINT
};
static const struct
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
index aeeacca5e2..558917e9cc 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -4,13 +4,13 @@
#pragma once
-#include "../Device.h"
-
#define DIRECTINPUT_VERSION 0x0800
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
-#include <Windows.h>
#include <dinput.h>
+#include <windows.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
namespace ciface
{
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp
index 1b402e9b23..295fc10b5a 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
index f61099f6fb..8b4dc65fbb 100644
--- 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;
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
index 802d1b8f0f..4e2f49f4d0 100644
--- 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
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
index deab16829e..18f972ce9e 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
index ff96aabb4b..7a4dfdaccc 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
index 8eea274182..9ef5873702 100644
--- 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
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
index 4217ae0169..95e685c8ce 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
index 93100a91f0..50b568cb9a 100644
--- 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>
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
index 3ad20ad039..ffbe475840 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index dbf5beff3c..6e0623e716 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
index 170e4ae9f2..36705075ee 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
index 101971dab6..fc784b81c6 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
index 074308305c..64c012c1c1 100644
--- 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")
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
index f9ed688932..15f39998b9 100644
--- 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
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
index a5b382e1ff..7574641258 100644
--- 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
{
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
index 39704821d7..f3dc398904 100644
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
@@ -5,12 +5,12 @@
#pragma once
-#include "../Device.h"
-
#define NOMINMAX
-#include <Windows.h>
+#include <windows.h>
#include <XInput.h>
+#include "InputCommon/ControllerInterface/Device.h"
+
#ifndef XINPUT_DEVSUBTYPE_FLIGHT_STICK
#error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong.
#endif
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index 4da005fa65..802346b81d 100644
--- 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
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index 4357ee9b5a..2714b70221 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -6,14 +6,14 @@
#pragma once
-#include "../Device.h"
-
extern "C" {
+#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/extensions/XInput2.h>
-#include <X11/keysym.h>
}
+#include "InputCommon/ControllerInterface/Device.h"
+
namespace ciface
{
namespace XInput2
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
index e507b88c9f..0d2bdab8f8 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@@ -1,7 +1,7 @@
-#include "Xlib.h"
-
#include <X11/XKBlib.h>
+#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
+
namespace ciface
{
namespace Xlib
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
index ed2e3098b4..9c506f67fe 100644
--- 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
{
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index e3e6d318af..859036c69e 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "InputConfig.h"
-#include "CommonPaths.h"
-#include "../Core/ConfigManager.h"
-#include "../Core/HW/Wiimote.h"
+#include "Common/CommonPaths.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/Wiimote.h"
+#include "InputCommon/InputConfig.h"
InputPlugin::~InputPlugin()
{
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
index 8fb284fc66..42a5b7b12f 100644
--- a/Source/Core/InputCommon/InputConfig.h
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -4,15 +4,15 @@
#pragma once
-#include "Thread.h"
-#include "FileUtil.h"
-#include "IniFile.h"
+#include <map>
+#include <vector>
-#include "ControllerInterface/ControllerInterface.h"
-#include "ControllerEmu.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Thread.h"
-#include <vector>
-#include <map>
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
// InputPlugin isn't a very good name anymore since it's used by GCPad/Wiimote
// which are not even plugins anymore.
diff --git a/Source/Core/InputCommon/UDPWiimote.cpp b/Source/Core/InputCommon/UDPWiimote.cpp
index 79b4fc020c..a50dbc17ca 100644
--- a/Source/Core/InputCommon/UDPWiimote.cpp
+++ b/Source/Core/InputCommon/UDPWiimote.cpp
@@ -2,7 +2,17 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "UDPWiimote.h"
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <functional>
+#include <list>
+#include <string.h>
+
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+
+#include "InputCommon/UDPWiimote.h"
#ifdef _WIN32
@@ -41,15 +51,6 @@
#endif
-#include "Thread.h"
-#include "Timer.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <list>
-#include <functional>
struct UDPWiimote::_d
{
diff --git a/Source/Core/InputCommon/UDPWiimote.h b/Source/Core/InputCommon/UDPWiimote.h
index 8d57c703ce..82f9635aea 100644
--- a/Source/Core/InputCommon/UDPWiimote.h
+++ b/Source/Core/InputCommon/UDPWiimote.h
@@ -4,8 +4,8 @@
#pragma once
-#include "Common.h"
#include <string>
+#include "Common/Common.h"
#define UDPWM_B1 (1<<0)
#define UDPWM_B2 (1<<1)
diff --git a/Source/Core/InputCommon/UDPWrapper.cpp b/Source/Core/InputCommon/UDPWrapper.cpp
index 1db21086e4..19eb619679 100644
--- a/Source/Core/InputCommon/UDPWrapper.cpp
+++ b/Source/Core/InputCommon/UDPWrapper.cpp
@@ -2,11 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "UDPWrapper.h"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "InputCommon/UDPWrapper.h"
const std::string DefaultPort(const int index)
{
diff --git a/Source/Core/InputCommon/UDPWrapper.h b/Source/Core/InputCommon/UDPWrapper.h
index 42b23f45d5..11a5ddb464 100644
--- a/Source/Core/InputCommon/UDPWrapper.h
+++ b/Source/Core/InputCommon/UDPWrapper.h
@@ -4,13 +4,13 @@
#pragma once
-#include "UDPWiimote.h"
-
-#include "Common.h"
-#include "ControllerEmu.h"
-#include "IniFile.h"
#include <string>
+#include "Common/Common.h"
+#include "Common/IniFile.h"
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/UDPWiimote.h"
+
class UDPWrapper : public ControllerEmu::ControlGroup
{
public:
diff --git a/Source/Core/InputCommon/X11InputBase.cpp b/Source/Core/InputCommon/X11InputBase.cpp
index 9b39f31d58..c6dce96a7b 100644
--- a/Source/Core/InputCommon/X11InputBase.cpp
+++ b/Source/Core/InputCommon/X11InputBase.cpp
@@ -2,10 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "X11InputBase.h"
-#include <string.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
#include <ctype.h>
+
+#include "InputCommon/X11InputBase.h"
+
namespace InputCommon
{
#if defined(HAVE_WX) && HAVE_WX
diff --git a/Source/Core/InputCommon/X11InputBase.h b/Source/Core/InputCommon/X11InputBase.h
index b2b917a7cf..dce3469d9d 100644
--- a/Source/Core/InputCommon/X11InputBase.h
+++ b/Source/Core/InputCommon/X11InputBase.h
@@ -4,14 +4,14 @@
#pragma once
-#include "Common.h"
-
-#include <X11/X.h>
#include <X11/keysym.h>
+#include <X11/X.h>
#if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h>
#endif
+#include "Common/Common.h"
+
namespace InputCommon
{
#if defined(HAVE_WX) && HAVE_WX
diff --git a/Source/Core/InputCommon/stdafx.cpp b/Source/Core/InputCommon/stdafx.cpp
index b602b39925..d2ad768558 100644
--- a/Source/Core/InputCommon/stdafx.cpp
+++ b/Source/Core/InputCommon/stdafx.cpp
@@ -2,4 +2,4 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "stdafx.h"
+#include "InputCommon/stdafx.h"