Rename QSG* to QQuick* in particles folder

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

src/declarative/items/qquickspriteengine_p.h

@@ -240,7 +240,7 @@ public slots:
     uint updateSprites(uint time);
 
 protected:
-    friend class QSGParticleSystem;
+    friend class QQuickParticleSystem;
     void restart(int index);
     void addToUpdateList(uint t, int idx);
     int goalSeek(int curState, int idx, int dist=-1);

src/declarative/particles/particles.pri

@@ -1,66 +1,66 @@
 HEADERS += \
-    $$PWD/qsgangledirection_p.h \
-    $$PWD/qsgcustomparticle_p.h \
-    $$PWD/qsgcustomaffector_p.h \
-    $$PWD/qsgellipseextruder_p.h \
-    $$PWD/qsgtrailemitter_p.h \
-    $$PWD/qsgfriction_p.h \
-    $$PWD/qsggravity_p.h \
-    $$PWD/qsgimageparticle_p.h \
-    $$PWD/qsgitemparticle_p.h \
-    $$PWD/qsgage_p.h \
-    $$PWD/qsglineextruder_p.h \
-    $$PWD/qsgmaskextruder_p.h \
-    $$PWD/qsgparticleaffector_p.h \
-    $$PWD/qsgparticleemitter_p.h \
-    $$PWD/qsgparticleextruder_p.h \
-    $$PWD/qsgparticlepainter_p.h \
-    $$PWD/qsgparticlesmodule_p.h \
-    $$PWD/qsgparticlesystem_p.h \
-    $$PWD/qsgpointattractor_p.h \
-    $$PWD/qsgpointdirection_p.h \
-    $$PWD/qsgspritegoal_p.h \
-    $$PWD/qsgdirection_p.h \
-    $$PWD/qsgtargetdirection_p.h \
-    $$PWD/qsgturbulence_p.h \
-    $$PWD/qsgwander_p.h \
-    $$PWD/qsgcumulativedirection_p.h \
-    $$PWD/qsgv8particledata_p.h \
-    $$PWD/qsgrectangleextruder_p.h \
-    $$PWD/qsgparticlegroup_p.h \
-    $$PWD/qsggroupgoal_p.h
+    $$PWD/qquickangledirection_p.h \
+    $$PWD/qquickcustomparticle_p.h \
+    $$PWD/qquickcustomaffector_p.h \
+    $$PWD/qquickellipseextruder_p.h \
+    $$PWD/qquicktrailemitter_p.h \
+    $$PWD/qquickfriction_p.h \
+    $$PWD/qquickgravity_p.h \
+    $$PWD/qquickimageparticle_p.h \
+    $$PWD/qquickitemparticle_p.h \
+    $$PWD/qquickage_p.h \
+    $$PWD/qquicklineextruder_p.h \
+    $$PWD/qquickmaskextruder_p.h \
+    $$PWD/qquickparticleaffector_p.h \
+    $$PWD/qquickparticleemitter_p.h \
+    $$PWD/qquickparticleextruder_p.h \
+    $$PWD/qquickparticlepainter_p.h \
+    $$PWD/qquickparticlesmodule_p.h \
+    $$PWD/qquickparticlesystem_p.h \
+    $$PWD/qquickpointattractor_p.h \
+    $$PWD/qquickpointdirection_p.h \
+    $$PWD/qquickspritegoal_p.h \
+    $$PWD/qquickdirection_p.h \
+    $$PWD/qquicktargetdirection_p.h \
+    $$PWD/qquickturbulence_p.h \
+    $$PWD/qquickwander_p.h \
+    $$PWD/qquickcumulativedirection_p.h \
+    $$PWD/qquickv8particledata_p.h \
+    $$PWD/qquickrectangleextruder_p.h \
+    $$PWD/qquickparticlegroup_p.h \
+    $$PWD/qquickgroupgoal_p.h
 
 SOURCES += \
-    $$PWD/qsgangledirection.cpp \
-    $$PWD/qsgcustomparticle.cpp \
-    $$PWD/qsgcustomaffector.cpp \
-    $$PWD/qsgellipseextruder.cpp \
-    $$PWD/qsgtrailemitter.cpp \
-    $$PWD/qsgfriction.cpp \
-    $$PWD/qsggravity.cpp \
-    $$PWD/qsgimageparticle.cpp \
-    $$PWD/qsgitemparticle.cpp \
-    $$PWD/qsgage.cpp \
-    $$PWD/qsglineextruder.cpp \
-    $$PWD/qsgmaskextruder.cpp \
-    $$PWD/qsgparticleaffector.cpp \
-    $$PWD/qsgparticleemitter.cpp \
-    $$PWD/qsgparticleextruder.cpp \
-    $$PWD/qsgparticlepainter.cpp \
-    $$PWD/qsgparticlesmodule.cpp \
-    $$PWD/qsgparticlesystem.cpp \
-    $$PWD/qsgpointattractor.cpp \
-    $$PWD/qsgpointdirection.cpp \
-    $$PWD/qsgspritegoal.cpp \
-    $$PWD/qsgdirection.cpp \
-    $$PWD/qsgtargetdirection.cpp \
-    $$PWD/qsgturbulence.cpp \
-    $$PWD/qsgwander.cpp \
-    $$PWD/qsgcumulativedirection.cpp \
-    $$PWD/qsgv8particledata.cpp \
-    $$PWD/qsgrectangleextruder.cpp \
-    $$PWD/qsgparticlegroup.cpp \
-    $$PWD/qsggroupgoal.cpp
+    $$PWD/qquickangledirection.cpp \
+    $$PWD/qquickcustomparticle.cpp \
+    $$PWD/qquickcustomaffector.cpp \
+    $$PWD/qquickellipseextruder.cpp \
+    $$PWD/qquicktrailemitter.cpp \
+    $$PWD/qquickfriction.cpp \
+    $$PWD/qquickgravity.cpp \
+    $$PWD/qquickimageparticle.cpp \
+    $$PWD/qquickitemparticle.cpp \
+    $$PWD/qquickage.cpp \
+    $$PWD/qquicklineextruder.cpp \
+    $$PWD/qquickmaskextruder.cpp \
+    $$PWD/qquickparticleaffector.cpp \
+    $$PWD/qquickparticleemitter.cpp \
+    $$PWD/qquickparticleextruder.cpp \
+    $$PWD/qquickparticlepainter.cpp \
+    $$PWD/qquickparticlesmodule.cpp \
+    $$PWD/qquickparticlesystem.cpp \
+    $$PWD/qquickpointattractor.cpp \
+    $$PWD/qquickpointdirection.cpp \
+    $$PWD/qquickspritegoal.cpp \
+    $$PWD/qquickdirection.cpp \
+    $$PWD/qquicktargetdirection.cpp \
+    $$PWD/qquickturbulence.cpp \
+    $$PWD/qquickwander.cpp \
+    $$PWD/qquickcumulativedirection.cpp \
+    $$PWD/qquickv8particledata.cpp \
+    $$PWD/qquickrectangleextruder.cpp \
+    $$PWD/qquickparticlegroup.cpp \
+    $$PWD/qquickgroupgoal.cpp
 
 RESOURCES += \
     $$PWD/particles.qrc

src/declarative/particles/qsgage.cpp → src/declarative/particles/qquickage.cpp

@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qsgage_p.h"
-#include "qsgparticleemitter_p.h"
+#include "qquickage_p.h"
+#include "qquickparticleemitter_p.h"
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Age QSGAgeAffector
+    \qmlclass Age QQuickAgeAffector
     \inqmlmodule QtQuick.Particles 2
     \inherits Affector
     \brief The Age affector allows you to prematurely age particles
@@ -76,13 +76,13 @@ QT_BEGIN_NAMESPACE
     Default value is true.
 */
 
-QSGAgeAffector::QSGAgeAffector(QQuickItem *parent) :
-    QSGParticleAffector(parent), m_lifeLeft(0), m_advancePosition(true)
+QQuickAgeAffector::QQuickAgeAffector(QQuickItem *parent) :
+    QQuickParticleAffector(parent), m_lifeLeft(0), m_advancePosition(true)
 {
 }
 
 
-bool QSGAgeAffector::affectParticle(QSGParticleData *d, qreal dt)
+bool QQuickAgeAffector::affectParticle(QQuickParticleData *d, qreal dt)
 {
     Q_UNUSED(dt);
     if (d->stillAlive()){

src/declarative/particles/qsgage_p.h → src/declarative/particles/qquickage_p.h

@@ -41,7 +41,7 @@
 
 #ifndef KILLAFFECTOR_H
 #define KILLAFFECTOR_H
-#include "qsgparticleaffector_p.h"
+#include "qquickparticleaffector_p.h"
 
 QT_BEGIN_HEADER
 
@@ -50,14 +50,14 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 
-class QSGAgeAffector : public QSGParticleAffector
+class QQuickAgeAffector : public QQuickParticleAffector
 {
     Q_OBJECT
     Q_PROPERTY(int lifeLeft READ lifeLeft WRITE setLifeLeft NOTIFY lifeLeftChanged)
     Q_PROPERTY(bool advancePosition READ advancePosition WRITE setAdvancePosition NOTIFY advancePositionChanged)
 
 public:
-    explicit QSGAgeAffector(QQuickItem *parent = 0);
+    explicit QQuickAgeAffector(QQuickItem *parent = 0);
 
     int lifeLeft() const
     {
@@ -70,7 +70,7 @@ class QSGAgeAffector : public QSGParticleAffector
     }
 
 protected:
-    virtual bool affectParticle(QSGParticleData *d, qreal dt);
+    virtual bool affectParticle(QQuickParticleData *d, qreal dt);
 signals:
     void lifeLeftChanged(int arg);
     void advancePositionChanged(bool arg);

src/declarative/particles/qsgangledirection.cpp → src/declarative/particles/qquickangledirection.cpp

@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qsgangledirection_p.h"
+#include "qquickangledirection_p.h"
 #include <cmath>
 QT_BEGIN_NAMESPACE
 const qreal CONV = 0.017453292519943295;
 /*!
-    \qmlclass AngleDirection QSGAngleDirection
+    \qmlclass AngleDirection QQuickAngleDirection
     \inqmlmodule QtQuick.Particles 2
     \inherits Direction
     \brief The AngleDirection element allows you to specify a direction that varies in angle
@@ -92,8 +92,8 @@ const qreal CONV = 0.017453292519943295;
 
     The default value is zero.
 */
-QSGAngleDirection::QSGAngleDirection(QObject *parent) :
-    QSGDirection(parent)
+QQuickAngleDirection::QQuickAngleDirection(QObject *parent) :
+    QQuickDirection(parent)
   , m_angle(0)
   , m_magnitude(0)
   , m_angleVariation(0)
@@ -102,7 +102,7 @@ QSGAngleDirection::QSGAngleDirection(QObject *parent) :
 
 }
 
-const QPointF QSGAngleDirection::sample(const QPointF &from)
+const QPointF QQuickAngleDirection::sample(const QPointF &from)
 {
     Q_UNUSED(from);
     QPointF ret;

src/declarative/particles/qsgangledirection_p.h → src/declarative/particles/qquickangledirection_p.h

@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANGLEDDIRECTION_H
-#define QSGANGLEDDIRECTION_H
-#include "qsgdirection_p.h"
+#ifndef QQuickANGLEDDIRECTION_H
+#define QQuickANGLEDDIRECTION_H
+#include "qquickdirection_p.h"
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGAngleDirection : public QSGDirection
+class QQuickAngleDirection : public QQuickDirection
 {
     Q_OBJECT
     Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
     Q_PROPERTY(qreal magnitude READ magnitude WRITE setMagnitude NOTIFY magnitudeChanged)
     Q_PROPERTY(qreal angleVariation READ angleVariation WRITE setAngleVariation NOTIFY angleVariationChanged)
     Q_PROPERTY(qreal magnitudeVariation READ magnitudeVariation WRITE setMagnitudeVariation NOTIFY magnitudeVariationChanged)
 public:
-    explicit QSGAngleDirection(QObject *parent = 0);
+    explicit QQuickAngleDirection(QObject *parent = 0);
     const QPointF sample(const QPointF &from);
     qreal angle() const
     {
@@ -130,4 +130,4 @@ qreal m_magnitudeVariation;
 
 QT_END_NAMESPACE
 QT_END_HEADER
-#endif // QSGANGLEDDIRECTION_H
+#endif // QQuickANGLEDDIRECTION_H

src/declarative/particles/qsgcumulativedirection.cpp → src/declarative/particles/qquickcumulativedirection.cpp

@@ -39,30 +39,30 @@
 **
 ****************************************************************************/
 
-#include "qsgcumulativedirection_p.h"
+#include "qquickcumulativedirection_p.h"
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CumulativeDirection QSGCumulativeDirection
+    \qmlclass CumulativeDirection QQuickCumulativeDirection
     \inqmlmodule QtQuick.Particles 2
     \inherits Direction
     \brief The CumulativeDirection element allows you to specify a direction made of other directions
 
     The CumulativeDirection element will act as a direction that sums the directions within it.
 */
-QSGCumulativeDirection::QSGCumulativeDirection(QObject *parent):QSGDirection(parent)
+QQuickCumulativeDirection::QQuickCumulativeDirection(QObject *parent):QQuickDirection(parent)
 {
 }
 
-QDeclarativeListProperty<QSGDirection> QSGCumulativeDirection::directions()
+QDeclarativeListProperty<QQuickDirection> QQuickCumulativeDirection::directions()
 {
-    return QDeclarativeListProperty<QSGDirection>(this, m_directions);//TODO: Proper list property
+    return QDeclarativeListProperty<QQuickDirection>(this, m_directions);//TODO: Proper list property
 }
 
-const QPointF QSGCumulativeDirection::sample(const QPointF &from)
+const QPointF QQuickCumulativeDirection::sample(const QPointF &from)
 {
     QPointF ret;
-    foreach (QSGDirection* dir, m_directions)
+    foreach (QQuickDirection* dir, m_directions)
         ret += dir->sample(from);
     return ret;
 }

src/declarative/particles/qsgcumulativedirection_p.h → src/declarative/particles/qquickcumulativedirection_p.h

@@ -39,31 +39,31 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCUMULATIVEDIRECTION_P_H
-#define QSGCUMULATIVEDIRECTION_P_H
-#include "qsgdirection_p.h"
+#ifndef QQuickCUMULATIVEDIRECTION_P_H
+#define QQuickCUMULATIVEDIRECTION_P_H
+#include "qquickdirection_p.h"
 #include <QDeclarativeListProperty>
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGCumulativeDirection : public QSGDirection
+class QQuickCumulativeDirection : public QQuickDirection
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QSGDirection> directions READ directions)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickDirection> directions READ directions)
     Q_CLASSINFO("DefaultProperty", "directions")
 public:
-    explicit QSGCumulativeDirection(QObject *parent = 0);
-    QDeclarativeListProperty<QSGDirection> directions();
+    explicit QQuickCumulativeDirection(QObject *parent = 0);
+    QDeclarativeListProperty<QQuickDirection> directions();
     const QPointF sample(const QPointF &from);
 private:
-    QList<QSGDirection*> m_directions;
+    QList<QQuickDirection*> m_directions;
 };
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGCUMULATIVEDIRECTION_P_H
+#endif // QQuickCUMULATIVEDIRECTION_P_H