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/ControllerInterface.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index affabafc9b..898fd954fb 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -96,8 +96,8 @@ public: { public: InputReference() : ControlReference(true) {} - ControlState State(const ControlState state); - Device::Control* Detect(const unsigned int ms, Device* const device); + ControlState State(const ControlState state) override; + Device::Control* Detect(const unsigned int ms, Device* const device) override; }; // @@ -109,8 +109,8 @@ public: { public: OutputReference() : ControlReference(false) {} - ControlState State(const ControlState state); - Device::Control* Detect(const unsigned int ms, Device* const device); + ControlState State(const ControlState state) override; + Device::Control* Detect(const unsigned int ms, Device* const device) override; }; ControllerInterface() : m_is_init(false), m_hwnd(NULL) {} -- 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/ControllerInterface.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 898fd954fb..763933aa22 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -83,7 +83,7 @@ public: } protected: - ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {} + ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(nullptr) {} ciface::ExpressionParser::Expression *parsed_expression; }; @@ -113,7 +113,7 @@ public: Device::Control* Detect(const unsigned int ms, Device* const device) override; }; - ControllerInterface() : m_is_init(false), m_hwnd(NULL) {} + ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {} void SetHwnd(void* const hwnd); void Initialize(); -- cgit v1.2.3