diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-08 09:39:34 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 01:05:21 +0100 |
commit | fb9638d88f55107e5e8d7eb3bbc30bc99890feb9 (patch) | |
tree | 262ee024178dd62c3958839b228a84ddbbcc3bef /src/imports/sensors2 | |
parent | 3df9caea52f7136e0bf2e22120b6715a5ab3de45 (diff) |
Rename declarative symbols.
Use the script rename-qtdeclarative-symbols.sh.
Change-Id: Ib1a62731a6c95590978a488c4afbd804f14fb958
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/imports/sensors2')
-rw-r--r-- | src/imports/sensors2/qsensor2ambientlight.h | 4 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2gesture.cpp | 4 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2gesture.h | 8 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2proximity.h | 4 | ||||
-rw-r--r-- | src/imports/sensors2/qsensor2tilt.h | 4 | ||||
-rw-r--r-- | src/imports/sensors2/sensors2.cpp | 6 | ||||
-rw-r--r-- | src/imports/sensors2/sensors2.pro | 2 |
7 files changed, 16 insertions, 16 deletions
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 \ |