Declarative --> Qml adaptation.

Change-Id: Id003cce807bb4b0740ed1c1e24b51067d054362d
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>

11 files changed, 42 insertions, 42 deletions

diff --git a/src/imports/gallery/gallery.pro b/src/imports/gallery/gallery.pro
index 8709385..6d352e8 100644
--- a/src/imports/gallery/gallery.pro
+++ b/src/imports/gallery/gallery.pro
@@ -10,7 +10,7 @@ qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 INSTALLS += qmldir
 
-QT += declarative gallery script
+QT += qml gallery script
 
 HEADERS += \
     qdeclarativedocumentgallery.h \
diff --git a/src/imports/gallery/qdeclarativedocumentgallery.cpp b/src/imports/gallery/qdeclarativedocumentgallery.cpp
index bc4fcac..4e2a0cd 100644
--- a/src/imports/gallery/qdeclarativedocumentgallery.cpp
+++ b/src/imports/gallery/qdeclarativedocumentgallery.cpp
@@ -44,8 +44,8 @@
 #include <qgalleryabstractrequest.h>
 
 #include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtQml/qqmlcontext.h>
+#include <QtQml/qqmlengine.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
@@ -73,7 +73,7 @@ QAbstractGallery *QDeclarativeDocumentGallery::gallery(QObject *object)
 #ifndef QTM_BUILD_UNITTESTS
     Q_UNUSED(object);
 #else
-    if  (QDeclarativeContext *context = QDeclarativeEngine::contextForObject(object)) {
+    if (QQmlContext *context = QQmlEngine::contextForObject(object)) {
         if (QAbstractGallery *gallery = qobject_cast<QAbstractGallery *>(
                 context->contextProperty(QLatin1String("qt_testGallery")).value<QObject *>())) {
             return gallery;
diff --git a/src/imports/gallery/qdeclarativegallery.cpp b/src/imports/gallery/qdeclarativegallery.cpp
index 644d2b1..db60c5a 100644
--- a/src/imports/gallery/qdeclarativegallery.cpp
+++ b/src/imports/gallery/qdeclarativegallery.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 
 #include <qdocumentgallery.h>
 
@@ -52,7 +52,7 @@
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
-class QGalleryDeclarativeModule : public QDeclarativeExtensionPlugin
+class QGalleryDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/src/imports/gallery/qdeclarativegalleryfilter.cpp b/src/imports/gallery/qdeclarativegalleryfilter.cpp
index c92d26d..48e137c 100644
--- a/src/imports/gallery/qdeclarativegalleryfilter.cpp
+++ b/src/imports/gallery/qdeclarativegalleryfilter.cpp
@@ -476,14 +476,14 @@ void QDeclarativeGalleryFilterGroup::componentComplete()
         connect(*it, SIGNAL(filterChanged()), this, SIGNAL(filterChanged()));
 }
 
-QDeclarativeListProperty<QDeclarativeGalleryFilterBase> QDeclarativeGalleryFilterGroup::filters()
+QQmlListProperty<QDeclarativeGalleryFilterBase> QDeclarativeGalleryFilterGroup::filters()
 {
-    return QDeclarativeListProperty<QDeclarativeGalleryFilterBase>(
+    return QQmlListProperty<QDeclarativeGalleryFilterBase>(
             this, &m_filters, append, count, at, clear);
 }
 
 void QDeclarativeGalleryFilterGroup::append(
-        QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters,
+        QQmlListProperty<QDeclarativeGalleryFilterBase> *filters,
         QDeclarativeGalleryFilterBase *filter)
 {
     QDeclarativeGalleryFilterGroup *filterGroup
@@ -499,19 +499,19 @@ void QDeclarativeGalleryFilterGroup::append(
 }
 
 int QDeclarativeGalleryFilterGroup::count(
-        QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters)
+        QQmlListProperty<QDeclarativeGalleryFilterBase> *filters)
 {
     return static_cast<QList<QDeclarativeGalleryFilterBase *>*>(filters->data)->count();
 }
 
 QDeclarativeGalleryFilterBase *QDeclarativeGalleryFilterGroup::at(
-        QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters, int index)
+        QQmlListProperty<QDeclarativeGalleryFilterBase> *filters, int index)
 {
     return static_cast<QList<QDeclarativeGalleryFilterBase *>*>(filters->data)->at(index);
 }
 
 void QDeclarativeGalleryFilterGroup::clear(
-        QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters)
+        QQmlListProperty<QDeclarativeGalleryFilterBase> *filters)
 {
     QDeclarativeGalleryFilterGroup *filterGroup
             = static_cast<QDeclarativeGalleryFilterGroup *>(filters->object);
diff --git a/src/imports/gallery/qdeclarativegalleryfilter.h b/src/imports/gallery/qdeclarativegalleryfilter.h
index 8019155..327676a 100644
--- a/src/imports/gallery/qdeclarativegalleryfilter.h
+++ b/src/imports/gallery/qdeclarativegalleryfilter.h
@@ -54,7 +54,7 @@
 #define QDECLARATIVEGALLERYFILTER_H
 
 #include <qgalleryfilter.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
@@ -252,11 +252,11 @@ public:
 
 class QDeclarativeGalleryFilterGroup
     : public QDeclarativeGalleryFilterBase
-    , public QDeclarativeParserStatus
+    , public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGalleryFilterBase> filters READ filters)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlListProperty<QDeclarativeGalleryFilterBase> filters READ filters)
     Q_CLASSINFO("DefaultProperty", "filters")
 public:
     explicit QDeclarativeGalleryFilterGroup(QObject *parent = 0)
@@ -268,7 +268,7 @@ public:
     void classBegin();
     void componentComplete();
 
-    QDeclarativeListProperty<QDeclarativeGalleryFilterBase> filters();
+    QQmlListProperty<QDeclarativeGalleryFilterBase> filters();
 
 protected:
     QList<QDeclarativeGalleryFilterBase *> m_filters;
@@ -277,12 +277,12 @@ private:
     bool m_complete;
 
     static void append(
-            QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters,
+            QQmlListProperty<QDeclarativeGalleryFilterBase> *filters,
             QDeclarativeGalleryFilterBase *filter);
-    static int count(QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters);
+    static int count(QQmlListProperty<QDeclarativeGalleryFilterBase> *filters);
     static QDeclarativeGalleryFilterBase *at(
-            QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters, int index);
-    static void clear(QDeclarativeListProperty<QDeclarativeGalleryFilterBase> *filters);
+            QQmlListProperty<QDeclarativeGalleryFilterBase> *filters, int index);
+    static void clear(QQmlListProperty<QDeclarativeGalleryFilterBase> *filters);
 };
 
 class QDeclarativeGalleryFilterUnion : public QDeclarativeGalleryFilterGroup
diff --git a/src/imports/gallery/qdeclarativegalleryitem.cpp b/src/imports/gallery/qdeclarativegalleryitem.cpp
index e128572..af04467 100644
--- a/src/imports/gallery/qdeclarativegalleryitem.cpp
+++ b/src/imports/gallery/qdeclarativegalleryitem.cpp
@@ -44,8 +44,8 @@
 #include <qgalleryresultset.h>
 
 #include <QtCore/qcoreapplication.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
-#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtQml/qqmlinfo.h>
+#include <QtQml/qqmlpropertymap.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
@@ -64,7 +64,7 @@ QDeclarativeGalleryItem::QDeclarativeGalleryItem(QObject *parent)
     connect(&m_request, SIGNAL(metaDataChanged(QList<int>)),
             this, SLOT(_q_metaDataChanged(QList<int>)));
 
-    m_metaData = new QDeclarativePropertyMap(this);
+    m_metaData = new QQmlPropertyMap(this);
 
     connect(m_metaData, SIGNAL(valueChanged(QString,QVariant)),
             this, SLOT(_q_valueChanged(QString,QVariant)));
diff --git a/src/imports/gallery/qdeclarativegalleryitem.h b/src/imports/gallery/qdeclarativegalleryitem.h
index e4d7021..57880c6 100644
--- a/src/imports/gallery/qdeclarativegalleryitem.h
+++ b/src/imports/gallery/qdeclarativegalleryitem.h
@@ -59,15 +59,15 @@
 
 #include <QtCore/qpointer.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlpropertymap.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
-class QDeclarativeGalleryItem : public QObject, public QDeclarativeParserStatus
+class QDeclarativeGalleryItem : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
     Q_ENUMS(Status)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -144,7 +144,7 @@ protected:
     bool event(QEvent *event);
 
     QGalleryItemRequest m_request;
-    QDeclarativePropertyMap *m_metaData;
+    QQmlPropertyMap *m_metaData;
     QHash<int, QString> m_propertyKeys;
     Status m_status;
     UpdateStatus m_updateStatus;
diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp
index 8d7db48..e43b53f 100644
--- a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp
+++ b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp
@@ -45,7 +45,7 @@
 
 #include <qgalleryresultset.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.h b/src/imports/gallery/qdeclarativegalleryquerymodel.h
index ef595d9..d9fdfd6 100644
--- a/src/imports/gallery/qdeclarativegalleryquerymodel.h
+++ b/src/imports/gallery/qdeclarativegalleryquerymodel.h
@@ -60,17 +60,17 @@
 
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qpointer.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtScript/QtScript>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
 class QDeclarativeGalleryFilterBase;
 
-class QDeclarativeGalleryQueryModel : public QAbstractListModel, public QDeclarativeParserStatus
+class QDeclarativeGalleryQueryModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
     Q_ENUMS(Status)
     Q_ENUMS(Scope)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
diff --git a/src/imports/gallery/qdeclarativegallerytype.cpp b/src/imports/gallery/qdeclarativegallerytype.cpp
index aa2b922..54a0053 100644
--- a/src/imports/gallery/qdeclarativegallerytype.cpp
+++ b/src/imports/gallery/qdeclarativegallerytype.cpp
@@ -45,8 +45,8 @@
 #include <qgalleryresultset.h>
 
 #include <QtCore/qcoreapplication.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
-#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtQml/qqmlinfo.h>
+#include <QtQml/qqmlpropertymap.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
@@ -65,7 +65,7 @@ QDeclarativeGalleryType::QDeclarativeGalleryType(QObject *parent)
     connect(&m_request, SIGNAL(metaDataChanged(QList<int>)),
             this, SLOT(_q_metaDataChanged(QList<int>)));
 
-    m_metaData = new QDeclarativePropertyMap(this);
+    m_metaData = new QQmlPropertyMap(this);
 }
 
 QDeclarativeGalleryType::~QDeclarativeGalleryType()
diff --git a/src/imports/gallery/qdeclarativegallerytype.h b/src/imports/gallery/qdeclarativegallerytype.h
index 4481fe9..0088fdc 100644
--- a/src/imports/gallery/qdeclarativegallerytype.h
+++ b/src/imports/gallery/qdeclarativegallerytype.h
@@ -57,18 +57,18 @@
 
 #include <QtCore/qpointer.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlpropertymap.h>
 
 #include "qdeclarativedocumentgallery.h"
 #include "qdeclarativegalleryfilter.h"
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
-class QDeclarativeGalleryType : public QObject, public QDeclarativeParserStatus
+class QDeclarativeGalleryType : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
     Q_ENUMS(Status)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -137,7 +137,7 @@ protected:
     bool event(QEvent *event);
 
     QGalleryTypeRequest m_request;
-    QDeclarativePropertyMap *m_metaData;
+    QQmlPropertyMap *m_metaData;
     QHash<int, QString> m_propertyKeys;
     Status m_status;
     UpdateStatus m_updateStatus;