diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput')
4 files changed, 13 insertions, 14 deletions
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 <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 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 <algorithm> #include <map> +#include <oleauto.h> #include <sstream> - #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/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 <algorithm> -#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 <Windows.h> #include <dinput.h> +#include <windows.h> + +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { |