Rename declarative symbols.

Use the script rename-qtdeclarative-symbols.sh.

Change-Id: Ib1a62731a6c95590978a488c4afbd804f14fb958
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

9 files changed, 30 insertions, 30 deletions

diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index 1b517d57..36b7d94a 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 
 #include <qaccelerometer.h>
 #include <qambientlightsensor.h>
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-// QtDeclarative doesn't have this for some reason. It has qmlRegisterRevision<T,int>
+// QtQml doesn't have this for some reason. It has qmlRegisterRevision<T,int>
 // and qmlRegisterUncreatableType<T> but they both only do half the job. This one
 // registers an uncreatable type and sets the revision so that derived classes will
 // pick up new properties.
@@ -66,24 +66,24 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
     QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
-    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+    QByteArray listName("QQmlListProperty<" + name + ">");
 
-    QDeclarativePrivate::RegisterType type = {
+    QQmlPrivate::RegisterType type = {
         1,
 
         qRegisterMetaType<T *>(pointerName.constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        qRegisterMetaType<QQmlListProperty<T> >(listName.constData()),
         0, 0,
         reason,
 
         uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
-        QDeclarativePrivate::attachedPropertiesFunc<T>(),
-        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+        QQmlPrivate::attachedPropertiesFunc<T>(),
+        QQmlPrivate::attachedPropertiesMetaObject<T>(),
 
-        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
-        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
-        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+        QQmlPrivate::StaticCastSelector<T,QQmlParserStatus>::cast(),
+        QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
+        QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
 
         0, 0,
 
@@ -91,10 +91,10 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         metaObjectRevision
     };
 
-    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
+    return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type);
 }
 
-class QSensorsDeclarativeModule : public QDeclarativeExtensionPlugin
+class QSensorsDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index de212fe5..35aa3c54 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtMobility/sensors
 
 include(qsensorsimport.pri)
 
-QT += declarative sensors
+QT += qml sensors
 
 SOURCES += sensors.cpp
 
diff --git a/src/imports/sensors2/qsensor2ambientlight.h b/src/imports/sensors2/qsensor2ambientlight.h
index 11a9b48f..573475eb 100644
--- a/src/imports/sensors2/qsensor2ambientlight.h
+++ b/src/imports/sensors2/qsensor2ambientlight.h
@@ -42,8 +42,8 @@
 #ifndef QSENSOR2AMBIENTLIGHT_H
 #define QSENSOR2AMBIENTLIGHT_H
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 #include <qambientlightsensor.h>
 #include "qsensor2common.h"
 
diff --git a/src/imports/sensors2/qsensor2gesture.cpp b/src/imports/sensors2/qsensor2gesture.cpp
index a1cc39c9..ef17c3f9 100644
--- a/src/imports/sensors2/qsensor2gesture.cpp
+++ b/src/imports/sensors2/qsensor2gesture.cpp
@@ -97,7 +97,7 @@ QSensor2Gesture::~QSensor2Gesture()
 }
 
 /*
-  QDeclarativeParserStatus interface implementation
+  QQmlParserStatus interface implementation
 */
 void QSensor2Gesture::classBegin()
 {
@@ -112,7 +112,7 @@ void QSensor2Gesture::componentComplete()
     setEnabled(_enabled);
 }
 /*
-  End of QDeclarativeParserStatus interface implementation
+  End of QQmlParserStatus interface implementation
 */
 
 /*!
diff --git a/src/imports/sensors2/qsensor2gesture.h b/src/imports/sensors2/qsensor2gesture.h
index 38e3c5d4..324e6587 100644
--- a/src/imports/sensors2/qsensor2gesture.h
+++ b/src/imports/sensors2/qsensor2gesture.h
@@ -42,8 +42,8 @@
 #ifndef QSENSOR2GESTURE_H
 #define QSENSOR2GESTURE_H
 
-#include <QtDeclarative/QDeclarativeParserStatus>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/QQmlParserStatus>
+#include <QtQml/qqml.h>
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
 
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 class QSensorGesture;
 class QSensorGestureManager;
-class QSensor2Gesture : public QObject, public QDeclarativeParserStatus
+class QSensor2Gesture : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QStringList availableGestures READ availableGestures NOTIFY availableGesturesChanged)
@@ -59,7 +59,7 @@ class QSensor2Gesture : public QObject, public QDeclarativeParserStatus
     Q_PROPERTY(QStringList validGestures READ validGestures NOTIFY validGesturesChanged)
     Q_PROPERTY(QStringList invalidGestures READ invalidGestures NOTIFY invalidGesturesChanged)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
 public:
     QSensor2Gesture(QObject* parent = 0);
diff --git a/src/imports/sensors2/qsensor2proximity.h b/src/imports/sensors2/qsensor2proximity.h
index 824c16b1..11daf1f6 100644
--- a/src/imports/sensors2/qsensor2proximity.h
+++ b/src/imports/sensors2/qsensor2proximity.h
@@ -42,8 +42,8 @@
 #ifndef QSENSOR2PROXIMITY_H
 #define QSENSOR2PROXIMITY_H
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 #include <qproximitysensor.h>
 #include "qsensor2common.h"
 
diff --git a/src/imports/sensors2/qsensor2tilt.h b/src/imports/sensors2/qsensor2tilt.h
index ae52901a..5b0ea29e 100644
--- a/src/imports/sensors2/qsensor2tilt.h
+++ b/src/imports/sensors2/qsensor2tilt.h
@@ -42,8 +42,8 @@
 #ifndef QSEONSOR2TILT_H
 #define QSEONSOR2TILT_H
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 #include <qaccelerometer.h>
 #include "qsensor2common.h"
 
diff --git a/src/imports/sensors2/sensors2.cpp b/src/imports/sensors2/sensors2.cpp
index 3be8c200..5570aaa1 100644
--- a/src/imports/sensors2/sensors2.cpp
+++ b/src/imports/sensors2/sensors2.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
 #include "qsensor2ambientlight.h"
 #include "qsensor2proximity.h"
 #include "qsensor2tilt.h"
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSensors2DeclarativeModule : public QDeclarativeExtensionPlugin
+class QSensors2DeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro
index 884c3369..49f704c2 100644
--- a/src/imports/sensors2/sensors2.pro
+++ b/src/imports/sensors2/sensors2.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtSensors
 
 include(qsensors2import.pri)
 
-QT += declarative sensors
+QT += qml sensors
 
 SOURCES += sensors2.cpp \
            qsensor2ambientlight.cpp \