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/particles/qquickparticlegroup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/particles/qquickparticlegroup.cpp') diff --git a/src/particles/qquickparticlegroup.cpp b/src/particles/qquickparticlegroup.cpp index 2ee2a1d0a3..a42d2bcb13 100644 --- a/src/particles/qquickparticlegroup.cpp +++ b/src/particles/qquickparticlegroup.cpp @@ -91,7 +91,7 @@ QQuickParticleGroup::QQuickParticleGroup(QObject* parent) : QQuickStochasticState(parent) - , m_system(0) + , m_system(nullptr) { } @@ -107,9 +107,9 @@ QQmlListProperty QQuickParticleGroup::particleChildren() { QQuickParticleSystem* system = qobject_cast(parent()); if (system) - return QQmlListProperty(this, 0, &QQuickParticleSystem::statePropertyRedirect, 0, 0, 0); + return QQmlListProperty(this, nullptr, &QQuickParticleSystem::statePropertyRedirect, nullptr, nullptr, nullptr); else - return QQmlListProperty(this, 0, &delayedRedirect, 0, 0, 0); + return QQmlListProperty(this, nullptr, &delayedRedirect, nullptr, nullptr, nullptr); } void QQuickParticleGroup::setSystem(QQuickParticleSystem* arg) -- cgit v1.2.3