piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Split Device stuff out

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
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));
}

6
Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
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: