summaryrefslogtreecommitdiff
path: root/src/imports/statemachine/state.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /src/imports/statemachine/state.cpp
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
downloadqtdeclarative-499ec43937e926e4f2fa57a9baa455fcb3862262.tar.gz
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/statemachine/state.cpp')
-rw-r--r--src/imports/statemachine/state.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/statemachine/state.cpp b/src/imports/statemachine/state.cpp
index 2467039d01..af76087256 100644
--- a/src/imports/statemachine/state.cpp
+++ b/src/imports/statemachine/state.cpp
@@ -50,7 +50,7 @@ State::State(QState *parent)
void State::componentComplete()
{
- if (this->machine() == NULL) {
+ if (this->machine() == nullptr) {
static bool once = false;
if (!once) {
once = true;