piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -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/Android/Android.cpp
View File

@ -23,7 +23,7 @@ namespace ciface
namespace Android
{
void Init( std::vector<ControllerInterface::Device*>& devices )
void Init( std::vector<Core::Device*>& devices )
{
devices.push_back(new Touchscreen());
}

6
Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
View File

@ -17,7 +17,7 @@
#ifndef _CIFACE_ANDROID_H_
#define _CIFACE_ANDROID_H_
#include "../ControllerInterface.h"
#include "../Device.h"
#include "Android/ButtonManager.h"
namespace ciface
@ -25,8 +25,8 @@ namespace ciface
namespace Android
{
void Init( std::vector<ControllerInterface::Device*>& devices );
class Touchscreen : public ControllerInterface::Device
void Init( std::vector<Core::Device*>& devices );
class Touchscreen : public Core::Device
{
private:
class Button : public Input