summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Xlib
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-11-13 00:53:24 -0800
committerJasper St. Pierre <jstpierre@mecheye.net>2014-11-28 10:50:45 -0800
commit367a42dcfdf61e5fcd3e3444190ed25d4d8fc114 (patch)
treea7ec9ee4e808582d835bddd0cfc104c58a82c831 /Source/Core/InputCommon/ControllerInterface/Xlib
parent0c056c64118673ece8fefcc22fa64b78c5431ab6 (diff)
ControllerInterface: Implement dummy UpdateInput / UpdateOutputs
Make the implementation here a bit easier.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp5
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h1
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h1
4 files changed, 0 insertions, 13 deletions
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();