summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2014-03-09 21:14:26 +0100
committerTillmann Karras <tilkax@gmail.com>2014-03-09 21:14:26 +0100
commitd802d392811be44d34ae9cd23f616db93e54c50f (patch)
treef9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
parentf28116b7da6aac6069084596dc4dbf866bdebfd8 (diff)
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h4
1 files changed, 2 insertions, 2 deletions
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();