From 499ec43937e926e4f2fa57a9baa455fcb3862262 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 21 Feb 2018 10:41:54 +0100 Subject: 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 --- src/qml/animations/qanimationgroupjob.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/qml/animations/qanimationgroupjob.cpp') diff --git a/src/qml/animations/qanimationgroupjob.cpp b/src/qml/animations/qanimationgroupjob.cpp index ea6d87952a..344791fd83 100644 --- a/src/qml/animations/qanimationgroupjob.cpp +++ b/src/qml/animations/qanimationgroupjob.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE QAnimationGroupJob::QAnimationGroupJob() - : QAbstractAnimationJob(), m_firstChild(0), m_lastChild(0) + : QAbstractAnimationJob(), m_firstChild(nullptr), m_lastChild(nullptr) { m_isGroup = true; } @@ -111,25 +111,25 @@ void QAnimationGroupJob::removeAnimation(QAbstractAnimationJob *animation) else m_lastChild = prev; - animation->m_previousSibling = 0; - animation->m_nextSibling = 0; + animation->m_previousSibling = nullptr; + animation->m_nextSibling = nullptr; - animation->m_group = 0; + animation->m_group = nullptr; animationRemoved(animation, prev, next); } void QAnimationGroupJob::clear() { QAbstractAnimationJob *child = firstChild(); - QAbstractAnimationJob *nextSibling = 0; - while (child != 0) { - child->m_group = 0; + QAbstractAnimationJob *nextSibling = nullptr; + while (child != nullptr) { + child->m_group = nullptr; nextSibling = child->nextSibling(); delete child; child = nextSibling; } - m_firstChild = 0; - m_lastChild = 0; + m_firstChild = nullptr; + m_lastChild = nullptr; } void QAnimationGroupJob::resetUncontrolledAnimationsFinishTime() -- cgit v1.2.3