Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDeclarativeXXX.

11 files changed, 42 insertions, 42 deletions

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index dc2266b..be861a4 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -12,6 +12,6 @@ embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices
-contains(QT_CONFIG, declarative): SUBDIRS *= qmlmodules
+contains(QT_CONFIG, declarative): SUBDIRS *= qdeclarativemodules
 
 
diff --git a/src/plugins/qmlmodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
index 0ebdfd9..1158c88 100644
--- a/src/plugins/qmlmodules/multimedia/multimedia.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qmlextensionplugin.h>
-#include <QtDeclarative/qml.h>
-#include <QtMultimedia/qml.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtMultimedia/qdeclarative.h>
 
 QT_BEGIN_NAMESPACE
 
-class QMultimediaQmlModule : public QmlExtensionPlugin
+class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
-    virtual void initialize(QmlEngine *engine, const char *uri)
+    virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
         QtMultimedia::qRegisterQmlElements(engine, uri);
     }
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
new file mode 100644
index 0000000..21382c5
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
@@ -0,0 +1,11 @@
+TARGET  = multimedia
+include(../../qpluginbase.pri)
+
+QT += multimedia declarative
+
+SOURCES += multimedia.cpp
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules
+target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules
+INSTALLS += target
+
diff --git a/src/plugins/qmlmodules/qmlmodules.pro b/src/plugins/qdeclarativemodules/qdeclarativemodules.pro
index 0a6f444..0a6f444 100644
--- a/src/plugins/qmlmodules/qmlmodules.pro
+++ b/src/plugins/qdeclarativemodules/qdeclarativemodules.pro
diff --git a/src/plugins/qmlmodules/widgets/graphicslayouts.cpp b/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp
index fc15ad2..fc15ad2 100644
--- a/src/plugins/qmlmodules/widgets/graphicslayouts.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp
diff --git a/src/plugins/qmlmodules/widgets/graphicslayouts_p.h b/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h
index 5394ffa..f9b9ae8 100644
--- a/src/plugins/qmlmodules/widgets/graphicslayouts_p.h
+++ b/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h
@@ -69,7 +69,7 @@ class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
     Q_OBJECT
     Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
 
-    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
     Q_CLASSINFO("DefaultProperty", "children")
@@ -77,7 +77,7 @@ public:
     QGraphicsLinearLayoutObject(QObject * = 0);
     ~QGraphicsLinearLayoutObject();
 
-    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
 
     static LinearLayoutAttached *qmlAttachedProperties(QObject *);
 
@@ -91,19 +91,19 @@ private:
     void insertLayoutItem(int, QGraphicsLayoutItem *);
     static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
 
-    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
         static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
     }
 
-    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
+    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
         static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
     }
 
-    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
+    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
         return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
     }
 
-    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
         return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
     }
 };
@@ -114,7 +114,7 @@ class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
     Q_OBJECT
     Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
 
-    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
     Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
     Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
@@ -123,7 +123,7 @@ public:
     QGraphicsGridLayoutObject(QObject * = 0);
     ~QGraphicsGridLayoutObject();
 
-    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
 
     qreal spacing() const;
 
@@ -136,19 +136,19 @@ private:
     void addLayoutItem(QGraphicsLayoutItem *);
     static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
 
-    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
         static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
     }
 
-    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
+    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
         static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
     }
 
-    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
+    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
         return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
     }
 
-    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
         return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
     }
 };
diff --git a/src/plugins/qmlmodules/widgets/graphicswidgets.cpp b/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp
index 062e516..062e516 100644
--- a/src/plugins/qmlmodules/widgets/graphicswidgets.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp
diff --git a/src/plugins/qmlmodules/widgets/graphicswidgets_p.h b/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h
index 6255d2b..2c2b707 100644
--- a/src/plugins/qmlmodules/widgets/graphicswidgets_p.h
+++ b/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h
@@ -42,7 +42,7 @@
 #ifndef GRAPHICSWIDGETS_H
 #define GRAPHICSWIDGETS_H
 
-#include <qml.h>
+#include <qdeclarative.h>
 
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QGraphicsView>
diff --git a/src/plugins/qmlmodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
index 72d5ce1..a0a2597 100644
--- a/src/plugins/qmlmodules/widgets/widgets.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qmlextensionplugin.h>
-#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 
 #include "graphicslayouts_p.h"
 #include "graphicswidgets_p.h"
@@ -67,15 +67,15 @@ class QGraphicsSceneDeclarativeUI : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QmlListProperty<QObject> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> children READ children)
     Q_CLASSINFO("DefaultProperty", "children")
 public:
     QGraphicsSceneDeclarativeUI(QObject *other) : QObject(other) {}
 
-    QmlListProperty<QObject> children() { return QmlListProperty<QObject>(this->parent(), 0, children_append); }
+    QDeclarativeListProperty<QObject> children() { return QDeclarativeListProperty<QObject>(this->parent(), 0, children_append); }
 
 private:
-    static void children_append(QmlListProperty<QObject> *prop, QObject *o) {
+    static void children_append(QDeclarativeListProperty<QObject> *prop, QObject *o) {
         if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o))
             static_cast<QGraphicsScene *>(prop->object)->addItem(go);
     }
@@ -85,13 +85,13 @@ class QGraphicsWidgetDeclarativeUI : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QmlListProperty<QGraphicsItem> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsItem> children READ children)
     Q_PROPERTY(QGraphicsLayout *layout READ layout WRITE setLayout)
     Q_CLASSINFO("DefaultProperty", "children")
 public:
     QGraphicsWidgetDeclarativeUI(QObject *other) : QObject(other) {}
 
-    QmlListProperty<QGraphicsItem> children() { return QmlListProperty<QGraphicsItem>(this, 0, children_append); }
+    QDeclarativeListProperty<QGraphicsItem> children() { return QDeclarativeListProperty<QGraphicsItem>(this, 0, children_append); }
 
     QGraphicsLayout *layout() const { return static_cast<QGraphicsWidget *>(parent())->layout(); }
     void setLayout(QGraphicsLayout *lo)
@@ -105,12 +105,12 @@ private:
         wid->setParentItem(static_cast<QGraphicsWidget *>(parent()));
     }
 
-    static void children_append(QmlListProperty<QGraphicsItem> *prop, QGraphicsItem *i) {
+    static void children_append(QDeclarativeListProperty<QGraphicsItem> *prop, QGraphicsItem *i) {
         static_cast<QGraphicsWidgetDeclarativeUI*>(prop->object)->setItemParent(i);
     }
 };
 
-class QWidgetsQmlModule : public QmlExtensionPlugin
+class QWidgetsQmlModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
@@ -119,7 +119,7 @@ public:
         return QStringList() << QLatin1String("Qt.widgets");
     }
 
-    virtual void initialize(QmlEngine *engine, const char *uri)
+    virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
         Q_UNUSED(uri);
         Q_UNUSED(engine);
diff --git a/src/plugins/qmlmodules/widgets/widgets.pro b/src/plugins/qdeclarativemodules/widgets/widgets.pro
index 5cc8dcc..03c4bf1 100644
--- a/src/plugins/qmlmodules/widgets/widgets.pro
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.pro
@@ -11,5 +11,5 @@ HEADERS += \
     graphicswidgets_p.h \
     graphicslayouts_p.h
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmlmodules
-target.path = $$[QT_INSTALL_PLUGINS]/plugins/qmlmodules
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules
+target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules
diff --git a/src/plugins/qmlmodules/multimedia/multimedia.pro b/src/plugins/qmlmodules/multimedia/multimedia.pro
deleted file mode 100644
index f04cc14..0000000
--- a/src/plugins/qmlmodules/multimedia/multimedia.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET  = multimedia
-include(../../qpluginbase.pri)
-
-QT += multimedia declarative
-
-SOURCES += multimedia.cpp
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmlmodules
-target.path = $$[QT_INSTALL_PLUGINS]/plugins/qmlmodules
-INSTALLS += target
-