summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-02-17 05:18:15 -0500
committerLioncash <mathew1800@gmail.com>2014-02-18 02:19:10 -0500
commit2afe2152712981e21d6bda6f029292ed2b1cf91e (patch)
treeaeac832bce3cc31516385ce9e1d5cb36f543bdd9 /Source/Core/InputCommon/ControllerInterface/DInput
parent73691a8587e5f09ef138384d2ff97e4059ba9380 (diff)
Convert all includes to relative paths.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInput.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h2
6 files changed, 15 insertions, 14 deletions
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..f7e7c98776 100644
--- 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"
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index 07e439e4eb..de922b2f57 100644
--- 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>
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..fa036ced79 100644
--- 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
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
index aeeacca5e2..49f6a402d4 100644
--- 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