From 877106b027431c6edb2d2c702fa6d811dac3d250 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 16 Jun 2013 20:07:10 -0400 Subject: InputCommon: Split Device stuff out The ExpressionParser needs this to be out of here to prevent issues with cyclic references. --- Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp | 2 +- Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Android') diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp index 6469945971..ef95f9b363 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp @@ -23,7 +23,7 @@ namespace ciface namespace Android { -void Init( std::vector& devices ) +void Init( std::vector& devices ) { devices.push_back(new Touchscreen()); } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h index 21f35165f1..e38c6a221a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h @@ -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& devices ); -class Touchscreen : public ControllerInterface::Device +void Init( std::vector& devices ); +class Touchscreen : public Core::Device { private: class Button : public Input -- cgit v1.2.3