summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Xlib
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2014-03-08 01:54:44 +0100
committerTillmann Karras <tilkax@gmail.com>2014-03-09 21:12:01 +0100
commitf28116b7da6aac6069084596dc4dbf866bdebfd8 (patch)
treee105ce4d1a55421d83c27797a896917d6031ee9c /Source/Core/InputCommon/ControllerInterface/Xlib
parentc89f04a7c5256d92b75e9868df9af6cfb7050559 (diff)
clang-modernize -add-override
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h30
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h24
2 files changed, 27 insertions, 27 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index 2714b70221..167f9af113 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -39,9 +39,9 @@ private:
{
friend class KeyboardMouse;
public:
- std::string GetName() const { return m_keyname; }
+ std::string GetName() const override { return m_keyname; }
Key(Display* display, KeyCode keycode, const char* keyboard);
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
std::string m_keyname;
@@ -53,9 +53,9 @@ private:
class Button : public Input
{
public:
- std::string GetName() const { return name; }
+ std::string GetName() const override { return name; }
Button(unsigned int index, unsigned int& buttons);
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
const unsigned int& m_buttons;
@@ -66,10 +66,10 @@ private:
class Cursor : public Input
{
public:
- std::string GetName() const { return name; }
- bool IsDetectable() { return false; }
+ std::string GetName() const override { return name; }
+ bool IsDetectable() override { return false; }
Cursor(u8 index, bool positive, const float& cursor);
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
const float& m_cursor;
@@ -81,10 +81,10 @@ private:
class Axis : public Input
{
public:
- std::string GetName() const { return name; }
- bool IsDetectable() { return false; }
+ std::string GetName() const override { return name; }
+ bool IsDetectable() override { return false; }
Axis(u8 index, bool positive, const float& axis);
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
const float& m_axis;
@@ -98,15 +98,15 @@ private:
void UpdateCursor();
public:
- bool UpdateInput();
- bool UpdateOutput();
+ bool UpdateInput() override;
+ bool UpdateOutput() override;
KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
~KeyboardMouse();
- std::string GetName() const;
- std::string GetSource() const;
- int GetId() const;
+ 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.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
index 9c506f67fe..237b3a484e 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
@@ -30,9 +30,9 @@ private:
{
friend class KeyboardMouse;
public:
- std::string GetName() const;
+ std::string GetName() const override;
Key(Display* display, KeyCode keycode, const char* keyboard);
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
std::string m_keyname;
@@ -44,10 +44,10 @@ private:
class Button : public Input
{
public:
- std::string GetName() const;
+ std::string GetName() const override;
Button(unsigned int index, unsigned int& buttons)
: m_buttons(buttons), m_index(index) {}
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
const unsigned int& m_buttons;
@@ -57,11 +57,11 @@ private:
class Cursor : public Input
{
public:
- std::string GetName() const;
- bool IsDetectable() { return false; }
+ std::string GetName() const override;
+ bool IsDetectable() override { return false; }
Cursor(u8 index, bool positive, const float& cursor)
: m_cursor(cursor), m_index(index), m_positive(positive) {}
- ControlState GetState() const;
+ ControlState GetState() const override;
private:
const float& m_cursor;
@@ -70,15 +70,15 @@ private:
};
public:
- bool UpdateInput();
- bool UpdateOutput();
+ bool UpdateInput() override;
+ bool UpdateOutput() override;
KeyboardMouse(Window window);
~KeyboardMouse();
- std::string GetName() const;
- std::string GetSource() const;
- int GetId() const;
+ std::string GetName() const override;
+ std::string GetSource() const override;
+ int GetId() const override;
private:
Window m_window;