diff options
Diffstat (limited to 'src/imports')
86 files changed, 453 insertions, 455 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp index d0200c6f..7130145c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp @@ -52,7 +52,7 @@ QT_USE_NAMESPACE \ingroup qml-places */ -QDeclarativeBusinessFeature::QDeclarativeBusinessFeature(QObject* parent) +QDeclarativeBusinessFeature::QDeclarativeBusinessFeature(QObject *parent) : QObject(parent) { } diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h index bee90a14..b6a37a4f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h @@ -58,8 +58,8 @@ class QDeclarativeBusinessFeature : public QObject Q_PROPERTY(QString value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QDeclarativeBusinessFeature(QObject* parent = 0); - explicit QDeclarativeBusinessFeature(const QPlaceBusinessFeature &value, QObject* parent = 0); + explicit QDeclarativeBusinessFeature(QObject *parent = 0); + explicit QDeclarativeBusinessFeature(const QPlaceBusinessFeature &value, QObject *parent = 0); ~QDeclarativeBusinessFeature(); QPlaceBusinessFeature businessFeature() const; diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index a969e622..696e803c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -79,7 +79,7 @@ QT_USE_NAMESPACE \sa CategoryModel */ -QDeclarativeCategory::QDeclarativeCategory(QObject* parent) +QDeclarativeCategory::QDeclarativeCategory(QObject *parent) : QObject(parent), m_icon(0), m_plugin(0), m_reply(0), m_complete(false), m_status(Ready) { } @@ -135,7 +135,7 @@ void QDeclarativeCategory::setPlugin(QDeclarativeGeoServiceProvider *plugin) } } -QDeclarativeGeoServiceProvider* QDeclarativeCategory::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativeCategory::plugin() const { return m_plugin; } diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h index 7c35fbca..a7dae7c6 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h @@ -68,14 +68,14 @@ class QDeclarativeCategory : public QObject, public QQmlParserStatus Q_PROPERTY(QString categoryId READ categoryId WRITE setCategoryId NOTIFY categoryIdChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged) - Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged) + Q_PROPERTY(QDeclarativePlaceIcon *icon READ icon WRITE setIcon NOTIFY iconChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_INTERFACES(QQmlParserStatus) public: - explicit QDeclarativeCategory(QObject* parent = 0); - QDeclarativeCategory(const QPlaceCategory &category, QDeclarativeGeoServiceProvider *plugin, QObject* parent = 0); + explicit QDeclarativeCategory(QObject *parent = 0); + QDeclarativeCategory(const QPlaceCategory &category, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0); ~QDeclarativeCategory(); enum Visibility { @@ -91,7 +91,7 @@ public: virtual void componentComplete(); void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; QPlaceCategory category(); void setCategory(const QPlaceCategory &category); diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h index d53aa33f..a6cdbd73 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h @@ -59,8 +59,8 @@ class QDeclarativePeriod : public QObject Q_PROPERTY(QTime endTime READ endTime WRITE setEndTime NOTIFY endTimeChanged) public: - explicit QDeclarativePeriod(QObject* parent = 0); - explicit QDeclarativePeriod(const QPlacePeriod &period, QObject* parent = 0); + explicit QDeclarativePeriod(QObject *parent = 0); + explicit QDeclarativePeriod(const QPlacePeriod &period, QObject *parent = 0); ~QDeclarativePeriod(); QPlacePeriod period() const; diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index 5a69c47f..8c000c0c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -182,7 +182,7 @@ QT_USE_NAMESPACE \sa PlaceSearchModel, PlaceRecommendationModel */ -QDeclarativePlace::QDeclarativePlace(QObject* parent) +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 QQmlPropertyMap(this)), @@ -253,7 +253,7 @@ void QDeclarativePlace::pluginReady() } } -QDeclarativeGeoServiceProvider* QDeclarativePlace::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativePlace::plugin() const { return m_plugin; } @@ -422,12 +422,12 @@ QPlace QDeclarativePlace::place() if (m_contactDetails->value(key).type() == QVariant::List) { QVariantList detailsVarList = m_contactDetails->value(key).toList(); foreach (const QVariant &detailVar, detailsVarList) { - QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(detailVar.value<QObject*>()); + QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(detailVar.value<QObject *>()); if (detail) cppDetails.append(detail->contactDetail()); } } else { - QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(m_contactDetails->value(key).value<QObject*>()); + QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(m_contactDetails->value(key).value<QObject *>()); if (detail) cppDetails.append(detail->contactDetail()); } @@ -716,7 +716,7 @@ void QDeclarativePlace::contactsModified(const QString &key, const QVariant &val // and override the write behaviour but this can only be done // when QTBUG-23183 is complete. if (value.userType() == QMetaType::QObjectStar) { - QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail*>(value.value<QObject *>()); + QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(value.value<QObject *>()); if (detail) { QVariantList varList; varList.append(value); @@ -918,7 +918,7 @@ QQmlListProperty<QDeclarativeCategory> QDeclarativePlace::categories() void QDeclarativePlace::category_append(QQmlListProperty<QDeclarativeCategory> *prop, QDeclarativeCategory *value) { - QDeclarativePlace *object = static_cast<QDeclarativePlace*>(prop->object); + QDeclarativePlace *object = static_cast<QDeclarativePlace *>(prop->object); if (object->m_categoriesToBeDeleted.contains(value)) object->m_categoriesToBeDeleted.removeAll(value); @@ -938,16 +938,16 @@ void QDeclarativePlace::category_append(QQmlListProperty<QDeclarativeCategory> * */ int QDeclarativePlace::category_count(QQmlListProperty<QDeclarativeCategory> *prop) { - return static_cast<QDeclarativePlace*>(prop->object)->m_categories.count(); + return static_cast<QDeclarativePlace *>(prop->object)->m_categories.count(); } /*! \internal */ -QDeclarativeCategory* QDeclarativePlace::category_at(QQmlListProperty<QDeclarativeCategory> *prop, +QDeclarativeCategory *QDeclarativePlace::category_at(QQmlListProperty<QDeclarativeCategory> *prop, int index) { - QDeclarativePlace *object = static_cast<QDeclarativePlace*>(prop->object); + QDeclarativePlace *object = static_cast<QDeclarativePlace *>(prop->object); QDeclarativeCategory *res = NULL; if (object->m_categories.count() > index && index > -1) { res = object->m_categories[index]; @@ -960,7 +960,7 @@ QDeclarativeCategory* QDeclarativePlace::category_at(QQmlListProperty<QDeclarati */ void QDeclarativePlace::category_clear(QQmlListProperty<QDeclarativeCategory> *prop) { - QDeclarativePlace *object = static_cast<QDeclarativePlace*>(prop->object); + QDeclarativePlace *object = static_cast<QDeclarativePlace *>(prop->object); if (object->m_categories.isEmpty()) return; @@ -1111,7 +1111,7 @@ void QDeclarativePlace::synchronizeContacts() foreach (const QString &contactType, m_contactDetails->keys()) { QList<QVariant> contacts = m_contactDetails->value(contactType).toList(); foreach (const QVariant &var, contacts) { - QObject *obj = var.value<QObject*>(); + QObject *obj = var.value<QObject *>(); if (obj->parent() == this) delete obj; } @@ -1219,12 +1219,12 @@ QString QDeclarativePlace::primaryValue(const QString &contactType) const if (m_contactDetails->value(contactType).userType() == QVariant::List) { QVariantList detailList = m_contactDetails->value(contactType).toList(); if (!detailList.isEmpty()) { - QDeclarativeContactDetail *primaryDetail = qobject_cast<QDeclarativeContactDetail*>(detailList.at(0).value<QObject *>()); + QDeclarativeContactDetail *primaryDetail = qobject_cast<QDeclarativeContactDetail *>(detailList.at(0).value<QObject *>()); if (primaryDetail) return primaryDetail->value(); } } else if (m_contactDetails->value(contactType).userType() == QMetaType::QObjectStar) { - QDeclarativeContactDetail *primaryDetail = qobject_cast<QDeclarativeContactDetail*>(m_contactDetails->value(contactType).value<QObject *>()); + QDeclarativeContactDetail *primaryDetail = qobject_cast<QDeclarativeContactDetail *>(m_contactDetails->value(contactType).value<QObject *>()); if (primaryDetail) return primaryDetail->value(); } diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h index 8715c36e..16fcc3a3 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h @@ -73,10 +73,10 @@ class QDeclarativePlace : public QObject, public QQmlParserStatus Q_PROPERTY(QPlace place READ place WRITE setPlace) Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged) 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(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) - Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged) + Q_PROPERTY(QDeclarativePlaceIcon *icon READ icon WRITE setIcon NOTIFY iconChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QString placeId READ placeId WRITE setPlaceId NOTIFY placeIdChanged) Q_PROPERTY(QString attribution READ attribution WRITE setAttribution NOTIFY attributionChanged) @@ -101,8 +101,8 @@ class QDeclarativePlace : public QObject, public QQmlParserStatus Q_INTERFACES(QQmlParserStatus) public: - explicit QDeclarativePlace(QObject* parent = 0); - QDeclarativePlace(const QPlace &src, QDeclarativeGeoServiceProvider *plugin, QObject* parent = 0); + explicit QDeclarativePlace(QObject *parent = 0); + QDeclarativePlace(const QPlace &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0); ~QDeclarativePlace(); enum Status {Ready, Saving, Fetching, Removing, Error}; @@ -118,7 +118,7 @@ public: virtual void componentComplete(); void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; QDeclarativeReviewModel *reviewModel(); QDeclarativePlaceImageModel *imageModel(); @@ -129,9 +129,9 @@ public: QQmlListProperty<QDeclarativeCategory> categories(); static void category_append(QQmlListProperty<QDeclarativeCategory> *prop, - QDeclarativeCategory* value); + QDeclarativeCategory *value); static int category_count(QQmlListProperty<QDeclarativeCategory> *prop); - static QDeclarativeCategory* category_at(QQmlListProperty<QDeclarativeCategory> *prop, int index); + static QDeclarativeCategory *category_at(QQmlListProperty<QDeclarativeCategory> *prop, int index); static void category_clear(QQmlListProperty<QDeclarativeCategory> *prop); QDeclarativeGeoLocation *location(); @@ -217,7 +217,7 @@ private: private: QPlaceManager *manager(); - QList<QDeclarativeCategory*> m_categories; + QList<QDeclarativeCategory *> m_categories; QDeclarativeGeoLocation *m_location; QDeclarativeRatings *m_ratings; QDeclarativeSupplier *m_supplier; diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h index aca92a04..33ea3330 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h @@ -59,7 +59,7 @@ class QDeclarativePlaceAttribute : public QObject Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) public: - explicit QDeclarativePlaceAttribute(QObject* parent = 0); + explicit QDeclarativePlaceAttribute(QObject *parent = 0); explicit QDeclarativePlaceAttribute(const QPlaceAttribute &src, QObject *parent = 0); ~QDeclarativePlaceAttribute(); diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp index fecacf45..4d530be9 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -173,7 +173,7 @@ QQmlPropertyMap *QDeclarativePlaceIcon::parameters() const The property holds the plugin that is responsible for managing this icon. */ -QDeclarativeGeoServiceProvider* QDeclarativePlaceIcon::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativePlaceIcon::plugin() const { return m_plugin; } diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h index 621aa12d..87c6dbca 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h @@ -63,8 +63,8 @@ class QDeclarativePlaceIcon : public QObject Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged) public: - explicit QDeclarativePlaceIcon(QObject* parent = 0); - QDeclarativePlaceIcon(const QPlaceIcon &src, QDeclarativeGeoServiceProvider *plugin, QObject* parent = 0); + explicit QDeclarativePlaceIcon(QObject *parent = 0); + QDeclarativePlaceIcon(const QPlaceIcon &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0); ~QDeclarativePlaceIcon(); QPlaceIcon icon() const; @@ -95,4 +95,3 @@ private: QT_END_NAMESPACE #endif - diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp index 9c0fbf5e..a18c47ad 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp @@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE This property holds the total number of image items for the place. */ -QDeclarativePlaceImageModel::QDeclarativePlaceImageModel(QObject* parent) +QDeclarativePlaceImageModel::QDeclarativePlaceImageModel(QObject *parent) : QDeclarativePlaceContentModel(QPlaceContent::ImageType, parent) { QHash<int, QByteArray> roles = roleNames(); diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h index dc908865..1e0db3b6 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h @@ -53,7 +53,7 @@ class QDeclarativePlaceImageModel : public QDeclarativePlaceContentModel Q_OBJECT public: - explicit QDeclarativePlaceImageModel(QObject* parent = 0); + explicit QDeclarativePlaceImageModel(QObject *parent = 0); ~QDeclarativePlaceImageModel(); QVariant data(const QModelIndex &index, int role) const; diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp index e268346a..0437d53c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp @@ -68,7 +68,7 @@ QT_USE_NAMESPACE \snippet snippets/declarative/places.qml EditorialModel */ -QDeclarativePlaceUser::QDeclarativePlaceUser(QObject* parent) +QDeclarativePlaceUser::QDeclarativePlaceUser(QObject *parent) : QObject(parent) {} QDeclarativePlaceUser::QDeclarativePlaceUser(const QPlaceUser &user, diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp b/src/imports/location/declarativeplaces/qdeclarativeratings.cpp index 9732e885..e8cb383b 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeratings.cpp @@ -62,7 +62,7 @@ QT_USE_NAMESPACE \snippet snippets/declarative/places.qml Ratings */ -QDeclarativeRatings::QDeclarativeRatings(QObject* parent) +QDeclarativeRatings::QDeclarativeRatings(QObject *parent) : QObject(parent) {} QDeclarativeRatings::QDeclarativeRatings(const QPlaceRatings &rating, diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h index 4a4fddf5..87683a78 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h @@ -59,8 +59,8 @@ class QDeclarativeRatings : public QObject Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged) public: - explicit QDeclarativeRatings(QObject* parent = 0); - explicit QDeclarativeRatings(const QPlaceRatings &src, QObject* parent = 0); + explicit QDeclarativeRatings(QObject *parent = 0); + explicit QDeclarativeRatings(const QPlaceRatings &src, QObject *parent = 0); ~QDeclarativeRatings(); QPlaceRatings ratings() const; diff --git a/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase.cpp b/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase.cpp index 31069289..d9524774 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase.cpp @@ -53,7 +53,7 @@ QDeclarativeResultModelBase::QDeclarativeResultModelBase(QObject *parent) /*! \internal */ -QDeclarativeGeoServiceProvider* QDeclarativeResultModelBase::favoritesPlugin() const +QDeclarativeGeoServiceProvider *QDeclarativeResultModelBase::favoritesPlugin() const { return m_favoritesPlugin; } diff --git a/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h b/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h index 992c3063..faf7225e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h @@ -59,7 +59,7 @@ public: explicit QDeclarativeResultModelBase(QObject *parent = 0); - QDeclarativeGeoServiceProvider* favoritesPlugin() const; + QDeclarativeGeoServiceProvider *favoritesPlugin() const; void setFavoritesPlugin(QDeclarativeGeoServiceProvider *plugin); QVariantMap favoritesMatchParameters() const; diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp index 12186377..10f668d5 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp @@ -138,7 +138,7 @@ QT_BEGIN_NAMESPACE This property holds the total number of reviews for the place. */ -QDeclarativeReviewModel::QDeclarativeReviewModel(QObject* parent) +QDeclarativeReviewModel::QDeclarativeReviewModel(QObject *parent) : QDeclarativePlaceContentModel(QPlaceContent::ReviewType, parent) { QHash<int, QByteArray> roles = roleNames(); diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h index 7d600cc2..455132bf 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h @@ -51,7 +51,7 @@ class QDeclarativeReviewModel : public QDeclarativePlaceContentModel Q_OBJECT public: - explicit QDeclarativeReviewModel(QObject* parent = 0); + explicit QDeclarativeReviewModel(QObject *parent = 0); ~QDeclarativeReviewModel(); QVariant data(const QModelIndex &index, int role) const; diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp index 74287e0d..23ae46d6 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp @@ -61,7 +61,7 @@ QDeclarativeSearchModelBase::~QDeclarativeSearchModelBase() /*! \internal */ -QDeclarativeGeoServiceProvider* QDeclarativeSearchModelBase::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativeSearchModelBase::plugin() const { return m_plugin; } diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h index 8ea83aa7..7b47ae90 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h @@ -83,7 +83,7 @@ public: explicit QDeclarativeSearchModelBase(QObject *parent = 0); ~QDeclarativeSearchModelBase(); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; void setPlugin(QDeclarativeGeoServiceProvider *plugin); QDeclarativeGeoBoundingArea *searchArea() const; diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index 6e38a7fc..44e20ff2 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -375,7 +375,7 @@ QQmlListProperty<QDeclarativeCategory> QDeclarativeSearchResultModel::categories void QDeclarativeSearchResultModel::categories_append(QQmlListProperty<QDeclarativeCategory> *list, QDeclarativeCategory *declCategory) { - QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); + QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel *>(list->object); if (searchModel && declCategory) { searchModel->m_categories.append(declCategory); QList<QPlaceCategory> categories = searchModel->m_request.categories(); @@ -387,17 +387,17 @@ void QDeclarativeSearchResultModel::categories_append(QQmlListProperty<QDeclarat int QDeclarativeSearchResultModel::categories_count(QQmlListProperty<QDeclarativeCategory> *list) { - QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); + QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel *>(list->object); if (searchModel) return searchModel->m_categories.count(); else return -1; } -QDeclarativeCategory* QDeclarativeSearchResultModel::category_at(QQmlListProperty<QDeclarativeCategory> *list, +QDeclarativeCategory *QDeclarativeSearchResultModel::category_at(QQmlListProperty<QDeclarativeCategory> *list, int index) { - QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); + QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel *>(list->object); if (searchModel && (searchModel->m_categories.count() > index) && (index > -1)) return searchModel->m_categories.at(index); else @@ -406,7 +406,7 @@ QDeclarativeCategory* QDeclarativeSearchResultModel::category_at(QQmlListPropert void QDeclarativeSearchResultModel::categories_clear(QQmlListProperty<QDeclarativeCategory> *list) { - QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel*>(list->object); + QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel *>(list->object); if (searchModel) { //note: we do not need to delete each of the elements in m_categories since the search model //should never be the parent of the categories anyway. diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h index 075d92a9..074c62b5 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h @@ -83,9 +83,9 @@ public: QQmlListProperty<QDeclarativeCategory> categories(); static void categories_append(QQmlListProperty<QDeclarativeCategory> *list, - QDeclarativeCategory* category); + QDeclarativeCategory *category); static int categories_count(QQmlListProperty<QDeclarativeCategory> *list); - static QDeclarativeCategory* category_at(QQmlListProperty<QDeclarativeCategory> *list, int index); + static QDeclarativeCategory *category_at(QQmlListProperty<QDeclarativeCategory> *list, int index); static void categories_clear(QQmlListProperty<QDeclarativeCategory> *list); QDeclarativeSearchResultModel::RelevanceHint relevanceHint() const; @@ -122,7 +122,7 @@ private: }; int getRow(const QString &placeId) const; - QList<QDeclarativeCategory*> m_categories; + QList<QDeclarativeCategory *> m_categories; QtLocation::VisibilityScope m_visibilityScope; }; diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp index 53927b90..2b7c2f64 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp @@ -288,7 +288,7 @@ void QDeclarativeSearchSuggestionModel::updateSearchRequest() /*! \internal */ -int QDeclarativeSearchSuggestionModel::rowCount(const QModelIndex& parent) const +int QDeclarativeSearchSuggestionModel::rowCount(const QModelIndex &parent) const { Q_UNUSED(parent) @@ -298,7 +298,7 @@ int QDeclarativeSearchSuggestionModel::rowCount(const QModelIndex& parent) const /*! \internal */ -QVariant QDeclarativeSearchSuggestionModel::data(const QModelIndex& index, int role) const +QVariant QDeclarativeSearchSuggestionModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) return QVariant(); diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp index f6415087..9de58ae8 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp @@ -73,7 +73,7 @@ QT_USE_NAMESPACE \snippet snippets/declarative/places.qml Supplier */ -QDeclarativeSupplier::QDeclarativeSupplier(QObject* parent) +QDeclarativeSupplier::QDeclarativeSupplier(QObject *parent) : QObject(parent), m_icon(0) { } diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h index 8012f116..8d19b54a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h @@ -60,13 +60,13 @@ class QDeclarativeSupplier : public QObject, public QQmlParserStatus Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QString supplierId READ supplierId WRITE setSupplierId NOTIFY supplierIdChanged) Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) - Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged) + Q_PROPERTY(QDeclarativePlaceIcon *icon READ icon WRITE setIcon NOTIFY iconChanged) Q_INTERFACES(QQmlParserStatus) public: - explicit QDeclarativeSupplier(QObject* parent = 0); - explicit QDeclarativeSupplier(const QPlaceSupplier &src, QDeclarativeGeoServiceProvider *plugin, QObject* parent = 0); + explicit QDeclarativeSupplier(QObject *parent = 0); + explicit QDeclarativeSupplier(const QPlaceSupplier &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0); ~QDeclarativeSupplier(); // From QQmlParserStatus diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index ba86f3e2..5f5e4427 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -159,7 +159,7 @@ void QDeclarativeSupportedCategoriesModel::componentComplete() /*! \internal */ -int QDeclarativeSupportedCategoriesModel::rowCount(const QModelIndex& parent) const +int QDeclarativeSupportedCategoriesModel::rowCount(const QModelIndex &parent) const { if (m_categoriesTree.keys().isEmpty()) return 0; @@ -224,7 +224,7 @@ QModelIndex QDeclarativeSupportedCategoriesModel::parent(const QModelIndex &chil */ QVariant QDeclarativeSupportedCategoriesModel::data(const QModelIndex &index, int role) const { - PlaceCategoryNode *node = static_cast<PlaceCategoryNode*>(index.internalPointer()); + PlaceCategoryNode *node = static_cast<PlaceCategoryNode *>(index.internalPointer()); if (!node) node = m_categoriesTree.value(QString()); else if (m_categoriesTree.keys(node).isEmpty()) @@ -285,7 +285,7 @@ void QDeclarativeSupportedCategoriesModel::setPlugin(QDeclarativeGeoServiceProvi /*! \internal */ -QDeclarativeGeoServiceProvider* QDeclarativeSupportedCategoriesModel::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativeSupportedCategoriesModel::plugin() const { return m_plugin; } diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h index a70748dd..6c72c3dc 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h @@ -105,7 +105,7 @@ public: enum Status {Ready, Updating, Error}; void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; void setHierarchical(bool hierarchical); bool hierarchical() const; diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 53fc3924..e9445ddd 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -99,7 +99,7 @@ class QLocationDeclarativeModule: public QQmlExtensionPlugin FILE "plugin.json") public: - virtual void registerTypes(const char* uri) + virtual void registerTypes(const char *uri) { if (QLatin1String(uri) == QLatin1String("QtMobility.location")) { qWarning("QtMobility.location is not supported. Use QtLocation instead."); diff --git a/src/imports/location/mapnode.cpp b/src/imports/location/mapnode.cpp index 4f957af4..5f439f4e 100644 --- a/src/imports/location/mapnode.cpp +++ b/src/imports/location/mapnode.cpp @@ -50,7 +50,7 @@ #define GL_MULTISAMPLE 0x809D #endif -MapNode::MapNode(QGeoMap* map): QSGGeometryNode(), +MapNode::MapNode(QGeoMap *map): QSGGeometryNode(), m_fbo(0), m_fboSurface(0), m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4), diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp index f50beab5..599734f3 100644 --- a/src/imports/location/qdeclarativecirclemapitem.cpp +++ b/src/imports/location/qdeclarativecirclemapitem.cpp @@ -128,7 +128,7 @@ inline static qreal qgeocoordinate_radToDeg(qreal rad) return rad * 180 / M_PI; } -static void calculatePeripheralPoints(QList<QGeoCoordinate>& path, const QGeoCoordinate& center, qreal distance, int steps) +static void calculatePeripheralPoints(QList<QGeoCoordinate> &path, const QGeoCoordinate ¢er, qreal distance, int steps) { // get angular distance in radians distance = distance / (qgeocoordinate_EARTH_MEAN_RADIUS * 1000); @@ -220,7 +220,7 @@ void QDeclarativeCircleMapItem::updateMapItemAssumeDirty() updateMapItem(); } -void QDeclarativeCircleMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) +void QDeclarativeCircleMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { @@ -256,7 +256,7 @@ void QDeclarativeCircleMapItem::setCenter(QDeclarativeCoordinate *center) emit centerChanged(center_); } -QDeclarativeCoordinate* QDeclarativeCircleMapItem::center() +QDeclarativeCoordinate *QDeclarativeCircleMapItem::center() { return center_; } @@ -319,11 +319,11 @@ qreal QDeclarativeCircleMapItem::radius() const /*! \internal */ -QSGNode* QDeclarativeCircleMapItem::updateMapItemPaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) +QSGNode *QDeclarativeCircleMapItem::updateMapItemPaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_UNUSED(data); - MapPolygonNode *node = static_cast<MapPolygonNode*>(oldNode); + MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode); if (!node) node = new MapPolygonNode(); @@ -361,7 +361,7 @@ void QDeclarativeCircleMapItem::updateMapItem() borderGeometry_.updateSourcePoints(*map(), closedPath); borderGeometry_.updateScreenPoints(*map(), border_.width()); - QList<QGeoMapItemGeometry*> geoms; + QList<QGeoMapItemGeometry *> geoms; geoms << &geometry_ << &borderGeometry_; QRectF combined = QGeoMapItemGeometry::translateToCommonOrigin(geoms); diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h index 07bd2ad8..c0f12361 100644 --- a/src/imports/location/qdeclarativecirclemapitem_p.h +++ b/src/imports/location/qdeclarativecirclemapitem_p.h @@ -55,7 +55,7 @@ class QDeclarativeGeoMapQuickItem; class QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase { Q_OBJECT - Q_PROPERTY(QDeclarativeCoordinate* center READ center WRITE setCenter NOTIFY centerChanged) + Q_PROPERTY(QDeclarativeCoordinate *center READ center WRITE setCenter NOTIFY centerChanged) Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QDeclarativeMapLineProperties *border READ border CONSTANT) @@ -64,11 +64,11 @@ public: explicit QDeclarativeCircleMapItem(QQuickItem *parent = 0); ~QDeclarativeCircleMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); - QDeclarativeCoordinate* center(); - void setCenter(QDeclarativeCoordinate* center); + QDeclarativeCoordinate *center(); + void setCenter(QDeclarativeCoordinate *center); qreal radius() const; void setRadius(qreal radius); diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/location/qdeclarativecoordinate.cpp index 5ab6f80f..2f854a5a 100644 --- a/src/imports/location/qdeclarativecoordinate.cpp +++ b/src/imports/location/qdeclarativecoordinate.cpp @@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE its coordinate property's values change. */ -QDeclarativeCoordinate::QDeclarativeCoordinate(QObject* parent) +QDeclarativeCoordinate::QDeclarativeCoordinate(QObject *parent) : QObject(parent) {} QDeclarativeCoordinate::QDeclarativeCoordinate(const QGeoCoordinate &coordinate, @@ -259,9 +259,9 @@ bool QDeclarativeCoordinate::isValid() const purpose of this calculation. */ -qreal QDeclarativeCoordinate::distanceTo(QObject* coordinate) +qreal QDeclarativeCoordinate::distanceTo(QObject *coordinate) { - QDeclarativeCoordinate *coord = static_cast<QDeclarativeCoordinate*>(coordinate); + QDeclarativeCoordinate *coord = static_cast<QDeclarativeCoordinate *>(coordinate); return m_coordinate.distanceTo(coord->coordinate()); } @@ -276,7 +276,7 @@ qreal QDeclarativeCoordinate::distanceTo(QObject* coordinate) */ qreal QDeclarativeCoordinate::azimuthTo(QObject *coordinate) { - QDeclarativeCoordinate *coord = static_cast<QDeclarativeCoordinate*>(coordinate); + QDeclarativeCoordinate *coord = static_cast<QDeclarativeCoordinate *>(coordinate); return m_coordinate.azimuthTo(coord->coordinate()); } diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/location/qdeclarativecoordinate_p.h index f7860d68..d18bd088 100644 --- a/src/imports/location/qdeclarativecoordinate_p.h +++ b/src/imports/location/qdeclarativecoordinate_p.h @@ -60,11 +60,11 @@ class QDeclarativeCoordinate : public QObject Q_PROPERTY(bool isValid READ isValid NOTIFY validityChanged) public: - explicit QDeclarativeCoordinate(QObject* parent = 0); - QDeclarativeCoordinate(const QGeoCoordinate &coordinate, QObject* parent = 0); + explicit QDeclarativeCoordinate(QObject *parent = 0); + QDeclarativeCoordinate(const QGeoCoordinate &coordinate, QObject *parent = 0); ~QDeclarativeCoordinate(); - Q_INVOKABLE qreal distanceTo(QObject* coordinate); + Q_INVOKABLE qreal distanceTo(QObject *coordinate); Q_INVOKABLE qreal azimuthTo(QObject *coordinate); Q_INVOKABLE QDeclarativeCoordinate *atDistanceAndAzimuth(qreal distance, qreal azimuth); diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp index 0949a630..d2c735f0 100644 --- a/src/imports/location/qdeclarativegeoaddress.cpp +++ b/src/imports/location/qdeclarativegeoaddress.cpp @@ -89,12 +89,12 @@ QT_BEGIN_NAMESPACE \sa {QGeoAddress} */ -QDeclarativeGeoAddress::QDeclarativeGeoAddress(QObject* parent) : +QDeclarativeGeoAddress::QDeclarativeGeoAddress(QObject *parent) : QObject(parent) { } -QDeclarativeGeoAddress::QDeclarativeGeoAddress(const QGeoAddress& address, QObject* parent) : +QDeclarativeGeoAddress::QDeclarativeGeoAddress(const QGeoAddress &address, QObject *parent) : QObject(parent), m_address(address) { } @@ -110,7 +110,7 @@ QGeoAddress QDeclarativeGeoAddress::address() const return m_address; } -void QDeclarativeGeoAddress::setAddress(const QGeoAddress& address) +void QDeclarativeGeoAddress::setAddress(const QGeoAddress &address) { // Elaborate but takes care of emiting needed signals setText(address.text()); @@ -172,7 +172,7 @@ QString QDeclarativeGeoAddress::country() const return m_address.country(); } -void QDeclarativeGeoAddress::setCountry(const QString& country) +void QDeclarativeGeoAddress::setCountry(const QString &country) { if (m_address.country() == country) return; @@ -194,7 +194,7 @@ QString QDeclarativeGeoAddress::countryCode() const return m_address.countryCode(); } -void QDeclarativeGeoAddress::setCountryCode(const QString& countryCode) +void QDeclarativeGeoAddress::setCountryCode(const QString &countryCode) { if (m_address.countryCode() == countryCode) return; @@ -216,7 +216,7 @@ QString QDeclarativeGeoAddress::state() const return m_address.state(); } -void QDeclarativeGeoAddress::setState(const QString& state) +void QDeclarativeGeoAddress::setState(const QString &state) { if (m_address.state() == state) return; @@ -238,7 +238,7 @@ QString QDeclarativeGeoAddress::county() const return m_address.county(); } -void QDeclarativeGeoAddress::setCounty(const QString& county) +void QDeclarativeGeoAddress::setCounty(const QString &county) { if (m_address.county() == county) return; @@ -260,7 +260,7 @@ QString QDeclarativeGeoAddress::city() const return m_address.city(); } -void QDeclarativeGeoAddress::setCity(const QString& city) +void QDeclarativeGeoAddress::setCity(const QString &city) { if (m_address.city() == city) return; @@ -282,7 +282,7 @@ QString QDeclarativeGeoAddress::district() const return m_address.district(); } -void QDeclarativeGeoAddress::setDistrict(const QString& district) +void QDeclarativeGeoAddress::setDistrict(const QString &district) { if (m_address.district() == district) return; @@ -307,7 +307,7 @@ QString QDeclarativeGeoAddress::street() const return m_address.street(); } -void QDeclarativeGeoAddress::setStreet(const QString& street) +void QDeclarativeGeoAddress::setStreet(const QString &street) { if (m_address.street() == street) return; @@ -329,7 +329,7 @@ QString QDeclarativeGeoAddress::postalCode() const return m_address.postalCode(); } -void QDeclarativeGeoAddress::setPostalCode(const QString& postalCode) +void QDeclarativeGeoAddress::setPostalCode(const QString &postalCode) { if (m_address.postalCode() == postalCode) return; diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h index 8678f9f6..acd3157e 100644 --- a/src/imports/location/qdeclarativegeoaddress_p.h +++ b/src/imports/location/qdeclarativegeoaddress_p.h @@ -65,30 +65,30 @@ class QDeclarativeGeoAddress : public QObject Q_PROPERTY(bool isTextGenerated READ isTextGenerated NOTIFY isTextGeneratedChanged) public: - explicit QDeclarativeGeoAddress(QObject* parent = 0); - QDeclarativeGeoAddress(const QGeoAddress& address, QObject* parent = 0); + explicit QDeclarativeGeoAddress(QObject *parent = 0); + QDeclarativeGeoAddress(const QGeoAddress &address, QObject *parent = 0); QGeoAddress address() const; - void setAddress(const QGeoAddress& address); + void setAddress(const QGeoAddress &address); QString text() const; void setText(const QString &address); QString country() const; - void setCountry(const QString& country); + void setCountry(const QString &country); QString countryCode() const; - void setCountryCode(const QString& countryCode); + void setCountryCode(const QString &countryCode); QString state() const; - void setState(const QString& state); + void setState(const QString &state); QString county() const; - void setCounty(const QString& county); + void setCounty(const QString &county); QString city() const; - void setCity(const QString& city); + void setCity(const QString &city); QString district() const; - void setDistrict(const QString& district); + void setDistrict(const QString &district); QString street() const; - void setStreet(const QString& street); + void setStreet(const QString &street); QString postalCode() const; - void setPostalCode(const QString& postalCode); + void setPostalCode(const QString &postalCode); bool isTextGenerated() const; Q_SIGNALS: diff --git a/src/imports/location/qdeclarativegeoboundingbox.cpp b/src/imports/location/qdeclarativegeoboundingbox.cpp index a9f7c02c..569c6d47 100644 --- a/src/imports/location/qdeclarativegeoboundingbox.cpp +++ b/src/imports/location/qdeclarativegeoboundingbox.cpp @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE \sa QGeoBoundingBox. */ -QDeclarativeGeoBoundingBox::QDeclarativeGeoBoundingBox(QObject* parent) +QDeclarativeGeoBoundingBox::QDeclarativeGeoBoundingBox(QObject *parent) : QDeclarativeGeoBoundingArea(parent), m_bottomLeft(0), m_bottomRight(0), m_topLeft(0), m_topRight(0), m_center(0), m_width(qQNaN()), m_height(qQNaN()) { @@ -110,7 +110,7 @@ QDeclarativeGeoBoundingBox::QDeclarativeGeoBoundingBox(const QGeoBoundingBox &bo For details on how to use this property to interface between C++ and QML see "\l {location-cpp-qml.html#boundingbox} {Interfaces between C++ and QML Code}". */ -void QDeclarativeGeoBoundingBox::setBox(const QGeoBoundingBox& box) +void QDeclarativeGeoBoundingBox::setBox(const QGeoBoundingBox &box) { QGeoBoundingBox oldBox = m_box; m_box = box; @@ -140,7 +140,7 @@ bool QDeclarativeGeoBoundingBox::contains(QDeclarativeCoordinate *coordinate) return m_box.contains(coordinate->coordinate()); } -QDeclarativeCoordinate* QDeclarativeGeoBoundingBox::bottomLeft() +QDeclarativeCoordinate *QDeclarativeGeoBoundingBox::bottomLeft() { if (!m_bottomLeft) { m_bottomLeft = new QDeclarativeCoordinate(m_box.bottomLeft(), this); @@ -189,7 +189,7 @@ void QDeclarativeGeoBoundingBox::setBottomLeft(QDeclarativeCoordinate *coordinat emit bottomLeftChanged(); } -QDeclarativeCoordinate* QDeclarativeGeoBoundingBox::bottomRight() +QDeclarativeCoordinate *QDeclarativeGeoBoundingBox::bottomRight() { if (!m_bottomRight) { m_bottomRight = new QDeclarativeCoordinate(m_box.bottomRight(), this); @@ -238,7 +238,7 @@ void QDeclarativeGeoBoundingBox::setBottomRight(QDeclarativeCoordinate *coordina emit bottomRightChanged(); } -QDeclarativeCoordinate* QDeclarativeGeoBoundingBox::topLeft() +QDeclarativeCoordinate *QDeclarativeGeoBoundingBox::topLeft() { if (!m_topLeft) { m_topLeft = new QDeclarativeCoordinate(m_box.topLeft(), this); @@ -287,7 +287,7 @@ void QDeclarativeGeoBoundingBox::setTopLeft(QDeclarativeCoordinate *coordinate) emit topLeftChanged(); } -QDeclarativeCoordinate* QDeclarativeGeoBoundingBox::topRight() +QDeclarativeCoordinate *QDeclarativeGeoBoundingBox::topRight() { if (!m_topRight) { m_topRight = new QDeclarativeCoordinate(m_box.topRight(), this); @@ -336,7 +336,7 @@ void QDeclarativeGeoBoundingBox::setTopRight(QDeclarativeCoordinate *coordinate) emit topRightChanged(); } -QDeclarativeCoordinate* QDeclarativeGeoBoundingBox::center() +QDeclarativeCoordinate *QDeclarativeGeoBoundingBox::center() { if (!m_center) { m_center = new QDeclarativeCoordinate(m_box.center(), this); diff --git a/src/imports/location/qdeclarativegeoboundingbox_p.h b/src/imports/location/qdeclarativegeoboundingbox_p.h index 7ae82b3c..d00ab25e 100644 --- a/src/imports/location/qdeclarativegeoboundingbox_p.h +++ b/src/imports/location/qdeclarativegeoboundingbox_p.h @@ -56,32 +56,32 @@ class QDeclarativeGeoBoundingBox : public QDeclarativeGeoBoundingArea Q_OBJECT Q_PROPERTY(QGeoBoundingBox box READ box WRITE setBox) - Q_PROPERTY(QDeclarativeCoordinate* bottomLeft READ bottomLeft WRITE setBottomLeft NOTIFY bottomLeftChanged) - Q_PROPERTY(QDeclarativeCoordinate* bottomRight READ bottomRight WRITE setBottomRight NOTIFY bottomRightChanged) - Q_PROPERTY(QDeclarativeCoordinate* topLeft READ topLeft WRITE setTopLeft NOTIFY topLeftChanged) - Q_PROPERTY(QDeclarativeCoordinate* topRight READ topRight WRITE setTopRight NOTIFY topRightChanged) - Q_PROPERTY(QDeclarativeCoordinate* center READ center WRITE setCenter NOTIFY centerChanged) + Q_PROPERTY(QDeclarativeCoordinate *bottomLeft READ bottomLeft WRITE setBottomLeft NOTIFY bottomLeftChanged) + Q_PROPERTY(QDeclarativeCoordinate *bottomRight READ bottomRight WRITE setBottomRight NOTIFY bottomRightChanged) + Q_PROPERTY(QDeclarativeCoordinate *topLeft READ topLeft WRITE setTopLeft NOTIFY topLeftChanged) + Q_PROPERTY(QDeclarativeCoordinate *topRight READ topRight WRITE setTopRight NOTIFY topRightChanged) + Q_PROPERTY(QDeclarativeCoordinate *center READ center WRITE setCenter NOTIFY centerChanged) Q_PROPERTY(double height READ height WRITE setHeight NOTIFY heightChanged) Q_PROPERTY(double width READ width WRITE setWidth NOTIFY widthChanged) public: - explicit QDeclarativeGeoBoundingBox(QObject* parent = 0); + explicit QDeclarativeGeoBoundingBox(QObject *parent = 0); explicit QDeclarativeGeoBoundingBox(const QGeoBoundingBox &box, QObject *parent = 0); - void setBox(const QGeoBoundingBox& box); + void setBox(const QGeoBoundingBox &box); QGeoBoundingBox box(); QGeoBoundingArea area() const; - Q_INVOKABLE bool contains(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* bottomLeft(); - void setBottomLeft(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* bottomRight(); - void setBottomRight(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* topLeft(); - void setTopLeft(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* topRight(); - void setTopRight(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* center(); - void setCenter(QDeclarativeCoordinate* coordinate); + Q_INVOKABLE bool contains(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *bottomLeft(); + void setBottomLeft(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *bottomRight(); + void setBottomRight(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *topLeft(); + void setTopLeft(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *topRight(); + void setTopRight(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *center(); + void setCenter(QDeclarativeCoordinate *coordinate); double height(); void setHeight(double height); double width(); diff --git a/src/imports/location/qdeclarativegeoboundingcircle.cpp b/src/imports/location/qdeclarativegeoboundingcircle.cpp index 7d9c2c4e..41a5b6f9 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle.cpp +++ b/src/imports/location/qdeclarativegeoboundingcircle.cpp @@ -97,7 +97,7 @@ QDeclarativeGeoBoundingCircle::QDeclarativeGeoBoundingCircle(const QGeoBoundingC For details on how to use this property to interface between C++ and QML see "\l {location-cpp-qml.html#boundingcircle} {Interfaces between C++ and QML Code}". */ -void QDeclarativeGeoBoundingCircle::setCircle(const QGeoBoundingCircle& circle) +void QDeclarativeGeoBoundingCircle::setCircle(const QGeoBoundingCircle &circle) { QGeoBoundingCircle oldCircle = m_circle; m_circle = circle; @@ -138,7 +138,7 @@ bool QDeclarativeGeoBoundingCircle::contains(QDeclarativeCoordinate *coordinate) Note: this property's changed() signal is currently emitted only if the whole element changes, not if only the contents of the element change. */ -QDeclarativeCoordinate* QDeclarativeGeoBoundingCircle::center() +QDeclarativeCoordinate *QDeclarativeGeoBoundingCircle::center() { if (!m_center) { m_center = new QDeclarativeCoordinate(m_circle.center(), this); diff --git a/src/imports/location/qdeclarativegeoboundingcircle_p.h b/src/imports/location/qdeclarativegeoboundingcircle_p.h index 15ba43c8..6f62b54c 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle_p.h +++ b/src/imports/location/qdeclarativegeoboundingcircle_p.h @@ -57,19 +57,19 @@ class QDeclarativeGeoBoundingCircle : public QDeclarativeGeoBoundingArea Q_OBJECT Q_PROPERTY(QGeoBoundingCircle circle READ circle WRITE setCircle) - Q_PROPERTY(QDeclarativeCoordinate* center READ center WRITE setCenter NOTIFY centerChanged) + Q_PROPERTY(QDeclarativeCoordinate *center READ center WRITE setCenter NOTIFY centerChanged) Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged) public: - explicit QDeclarativeGeoBoundingCircle(QObject* parent = 0); + explicit QDeclarativeGeoBoundingCircle(QObject *parent = 0); explicit QDeclarativeGeoBoundingCircle(const QGeoBoundingCircle &circle, QObject *parent = 0); - void setCircle(const QGeoBoundingCircle& circle); + void setCircle(const QGeoBoundingCircle &circle); QGeoBoundingCircle circle() const; QGeoBoundingArea area() const; - Q_INVOKABLE bool contains(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* center(); - void setCenter(QDeclarativeCoordinate* coordinate); + Q_INVOKABLE bool contains(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *center(); + void setCenter(QDeclarativeCoordinate *coordinate); qreal radius() const; void setRadius(qreal radius); diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 389de66b..8e750a9e 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -106,7 +106,7 @@ QT_BEGIN_NAMESPACE \endcode */ -QDeclarativeGeocodeModel::QDeclarativeGeocodeModel(QObject* parent) +QDeclarativeGeocodeModel::QDeclarativeGeocodeModel(QObject *parent) : QAbstractListModel(parent), autoUpdate_(false), complete_(false), @@ -149,9 +149,9 @@ void QDeclarativeGeocodeModel::componentComplete() */ QGeoBoundingArea QDeclarativeGeocodeModel::boundingArea() { - if (qobject_cast<QDeclarativeGeoBoundingBox*>(boundingArea_) && boundingBox_.isValid()) { + if (qobject_cast<QDeclarativeGeoBoundingBox *>(boundingArea_) && boundingBox_.isValid()) { return boundingBox_; - } else if (qobject_cast<QDeclarativeGeoBoundingCircle*>(boundingArea_) && boundingCircle_.isValid()) { + } else if (qobject_cast<QDeclarativeGeoBoundingCircle *>(boundingArea_) && boundingCircle_.isValid()) { return boundingCircle_; } return QGeoBoundingArea(); @@ -326,19 +326,19 @@ void QDeclarativeGeocodeModel::pluginReady() \sa Plugin */ -QDeclarativeGeoServiceProvider* QDeclarativeGeocodeModel::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativeGeocodeModel::plugin() const { return plugin_; } -void QDeclarativeGeocodeModel::setBounds(QObject* bounds) +void QDeclarativeGeocodeModel::setBounds(QObject *bounds) { if (boundingArea_ == bounds) return; - if (qobject_cast<QDeclarativeGeoBoundingBox*>(bounds)) { - boundingBox_ = qobject_cast<QDeclarativeGeoBoundingBox*>(bounds)->box(); - } else if (qobject_cast<QDeclarativeGeoBoundingCircle*>(bounds)) { - boundingCircle_ = qobject_cast<QDeclarativeGeoBoundingCircle*>(bounds)->circle(); + if (qobject_cast<QDeclarativeGeoBoundingBox *>(bounds)) { + boundingBox_ = qobject_cast<QDeclarativeGeoBoundingBox *>(bounds)->box(); + } else if (qobject_cast<QDeclarativeGeoBoundingCircle *>(bounds)) { + boundingCircle_ = qobject_cast<QDeclarativeGeoBoundingCircle *>(bounds)->circle(); } else { qmlInfo(this) << tr("Unsupported bound type (Box and Circle supported)"); return; @@ -358,7 +358,7 @@ void QDeclarativeGeocodeModel::setBounds(QObject* bounds) */ -QObject* QDeclarativeGeocodeModel::bounds() const +QObject *QDeclarativeGeocodeModel::bounds() const { return boundingArea_; } @@ -518,7 +518,7 @@ int QDeclarativeGeocodeModel::count() const If you access out of bounds, a zero (null object) is returned and a warning is issued. */ -QDeclarativeGeoLocation* QDeclarativeGeocodeModel::get(int index) +QDeclarativeGeoLocation *QDeclarativeGeocodeModel::get(int index) { if (index < 0 || index >= declarativeLocations_.count()) { qmlInfo(this) << tr("Error, too big or small index in get(): ") << index; @@ -636,28 +636,28 @@ QVariant QDeclarativeGeocodeModel::query() const return queryVariant_; } -void QDeclarativeGeocodeModel::setQuery(const QVariant& query) +void QDeclarativeGeocodeModel::setQuery(const QVariant &query) { if (query == queryVariant_) return; - QObject *object = qvariant_cast<QObject*>(query); - if (qobject_cast<QDeclarativeCoordinate*>(object)) { + QObject *object = qvariant_cast<QObject *>(query); + if (qobject_cast<QDeclarativeCoordinate *>(object)) { if (coordinate_) coordinate_->disconnect(this); if (address_) address_->disconnect(this); - coordinate_ = qobject_cast<QDeclarativeCoordinate*>(object); + coordinate_ = qobject_cast<QDeclarativeCoordinate *>(object); connect(coordinate_, SIGNAL(latitudeChanged(double)), this, SLOT(queryContentChanged())); connect(coordinate_, SIGNAL(longitudeChanged(double)), this, SLOT(queryContentChanged())); connect(coordinate_, SIGNAL(altitudeChanged(double)), this, SLOT(queryContentChanged())); address_ = 0; searchString_.clear(); - } else if (qobject_cast<QDeclarativeGeoAddress*>(object)) { + } else if (qobject_cast<QDeclarativeGeoAddress *>(object)) { if (address_) address_->disconnect(this); if (coordinate_) coordinate_->disconnect(this); - address_ = qobject_cast<QDeclarativeGeoAddress*>(object); + address_ = qobject_cast<QDeclarativeGeoAddress *>(object); connect(address_, SIGNAL(countryChanged()), this, SLOT(queryContentChanged())); connect(address_, SIGNAL(countryCodeChanged()), this, SLOT(queryContentChanged())); connect(address_, SIGNAL(stateChanged()), this, SLOT(queryContentChanged())); diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index 838e236d..8e8dc5dc 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -73,7 +73,7 @@ class QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserSta Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged) Q_PROPERTY(int offset READ offset WRITE setOffset NOTIFY offsetChanged) Q_PROPERTY(QVariant query READ query WRITE setQuery NOTIFY queryChanged) - Q_PROPERTY(QObject* bounds READ bounds WRITE setBounds NOTIFY boundsChanged) + Q_PROPERTY(QObject *bounds READ bounds WRITE setBounds NOTIFY boundsChanged) Q_PROPERTY(GeocodeError error READ error NOTIFY errorChanged) Q_INTERFACES(QQmlParserStatus) @@ -99,7 +99,7 @@ public: LocationRole = Qt::UserRole + 1 }; - explicit QDeclarativeGeocodeModel(QObject* parent = 0); + explicit QDeclarativeGeocodeModel(QObject *parent = 0); virtual ~QDeclarativeGeocodeModel(); // From QQmlParserStatus @@ -111,10 +111,10 @@ public: virtual QVariant data(const QModelIndex &index, int role) const; void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; - void setBounds(QObject* bounds); - QObject* bounds() const; + void setBounds(QObject *bounds); + QObject *bounds() const; Status status() const; QString errorString() const; @@ -124,7 +124,7 @@ public: void setAutoUpdate(bool update); int count() const; - Q_INVOKABLE QDeclarativeGeoLocation* get(int index); + Q_INVOKABLE QDeclarativeGeoLocation *get(int index); int limit() const; void setLimit(int limit); @@ -132,7 +132,7 @@ public: void setOffset(int offset); QVariant query() const; - void setQuery(const QVariant& query); + void setQuery(const QVariant &query); Q_INVOKABLE void reset(); Q_INVOKABLE void cancel(); @@ -161,7 +161,7 @@ protected Q_SLOTS: void pluginReady(); protected: - QGeocodingManager* searchManager(); + QGeocodingManager *searchManager(); void setStatus(Status status); void setErrorString(const QString &error); void setError(GeocodeError error); @@ -179,7 +179,7 @@ private: QGeoBoundingBox boundingBox_; QGeoBoundingCircle boundingCircle_; - QList<QDeclarativeGeoLocation*> declarativeLocations_; + QList<QDeclarativeGeoLocation *> declarativeLocations_; Status status_; QString errorString_; diff --git a/src/imports/location/qdeclarativegeolocation.cpp b/src/imports/location/qdeclarativegeolocation.cpp index 96c4ef63..f0e170c2 100644 --- a/src/imports/location/qdeclarativegeolocation.cpp +++ b/src/imports/location/qdeclarativegeolocation.cpp @@ -87,7 +87,7 @@ QT_USE_NAMESPACE */ -QDeclarativeGeoLocation::QDeclarativeGeoLocation(QObject* parent) +QDeclarativeGeoLocation::QDeclarativeGeoLocation(QObject *parent) : QObject(parent), m_address(0), m_coordinate(0), m_boundingBox(0) { diff --git a/src/imports/location/qdeclarativegeolocation_p.h b/src/imports/location/qdeclarativegeolocation_p.h index 785956d2..3e2ba7a4 100644 --- a/src/imports/location/qdeclarativegeolocation_p.h +++ b/src/imports/location/qdeclarativegeolocation_p.h @@ -56,13 +56,13 @@ class QDeclarativeGeoLocation : public QObject Q_OBJECT Q_PROPERTY(QGeoLocation location READ location WRITE setLocation) - Q_PROPERTY(QDeclarativeGeoAddress* address READ address WRITE setAddress NOTIFY addressChanged) - Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged) + Q_PROPERTY(QDeclarativeGeoAddress *address READ address WRITE setAddress NOTIFY addressChanged) + Q_PROPERTY(QDeclarativeCoordinate *coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged) Q_PROPERTY(QDeclarativeGeoBoundingBox *boundingBox READ boundingBox WRITE setBoundingBox NOTIFY boundingBoxChanged) public: - explicit QDeclarativeGeoLocation(QObject* parent = 0); - explicit QDeclarativeGeoLocation(const QGeoLocation &src, QObject* parent = 0); + explicit QDeclarativeGeoLocation(QObject *parent = 0); + explicit QDeclarativeGeoLocation(const QGeoLocation &src, QObject *parent = 0); ~QDeclarativeGeoLocation(); QGeoLocation location() ; diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp index ac557ece..f243094f 100644 --- a/src/imports/location/qdeclarativegeomaneuver.cpp +++ b/src/imports/location/qdeclarativegeomaneuver.cpp @@ -109,7 +109,7 @@ bool QDeclarativeGeoManeuver::valid() const */ -QDeclarativeCoordinate* QDeclarativeGeoManeuver::position() const +QDeclarativeCoordinate *QDeclarativeGeoManeuver::position() const { return position_; } @@ -187,7 +187,7 @@ qreal QDeclarativeGeoManeuver::distanceToNextInstruction() const */ -QDeclarativeCoordinate* QDeclarativeGeoManeuver::waypoint() const +QDeclarativeCoordinate *QDeclarativeGeoManeuver::waypoint() const { return waypoint_; } diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h index fee2773c..d99677e1 100644 --- a/src/imports/location/qdeclarativegeomaneuver_p.h +++ b/src/imports/location/qdeclarativegeomaneuver_p.h @@ -56,12 +56,12 @@ class QDeclarativeGeoManeuver : public QObject Q_ENUMS(Direction) Q_PROPERTY(bool valid READ valid CONSTANT) - Q_PROPERTY(QDeclarativeCoordinate* position READ position CONSTANT) + Q_PROPERTY(QDeclarativeCoordinate *position READ position CONSTANT) Q_PROPERTY(QString instructionText READ instructionText CONSTANT) Q_PROPERTY(Direction direction READ direction CONSTANT) Q_PROPERTY(int timeToNextInstruction READ timeToNextInstruction CONSTANT) Q_PROPERTY(qreal distanceToNextInstruction READ distanceToNextInstruction CONSTANT) - Q_PROPERTY(QDeclarativeCoordinate* waypoint READ waypoint CONSTANT) + Q_PROPERTY(QDeclarativeCoordinate *waypoint READ waypoint CONSTANT) Q_PROPERTY(bool waypointValid READ waypointValid CONSTANT) public: @@ -87,12 +87,12 @@ public: bool valid() const; bool waypointValid() const; - QDeclarativeCoordinate* position() const; + QDeclarativeCoordinate *position() const; QString instructionText() const; Direction direction() const; int timeToNextInstruction() const; qreal distanceToNextInstruction() const; - QDeclarativeCoordinate* waypoint() const; + QDeclarativeCoordinate *waypoint() const; private: QGeoManeuver maneuver_; diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 47d45345..eed4afda 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -217,7 +217,7 @@ QDeclarativeGeoMap::~QDeclarativeGeoMap() qDeleteAll(mapViews_); // remove any map items associations for (int i = 0; i < mapItems_.count(); ++i) - qobject_cast<QDeclarativeGeoMapItemBase*>(mapItems_.at(i))->setMap(0,0); + qobject_cast<QDeclarativeGeoMapItemBase *>(mapItems_.at(i))->setMap(0,0); mapItems_.clear(); if (copyrightsWPtr_.data()) { @@ -239,11 +239,11 @@ void QDeclarativeGeoMap::onMapChildrenChanged() bool foundCopyrights = false; for (int i = 0; i < kids.size(); ++i) { - QDeclarativeGeoMapCopyrightNotice *copyrights = qobject_cast<QDeclarativeGeoMapCopyrightNotice*>(kids.at(i)); + QDeclarativeGeoMapCopyrightNotice *copyrights = qobject_cast<QDeclarativeGeoMapCopyrightNotice *>(kids.at(i)); if (copyrights) { foundCopyrights = true; } else { - QDeclarativeGeoMapItemBase *mapItem = qobject_cast<QDeclarativeGeoMapItemBase*>(kids.at(i)); + QDeclarativeGeoMapItemBase *mapItem = qobject_cast<QDeclarativeGeoMapItemBase *>(kids.at(i)); if (mapItem) { if (mapItem->z() > maxChildZ) maxChildZ = mapItem->z(); @@ -260,9 +260,9 @@ void QDeclarativeGeoMap::onMapChildrenChanged() copyrightsWPtr_ = new QDeclarativeGeoMapCopyrightNotice(this); copyrights = copyrightsWPtr_.data(); connect(map_, - SIGNAL(copyrightsChanged(const QImage&, const QPoint&)), + SIGNAL(copyrightsChanged(const QImage &, const QPoint &)), copyrights, - SLOT(copyrightsChanged(const QImage&, const QPoint&))); + SLOT(copyrightsChanged(const QImage &, const QPoint &))); } else { // just re-set its parent. copyrights->setParent(this); @@ -339,7 +339,7 @@ void QDeclarativeGeoMap::mouseReleaseEvent(QMouseEvent *event) \internal returns whether flickable used the event */ -bool QDeclarativeGeoMap::mouseEvent(QMouseEvent* event) +bool QDeclarativeGeoMap::mouseEvent(QMouseEvent *event) { if (!mappingManagerInitialized_) return false; @@ -364,7 +364,7 @@ bool QDeclarativeGeoMap::mouseEvent(QMouseEvent* event) further details. */ -QDeclarativeGeoMapGestureArea* QDeclarativeGeoMap::gesture() +QDeclarativeGeoMapGestureArea *QDeclarativeGeoMap::gesture() { return gestureArea_; } @@ -377,7 +377,7 @@ QDeclarativeGeoMapGestureArea* QDeclarativeGeoMap::gesture() This object will be deprecated, use the gesture object instead. */ -QDeclarativeGeoMapPinchArea* QDeclarativeGeoMap::pinch() +QDeclarativeGeoMapPinchArea *QDeclarativeGeoMap::pinch() { return pinchArea_; } @@ -390,7 +390,7 @@ QDeclarativeGeoMapPinchArea* QDeclarativeGeoMap::pinch() This object will be deprecated, use the gesture object instead. */ -QDeclarativeGeoMapFlickable* QDeclarativeGeoMap::flick() +QDeclarativeGeoMapFlickable *QDeclarativeGeoMap::flick() { return flickable_; } @@ -413,13 +413,13 @@ void QDeclarativeGeoMap::populateMap() QObjectList kids = children(); for (int i = 0; i < kids.size(); ++i) { // dispatch items appropriately - QDeclarativeGeoMapItemView *mapView = qobject_cast<QDeclarativeGeoMapItemView*>(kids.at(i)); + QDeclarativeGeoMapItemView *mapView = qobject_cast<QDeclarativeGeoMapItemView *>(kids.at(i)); if (mapView) { mapViews_.append(mapView); setupMapView(mapView); continue; } - QDeclarativeGeoMapItemBase *mapItem = qobject_cast<QDeclarativeGeoMapItemBase*>(kids.at(i)); + QDeclarativeGeoMapItemBase *mapItem = qobject_cast<QDeclarativeGeoMapItemBase *>(kids.at(i)); if (mapItem) { addMapItem(mapItem); } @@ -439,7 +439,7 @@ void QDeclarativeGeoMap::setupMapView(QDeclarativeGeoMapItemView *view) /*! \internal */ -QSGNode* QDeclarativeGeoMap::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) +QSGNode *QDeclarativeGeoMap::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_UNUSED(data) if (width() <= 0 || height() <= 0) { @@ -507,9 +507,9 @@ void QDeclarativeGeoMap::mappingManagerInitialized() copyrightsWPtr_ = new QDeclarativeGeoMapCopyrightNotice(this); connect(map_, - SIGNAL(copyrightsChanged(const QImage&, const QPoint&)), + SIGNAL(copyrightsChanged(const QImage &, const QPoint &)), copyrightsWPtr_.data(), - SLOT(copyrightsChanged(const QImage&, const QPoint&))); + SLOT(copyrightsChanged(const QImage &, const QPoint &))); pinchArea_->zoomLevelLimits(mappingManager_->cameraCapabilities().minimumZoomLevel(), mappingManager_->cameraCapabilities().maximumZoomLevel()); @@ -569,7 +569,7 @@ void QDeclarativeGeoMap::mappingManagerInitialized() // Any map items that were added before the plugin was ready // need to have setMap called again foreach (QObject *obj, mapItems_) { - QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase*>(obj); + QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase *>(obj); if (item) item->setMap(this, map_); } @@ -588,7 +588,7 @@ void QDeclarativeGeoMap::updateMapDisplay(const QRectF &target) /*! \internal */ -QDeclarativeGeoServiceProvider* QDeclarativeGeoMap::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativeGeoMap::plugin() const { return plugin_; } @@ -775,7 +775,7 @@ void QDeclarativeGeoMap::setCenter(QDeclarativeCoordinate *center) emit centerChanged(center_); } -QDeclarativeCoordinate* QDeclarativeGeoMap::center() +QDeclarativeCoordinate *QDeclarativeGeoMap::center() { if (!center_) { if (mappingManagerInitialized_) @@ -928,7 +928,7 @@ QQmlListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMapTypes() the current viewport. */ -QDeclarativeCoordinate* QDeclarativeGeoMap::toCoordinate(const QPointF &screenPosition) const +QDeclarativeCoordinate *QDeclarativeGeoMap::toCoordinate(const QPointF &screenPosition) const { QGeoCoordinate coordinate; if (map_) @@ -948,7 +948,7 @@ QDeclarativeCoordinate* QDeclarativeGeoMap::toCoordinate(const QPointF &screenPo current viewport. */ -QPointF QDeclarativeGeoMap::toScreenPosition(QDeclarativeCoordinate* coordinate) const +QPointF QDeclarativeGeoMap::toScreenPosition(QDeclarativeCoordinate *coordinate) const { QPointF point(qQNaN(), qQNaN()); if (coordinate && map_) @@ -1041,7 +1041,7 @@ void QDeclarativeGeoMap::addMapItem(QDeclarativeGeoMapItemBase *item) \sa addMapItem, removeMapItem, clearMapItems */ -QList<QObject*> QDeclarativeGeoMap::mapItems() +QList<QObject *> QDeclarativeGeoMap::mapItems() { return mapItems_; } @@ -1085,8 +1085,8 @@ void QDeclarativeGeoMap::clearMapItems() return; updateMutex_.lock(); for (int i = 0; i < mapItems_.count(); ++i) { - qobject_cast<QDeclarativeGeoMapItemBase*>(mapItems_.at(i))->setParentItem(0); - qobject_cast<QDeclarativeGeoMapItemBase*>(mapItems_.at(i))->setMap(0, 0); + qobject_cast<QDeclarativeGeoMapItemBase *>(mapItems_.at(i))->setParentItem(0); + qobject_cast<QDeclarativeGeoMapItemBase *>(mapItems_.at(i))->setMap(0, 0); } mapItems_.clear(); emit mapItemsChanged(); @@ -1162,9 +1162,9 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(bool refine) QPointF centerPt; int itemCount = 0; for (int i = 0; i < mapItems_.count(); ++i) { - QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase*>(mapItems_.at(i)); + QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase *>(mapItems_.at(i)); // account for the special case - circle - QDeclarativeCircleMapItem *circleItem = qobject_cast<QDeclarativeCircleMapItem*>(mapItems_.at(i)); + QDeclarativeCircleMapItem *circleItem = qobject_cast<QDeclarativeCircleMapItem *>(mapItems_.at(i)); if ((!circleItem || !circleItem->center()) && !item) continue; if (circleItem && circleItem->center()) { diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h index 416f341c..9a13f0a6 100644 --- a/src/imports/location/qdeclarativegeomap_p.h +++ b/src/imports/location/qdeclarativegeomap_p.h @@ -101,17 +101,17 @@ class QDeclarativeGeoMap : public QQuickItem { Q_OBJECT - Q_PROPERTY(QDeclarativeGeoMapGestureArea* gesture READ gesture CONSTANT) - Q_PROPERTY(QDeclarativeGeoMapPinchArea* pinch READ pinch CONSTANT) - Q_PROPERTY(QDeclarativeGeoMapFlickable* flick READ flick CONSTANT) + Q_PROPERTY(QDeclarativeGeoMapGestureArea *gesture READ gesture CONSTANT) + Q_PROPERTY(QDeclarativeGeoMapPinchArea *pinch READ pinch CONSTANT) + Q_PROPERTY(QDeclarativeGeoMapFlickable *flick READ flick CONSTANT) Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged) Q_PROPERTY(qreal minimumZoomLevel READ minimumZoomLevel NOTIFY minimumZoomLevelChanged) 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(QDeclarativeGeoMapType *activeMapType READ activeMapType WRITE setActiveMapType NOTIFY activeMapTypeChanged) 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) + 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) @@ -132,15 +132,15 @@ public: void itemChange(ItemChange change, const ItemChangeData & data); void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; - void setActiveMapType(QDeclarativeGeoMapType* mapType); - QDeclarativeGeoMapType* activeMapType()const; + void setActiveMapType(QDeclarativeGeoMapType *mapType); + QDeclarativeGeoMapType *activeMapType() const; qreal minimumZoomLevel() const; qreal maximumZoomLevel() const; - QDeclarativeGeoMapFlickable* flick(); + QDeclarativeGeoMapFlickable *flick(); void setZoomLevel(qreal zoomLevel); qreal zoomLevel() const; @@ -152,23 +152,23 @@ public: qreal tilt() const; void setCenter(QDeclarativeCoordinate *center); - QDeclarativeCoordinate* center(); + QDeclarativeCoordinate *center(); QQmlListProperty<QDeclarativeGeoMapType> supportedMapTypes(); Q_INVOKABLE void removeMapItem(QDeclarativeGeoMapItemBase *item); Q_INVOKABLE void addMapItem(QDeclarativeGeoMapItemBase *item); Q_INVOKABLE void clearMapItems(); - QList<QObject*> mapItems(); + QList<QObject *> mapItems(); - Q_INVOKABLE QDeclarativeCoordinate* toCoordinate(const QPointF &screenPosition) const; - Q_INVOKABLE QPointF toScreenPosition(QDeclarativeCoordinate* coordinate) const; + Q_INVOKABLE QDeclarativeCoordinate *toCoordinate(const QPointF &screenPosition) const; + Q_INVOKABLE QPointF toScreenPosition(QDeclarativeCoordinate *coordinate) const; // callback for map mouse areas - bool mouseEvent(QMouseEvent* event); + bool mouseEvent(QMouseEvent *event); - QDeclarativeGeoMapPinchArea* pinch(); - QDeclarativeGeoMapGestureArea* gesture(); + QDeclarativeGeoMapPinchArea *pinch(); + QDeclarativeGeoMapGestureArea *gesture(); Q_INVOKABLE void fitViewportToMapItems(); @@ -197,7 +197,7 @@ Q_SIGNALS: void mapItemsChanged(); private Q_SLOTS: - void updateMapDisplay(const QRectF& target); + void updateMapDisplay(const QRectF &target); void centerLatitudeChanged(double latitude); void centerLongitudeChanged(double longitude); void centerAltitudeChanged(double altitude); @@ -225,10 +225,10 @@ private: QPointer<QDeclarativeCoordinate> center_; QDeclarativeGeoMapType *activeMapType_; - QList<QDeclarativeGeoMapType*> supportedMapTypes_; + QList<QDeclarativeGeoMapType *> supportedMapTypes_; bool componentCompleted_; bool mappingManagerInitialized_; - QList<QDeclarativeGeoMapItemView*> mapViews_; + QList<QDeclarativeGeoMapItemView *> mapViews_; QDeclarativeGeoMapGestureArea *gestureArea_; QDeclarativeGeoMapFlickable *flickable_; @@ -245,7 +245,7 @@ private: QGeoMap *map_; QWeakPointer<QDeclarativeGeoMapCopyrightNotice> copyrightsWPtr_; - QList<QObject*> mapItems_; + QList<QObject *> mapItems_; QMutex updateMutex_; friend class QDeclarativeGeoMapItem; diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h b/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h index 1b430afa..e35e581c 100644 --- a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h +++ b/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h @@ -69,4 +69,3 @@ private: QT_END_NAMESPACE #endif - diff --git a/src/imports/location/qdeclarativegeomapflickable_p.h b/src/imports/location/qdeclarativegeomapflickable_p.h index 84d35425..c2e5252b 100644 --- a/src/imports/location/qdeclarativegeomapflickable_p.h +++ b/src/imports/location/qdeclarativegeomapflickable_p.h @@ -71,12 +71,12 @@ public: ~QDeclarativeGeoMapFlickable(); qreal deceleration() const { return gestureArea_->flickDeceleration(); } - void setDeceleration(qreal deceleration){ gestureArea_->setFlickDeceleration(deceleration); } + void setDeceleration(qreal deceleration) { gestureArea_->setFlickDeceleration(deceleration); } bool enabled() const { return gestureArea_->panEnabled(); } - void setEnabled(bool enabled){ gestureArea_->setPanEnabled(enabled); } + void setEnabled(bool enabled) { gestureArea_->setPanEnabled(enabled); } - void setMap(QGeoMap* map){ gestureArea_->setMap(map); } + void setMap(QGeoMap *map) { gestureArea_->setMap(map); } Q_SIGNALS: void decelerationChanged(); diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp index de9ffd74..ac85e62a 100644 --- a/src/imports/location/qdeclarativegeomapgesturearea.cpp +++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp @@ -324,7 +324,7 @@ QT_BEGIN_NAMESPACE */ -QDeclarativeGeoMapGestureArea::QDeclarativeGeoMapGestureArea(QDeclarativeGeoMap* map, QObject *parent) +QDeclarativeGeoMapGestureArea::QDeclarativeGeoMapGestureArea(QDeclarativeGeoMap *map, QObject *parent) : QObject(parent), declarativeMap_(map), enabled_(true), @@ -363,7 +363,7 @@ QDeclarativeGeoMapGestureArea::QDeclarativeGeoMapGestureArea(QDeclarativeGeoMap* /*! \internal */ -void QDeclarativeGeoMapGestureArea::setMap(QGeoMap* map) +void QDeclarativeGeoMapGestureArea::setMap(QGeoMap *map) { if (map_ || !map) return; diff --git a/src/imports/location/qdeclarativegeomapgesturearea_p.h b/src/imports/location/qdeclarativegeomapgesturearea_p.h index 2aeb8fdd..8f025d93 100644 --- a/src/imports/location/qdeclarativegeomapgesturearea_p.h +++ b/src/imports/location/qdeclarativegeomapgesturearea_p.h @@ -135,7 +135,7 @@ class QDeclarativeGeoMapGestureArea: public QObject //Q_PROPERTY(qreal maximumTiltChange READ maximumTiltChange WRITE setMaximumTiltChange NOTIFY maximumTiltChangeChanged) public: - QDeclarativeGeoMapGestureArea(QDeclarativeGeoMap* map, QObject *parent = 0); + QDeclarativeGeoMapGestureArea(QDeclarativeGeoMap *map, QObject *parent = 0); ~QDeclarativeGeoMapGestureArea(); enum ActiveGesture { @@ -201,7 +201,7 @@ public: bool mouseReleaseEvent(QMouseEvent *event); void zoomLevelLimits(qreal min, qreal max); - void setMap(QGeoMap* map); + void setMap(QGeoMap *map); // will be removed void registerFlickDeprecated(QDeclarativeGeoMapFlickable *flickable) @@ -233,9 +233,9 @@ Q_SIGNALS: void pinchEnabledChanged(); void panEnabledChanged(); - void pinchStarted(QDeclarativeGeoMapPinchEvent* pinch); - void pinchUpdated(QDeclarativeGeoMapPinchEvent* pinch); - void pinchFinished(QDeclarativeGeoMapPinchEvent* pinch); + void pinchStarted(QDeclarativeGeoMapPinchEvent *pinch); + void pinchUpdated(QDeclarativeGeoMapPinchEvent *pinch); + void pinchFinished(QDeclarativeGeoMapPinchEvent *pinch); void panStarted(); void panFinished(); void flickStarted(); diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp index df042cee..53dc8e37 100644 --- a/src/imports/location/qdeclarativegeomapitembase.cpp +++ b/src/imports/location/qdeclarativegeomapitembase.cpp @@ -100,12 +100,12 @@ QDeclarativeGeoMapItemBase::~QDeclarativeGeoMapItemBase() */ void QDeclarativeGeoMapItemBase::afterChildrenChanged() { - QList<QQuickItem*> kids = childItems(); + QList<QQuickItem *> kids = childItems(); if (kids.size() > 0) { bool printedWarning = false; foreach (QQuickItem *i, kids) { if (i->flags() & QQuickItem::ItemHasContents - && !qobject_cast<QDeclarativeGeoMapMouseArea*>(i)) { + && !qobject_cast<QDeclarativeGeoMapMouseArea *>(i)) { if (!printedWarning) { qmlInfo(this) << "Geographic map items do not support child items"; printedWarning = true; @@ -198,7 +198,7 @@ void QDeclarativeGeoMapItemBase::baseCameraDataChanged(const QGeoCameraData &cam /*! \internal */ -void QDeclarativeGeoMapItemBase::setPositionOnMap(const QGeoCoordinate& coordinate, const QPointF& offset) +void QDeclarativeGeoMapItemBase::setPositionOnMap(const QGeoCoordinate &coordinate, const QPointF &offset) { if (!map_ || !quickMap_) return; @@ -239,7 +239,7 @@ QSGNode *QDeclarativeGeoMapItemBase::updatePaintNode(QSGNode *oldNode, UpdatePai return 0; } - QSGOpacityNode *opn = static_cast<QSGOpacityNode*>(oldNode); + QSGOpacityNode *opn = static_cast<QSGOpacityNode *>(oldNode); if (!opn) opn = new QSGOpacityNode(); diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h index c65dfcef..f996aabb 100644 --- a/src/imports/location/qdeclarativegeomapitembase_p.h +++ b/src/imports/location/qdeclarativegeomapitembase_p.h @@ -74,14 +74,14 @@ public: explicit QDeclarativeGeoMapItemBase(QQuickItem *parent = 0); virtual ~QDeclarativeGeoMapItemBase(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); - virtual void setPositionOnMap(const QGeoCoordinate& coordinate, const QPointF& offset); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); + virtual void setPositionOnMap(const QGeoCoordinate &coordinate, const QPointF &offset); virtual bool contains(const QPointF &point); virtual void dragStarted(); virtual void dragEnded(); - QDeclarativeGeoMap* quickMap() {return quickMap_;} - QGeoMap* map() { return map_; } + QDeclarativeGeoMap *quickMap() { return quickMap_; } + QGeoMap *map() { return map_; } QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); diff --git a/src/imports/location/qdeclarativegeomapitemview.cpp b/src/imports/location/qdeclarativegeomapitemview.cpp index 54088f46..3a8dd06c 100644 --- a/src/imports/location/qdeclarativegeomapitemview.cpp +++ b/src/imports/location/qdeclarativegeomapitemview.cpp @@ -111,12 +111,12 @@ void QDeclarativeGeoMapItemView::setModel(const QVariant &model) { if (!model.isValid() || model == modelVariant_) return; - QObject *object = qvariant_cast<QObject*>(model); + QObject *object = qvariant_cast<QObject *>(model); QAbstractItemModel *itemModel; QListModelInterface *listModel; if (object) { - itemModel = qobject_cast<QAbstractItemModel*>(object); - listModel = qobject_cast<QListModelInterface*>(object); + itemModel = qobject_cast<QAbstractItemModel *>(object); + listModel = qobject_cast<QListModelInterface *>(object); } else { return; } @@ -194,7 +194,7 @@ void QDeclarativeGeoMapItemView::itemModelRowsRemoved(QModelIndex, int start, in } } -void QDeclarativeGeoMapItemView::listModelItemsChanged(int index, int count, const QList<int>&) +void QDeclarativeGeoMapItemView::listModelItemsChanged(int index, int count, const QList<int> &) { if (!componentCompleted_ || !map_ || !delegate_ || !listModel_) return; @@ -232,7 +232,7 @@ void QDeclarativeGeoMapItemView::listModelItemsInserted(int index, int count) void QDeclarativeGeoMapItemView::listModelItemsMoved(int from, int to, int count) { - QList<QDeclarativeGeoMapItemBase*> temp; + QList<QDeclarativeGeoMapItemBase *> temp; for (int i = 0; i < count; ++i) temp.append(mapItemList_.takeAt(from)); @@ -268,7 +268,7 @@ void QDeclarativeGeoMapItemView::listModelItemsRemoved(int index, int count) MapItem -derived element as the root element. */ -QQmlComponent* QDeclarativeGeoMapItemView::delegate() const +QQmlComponent *QDeclarativeGeoMapItemView::delegate() const { return delegate_; } @@ -286,7 +286,7 @@ void QDeclarativeGeoMapItemView::setDelegate(QQmlComponent *delegate) /*! \internal */ -void QDeclarativeGeoMapItemView::setMapData(QDeclarativeGeoMap* map) +void QDeclarativeGeoMapItemView::setMapData(QDeclarativeGeoMap *map) { if (!map || map_) // changing map on the fly not supported return; @@ -380,7 +380,7 @@ QDeclarativeGeoMapItemBase *QDeclarativeGeoMapItemView::createItemFromListModel( delete itemContext; return 0; } - QDeclarativeGeoMapItemBase *declMapObj = qobject_cast<QDeclarativeGeoMapItemBase*>(obj); + QDeclarativeGeoMapItemBase *declMapObj = qobject_cast<QDeclarativeGeoMapItemBase *>(obj); if (!declMapObj) { qWarning() << "QDeclarativeGeoMapItemView map item delegate is of unsupported type."; delete itemContext; @@ -394,7 +394,7 @@ QDeclarativeGeoMapItemBase *QDeclarativeGeoMapItemView::createItemFromListModel( /*! \internal */ -QDeclarativeGeoMapItemBase* QDeclarativeGeoMapItemView::createItemFromItemModel(int modelRow) +QDeclarativeGeoMapItemBase *QDeclarativeGeoMapItemView::createItemFromItemModel(int modelRow) { if (!delegate_ || !itemModel_) return 0; @@ -430,7 +430,7 @@ QDeclarativeGeoMapItemBase* QDeclarativeGeoMapItemView::createItemFromItemModel( delete itemContext; return 0; } - QDeclarativeGeoMapItemBase *declMapObj = qobject_cast<QDeclarativeGeoMapItemBase*>(obj); + QDeclarativeGeoMapItemBase *declMapObj = qobject_cast<QDeclarativeGeoMapItemBase *>(obj); if (!declMapObj) { qWarning() << "QDeclarativeGeoMapItemView map item delegate is of unsupported type."; delete itemContext; diff --git a/src/imports/location/qdeclarativegeomapitemview_p.h b/src/imports/location/qdeclarativegeomapitemview_p.h index 45117c3b..e81e036a 100644 --- a/src/imports/location/qdeclarativegeomapitemview_p.h +++ b/src/imports/location/qdeclarativegeomapitemview_p.h @@ -62,7 +62,7 @@ class QDeclarativeGeoMapItemView : public QObject, public QQmlParserStatus Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) - Q_PROPERTY(QQmlComponent* 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) @@ -74,9 +74,9 @@ public: void setModel(const QVariant &); QQmlComponent *delegate() const; - void setDelegate(QQmlComponent*); + void setDelegate(QQmlComponent *); - void setMapData(QDeclarativeGeoMap*); + void setMapData(QDeclarativeGeoMap *); void repopulate(); void removeInstantiatedItems(); @@ -86,7 +86,7 @@ public: void setVisible(bool visible); bool isVisible() const; - QDeclarativeGeoMapItemBase* createItem(int modelRow); + QDeclarativeGeoMapItemBase *createItem(int modelRow); // From QQmlParserStatus virtual void componentComplete(); void classBegin() {} @@ -119,7 +119,7 @@ private: QAbstractItemModel *itemModel_; QListModelInterface *listModel_; QDeclarativeGeoMap *map_; - QList<QDeclarativeGeoMapItemBase*> mapItemList_; + QList<QDeclarativeGeoMapItemBase *> mapItemList_; }; QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index d38f8dc3..777d5a1e 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -139,7 +139,7 @@ QDeclarativeGeoMapMouseArea::~QDeclarativeGeoMapMouseArea() Converts the \a event's coordinates to geo coordinates. */ -QDeclarativeCoordinate *QDeclarativeGeoMapMouseArea::mouseToCoordinate(QQuickMouseEvent* event) +QDeclarativeCoordinate *QDeclarativeGeoMapMouseArea::mouseToCoordinate(QQuickMouseEvent *event) { // figure out the map association for this mouse area and use it to resolve geocoordinate QDeclarativeGeoMap *quickmap = map(); @@ -157,9 +157,9 @@ QDeclarativeGeoMap *QDeclarativeGeoMapMouseArea::map() QQuickItem *pmi = parentMapItem(); QDeclarativeGeoMap *map = 0; if (pmi) { - map = qobject_cast<QDeclarativeGeoMap*>(pmi); + map = qobject_cast<QDeclarativeGeoMap *>(pmi); if (!map) { - QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase*>(pmi); + QDeclarativeGeoMapItemBase *item = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi); if (item) map = item->quickMap(); } @@ -193,13 +193,13 @@ void QDeclarativeGeoMapMouseArea::mousePressEvent(QMouseEvent *event) { // map element's flickable may use the event QQuickItem *pmi = parentMapItem(); - if (pmi && qobject_cast<QDeclarativeGeoMap*>(pmi)) - qobject_cast<QDeclarativeGeoMap*>(pmi)->mouseEvent(event); + if (pmi && qobject_cast<QDeclarativeGeoMap *>(pmi)) + qobject_cast<QDeclarativeGeoMap *>(pmi)->mouseEvent(event); // ignore event if it misses non-rectangular geometry (e.g. circle, route) bool contains = true; - if (pmi && qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)) - contains = qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)->contains(event->pos()); + if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)) + contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos()); if (contains) QQuickMouseArea::mousePressEvent(event); @@ -215,12 +215,12 @@ void QDeclarativeGeoMapMouseArea::mouseReleaseEvent(QMouseEvent *event) // map element's flickable may use the event QQuickItem *pmi = parentMapItem(); - if (pmi && qobject_cast<QDeclarativeGeoMap*>(pmi)) { - qobject_cast<QDeclarativeGeoMap*>(pmi)->mouseEvent(event); - } else if (dragActive_ && pmi && qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)) { + if (pmi && qobject_cast<QDeclarativeGeoMap *>(pmi)) { + qobject_cast<QDeclarativeGeoMap *>(pmi)->mouseEvent(event); + } else if (dragActive_ && pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)) { // position of the item may have changed by the time the activeChanged // is received, hence update already on mouse release - qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)->dragEnded(); + qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->dragEnded(); dragActive_ = false; } @@ -242,8 +242,8 @@ void QDeclarativeGeoMapMouseArea::mouseMoveEvent(QMouseEvent *event) { // map element's flickable may use the event QQuickItem *pmi = parentMapItem(); - if (pmi && qobject_cast<QDeclarativeGeoMap*>(pmi)) - qobject_cast<QDeclarativeGeoMap*>(pmi)->mouseEvent(event); + if (pmi && qobject_cast<QDeclarativeGeoMap *>(pmi)) + qobject_cast<QDeclarativeGeoMap *>(pmi)->mouseEvent(event); QQuickMouseArea::mouseMoveEvent(event); } @@ -255,8 +255,8 @@ void QDeclarativeGeoMapMouseArea::hoverEnterEvent(QHoverEvent *event) { QQuickItem *pmi = parentMapItem(); bool contains = true; - if (pmi && qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)) - contains = qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)->contains(event->pos()); + if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)) + contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos()); /* for many objects it's doubtful this will ever be true */ if (!hovered() && contains) @@ -272,8 +272,8 @@ void QDeclarativeGeoMapMouseArea::hoverMoveEvent(QHoverEvent *event) { QQuickItem *pmi = parentMapItem(); bool contains = true; - if (pmi && qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)) - contains = qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)->contains(event->pos()); + if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)) + contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos()); /* we may have already entered the object from scenegraph's perspective * (ie, the hoverEnterEvent fired and we ignored it), so make sure our @@ -295,8 +295,8 @@ void QDeclarativeGeoMapMouseArea::hoverLeaveEvent(QHoverEvent *event) { QQuickItem *pmi = parentMapItem(); bool contains = true; - if (pmi && qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)) - contains = qobject_cast<QDeclarativeGeoMapItemBase*>(pmi)->contains(event->pos()); + if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)) + contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos()); if (!hovered() && contains) QQuickMouseArea::hoverEnterEvent(event); @@ -310,13 +310,13 @@ void QDeclarativeGeoMapMouseArea::hoverLeaveEvent(QHoverEvent *event) /*! \internal */ -QQuickItem* QDeclarativeGeoMapMouseArea::parentMapItem() +QQuickItem *QDeclarativeGeoMapMouseArea::parentMapItem() { QQuickItem *item = this; while (item->parentItem()) { item = item->parentItem(); - if (qobject_cast<QDeclarativeGeoMap*>(item) || - qobject_cast<QDeclarativeGeoMapItemBase*>(item)) + if (qobject_cast<QDeclarativeGeoMap *>(item) || + qobject_cast<QDeclarativeGeoMapItemBase *>(item)) return item; } return 0; diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h index 5d0c4d75..4be5af88 100644 --- a/src/imports/location/qdeclarativegeomapmousearea_p.h +++ b/src/imports/location/qdeclarativegeomapmousearea_p.h @@ -59,7 +59,7 @@ public: explicit QDeclarativeGeoMapMouseArea(QQuickItem *parent = 0); ~QDeclarativeGeoMapMouseArea(); - Q_INVOKABLE QDeclarativeCoordinate* mouseToCoordinate(QQuickMouseEvent* event); + Q_INVOKABLE QDeclarativeCoordinate *mouseToCoordinate(QQuickMouseEvent *event); // From QQmlParserStatus virtual void componentComplete(); @@ -78,8 +78,8 @@ private Q_SLOTS: void dragActiveChanged(); private: - QQuickItem* parentMapItem(); - QDeclarativeGeoMap* map(); + QQuickItem *parentMapItem(); + QDeclarativeGeoMap *map(); private: bool componentCompleted_; diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp index 2f39c992..6c5cd486 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent.cpp +++ b/src/imports/location/qdeclarativegeomapmouseevent.cpp @@ -239,7 +239,7 @@ void QDeclarativeGeoMapMouseEvent::setCoordinate(const QGeoCoordinate &coordinat coordinate_.setCoordinate(coordinate); } -QDeclarativeCoordinate* QDeclarativeGeoMapMouseEvent::coordinate() +QDeclarativeCoordinate *QDeclarativeGeoMapMouseEvent::coordinate() { return &coordinate_; } diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h index 7d1f90ca..e08084f4 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent_p.h +++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h @@ -59,7 +59,7 @@ class QDeclarativeGeoMapMouseEvent : public QObject Q_PROPERTY(bool wasHeld READ wasHeld) Q_PROPERTY(int x READ x) Q_PROPERTY(int y READ y) - Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate) + Q_PROPERTY(QDeclarativeCoordinate *coordinate READ coordinate) public: explicit QDeclarativeGeoMapMouseEvent(QObject *parent = 0); @@ -87,7 +87,7 @@ public: int y() const; void setCoordinate(const QGeoCoordinate &coordinate); - QDeclarativeCoordinate* coordinate(); + QDeclarativeCoordinate *coordinate(); private: bool accepted_; diff --git a/src/imports/location/qdeclarativegeomappincharea_p.h b/src/imports/location/qdeclarativegeomappincharea_p.h index 90f810db..4f054941 100644 --- a/src/imports/location/qdeclarativegeomappincharea_p.h +++ b/src/imports/location/qdeclarativegeomappincharea_p.h @@ -149,7 +149,7 @@ public: void setFlickDeceleration(qreal deceleration){ gestureArea_->setFlickDeceleration(deceleration); } void zoomLevelLimits(qreal min, qreal max){ gestureArea_->zoomLevelLimits(min, max); } - void setMap(QGeoMap* map){ gestureArea_->setMap(map); } + void setMap(QGeoMap *map){ gestureArea_->setMap(map); } Q_SIGNALS: void activeChanged(); @@ -166,9 +166,9 @@ Q_SIGNALS: void maximumTiltChangeChanged(); void flickDecelerationChanged(); - void pinchStarted(QDeclarativeGeoMapPinchEvent* pinch); - void pinchUpdated(QDeclarativeGeoMapPinchEvent* pinch); - void pinchFinished(QDeclarativeGeoMapPinchEvent* pinch); + void pinchStarted(QDeclarativeGeoMapPinchEvent *pinch); + void pinchUpdated(QDeclarativeGeoMapPinchEvent *pinch); + void pinchFinished(QDeclarativeGeoMapPinchEvent *pinch); private: QDeclarativeGeoMapGestureArea *gestureArea_; // the destination for this wrapper class diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index 1d517c6b..b21d2f25 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -219,7 +219,7 @@ void QDeclarativeGeoMapQuickItem::setCoordinate(QDeclarativeCoordinate *coordina /*! \internal */ -void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) +void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map && quickMap) { @@ -247,7 +247,7 @@ void QDeclarativeGeoMapQuickItem::dragEnded() /*! \internal */ -QDeclarativeCoordinate* QDeclarativeGeoMapQuickItem::coordinate() +QDeclarativeCoordinate *QDeclarativeGeoMapQuickItem::coordinate() { return coordinate_; } @@ -257,7 +257,7 @@ QDeclarativeCoordinate* QDeclarativeGeoMapQuickItem::coordinate() This property holds the source item that will be drawn on the map. */ -void QDeclarativeGeoMapQuickItem::setSourceItem(QQuickItem* sourceItem) +void QDeclarativeGeoMapQuickItem::setSourceItem(QQuickItem *sourceItem) { if (sourceItem_.data() == sourceItem) return; @@ -268,7 +268,7 @@ void QDeclarativeGeoMapQuickItem::setSourceItem(QQuickItem* sourceItem) emit sourceItemChanged(); } -QQuickItem* QDeclarativeGeoMapQuickItem::sourceItem() +QQuickItem *QDeclarativeGeoMapQuickItem::sourceItem() { return sourceItem_.data(); } @@ -278,12 +278,12 @@ QQuickItem* QDeclarativeGeoMapQuickItem::sourceItem() */ void QDeclarativeGeoMapQuickItem::afterChildrenChanged() { - QList<QQuickItem*> kids = childItems(); + QList<QQuickItem *> kids = childItems(); if (kids.size() > 0) { bool printedWarning = false; foreach (QQuickItem *i, kids) { if (i->flags() & QQuickItem::ItemHasContents - && !qobject_cast<QDeclarativeGeoMapMouseArea*>(i) + && !qobject_cast<QDeclarativeGeoMapMouseArea *>(i) && sourceItem_.data() != i && opacityContainer_ != i) { if (!printedWarning) { diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h index 875ad414..f4c43501 100644 --- a/src/imports/location/qdeclarativegeomapquickitem_p.h +++ b/src/imports/location/qdeclarativegeomapquickitem_p.h @@ -54,22 +54,22 @@ QT_BEGIN_NAMESPACE class QDeclarativeGeoMapQuickItem : public QDeclarativeGeoMapItemBase { Q_OBJECT - Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged) + Q_PROPERTY(QDeclarativeCoordinate *coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged) Q_PROPERTY(QPointF anchorPoint READ anchorPoint WRITE setAnchorPoint NOTIFY anchorPointChanged) Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) - Q_PROPERTY(QQuickItem* sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged) + Q_PROPERTY(QQuickItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged) public: explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0); ~QDeclarativeGeoMapQuickItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); void setCoordinate(QDeclarativeCoordinate *coordinate); - QDeclarativeCoordinate* coordinate(); + QDeclarativeCoordinate *coordinate(); - void setSourceItem(QQuickItem* sourceItem); - QQuickItem* sourceItem(); + void setSourceItem(QQuickItem *sourceItem); + QQuickItem *sourceItem(); void setAnchorPoint(const QPointF &anchorPoint); QPointF anchorPoint() const; diff --git a/src/imports/location/qdeclarativegeomaptype.cpp b/src/imports/location/qdeclarativegeomaptype.cpp index 6ece1148..733469ec 100644 --- a/src/imports/location/qdeclarativegeomaptype.cpp +++ b/src/imports/location/qdeclarativegeomaptype.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE a flag to indicate if the map type is optimized for mobile devices (\l mobile). */ -QDeclarativeGeoMapType::QDeclarativeGeoMapType(const QGeoMapType mapType, QObject* parent) +QDeclarativeGeoMapType::QDeclarativeGeoMapType(const QGeoMapType mapType, QObject *parent) : QObject(parent), mapType_(mapType) {} diff --git a/src/imports/location/qdeclarativegeomaptype_p.h b/src/imports/location/qdeclarativegeomaptype_p.h index 744ee873..d685a12d 100644 --- a/src/imports/location/qdeclarativegeomaptype_p.h +++ b/src/imports/location/qdeclarativegeomaptype_p.h @@ -71,7 +71,7 @@ public: CustomMap = 100 }; - QDeclarativeGeoMapType(const QGeoMapType mapType, QObject* parent = 0); + QDeclarativeGeoMapType(const QGeoMapType mapType, QObject *parent = 0); ~QDeclarativeGeoMapType(); MapStyle style() const; diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 88a70b79..bb740409 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -125,7 +125,7 @@ QList<QGeoCoordinate> QDeclarativeGeoRoute::routePath() */ -QDeclarativeGeoBoundingBox* QDeclarativeGeoRoute::bounds() const +QDeclarativeGeoBoundingBox *QDeclarativeGeoRoute::bounds() const { return bounds_; } @@ -180,7 +180,7 @@ QQmlListProperty<QDeclarativeCoordinate> QDeclarativeGeoRoute::path() void QDeclarativeGeoRoute::path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate) { - static_cast<QDeclarativeGeoRoute*>(prop->object)->appendPath(coordinate); + static_cast<QDeclarativeGeoRoute *>(prop->object)->appendPath(coordinate); } /*! @@ -188,15 +188,15 @@ void QDeclarativeGeoRoute::path_append(QQmlListProperty<QDeclarativeCoordinate> */ int QDeclarativeGeoRoute::path_count(QQmlListProperty<QDeclarativeCoordinate> *prop) { - return static_cast<QDeclarativeGeoRoute*>(prop->object)->path_.count(); + return static_cast<QDeclarativeGeoRoute *>(prop->object)->path_.count(); } /*! \internal */ -QDeclarativeCoordinate* QDeclarativeGeoRoute::path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) +QDeclarativeCoordinate *QDeclarativeGeoRoute::path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) { - return static_cast<QDeclarativeGeoRoute*>(prop->object)->path_.at(index); + return static_cast<QDeclarativeGeoRoute *>(prop->object)->path_.at(index); } /*! @@ -204,13 +204,13 @@ QDeclarativeCoordinate* QDeclarativeGeoRoute::path_at(QQmlListProperty<QDeclarat */ void QDeclarativeGeoRoute::path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop) { - static_cast<QDeclarativeGeoRoute*>(prop->object)->clearPath(); + static_cast<QDeclarativeGeoRoute *>(prop->object)->clearPath(); } /*! \internal */ -void QDeclarativeGeoRoute::appendPath(QDeclarativeCoordinate* coordinate) +void QDeclarativeGeoRoute::appendPath(QDeclarativeCoordinate *coordinate) { path_.append(coordinate); } @@ -247,7 +247,7 @@ QQmlListProperty<QDeclarativeGeoRouteSegment> QDeclarativeGeoRoute::segments() void QDeclarativeGeoRoute::segments_append(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, QDeclarativeGeoRouteSegment *segment) { - static_cast<QDeclarativeGeoRoute*>(prop->object)->appendSegment(segment); + static_cast<QDeclarativeGeoRoute *>(prop->object)->appendSegment(segment); } /*! @@ -255,15 +255,15 @@ void QDeclarativeGeoRoute::segments_append(QQmlListProperty<QDeclarativeGeoRoute */ int QDeclarativeGeoRoute::segments_count(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop) { - return static_cast<QDeclarativeGeoRoute*>(prop->object)->segments_.count(); + return static_cast<QDeclarativeGeoRoute *>(prop->object)->segments_.count(); } /*! \internal */ -QDeclarativeGeoRouteSegment* QDeclarativeGeoRoute::segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index) +QDeclarativeGeoRouteSegment *QDeclarativeGeoRoute::segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index) { - return static_cast<QDeclarativeGeoRoute*>(prop->object)->segments_.at(index); + return static_cast<QDeclarativeGeoRoute *>(prop->object)->segments_.at(index); } /*! @@ -271,13 +271,13 @@ QDeclarativeGeoRouteSegment* QDeclarativeGeoRoute::segments_at(QQmlListProperty< */ void QDeclarativeGeoRoute::segments_clear(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop) { - static_cast<QDeclarativeGeoRoute*>(prop->object)->clearSegments(); + static_cast<QDeclarativeGeoRoute *>(prop->object)->clearSegments(); } /*! \internal */ -void QDeclarativeGeoRoute::appendSegment(QDeclarativeGeoRouteSegment* segment) +void QDeclarativeGeoRoute::appendSegment(QDeclarativeGeoRouteSegment *segment) { segments_.append(segment); } diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h index 89be9505..16fddb3f 100644 --- a/src/imports/location/qdeclarativegeoroute_p.h +++ b/src/imports/location/qdeclarativegeoroute_p.h @@ -67,27 +67,27 @@ public: QDeclarativeGeoRoute(const QGeoRoute &route, QObject *parent = 0); ~QDeclarativeGeoRoute(); - QDeclarativeGeoBoundingBox* bounds() const; + QDeclarativeGeoBoundingBox *bounds() const; int travelTime() const; qreal distance() const; QQmlListProperty<QDeclarativeCoordinate> path(); QQmlListProperty<QDeclarativeGeoRouteSegment> segments(); - void appendPath(QDeclarativeCoordinate* coordinate); + void appendPath(QDeclarativeCoordinate *coordinate); void clearPath(); - void appendSegment(QDeclarativeGeoRouteSegment* segment); + void appendSegment(QDeclarativeGeoRouteSegment *segment); void clearSegments(); private: 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 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 QDeclarativeGeoRouteSegment *segments_at(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop, int index); static void segments_clear(QQmlListProperty<QDeclarativeGeoRouteSegment> *prop); void init(); @@ -95,8 +95,8 @@ private: QGeoRoute route_; QDeclarativeGeoBoundingBox *bounds_; - QList<QDeclarativeCoordinate*> path_; - QList<QDeclarativeGeoRouteSegment*> segments_; + QList<QDeclarativeCoordinate *> path_; + QList<QDeclarativeGeoRouteSegment *> segments_; friend class QDeclarativeRouteMapItem; }; diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index f157f387..f378ed27 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -215,7 +215,7 @@ void QDeclarativeGeoRouteModel::abortRequest() If you access out of bounds, a zero (null object) is returned and a warning is issued. */ -QDeclarativeGeoRoute* QDeclarativeGeoRouteModel::get(int index) +QDeclarativeGeoRoute *QDeclarativeGeoRouteModel::get(int index) { if (index < 0 || index >= routes_.count()) { qmlInfo(this) << tr("Error, invalid index for get(): ") << index; @@ -330,7 +330,7 @@ void QDeclarativeGeoRouteModel::queryDetailsChanged() \sa Plugin */ -QDeclarativeGeoServiceProvider* QDeclarativeGeoRouteModel::plugin() const +QDeclarativeGeoServiceProvider *QDeclarativeGeoRouteModel::plugin() const { return plugin_; } @@ -338,7 +338,7 @@ QDeclarativeGeoServiceProvider* QDeclarativeGeoRouteModel::plugin() const /*! \internal */ -void QDeclarativeGeoRouteModel::setQuery(QDeclarativeGeoRouteQuery* query) +void QDeclarativeGeoRouteModel::setQuery(QDeclarativeGeoRouteQuery *query) { if (!query || query == routeQuery_) return; @@ -361,7 +361,7 @@ void QDeclarativeGeoRouteModel::setQuery(QDeclarativeGeoRouteQuery* query) preferences (means of traveling, things to avoid on route etc). */ -QDeclarativeGeoRouteQuery* QDeclarativeGeoRouteModel::query() const +QDeclarativeGeoRouteQuery *QDeclarativeGeoRouteModel::query() const { return routeQuery_; } @@ -732,7 +732,7 @@ QQmlListProperty<QDeclarativeCoordinate> QDeclarativeGeoRouteQuery::waypoints() void QDeclarativeGeoRouteQuery::waypoints_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *waypoint) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); model->addWaypoint(waypoint); } @@ -741,16 +741,16 @@ void QDeclarativeGeoRouteQuery::waypoints_append(QQmlListProperty<QDeclarativeCo */ int QDeclarativeGeoRouteQuery::waypoints_count(QQmlListProperty<QDeclarativeCoordinate> *prop) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); return model->waypoints_.count(); } /*! \internal */ -QDeclarativeCoordinate* QDeclarativeGeoRouteQuery::waypoints_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) +QDeclarativeCoordinate *QDeclarativeGeoRouteQuery::waypoints_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); Q_ASSERT(index < model->waypoints_.count()); return model->waypoints_.at(index); } @@ -760,7 +760,7 @@ QDeclarativeCoordinate* QDeclarativeGeoRouteQuery::waypoints_at(QQmlListProperty */ void QDeclarativeGeoRouteQuery::waypoints_clear(QQmlListProperty<QDeclarativeCoordinate> *prop) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); model->clearWaypoints(); } @@ -787,7 +787,7 @@ QQmlListProperty<QDeclarativeGeoBoundingBox> QDeclarativeGeoRouteQuery::excluded */ void QDeclarativeGeoRouteQuery::exclusions_append(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, QDeclarativeGeoBoundingBox *area) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); model->addExcludedArea(area); } @@ -796,16 +796,16 @@ void QDeclarativeGeoRouteQuery::exclusions_append(QQmlListProperty<QDeclarativeG */ int QDeclarativeGeoRouteQuery::exclusions_count(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); return model->exclusions_.count(); } /*! \internal */ -QDeclarativeGeoBoundingBox* QDeclarativeGeoRouteQuery::exclusions_at(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, int index) +QDeclarativeGeoBoundingBox *QDeclarativeGeoRouteQuery::exclusions_at(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, int index) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); Q_ASSERT(index < model->exclusions_.count()); return model->exclusions_.at(index); } @@ -815,7 +815,7 @@ QDeclarativeGeoBoundingBox* QDeclarativeGeoRouteQuery::exclusions_at(QQmlListPro */ void QDeclarativeGeoRouteQuery::exclusions_clear(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop) { - QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery*>(prop->object); + QDeclarativeGeoRouteQuery *model = static_cast<QDeclarativeGeoRouteQuery *>(prop->object); model->clearExcludedAreas(); } @@ -829,7 +829,7 @@ void QDeclarativeGeoRouteQuery::exclusions_clear(QQmlListProperty<QDeclarativeGe */ -void QDeclarativeGeoRouteQuery::addExcludedArea(QDeclarativeGeoBoundingBox* area) +void QDeclarativeGeoRouteQuery::addExcludedArea(QDeclarativeGeoBoundingBox *area) { if (!area) return; @@ -857,7 +857,7 @@ void QDeclarativeGeoRouteQuery::addExcludedArea(QDeclarativeGeoBoundingBox* area \sa addExcludedArea, clearExcludedAreas */ -void QDeclarativeGeoRouteQuery::removeExcludedArea(QDeclarativeGeoBoundingBox* area) +void QDeclarativeGeoRouteQuery::removeExcludedArea(QDeclarativeGeoBoundingBox *area) { if (!area) return; @@ -901,7 +901,7 @@ void QDeclarativeGeoRouteQuery::clearExcludedAreas() \sa removeWaypoint, clearWaypoints */ -void QDeclarativeGeoRouteQuery::addWaypoint(QDeclarativeCoordinate* waypoint) +void QDeclarativeGeoRouteQuery::addWaypoint(QDeclarativeCoordinate *waypoint) { if (!waypoint) { qmlInfo(this) << tr("Not adding null waypoint."); @@ -936,7 +936,7 @@ void QDeclarativeGeoRouteQuery::addWaypoint(QDeclarativeCoordinate* waypoint) \sa addWaypoint, clearWaypoints */ -void QDeclarativeGeoRouteQuery::removeWaypoint(QDeclarativeCoordinate* waypoint) +void QDeclarativeGeoRouteQuery::removeWaypoint(QDeclarativeCoordinate *waypoint) { if (!waypoint) return; @@ -1234,7 +1234,7 @@ void QDeclarativeGeoRouteQuery::setRouteOptimizations(QDeclarativeGeoRouteQuery: /*! \internal */ -QGeoRouteRequest& QDeclarativeGeoRouteQuery::routeRequest() +QGeoRouteRequest &QDeclarativeGeoRouteQuery::routeRequest() { // Bit inefficient, but waypoint and excludearea count is not big QList<QGeoCoordinate> waypoints; @@ -1252,9 +1252,9 @@ QGeoRouteRequest& QDeclarativeGeoRouteQuery::routeRequest() /*! \internal */ -void QDeclarativeGeoRouteQuery::waypointDestroyed(QObject* object) +void QDeclarativeGeoRouteQuery::waypointDestroyed(QObject *object) { - const int index = waypoints_.indexOf(static_cast<QDeclarativeCoordinate*>(object)); + const int index = waypoints_.indexOf(static_cast<QDeclarativeCoordinate *>(object)); if (index >= 0) { waypoints_.removeAt(index); diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h index 0e62ef87..d5b00430 100644 --- a/src/imports/location/qdeclarativegeoroutemodel_p.h +++ b/src/imports/location/qdeclarativegeoroutemodel_p.h @@ -70,7 +70,7 @@ class QDeclarativeGeoRouteModel : public QAbstractListModel, public QQmlParserSt Q_ENUMS(RouteError) Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged) - Q_PROPERTY(QDeclarativeGeoRouteQuery* query READ query WRITE setQuery NOTIFY queryChanged) + Q_PROPERTY(QDeclarativeGeoRouteQuery *query READ query WRITE setQuery NOTIFY queryChanged) Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(bool autoUpdate READ autoUpdate WRITE setAutoUpdate NOTIFY autoUpdateChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) @@ -111,10 +111,10 @@ public: QVariant data(const QModelIndex &index, int role) const; void setPlugin(QDeclarativeGeoServiceProvider *plugin); - QDeclarativeGeoServiceProvider* plugin() const; + QDeclarativeGeoServiceProvider *plugin() const; - void setQuery(QDeclarativeGeoRouteQuery* query); - QDeclarativeGeoRouteQuery* query() const; + void setQuery(QDeclarativeGeoRouteQuery *query); + QDeclarativeGeoRouteQuery *query() const; void setAutoUpdate(bool autoUpdate); bool autoUpdate() const; @@ -124,7 +124,7 @@ public: RouteError error() const; int count() const; - Q_INVOKABLE QDeclarativeGeoRoute* get(int index); + Q_INVOKABLE QDeclarativeGeoRoute *get(int index); Q_INVOKABLE void reset(); Q_INVOKABLE void cancel(); @@ -161,7 +161,7 @@ private: QDeclarativeGeoRouteQuery *routeQuery_; QGeoRouteReply *reply_; - QList<QDeclarativeGeoRoute*> routes_; + QList<QDeclarativeGeoRoute *> routes_; bool autoUpdate_; Status status_; QString errorString_; @@ -201,7 +201,7 @@ public: void classBegin() {} void componentComplete(); - QGeoRouteRequest& routeRequest(); + QGeoRouteRequest &routeRequest(); enum TravelMode { CarTravel = QGeoRouteRequest::CarTravel, @@ -264,12 +264,12 @@ public: QQmlListProperty<QDeclarativeCoordinate> waypoints(); QQmlListProperty<QDeclarativeGeoBoundingBox> excludedAreas(); - Q_INVOKABLE void addWaypoint(QDeclarativeCoordinate* waypoint); - Q_INVOKABLE void removeWaypoint(QDeclarativeCoordinate* waypoint); + Q_INVOKABLE void addWaypoint(QDeclarativeCoordinate *waypoint); + Q_INVOKABLE void removeWaypoint(QDeclarativeCoordinate *waypoint); Q_INVOKABLE void clearWaypoints(); - Q_INVOKABLE void addExcludedArea(QDeclarativeGeoBoundingBox* area); - Q_INVOKABLE void removeExcludedArea(QDeclarativeGeoBoundingBox* area); + Q_INVOKABLE void addExcludedArea(QDeclarativeGeoBoundingBox *area); + Q_INVOKABLE void removeExcludedArea(QDeclarativeGeoBoundingBox *area); Q_INVOKABLE void clearExcludedAreas(); Q_INVOKABLE void setFeatureWeight(FeatureType featureType, FeatureWeight featureWeight); @@ -307,22 +307,22 @@ Q_SIGNALS: void queryDetailsChanged(); private Q_SLOTS: - void waypointDestroyed(QObject* object); + void waypointDestroyed(QObject *object); private: 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 QDeclarativeCoordinate *waypoints_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); static void waypoints_clear(QQmlListProperty<QDeclarativeCoordinate> *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 QDeclarativeGeoBoundingBox *exclusions_at(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop, int index); static void exclusions_clear(QQmlListProperty<QDeclarativeGeoBoundingBox> *prop); - QList<QDeclarativeCoordinate*> waypoints_; - QList<QDeclarativeGeoBoundingBox*> exclusions_; + QList<QDeclarativeCoordinate *> waypoints_; + QList<QDeclarativeGeoBoundingBox *> exclusions_; QGeoRouteRequest request_; bool complete_; diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index 0d262761..31d41602 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -126,7 +126,7 @@ qreal QDeclarativeGeoRouteSegment::distance() const of this route segment. */ -QDeclarativeGeoManeuver* QDeclarativeGeoRouteSegment::maneuver() const +QDeclarativeGeoManeuver *QDeclarativeGeoRouteSegment::maneuver() const { return maneuver_; } @@ -154,22 +154,22 @@ QQmlListProperty<QDeclarativeCoordinate> QDeclarativeGeoRouteSegment::path() void QDeclarativeGeoRouteSegment::path_append(QQmlListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate) { - static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.append(coordinate); + static_cast<QDeclarativeGeoRouteSegment *>(prop->object)->path_.append(coordinate); } int QDeclarativeGeoRouteSegment::path_count(QQmlListProperty<QDeclarativeCoordinate> *prop) { - return static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.count(); + return static_cast<QDeclarativeGeoRouteSegment *>(prop->object)->path_.count(); } -QDeclarativeCoordinate* QDeclarativeGeoRouteSegment::path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) +QDeclarativeCoordinate *QDeclarativeGeoRouteSegment::path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index) { - return static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.at(index); + return static_cast<QDeclarativeGeoRouteSegment *>(prop->object)->path_.at(index); } void QDeclarativeGeoRouteSegment::path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop) { - static_cast<QDeclarativeGeoRouteSegment*>(prop->object)->path_.clear(); + static_cast<QDeclarativeGeoRouteSegment *>(prop->object)->path_.clear(); } #include "moc_qdeclarativegeoroutesegment_p.cpp" diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h index 43e26fb2..ae09e98b 100644 --- a/src/imports/location/qdeclarativegeoroutesegment_p.h +++ b/src/imports/location/qdeclarativegeoroutesegment_p.h @@ -56,7 +56,7 @@ class QDeclarativeGeoRouteSegment : public QObject Q_PROPERTY(int travelTime READ travelTime CONSTANT) Q_PROPERTY(qreal distance READ distance CONSTANT) Q_PROPERTY(QQmlListProperty<QDeclarativeCoordinate> path READ path) - Q_PROPERTY(QDeclarativeGeoManeuver* maneuver READ maneuver CONSTANT) + Q_PROPERTY(QDeclarativeGeoManeuver *maneuver READ maneuver CONSTANT) public: explicit QDeclarativeGeoRouteSegment(QObject *parent = 0); @@ -66,17 +66,17 @@ public: int travelTime() const; qreal distance() const; QQmlListProperty<QDeclarativeCoordinate> path(); - QDeclarativeGeoManeuver* maneuver() const; + QDeclarativeGeoManeuver *maneuver() const; private: 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 QDeclarativeCoordinate *path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); QGeoRouteSegment segment_; QDeclarativeGeoManeuver *maneuver_; - QList<QDeclarativeCoordinate*> path_; + QList<QDeclarativeCoordinate *> path_; }; QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index c53cc93d..886fb5f5 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -458,7 +458,7 @@ QQmlListProperty<QDeclarativeGeoServiceProviderParameter> QDeclarativeGeoService */ void QDeclarativeGeoServiceProvider::parameter_append(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, QDeclarativeGeoServiceProviderParameter *parameter) { - QDeclarativeGeoServiceProvider *p = static_cast<QDeclarativeGeoServiceProvider*>(prop->object); + QDeclarativeGeoServiceProvider *p = static_cast<QDeclarativeGeoServiceProvider *>(prop->object); p->parameters_.append(parameter); if (p->sharedProvider_) p->sharedProvider_->setParameters(p->parameterMap()); @@ -469,15 +469,15 @@ void QDeclarativeGeoServiceProvider::parameter_append(QQmlListProperty<QDeclarat */ int QDeclarativeGeoServiceProvider::parameter_count(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop) { - return static_cast<QDeclarativeGeoServiceProvider*>(prop->object)->parameters_.count(); + return static_cast<QDeclarativeGeoServiceProvider *>(prop->object)->parameters_.count(); } /*! \internal */ -QDeclarativeGeoServiceProviderParameter* QDeclarativeGeoServiceProvider::parameter_at(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index) +QDeclarativeGeoServiceProviderParameter *QDeclarativeGeoServiceProvider::parameter_at(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index) { - return static_cast<QDeclarativeGeoServiceProvider*>(prop->object)->parameters_[index]; + return static_cast<QDeclarativeGeoServiceProvider *>(prop->object)->parameters_[index]; } /*! @@ -485,7 +485,7 @@ QDeclarativeGeoServiceProviderParameter* QDeclarativeGeoServiceProvider::paramet */ void QDeclarativeGeoServiceProvider::parameter_clear(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop) { - QDeclarativeGeoServiceProvider *p = static_cast<QDeclarativeGeoServiceProvider*>(prop->object); + QDeclarativeGeoServiceProvider *p = static_cast<QDeclarativeGeoServiceProvider *>(prop->object); p->parameters_.clear(); if (p->sharedProvider_) p->sharedProvider_->setParameters(p->parameterMap()); diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h index d8d88169..46a02bc9 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider_p.h +++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h @@ -205,12 +205,12 @@ Q_SIGNALS: private: 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 QDeclarativeGeoServiceProviderParameter *parameter_at(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index); static void parameter_clear(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop); QGeoServiceProvider *sharedProvider_; QString name_; - QList<QDeclarativeGeoServiceProviderParameter*> parameters_; + QList<QDeclarativeGeoServiceProviderParameter *> parameters_; QDeclarativeGeoServiceProviderRequirements *required_; bool complete_; bool experimental_; diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 6b00076c..a07f8439 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -204,11 +204,11 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map) screenVertices_.reserve(ts.vertices.size()); if (ts.indices.type() == QVertexIndexVector::UnsignedInt) { - const quint32 *ix = reinterpret_cast<const quint32*>(ts.indices.data()); + const quint32 *ix = reinterpret_cast<const quint32 *>(ts.indices.data()); for (int i = 0; i < (ts.indices.size()/3*3); ++i) screenIndices_ << ix[i]; } else { - const quint16 *ix = reinterpret_cast<const quint16*>(ts.indices.data()); + const quint16 *ix = reinterpret_cast<const quint16 *>(ts.indices.data()); for (int i = 0; i < (ts.indices.size()/3*3); ++i) screenIndices_ << ix[i]; } @@ -244,7 +244,7 @@ void QDeclarativePolygonMapItem::handleBorderUpdated() */ void QDeclarativePolygonMapItem::updateAfterCoordinateChanged() { - QDeclarativeCoordinate *coord = qobject_cast<QDeclarativeCoordinate*>(QObject::sender()); + QDeclarativeCoordinate *coord = qobject_cast<QDeclarativeCoordinate *>(QObject::sender()); if (coord) { // TODO: maybe use a QHash instead of indexOf here? int idx = this->coordPath_.indexOf(coord); @@ -278,7 +278,7 @@ QDeclarativeMapLineProperties *QDeclarativePolygonMapItem::border() /*! \internal */ -void QDeclarativePolygonMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) +void QDeclarativePolygonMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { @@ -308,7 +308,7 @@ QQmlListProperty<QDeclarativeCoordinate> QDeclarativePolygonMapItem::declarative void QDeclarativePolygonMapItem::path_append( QQmlListProperty<QDeclarativeCoordinate> *property, QDeclarativeCoordinate *coordinate) { - QDeclarativePolygonMapItem *item = qobject_cast<QDeclarativePolygonMapItem*>(property->object); + QDeclarativePolygonMapItem *item = qobject_cast<QDeclarativePolygonMapItem *>(property->object); item->coordPath_.append(coordinate); item->path_.append(coordinate->coordinate()); @@ -327,16 +327,16 @@ void QDeclarativePolygonMapItem::path_append( int QDeclarativePolygonMapItem::path_count( QQmlListProperty<QDeclarativeCoordinate> *property) { - return qobject_cast<QDeclarativePolygonMapItem*>(property->object)->coordPath_.count(); + return qobject_cast<QDeclarativePolygonMapItem *>(property->object)->coordPath_.count(); } /*! \internal */ -QDeclarativeCoordinate* QDeclarativePolygonMapItem::path_at( +QDeclarativeCoordinate *QDeclarativePolygonMapItem::path_at( QQmlListProperty<QDeclarativeCoordinate> *property, int index) { - return qobject_cast<QDeclarativePolygonMapItem*>(property->object)->coordPath_.at(index); + return qobject_cast<QDeclarativePolygonMapItem *>(property->object)->coordPath_.at(index); } /*! @@ -345,7 +345,7 @@ QDeclarativeCoordinate* QDeclarativePolygonMapItem::path_at( void QDeclarativePolygonMapItem::path_clear( QQmlListProperty<QDeclarativeCoordinate> *property) { - QDeclarativePolygonMapItem *item = qobject_cast<QDeclarativePolygonMapItem*>( + QDeclarativePolygonMapItem *item = qobject_cast<QDeclarativePolygonMapItem *>( property->object); qDeleteAll(item->coordPath_); item->coordPath_.clear(); @@ -364,7 +364,7 @@ void QDeclarativePolygonMapItem::path_clear( \sa removeCoordinate, path */ -void QDeclarativePolygonMapItem::addCoordinate(QDeclarativeCoordinate* coordinate) +void QDeclarativePolygonMapItem::addCoordinate(QDeclarativeCoordinate *coordinate) { coordPath_.append(coordinate); path_.append(coordinate->coordinate()); @@ -388,7 +388,7 @@ void QDeclarativePolygonMapItem::addCoordinate(QDeclarativeCoordinate* coordinat */ -void QDeclarativePolygonMapItem::removeCoordinate(QDeclarativeCoordinate* coordinate) +void QDeclarativePolygonMapItem::removeCoordinate(QDeclarativeCoordinate *coordinate) { int index = coordPath_.lastIndexOf(coordinate); @@ -440,10 +440,10 @@ void QDeclarativePolygonMapItem::setColor(const QColor &color) /*! \internal */ -QSGNode* QDeclarativePolygonMapItem::updateMapItemPaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) +QSGNode *QDeclarativePolygonMapItem::updateMapItemPaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_UNUSED(data); - MapPolygonNode *node = static_cast<MapPolygonNode*>(oldNode); + MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode); if (!node) node = new MapPolygonNode(); @@ -475,7 +475,7 @@ void QDeclarativePolygonMapItem::updateMapItem() borderGeometry_.updateSourcePoints(*map(), closedPath); borderGeometry_.updateScreenPoints(*map(), border_.width()); - QList<QGeoMapItemGeometry*> geoms; + QList<QGeoMapItemGeometry *> geoms; geoms << &geometry_ << &borderGeometry_; QRectF combined = QGeoMapItemGeometry::translateToCommonOrigin(geoms); @@ -584,7 +584,7 @@ bool MapPolygonNode::isSubtreeBlocked() const /*! \internal */ -void MapPolygonNode::update(const QColor& fillColor, const QColor& borderColor, +void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor, const QGeoMapItemGeometry *fillShape, const QGeoMapItemGeometry *borderShape) { diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h index 6cb53aa7..9059e7cd 100644 --- a/src/imports/location/qdeclarativepolygonmapitem_p.h +++ b/src/imports/location/qdeclarativepolygonmapitem_p.h @@ -80,12 +80,12 @@ public: explicit QDeclarativePolygonMapItem(QQuickItem *parent = 0); ~QDeclarativePolygonMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); - Q_INVOKABLE void addCoordinate(QDeclarativeCoordinate* coordinate); - Q_INVOKABLE void removeCoordinate(QDeclarativeCoordinate* coordinate); + Q_INVOKABLE void addCoordinate(QDeclarativeCoordinate *coordinate); + Q_INVOKABLE void removeCoordinate(QDeclarativeCoordinate *coordinate); QQmlListProperty<QDeclarativeCoordinate> declarativePath(); @@ -113,13 +113,13 @@ private Q_SLOTS: private: 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 QDeclarativeCoordinate *path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); void pathPropertyChanged(); private: QDeclarativeMapLineProperties border_; - QList<QDeclarativeCoordinate*> coordPath_; + QList<QDeclarativeCoordinate *> coordPath_; QList<QGeoCoordinate> path_; QColor color_; bool dirtyMaterial_; @@ -136,7 +136,7 @@ public: MapPolygonNode(); ~MapPolygonNode(); - void update(const QColor& fillColor, const QColor& borderColor, + void update(const QColor &fillColor, const QColor &borderColor, const QGeoMapItemGeometry *fillShape, const QGeoMapItemGeometry *borderShape); diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index d2cce34d..46526a97 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -447,7 +447,7 @@ void QDeclarativePolylineMapItem::updateAfterLinePropertiesChanged() */ void QDeclarativePolylineMapItem::updateAfterCoordinateChanged() { - QDeclarativeCoordinate *coord = qobject_cast<QDeclarativeCoordinate*>(QObject::sender()); + QDeclarativeCoordinate *coord = qobject_cast<QDeclarativeCoordinate *>(QObject::sender()); if (coord) { // TODO: maybe use a QHash instead of indexOf here? int idx = this->coordPath_.indexOf(coord); @@ -460,7 +460,7 @@ void QDeclarativePolylineMapItem::updateAfterCoordinateChanged() /*! \internal */ -void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) +void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { @@ -488,7 +488,7 @@ QQmlListProperty<QDeclarativeCoordinate> QDeclarativePolylineMapItem::declarativ void QDeclarativePolylineMapItem::path_append(QQmlListProperty<QDeclarativeCoordinate> *property, QDeclarativeCoordinate *coordinate) { - QDeclarativePolylineMapItem *item = qobject_cast<QDeclarativePolylineMapItem*>( + QDeclarativePolylineMapItem *item = qobject_cast<QDeclarativePolylineMapItem *>( property->object); QObject::connect(coordinate, SIGNAL(coordinateChanged(QGeoCoordinate)), @@ -507,16 +507,16 @@ void QDeclarativePolylineMapItem::path_append(QQmlListProperty<QDeclarativeCoord int QDeclarativePolylineMapItem::path_count( QQmlListProperty<QDeclarativeCoordinate> *property) { - return qobject_cast<QDeclarativePolylineMapItem*>(property->object)->coordPath_.count(); + return qobject_cast<QDeclarativePolylineMapItem *>(property->object)->coordPath_.count(); } /*! \internal */ -QDeclarativeCoordinate* QDeclarativePolylineMapItem::path_at( +QDeclarativeCoordinate *QDeclarativePolylineMapItem::path_at( QQmlListProperty<QDeclarativeCoordinate> *property, int index) { - return qobject_cast<QDeclarativePolylineMapItem*>(property->object)->coordPath_.at(index); + return qobject_cast<QDeclarativePolylineMapItem *>(property->object)->coordPath_.at(index); } /*! @@ -525,7 +525,7 @@ QDeclarativeCoordinate* QDeclarativePolylineMapItem::path_at( void QDeclarativePolylineMapItem::path_clear( QQmlListProperty<QDeclarativeCoordinate> *property) { - QDeclarativePolylineMapItem *item = qobject_cast<QDeclarativePolylineMapItem*>( + QDeclarativePolylineMapItem *item = qobject_cast<QDeclarativePolylineMapItem *>( property->object); qDeleteAll(item->coordPath_); item->coordPath_.clear(); @@ -543,7 +543,7 @@ void QDeclarativePolylineMapItem::path_clear( \sa removeCoordinate, path */ -void QDeclarativePolylineMapItem::addCoordinate(QDeclarativeCoordinate* coordinate) +void QDeclarativePolylineMapItem::addCoordinate(QDeclarativeCoordinate *coordinate) { coordPath_.append(coordinate); path_.append(coordinate->coordinate()); @@ -565,7 +565,7 @@ void QDeclarativePolylineMapItem::addCoordinate(QDeclarativeCoordinate* coordina \sa addCoordinate, path */ -void QDeclarativePolylineMapItem::removeCoordinate(QDeclarativeCoordinate* coordinate) +void QDeclarativePolylineMapItem::removeCoordinate(QDeclarativeCoordinate *coordinate) { int index = coordPath_.lastIndexOf(coordinate); @@ -654,11 +654,11 @@ void QDeclarativePolylineMapItem::updateMapItem() /*! \internal */ -QSGNode* QDeclarativePolylineMapItem::updateMapItemPaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) +QSGNode *QDeclarativePolylineMapItem::updateMapItemPaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_UNUSED(data); - MapPolylineNode *node = static_cast<MapPolylineNode*>(oldNode); + MapPolylineNode *node = static_cast<MapPolylineNode *>(oldNode); if (!node) { node = new MapPolylineNode(); @@ -732,8 +732,8 @@ bool MapPolylineNode::isSubtreeBlocked() const /*! \internal */ -void MapPolylineNode::update(const QColor& fillColor, - const QGeoMapItemGeometry* shape) +void MapPolylineNode::update(const QColor &fillColor, + const QGeoMapItemGeometry *shape) { if (shape->size() == 0) { blocked_ = true; diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h index 64e81829..bbff6f3c 100644 --- a/src/imports/location/qdeclarativepolylinemapitem_p.h +++ b/src/imports/location/qdeclarativepolylinemapitem_p.h @@ -105,12 +105,12 @@ public: explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); ~QDeclarativePolylineMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); - Q_INVOKABLE void addCoordinate(QDeclarativeCoordinate* coordinate); - Q_INVOKABLE void removeCoordinate(QDeclarativeCoordinate* coordinate); + Q_INVOKABLE void addCoordinate(QDeclarativeCoordinate *coordinate); + Q_INVOKABLE void removeCoordinate(QDeclarativeCoordinate *coordinate); QQmlListProperty<QDeclarativeCoordinate> declarativePath(); @@ -118,7 +118,7 @@ public: QDeclarativeMapLineProperties *line(); - inline QList<QDeclarativeCoordinate*> &path() { return coordPath_; } + inline QList<QDeclarativeCoordinate *> &path() { return coordPath_; } void dragEnded(); Q_SIGNALS: @@ -133,13 +133,13 @@ protected Q_SLOTS: private: 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 QDeclarativeCoordinate *path_at(QQmlListProperty<QDeclarativeCoordinate> *prop, int index); static void path_clear(QQmlListProperty<QDeclarativeCoordinate> *prop); void pathPropertyChanged(); private: QDeclarativeMapLineProperties line_; - QList<QDeclarativeCoordinate*> coordPath_; + QList<QDeclarativeCoordinate *> coordPath_; QList<QGeoCoordinate> path_; QColor color_; bool dirtyMaterial_; @@ -155,7 +155,7 @@ public: MapPolylineNode(); ~MapPolylineNode(); - void update(const QColor& fillColor, const QGeoMapItemGeometry *shape); + void update(const QColor &fillColor, const QGeoMapItemGeometry *shape); bool isSubtreeBlocked() const; private: diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index f241e1c0..600eab6c 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE */ -QDeclarativePosition::QDeclarativePosition(QObject* parent) +QDeclarativePosition::QDeclarativePosition(QObject *parent) : QObject(parent), m_latitudeValid(false), m_longitudeValid(false), m_altitudeValid(false), m_speed(-1), m_speedValid(false), m_horizontalAccuracyValid(false), m_verticalAccuracyValid(false), m_horizontalAccuracy(-1), m_verticalAccuracy(-1) @@ -143,7 +143,7 @@ void QDeclarativePosition::setCoordinate(const QGeoCoordinate &coordinate) emit coordinateChanged(); } -QDeclarativeCoordinate* QDeclarativePosition::coordinate() +QDeclarativeCoordinate *QDeclarativePosition::coordinate() { return &m_coordinate; } @@ -332,7 +332,7 @@ bool QDeclarativePosition::isVerticalAccuracyValid() const It is a read-only property. */ -void QDeclarativePosition::setTimestamp(const QDateTime& timestamp) +void QDeclarativePosition::setTimestamp(const QDateTime ×tamp) { if (timestamp == m_timestamp) return; diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h index 2b22945b..31f39048 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/location/qdeclarativeposition_p.h @@ -64,7 +64,7 @@ class QDeclarativePosition : public QObject Q_PROPERTY(bool latitudeValid READ isLatitudeValid NOTIFY latitudeValidChanged) Q_PROPERTY(bool longitudeValid READ isLongitudeValid NOTIFY longitudeValidChanged) Q_PROPERTY(bool altitudeValid READ isAltitudeValid NOTIFY altitudeValidChanged) - Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate NOTIFY coordinateChanged) + Q_PROPERTY(QDeclarativeCoordinate *coordinate READ coordinate NOTIFY coordinateChanged) Q_PROPERTY(QDateTime timestamp READ timestamp NOTIFY timestampChanged) Q_PROPERTY(double speed READ speed NOTIFY speedChanged) Q_PROPERTY(bool speedValid READ isSpeedValid NOTIFY speedValidChanged) @@ -75,19 +75,19 @@ class QDeclarativePosition : public QObject public: - explicit QDeclarativePosition(QObject* parent = 0); + explicit QDeclarativePosition(QObject *parent = 0); ~QDeclarativePosition(); bool isLatitudeValid() const; bool isLongitudeValid() const; bool isAltitudeValid() const; QDateTime timestamp() const; - void setTimestamp(const QDateTime& timestamp); + void setTimestamp(const QDateTime ×tamp); double speed() const; void setSpeed(double speed); bool isSpeedValid() const; - void setCoordinate(QDeclarativeCoordinate* coordinate); - QDeclarativeCoordinate* coordinate(); + void setCoordinate(QDeclarativeCoordinate *coordinate); + QDeclarativeCoordinate *coordinate(); bool isHorizontalAccuracyValid() const; qreal horizontalAccuracy() const; void setHorizontalAccuracy(qreal horizontalAccuracy); diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index 4e05d6d8..4b9b8e03 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -198,7 +198,7 @@ bool QDeclarativePositionSource::isValid() const /*! \internal */ -void QDeclarativePositionSource::setNmeaSource(const QUrl& nmeaSource) +void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource) { // Strip the filename. This is clumsy but the file may be prefixed in several // ways: "file:///", "qrc:///", "/", "" in platform dependant manner. @@ -237,7 +237,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl& nmeaSource) qDebug() << "QDeclarativePositionSource NMEA File was found: " << localFileName; #endif m_positionSource = new QNmeaPositionInfoSource(QNmeaPositionInfoSource::SimulationMode); - (qobject_cast<QNmeaPositionInfoSource*>(m_positionSource))->setDevice(m_nmeaFile); + (qobject_cast<QNmeaPositionInfoSource *>(m_positionSource))->setDevice(m_nmeaFile); connect(m_positionSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdateReceived(QGeoPositionInfo))); if (m_active && !m_singleUpdate) { @@ -312,7 +312,7 @@ int QDeclarativePositionSource::updateInterval() const if (m_positionSource) { int ival = m_positionSource->updateInterval(); if (m_updateInterval != ival) { - QDeclarativePositionSource *me = const_cast<QDeclarativePositionSource*>(this); + QDeclarativePositionSource *me = const_cast<QDeclarativePositionSource *>(this); me->m_updateInterval = ival; emit me->updateIntervalChanged(); } @@ -526,12 +526,12 @@ bool QDeclarativePositionSource::isActive() const \sa start, stop, update */ -QDeclarativePosition* QDeclarativePositionSource::position() +QDeclarativePosition *QDeclarativePositionSource::position() { return &m_position; } -void QDeclarativePositionSource::positionUpdateReceived(const QGeoPositionInfo& update) +void QDeclarativePositionSource::positionUpdateReceived(const QGeoPositionInfo &update) { if (update.isValid()) { m_position.setTimestamp(update.timestamp()); diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/location/qdeclarativepositionsource_p.h index f7619ab2..bfdd1e83 100644 --- a/src/imports/location/qdeclarativepositionsource_p.h +++ b/src/imports/location/qdeclarativepositionsource_p.h @@ -57,7 +57,7 @@ class QDeclarativePositionSource : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativePosition* position READ position NOTIFY positionChanged) + Q_PROPERTY(QDeclarativePosition *position READ position NOTIFY positionChanged) Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) Q_PROPERTY(bool valid READ isValid NOTIFY validityChanged) Q_PROPERTY(QUrl nmeaSource READ nmeaSource WRITE setNmeaSource NOTIFY nmeaSourceChanged) @@ -89,7 +89,7 @@ public: QDeclarativePositionSource(); ~QDeclarativePositionSource(); - void setNmeaSource(const QUrl& nmeaSource); + void setNmeaSource(const QUrl &nmeaSource); void setUpdateInterval(int updateInterval); void setActive(bool active); void setPreferredPositioningMethods(QGeoPositionInfoSource::PositioningMethods methods); @@ -101,7 +101,7 @@ public: int updateInterval() const; bool isActive() const; bool isValid() const; - QDeclarativePosition* position(); + QDeclarativePosition *position(); PositioningMethods supportedPositioningMethods() const; PositioningMethods preferredPositioningMethods() const; SourceError sourceError() const; @@ -124,7 +124,7 @@ Q_SIGNALS: private Q_SLOTS: - void positionUpdateReceived(const QGeoPositionInfo& update); + void positionUpdateReceived(const QGeoPositionInfo &update); void sourceErrorReceived(const QGeoPositionInfoSource::Error error); private: QGeoPositionInfoSource *m_positionSource; diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp index bcbc3c67..05cd9b8a 100644 --- a/src/imports/location/qdeclarativerectanglemapitem.cpp +++ b/src/imports/location/qdeclarativerectanglemapitem.cpp @@ -175,7 +175,7 @@ QDeclarativeRectangleMapItem::~QDeclarativeRectangleMapItem() /*! \internal */ -void QDeclarativeRectangleMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) +void QDeclarativeRectangleMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { @@ -223,7 +223,7 @@ void QDeclarativeRectangleMapItem::setTopLeft(QDeclarativeCoordinate *topLeft) emit topLeftChanged(topLeft_); } -QDeclarativeCoordinate* QDeclarativeRectangleMapItem::topLeft() +QDeclarativeCoordinate *QDeclarativeRectangleMapItem::topLeft() { return topLeft_; } @@ -260,7 +260,7 @@ void QDeclarativeRectangleMapItem::setBottomRight(QDeclarativeCoordinate *bottom emit bottomRightChanged(bottomRight_); } -QDeclarativeCoordinate* QDeclarativeRectangleMapItem::bottomRight() +QDeclarativeCoordinate *QDeclarativeRectangleMapItem::bottomRight() { return bottomRight_; } @@ -299,11 +299,11 @@ void QDeclarativeRectangleMapItem::setColor(const QColor &color) /*! \internal */ -QSGNode* QDeclarativeRectangleMapItem::updateMapItemPaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) +QSGNode *QDeclarativeRectangleMapItem::updateMapItemPaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_UNUSED(data); - MapPolygonNode *node = static_cast<MapPolygonNode*>(oldNode); + MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode); if (!node) { node = new MapPolygonNode(); @@ -347,7 +347,7 @@ void QDeclarativeRectangleMapItem::updateMapItem() borderGeometry_.updateSourcePoints(*map(), pathClosed); borderGeometry_.updateScreenPoints(*map(), border_.width()); - QList<QGeoMapItemGeometry*> geoms; + QList<QGeoMapItemGeometry *> geoms; geoms << &geometry_ << &borderGeometry_; QRectF combined = QGeoMapItemGeometry::translateToCommonOrigin(geoms); diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h index 1005e7b9..89db675c 100644 --- a/src/imports/location/qdeclarativerectanglemapitem_p.h +++ b/src/imports/location/qdeclarativerectanglemapitem_p.h @@ -68,8 +68,8 @@ class QDeclarativeRectangleMapItem: public QDeclarativeGeoMapItemBase { Q_OBJECT - Q_PROPERTY(QDeclarativeCoordinate* topLeft READ topLeft WRITE setTopLeft NOTIFY topLeftChanged) - Q_PROPERTY(QDeclarativeCoordinate* bottomRight READ bottomRight WRITE setBottomRight NOTIFY bottomRightChanged) + Q_PROPERTY(QDeclarativeCoordinate *topLeft READ topLeft WRITE setTopLeft NOTIFY topLeftChanged) + Q_PROPERTY(QDeclarativeCoordinate *bottomRight READ bottomRight WRITE setBottomRight NOTIFY bottomRightChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QDeclarativeMapLineProperties *border READ border) @@ -77,14 +77,14 @@ public: explicit QDeclarativeRectangleMapItem(QQuickItem *parent = 0); ~QDeclarativeRectangleMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); - QDeclarativeCoordinate* topLeft(); + QDeclarativeCoordinate *topLeft(); void setTopLeft(QDeclarativeCoordinate *center); - QDeclarativeCoordinate* bottomRight(); + QDeclarativeCoordinate *bottomRight(); void setBottomRight(QDeclarativeCoordinate *center); QColor color() const; diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index ae76b78f..a1ef03d6 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -109,7 +109,7 @@ void QDeclarativeRouteMapItem::updateAfterLinePropertiesChanged() /*! \internal */ -void QDeclarativeRouteMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) +void QDeclarativeRouteMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { @@ -123,7 +123,7 @@ void QDeclarativeRouteMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map Holds the route to be drawn which can be used to represents one geographical route. */ -QDeclarativeGeoRoute* QDeclarativeRouteMapItem::route() const +QDeclarativeGeoRoute *QDeclarativeRouteMapItem::route() const { return route_; } @@ -150,11 +150,11 @@ void QDeclarativeRouteMapItem::setRoute(QDeclarativeGeoRoute *route) /*! \internal */ -QSGNode* QDeclarativeRouteMapItem::updateMapItemPaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) +QSGNode *QDeclarativeRouteMapItem::updateMapItemPaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_UNUSED(data); - MapPolylineNode *node = static_cast<MapPolylineNode*>(oldNode); + MapPolylineNode *node = static_cast<MapPolylineNode *>(oldNode); if (!node) { node = new MapPolylineNode(); diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h index 535687d7..64522306 100644 --- a/src/imports/location/qdeclarativeroutemapitem_p.h +++ b/src/imports/location/qdeclarativeroutemapitem_p.h @@ -57,18 +57,18 @@ class QDeclarativeRouteMapItem : public QDeclarativeGeoMapItemBase { Q_OBJECT - Q_PROPERTY(QDeclarativeGeoRoute* route READ route WRITE setRoute NOTIFY routeChanged) + Q_PROPERTY(QDeclarativeGeoRoute *route READ route WRITE setRoute NOTIFY routeChanged) Q_PROPERTY(QDeclarativeMapLineProperties *line READ line CONSTANT) public: explicit QDeclarativeRouteMapItem(QQuickItem *parent = 0); ~QDeclarativeRouteMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); - QDeclarativeGeoRoute* route() const; + QDeclarativeGeoRoute *route() const; void setRoute(QDeclarativeGeoRoute *route); QDeclarativeMapLineProperties *line(); diff --git a/src/imports/location/qgeomapitemgeometry_p.h b/src/imports/location/qgeomapitemgeometry_p.h index 202f1090..57e0dbc9 100644 --- a/src/imports/location/qgeomapitemgeometry_p.h +++ b/src/imports/location/qgeomapitemgeometry_p.h @@ -112,7 +112,7 @@ public: void allocateAndFill(QSGGeometry *geom) const; - static QRectF translateToCommonOrigin(const QList<QGeoMapItemGeometry*> &geoms); + static QRectF translateToCommonOrigin(const QList<QGeoMapItemGeometry *> &geoms); protected: bool sourceDirty_, screenDirty_; |