diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
tree | 206c90d47387f8322b68f5e3db613189397e1af3 /src/quick/util/qquickanimator.cpp | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) |
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/quick/util/qquickanimator.cpp')
-rw-r--r-- | src/quick/util/qquickanimator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp index 5608326f8a..d1ff78f8bc 100644 --- a/src/quick/util/qquickanimator.cpp +++ b/src/quick/util/qquickanimator.cpp @@ -280,22 +280,22 @@ QAbstractAnimationJob *QQuickAnimator::transition(QQuickStateActions &actions, if (d->defaultProperty.isValid() && propertyName() != d->defaultProperty.name()) { qDebug() << Q_FUNC_INFO << "property name conflict..."; - return 0; + return nullptr; } // The animation system cannot handle backwards uncontrolled animations. if (direction == Backward) - return 0; + return nullptr; QQuickAnimatorJob *job = createJob(); if (!job) - return 0; + return nullptr; d->apply(job, propertyName(), actions, modified, defaultTarget); if (!job->target()) { delete job; - return 0; + return nullptr; } return job; @@ -576,7 +576,7 @@ QQuickAnimatorJob *QQuickUniformAnimator::createJob() const { QString u = propertyName(); if (u.isEmpty()) - return 0; + return nullptr; QQuickUniformAnimatorJob *job = new QQuickUniformAnimatorJob(); job->setUniform(u.toLatin1()); |