diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-16 20:07:10 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-25 00:58:30 -0400 |
| commit | 877106b027431c6edb2d2c702fa6d811dac3d250 (patch) | |
| tree | a0d83be190efea7ad4915db7db9ac40f9192b251 /Source/Core/InputCommon/Src/ControllerInterface/Xlib | |
| parent | 143d2eccb49b700ccd00dfa229b03d1d1a51533c (diff) | |
InputCommon: Split Device stuff out
The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Xlib')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index dad0c6bbf8..7016c4908b 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -7,7 +7,7 @@ namespace ciface namespace Xlib { -void Init(std::vector<ControllerInterface::Device*>& devices, void* const hwnd) +void Init(std::vector<Core::Device*>& devices, void* const hwnd) { devices.push_back(new KeyboardMouse((Window)hwnd)); } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h index 2af95ff7f9..c178f1e9b4 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h @@ -1,7 +1,7 @@ #ifndef _CIFACE_XLIB_H_ #define _CIFACE_XLIB_H_ -#include "../ControllerInterface.h" +#include "../Device.h" #include <X11/Xlib.h> #include <X11/keysym.h> @@ -11,9 +11,9 @@ namespace ciface namespace Xlib { -void Init(std::vector<ControllerInterface::Device*>& devices, void* const hwnd); +void Init(std::vector<Core::Device*>& devices, void* const hwnd); -class KeyboardMouse : public ControllerInterface::Device +class KeyboardMouse : public Core::Device { private: |