InputCommon: Split Device stuff out

The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
This commit is contained in:
Jasper St. Pierre
2013-06-16 20:07:10 -04:00
parent 143d2eccb4
commit 877106b027
30 changed files with 448 additions and 451 deletions

View File

@ -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));
}

View File

@ -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: