From f28116b7da6aac6069084596dc4dbf866bdebfd8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 8 Mar 2014 01:54:44 +0100 Subject: clang-modernize -add-override --- Source/Core/InputCommon/ControllerInterface/Device.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h') diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index 8b4dc65fbb..43f1b738c7 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -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(); } -- cgit v1.2.3 From d802d392811be44d34ae9cd23f616db93e54c50f Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 9 Mar 2014 21:14:26 +0100 Subject: clang-modernize -use-nullptr and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine --- Source/Core/InputCommon/ControllerInterface/Device.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h') diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index 43f1b738c7..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; } }; // -- cgit v1.2.3