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/qquickparticleemitter.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/qquickparticleemitter.cpp')
| -rw-r--r-- | src/particles/qquickparticleemitter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index d17c8fc2ba..78409d3a44 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -222,9 +222,9 @@ QQuickParticleEmitter::QQuickParticleEmitter(QQuickItem *parent) : , m_particleDuration(1000) , m_particleDurationVariation(0) , m_enabled(true) - , m_system(0) - , m_extruder(0) - , m_defaultExtruder(0) + , m_system(nullptr) + , m_extruder(nullptr) + , m_defaultExtruder(nullptr) , m_velocity(&m_nullVector) , m_acceleration(&m_nullVector) , m_particleSize(16) @@ -349,7 +349,7 @@ void QQuickParticleEmitter::reset() void QQuickParticleEmitter::emitWindow(int timeStamp) { - if (m_system == 0) + if (m_system == nullptr) return; if ((!m_enabled || m_particlesPerSecond <= 0)&& !m_pulseLeft && m_burstQueue.isEmpty()){ m_reset_last = true; |