Merge pull request #142 from Tilka/clang-modernize

Run clang-modernize and manually fix the result

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index affabafc9b..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;
 	};
 
@@ -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,11 +109,11 @@ 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) {}
+	ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {}
 
 	void SetHwnd(void* const hwnd);
 	void Initialize();