From 2afe2152712981e21d6bda6f029292ed2b1cf91e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 17 Feb 2014 05:18:15 -0500 Subject: Convert all includes to relative paths. --- Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 8 ++++---- Source/Core/InputCommon/ControllerInterface/DInput/DInput.h | 2 +- .../InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 6 +++--- .../Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h | 4 ++-- .../ControllerInterface/DInput/DInputKeyboardMouse.cpp | 7 ++++--- .../InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput') 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 #include #include -#include #include #include 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 +#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 -- cgit v1.2.3 From 6847a0fc0c1699eb01fadd50cfaf76e4e34a02cb Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:17:31 +0100 Subject: Fix more header sorting issues in InputCommon/ (now check-includes clean). --- Source/Core/InputCommon/ControllerInterface/DInput/DInput.h | 7 +++---- .../InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 9 ++++----- .../ControllerInterface/DInput/DInputKeyboardMouse.cpp | 5 +++-- .../InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h | 6 +++--- 4 files changed, 13 insertions(+), 14 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput') diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index f7e7c98776..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 "InputCommon/ControllerInterface/Device.h" - #define DINPUT_SOURCE_NAME "DInput" #define DIRECTINPUT_VERSION 0x0800 #define WIN32_LEAN_AND_MEAN #define NOMINMAX -#include #include - #include +#include + +#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 de922b2f57..b524f1f0f4 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -2,15 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "InputCommon/ControllerInterface/DInput/DInput.h" -#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" - #include #include +#include #include - #include -#include + +#include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index fa036ced79..c9dd9034fe 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -3,8 +3,9 @@ // Refer to the license.txt file included. #include -#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" + #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 @@ -26,7 +27,7 @@ static const struct const char* const name; } named_keys[] = { -#include "InputCommon/ControllerInterface/DInput/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 49f6a402d4..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 "InputCommon/ControllerInterface/Device.h" - #define DIRECTINPUT_VERSION 0x0800 #define WIN32_LEAN_AND_MEAN #define NOMINMAX -#include #include +#include + +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { -- cgit v1.2.3 From 91286f5021e1e0c6ea4a4b38637e5de77fffc7a0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 13:46:47 -0500 Subject: Fix the Windows build in relation to the recent changes. --- Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput') diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index b524f1f0f4..e98c13df88 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include -- cgit v1.2.3