diff options
90 files changed, 376 insertions, 389 deletions
diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc index b1c3726b..d6ce5e42 100644 --- a/doc/src/examples/weatherinfo.qdoc +++ b/doc/src/examples/weatherinfo.qdoc @@ -83,7 +83,7 @@ \snippet examples/weatherinfo/appmodel.h 3 \snippet examples/weatherinfo/appmodel.h 4 - We use a QDeclarativeListProperty for the weather forecast information, + We use a QQmlListProperty for the weather forecast information, which contains the next 4 days of forecast weather. This makes it easy to access from QML. diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro index c23005af..b73c3674 100644 --- a/examples/declarative/flickr/flickr.pro +++ b/examples/declarative/flickr/flickr.pro @@ -1,7 +1,7 @@ TEMPLATE=app TARGET = qml_location_flickr -QT += declarative quick network location +QT += qml quick network location SOURCES += qmllocationflickr.cpp RESOURCES += \ diff --git a/examples/declarative/flickr/qmllocationflickr.cpp b/examples/declarative/flickr/qmllocationflickr.cpp index f1876edd..3962c8f5 100644 --- a/examples/declarative/flickr/qmllocationflickr.cpp +++ b/examples/declarative/flickr/qmllocationflickr.cpp @@ -40,7 +40,7 @@ #include <QGuiApplication> #include <QtQuick/QQuickView> -#include <QtDeclarative/QDeclarativeEngine> +#include <QtQml/QQmlEngine> int main(int argc, char *argv[]) { diff --git a/examples/declarative/mapviewer/mapviewerwrapper.pro b/examples/declarative/mapviewer/mapviewerwrapper.pro index 37949448..36b5d551 100644 --- a/examples/declarative/mapviewer/mapviewerwrapper.pro +++ b/examples/declarative/mapviewer/mapviewerwrapper.pro @@ -1,7 +1,7 @@ TARGET = qml_location_mapviewer TEMPLATE = app -QT += declarative network quick +QT += qml network quick SOURCES += qmlmapviewerwrapper.cpp RESOURCES += \ diff --git a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp b/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp index 8420ab87..a4a7edbf 100644 --- a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp +++ b/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp @@ -41,8 +41,8 @@ #include <QtCore/QStringList> #include <QtCore/QTextStream> #include <QtGui/QGuiApplication> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlContext> #include <QtQuick/QQuickView> #include <QtQuick/QQuickItem> diff --git a/examples/declarative/places/placeswrapper.pro b/examples/declarative/places/placeswrapper.pro index 0a716a80..dee611cc 100644 --- a/examples/declarative/places/placeswrapper.pro +++ b/examples/declarative/places/placeswrapper.pro @@ -1,7 +1,7 @@ TARGET = qml_location_places TEMPLATE = app -QT += declarative quick network +QT += qml quick network SOURCES += qmlplaceswrapper.cpp RESOURCES += \ diff --git a/examples/declarative/places/qmlplaceswrapper.cpp b/examples/declarative/places/qmlplaceswrapper.cpp index 31cad21a..ba8a5aa1 100644 --- a/examples/declarative/places/qmlplaceswrapper.cpp +++ b/examples/declarative/places/qmlplaceswrapper.cpp @@ -41,8 +41,8 @@ #include <QtCore/QStringList> #include <QtCore/QTextStream> #include <QtGui/QGuiApplication> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlContext> #include <QtQuick/QQuickView> #include <QtQuick/QQuickItem> diff --git a/examples/weatherinfo/appmodel.cpp b/examples/weatherinfo/appmodel.cpp index 524b4715..8edd5fc5 100644 --- a/examples/weatherinfo/appmodel.cpp +++ b/examples/weatherinfo/appmodel.cpp @@ -129,7 +129,7 @@ public: QNetworkSession *ns; WeatherData now; QList<WeatherData*> forecast; - QDeclarativeListProperty<WeatherData> *fcProp; + QQmlListProperty<WeatherData> *fcProp; QSignalMapper *geoReplyMapper; QSignalMapper *weatherReplyMapper; bool ready; @@ -145,19 +145,19 @@ public: {} }; -static void forecastAppend(QDeclarativeListProperty<WeatherData> *prop, WeatherData *val) +static void forecastAppend(QQmlListProperty<WeatherData> *prop, WeatherData *val) { Q_UNUSED(val); Q_UNUSED(prop); } -static WeatherData *forecastAt(QDeclarativeListProperty<WeatherData> *prop, int index) +static WeatherData *forecastAt(QQmlListProperty<WeatherData> *prop, int index) { AppModelPrivate *d = static_cast<AppModelPrivate*>(prop->data); return d->forecast.at(index); } -static int forecastCount(QDeclarativeListProperty<WeatherData> *prop) +static int forecastCount(QQmlListProperty<WeatherData> *prop) { AppModelPrivate *d = static_cast<AppModelPrivate*>(prop->data); return d->forecast.size(); @@ -169,7 +169,7 @@ AppModel::AppModel(QObject *parent) : d(new AppModelPrivate) { //! [0] - d->fcProp = new QDeclarativeListProperty<WeatherData>(this, d, + d->fcProp = new QQmlListProperty<WeatherData>(this, d, forecastAppend, forecastCount, forecastAt); @@ -433,7 +433,7 @@ WeatherData *AppModel::weather() const return &(d->now); } -QDeclarativeListProperty<WeatherData> AppModel::forecast() const +QQmlListProperty<WeatherData> AppModel::forecast() const { return *(d->fcProp); } diff --git a/examples/weatherinfo/appmodel.h b/examples/weatherinfo/appmodel.h index 4a8cbdc0..85d6912e 100644 --- a/examples/weatherinfo/appmodel.h +++ b/examples/weatherinfo/appmodel.h @@ -44,7 +44,7 @@ #include <QtCore/QObject> #include <QtCore/QString> #include <QtNetwork/QNetworkReply> -#include <QDeclarativeListProperty> +#include <QtQml/QQmlListProperty> #include <qgeopositioninfo.h> @@ -120,7 +120,7 @@ class AppModel : public QObject Q_PROPERTY(WeatherData *weather READ weather NOTIFY weatherChanged) - Q_PROPERTY(QDeclarativeListProperty<WeatherData> forecast + Q_PROPERTY(QQmlListProperty<WeatherData> forecast READ forecast NOTIFY weatherChanged) @@ -139,7 +139,7 @@ public: void setCity(const QString &value); WeatherData *weather() const; - QDeclarativeListProperty<WeatherData> forecast() const; + QQmlListProperty<WeatherData> forecast() const; public slots: Q_INVOKABLE void refreshWeather(); diff --git a/examples/weatherinfo/main.cpp b/examples/weatherinfo/main.cpp index ee1a1a6b..51cefcc1 100644 --- a/examples/weatherinfo/main.cpp +++ b/examples/weatherinfo/main.cpp @@ -40,8 +40,8 @@ #include <QtGui/QGuiApplication> #include <QtQuick/QQuickView> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlContext> #include <QtQuick/QQuickItem> //! [0] diff --git a/examples/weatherinfo/weatherinfo.pro b/examples/weatherinfo/weatherinfo.pro index 7cd8737a..698115ba 100644 --- a/examples/weatherinfo/weatherinfo.pro +++ b/examples/weatherinfo/weatherinfo.pro @@ -1,11 +1,7 @@ TEMPLATE = app TARGET = weatherinfo -QT += core \ - network \ - location \ - declarative \ - quick +QT += core network location qml quick SOURCES += main.cpp \ appmodel.cpp diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h index e113c400..3e77a9fc 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEBUSINESSFEATURE_P_H #include <qplacebusinessfeature.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QObject> diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index 8496f022..7b60a312 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -43,7 +43,7 @@ #include "qdeclarativeplaceicon_p.h" #include "qdeclarativegeoserviceprovider_p.h" -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> @@ -95,7 +95,7 @@ QDeclarativeCategory::QDeclarativeCategory(const QPlaceCategory &category, QDeclarativeCategory::~QDeclarativeCategory() {} -// From QDeclarativeParserStatus +// From QQmlParserStatus void QDeclarativeCategory::componentComplete() { // delayed instantiation of QObject based properties. diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h index ba3a9502..b15976ba 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVECATEGORY_P_H #define QDECLARATIVECATEGORY_P_H -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/qqml.h> +#include <QtQml/QQmlParserStatus> #include <QObject> #include <qplacecategory.h> @@ -56,7 +56,7 @@ class QDeclarativePlaceIcon; class QPlaceReply; class QPlaceManager; -class QDeclarativeCategory : public QObject, public QDeclarativeParserStatus +class QDeclarativeCategory : public QObject, public QQmlParserStatus { Q_OBJECT @@ -71,7 +71,7 @@ class QDeclarativeCategory : public QObject, public QDeclarativeParserStatus Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: explicit QDeclarativeCategory(QObject* parent = 0); @@ -86,7 +86,7 @@ public: }; enum Status {Ready, Saving, Removing, Error}; - //From QDeclarativeParserStatus + //From QQmlParserStatus virtual void classBegin() {} virtual void componentComplete(); diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp index e2c3e04f..861fc73d 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp @@ -42,7 +42,7 @@ #include "qdeclarativecontactdetail_p.h" /*! - \qmlclass ContactDetails QDeclarativePropertyMap + \qmlclass ContactDetails QQmlPropertyMap \inqmlmodule QtLocation 5 \ingroup qml-QtLocation5-places \ingroup qml-QtLocation5-places-data @@ -88,7 +88,7 @@ The following demonstrates how to assign multiple phone numbers to a place in javascript: \snippet snippets/declarative/places.qml ContactDetails write multiple - Note, due to limitations of the QDeclarativePropertyMap, it is not possible + Note, due to limitations of the QQmlPropertyMap, it is not possible to declaratively specify the contact details in QML, it can only be accomplished via javascript. */ @@ -121,7 +121,7 @@ The following demonstrates how to assign multiple phone numbers to a place in javascript: \snippet snippets/declarative/places.qml ContactDetails write multiple - Note, due to limitations of the QDeclarativePropertyMap, it is not possible + Note, due to limitations of the QQmlPropertyMap, it is not possible to declaratively specify the contact details in QML, it can only be accomplished via javascript. */ diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h b/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h index e0fd3b0b..03c7a871 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h @@ -44,7 +44,7 @@ #include <QtCore/QObject> #include <QtLocation/QPlaceContactDetail> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h index ff0b5509..130af588 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEPERIOD_P_H #include <qplaceperiod.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QObject> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index e4fb3887..1e85863a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -45,8 +45,8 @@ #include "qdeclarativeplaceattribute_p.h" #include "qdeclarativeplaceicon_p.h" -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> #include <QtLocation/QPlaceDetailsReply> @@ -182,8 +182,8 @@ QT_USE_NAMESPACE QDeclarativePlace::QDeclarativePlace(QObject* parent) : QObject(parent), m_location(0), m_ratings(0), m_supplier(0), m_icon(0), m_reviewModel(0), m_imageModel(0), m_editorialModel(0), - m_extendedAttributes(new QDeclarativePropertyMap(this)), - m_contactDetails(new QDeclarativePropertyMap(this)), m_reply(0), m_plugin(0), + m_extendedAttributes(new QQmlPropertyMap(this)), + m_contactDetails(new QQmlPropertyMap(this)), m_reply(0), m_plugin(0), m_complete(false), m_favorite(0), m_status(QDeclarativePlace::Ready) { connect(m_contactDetails, SIGNAL(valueChanged(QString,QVariant)), @@ -195,8 +195,8 @@ QDeclarativePlace::QDeclarativePlace(QObject* parent) QDeclarativePlace::QDeclarativePlace(const QPlace &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent) : QObject(parent), m_location(0), m_ratings(0), m_supplier(0), m_icon(0), m_reviewModel(0), m_imageModel(0), m_editorialModel(0), - m_extendedAttributes(new QDeclarativePropertyMap(this)), - m_contactDetails(new QDeclarativePropertyMap(this)), m_reply(0), m_plugin(plugin), + m_extendedAttributes(new QQmlPropertyMap(this)), + m_contactDetails(new QQmlPropertyMap(this)), m_reply(0), m_plugin(plugin), m_complete(false), m_favorite(0), m_status(QDeclarativePlace::Ready) { Q_ASSERT(plugin); @@ -211,7 +211,7 @@ QDeclarativePlace::~QDeclarativePlace() { } -// From QDeclarativeParserStatus +// From QQmlParserStatus void QDeclarativePlace::componentComplete() { m_complete = true; @@ -711,7 +711,7 @@ void QDeclarativePlace::contactsModified(const QString &key, const QVariant &val { //TODO: This is a workaround to allow an assignment of a single contact detail // to be treated as an asignment of a list with a single element. - // A proper solution is to inherit off QDeclarativePropertyMap + // A proper solution is to inherit off QQmlPropertyMap // and override the write behaviour but this can only be done // when QTBUG-23183 is complete. if (value.userType() == QMetaType::QObjectStar) { @@ -858,7 +858,7 @@ QUrl QDeclarativePlace::primaryWebsite() const This property holds the extended attributes of a place. Extended attributes are additional information about a place not covered by the place's properties. */ -QDeclarativePropertyMap *QDeclarativePlace::extendedAttributes() const +QQmlPropertyMap *QDeclarativePlace::extendedAttributes() const { return m_extendedAttributes; } @@ -869,7 +869,7 @@ QDeclarativePropertyMap *QDeclarativePlace::extendedAttributes() const This property holds the contact information for this place, for example a phone number or a website URL. This property is a map of \l ContactDetail objects. */ -QDeclarativePropertyMap *QDeclarativePlace::contactDetails() const +QQmlPropertyMap *QDeclarativePlace::contactDetails() const { return m_contactDetails; } @@ -880,9 +880,9 @@ QDeclarativePropertyMap *QDeclarativePlace::contactDetails() const This property holds the list of categories this place is a member of. The categories that can be assigned to a place are specific to each \l plugin. */ -QDeclarativeListProperty<QDeclarativeCategory> QDeclarativePlace::categories() +QQmlListProperty<QDeclarativeCategory> QDeclarativePlace::categories() { - return QDeclarativeListProperty<QDeclarativeCategory>(this, + return QQmlListProperty<QDeclarativeCategory>(this, 0, // opaque data parameter category_append, category_count, @@ -890,7 +890,7 @@ QDeclarativeListProperty<QDeclarativeCategory> QDeclarativePlace::categories() category_clear); } -void QDeclarativePlace::category_append(QDeclarativeListProperty<QDeclarativeCategory> *prop, +void QDeclarativePlace::category_append(QQmlListProperty<QDeclarativeCategory> *prop, QDeclarativeCategory *value) { QDeclarativePlace* object = static_cast<QDeclarativePlace*>(prop->object); @@ -903,12 +903,12 @@ void QDeclarativePlace::category_append(QDeclarativeListProperty<QDeclarativeCat emit object->categoriesChanged(); } -int QDeclarativePlace::category_count(QDeclarativeListProperty<QDeclarativeCategory> *prop) +int QDeclarativePlace::category_count(QQmlListProperty<QDeclarativeCategory> *prop) { return static_cast<QDeclarativePlace*>(prop->object)->m_categories.count(); } -QDeclarativeCategory* QDeclarativePlace::category_at(QDeclarativeListProperty<QDeclarativeCategory> *prop, +QDeclarativeCategory* QDeclarativePlace::category_at(QQmlListProperty<QDeclarativeCategory> *prop, int index) { QDeclarativePlace* object = static_cast<QDeclarativePlace*>(prop->object); @@ -919,7 +919,7 @@ QDeclarativeCategory* QDeclarativePlace::category_at(QDeclarativeListProperty<QD return res; } -void QDeclarativePlace::category_clear(QDeclarativeListProperty<QDeclarativeCategory> *prop) +void QDeclarativePlace::category_clear(QQmlListProperty<QDeclarativeCategory> *prop) { QDeclarativePlace* object = static_cast<QDeclarativePlace*>(prop->object); if (object->m_categories.isEmpty()) diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h index bc91d8ba..e98fde7e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h @@ -42,10 +42,12 @@ #ifndef QDECLARATIVEPLACE_P_H #define QDECLARATIVEPLACE_P_H -#include <QObject> -#include <QDeclarativeListProperty> -#include <QtDeclarative/QDeclarativeParserStatus> -#include <qplace.h> +#include <QtCore/QObject> +#include <QtQml/QQmlListProperty> +#include <QtQml/QQmlParserStatus> +#include <QtQml/QQmlPropertyMap> +#include <QtLocation/QPlace> + #include "qdeclarativegeolocation_p.h" #include "qdeclarativecategory_p.h" #include "qdeclarativecontactdetail_p.h" @@ -54,7 +56,6 @@ #include "qdeclarativereviewmodel_p.h" #include "qdeclarativeplaceimagemodel_p.h" #include "qdeclarativeplaceeditorialmodel.h" -#include <QDeclarativePropertyMap> QT_BEGIN_NAMESPACE @@ -63,7 +64,7 @@ class QPlaceReply; class QPlaceManager; class QDeclarativePlaceIcon; -class QDeclarativePlace : public QObject, public QDeclarativeParserStatus +class QDeclarativePlace : public QObject, public QQmlParserStatus { Q_OBJECT @@ -71,7 +72,7 @@ class QDeclarativePlace : public QObject, public QDeclarativeParserStatus Q_PROPERTY(QPlace place READ place WRITE setPlace) Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged) Q_PROPERTY(QDeclarativeGeoLocation* location READ location WRITE setLocation NOTIFY locationChanged); Q_PROPERTY(QDeclarativeRatings* ratings READ ratings WRITE setRatings NOTIFY ratingsChanged); Q_PROPERTY(QDeclarativeSupplier *supplier READ supplier WRITE setSupplier NOTIFY supplierChanged) @@ -97,7 +98,7 @@ class QDeclarativePlace : public QObject, public QDeclarativeParserStatus Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged) Q_PROPERTY(QDeclarativePlace *favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: explicit QDeclarativePlace(QObject* parent = 0); @@ -112,7 +113,7 @@ public: PublicVisibility = QtLocation::PublicVisibility }; - //From QDeclarativeParserStatus + //From QQmlParserStatus virtual void classBegin() {} virtual void componentComplete(); @@ -126,12 +127,12 @@ public: QPlace place(); void setPlace(const QPlace &src); - QDeclarativeListProperty<QDeclarativeCategory> categories(); - static void category_append(QDeclarativeListProperty<QDeclarativeCategory> *prop, + QQmlListProperty<QDeclarativeCategory> categories(); + static void category_append(QQmlListProperty<QDeclarativeCategory> *prop, QDeclarativeCategory* value); - static int category_count(QDeclarativeListProperty<QDeclarativeCategory> *prop); - static QDeclarativeCategory* category_at(QDeclarativeListProperty<QDeclarativeCategory> *prop, int index); - static void category_clear(QDeclarativeListProperty<QDeclarativeCategory> *prop); + static int category_count(QQmlListProperty<QDeclarativeCategory> *prop); + static QDeclarativeCategory* category_at(QQmlListProperty<QDeclarativeCategory> *prop, int index); + static void category_clear(QQmlListProperty<QDeclarativeCategory> *prop); QDeclarativeGeoLocation *location(); void setLocation(QDeclarativeGeoLocation *location); @@ -162,9 +163,9 @@ public: QString primaryEmail() const; QUrl primaryWebsite() const; - QDeclarativePropertyMap *extendedAttributes() const; + QQmlPropertyMap *extendedAttributes() const; - QDeclarativePropertyMap *contactDetails() const; + QQmlPropertyMap *contactDetails() const; Visibility visibility() const; void setVisibility(Visibility visibility); @@ -224,8 +225,8 @@ private: QDeclarativeReviewModel *m_reviewModel; QDeclarativePlaceImageModel *m_imageModel; QDeclarativePlaceEditorialModel *m_editorialModel; - QDeclarativePropertyMap *m_extendedAttributes; - QDeclarativePropertyMap *m_contactDetails; + QQmlPropertyMap *m_extendedAttributes; + QQmlPropertyMap *m_contactDetails; QPlace m_src; diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp index 27995e5d..e419158e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp @@ -42,7 +42,7 @@ #include "qdeclarativeplaceattribute_p.h" /*! - \qmlclass ExtendedAttributes QDeclarativePropertyMap + \qmlclass ExtendedAttributes QQmlPropertyMap \inqmlmodule QtLocation 5 \ingroup qml-QtLocation5-places \ingroup qml-QtLocation5-places-data @@ -86,7 +86,7 @@ \codeline \snippet snippets/declarative/places.qml ExtendedAttributes read - \sa PlaceAttribute, QDeclarativePropertyMap + \sa PlaceAttribute, QQmlPropertyMap */ /*! diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h index 3e0ac2d9..a7aa87a3 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEPLACEATTRIBUTE_P_H #include <QObject> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QString> #include <qplaceattribute.h> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp index 6f23ad37..657445b5 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp @@ -44,7 +44,7 @@ #include "qdeclarativegeoserviceprovider_p.h" #include "qdeclarativeplaceuser_p.h" -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> #include <QtLocation/QPlaceContentRequest> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h b/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h index 3499e178..de7b20f7 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h @@ -43,7 +43,7 @@ #define QDECLARATIVEPLACECONTENTMODEL_H #include <QtCore/QAbstractListModel> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/QQmlParserStatus> #include <QtLocation/QPlaceContent> #include <QtLocation/QPlaceContentReply> @@ -55,7 +55,7 @@ class QGeoServiceProvider; class QDeclarativeSupplier; class QDeclarativePlaceUser; -class QDeclarativePlaceContentModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativePlaceContentModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT @@ -63,7 +63,7 @@ class QDeclarativePlaceContentModel : public QAbstractListModel, public QDeclara Q_PROPERTY(int batchSize READ batchSize WRITE setBatchSize NOTIFY batchSizeChanged) Q_PROPERTY(int totalCount READ totalCount NOTIFY totalCountChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: explicit QDeclarativePlaceContentModel(QPlaceContent::Type type, QObject *parent = 0); @@ -95,7 +95,7 @@ public: bool canFetchMore(const QModelIndex &parent) const; void fetchMore(const QModelIndex &parent); - // from QDeclarativeParserStatus + // from QQmlParserStatus void classBegin(); void componentComplete(); diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp index 15e0c099..42686642 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -43,7 +43,7 @@ #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> QT_USE_NAMESPACE @@ -81,12 +81,12 @@ QT_USE_NAMESPACE */ QDeclarativePlaceIcon::QDeclarativePlaceIcon(QObject *parent) - : QObject(parent), m_plugin(0), m_parameters(new QDeclarativePropertyMap(this)) +: QObject(parent), m_plugin(0), m_parameters(new QQmlPropertyMap(this)) { } QDeclarativePlaceIcon::QDeclarativePlaceIcon(const QPlaceIcon &icon, QDeclarativeGeoServiceProvider *plugin, QObject *parent) - : QObject(parent), m_parameters(new QDeclarativePropertyMap(this)) +: QObject(parent), m_parameters(new QQmlPropertyMap(this)) { if (icon.isEmpty()) m_plugin = 0; @@ -167,12 +167,12 @@ QUrl QDeclarativePlaceIcon::url(const QSize &size) const Consult the \l {Information about plugins} {plugin documentation} for what parameters are supported and how they should be used. - Note, due to limitations of the QDeclarativePropertyMap, it is not possible + Note, due to limitations of the QQmlPropertyMap, it is not possible to declaratively specify the parameters in QML, assignment of parameters keys and values can only be accomplished by javascript. */ -QDeclarativePropertyMap *QDeclarativePlaceIcon::parameters() const +QQmlPropertyMap *QDeclarativePlaceIcon::parameters() const { return m_parameters; } diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h index f06f3438..37dca7e5 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h @@ -45,14 +45,14 @@ #include "qdeclarativegeoserviceprovider_p.h" #include <qplaceicon.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/QDeclarativePropertyMap> +#include <QtQml/qqml.h> +#include <QtQml/QQmlPropertyMap> #include <QObject> QT_BEGIN_NAMESPACE -class QDeclarativePropertyMap; +class QQmlPropertyMap; class QDeclarativePlaceIcon : public QObject { @@ -72,7 +72,7 @@ public: Q_INVOKABLE QUrl url(const QSize &size = QSize()) const; - QDeclarativePropertyMap *parameters() const; + QQmlPropertyMap *parameters() const; void setPlugin(QDeclarativeGeoServiceProvider *plugin); QDeclarativeGeoServiceProvider *plugin() const; @@ -89,7 +89,7 @@ private: QPlaceManager *manager() const; void initParameters(const QVariantMap ¶meterMap); QDeclarativeGeoServiceProvider *m_plugin; - QDeclarativePropertyMap *m_parameters; + QQmlPropertyMap *m_parameters; }; QT_END_NAMESPACE diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h index 04180917..a29c0443 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEPLACEUSER_P_H #include <QtCore/QObject> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtLocation/QPlaceUser> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h index aa06d400..fa959a0c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVERATINGS_P_H #include <qplaceratings.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QObject> diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp index a67d267c..f1005f6a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp @@ -42,8 +42,8 @@ #include "qdeclarativerecommendationmodel_p.h" #include "qdeclarativeplace_p.h" -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h index 388003e7..57c333c9 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVERECOMMENDATIONMODEL_P_H #define QDECLARATIVERECOMMENDATIONMODEL_P_H -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/QQmlParserStatus> #include "qdeclarativeresultmodelbase_p.h" QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ class QDeclarativeRecommendationModel : public QDeclarativeResultModelBase Q_OBJECT Q_PROPERTY(QString placeId READ placeId WRITE setPlaceId NOTIFY placeIdChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: explicit QDeclarativeRecommendationModel(QObject *parent = 0); diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp index 66a792e8..4523ae47 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp @@ -42,7 +42,7 @@ #include "qdeclarativesearchmodelbase.h" #include "qdeclarativeplace_p.h" -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> #include <QtLocation/QPlaceSearchRequest> diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h index ce9325d1..36a526fe 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h @@ -43,7 +43,7 @@ #define QDECLARATIVESEARCHMODELBASE_H #include <QtCore/QAbstractListModel> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/QQmlParserStatus> #include <QtLocation/QPlaceSearchRequest> #include <QtLocation/QPlaceSearchResult> #include <QtLocation/QPlaceReply> @@ -58,7 +58,7 @@ class QPlaceSearchReply; class QDeclarativePlace; class QDeclarativeGeoBoundingArea; -class QDeclarativeSearchModelBase : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeSearchModelBase : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT @@ -70,7 +70,7 @@ class QDeclarativeSearchModelBase : public QAbstractListModel, public QDeclarati Q_ENUMS(Status) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: enum Status { @@ -106,7 +106,7 @@ public: virtual void clearData(); virtual void updateSearchRequest(); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void classBegin(); virtual void componentComplete(); diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index 6b78fa1a..f7728634 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -43,8 +43,8 @@ #include "qdeclarativeplace_p.h" #include "qdeclarativeplaceicon_p.h" -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceSearchReply> #include <QtLocation/QPlaceManager> @@ -291,9 +291,9 @@ void QDeclarativeSearchResultModel::setSearchTerm(const QString &searchTerm) This property holds a list of categories to be used when searching. Returned search results will be for places that match at least one of the categories. */ -QDeclarativeListProperty<QDeclarativeCategory> QDeclarativeSearchResultModel::categories() +QQmlListProperty<QDeclarativeCategory> QDeclarativeSearchResultModel::categories() { - return QDeclarativeListProperty<QDeclarativeCategory>(this, + return QQmlListProperty<QDeclarativeCategory>(this, 0, // opaque data parameter categories_append, categories_count, @@ -301,8 +301,8 @@ QDeclarativeListProperty<QDeclarativeCategory> QDeclarativeSearchResultModel::ca categories_clear); } -void QDeclarativeSearchResultModel::categories_append(QDeclarativeListProperty<QDeclarativeCategory> *list, - QDeclarativeCategory *declCategory) +void QDeclarativeSearchResultModel::categories_append(QQmlListProperty<QDeclarativeCategory> *list, + QDeclarativeCategory *declCategory) { QDeclarativeSearchResultModel* searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); if (searchModel && declCategory) { @@ -314,7 +314,7 @@ void QDeclarativeSearchResultModel::categories_append(QDeclarativeListProperty<Q } } -int QDeclarativeSearchResultModel::categories_count(QDeclarativeListProperty<QDeclarativeCategory> *list) +int QDeclarativeSearchResultModel::categories_count(QQmlListProperty<QDeclarativeCategory> *list) { QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); if (searchModel) @@ -323,7 +323,7 @@ int QDeclarativeSearchResultModel::categories_count(QDeclarativeListProperty<QDe return -1; } -QDeclarativeCategory* QDeclarativeSearchResultModel::category_at(QDeclarativeListProperty<QDeclarativeCategory> *list, +QDeclarativeCategory* QDeclarativeSearchResultModel::category_at(QQmlListProperty<QDeclarativeCategory> *list, int index) { QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); @@ -333,7 +333,7 @@ QDeclarativeCategory* QDeclarativeSearchResultModel::category_at(QDeclarativeLis return 0; } -void QDeclarativeSearchResultModel::categories_clear(QDeclarativeListProperty<QDeclarativeCategory> *list) +void QDeclarativeSearchResultModel::categories_clear(QQmlListProperty<QDeclarativeCategory> *list) { QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); if (searchModel) { diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h index 33bd1b2d..225f118f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h @@ -55,7 +55,7 @@ class QDeclarativeSearchResultModel : public QDeclarativeResultModelBase Q_OBJECT Q_PROPERTY(QString searchTerm READ searchTerm WRITE setSearchTerm NOTIFY searchTermChanged) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged) Q_PROPERTY(int maximumCorrections READ maximumCorrections WRITE setMaximumCorrections NOTIFY maximumCorrectionsChanged) Q_PROPERTY(RelevanceHint relevanceHint READ relevanceHint WRITE setRelevanceHint NOTIFY relevanceHintChanged) Q_PROPERTY(QDeclarativePlace::Visibility visibilityScope READ visibilityScope WRITE setVisibilityScope NOTIFY visibilityScopeChanged) @@ -81,12 +81,12 @@ public: QString searchTerm() const; void setSearchTerm(const QString &searchTerm); - QDeclarativeListProperty<QDeclarativeCategory> categories(); - static void categories_append(QDeclarativeListProperty<QDeclarativeCategory> *list, + QQmlListProperty<QDeclarativeCategory> categories(); + static void categories_append(QQmlListProperty<QDeclarativeCategory> *list, QDeclarativeCategory* category); - static int categories_count(QDeclarativeListProperty<QDeclarativeCategory> *list); - static QDeclarativeCategory* category_at(QDeclarativeListProperty<QDeclarativeCategory> *list, int index); - static void categories_clear(QDeclarativeListProperty<QDeclarativeCategory> *list); + static int categories_count(QQmlListProperty<QDeclarativeCategory> *list); + static QDeclarativeCategory* category_at(QQmlListProperty<QDeclarativeCategory> *list, int index); + static void categories_clear(QQmlListProperty<QDeclarativeCategory> *list); QDeclarativeSearchResultModel::RelevanceHint relevanceHint() const; void setRelevanceHint(QDeclarativeSearchResultModel::RelevanceHint hint); diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp index a5dc587b..de0f577c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp @@ -42,7 +42,7 @@ #include "qdeclarativesearchsuggestionmodel_p.h" #include "qdeclarativegeoserviceprovider_p.h" -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QtLocation/QGeoServiceProvider> #include <qplacemanager.h> diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h index a4f518b4..5448dc3a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h @@ -44,15 +44,15 @@ #include <QObject> #include <QtCore/QUrl> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/qqml.h> +#include <QtQml/QQmlParserStatus> #include <qplacesupplier.h> #include "qdeclarativeplaceicon_p.h" QT_BEGIN_NAMESPACE -class QDeclarativeSupplier : public QObject, public QDeclarativeParserStatus +class QDeclarativeSupplier : public QObject, public QQmlParserStatus { Q_OBJECT @@ -62,14 +62,14 @@ class QDeclarativeSupplier : public QObject, public QDeclarativeParserStatus Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: explicit QDeclarativeSupplier(QObject* parent = 0); explicit QDeclarativeSupplier(const QPlaceSupplier &src, QDeclarativeGeoServiceProvider *plugin, QObject* parent = 0); ~QDeclarativeSupplier(); - // From QDeclarativeParserStatus + // From QQmlParserStatus void classBegin() { } void componentComplete(); diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index eb6b4957..eedad271 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -43,7 +43,7 @@ #include "qdeclarativeplaceicon_p.h" #include "qgeoserviceprovider.h" -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QtLocation/QPlaceManager> #include <QtLocation/QPlaceIcon> @@ -142,7 +142,7 @@ QDeclarativeSupportedCategoriesModel::~QDeclarativeSupportedCategoriesModel() qDeleteAll(m_categoriesTree); } -// From QDeclarativeParserStatus +// From QQmlParserStatus void QDeclarativeSupportedCategoriesModel::componentComplete() { m_complete = true; diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h index 8efb2cd6..c74a2f2b 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h @@ -47,8 +47,8 @@ #include <QObject> #include <QtCore/QStringList> #include <QAbstractListModel> -#include <QDeclarativeListProperty> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QQmlListProperty> +#include <QtQml/QQmlParserStatus> #include <QtLocation/QPlaceCategory> @@ -68,7 +68,7 @@ public: QSharedPointer<QDeclarativeCategory> declCategory; }; -class QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public QDeclarativeParserStatus +class QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public QQmlParserStatus { Q_OBJECT @@ -78,14 +78,14 @@ class QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public Q Q_PROPERTY(bool hierarchical READ hierarchical WRITE setHierarchical NOTIFY hierarchicalChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged); - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_ENUMS(Roles) public: explicit QDeclarativeSupportedCategoriesModel(QObject *parent = 0); virtual ~QDeclarativeSupportedCategoriesModel(); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void classBegin() {} virtual void componentComplete(); diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 809a6bf2..27ea338b 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -85,14 +85,14 @@ #include "qdeclarativesearchresultmodel_p.h" #include "qdeclarativesearchsuggestionmodel_p.h" -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <qdeclarativepropertymap.h> +#include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqml.h> +#include <qqmlpropertymap.h> #include <QDebug> QT_BEGIN_NAMESPACE -class QLocationDeclarativeModule: public QDeclarativeExtensionPlugin +class QLocationDeclarativeModule: public QQmlExtensionPlugin { Q_OBJECT diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index 7080f5b4..1359785e 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -3,7 +3,7 @@ TARGETPATH = QtLocation include(qlocationimport.pri) -QT += quick-private network location declarative-private 3d core-private gui-private +QT += quick-private network location qml-private 3d core-private gui-private DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index 15547472..b96b7d39 100644 --- a/src/imports/location/plugins.qmltypes +++ b/src/imports/location/plugins.qmltypes @@ -420,7 +420,7 @@ Module { prototype: "QObject" exports: ["MapItemView 5.0"] Property { name: "model"; type: "QVariant" } - Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "visible"; type: "bool" } Property { name: "z"; type: "qreal" } } @@ -1144,7 +1144,7 @@ Module { Method { name: "stop" } } Component { - name: "QDeclarativePropertyMap" + name: "QQmlPropertyMap" prototype: "QObject" Signal { name: "valueChanged" diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/location/qdeclarativecoordinate.cpp index 9056cf8f..5fb4f608 100644 --- a/src/imports/location/qdeclarativecoordinate.cpp +++ b/src/imports/location/qdeclarativecoordinate.cpp @@ -41,7 +41,7 @@ #include "qdeclarativecoordinate_p.h" #include <qnumeric.h> -#include "qdeclarative.h" +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/location/qdeclarativecoordinate_p.h index 443fe003..7d0946d7 100644 --- a/src/imports/location/qdeclarativecoordinate_p.h +++ b/src/imports/location/qdeclarativecoordinate_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVECOORDINATE_H #include <qgeocoordinate.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QObject> diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h index 64b6d427..eafe628e 100644 --- a/src/imports/location/qdeclarativegeoaddress_p.h +++ b/src/imports/location/qdeclarativegeoaddress_p.h @@ -44,7 +44,7 @@ #include <qgeoaddress.h> #include <QtCore> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingarea_p.h b/src/imports/location/qdeclarativegeoboundingarea_p.h index a88f1a17..aa8e8eae 100644 --- a/src/imports/location/qdeclarativegeoboundingarea_p.h +++ b/src/imports/location/qdeclarativegeoboundingarea_p.h @@ -46,7 +46,7 @@ #include <QtCore> #include <QPointer> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingbox_p.h b/src/imports/location/qdeclarativegeoboundingbox_p.h index ba09ecf3..1f96ba69 100644 --- a/src/imports/location/qdeclarativegeoboundingbox_p.h +++ b/src/imports/location/qdeclarativegeoboundingbox_p.h @@ -47,7 +47,7 @@ #include <qgeoboundingbox.h> #include <QtCore> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingcircle_p.h b/src/imports/location/qdeclarativegeoboundingcircle_p.h index 4a671339..7be8c7bf 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle_p.h +++ b/src/imports/location/qdeclarativegeoboundingcircle_p.h @@ -48,7 +48,7 @@ #include <QtCore> #include <QPointer> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 5c4ba148..4f292262 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -42,7 +42,7 @@ #include "qdeclarativegeocodemodel_p.h" #include "qdeclarativegeolocation_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <qgeoserviceprovider.h> #include <qgeocodingmanager.h> @@ -133,7 +133,7 @@ QDeclarativeGeocodeModel::~QDeclarativeGeocodeModel() delete reply_; } -// From QDeclarativeParserStatus +// From QQmlParserStatus void QDeclarativeGeocodeModel::componentComplete() { complete_ = true; diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index 13d727bc..2cd5e475 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -47,8 +47,8 @@ #include "qdeclarativegeoboundingcircle_p.h" #include <qgeocodereply.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDeclarativeParserStatus> +#include <QtQml/qqml.h> +#include <QtQml/QQmlParserStatus> #include "qdeclarativegeolocation_p.h" #include <QAbstractListModel> #include <QPointer> @@ -59,7 +59,7 @@ class QGeoServiceProvider; class QGeocodingManager; class QDeclarativeGeoLocation; -class QDeclarativeGeocodeModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_ENUMS(Status) @@ -75,7 +75,7 @@ class QDeclarativeGeocodeModel : public QAbstractListModel, public QDeclarativeP Q_PROPERTY(QVariant query READ query WRITE setQuery NOTIFY queryChanged) Q_PROPERTY(QObject* bounds READ bounds WRITE setBounds NOTIFY boundsChanged) Q_PROPERTY(GeocodeError error READ error NOTIFY errorChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: enum Status { @@ -102,7 +102,7 @@ public: explicit QDeclarativeGeocodeModel(QObject* parent = 0); virtual ~QDeclarativeGeocodeModel(); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void classBegin() {} virtual void componentComplete(); diff --git a/src/imports/location/qdeclarativegeolocation_p.h b/src/imports/location/qdeclarativegeolocation_p.h index d159ddd7..c1648ee7 100644 --- a/src/imports/location/qdeclarativegeolocation_p.h +++ b/src/imports/location/qdeclarativegeolocation_p.h @@ -42,9 +42,9 @@ #ifndef QDECLARATIVEGEOLOCATION_P_H #define QDECLARATIVEGEOLOCATION_P_H -#include <QObject> -#include <QDeclarativeListProperty> -#include <qgeolocation.h> +#include <QtCore/QObject> +#include <QtQml/QQmlListProperty> +#include <QtLocation/QGeoLocation> #include "qdeclarativecoordinate_p.h" #include "qdeclarativegeoboundingbox_p.h" #include "qdeclarativegeoaddress_p.h" diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index d07f8553..baa06aea 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -59,8 +59,8 @@ #include <qgeoserviceprovider.h> #include <qgeomappingmanager.h> -#include <QDeclarativeContext> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/QQmlContext> +#include <QtQml/qqmlinfo.h> #include <QModelIndex> #include <QtQuick/QQuickCanvas> #include <QtQuick/QSGEngine> @@ -793,9 +793,9 @@ void QDeclarativeGeoMap::centerAltitudeChanged(double altitude) } } -QDeclarativeListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMapTypes() +QQmlListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMapTypes() { - return QDeclarativeListProperty<QDeclarativeGeoMapType>(this, supportedMapTypes_); + return QQmlListProperty<QDeclarativeGeoMapType>(this, supportedMapTypes_); } /*! diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h index 2a81dbe8..94335315 100644 --- a/src/imports/location/qdeclarativegeomap_p.h +++ b/src/imports/location/qdeclarativegeomap_p.h @@ -51,7 +51,7 @@ #include <QtQuick/QSGTexture> #include <QtQuick/QQuickPaintedItem> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/QQmlParserStatus> #include "qdeclarativegeomapitemview_p.h" #include "qdeclarativegeomapflickable_p.h" #include "qdeclarativegeomappincharea_p.h" @@ -105,20 +105,20 @@ class QDeclarativeGeoMap : public QQuickItem Q_PROPERTY(qreal maximumZoomLevel READ maximumZoomLevel NOTIFY maximumZoomLevelChanged) Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) Q_PROPERTY(QDeclarativeGeoMapType* activeMapType READ activeMapType WRITE setActiveMapType NOTIFY activeMapTypeChanged) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGeoMapType> supportedMapTypes READ supportedMapTypes NOTIFY supportedMapTypesChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeGeoMapType> supportedMapTypes READ supportedMapTypes NOTIFY supportedMapTypesChanged) Q_PROPERTY(QDeclarativeCoordinate* center READ center WRITE setCenter NOTIFY centerChanged) Q_PROPERTY(QList<QObject*> mapItems READ mapItems NOTIFY mapItemsChanged) // Tilt and bearing are not part of supported API Q_PROPERTY(qreal tilt READ tilt WRITE setTilt NOTIFY tiltChanged) Q_PROPERTY(qreal bearing READ bearing WRITE setBearing NOTIFY bearingChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativeGeoMap(QQuickItem *parent = 0); ~QDeclarativeGeoMap(); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void componentComplete(); // from QQuickItem @@ -150,7 +150,7 @@ public: void setCenter(QDeclarativeCoordinate *center); QDeclarativeCoordinate* center(); - QDeclarativeListProperty<QDeclarativeGeoMapType> supportedMapTypes(); + QQmlListProperty<QDeclarativeGeoMapType> supportedMapTypes(); Q_INVOKABLE void removeMapItem(QDeclarativeGeoMapItemBase *item); Q_INVOKABLE void addMapItem(QDeclarativeGeoMapItemBase *item); diff --git a/src/imports/location/qdeclarativegeomapflickable_p.h b/src/imports/location/qdeclarativegeomapflickable_p.h index d21db872..1e6ba57f 100644 --- a/src/imports/location/qdeclarativegeomapflickable_p.h +++ b/src/imports/location/qdeclarativegeomapflickable_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEGEOMAPFLICKABLE_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtGui/qevent.h> #include <QElapsedTimer> #include <QVector> diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp index 8b1cc615..9fe7766c 100644 --- a/src/imports/location/qdeclarativegeomapitembase.cpp +++ b/src/imports/location/qdeclarativegeomapitembase.cpp @@ -42,7 +42,7 @@ #include "qdeclarativegeomapitembase_p.h" #include "qdeclarativegeomapmousearea_p.h" #include "qgeocameradata_p.h" -#include <QDeclarativeInfo> +#include <QtQml/QQmlInfo> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapitemview.cpp b/src/imports/location/qdeclarativegeomapitemview.cpp index 154cb2ea..d6716c27 100644 --- a/src/imports/location/qdeclarativegeomapitemview.cpp +++ b/src/imports/location/qdeclarativegeomapitemview.cpp @@ -44,10 +44,10 @@ #include "qdeclarativegeomap_p.h" #include "qdeclarativegeomapitembase_p.h" -#include <QDeclarativeParserStatus> -#include <QAbstractItemModel> -#include <QDeclarativeContext> -#include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> +#include <QtCore/QAbstractItemModel> +#include <QtQml/QQmlParserStatus> +#include <QtQml/QQmlContext> +#include <QtQml/private/qqmlopenmetaobject_p.h> QT_BEGIN_NAMESPACE @@ -148,7 +148,7 @@ void QDeclarativeGeoMapItemView::modelRowsRemoved(QModelIndex, int start, int en } } -QDeclarativeComponent* QDeclarativeGeoMapItemView::delegate() const +QQmlComponent* QDeclarativeGeoMapItemView::delegate() const { return delegate_; } @@ -162,7 +162,7 @@ QDeclarativeComponent* QDeclarativeGeoMapItemView::delegate() const */ -void QDeclarativeGeoMapItemView::setDelegate(QDeclarativeComponent *delegate) +void QDeclarativeGeoMapItemView::setDelegate(QQmlComponent *delegate) { if (!delegate) return; @@ -229,10 +229,10 @@ QDeclarativeGeoMapItemBase* QDeclarativeGeoMapItemView::createItem(int modelRow) } QObject *model = new QObject(this); - QDeclarativeOpenMetaObject *modelMetaObject = new QDeclarativeOpenMetaObject(model); + QQmlOpenMetaObject *modelMetaObject = new QQmlOpenMetaObject(model); QHashIterator<int, QByteArray> iterator(model_->roleNames()); - QDeclarativeContext *itemContext = new QDeclarativeContext(qmlContext(this)); + QQmlContext *itemContext = new QQmlContext(qmlContext(this)); while (iterator.hasNext()) { iterator.next(); QVariant modelData = model_->data(index, iterator.key()); diff --git a/src/imports/location/qdeclarativegeomapitemview_p.h b/src/imports/location/qdeclarativegeomapitemview_p.h index 36fc86e9..a958e9e1 100644 --- a/src/imports/location/qdeclarativegeomapitemview_p.h +++ b/src/imports/location/qdeclarativegeomapitemview_p.h @@ -45,7 +45,7 @@ #include "QModelIndex" #include <QtQuick/QQuickItem> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/QQmlParserStatus> #include <QtCore/QPointer> QT_BEGIN_NAMESPACE @@ -54,14 +54,14 @@ class QAbstractItemModel; class QDeclarativeGeoMap; class QDeclarativeGeoMapItemBase; -class QDeclarativeGeoMapItemView : public QObject, public QDeclarativeParserStatus +class QDeclarativeGeoMapItemView : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) - Q_PROPERTY(QDeclarativeComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged) @@ -72,8 +72,8 @@ public: QVariant model() const; void setModel(const QVariant &); - QDeclarativeComponent *delegate() const; - void setDelegate(QDeclarativeComponent*); + QQmlComponent *delegate() const; + void setDelegate(QQmlComponent*); void setMapData(QDeclarativeGeoMap*); void repopulate(); @@ -86,7 +86,7 @@ public: bool isVisible() const; QDeclarativeGeoMapItemBase* createItem(int modelRow); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void componentComplete(); void classBegin() {} @@ -104,7 +104,7 @@ private Q_SLOTS: private: bool visible_; bool componentCompleted_; - QDeclarativeComponent *delegate_; + QQmlComponent *delegate_; QVariant modelVariant_; QAbstractItemModel* model_; QDeclarativeGeoMap *map_; diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index f3191048..9e82b02f 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeomapmousearea_p.h" #include "qdeclarativegeomapitembase_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QtQuick/QQuickCanvas> #include <QtQuick/private/qquickevents_p_p.h> diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h index 5d12988f..bb28d3db 100644 --- a/src/imports/location/qdeclarativegeomapmousearea_p.h +++ b/src/imports/location/qdeclarativegeomapmousearea_p.h @@ -61,7 +61,7 @@ public: Q_INVOKABLE QDeclarativeCoordinate* mouseToCoordinate(QQuickMouseEvent* event); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void componentComplete(); protected: diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h index 14fd163c..77737de8 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent_p.h +++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h @@ -44,7 +44,7 @@ #include "qdeclarativecoordinate_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappincharea.cpp b/src/imports/location/qdeclarativegeomappincharea.cpp index a1b9eba2..0d38dd50 100644 --- a/src/imports/location/qdeclarativegeomappincharea.cpp +++ b/src/imports/location/qdeclarativegeomappincharea.cpp @@ -44,7 +44,7 @@ #include "qdeclarativegeomap_p.h" #include <QtGui/qevent.h> #include <QtGui/QStyleHints> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QDebug> #include "math.h" #include "qgeomap_p.h" diff --git a/src/imports/location/qdeclarativegeomappincharea_p.h b/src/imports/location/qdeclarativegeomappincharea_p.h index c4474c70..97b28f80 100644 --- a/src/imports/location/qdeclarativegeomappincharea_p.h +++ b/src/imports/location/qdeclarativegeomappincharea_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEGEOMAPPINCHAREA_H #define QDECLARATIVEGEOMAPPINCHAREA_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QTouchEvent> #include <QObject> #include <QDebug> diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index 1f1f80e9..121badf3 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -42,7 +42,7 @@ #include "qdeclarativegeomapquickitem_p.h" #include "qdeclarativegeomapmousearea_p.h" #include "qdeclarativecoordinate_p.h" -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> #include <QDebug> #include <cmath> diff --git a/src/imports/location/qdeclarativegeomaptype.cpp b/src/imports/location/qdeclarativegeomaptype.cpp index cd42bc59..cc066766 100644 --- a/src/imports/location/qdeclarativegeomaptype.cpp +++ b/src/imports/location/qdeclarativegeomaptype.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeomaptype_p.h" #include <qnumeric.h> -#include "qdeclarative.h" +#include <QtQml/qqml.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaptype_p.h b/src/imports/location/qdeclarativegeomaptype_p.h index 31d09635..c60e6c5f 100644 --- a/src/imports/location/qdeclarativegeomaptype_p.h +++ b/src/imports/location/qdeclarativegeomaptype_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEGEOMAPTYPE_H #define QDECLARATIVEGEOMAPTYPE_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include "qgeomaptype.h" #include <QObject> diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 19924429..2056cd87 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -152,7 +152,7 @@ qreal QDeclarativeGeoRoute::distance() const } /*! - \qmlproperty QDeclarativeListProperty<Coordinate> QtLocation5::Route::path + \qmlproperty QQmlListProperty<Coordinate> QtLocation5::Route::path Read-only property which holds the geographical coordinates of this route. Coordinates are listed in the order in which they would be traversed by someone @@ -165,32 +165,29 @@ qreal QDeclarativeGeoRoute::distance() const \sa Coordinate */ -QDeclarativeListProperty<QDeclarativeCoordinate> QDeclarativeGeoRoute::path() +QQmlListProperty<QDeclarativeCoordinate> QDeclarativeGeoRoute::path() { - return QDeclarativeListProperty<QDeclarativeCoordinate>(this, - 0, - path_append, - path_count, - path_at, - path_clear); + return QQmlListProperty<QDeclarativeCoordinate>(this, 0, path_append, path_count, + path_at, path_clear); } -void QDeclarativeGeoRoute::path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate) +void QDeclarativeGeoRoute::path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, + QDeclarativeCoordinate *coordinate) { static_cast<QDeclarativeGeoRoute*>(prop->object)->appendPath(coordinate); } -int QDeclarativeGeoRoute::path_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop) +int QDeclarativeGeoRoute::path_count(QQmlListProperty<QDeclarativeCoordinate> *prop) { return static_cast<QDeclarativeGeoRoute*>(prop->object)->path_.count(); } -QDeclarativeCoordinate* QDeclarativeGeoRoute::path_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index) +QDeclarativeCoordinate* QDeclarativeGeoRoute::path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) { return static_cast<QDeclarativeGeoRoute*>(prop->object)->path_.at(index); } -void QDeclarativeGeoRoute::path_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop) +void QDeclarativeGeoRoute::path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop) { static_cast<QDeclarativeGeoRoute*>(prop->object)->clearPath(); } @@ -206,7 +203,7 @@ void QDeclarativeGeoRoute::clearPath() } /*! - \qmlproperty QDeclarativeListProperty<RouteSegment> QtLocation5::Route::segments + \qmlproperty QQmlListProperty<RouteSegment> QtLocation5::Route::segments Read-only property which holds the list of \l RouteSegment elements of this route. @@ -217,32 +214,29 @@ void QDeclarativeGeoRoute::clearPath() \sa RouteSegment */ -QDeclarativeListProperty<QDeclarativeGeoRouteSegment> QDeclarativeGeoRoute::segments() +QQmlListProperty<QDeclarativeGeoRouteSegment> QDeclarativeGeoRoute::segments() { - return QDeclarativeListProperty<QDeclarativeGeoRouteSegment>(this, - 0, - segments_append, - segments_count, - segments_at, - segments_clear); + return QQmlListProperty<QDeclarativeGeoRouteSegment>(this, 0, segments_append, segments_count, + segments_at, segments_clear); } -void QDeclarativeGeoRoute::segments_append(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop, QDeclarativeGeoRouteSegment *segment) +void QDeclarativeGeoRoute::segments_append(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, + QDeclarativeGeoRouteSegment *segment) { static_cast<QDeclarativeGeoRoute*>(prop->object)->appendSegment(segment); } -int QDeclarativeGeoRoute::segments_count(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop) +int QDeclarativeGeoRoute::segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop) { return static_cast<QDeclarativeGeoRoute*>(prop->object)->segments_.count(); } -QDeclarativeGeoRouteSegment* QDeclarativeGeoRoute::segments_at(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop, int index) +QDeclarativeGeoRouteSegment* QDeclarativeGeoRoute::segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index) { return static_cast<QDeclarativeGeoRoute*>(prop->object)->segments_.at(index); } -void QDeclarativeGeoRoute::segments_clear(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop) +void QDeclarativeGeoRoute::segments_clear(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop) { static_cast<QDeclarativeGeoRoute*>(prop->object)->clearSegments(); } diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h index 77caa046..64ef1945 100644 --- a/src/imports/location/qdeclarativegeoroute_p.h +++ b/src/imports/location/qdeclarativegeoroute_p.h @@ -59,8 +59,8 @@ class QDeclarativeGeoRoute : public QObject Q_PROPERTY(QDeclarativeGeoBoundingBox *bounds READ bounds CONSTANT) Q_PROPERTY(int travelTime READ travelTime CONSTANT) Q_PROPERTY(qreal distance READ distance CONSTANT) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> path READ path CONSTANT) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> segments READ segments CONSTANT) + Q_PROPERTY(QQmlListProperty<QDeclarativeCoordinate> path READ path CONSTANT) + Q_PROPERTY(QQmlListProperty<QDeclarativeGeoRouteSegment> segments READ segments CONSTANT) public: QDeclarativeGeoRoute(QObject *parent = 0); @@ -70,8 +70,8 @@ public: QDeclarativeGeoBoundingBox* bounds() const; int travelTime() const; qreal distance() const; - QDeclarativeListProperty<QDeclarativeCoordinate> path(); - QDeclarativeListProperty<QDeclarativeGeoRouteSegment> segments(); + QQmlListProperty<QDeclarativeCoordinate> path(); + QQmlListProperty<QDeclarativeGeoRouteSegment> segments(); void appendPath(QDeclarativeCoordinate* coordinate); void clearPath(); @@ -80,15 +80,15 @@ public: void clearSegments(); private: - static void path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); - static int path_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); - static QDeclarativeCoordinate* path_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index); - static void path_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); - - static void segments_append(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop, QDeclarativeGeoRouteSegment *segment); - static int segments_count(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop); - static QDeclarativeGeoRouteSegment* segments_at(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop, int index); - static void segments_clear(QDeclarativeListProperty<QDeclarativeGeoRouteSegment> *prop); + static void path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); + static int path_count(QQmlListProperty<QDeclarativeCoordinate> *prop); + static QDeclarativeCoordinate* path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); + static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); + + static void segments_append(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, QDeclarativeGeoRouteSegment *segment); + static int segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop); + static QDeclarativeGeoRouteSegment* segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index); + static void segments_clear(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop); void init(); QList<QGeoCoordinate> routePath(); diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 5b8c6935..707fa7fd 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -44,7 +44,7 @@ #include <qgeoserviceprovider.h> #include <qgeoroutingmanager.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqmlinfo.h> QT_BEGIN_NAMESPACE @@ -662,7 +662,7 @@ int QDeclarativeGeoRouteQuery::numberAlternativeRoutes() const } /*! - \qmlproperty QDeclarativeListProperty<Coordinate> RouteQuery::waypoints + \qmlproperty QQmlListProperty<Coordinate> RouteQuery::waypoints The waypoint coordinates of the desired route. @@ -675,43 +675,40 @@ int QDeclarativeGeoRouteQuery::numberAlternativeRoutes() const \sa addWaypoint removeWaypoint clearWaypoints */ -QDeclarativeListProperty<QDeclarativeCoordinate> QDeclarativeGeoRouteQuery::waypoints() +QQmlListProperty<QDeclarativeCoordinate> QDeclarativeGeoRouteQuery::waypoints() { - return QDeclarativeListProperty<QDeclarativeCoordinate>(this, - 0, - waypoints_append, - waypoints_count, - waypoints_at, - waypoints_clear); + return QQmlListProperty<QDeclarativeCoordinate>(this, 0, waypoints_append, waypoints_count, + waypoints_at, waypoints_clear); } -void QDeclarativeGeoRouteQuery::waypoints_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *waypoint) +void QDeclarativeGeoRouteQuery::waypoints_append(QQmlListProperty<QDeclarativeCoordinate> *prop, + QDeclarativeCoordinate *waypoint) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); model->addWaypoint(waypoint); } -int QDeclarativeGeoRouteQuery::waypoints_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop) +int QDeclarativeGeoRouteQuery::waypoints_count(QQmlListProperty<QDeclarativeCoordinate> *prop) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); return model->waypoints_.count(); } -QDeclarativeCoordinate* QDeclarativeGeoRouteQuery::waypoints_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index) +QDeclarativeCoordinate* QDeclarativeGeoRouteQuery::waypoints_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); Q_ASSERT(index < model->waypoints_.count()); return model->waypoints_.at(index); } -void QDeclarativeGeoRouteQuery::waypoints_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop) +void QDeclarativeGeoRouteQuery::waypoints_clear(QQmlListProperty<QDeclarativeCoordinate> *prop) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); model->clearWaypoints(); } /*! - \qmlproperty QDeclarativeListProperty<BoundingBox> RouteQuery::excludedAreas + \qmlproperty QQmlListProperty<BoundingBox> RouteQuery::excludedAreas Areas that the route must not cross. @@ -721,36 +718,33 @@ void QDeclarativeGeoRouteQuery::waypoints_clear(QDeclarativeListProperty<QDeclar \sa addExcludedArea removeExcludedArea clearExcludedAreas */ -QDeclarativeListProperty<QDeclarativeGeoBoundingBox> QDeclarativeGeoRouteQuery::excludedAreas() +QQmlListProperty<QDeclarativeGeoBoundingBox> QDeclarativeGeoRouteQuery::excludedAreas() { - return QDeclarativeListProperty<QDeclarativeGeoBoundingBox>(this, - 0, - exclusions_append, - exclusions_count, - exclusions_at, - exclusions_clear); + return QQmlListProperty<QDeclarativeGeoBoundingBox>(this, 0, exclusions_append, + exclusions_count, exclusions_at, + exclusions_clear); } -void QDeclarativeGeoRouteQuery::exclusions_append(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop, QDeclarativeGeoBoundingBox *area) +void QDeclarativeGeoRouteQuery::exclusions_append(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, QDeclarativeGeoBoundingBox *area) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); model->addExcludedArea(area); } -int QDeclarativeGeoRouteQuery::exclusions_count(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop) +int QDeclarativeGeoRouteQuery::exclusions_count(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); return model->exclusions_.count(); } -QDeclarativeGeoBoundingBox* QDeclarativeGeoRouteQuery::exclusions_at(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop, int index) +QDeclarativeGeoBoundingBox* QDeclarativeGeoRouteQuery::exclusions_at(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, int index) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); Q_ASSERT(index < model->exclusions_.count()); return model->exclusions_.at(index); } -void QDeclarativeGeoRouteQuery::exclusions_clear(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop) +void QDeclarativeGeoRouteQuery::exclusions_clear(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop) { QDeclarativeGeoRouteQuery* model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); model->clearExcludedAreas(); diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h index 1e2b97fc..3b668bc3 100644 --- a/src/imports/location/qdeclarativegeoroutemodel_p.h +++ b/src/imports/location/qdeclarativegeoroutemodel_p.h @@ -50,8 +50,8 @@ #include <qgeorouterequest.h> #include <qgeoroutereply.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDeclarativeParserStatus> +#include <QtQml/qqml.h> +#include <QtQml/QQmlParserStatus> #include <QAbstractListModel> #include <QObject> @@ -63,7 +63,7 @@ class QGeoRoutingManager; class QDeclarativeGeoRoute; class QDeclarativeGeoRouteQuery; -class QDeclarativeGeoRouteModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeGeoRouteModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_ENUMS(Status) @@ -76,7 +76,7 @@ class QDeclarativeGeoRouteModel : public QAbstractListModel, public QDeclarative Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged) Q_PROPERTY(RouteError error READ error NOTIFY errorChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: enum Roles { @@ -102,7 +102,7 @@ public: QDeclarativeGeoRouteModel(QObject *parent = 0); ~QDeclarativeGeoRouteModel(); - // From QDeclarativeParserStatus + // From QQmlParserStatus void classBegin() {} void componentComplete(); @@ -168,7 +168,7 @@ private: RouteError error_; }; -class QDeclarativeGeoRouteQuery : public QObject, public QDeclarativeParserStatus +class QDeclarativeGeoRouteQuery : public QObject, public QQmlParserStatus { Q_OBJECT Q_ENUMS(TravelMode) @@ -187,17 +187,17 @@ class QDeclarativeGeoRouteQuery : public QObject, public QDeclarativeParserStatu Q_PROPERTY(RouteOptimizations routeOptimizations READ routeOptimizations WRITE setRouteOptimizations NOTIFY routeOptimizationsChanged) Q_PROPERTY(SegmentDetail segmentDetail READ segmentDetail WRITE setSegmentDetail NOTIFY segmentDetailChanged) Q_PROPERTY(ManeuverDetail maneuverDetail READ maneuverDetail WRITE setManeuverDetail NOTIFY maneuverDetailChanged) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> waypoints READ waypoints NOTIFY waypointsChanged) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> excludedAreas READ excludedAreas NOTIFY excludedAreasChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeCoordinate> waypoints READ waypoints NOTIFY waypointsChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeGeoBoundingBox> excludedAreas READ excludedAreas NOTIFY excludedAreasChanged) Q_PROPERTY(QList<int> featureTypes READ featureTypes NOTIFY featureTypesChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativeGeoRouteQuery(QObject *parent = 0); ~QDeclarativeGeoRouteQuery(); - // From QDeclarativeParserStatus + // From QQmlParserStatus void classBegin() {} void componentComplete(); @@ -261,8 +261,8 @@ public: QList<int> featureTypes(); // READ functions for list properties - QDeclarativeListProperty<QDeclarativeCoordinate> waypoints(); - QDeclarativeListProperty<QDeclarativeGeoBoundingBox> excludedAreas(); + QQmlListProperty<QDeclarativeCoordinate> waypoints(); + QQmlListProperty<QDeclarativeGeoBoundingBox> excludedAreas(); Q_INVOKABLE void addWaypoint(QDeclarativeCoordinate* waypoint); Q_INVOKABLE void removeWaypoint(QDeclarativeCoordinate* waypoint); @@ -308,15 +308,15 @@ Q_SIGNALS: private: - static void waypoints_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *waypoint); - static int waypoints_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); - static QDeclarativeCoordinate* waypoints_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index); - static void waypoints_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); + static void waypoints_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *waypoint); + static int waypoints_count(QQmlListProperty<QDeclarativeCoordinate> *prop); + static QDeclarativeCoordinate* waypoints_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); + static void waypoints_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); - static void exclusions_append(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop, QDeclarativeGeoBoundingBox *area); - static int exclusions_count(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop); - static QDeclarativeGeoBoundingBox* exclusions_at(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop, int index); - static void exclusions_clear(QDeclarativeListProperty<QDeclarativeGeoBoundingBox> *prop); + static void exclusions_append(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, QDeclarativeGeoBoundingBox *area); + static int exclusions_count(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop); + static QDeclarativeGeoBoundingBox* exclusions_at(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, int index); + static void exclusions_clear(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop); QList<QDeclarativeCoordinate*> waypoints_; QList<QDeclarativeGeoBoundingBox*> exclusions_; diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index 72df6c5d..067e0ddc 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -132,7 +132,7 @@ QDeclarativeGeoManeuver* QDeclarativeGeoRouteSegment::maneuver() const } /*! - \qmlproperty QDeclarativeListProperty<Coordinate> QtLocation5::RouteSegment::path + \qmlproperty QQmlListProperty<Coordinate> QtLocation5::RouteSegment::path Read-only property which holds the geographical coordinates of this segment. Coordinates are listed in the order in which they would be traversed by someone @@ -145,32 +145,29 @@ QDeclarativeGeoManeuver* QDeclarativeGeoRouteSegment::maneuver() const \sa Coordinate */ -QDeclarativeListProperty<QDeclarativeCoordinate> QDeclarativeGeoRouteSegment::path() +QQmlListProperty<QDeclarativeCoordinate> QDeclarativeGeoRouteSegment::path() { - return QDeclarativeListProperty<QDeclarativeCoordinate>(this, - 0, - path_append, - path_count, - path_at, - path_clear); + return QQmlListProperty<QDeclarativeCoordinate>(this, 0, path_append, path_count, + path_at, path_clear); } -void QDeclarativeGeoRouteSegment::path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate) +void QDeclarativeGeoRouteSegment::path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, + QDeclarativeCoordinate *coordinate) { static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.append(coordinate); } -int QDeclarativeGeoRouteSegment::path_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop) +int QDeclarativeGeoRouteSegment::path_count(QQmlListProperty<QDeclarativeCoordinate> *prop) { return static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.count(); } -QDeclarativeCoordinate* QDeclarativeGeoRouteSegment::path_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index) +QDeclarativeCoordinate* QDeclarativeGeoRouteSegment::path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) { return static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.at(index); } -void QDeclarativeGeoRouteSegment::path_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop) +void QDeclarativeGeoRouteSegment::path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop) { static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.clear(); } diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h index ff501379..5fb346b5 100644 --- a/src/imports/location/qdeclarativegeoroutesegment_p.h +++ b/src/imports/location/qdeclarativegeoroutesegment_p.h @@ -55,7 +55,7 @@ class QDeclarativeGeoRouteSegment : public QObject Q_OBJECT Q_PROPERTY(int travelTime READ travelTime CONSTANT) Q_PROPERTY(qreal distance READ distance CONSTANT) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> path READ path) + Q_PROPERTY(QQmlListProperty<QDeclarativeCoordinate> path READ path) Q_PROPERTY(QDeclarativeGeoManeuver* maneuver READ maneuver CONSTANT) public: @@ -65,14 +65,14 @@ public: int travelTime() const; qreal distance() const; - QDeclarativeListProperty<QDeclarativeCoordinate> path(); + QQmlListProperty<QDeclarativeCoordinate> path(); QDeclarativeGeoManeuver* maneuver() const; private: - static void path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); - static int path_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); - static QDeclarativeCoordinate* path_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index); - static void path_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); + static void path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); + static int path_count(QQmlListProperty<QDeclarativeCoordinate> *prop); + static QDeclarativeCoordinate* path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); + static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); QGeoRouteSegment segment_; QDeclarativeGeoManeuver* maneuver_; diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index ef2213dc..63c394db 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -44,8 +44,9 @@ #include "qgeocodingmanager.h" #include "qgeomappingmanager.h" #include "qgeoroutingmanager.h" + #include <QtCore/QStringList> -#include <QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QDebug> @@ -354,9 +355,9 @@ void QDeclarativeGeoServiceProvider::setLocales(const QStringList &locales) This property holds the list of plugin parameters. */ -QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> QDeclarativeGeoServiceProvider::parameters() +QQmlListProperty<QDeclarativeGeoServiceProviderParameter> QDeclarativeGeoServiceProvider::parameters() { - return QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter>(this, + return QQmlListProperty<QDeclarativeGeoServiceProviderParameter>(this, 0, parameter_append, parameter_count, @@ -364,7 +365,7 @@ QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> QDeclarativeGe parameter_clear); } -void QDeclarativeGeoServiceProvider::parameter_append(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop, QDeclarativeGeoServiceProviderParameter *parameter) +void QDeclarativeGeoServiceProvider::parameter_append(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, QDeclarativeGeoServiceProviderParameter *parameter) { QDeclarativeGeoServiceProvider *p = static_cast<QDeclarativeGeoServiceProvider*>(prop->object); p->parameters_.append(parameter); @@ -372,17 +373,17 @@ void QDeclarativeGeoServiceProvider::parameter_append(QDeclarativeListProperty<Q p->sharedProvider_->setParameters(p->parameterMap()); } -int QDeclarativeGeoServiceProvider::parameter_count(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop) +int QDeclarativeGeoServiceProvider::parameter_count(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop) { return static_cast<QDeclarativeGeoServiceProvider*>(prop->object)->parameters_.count(); } -QDeclarativeGeoServiceProviderParameter* QDeclarativeGeoServiceProvider::parameter_at(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index) +QDeclarativeGeoServiceProviderParameter* QDeclarativeGeoServiceProvider::parameter_at(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index) { return static_cast<QDeclarativeGeoServiceProvider*>(prop->object)->parameters_[index]; } -void QDeclarativeGeoServiceProvider::parameter_clear(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop) +void QDeclarativeGeoServiceProvider::parameter_clear(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop) { QDeclarativeGeoServiceProvider *p = static_cast<QDeclarativeGeoServiceProvider*>(prop->object); p->parameters_.clear(); diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h index dbf39626..0f2cf478 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider_p.h +++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h @@ -44,7 +44,7 @@ #include <qgeocoordinate.h> #include <QtQuick/QQuickItem> -#include <QtDeclarative/QDeclarativeParserStatus> +#include <QtQml/QQmlParserStatus> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceManager> @@ -82,7 +82,7 @@ private: class QDeclarativeGeoServiceProviderRequirements; -class QDeclarativeGeoServiceProvider : public QObject, public QDeclarativeParserStatus +class QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus { Q_OBJECT Q_ENUMS(RoutingFeature) @@ -92,7 +92,7 @@ class QDeclarativeGeoServiceProvider : public QObject, public QDeclarativeParser Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QStringList availableServiceProviders READ availableServiceProviders CONSTANT) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> parameters READ parameters) + Q_PROPERTY(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> parameters READ parameters) Q_PROPERTY(QDeclarativeGeoServiceProviderRequirements *required READ requirements) Q_PROPERTY(QStringList locales READ locales WRITE setLocales NOTIFY localesChanged) Q_PROPERTY(QStringList preferred READ preferred WRITE setPreferred NOTIFY preferredChanged) @@ -100,7 +100,7 @@ class QDeclarativeGeoServiceProvider : public QObject, public QDeclarativeParser Q_PROPERTY(bool isAttached READ isAttached NOTIFY attached) Q_CLASSINFO("DefaultProperty", "parameters") - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativeGeoServiceProvider(QObject *parent = 0); @@ -163,14 +163,14 @@ public: Q_DECLARE_FLAGS(PlacesFeatures, PlacesFeature) Q_FLAGS(PlacesFeatures) - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void classBegin() {} virtual void componentComplete(); void setName(const QString &name); QString name() const; - QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> parameters(); + QQmlListProperty<QDeclarativeGeoServiceProviderParameter> parameters(); QMap<QString, QVariant> parameterMap() const; QStringList availableServiceProviders(); @@ -203,10 +203,10 @@ Q_SIGNALS: void allowExperimentalChanged(bool allow); private: - static void parameter_append(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop, QDeclarativeGeoServiceProviderParameter *mapObject); - static int parameter_count(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop); - static QDeclarativeGeoServiceProviderParameter* parameter_at(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index); - static void parameter_clear(QDeclarativeListProperty<QDeclarativeGeoServiceProviderParameter> *prop); + static void parameter_append(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, QDeclarativeGeoServiceProviderParameter *mapObject); + static int parameter_count(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop); + static QDeclarativeGeoServiceProviderParameter* parameter_at(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index); + static void parameter_clear(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop); QGeoServiceProvider *sharedProvider_; QString name_; diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 5404c407..cd17be65 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -42,7 +42,7 @@ #include "qdeclarativepolygonmapitem_p.h" #include "qgeocameracapabilities_p.h" #include <QtGui/private/qtriangulator_p.h> -#include <QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QPainter> #include <QPainterPath> #include <qnumeric.h> @@ -266,10 +266,10 @@ void QDeclarativePolygonMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *m } } -QDeclarativeListProperty<QDeclarativeCoordinate> QDeclarativePolygonMapItem::declarativePath() +QQmlListProperty<QDeclarativeCoordinate> QDeclarativePolygonMapItem::declarativePath() { - return QDeclarativeListProperty<QDeclarativeCoordinate>(this, 0, path_append, path_count, - path_at, path_clear); + return QQmlListProperty<QDeclarativeCoordinate>(this, 0, path_append, path_count, + path_at, path_clear); } /*! @@ -282,7 +282,7 @@ QDeclarativeListProperty<QDeclarativeCoordinate> QDeclarativePolygonMapItem::dec */ void QDeclarativePolygonMapItem::path_append( - QDeclarativeListProperty<QDeclarativeCoordinate> *property, QDeclarativeCoordinate *coordinate) + QQmlListProperty<QDeclarativeCoordinate> *property, QDeclarativeCoordinate *coordinate) { QDeclarativePolygonMapItem* item = qobject_cast<QDeclarativePolygonMapItem*>(property->object); item->coordPath_.append(coordinate); @@ -298,19 +298,19 @@ void QDeclarativePolygonMapItem::path_append( } int QDeclarativePolygonMapItem::path_count( - QDeclarativeListProperty<QDeclarativeCoordinate> *property) + QQmlListProperty<QDeclarativeCoordinate> *property) { return qobject_cast<QDeclarativePolygonMapItem*>(property->object)->coordPath_.count(); } QDeclarativeCoordinate* QDeclarativePolygonMapItem::path_at( - QDeclarativeListProperty<QDeclarativeCoordinate> *property, int index) + QQmlListProperty<QDeclarativeCoordinate> *property, int index) { return qobject_cast<QDeclarativePolygonMapItem*>(property->object)->coordPath_.at(index); } void QDeclarativePolygonMapItem::path_clear( - QDeclarativeListProperty<QDeclarativeCoordinate> *property) + QQmlListProperty<QDeclarativeCoordinate> *property) { QDeclarativePolygonMapItem* item = qobject_cast<QDeclarativePolygonMapItem*>( property->object); diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h index 85ce333b..5cd16363 100644 --- a/src/imports/location/qdeclarativepolygonmapitem_p.h +++ b/src/imports/location/qdeclarativepolygonmapitem_p.h @@ -72,7 +72,7 @@ class QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> path READ declarativePath NOTIFY pathChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeCoordinate> path READ declarativePath NOTIFY pathChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QDeclarativeMapLineProperties *border READ border CONSTANT) @@ -87,7 +87,7 @@ public: Q_INVOKABLE void addCoordinate(QDeclarativeCoordinate* coordinate); Q_INVOKABLE void removeCoordinate(QDeclarativeCoordinate* coordinate); - QDeclarativeListProperty<QDeclarativeCoordinate> declarativePath(); + QQmlListProperty<QDeclarativeCoordinate> declarativePath(); QColor color() const; void setColor(const QColor &color); @@ -110,10 +110,10 @@ private Q_SLOTS: void updateAfterCoordinateChanged(); private: - static void path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); - static int path_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); - static QDeclarativeCoordinate* path_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index); - static void path_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); + static void path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); + static int path_count(QQmlListProperty<QDeclarativeCoordinate> *prop); + static QDeclarativeCoordinate* path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); + static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); void pathPropertyChanged(); private: diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 304c3848..298b11f9 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -41,7 +41,7 @@ #include "qdeclarativepolylinemapitem_p.h" #include "qgeocameracapabilities_p.h" -#include <QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QPainter> #include <QPainterPath> #include <QPainterPathStroker> @@ -439,13 +439,14 @@ void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap * define the polyline. */ -QDeclarativeListProperty<QDeclarativeCoordinate> QDeclarativePolylineMapItem::declarativePath() +QQmlListProperty<QDeclarativeCoordinate> QDeclarativePolylineMapItem::declarativePath() { - return QDeclarativeListProperty<QDeclarativeCoordinate>(this, 0, path_append, path_count, - path_at, path_clear); + return QQmlListProperty<QDeclarativeCoordinate>(this, 0, path_append, path_count, + path_at, path_clear); } -void QDeclarativePolylineMapItem::path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *property, QDeclarativeCoordinate *coordinate) +void QDeclarativePolylineMapItem::path_append(QQmlListProperty<QDeclarativeCoordinate> *property, + QDeclarativeCoordinate *coordinate) { QDeclarativePolylineMapItem* item = qobject_cast<QDeclarativePolylineMapItem*>( property->object); @@ -461,19 +462,19 @@ void QDeclarativePolylineMapItem::path_append(QDeclarativeListProperty<QDeclarat } int QDeclarativePolylineMapItem::path_count( - QDeclarativeListProperty<QDeclarativeCoordinate> *property) + QQmlListProperty<QDeclarativeCoordinate> *property) { return qobject_cast<QDeclarativePolylineMapItem*>(property->object)->coordPath_.count(); } QDeclarativeCoordinate* QDeclarativePolylineMapItem::path_at( - QDeclarativeListProperty<QDeclarativeCoordinate> *property, int index) + QQmlListProperty<QDeclarativeCoordinate> *property, int index) { return qobject_cast<QDeclarativePolylineMapItem*>(property->object)->coordPath_.at(index); } void QDeclarativePolylineMapItem::path_clear( - QDeclarativeListProperty<QDeclarativeCoordinate> *property) + QQmlListProperty<QDeclarativeCoordinate> *property) { QDeclarativePolylineMapItem* item = qobject_cast<QDeclarativePolylineMapItem*>( property->object); diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h index 7a80ee7b..eecb62d9 100644 --- a/src/imports/location/qdeclarativepolylinemapitem_p.h +++ b/src/imports/location/qdeclarativepolylinemapitem_p.h @@ -98,7 +98,7 @@ class QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> path READ declarativePath NOTIFY pathChanged) + Q_PROPERTY(QQmlListProperty<QDeclarativeCoordinate> path READ declarativePath NOTIFY pathChanged) Q_PROPERTY(QDeclarativeMapLineProperties *line READ line CONSTANT) public: @@ -112,7 +112,7 @@ public: Q_INVOKABLE void addCoordinate(QDeclarativeCoordinate* coordinate); Q_INVOKABLE void removeCoordinate(QDeclarativeCoordinate* coordinate); - QDeclarativeListProperty<QDeclarativeCoordinate> declarativePath(); + QQmlListProperty<QDeclarativeCoordinate> declarativePath(); bool contains(QPointF point); @@ -130,10 +130,10 @@ protected Q_SLOTS: void afterViewportChanged(const QGeoMapViewportChangeEvent &event); private: - static void path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); - static int path_count(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); - static QDeclarativeCoordinate* path_at(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, int index); - static void path_clear(QDeclarativeListProperty<QDeclarativeCoordinate> *prop); + static void path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); + static int path_count(QQmlListProperty<QDeclarativeCoordinate> *prop); + static QDeclarativeCoordinate* path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); + static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); void pathPropertyChanged(); private: diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index 20578716..eccb3bd4 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qdeclarativeposition_p.h" -#include "qdeclarative.h" +#include <QtQml/qqml.h> #include <qnmeapositioninfosource.h> #include <QFile> diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h index ff1502c8..dc90f8fc 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/location/qdeclarativeposition_p.h @@ -47,7 +47,7 @@ #include <qgeopositioninfosource.h> #include <qgeopositioninfo.h> #include "qdeclarativecoordinate_p.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> // Define this to get qDebug messages // #define QDECLARATIVE_POSITION_DEBUG diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index 4f45a2c8..66e4392e 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -39,10 +39,11 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeinfo.h> #include "qdeclarativepositionsource_p.h" #include "qdeclarativeposition_p.h" -#include "qdeclarative.h" + +#include <QtQml/qqmlinfo.h> +#include <QtQml/qqml.h> #include <qnmeapositioninfosource.h> #include <QFile> #include <QTimer> diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/location/qdeclarativepositionsource_p.h index 02a8fdcd..58995f44 100644 --- a/src/imports/location/qdeclarativepositionsource_p.h +++ b/src/imports/location/qdeclarativepositionsource_p.h @@ -46,7 +46,7 @@ #include <QDateTime> #include <qgeopositioninfosource.h> #include <qgeopositioninfo.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include "qdeclarativeposition_p.h" class QFile; diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index c03a612d..4ded48ed 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -44,7 +44,7 @@ #include "qdeclarativepolylinemapitem_p.h" #include "qgeocameracapabilities_p.h" #include "qdeclarativegeoroute_p.h" -#include <QtDeclarative/QDeclarativeInfo> +#include <QtQml/QQmlInfo> #include <QtGui/QPainter> /*! diff --git a/src/plugins/geoservices/nokia/placesv1/placesv1.pri b/src/plugins/geoservices/nokia/placesv1/placesv1.pri index 8908456f..e36a04cb 100644 --- a/src/plugins/geoservices/nokia/placesv1/placesv1.pri +++ b/src/plugins/geoservices/nokia/placesv1/placesv1.pri @@ -1,4 +1,4 @@ -QT *= location network declarative +QT *= location network qml HEADERS += \ #data classes diff --git a/sync.profile b/sync.profile index 7d885aa1..7d02dd10 100644 --- a/sync.profile +++ b/sync.profile @@ -9,7 +9,7 @@ %mastercontent = ( "gui" => "#include <QtGui/QtGui>\n", "network" => "#include <QtNetwork/QtNetwork>\n", - "declarative" => "#include <QtDeclarative/qdeclarative.h>\n", + "declarative" => "#include <QtQml/qqml.h>\n", ); %modulepris = ( "QtLocation" => "$basedir/modules/qt_location.pri", diff --git a/tests/applications/declarative_map/qmlmap3d.cpp b/tests/applications/declarative_map/qmlmap3d.cpp index 8af49ec7..73a06bde 100644 --- a/tests/applications/declarative_map/qmlmap3d.cpp +++ b/tests/applications/declarative_map/qmlmap3d.cpp @@ -40,7 +40,7 @@ #include <QtGui/QGuiApplication> #include <QtCore/QStringList> -#include <QtDeclarative/QDeclarativeEngine> +#include <QtQml/QQmlEngine> #include <QNetworkProxy> #include <QtQuick/qquickview.h> diff --git a/tests/auto/declarative_core/tst_map_routing.qml b/tests/auto/declarative_core/tst_map_routing.qml index 73b05dac..f77fd2f4 100644 --- a/tests/auto/declarative_core/tst_map_routing.qml +++ b/tests/auto/declarative_core/tst_map_routing.qml @@ -164,7 +164,7 @@ Item { compare (emptyQuery.maneuverDetail, RouteQuery.BasicManeuvers) compare (emptyQuery.waypoints.length, 0, "Waypoints") compare (emptyQuery.excludedAreas.length, 0, "excluded areas") - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare (emptyQuery.featureTypes.length, 0, "Feature types") } @@ -351,7 +351,7 @@ Item { // Feature types and weights queryDetailsChangedSpy.clear() - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes.length, 0) compare(featureTypesSpy.count, 0) emptyQuery.setFeatureWeight(RouteQuery.TollFeature, RouteQuery.AvoidFeatureWeight); @@ -360,7 +360,7 @@ Item { emptyQuery.setFeatureWeight(RouteQuery.HighwayFeature, RouteQuery.PreferFeatureWeight); compare(featureTypesSpy.count, 2) compare(queryDetailsChangedSpy.count, 2) - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes.length, 2) //compare(emptyQuery.featureTypes[0], RouteQuery.TollFeature) //compare(emptyQuery.featureTypes[1], RouteQuery.HighwayFeature) @@ -371,16 +371,16 @@ Item { emptyQuery.setFeatureWeight(RouteQuery.TollFeature, RouteQuery.NeutralFeatureWeight); compare(featureTypesSpy.count, 3) compare(queryDetailsChangedSpy.count, 3) - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes.length, 1) compare(emptyQuery.featureWeight(RouteQuery.TollFeature), RouteQuery.NeutralFeatureWeight); compare(emptyQuery.featureWeight(RouteQuery.HighwayFeature), RouteQuery.PreferFeatureWeight); - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes[0], RouteQuery.HighwayFeature) //compare(emptyQuery.featureWeight(emptyQuery.featureTypes[0]), RouteQuery.PreferFeatureWeight) compare(featureTypesSpy.count, 3) compare(queryDetailsChangedSpy.count, 3) - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes.length, 1) // Put some feature weights and then reset them with NoFeature @@ -388,12 +388,12 @@ Item { emptyQuery.setFeatureWeight(RouteQuery.MotorPoolLaneFeature, RouteQuery.DisallowFeatureWeight); compare(featureTypesSpy.count, 5) compare(queryDetailsChangedSpy.count, 5) - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes.length, 3) emptyQuery.setFeatureWeight(RouteQuery.NoFeature, RouteQuery.NeutralFeatureWeight) compare(featureTypesSpy.count, 6) compare(queryDetailsChangedSpy.count, 6) - // Bug in QtDeclarative. Todo, enable when QList<int> support is done + // Bug in QtQml. Todo, enable when QList<int> support is done //compare(emptyQuery.featureTypes.length, 0) // Segment details diff --git a/tests/auto/qmlinterface/qmlinterface.pro b/tests/auto/qmlinterface/qmlinterface.pro index aca6b91f..93864587 100644 --- a/tests/auto/qmlinterface/qmlinterface.pro +++ b/tests/auto/qmlinterface/qmlinterface.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += location declarative testlib +QT += location qml testlib #QT -= gui diff --git a/tests/auto/qmlinterface/tst_qmlinterface.cpp b/tests/auto/qmlinterface/tst_qmlinterface.cpp index 5a9e1e74..ad9c957d 100644 --- a/tests/auto/qmlinterface/tst_qmlinterface.cpp +++ b/tests/auto/qmlinterface/tst_qmlinterface.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/QDeclarativeListReference> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlComponent> +#include <QtQml/QQmlListReference> #include <QtLocation/QGeoCoordinate> #include <QtLocation/QGeoAddress> #include <QtLocation/QGeoBoundingBox> @@ -166,8 +166,8 @@ tst_qmlinterface::tst_qmlinterface() void tst_qmlinterface::testCoordinate() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestCoordinate.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestCoordinate.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -186,8 +186,8 @@ void tst_qmlinterface::testCoordinate() void tst_qmlinterface::testAddress() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestAddress.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestAddress.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -209,8 +209,8 @@ void tst_qmlinterface::testAddress() void tst_qmlinterface::testBoundingBox() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestBoundingBox.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestBoundingBox.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -229,8 +229,8 @@ void tst_qmlinterface::testBoundingBox() void tst_qmlinterface::testBoundingCircle() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestBoundingCircle.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestBoundingCircle.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -248,8 +248,8 @@ void tst_qmlinterface::testBoundingCircle() void tst_qmlinterface::testLocation() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestLocation.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestLocation.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -268,8 +268,8 @@ void tst_qmlinterface::testLocation() void tst_qmlinterface::testCategory() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestCategory.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestCategory.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -287,8 +287,8 @@ void tst_qmlinterface::testCategory() void tst_qmlinterface::testIcon() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestIcon.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestIcon.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -305,8 +305,8 @@ void tst_qmlinterface::testIcon() void tst_qmlinterface::testRatings() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestRatings.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestRatings.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -325,8 +325,8 @@ void tst_qmlinterface::testRatings() void tst_qmlinterface::testSupplier() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestSupplier.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestSupplier.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -346,8 +346,8 @@ void tst_qmlinterface::testSupplier() void tst_qmlinterface::testUser() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestUser.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestUser.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -365,8 +365,8 @@ void tst_qmlinterface::testUser() void tst_qmlinterface::testPlaceAttribute() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestPlaceAttribute.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestPlaceAttribute.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -384,8 +384,8 @@ void tst_qmlinterface::testPlaceAttribute() void tst_qmlinterface::testContactDetail() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestContactDetail.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestContactDetail.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -403,8 +403,8 @@ void tst_qmlinterface::testContactDetail() void tst_qmlinterface::testPlace() { - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, SRCDIR "data/TestPlace.qml"); + QQmlEngine engine; + QQmlComponent component(&engine, SRCDIR "data/TestPlace.qml"); QVERIFY(component.isReady()); QObject *qmlObject = component.create(); @@ -417,7 +417,7 @@ void tst_qmlinterface::testPlace() QVERIFY(qmlObject->property("name").toString().isEmpty()); QVERIFY(qmlObject->property("placeId").toString().isEmpty()); QVERIFY(qmlObject->property("attribution").toString().isEmpty()); - QDeclarativeListReference categories(qmlObject, "categories", &engine); + QQmlListReference categories(qmlObject, "categories", &engine); QCOMPARE(categories.count(), 0); QCOMPARE(qmlObject->property("location").value<QGeoLocation>(), QGeoLocation()); QCOMPARE(qmlObject->property("ratings").value<QPlaceRatings>(), QPlaceRatings()); diff --git a/tests/plugins/declarativetestplugin/declarativetestplugin.pro b/tests/plugins/declarativetestplugin/declarativetestplugin.pro index 26e18426..40bedfb7 100644 --- a/tests/plugins/declarativetestplugin/declarativetestplugin.pro +++ b/tests/plugins/declarativetestplugin/declarativetestplugin.pro @@ -3,7 +3,7 @@ TARGETPATH = QtLocation/test include(../../../src/imports/location/qlocationimport.pri) -QT += declarative quick location widgets +QT += qml quick location widgets DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/tests/plugins/declarativetestplugin/locationtest.cpp b/tests/plugins/declarativetestplugin/locationtest.cpp index 55c02833..576650f6 100644 --- a/tests/plugins/declarativetestplugin/locationtest.cpp +++ b/tests/plugins/declarativetestplugin/locationtest.cpp @@ -39,15 +39,17 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> #include "qdeclarativepinchgenerator_p.h" #include "qdeclarativelocationtestmodel_p.h" -#include <QtDeclarative/qdeclarative.h> + +#include <QtQml/QQmlExtensionPlugin> +#include <QtQml/qqml.h> + #include <QDebug> QT_BEGIN_NAMESPACE -class QLocationDeclarativeTestModule: public QDeclarativeExtensionPlugin +class QLocationDeclarativeTestModule: public QQmlExtensionPlugin { Q_OBJECT diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h index 5f18ee61..4ad14348 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h @@ -62,7 +62,7 @@ public: QDeclarativeCoordinate* coordinate() const {return coordinate_;} }; -class QDeclarativeLocationTestModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeLocationTestModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(int datacount READ datacount WRITE setDatacount NOTIFY datacountChanged) @@ -70,7 +70,7 @@ class QDeclarativeLocationTestModel : public QAbstractListModel, public QDeclara Q_PROPERTY(bool crazyMode READ crazyMode WRITE setCrazyMode NOTIFY crazyModeChanged) Q_PROPERTY(int crazyLevel READ crazyLevel WRITE setCrazyLevel NOTIFY crazyLevelChanged) Q_PROPERTY(QString datatype READ datatype WRITE setDatatype NOTIFY datatypeChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativeLocationTestModel(QObject* parent = 0); @@ -80,7 +80,7 @@ public: TestDataRole = Qt::UserRole + 500 }; - // from QDeclarativeParserStatus + // from QQmlParserStatus virtual void componentComplete(); virtual void classBegin() {} diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h index 43f811b0..8fde7214 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h @@ -91,7 +91,7 @@ class QDeclarativePinchGenerator : public QQuickItem Q_PROPERTY(QQuickItem* target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QList<QObject*> swipe1 READ swipe1 NOTIFY swipesChanged) Q_PROPERTY(QList<QObject*> swipe2 READ swipe2 NOTIFY swipesChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativePinchGenerator(); @@ -138,7 +138,7 @@ public: Replaying = 3 }; - // from QDeclarativeParserStatus + // from QQmlParserStatus virtual void componentComplete(); // from QQuickItem void itemChange(ItemChange change, const ItemChangeData & data); |