Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quick/particles/qquickimageparticle_p.h b/src/quick/particles/qquickimageparticle_p.h
index a0f1595192..401f4609b0 100644
--- a/src/quick/particles/qquickimageparticle_p.h
+++ b/src/quick/particles/qquickimageparticle_p.h
@@ -43,8 +43,8 @@
 #define ULTRAPARTICLE_H
 #include "qquickparticlepainter_p.h"
 #include "qquickdirection_p.h"
-#include <private/qdeclarativepixmapcache_p.h>
-#include <QDeclarativeListProperty>
+#include <private/qquickpixmapcache_p.h>
+#include <QQmlListProperty>
 #include <QtQuick/qsgsimplematerial.h>
 #include <QtGui/qcolor.h>
 
@@ -150,7 +150,7 @@ class QQuickImageParticle : public QQuickParticlePainter
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ image WRITE setImage NOTIFY imageChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
+    Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     //### Is it worth having progress like Image has?
     //Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -193,7 +193,7 @@ public:
 
     enum Status { Null, Ready, Loading, Error };
 
-    QDeclarativeListProperty<QQuickSprite> sprites();
+    QQmlListProperty<QQuickSprite> sprites();
     QQuickStochasticEngine* spriteEngine() {return m_spriteEngine;}
 
     enum EntryEffect {
@@ -357,7 +357,7 @@ private slots:
 private:
     struct ImageData {
         QUrl source;
-        QDeclarativePixmap pix;
+        QQuickPixmap pix;
     };
     ImageData *m_image;
     ImageData *m_colorTable;