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/particles/qquickitemparticle.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/particles/qquickitemparticle.cpp')
| -rw-r--r-- | src/particles/qquickitemparticle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp index 50b66a4d15..412390dffc 100644 --- a/src/particles/qquickitemparticle.cpp +++ b/src/particles/qquickitemparticle.cpp @@ -118,7 +118,7 @@ QT_BEGIN_NAMESPACE */ QQuickItemParticle::QQuickItemParticle(QQuickItem *parent) : - QQuickParticlePainter(parent), m_fade(true), m_lastT(0), m_activeCount(0), m_delegate(0) + QQuickParticlePainter(parent), m_fade(true), m_lastT(0), m_activeCount(0), m_delegate(nullptr) { setFlag(QQuickItem::ItemHasContents); clock = new Clock(this); @@ -195,7 +195,7 @@ void QQuickItemParticle::tick(int time) //remove old item from the particle that is dying to make room for this one if (d->delegate) { m_deletables << d->delegate; - d->delegate = 0; + d->delegate = nullptr; } if (!m_pendingItems.isEmpty()){ d->delegate = m_pendingItems.front(); @@ -289,7 +289,7 @@ void QQuickItemParticle::prepareNextFrame() } if (t >= 1.0f){//Usually happens from load m_deletables << item; - data->delegate = 0; + data->delegate = nullptr; }else{//Fade data->delegate->setVisible(true); if (m_fade){ |