diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-07-14 23:13:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 23:13:30 +0200 |
| commit | a9d8a7decd510aecbc0492709ecd347e0f7b56de (patch) | |
| tree | 63cdec11183166eeb2bb5440537965b19dbe1593 /Source/Core/InputCommon/ControllerInterface/Xlib | |
| parent | a97a546bd667438a98ec2d9c698ab7958280693d (diff) | |
| parent | 788e19f54d86ba45cdc83d39c0488b17aa1d00dd (diff) | |
Merge pull request #4009 from leoetlino/common-id-assign
ControllerInterface: Make the ID assigning code common
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
4 files changed, 0 insertions, 12 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index c7c2e74242..59a1c64047 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -300,11 +300,6 @@ std::string KeyboardMouse::GetSource() const return "XInput2"; } -int KeyboardMouse::GetId() const -{ - return -1; -} - KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) : m_display(display), m_keyboard(keyboard), m_keycode(keycode) { diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 10499ea22c..80df03db70 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -104,7 +104,6 @@ public: std::string GetName() const override; std::string GetSource() const override; - int GetId() const override; private: Window m_window; diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index fd5cda04ec..c0ee39ac68 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -80,11 +80,6 @@ std::string KeyboardMouse::GetSource() const return "Xlib"; } -int KeyboardMouse::GetId() const -{ - return 0; -} - KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) : m_display(display), m_keyboard(keyboard), m_keycode(keycode) { diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index 18e5bad635..ef0d5777a3 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -81,7 +81,6 @@ public: std::string GetName() const override; std::string GetSource() const override; - int GetId() const override; private: Window m_window; |