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/Android | |
| 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/Android')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Android/Android.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Android/Android.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index e36e314294..a5e995f6cc 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -27,10 +27,6 @@ std::string Touchscreen::GetSource() const return "Android"; } -int Touchscreen::GetId() const -{ - return _padID; -} Touchscreen::Touchscreen(int padID) : _padID(padID) { // GC diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h index 29cc16d7ef..987aaed863 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h @@ -46,7 +46,6 @@ public: Touchscreen(int padID); ~Touchscreen() {} std::string GetName() const; - int GetId() const; std::string GetSource() const; private: |