diff options
-rw-r--r-- | src/particles/qquickcustomaffector.cpp | 10 | ||||
-rw-r--r-- | src/particles/qquickparticlesystem.cpp | 44 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index 67f2922423..c447ff440e 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -120,9 +120,9 @@ void QQuickCustomAffector::affectSystem(qreal dt) updateOffsets(); QList<QQuickParticleData*> toAffect; - foreach (QQuickParticleGroupData* gd, m_system->groupData) { + for (const QQuickParticleGroupData *gd : qAsConst(m_system->groupData)) { if (activeGroup(gd->index)) { - foreach (QQuickParticleData* d, gd->data) { + for (QQuickParticleData *d : gd->data) { if (shouldAffect(d)) { toAffect << d; } @@ -134,7 +134,7 @@ void QQuickCustomAffector::affectSystem(qreal dt) return; if (justAffected) { - foreach (QQuickParticleData* d, toAffect) {//Not postAffect to avoid saying the particle changed + for (const QQuickParticleData *d : qAsConst(toAffect)) {//Not postAffect to avoid saying the particle changed if (m_onceOff) m_onceOffed << qMakePair(d->groupId, d->index); emit affected(d->curX(m_system), d->curY(m_system)); @@ -176,7 +176,7 @@ void QQuickCustomAffector::affectSystem(qreal dt) doAffect(dt); } - foreach (QQuickParticleData* d, toAffect) + for (QQuickParticleData *d : qAsConst(toAffect)) if (d->update == 1.0) postAffect(d); } @@ -233,7 +233,7 @@ bool QQuickCustomAffector::affectParticle(QQuickParticleData *d, qreal dt) void QQuickCustomAffector::affectProperties(const QList<QQuickParticleData*> &particles, qreal dt) { - foreach (QQuickParticleData* d, particles) + for (QQuickParticleData *d : particles) if ( affectParticle(d, dt) ) d->update = 1.0; } diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp index 386efed122..4eabbde970 100644 --- a/src/particles/qquickparticlesystem.cpp +++ b/src/particles/qquickparticlesystem.cpp @@ -324,7 +324,7 @@ QQuickParticleGroupData::QQuickParticleGroupData(const QString &name, QQuickPart QQuickParticleGroupData::~QQuickParticleGroupData() { - foreach (QQuickParticleData* d, data) + for (QQuickParticleData *d : qAsConst(data)) delete d; } @@ -347,7 +347,7 @@ void QQuickParticleGroupData::setSize(int newSize) } int delta = newSize - m_size; m_size = newSize; - foreach (QQuickParticlePainter* p, painters) + for (QQuickParticlePainter *p : qAsConst(painters)) p->setCount(p->count() + delta); } @@ -360,7 +360,7 @@ void QQuickParticleGroupData::kill(QQuickParticleData* d) { Q_ASSERT(d->groupId == index); d->lifeSpan = 0;//Kill off - foreach (QQuickParticlePainter* p, painters) + for (QQuickParticlePainter *p : qAsConst(painters)) p->reload(d); freeList.free(d->index); } @@ -392,7 +392,7 @@ bool QQuickParticleGroupData::recycle() m_latestAliveParticles.clear(); while (dataHeap.top() <= m_system->timeInt) { - foreach (QQuickParticleData* datum, dataHeap.pop()) { + for (QQuickParticleData *datum : dataHeap.pop()) { if (!datum->stillAlive(m_system)) { freeList.free(datum->index); } else { @@ -579,7 +579,7 @@ QQuickParticleSystem::QQuickParticleSystem(QQuickItem *parent) : QQuickParticleSystem::~QQuickParticleSystem() { - foreach (QQuickParticleGroupData* gd, groupData) + for (QQuickParticleGroupData *gd : qAsConst(groupData)) delete gd; } @@ -596,7 +596,7 @@ void QQuickParticleSystem::initGroups() for (auto e : qAsConst(m_emitters)) { e->reclaculateGroupId(); } - foreach (QQuickParticlePainter *p, m_painters) { + for (QQuickParticlePainter *p : qAsConst(m_painters)) { p->recalculateGroupIds(); } @@ -668,7 +668,7 @@ void QQuickParticleSystem::setPaused(bool arg) { if (m_animation && m_animation->state() != QAbstractAnimation::Stopped) m_paused ? m_animation->pause() : m_animation->resume(); if (!m_paused) { - foreach (QQuickParticlePainter *p, m_painters) { + for (QQuickParticlePainter *p : qAsConst(m_painters)) { if (p) { p->update(); } @@ -778,12 +778,12 @@ void QQuickParticleSystem::reset() if (!m_running) return; - foreach (QQuickParticleEmitter* e, m_emitters) + for (QQuickParticleEmitter *e : qAsConst(m_emitters)) e->reset(); emittersChanged(); - foreach (QQuickParticlePainter *p, m_painters) { + for (QQuickParticlePainter *p : qAsConst(m_painters)) { loadPainter(p); p->reset(); } @@ -807,7 +807,7 @@ void QQuickParticleSystem::loadPainter(QQuickParticlePainter *painter) if (!m_componentComplete || !painter) return; - for (QQuickParticleGroupData* sg : groupData) { + for (QQuickParticleGroupData *sg : groupData) { sg->painters.removeOne(painter); } @@ -876,13 +876,13 @@ void QQuickParticleSystem::emittersChanged() if (particleCount > bySysIdx.size())//New datum requests haven't updated it bySysIdx.resize(particleCount); - foreach (QQuickParticleAffector *a, m_affectors) {//Groups may have changed + for (QQuickParticleAffector *a : qAsConst(m_affectors)) {//Groups may have changed if (a) { a->m_updateIntSet = true; } } - foreach (QQuickParticlePainter *p, m_painters) + for (QQuickParticlePainter *p : qAsConst(m_painters)) loadPainter(p); if (!m_groups.isEmpty()) @@ -897,7 +897,7 @@ void QQuickParticleSystem::createEngine() if (stateEngine && m_debugMode) qDebug() << "Resetting Existing Sprite Engine..."; //### Solve the losses if size/states go down - foreach (QQuickParticleGroup* group, m_groups) { + for (QQuickParticleGroup *group : qAsConst(m_groups)) { bool exists = false; for (auto it = groupIds.keyBegin(), end = groupIds.keyEnd(); it != end; ++it) { if (group->name() == *it) { @@ -917,7 +917,7 @@ void QQuickParticleSystem::createEngine() for (int i = 0, ei = groupData.size(); i != ei; ++i) { bool exists = false; QString name = groupData[i]->name(); - foreach (QQuickParticleGroup* existing, m_groups) { + for (QQuickParticleGroup *existing : qAsConst(m_groups)) { if (existing->name() == name) { newList << existing; exists = true; @@ -931,7 +931,7 @@ void QQuickParticleSystem::createEngine() m_groups = newList; QList<QQuickStochasticState*> states; states.reserve(m_groups.count()); - foreach (QQuickParticleGroup* g, m_groups) + for (QQuickParticleGroup *g : qAsConst(m_groups)) states << (QQuickStochasticState*)g; if (!stateEngine) @@ -1036,10 +1036,10 @@ void QQuickParticleSystem::finishNewDatum(QQuickParticleData *pd) Q_ASSERT(pd); groupData[pd->groupId]->prepareRecycler(pd); - foreach (QQuickParticleAffector *a, m_affectors) + for (QQuickParticleAffector *a : qAsConst(m_affectors)) if (a && a->m_needsReset) a->reset(pd); - foreach (QQuickParticlePainter* p, groupData[pd->groupId]->painters) + for (QQuickParticlePainter *p : qAsConst(groupData[pd->groupId]->painters)) if (p) p->load(pd); } @@ -1062,18 +1062,18 @@ void QQuickParticleSystem::updateCurrentTime( int currentTime ) bool oldClear = m_empty; m_empty = true; - foreach (QQuickParticleGroupData* gd, groupData)//Recycle all groups and see if they're out of live particles + for (QQuickParticleGroupData *gd : qAsConst(groupData))//Recycle all groups and see if they're out of live particles m_empty = gd->recycle() && m_empty; if (stateEngine) stateEngine->updateSprites(timeInt); - foreach (QQuickParticleEmitter* emitter, m_emitters) + for (QQuickParticleEmitter *emitter : qAsConst(m_emitters)) emitter->emitWindow(timeInt); - foreach (QQuickParticleAffector* a, m_affectors) + for (QQuickParticleAffector *a : qAsConst(m_affectors)) a->affectSystem(dt); - for (QQuickParticleData* d : needsReset) - foreach (QQuickParticlePainter* p, groupData[d->groupId]->painters) + for (QQuickParticleData *d : needsReset) + for (QQuickParticlePainter *p : qAsConst(groupData[d->groupId]->painters)) p->reload(d); if (oldClear != m_empty) |