Refactor SpriteEngine out of StochasticEngine

Also add ParticleGroups which use only StochasticStates
Simplistic change for now, just to focus the API for the
particle system. ParticleGroup elements replace the particleStates
property on the system, and the term "group" is now used more
consistently.

Change-Id: I6456f9c521b8166ccd94ea953275557bcfbf6423
Reviewed-on: http://codereview.qt-project.org/4699
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/declarative/particles/qsgparticlepainter_p.h b/src/declarative/particles/qsgparticlepainter_p.h
index 08ae3aede8..d469947453 100644
--- a/src/declarative/particles/qsgparticlepainter_p.h
+++ b/src/declarative/particles/qsgparticlepainter_p.h
@@ -58,7 +58,7 @@ class QSGParticlePainter : public QSGItem
 {
     Q_OBJECT
     Q_PROPERTY(QSGParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
-    Q_PROPERTY(QStringList particles READ particles WRITE setParticles NOTIFY particlesChanged)
+    Q_PROPERTY(QStringList groups READ groups WRITE setGroups NOTIFY groupsChanged)
 
 public:
     explicit QSGParticlePainter(QSGItem *parent = 0);
@@ -74,25 +74,25 @@ public:
     }
 
 
-    QStringList particles() const
+    QStringList groups() const
     {
-        return m_particles;
+        return m_groups;
     }
 
 signals:
     void countChanged();
     void systemChanged(QSGParticleSystem* arg);
 
-    void particlesChanged(QStringList arg);
+    void groupsChanged(QStringList arg);
 
 public slots:
 void setSystem(QSGParticleSystem* arg);
 
-void setParticles(QStringList arg)
+void setGroups(QStringList arg)
 {
-    if (m_particles != arg) {
-        m_particles = arg;
-        emit particlesChanged(arg);
+    if (m_groups != arg) {
+        m_groups = arg;
+        emit groupsChanged(arg);
     }
 }
 
@@ -121,7 +121,7 @@ protected:
     friend class QSGParticleSystem;
     int m_count;
     bool m_pleaseReset;
-    QStringList m_particles;
+    QStringList m_groups;
     QPointF m_systemOffset;
 
 private: