Clean up static analysis issues.

Just removing overly defensive programming and unused variables.

Change-Id: I1ffe7a5bd46375f74a8e71e7710d29bc1de02b7d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

diff --git a/src/declarative/particles/qquickimageparticle.cpp b/src/declarative/particles/qquickimageparticle.cpp
index 0847d06..73f9078 100644 (file)
--- a/src/declarative/particles/qquickimageparticle.cpp
+++ b/src/declarative/particles/qquickimageparticle.cpp
@@ -1197,7 +1197,6 @@ static QSGGeometry::AttributeSet SpriteParticle_AttributeSet =
 
 void QQuickImageParticle::clearShadows()
 {
-    m_shadowInit = false;
     foreach (const QVector<QQuickParticleData*> data, m_shadowData)
         qDeleteAll(data);
     m_shadowData.clear();

diff --git a/src/declarative/particles/qquickimageparticle_p.h b/src/declarative/particles/qquickimageparticle_p.h
index 4cbe33b..c7da7cf 100644 (file)
--- a/src/declarative/particles/qquickimageparticle_p.h
+++ b/src/declarative/particles/qquickimageparticle_p.h
@@ -227,8 +227,6 @@ public:
     qreal colorVariation() const { return m_color_variation; }
     void setColorVariation(qreal var);
 
-    qreal renderOpacity() const { return m_render_opacity; }
-
     qreal alphaVariation() const { return m_alphaVariation; }
 
     qreal alpha() const { return m_alpha; }
@@ -273,7 +271,6 @@ signals:
     void colorChanged();
     void colorVariationChanged();
 
-    void particleDurationChanged();
     void alphaVariationChanged(qreal arg);
 
     void alphaChanged(qreal arg);
@@ -358,7 +355,6 @@ private:
 
     QColor m_color;
     qreal m_color_variation;
-    qreal m_particleDuration;
 
     QSGGeometryNode *m_rootNode;
     QHash<int, QSGGeometryNode *> m_nodes;
@@ -370,7 +366,6 @@ private:
 
     // derived values...
 
-    qreal m_render_opacity;
     qreal m_alphaVariation;
     qreal m_alpha;
     qreal m_redVariation;
@@ -393,7 +388,6 @@ private:
     bool m_explicitDeformation;
     bool m_explicitAnimation;
     QHash<int, QVector<QQuickParticleData*> > m_shadowData;
-    bool m_shadowInit;
     void clearShadows();
     QQuickParticleData* getShadowDatum(QQuickParticleData* datum);
 

diff --git a/src/declarative/particles/qquickparticlepainter.cpp b/src/declarative/particles/qquickparticlepainter.cpp
index 6d44e9a..812c4b8 100644 (file)
--- a/src/declarative/particles/qquickparticlepainter.cpp
+++ b/src/declarative/particles/qquickparticlepainter.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 */
 QQuickParticlePainter::QQuickParticlePainter(QQuickItem *parent) :
     QQuickItem(parent),
-    m_system(0), m_count(0), m_pleaseReset(true), m_sentinel(new QQuickParticleData(0))
+    m_system(0), m_count(0), m_pleaseReset(true)
 {
 }
 

diff --git a/src/declarative/particles/qquickparticlepainter_p.h b/src/declarative/particles/qquickparticlepainter_p.h
index b18597d..e80d68f 100644 (file)
--- a/src/declarative/particles/qquickparticlepainter_p.h
+++ b/src/declarative/particles/qquickparticlepainter_p.h
@@ -124,9 +124,7 @@ protected:
     QPointF m_systemOffset;
 
 private:
-    QQuickParticleData* m_sentinel;
     QSet<QPair<int,int> > m_pendingCommits;
-    //QVector<QQuickParticleData*> m_shadowData;//For when we implement overwrite: false
 };
 
 QT_END_NAMESPACE

diff --git a/src/declarative/particles/qquickparticlesystem.cpp b/src/declarative/particles/qquickparticlesystem.cpp
index d6f1cc6..051b2af 100644 (file)
--- a/src/declarative/particles/qquickparticlesystem.cpp
+++ b/src/declarative/particles/qquickparticlesystem.cpp
@@ -1060,6 +1060,10 @@ void QQuickParticleSystem::updateCurrentTime( int currentTime )
     dt = time - dt;
     needsReset.clear();
 
+    m_emitters.removeAll(0);
+    m_painters.removeAll(0);
+    m_affectors.removeAll(0);
+
     bool oldClear = m_empty;
     m_empty = true;
     foreach (QQuickParticleGroupData* gd, groupData)//Recycle all groups and see if they're out of live particles
@@ -1069,15 +1073,12 @@ void QQuickParticleSystem::updateCurrentTime( int currentTime )
         stateEngine->updateSprites(timeInt);
 
     foreach (QQuickParticleEmitter* emitter, m_emitters)
-        if (emitter)
-            emitter->emitWindow(timeInt);
+        emitter->emitWindow(timeInt);
     foreach (QQuickParticleAffector* a, m_affectors)
-        if (a)
-            a->affectSystem(dt);
+        a->affectSystem(dt);
     foreach (QQuickParticleData* d, needsReset)
         foreach (QQuickParticlePainter* p, groupData[d->group]->painters)
-            if (p && d)
-                p->reload(d);
+            p->reload(d);
 
     if (oldClear != m_empty)
         emptyChanged(m_empty);

diff --git a/src/declarative/particles/qquickparticlesystem_p.h b/src/declarative/particles/qquickparticlesystem_p.h
index e3c46f7..791770a 100644 (file)
--- a/src/declarative/particles/qquickparticlesystem_p.h
+++ b/src/declarative/particles/qquickparticlesystem_p.h
@@ -114,7 +114,7 @@ public:
     void setSize(int newSize);
 
     int index;
-    QSet<QQuickParticlePainter*> painters;
+    QSet<QQuickParticlePainter*> painters;//TODO: What if they are dynamically removed?
 
     //TODO: Refactor particle data list out into a separate class
     QVector<QQuickParticleData*> data;

diff --git a/src/declarative/particles/qquicktrailemitter.cpp b/src/declarative/particles/qquicktrailemitter.cpp
index b90bb1c..272a3eb 100644 (file)
--- a/src/declarative/particles/qquicktrailemitter.cpp
+++ b/src/declarative/particles/qquicktrailemitter.cpp
@@ -181,12 +181,13 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
 
     int gId = m_system->groupIds[m_follow];
     int gId2 = m_system->groupIds[m_group];
-    foreach (QQuickParticleData *d, m_system->groupData[gId]->data){
-        if (!d || !d->stillAlive()){
-            m_lastEmission[d->index] = time; //Should only start emitting when it returns to life
+    for (int i=0; i<m_system->groupData[gId]->data.count(); i++) {
+        QQuickParticleData *d = m_system->groupData[gId]->data[i];
+        if (!d->stillAlive()){
+            m_lastEmission[i] = time; //Should only start emitting when it returns to life
             continue;
         }
-        pt = m_lastEmission[d->index];
+        pt = m_lastEmission[i];
         if (pt < d->t)
             pt = d->t;
         if (pt + maxLife < time)//We missed so much, that we should skip emiting particles that are dead by now