Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Touchscreen: Add override specifiers
Fix -Winconsistent-missing-override warnings on Android
  • Loading branch information
Dentomologist committed Mar 7, 2021
1 parent 1fd332d commit 486a25d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.h
Expand Up @@ -15,9 +15,9 @@ class Touchscreen : public Core::Device
class Button : public Input
{
public:
std::string GetName() const;
std::string GetName() const override;
Button(int pad_id, ButtonManager::ButtonType index) : m_pad_id(pad_id), m_index(index) {}
ControlState GetState() const;
ControlState GetState() const override;

private:
const int m_pad_id;
Expand All @@ -26,13 +26,13 @@ class Touchscreen : public Core::Device
class Axis : public Input
{
public:
std::string GetName() const;
std::string GetName() const override;
bool IsDetectable() const override { return false; }
Axis(int pad_id, ButtonManager::ButtonType index, float neg = 1.0f)
: m_pad_id(pad_id), m_index(index), m_neg(neg)
{
}
ControlState GetState() const;
ControlState GetState() const override;

private:
const int m_pad_id;
Expand All @@ -56,8 +56,8 @@ class Touchscreen : public Core::Device
public:
Touchscreen(int pad_id, bool accelerometer_enabled, bool gyroscope_enabled);
~Touchscreen() {}
std::string GetName() const;
std::string GetSource() const;
std::string GetName() const override;
std::string GetSource() const override;

private:
const int m_pad_id;
Expand Down

0 comments on commit 486a25d

Please sign in to comment.