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/qquicktrailemitter.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/qquicktrailemitter.cpp')
| -rw-r--r-- | src/particles/qquicktrailemitter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index 16b87f0e51..fde5eab617 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -62,7 +62,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) : , m_emitterXVariation(0) , m_emitterYVariation(0) , m_followCount(0) - , m_emissionExtruder(0) + , m_emissionExtruder(nullptr) , m_defaultEmissionExtruder(new QQuickParticleExtruder(this)) { //TODO: If followed increased their size @@ -150,7 +150,7 @@ void QQuickTrailEmitter::reset() void QQuickTrailEmitter::emitWindow(int timeStamp) { - if (m_system == 0) + if (m_system == nullptr) return; if (!m_enabled && !m_pulseLeft && m_burstQueue.isEmpty()) return; |