diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-10 09:24:09 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-10 09:24:09 +1300 |
| commit | 633dc75e857d649ffab7c4398e92536bccc9e1de (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/InputCommon/ControllerInterface/Device.h | |
| parent | f4012638672472afdbd9956229f273a18a77fd77 (diff) | |
| parent | d802d392811be44d34ae9cd23f616db93e54c50f (diff) | |
Merge pull request #142 from Tilka/clang-modernize
Run clang-modernize and manually fix the result
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index 8b4dc65fbb..a096bcb8b9 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -42,8 +42,8 @@ public: virtual std::string GetName() const = 0; virtual ~Control() {} - virtual Input* ToInput() { return NULL; } - virtual Output* ToOutput() { return NULL; } + virtual Input* ToInput() { return nullptr; } + virtual Output* ToOutput() { return nullptr; } }; // @@ -59,7 +59,7 @@ public: virtual ControlState GetState() const = 0; - Input* ToInput() { return this; } + Input* ToInput() override { return this; } }; // @@ -74,7 +74,7 @@ public: virtual void SetState(ControlState state) = 0; - Output* ToOutput() { return this; } + Output* ToOutput() override { return this; } }; virtual ~Device(); @@ -104,12 +104,12 @@ protected: : m_low(*low), m_high(*high) {} - ControlState GetState() const + ControlState GetState() const override { return (1 + m_high.GetState() - m_low.GetState()) / 2; } - std::string GetName() const + std::string GetName() const override { return m_low.GetName() + *m_high.GetName().rbegin(); } |