diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-20 02:08:44 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-20 02:08:44 +0100 |
| commit | 6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch) | |
| tree | cfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/InputCommon/ControllerInterface/Xlib | |
| parent | afba0d736d363fa4c71b86d84a1caad3d52f147e (diff) | |
| parent | 24ba058404d8036a977a41e55c58a7326302cb34 (diff) | |
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
4 files changed, 11 insertions, 11 deletions
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 { |