Merge pull request #1560 from magcius/pad-cleanup-1

Pad cleanup 1

4 files changed, 4 insertions, 21 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index 13ace15997..1d7d080d7e 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -208,7 +208,7 @@ void KeyboardMouse::UpdateCursor()
 	m_state.cursor.y = win_y / (float)win_attribs.height * 2 - 1;
 }
 
-bool KeyboardMouse::UpdateInput()
+void KeyboardMouse::UpdateInput()
 {
 	XFlush(m_display);
 
@@ -282,13 +282,6 @@ bool KeyboardMouse::UpdateInput()
 	m_state.axis.y *= MOUSE_AXIS_SMOOTHING;
 	m_state.axis.y += delta_y;
 	m_state.axis.y /= MOUSE_AXIS_SMOOTHING+1.0f;
-
-	return true;
-}
-
-bool KeyboardMouse::UpdateOutput()
-{
-	return true;
 }
 
 std::string KeyboardMouse::GetName() const
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index a75c74bba5..3f31aa50f2 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -98,8 +98,7 @@ private:
 	void UpdateCursor();
 
 public:
-	bool UpdateInput() override;
-	bool UpdateOutput() override;
+	void UpdateInput() 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..9a700a9c99 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@@ -49,7 +49,7 @@ KeyboardMouse::~KeyboardMouse()
 	XCloseDisplay(m_display);
 }
 
-bool KeyboardMouse::UpdateInput()
+void KeyboardMouse::UpdateInput()
 {
 	XQueryKeymap(m_display, m_state.keyboard);
 
@@ -64,16 +64,8 @@ bool KeyboardMouse::UpdateInput()
 	// the mouse position as a range from -1 to 1
 	m_state.cursor.x = (float)win_x / (float)win_attribs.width * 2 - 1;
 	m_state.cursor.y = (float)win_y / (float)win_attribs.height * 2 - 1;
-
-	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..0c2f79c8b3 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
@@ -70,8 +70,7 @@ private:
 	};
 
 public:
-	bool UpdateInput() override;
-	bool UpdateOutput() override;
+	void UpdateInput() override;
 
 	KeyboardMouse(Window window);
 	~KeyboardMouse();