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 | |
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')
-rw-r--r-- | src/particles/qquickcustomparticle.cpp | 14 | ||||
-rw-r--r-- | src/particles/qquickimageparticle.cpp | 36 | ||||
-rw-r--r-- | src/particles/qquickitemparticle.cpp | 6 | ||||
-rw-r--r-- | src/particles/qquickparticleaffector.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquickparticleemitter.cpp | 8 | ||||
-rw-r--r-- | src/particles/qquickparticlegroup.cpp | 6 | ||||
-rw-r--r-- | src/particles/qquickparticlepainter.cpp | 4 | ||||
-rw-r--r-- | src/particles/qquickparticlesystem.cpp | 36 | ||||
-rw-r--r-- | src/particles/qquickparticlesystem_p.h | 2 | ||||
-rw-r--r-- | src/particles/qquickspritegoal.cpp | 4 | ||||
-rw-r--r-- | src/particles/qquicktargetdirection.cpp | 2 | ||||
-rw-r--r-- | src/particles/qquicktrailemitter.cpp | 4 | ||||
-rw-r--r-- | src/particles/qquickturbulence.cpp | 2 |
13 files changed, 63 insertions, 63 deletions
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp index e344fea1fa..0e3c656762 100644 --- a/src/particles/qquickcustomparticle.cpp +++ b/src/particles/qquickcustomparticle.cpp @@ -246,7 +246,7 @@ QSGNode *QQuickCustomParticle::updatePaintNode(QSGNode *oldNode, UpdatePaintNode QQuickOpenGLShaderEffectNode *rootNode = static_cast<QQuickOpenGLShaderEffectNode *>(oldNode); if (m_pleaseReset){ delete rootNode;//Automatically deletes children - rootNode = 0; + rootNode = nullptr; m_nodes.clear(); m_pleaseReset = false; m_dirtyProgram = true; @@ -270,7 +270,7 @@ QQuickOpenGLShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickOpenG rootNode = buildCustomNodes(); if (!rootNode) - return 0; + return nullptr; if (m_dirtyProgram) { const bool isES = QOpenGLContext::currentContext()->isOpenGLES(); @@ -316,23 +316,23 @@ QQuickOpenGLShaderEffectNode* QQuickCustomParticle::buildCustomNodes() typedef QHash<int, QQuickOpenGLShaderEffectNode*>::const_iterator NodeHashConstIt; if (!QOpenGLContext::currentContext()) - return 0; + return nullptr; if (m_count * 4 > 0xffff) { // Index data is ushort. qmlInfo(this) << "CustomParticle: Too many particles - maximum 16383 per CustomParticle"; - return 0; + return nullptr; } if (m_count <= 0) { qmlInfo(this) << "CustomParticle: Too few particles"; - return 0; + return nullptr; } if (groups().isEmpty()) - return 0; + return nullptr; - QQuickOpenGLShaderEffectNode *rootNode = 0; + QQuickOpenGLShaderEffectNode *rootNode = nullptr; QQuickOpenGLShaderEffectMaterial *material = new QQuickOpenGLShaderEffectMaterial; m_dirtyProgram = true; diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 37bf323f42..d2fb78d72a 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -67,7 +67,7 @@ class ImageMaterialData { public: ImageMaterialData() - : texture(0), colorTable(0) + : texture(nullptr), colorTable(nullptr) {} ~ImageMaterialData(){ @@ -701,7 +701,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size) QQuickImageParticle::QQuickImageParticle(QQuickItem* parent) : QQuickParticlePainter(parent) , m_color_variation(0.0) - , m_material(0) + , m_material(nullptr) , m_alphaVariation(0.0) , m_alpha(1.0) , m_redVariation(0.0) @@ -712,9 +712,9 @@ QQuickImageParticle::QQuickImageParticle(QQuickItem* parent) , m_rotationVelocity(0) , m_rotationVelocityVariation(0) , m_autoRotation(false) - , m_xVector(0) - , m_yVector(0) - , m_spriteEngine(0) + , m_xVector(nullptr) + , m_yVector(nullptr) + , m_spriteEngine(nullptr) , m_spritesInterpolate(true) , m_explicitColor(false) , m_explicitRotation(false) @@ -743,7 +743,7 @@ QQmlListProperty<QQuickSprite> QQuickImageParticle::sprites() void QQuickImageParticle::sceneGraphInvalidated() { m_nodes.clear(); - m_material = 0; + m_material = nullptr; } void QQuickImageParticle::setImage(const QUrl &image) @@ -1011,7 +1011,7 @@ void QQuickImageParticle::resetColor() for (auto groupId : groupIds()) { for (QQuickParticleData* d : qAsConst(m_system->groupData[groupId]->data)) { if (d->colorOwner == this) { - d->colorOwner = 0; + d->colorOwner = nullptr; } } } @@ -1030,7 +1030,7 @@ void QQuickImageParticle::resetRotation() for (auto groupId : groupIds()) { for (QQuickParticleData* d : qAsConst(m_system->groupData[groupId]->data)) { if (d->rotationOwner == this) { - d->rotationOwner = 0; + d->rotationOwner = nullptr; } } } @@ -1047,7 +1047,7 @@ void QQuickImageParticle::resetDeformation() for (auto groupId : groupIds()) { for (QQuickParticleData* d : qAsConst(m_system->groupData[groupId]->data)) { if (d->deformationOwner == this) { - d->deformationOwner = 0; + d->deformationOwner = nullptr; } } } @@ -1055,8 +1055,8 @@ void QQuickImageParticle::resetDeformation() delete m_xVector; if (m_yVector) delete m_yVector; - m_xVector = 0; - m_yVector = 0; + m_xVector = nullptr; + m_yVector = nullptr; } void QQuickImageParticle::reset() @@ -1076,7 +1076,7 @@ void QQuickImageParticle::createEngine() this, SLOT(spriteAdvance(int)), Qt::DirectConnection); m_explicitAnimation = true; } else { - m_spriteEngine = 0; + m_spriteEngine = nullptr; m_explicitAnimation = false; } reset(); @@ -1298,7 +1298,7 @@ void QQuickImageParticle::finishBuildParticleNodes(QSGNode** node) clearShadows(); if (m_material) - m_material = 0; + m_material = nullptr; //Setup material QImage colortable; @@ -1473,12 +1473,12 @@ static inline bool isOpenGL(QSGRenderContext *rc) QSGNode *QQuickImageParticle::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) { if (!node && !isOpenGL(QQuickItemPrivate::get(this)->sceneGraphRenderContext())) - return 0; + return nullptr; if (m_pleaseReset){ if (node) delete node; - node = 0; + node = nullptr; m_lastLevel = perfLevel; m_nodes.clear(); @@ -1487,7 +1487,7 @@ QSGNode *QQuickImageParticle::updatePaintNode(QSGNode *node, UpdatePaintNodeData m_startsIdx.clear(); m_lastIdxStart = 0; - m_material = 0; + m_material = nullptr; m_pleaseReset = false; m_startedImageLoading = 0;//Cancel a part-way build (may still have a pending load) @@ -1509,7 +1509,7 @@ QSGNode *QQuickImageParticle::updatePaintNode(QSGNode *node, UpdatePaintNodeData void QQuickImageParticle::prepareNextFrame(QSGNode **node) { - if (*node == 0){//TODO: Staggered loading (as emitted) + if (*node == nullptr){//TODO: Staggered loading (as emitted) buildParticleNodes(node); if (m_debugMode) { qDebug() << "QQuickImageParticle Feature level: " << perfLevel; @@ -1522,7 +1522,7 @@ void QQuickImageParticle::prepareNextFrame(QSGNode **node) } qDebug() << "Total count: " << count; } - if (*node == 0) + if (*node == nullptr) return; } qint64 timeStamp = m_system->systemSync(this); 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){ diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp index 30716ecb80..76089c1abd 100644 --- a/src/particles/qquickparticleaffector.cpp +++ b/src/particles/qquickparticleaffector.cpp @@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE */ QQuickParticleAffector::QQuickParticleAffector(QQuickItem *parent) : QQuickItem(parent), m_needsReset(false), m_ignoresTime(false), m_onceOff(false), m_enabled(true) - , m_system(0), m_updateIntSet(false), m_shape(new QQuickParticleExtruder(this)) + , m_system(nullptr), m_updateIntSet(false), m_shape(new QQuickParticleExtruder(this)) { } 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; 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<QObject> QQuickParticleGroup::particleChildren() { QQuickParticleSystem* system = qobject_cast<QQuickParticleSystem*>(parent()); if (system) - return QQmlListProperty<QObject>(this, 0, &QQuickParticleSystem::statePropertyRedirect, 0, 0, 0); + return QQmlListProperty<QObject>(this, nullptr, &QQuickParticleSystem::statePropertyRedirect, nullptr, nullptr, nullptr); else - return QQmlListProperty<QObject>(this, 0, &delayedRedirect, 0, 0, 0); + return QQmlListProperty<QObject>(this, nullptr, &delayedRedirect, nullptr, nullptr, nullptr); } void QQuickParticleGroup::setSystem(QQuickParticleSystem* arg) diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp index 70fc2d59e3..13591be97a 100644 --- a/src/particles/qquickparticlepainter.cpp +++ b/src/particles/qquickparticlepainter.cpp @@ -66,10 +66,10 @@ QT_BEGIN_NAMESPACE */ QQuickParticlePainter::QQuickParticlePainter(QQuickItem *parent) : QQuickItem(parent) - , m_system(0) + , m_system(nullptr) , m_count(0) , m_pleaseReset(true) - , m_window(0) + , m_window(nullptr) , m_groupIdsNeedRecalculation(false) { } diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp index 5e613c484a..612675fec7 100644 --- a/src/particles/qquickparticlesystem.cpp +++ b/src/particles/qquickparticlesystem.cpp @@ -378,7 +378,7 @@ QQuickParticleData* QQuickParticleGroupData::newDatum(bool respectsLimits) return data[idx]; } if (respectsLimits) - return 0; + return nullptr; int oldSize = m_size; setSize(oldSize + 10);//###+1,10%,+10? Choose something non-arbitrarily @@ -418,11 +418,11 @@ QQuickParticleData::QQuickParticleData() : index(0) , systemIndex(-1) , groupId(0) - , colorOwner(0) - , rotationOwner(0) - , deformationOwner(0) - , animationOwner(0) - , v8Datum(0) + , colorOwner(nullptr) + , rotationOwner(nullptr) + , deformationOwner(nullptr) + , animationOwner(nullptr) + , v8Datum(nullptr) { x = 0; y = 0; @@ -455,7 +455,7 @@ QQuickParticleData::QQuickParticleData() color.b = 255; color.a = 255; r = 0; - delegate = 0; + delegate = nullptr; modelIndex = -1; } @@ -477,7 +477,7 @@ QQuickParticleData &QQuickParticleData::operator=(const QQuickParticleData &othe index = other.index; systemIndex = other.systemIndex; // Lazily initialized - v8Datum = 0; + v8Datum = nullptr; return *this; } @@ -564,9 +564,9 @@ void QQuickParticleData::extendLife(float time, QQuickParticleSystem* particleSy QQuickParticleSystem::QQuickParticleSystem(QQuickItem *parent) : QQuickItem(parent), - stateEngine(0), + stateEngine(nullptr), nextFreeGroupId(0), - m_animation(0), + m_animation(nullptr), m_running(true), initialized(0), particleCount(0), @@ -768,9 +768,9 @@ void QQuickParticleSystem::reset() timeInt = 0; //Clear guarded pointers which have been deleted int cleared = 0; - cleared += m_emitters.removeAll(0); - cleared += m_painters.removeAll(0); - cleared += m_affectors.removeAll(0); + cleared += m_emitters.removeAll(nullptr); + cleared += m_painters.removeAll(nullptr); + cleared += m_affectors.removeAll(nullptr); bySysIdx.resize(0); initGroups();//Also clears all logical particles @@ -945,7 +945,7 @@ void QQuickParticleSystem::createEngine() } else { if (stateEngine) delete stateEngine; - stateEngine = 0; + stateEngine = nullptr; } } @@ -993,7 +993,7 @@ QQuickParticleData* QQuickParticleSystem::newDatum(int groupId, bool respectLimi QQuickParticleData* ret = groupData[groupId]->newDatum(respectLimits); if (!ret) { - return 0; + return nullptr; } if (sysIndex == -1) { if (ret->systemIndex == -1) @@ -1056,9 +1056,9 @@ void QQuickParticleSystem::updateCurrentTime( int currentTime ) dt = time - dt; needsReset.clear(); - m_emitters.removeAll(0); - m_painters.removeAll(0); - m_affectors.removeAll(0); + m_emitters.removeAll(nullptr); + m_painters.removeAll(nullptr); + m_affectors.removeAll(nullptr); bool oldClear = m_empty; m_empty = true; diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h index 92dca40419..6671cec4f8 100644 --- a/src/particles/qquickparticlesystem_p.h +++ b/src/particles/qquickparticlesystem_p.h @@ -353,7 +353,7 @@ class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleSystem : public QQuickItem Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged) public: - explicit QQuickParticleSystem(QQuickItem *parent = 0); + explicit QQuickParticleSystem(QQuickItem *parent = nullptr); ~QQuickParticleSystem(); bool isRunning() const diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp index 2e420a2840..75d6f8bdf6 100644 --- a/src/particles/qquickspritegoal.cpp +++ b/src/particles/qquickspritegoal.cpp @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE QQuickSpriteGoalAffector::QQuickSpriteGoalAffector(QQuickItem *parent) : QQuickParticleAffector(parent), m_goalIdx(-1), - m_lastEngine(0), + m_lastEngine(nullptr), m_jump(false), m_systemStates(false), m_notUsingEngine(false) @@ -121,7 +121,7 @@ void QQuickSpriteGoalAffector::setGoalState(const QString &arg) bool QQuickSpriteGoalAffector::affectParticle(QQuickParticleData *d, qreal dt) { Q_UNUSED(dt); - QQuickStochasticEngine *engine = 0; + QQuickStochasticEngine *engine = nullptr; if (!m_systemStates){ //TODO: Affect all engines foreach (QQuickParticlePainter *p, m_system->groupData[d->groupId]->painters) diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp index a113b7c04a..5d84f9dc2b 100644 --- a/src/particles/qquicktargetdirection.cpp +++ b/src/particles/qquicktargetdirection.cpp @@ -91,7 +91,7 @@ QQuickTargetDirection::QQuickTargetDirection(QObject *parent) : , m_proportionalMagnitude(false) , m_magnitude(0) , m_magnitudeVariation(0) - , m_targetItem(0) + , m_targetItem(nullptr) { } 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; diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp index f916635358..dc72d884bc 100644 --- a/src/particles/qquickturbulence.cpp +++ b/src/particles/qquickturbulence.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE QQuickTurbulenceAffector::QQuickTurbulenceAffector(QQuickItem *parent) : QQuickParticleAffector(parent), - m_strength(10), m_lastT(0), m_gridSize(0), m_field(0), m_vectorField(0), m_inited(false) + m_strength(10), m_lastT(0), m_gridSize(0), m_field(nullptr), m_vectorField(nullptr), m_inited(false) { } |