From 367a42dcfdf61e5fcd3e3444190ed25d4d8fc114 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 13 Nov 2014 00:53:24 -0800 Subject: ControllerInterface: Implement dummy UpdateInput / UpdateOutputs Make the implementation here a bit easier. --- Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 5 ----- Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h | 1 - Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp | 6 ------ Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h | 1 - 4 files changed, 13 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib') diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 13ace15997..4d7cc26b4d 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -286,11 +286,6 @@ bool KeyboardMouse::UpdateInput() return true; } -bool KeyboardMouse::UpdateOutput() -{ - return true; -} - std::string KeyboardMouse::GetName() const { // This is the name string we got from the X server for this master diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index a75c74bba5..064dd997f7 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -99,7 +99,6 @@ private: public: bool UpdateInput() override; - bool UpdateOutput() override; KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid); ~KeyboardMouse(); diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index 973368a78e..e938cfc1bc 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -68,12 +68,6 @@ bool KeyboardMouse::UpdateInput() return true; } -bool KeyboardMouse::UpdateOutput() -{ - return true; -} - - std::string KeyboardMouse::GetName() const { return "Keyboard Mouse"; diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index 237b3a484e..61d520d08c 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -71,7 +71,6 @@ private: public: bool UpdateInput() override; - bool UpdateOutput() override; KeyboardMouse(Window window); ~KeyboardMouse(); -- cgit v1.2.3