ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Touchscreen: Add override specifiers 

Fix -Winconsistent-missing-override warnings on Android
This commit is contained in:
Dentomologist 2021-03-05 10:33:46 -08:00
parent 1fd332d3b7
commit 486a25dd2b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/InputCommon/ControllerInterface/Touch/Touchscreen.h
View File

@ -15,9 +15,9 @@ private:
class Button : public Input class Button : public Input
{ {
public: 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) {} Button(int pad_id, ButtonManager::ButtonType index) : m_pad_id(pad_id), m_index(index) {}
ControlState GetState() const; ControlState GetState() const override;
private: private:
const int m_pad_id; const int m_pad_id;
@ -26,13 +26,13 @@ private:
class Axis : public Input class Axis : public Input
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
bool IsDetectable() const override { return false; } bool IsDetectable() const override { return false; }
Axis(int pad_id, ButtonManager::ButtonType index, float neg = 1.0f) Axis(int pad_id, ButtonManager::ButtonType index, float neg = 1.0f)
: m_pad_id(pad_id), m_index(index), m_neg(neg) : m_pad_id(pad_id), m_index(index), m_neg(neg)
{ {
} }
ControlState GetState() const; ControlState GetState() const override;
private: private:
const int m_pad_id; const int m_pad_id;
@ -56,8 +56,8 @@ private:
public: public:
Touchscreen(int pad_id, bool accelerometer_enabled, bool gyroscope_enabled); Touchscreen(int pad_id, bool accelerometer_enabled, bool gyroscope_enabled);
~Touchscreen() {} ~Touchscreen() {}
std::string GetName() const; std::string GetName() const override;
std::string GetSource() const; std::string GetSource() const override;
private: private:
const int m_pad_id; const int m_pad_id;