summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativecategory.cpp4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativecategory_p.h8
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeperiod_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplace.cpp26
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplace_p.h18
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h5
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeratings.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeratings_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeresultmodelbase.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp10
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h6
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupplier.cpp2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupplier_p.h6
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp6
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h2
-rw-r--r--src/imports/location/location.cpp2
-rw-r--r--src/imports/location/mapnode.cpp2
-rw-r--r--src/imports/location/qdeclarativecirclemapitem.cpp12
-rw-r--r--src/imports/location/qdeclarativecirclemapitem_p.h8
-rw-r--r--src/imports/location/qdeclarativecoordinate.cpp8
-rw-r--r--src/imports/location/qdeclarativecoordinate_p.h6
-rw-r--r--src/imports/location/qdeclarativegeoaddress.cpp22
-rw-r--r--src/imports/location/qdeclarativegeoaddress_p.h22
-rw-r--r--src/imports/location/qdeclarativegeoboundingbox.cpp14
-rw-r--r--src/imports/location/qdeclarativegeoboundingbox_p.h36
-rw-r--r--src/imports/location/qdeclarativegeoboundingcircle.cpp4
-rw-r--r--src/imports/location/qdeclarativegeoboundingcircle_p.h12
-rw-r--r--src/imports/location/qdeclarativegeocodemodel.cpp34
-rw-r--r--src/imports/location/qdeclarativegeocodemodel_p.h18
-rw-r--r--src/imports/location/qdeclarativegeolocation.cpp2
-rw-r--r--src/imports/location/qdeclarativegeolocation_p.h8
-rw-r--r--src/imports/location/qdeclarativegeomaneuver.cpp4
-rw-r--r--src/imports/location/qdeclarativegeomaneuver_p.h8
-rw-r--r--src/imports/location/qdeclarativegeomap.cpp48
-rw-r--r--src/imports/location/qdeclarativegeomap_p.h42
-rw-r--r--src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h1
-rw-r--r--src/imports/location/qdeclarativegeomapflickable_p.h6
-rw-r--r--src/imports/location/qdeclarativegeomapgesturearea.cpp4
-rw-r--r--src/imports/location/qdeclarativegeomapgesturearea_p.h10
-rw-r--r--src/imports/location/qdeclarativegeomapitembase.cpp8
-rw-r--r--src/imports/location/qdeclarativegeomapitembase_p.h8
-rw-r--r--src/imports/location/qdeclarativegeomapitemview.cpp20
-rw-r--r--src/imports/location/qdeclarativegeomapitemview_p.h10
-rw-r--r--src/imports/location/qdeclarativegeomapmousearea.cpp44
-rw-r--r--src/imports/location/qdeclarativegeomapmousearea_p.h6
-rw-r--r--src/imports/location/qdeclarativegeomapmouseevent.cpp2
-rw-r--r--src/imports/location/qdeclarativegeomapmouseevent_p.h4
-rw-r--r--src/imports/location/qdeclarativegeomappincharea_p.h8
-rw-r--r--src/imports/location/qdeclarativegeomapquickitem.cpp12
-rw-r--r--src/imports/location/qdeclarativegeomapquickitem_p.h12
-rw-r--r--src/imports/location/qdeclarativegeomaptype.cpp2
-rw-r--r--src/imports/location/qdeclarativegeomaptype_p.h2
-rw-r--r--src/imports/location/qdeclarativegeoroute.cpp26
-rw-r--r--src/imports/location/qdeclarativegeoroute_p.h14
-rw-r--r--src/imports/location/qdeclarativegeoroutemodel.cpp42
-rw-r--r--src/imports/location/qdeclarativegeoroutemodel_p.h32
-rw-r--r--src/imports/location/qdeclarativegeoroutesegment.cpp12
-rw-r--r--src/imports/location/qdeclarativegeoroutesegment_p.h8
-rw-r--r--src/imports/location/qdeclarativegeoserviceprovider.cpp10
-rw-r--r--src/imports/location/qdeclarativegeoserviceprovider_p.h4
-rw-r--r--src/imports/location/qdeclarativepolygonmapitem.cpp30
-rw-r--r--src/imports/location/qdeclarativepolygonmapitem_p.h12
-rw-r--r--src/imports/location/qdeclarativepolylinemapitem.cpp26
-rw-r--r--src/imports/location/qdeclarativepolylinemapitem_p.h14
-rw-r--r--src/imports/location/qdeclarativeposition.cpp6
-rw-r--r--src/imports/location/qdeclarativeposition_p.h10
-rw-r--r--src/imports/location/qdeclarativepositionsource.cpp10
-rw-r--r--src/imports/location/qdeclarativepositionsource_p.h8
-rw-r--r--src/imports/location/qdeclarativerectanglemapitem.cpp12
-rw-r--r--src/imports/location/qdeclarativerectanglemapitem_p.h10
-rw-r--r--src/imports/location/qdeclarativeroutemapitem.cpp8
-rw-r--r--src/imports/location/qdeclarativeroutemapitem_p.h6
-rw-r--r--src/imports/location/qgeomapitemgeometry_p.h2
-rw-r--r--src/location/maps/qcache3q_p.h6
-rw-r--r--src/location/maps/qdoublevector2d.cpp4
-rw-r--r--src/location/maps/qdoublevector2d_p.h8
-rw-r--r--src/location/maps/qdoublevector3d.cpp18
-rw-r--r--src/location/maps/qdoublevector3d_p.h30
-rw-r--r--src/location/maps/qgeocameracapabilities.cpp6
-rw-r--r--src/location/maps/qgeocameracapabilities_p.h2
-rw-r--r--src/location/maps/qgeocameradata.cpp6
-rw-r--r--src/location/maps/qgeocameradata_p.h2
-rw-r--r--src/location/maps/qgeocodereply.h2
-rw-r--r--src/location/maps/qgeocodereply_p.h2
-rw-r--r--src/location/maps/qgeocodingmanager.cpp10
-rw-r--r--src/location/maps/qgeocodingmanager.h10
-rw-r--r--src/location/maps/qgeocodingmanagerengine.cpp10
-rw-r--r--src/location/maps/qgeocodingmanagerengine.h10
-rw-r--r--src/location/maps/qgeomaneuver.cpp2
-rw-r--r--src/location/maps/qgeomaneuver.h2
-rw-r--r--src/location/maps/qgeomap.cpp4
-rw-r--r--src/location/maps/qgeomap_p.h4
-rw-r--r--src/location/maps/qgeomapdata.cpp8
-rw-r--r--src/location/maps/qgeomapdata_p.h4
-rw-r--r--src/location/maps/qgeomapdata_p_p.h4
-rw-r--r--src/location/maps/qgeomappingmanager.h2
-rw-r--r--src/location/maps/qgeomappingmanagerengine.h2
-rw-r--r--src/location/maps/qgeomapscene.cpp6
-rw-r--r--src/location/maps/qgeomaptype.cpp2
-rw-r--r--src/location/maps/qgeomaptype.h2
-rw-r--r--src/location/maps/qgeomaptype_p.h2
-rw-r--r--src/location/maps/qgeoroute.cpp2
-rw-r--r--src/location/maps/qgeoroute.h2
-rw-r--r--src/location/maps/qgeorouterequest.cpp2
-rw-r--r--src/location/maps/qgeorouterequest.h2
-rw-r--r--src/location/maps/qgeoroutesegment.cpp2
-rw-r--r--src/location/maps/qgeoroutesegment.h2
-rw-r--r--src/location/maps/qgeoroutingmanager.cpp8
-rw-r--r--src/location/maps/qgeoroutingmanager.h8
-rw-r--r--src/location/maps/qgeoroutingmanagerengine.cpp8
-rw-r--r--src/location/maps/qgeoroutingmanagerengine.h8
-rw-r--r--src/location/maps/qgeoserviceprovider.cpp8
-rw-r--r--src/location/maps/qgeoserviceprovider.h6
-rw-r--r--src/location/maps/qgeoserviceproviderfactory.cpp8
-rw-r--r--src/location/maps/qgeoserviceproviderfactory.h6
-rw-r--r--src/location/maps/qgeotilecache_p.h2
-rw-r--r--src/location/maps/qgeotiledmapdata.cpp4
-rw-r--r--src/location/maps/qgeotiledmapdata_p.h2
-rw-r--r--src/location/maps/qgeotiledmapdata_p_p.h2
-rw-r--r--src/location/maps/qgeotiledmappingmanagerengine.cpp22
-rw-r--r--src/location/maps/qgeotiledmappingmanagerengine.h4
-rw-r--r--src/location/maps/qgeotiledmappingmanagerengine_p.h6
-rw-r--r--src/location/maps/qgeotiledmapreply_p.h2
-rw-r--r--src/location/maps/qgeotilefetcher.cpp2
-rw-r--r--src/location/maps/qgeotilefetcher.h2
-rw-r--r--src/location/maps/qgeotilefetcher_p.h2
-rw-r--r--src/location/maps/qgeotilerequestmanager.cpp4
-rw-r--r--src/location/maps/qgeotilespec.cpp4
-rw-r--r--src/location/maps/qgeotilespec.h2
-rw-r--r--src/location/maps/qgeotilespec_p.h2
-rw-r--r--src/location/places/placemacro.h14
-rw-r--r--src/location/places/qplace.cpp6
-rw-r--r--src/location/places/qplace.h2
-rw-r--r--src/location/places/qplaceattribute_p.h2
-rw-r--r--src/location/places/qplacecontent.h4
-rw-r--r--src/location/places/qplacecontent_p.h14
-rw-r--r--src/location/places/qplacecontentrequest.cpp4
-rw-r--r--src/location/places/qplacecontentrequest.h2
-rw-r--r--src/location/places/qplaceicon.cpp2
-rw-r--r--src/location/places/qplacemanager.cpp4
-rw-r--r--src/location/places/qplacemanagerengine.cpp2
-rw-r--r--src/location/places/qplacematchrequest.cpp4
-rw-r--r--src/location/places/qplacematchrequest.h2
-rw-r--r--src/location/places/qplacesearchrequest.cpp4
-rw-r--r--src/location/places/qplacesearchrequest.h2
-rw-r--r--src/location/qgeoareamonitor_polling.cpp2
-rw-r--r--src/location/qgeoboundingbox.cpp4
-rw-r--r--src/location/qgeoboundingbox.h4
-rw-r--r--src/location/qgeoboundingcircle.cpp2
-rw-r--r--src/location/qgeoboundingcircle.h2
-rw-r--r--src/location/qgeopositioninfosource.cpp2
-rw-r--r--src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp4
-rw-r--r--src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp4
-rw-r--r--src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp2
-rw-r--r--src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeocodexmlparser.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qgeocodexmlparser.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp16
-rw-r--r--src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h10
-rw-r--r--src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h4
-rw-r--r--src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qgeomapreply_nokia.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h4
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp4
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutexmlparser.h4
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp10
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h6
-rw-r--r--src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp16
-rw-r--r--src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h6
-rw-r--r--src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp4
-rw-r--r--src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h4
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp14
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h14
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h2
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h2
-rw-r--r--src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp6
-rw-r--r--src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h6
-rw-r--r--src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp22
-rw-r--r--src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h4
-rw-r--r--src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp34
-rw-r--r--src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h22
-rw-r--r--src/plugins/position/maemo/dbuscomm_maemo.cpp30
-rw-r--r--src/plugins/position/maemo/dbuscomm_maemo_p.h10
-rw-r--r--src/plugins/position/maemo/dbusserver_maemo.cpp4
-rw-r--r--src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp12
-rw-r--r--src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h6
-rw-r--r--src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp2
-rw-r--r--src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h4
-rw-r--r--src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp4
-rw-r--r--src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h4
-rw-r--r--src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp4
-rw-r--r--src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h6
209 files changed, 811 insertions, 813 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 &center, 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 &timestamp)
{
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 &timestamp);
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_;
diff --git a/src/location/maps/qcache3q_p.h b/src/location/maps/qcache3q_p.h
index 4f8554eb..c7932e82 100644
--- a/src/location/maps/qcache3q_p.h
+++ b/src/location/maps/qcache3q_p.h
@@ -149,7 +149,7 @@ private:
Queue *q2_; // regular nodes, promoted from newbies, evicted LRU
Queue *q3_; // "hobos": evicted from q2 but were very popular (above mean)
Queue *q1_evicted_; // ghosts of recently evicted newbies and regulars
- QHash<Key, Node*> lookup_;
+ QHash<Key, Node *> lookup_;
public:
explicit QCache3Q(int maxCost = 100, int minRecent = -1, int maxOldPopular = -1);
@@ -393,11 +393,11 @@ template <class Key, class T, class EvPolicy>
QSharedPointer<T> QCache3Q<Key,T,EvPolicy>::object(const Key &key) const
{
if (!lookup_.contains(key)) {
- const_cast<QCache3Q<Key,T,EvPolicy>*>(this)->missCount_++;
+ const_cast<QCache3Q<Key,T,EvPolicy> *>(this)->missCount_++;
return QSharedPointer<T>(0);
}
- QCache3Q<Key,T,EvPolicy> *me = const_cast<QCache3Q<Key,T,EvPolicy>*>(this);
+ QCache3Q<Key,T,EvPolicy> *me = const_cast<QCache3Q<Key,T,EvPolicy> *>(this);
Node *n = me->lookup_[key];
n->pop++;
diff --git a/src/location/maps/qdoublevector2d.cpp b/src/location/maps/qdoublevector2d.cpp
index 369739c2..0b5f3450 100644
--- a/src/location/maps/qdoublevector2d.cpp
+++ b/src/location/maps/qdoublevector2d.cpp
@@ -46,7 +46,7 @@
QT_BEGIN_NAMESPACE
-QDoubleVector2D::QDoubleVector2D(const QDoubleVector3D& vector)
+QDoubleVector2D::QDoubleVector2D(const QDoubleVector3D &vector)
{
xp = vector.xp;
yp = vector.yp;
@@ -89,7 +89,7 @@ void QDoubleVector2D::normalize()
yp /= len;
}
-double QDoubleVector2D::dotProduct(const QDoubleVector2D& v1, const QDoubleVector2D& v2)
+double QDoubleVector2D::dotProduct(const QDoubleVector2D &v1, const QDoubleVector2D &v2)
{
return v1.xp * v2.xp + v1.yp * v2.yp;
}
diff --git a/src/location/maps/qdoublevector2d_p.h b/src/location/maps/qdoublevector2d_p.h
index 959e2ffe..5b8918ce 100644
--- a/src/location/maps/qdoublevector2d_p.h
+++ b/src/location/maps/qdoublevector2d_p.h
@@ -69,7 +69,7 @@ public:
QDoubleVector2D();
explicit QDoubleVector2D(const QVector2D &vector);
QDoubleVector2D(double xpos, double ypos);
- explicit QDoubleVector2D(const QDoubleVector3D& vector);
+ explicit QDoubleVector2D(const QDoubleVector3D &vector);
operator QVector2D() const;
@@ -93,7 +93,7 @@ public:
QDoubleVector2D &operator*=(const QDoubleVector2D &vector);
QDoubleVector2D &operator/=(double divisor);
- static double dotProduct(const QDoubleVector2D& v1, const QDoubleVector2D& v2);
+ static double dotProduct(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
friend inline bool operator==(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
friend inline bool operator!=(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
@@ -105,7 +105,7 @@ public:
friend inline const QDoubleVector2D operator-(const QDoubleVector2D &vector);
friend inline const QDoubleVector2D operator/(const QDoubleVector2D &vector, double divisor);
- friend inline bool qFuzzyCompare(const QDoubleVector2D& v1, const QDoubleVector2D& v2);
+ friend inline bool qFuzzyCompare(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
QDoubleVector3D toVector3D() const;
@@ -219,7 +219,7 @@ inline const QDoubleVector2D operator/(const QDoubleVector2D &vector, double div
return QDoubleVector2D(vector.xp / divisor, vector.yp / divisor);
}
-inline bool qFuzzyCompare(const QDoubleVector2D& v1, const QDoubleVector2D& v2)
+inline bool qFuzzyCompare(const QDoubleVector2D &v1, const QDoubleVector2D &v2)
{
return qFuzzyCompare(v1.xp, v2.xp) && qFuzzyCompare(v1.yp, v2.yp);
}
diff --git a/src/location/maps/qdoublevector3d.cpp b/src/location/maps/qdoublevector3d.cpp
index 081cb1c6..3f9a99f9 100644
--- a/src/location/maps/qdoublevector3d.cpp
+++ b/src/location/maps/qdoublevector3d.cpp
@@ -46,14 +46,14 @@
QT_BEGIN_NAMESPACE
-QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D& vector)
+QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D &vector)
{
xp = vector.xp;
yp = vector.yp;
zp = 0.0;
}
-QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D& vector, double zpos)
+QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D &vector, double zpos)
{
xp = vector.xp;
yp = vector.yp;
@@ -90,44 +90,44 @@ void QDoubleVector3D::normalize()
zp /= len;
}
-double QDoubleVector3D::dotProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+double QDoubleVector3D::dotProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
{
return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp;
}
-QDoubleVector3D QDoubleVector3D::crossProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+QDoubleVector3D QDoubleVector3D::crossProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
{
return QDoubleVector3D(v1.yp * v2.zp - v1.zp * v2.yp,
v1.zp * v2.xp - v1.xp * v2.zp,
v1.xp * v2.yp - v1.yp * v2.xp);
}
-QDoubleVector3D QDoubleVector3D::normal(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+QDoubleVector3D QDoubleVector3D::normal(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
{
return crossProduct(v1, v2).normalized();
}
QDoubleVector3D QDoubleVector3D::normal
- (const QDoubleVector3D& v1, const QDoubleVector3D& v2, const QDoubleVector3D& v3)
+ (const QDoubleVector3D &v1, const QDoubleVector3D &v2, const QDoubleVector3D &v3)
{
return crossProduct((v2 - v1), (v3 - v1)).normalized();
}
double QDoubleVector3D::distanceToPlane
- (const QDoubleVector3D& plane, const QDoubleVector3D& normal) const
+ (const QDoubleVector3D &plane, const QDoubleVector3D &normal) const
{
return dotProduct(*this - plane, normal);
}
double QDoubleVector3D::distanceToPlane
- (const QDoubleVector3D& plane1, const QDoubleVector3D& plane2, const QDoubleVector3D& plane3) const
+ (const QDoubleVector3D &plane1, const QDoubleVector3D &plane2, const QDoubleVector3D &plane3) const
{
QDoubleVector3D n = normal(plane2 - plane1, plane3 - plane1);
return dotProduct(*this - plane1, n);
}
double QDoubleVector3D::distanceToLine
- (const QDoubleVector3D& point, const QDoubleVector3D& direction) const
+ (const QDoubleVector3D &point, const QDoubleVector3D &direction) const
{
if (direction.isNull())
return (*this - point).length();
diff --git a/src/location/maps/qdoublevector3d_p.h b/src/location/maps/qdoublevector3d_p.h
index 539e5036..90ab0abd 100644
--- a/src/location/maps/qdoublevector3d_p.h
+++ b/src/location/maps/qdoublevector3d_p.h
@@ -69,8 +69,8 @@ public:
QDoubleVector3D();
QDoubleVector3D(double xpos, double ypos, double zpos);
explicit QDoubleVector3D(const QVector3D &vector);
- QDoubleVector3D(const QDoubleVector2D& vector);
- QDoubleVector3D(const QDoubleVector2D& vector, double zpos);
+ QDoubleVector3D(const QDoubleVector2D &vector);
+ QDoubleVector3D(const QDoubleVector2D &vector, double zpos);
operator QVector3D() const;
@@ -96,18 +96,18 @@ public:
QDoubleVector3D &operator+=(const QDoubleVector3D &vector);
QDoubleVector3D &operator-=(const QDoubleVector3D &vector);
QDoubleVector3D &operator*=(double factor);
- QDoubleVector3D &operator*=(const QDoubleVector3D& vector);
+ QDoubleVector3D &operator*=(const QDoubleVector3D &vector);
QDoubleVector3D &operator/=(double divisor);
- static double dotProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
- static QDoubleVector3D crossProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
- static QDoubleVector3D normal(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
+ static double dotProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
+ static QDoubleVector3D crossProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
+ static QDoubleVector3D normal(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
static QDoubleVector3D normal
- (const QDoubleVector3D& v1, const QDoubleVector3D& v2, const QDoubleVector3D& v3);
+ (const QDoubleVector3D &v1, const QDoubleVector3D &v2, const QDoubleVector3D &v3);
- double distanceToPlane(const QDoubleVector3D& plane, const QDoubleVector3D& normal) const;
- double distanceToPlane(const QDoubleVector3D& plane1, const QDoubleVector3D& plane2, const QDoubleVector3D& plane3) const;
- double distanceToLine(const QDoubleVector3D& point, const QDoubleVector3D& direction) const;
+ double distanceToPlane(const QDoubleVector3D &plane, const QDoubleVector3D &normal) const;
+ double distanceToPlane(const QDoubleVector3D &plane1, const QDoubleVector3D &plane2, const QDoubleVector3D &plane3) const;
+ double distanceToLine(const QDoubleVector3D &point, const QDoubleVector3D &direction) const;
friend inline bool operator==(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
friend inline bool operator!=(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
@@ -115,11 +115,11 @@ public:
friend inline const QDoubleVector3D operator-(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
friend inline const QDoubleVector3D operator*(double factor, const QDoubleVector3D &vector);
friend inline const QDoubleVector3D operator*(const QDoubleVector3D &vector, double factor);
- friend const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D& v2);
+ friend const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
friend inline const QDoubleVector3D operator-(const QDoubleVector3D &vector);
friend inline const QDoubleVector3D operator/(const QDoubleVector3D &vector, double divisor);
- friend inline bool qFuzzyCompare(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
+ friend inline bool qFuzzyCompare(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
QDoubleVector2D toVector2D() const;
@@ -210,7 +210,7 @@ inline QDoubleVector3D &QDoubleVector3D::operator*=(double factor)
return *this;
}
-inline QDoubleVector3D &QDoubleVector3D::operator*=(const QDoubleVector3D& vector)
+inline QDoubleVector3D &QDoubleVector3D::operator*=(const QDoubleVector3D &vector)
{
xp *= vector.xp;
yp *= vector.yp;
@@ -256,7 +256,7 @@ inline const QDoubleVector3D operator*(const QDoubleVector3D &vector, double fac
return QDoubleVector3D(vector.xp * factor, vector.yp * factor, vector.zp * factor);
}
-inline const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D& v2)
+inline const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
{
return QDoubleVector3D(v1.xp * v2.xp, v1.yp * v2.yp, v1.zp * v2.zp);
}
@@ -271,7 +271,7 @@ inline const QDoubleVector3D operator/(const QDoubleVector3D &vector, double div
return QDoubleVector3D(vector.xp / divisor, vector.yp / divisor, vector.zp / divisor);
}
-inline bool qFuzzyCompare(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+inline bool qFuzzyCompare(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
{
return qFuzzyCompare(v1.xp, v2.xp) &&
qFuzzyCompare(v1.yp, v2.yp) &&
diff --git a/src/location/maps/qgeocameracapabilities.cpp b/src/location/maps/qgeocameracapabilities.cpp
index ab938abb..0e6494b8 100644
--- a/src/location/maps/qgeocameracapabilities.cpp
+++ b/src/location/maps/qgeocameracapabilities.cpp
@@ -52,7 +52,7 @@ public:
QGeoCameraCapabilitiesPrivate(const QGeoCameraCapabilitiesPrivate &other);
~QGeoCameraCapabilitiesPrivate();
- QGeoCameraCapabilitiesPrivate& operator = (const QGeoCameraCapabilitiesPrivate &other);
+ QGeoCameraCapabilitiesPrivate &operator = (const QGeoCameraCapabilitiesPrivate &other);
bool supportsBearing_;
bool supportsRolling_;
@@ -91,7 +91,7 @@ QGeoCameraCapabilitiesPrivate::QGeoCameraCapabilitiesPrivate(const QGeoCameraCap
QGeoCameraCapabilitiesPrivate::~QGeoCameraCapabilitiesPrivate() {}
-QGeoCameraCapabilitiesPrivate& QGeoCameraCapabilitiesPrivate::operator = (const QGeoCameraCapabilitiesPrivate &other)
+QGeoCameraCapabilitiesPrivate &QGeoCameraCapabilitiesPrivate::operator = (const QGeoCameraCapabilitiesPrivate &other)
{
if (this == &other)
return *this;
@@ -144,7 +144,7 @@ QGeoCameraCapabilities::~QGeoCameraCapabilities() {}
Assigns the contents of \a other to this camera capabilities object and
returns a reference to this camera capabilities object.
*/
-QGeoCameraCapabilities& QGeoCameraCapabilities::operator = (const QGeoCameraCapabilities &other)
+QGeoCameraCapabilities &QGeoCameraCapabilities::operator = (const QGeoCameraCapabilities &other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeocameracapabilities_p.h b/src/location/maps/qgeocameracapabilities_p.h
index b9b17ed7..ef7ef8bf 100644
--- a/src/location/maps/qgeocameracapabilities_p.h
+++ b/src/location/maps/qgeocameracapabilities_p.h
@@ -67,7 +67,7 @@ public:
QGeoCameraCapabilities(const QGeoCameraCapabilities &other);
~QGeoCameraCapabilities();
- QGeoCameraCapabilities& operator = (const QGeoCameraCapabilities &other);
+ QGeoCameraCapabilities &operator = (const QGeoCameraCapabilities &other);
void setMinimumZoomLevel(double minimumZoomLevel);
double minimumZoomLevel() const;
diff --git a/src/location/maps/qgeocameradata.cpp b/src/location/maps/qgeocameradata.cpp
index f9d2d4bf..a54bafba 100644
--- a/src/location/maps/qgeocameradata.cpp
+++ b/src/location/maps/qgeocameradata.cpp
@@ -57,7 +57,7 @@ public:
QGeoCameraDataPrivate();
QGeoCameraDataPrivate(const QGeoCameraDataPrivate &rhs);
- QGeoCameraDataPrivate& operator = (const QGeoCameraDataPrivate &rhs);
+ QGeoCameraDataPrivate &operator = (const QGeoCameraDataPrivate &rhs);
bool operator == (const QGeoCameraDataPrivate &rhs) const;
@@ -87,7 +87,7 @@ QGeoCameraDataPrivate::QGeoCameraDataPrivate(const QGeoCameraDataPrivate &rhs)
zoomLevel_(rhs.zoomLevel_),
interpolator_(rhs.interpolator_) {}
-QGeoCameraDataPrivate& QGeoCameraDataPrivate::operator = (const QGeoCameraDataPrivate &rhs)
+QGeoCameraDataPrivate &QGeoCameraDataPrivate::operator = (const QGeoCameraDataPrivate &rhs)
{
if (this == &rhs)
return *this;
@@ -156,7 +156,7 @@ QGeoCameraData::~QGeoCameraData()
{
}
-QGeoCameraData& QGeoCameraData::operator = (const QGeoCameraData &other)
+QGeoCameraData &QGeoCameraData::operator = (const QGeoCameraData &other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeocameradata_p.h b/src/location/maps/qgeocameradata_p.h
index 46822a3a..013dd6b0 100644
--- a/src/location/maps/qgeocameradata_p.h
+++ b/src/location/maps/qgeocameradata_p.h
@@ -73,7 +73,7 @@ public:
QGeoCameraData(const QGeoCameraData &other);
~QGeoCameraData();
- QGeoCameraData& operator = (const QGeoCameraData &other);
+ QGeoCameraData &operator = (const QGeoCameraData &other);
bool operator == (const QGeoCameraData &other) const;
bool operator != (const QGeoCameraData &other) const;
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index 41b50c95..5a988cb4 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
void error(QGeocodeReply::Error error, const QString &errorString = QString());
protected:
- QGeocodeReply(QObject* parent = 0);
+ QGeocodeReply(QObject *parent = 0);
void setError(Error error, const QString &errorString);
void setFinished(bool finished);
diff --git a/src/location/maps/qgeocodereply_p.h b/src/location/maps/qgeocodereply_p.h
index 35bf67f9..3e32ddd4 100644
--- a/src/location/maps/qgeocodereply_p.h
+++ b/src/location/maps/qgeocodereply_p.h
@@ -67,7 +67,7 @@ class QGeocodeReplyPrivate
{
public:
QGeocodeReplyPrivate();
- QGeocodeReplyPrivate(QGeocodeReply::Error error, const QString& errorString);
+ QGeocodeReplyPrivate(QGeocodeReply::Error error, const QString &errorString);
~QGeocodeReplyPrivate();
QGeocodeReply::Error error;
diff --git a/src/location/maps/qgeocodingmanager.cpp b/src/location/maps/qgeocodingmanager.cpp
index 8f68db72..a9917dc2 100644
--- a/src/location/maps/qgeocodingmanager.cpp
+++ b/src/location/maps/qgeocodingmanager.cpp
@@ -173,7 +173,7 @@ int QGeocodingManager::managerVersion() const
QGeocodingManager::error(), QGeocodeReply::finished() or
QGeocodeReply::error() with deleteLater().
*/
-QGeocodeReply* QGeocodingManager::geocode(const QGeoAddress &address, const QGeoBoundingArea &bounds)
+QGeocodeReply *QGeocodingManager::geocode(const QGeoAddress &address, const QGeoBoundingArea &bounds)
{
// if (!d_ptr->engine)
// return new QGeocodeReply(QGeocodeReply::EngineNotSetError, "The geocoding manager was not created with a valid engine.", this);
@@ -218,7 +218,7 @@ QGeocodeReply* QGeocodingManager::geocode(const QGeoAddress &address, const QGeo
QGeocodingManager::error(), QGeocodeReply::finished() or
QGeocodeReply::error() with deleteLater().
*/
-QGeocodeReply* QGeocodingManager::reverseGeocode(const QGeoCoordinate &coordinate, const QGeoBoundingArea &bounds)
+QGeocodeReply *QGeocodingManager::reverseGeocode(const QGeoCoordinate &coordinate, const QGeoBoundingArea &bounds)
{
// if (!d_ptr->engine)
// return new QGeocodeReply(QGeocodeReply::EngineNotSetError, "The geocoding manager was not created with a valid engine.", this);
@@ -255,7 +255,7 @@ QGeocodeReply* QGeocodingManager::reverseGeocode(const QGeoCoordinate &coordinat
QGeocodingManager::error(), QGeocodeReply::finished() or
QGeocodeReply::error() with deleteLater().
*/
-QGeocodeReply* QGeocodingManager::geocode(const QString &address,
+QGeocodeReply *QGeocodingManager::geocode(const QString &address,
int limit,
int offset,
const QGeoBoundingArea &bounds)
@@ -293,7 +293,7 @@ QLocale QGeocodingManager::locale() const
}
/*!
-\fn void QGeocodingManager::finished(QGeocodeReply* reply)
+\fn void QGeocodingManager::finished(QGeocodeReply *reply)
This signal is emitted when \a reply has finished processing.
@@ -308,7 +308,7 @@ QLocale QGeocodingManager::locale() const
*/
/*!
-\fn void QGeocodingManager::error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString)
+\fn void QGeocodingManager::error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString)
This signal is emitted when an error has been detected in the processing of
\a reply. The QGeocodingManager::finished() signal will probably follow.
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index 7d7f9c5d..b5ef6abb 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -69,22 +69,22 @@ public:
QString managerName() const;
int managerVersion() const;
- QGeocodeReply* geocode(const QGeoAddress &address,
+ QGeocodeReply *geocode(const QGeoAddress &address,
const QGeoBoundingArea &bounds = QGeoBoundingArea());
- QGeocodeReply* geocode(const QString &searchString,
+ QGeocodeReply *geocode(const QString &searchString,
int limit = -1,
int offset = 0,
const QGeoBoundingArea &bounds = QGeoBoundingArea());
- QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate,
+ QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
const QGeoBoundingArea &bounds = QGeoBoundingArea());
void setLocale(const QLocale &locale);
QLocale locale() const;
Q_SIGNALS:
- void finished(QGeocodeReply* reply);
- void error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString = QString());
+ void finished(QGeocodeReply *reply);
+ void error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString = QString());
private:
QGeocodingManager(QGeocodingManagerEngine *engine, QObject *parent = 0);
diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp
index 2dc5f316..471f971b 100644
--- a/src/location/maps/qgeocodingmanagerengine.cpp
+++ b/src/location/maps/qgeocodingmanagerengine.cpp
@@ -174,7 +174,7 @@ int QGeocodingManagerEngine::managerVersion() const
QGeocodingManagerEngine::error(), QGeocodeReply::finished() or
QGeocodeReply::error() with deleteLater().
*/
-QGeocodeReply* QGeocodingManagerEngine::geocode(const QGeoAddress &address,
+QGeocodeReply *QGeocodingManagerEngine::geocode(const QGeoAddress &address,
const QGeoBoundingArea &bounds)
{
Q_UNUSED(address)
@@ -219,7 +219,7 @@ QGeocodeReply* QGeocodingManagerEngine::geocode(const QGeoAddress &address,
QGeocodingManagerEngine::error(), QGeocodeReply::finished() or
QGeocodeReply::error() with deleteLater().
*/
-QGeocodeReply* QGeocodingManagerEngine::reverseGeocode(const QGeoCoordinate &coordinate,
+QGeocodeReply *QGeocodingManagerEngine::reverseGeocode(const QGeoCoordinate &coordinate,
const QGeoBoundingArea &bounds)
{
Q_UNUSED(coordinate)
@@ -257,7 +257,7 @@ QGeocodeReply* QGeocodingManagerEngine::reverseGeocode(const QGeoCoordinate &coo
QGeocodingManagerEngine::error(), QGeocodeReply::finished() or
QGeocodeReply::error() with deleteLater().
*/
-QGeocodeReply* QGeocodingManagerEngine::geocode(const QString &address,
+QGeocodeReply *QGeocodingManagerEngine::geocode(const QString &address,
int limit,
int offset,
const QGeoBoundingArea &bounds)
@@ -294,7 +294,7 @@ QLocale QGeocodingManagerEngine::locale() const
}
/*!
-\fn void QGeocodingManagerEngine::finished(QGeocodeReply* reply)
+\fn void QGeocodingManagerEngine::finished(QGeocodeReply *reply)
This signal is emitted when \a reply has finished processing.
@@ -309,7 +309,7 @@ QLocale QGeocodingManagerEngine::locale() const
*/
/*!
-\fn void QGeocodingManagerEngine::error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString)
+\fn void QGeocodingManagerEngine::error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString)
This signal is emitted when an error has been detected in the processing of
\a reply. The QGeocodingManagerEngine::finished() signal will probably follow.
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index 6e2bed6b..64f560bf 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -67,13 +67,13 @@ public:
QString managerName() const;
int managerVersion() const;
- virtual QGeocodeReply* geocode(const QGeoAddress &address,
+ virtual QGeocodeReply *geocode(const QGeoAddress &address,
const QGeoBoundingArea &bounds);
- virtual QGeocodeReply* geocode(const QString &address,
+ virtual QGeocodeReply *geocode(const QString &address,
int limit,
int offset,
const QGeoBoundingArea &bounds);
- virtual QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate,
+ virtual QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
const QGeoBoundingArea &bounds);
@@ -81,8 +81,8 @@ public:
QLocale locale() const;
Q_SIGNALS:
- void finished(QGeocodeReply* reply);
- void error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString = QString());
+ void finished(QGeocodeReply *reply);
+ void error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString = QString());
private:
void setManagerName(const QString &managerName);
diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 4a63d8b4..536bdb10 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -137,7 +137,7 @@ QGeoManeuver::~QGeoManeuver() {}
Assigns \a other to this maneuver object and then returns
a reference to this maneuver object.
*/
-QGeoManeuver& QGeoManeuver::operator= (const QGeoManeuver & other)
+QGeoManeuver &QGeoManeuver::operator= (const QGeoManeuver & other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 93ae7ff2..a9a5b08e 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -79,7 +79,7 @@ public:
QGeoManeuver(const QGeoManeuver &other);
~QGeoManeuver();
- QGeoManeuver& operator= (const QGeoManeuver &other);
+ QGeoManeuver &operator= (const QGeoManeuver &other);
bool operator== (const QGeoManeuver &other) const;
bool operator!= (const QGeoManeuver &other) const;
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index b4ed8b18..7001c7c7 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -89,12 +89,12 @@ QGeoMap::~QGeoMap()
delete mapData_;
}
-QGeoMapController* QGeoMap::mapController()
+QGeoMapController *QGeoMap::mapController()
{
return mapData_->mapController();
}
-QGLCamera* QGeoMap::glCamera() const
+QGLCamera *QGeoMap::glCamera() const
{
return mapData_->glCamera();
}
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index 04a58672..34771fe4 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -85,9 +85,9 @@ public:
QGeoMap(QGeoMapData *mapData, QObject *parent = 0);
virtual ~QGeoMap();
- QGeoMapController* mapController();
+ QGeoMapController *mapController();
- QGLCamera* glCamera() const;
+ QGLCamera *glCamera() const;
void paintGL(QGLPainter *painter);
void resize(int width, int height);
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index fde4a1f9..955b426b 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -83,13 +83,13 @@ QGeoMapData::~QGeoMapData()
delete d_ptr;
}
-QGeoMapController* QGeoMapData::mapController()
+QGeoMapController *QGeoMapData::mapController()
{
Q_D(QGeoMapData);
return d->mapController();
}
-QGLCamera* QGeoMapData::glCamera() const
+QGLCamera *QGeoMapData::glCamera() const
{
Q_D(const QGeoMapData);
return d->glCamera();
@@ -227,14 +227,14 @@ void QGeoMapDataPrivate::setCoordinateInterpolator(QSharedPointer<QGeoCoordinate
coordinateInterpolator_ = interpolator;
}
-QGeoMapController* QGeoMapDataPrivate::mapController()
+QGeoMapController *QGeoMapDataPrivate::mapController()
{
if (!controller_)
controller_ = new QGeoMapController(map_, coordinateInterpolator_);
return controller_;
}
-QGLCamera* QGeoMapDataPrivate::glCamera() const
+QGLCamera *QGeoMapDataPrivate::glCamera() const
{
return camera_;
}
diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h
index 3a0ba8ce..42367ced 100644
--- a/src/location/maps/qgeomapdata_p.h
+++ b/src/location/maps/qgeomapdata_p.h
@@ -83,9 +83,9 @@ public:
QGeoMapData(QGeoMappingManagerEngine *engine, QObject *parent = 0);
virtual ~QGeoMapData();
- QGeoMapController* mapController();
+ QGeoMapController *mapController();
- QGLCamera* glCamera() const;
+ QGLCamera *glCamera() const;
virtual void paintGL(QGLPainter *painter) = 0;
void resize(int width, int height);
diff --git a/src/location/maps/qgeomapdata_p_p.h b/src/location/maps/qgeomapdata_p_p.h
index 8242d67c..cf6d2909 100644
--- a/src/location/maps/qgeomapdata_p_p.h
+++ b/src/location/maps/qgeomapdata_p_p.h
@@ -85,9 +85,9 @@ public:
QGeoMappingManagerEngine *engine() const;
- QGeoMapController* mapController();
+ QGeoMapController *mapController();
- QGLCamera* glCamera() const;
+ QGLCamera *glCamera() const;
void setCameraData(const QGeoCameraData &cameraData);
QGeoCameraData cameraData() const;
diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index e563a274..49fde85f 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -72,7 +72,7 @@ public:
QString managerName() const;
int managerVersion() const;
- QGeoMap* createMap(QObject *parent);
+ QGeoMap *createMap(QObject *parent);
QList<QGeoMapType> supportedMapTypes() const;
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index 45d56e5a..773cd3d5 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -78,7 +78,7 @@ public:
explicit QGeoMappingManagerEngine(QObject *parent = 0);
virtual ~QGeoMappingManagerEngine();
- virtual QGeoMapData* createMapData() = 0;
+ virtual QGeoMapData *createMapData() = 0;
QMap<QString, QVariant> parameters() const;
diff --git a/src/location/maps/qgeomapscene.cpp b/src/location/maps/qgeomapscene.cpp
index bb69c814..c8b39232 100644
--- a/src/location/maps/qgeomapscene.cpp
+++ b/src/location/maps/qgeomapscene.cpp
@@ -90,7 +90,7 @@ public:
// it is 1<<zoomLevel
int sideLength_;
- QHash<QGeoTileSpec, QGLSceneNode*> nodes_;
+ QHash<QGeoTileSpec, QGLSceneNode *> nodes_;
QHash<QGeoTileSpec, QSharedPointer<QGeoTileTexture> > textures_;
QList<QSharedPointer<QGeoTileTexture> > newUploads_;
@@ -207,13 +207,13 @@ QPointF QGeoMapScene::mercatorToScreenPosition(const QDoubleVector2D &mercator)
return d->mercatorToScreenPosition(mercator);
}
-QGLCamera* QGeoMapScene::camera() const
+QGLCamera *QGeoMapScene::camera() const
{
Q_D(const QGeoMapScene);
return d->camera_;
}
-QGLSceneNode* QGeoMapScene::sceneNode() const
+QGLSceneNode *QGeoMapScene::sceneNode() const
{
Q_D(const QGeoMapScene);
return d->sceneNode_;
diff --git a/src/location/maps/qgeomaptype.cpp b/src/location/maps/qgeomaptype.cpp
index 331b32c3..bfa99100 100644
--- a/src/location/maps/qgeomaptype.cpp
+++ b/src/location/maps/qgeomaptype.cpp
@@ -55,7 +55,7 @@ QGeoMapType::QGeoMapType(QGeoMapType::MapStyle style, const QString &name, const
QGeoMapType::~QGeoMapType() {}
-QGeoMapType& QGeoMapType::operator = (const QGeoMapType &other)
+QGeoMapType &QGeoMapType::operator = (const QGeoMapType &other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeomaptype.h b/src/location/maps/qgeomaptype.h
index d6b48211..82e21d6e 100644
--- a/src/location/maps/qgeomaptype.h
+++ b/src/location/maps/qgeomaptype.h
@@ -73,7 +73,7 @@ public:
QGeoMapType(MapStyle style, const QString &name, const QString &description, bool mobile, int mapId);
~QGeoMapType();
- QGeoMapType& operator = (const QGeoMapType &other);
+ QGeoMapType &operator = (const QGeoMapType &other);
bool operator == (const QGeoMapType &other) const;
bool operator != (const QGeoMapType &other) const;
diff --git a/src/location/maps/qgeomaptype_p.h b/src/location/maps/qgeomaptype_p.h
index 4cea4f3b..26cbb798 100644
--- a/src/location/maps/qgeomaptype_p.h
+++ b/src/location/maps/qgeomaptype_p.h
@@ -69,7 +69,7 @@ public:
QGeoMapTypePrivate(const QGeoMapTypePrivate &other);
~QGeoMapTypePrivate();
- QGeoMapTypePrivate& operator = (const QGeoMapTypePrivate &other);
+ QGeoMapTypePrivate &operator = (const QGeoMapTypePrivate &other);
bool operator == (const QGeoMapTypePrivate &other) const;
diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index bc8151e0..6614f7bc 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -95,7 +95,7 @@ QGeoRoute::~QGeoRoute()
Assigns the contents of \a other to this route and returns a reference to
this route.
*/
-QGeoRoute& QGeoRoute::operator= (const QGeoRoute & other)
+QGeoRoute &QGeoRoute::operator= (const QGeoRoute & other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index b24869d5..ea4d4cb1 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -67,7 +67,7 @@ public:
QGeoRoute(const QGeoRoute &other);
~QGeoRoute();
- QGeoRoute& operator = (const QGeoRoute &other);
+ QGeoRoute &operator = (const QGeoRoute &other);
bool operator == (const QGeoRoute &other) const;
bool operator != (const QGeoRoute &other) const;
diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp
index 1278cb51..26ae244b 100644
--- a/src/location/maps/qgeorouterequest.cpp
+++ b/src/location/maps/qgeorouterequest.cpp
@@ -255,7 +255,7 @@ QGeoRouteRequest::~QGeoRouteRequest() {}
Assigns \a other to this route request object and then returns a reference
to this route request object.
*/
-QGeoRouteRequest& QGeoRouteRequest::operator= (const QGeoRouteRequest & other)
+QGeoRouteRequest &QGeoRouteRequest::operator= (const QGeoRouteRequest & other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 0e6b0d8d..c903183a 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -119,7 +119,7 @@ public:
~QGeoRouteRequest();
- QGeoRouteRequest& operator= (const QGeoRouteRequest &other);
+ QGeoRouteRequest &operator= (const QGeoRouteRequest &other);
bool operator == (const QGeoRouteRequest &other) const;
bool operator != (const QGeoRouteRequest &other) const;
diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp
index 5264a5ac..dbf98e1a 100644
--- a/src/location/maps/qgeoroutesegment.cpp
+++ b/src/location/maps/qgeoroutesegment.cpp
@@ -96,7 +96,7 @@ QGeoRouteSegment::~QGeoRouteSegment() {}
Assigns \a other to this route segment object and then returns a
reference to this route segment object.
*/
-QGeoRouteSegment& QGeoRouteSegment::operator= (const QGeoRouteSegment & other)
+QGeoRouteSegment &QGeoRouteSegment::operator= (const QGeoRouteSegment & other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index abc808c2..6cbea455 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -64,7 +64,7 @@ public:
QGeoRouteSegment(const QGeoRouteSegment &other);
~QGeoRouteSegment();
- QGeoRouteSegment& operator= (const QGeoRouteSegment &other);
+ QGeoRouteSegment &operator= (const QGeoRouteSegment &other);
bool operator ==(const QGeoRouteSegment &other) const;
bool operator !=(const QGeoRouteSegment &other) const;
diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp
index e74bdbab..dde8187f 100644
--- a/src/location/maps/qgeoroutingmanager.cpp
+++ b/src/location/maps/qgeoroutingmanager.cpp
@@ -235,7 +235,7 @@ int QGeoRoutingManager::managerVersion() const
QGeoRoutingManager::error(), QGeoRouteReply::finished() or
QGeoRouteReply::error() with deleteLater().
*/
-QGeoRouteReply* QGeoRoutingManager::calculateRoute(const QGeoRouteRequest& request)
+QGeoRouteReply *QGeoRoutingManager::calculateRoute(const QGeoRouteRequest &request)
{
return d_ptr->engine->calculateRoute(request);
}
@@ -267,7 +267,7 @@ QGeoRouteReply* QGeoRoutingManager::calculateRoute(const QGeoRouteRequest& reque
QGeoRoutingManager::error(), QGeoRouteReply::finished() or
QGeoRouteReply::error() with deleteLater().
*/
-QGeoRouteReply* QGeoRoutingManager::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
+QGeoRouteReply *QGeoRoutingManager::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
{
return d_ptr->engine->updateRoute(route, position);
}
@@ -347,7 +347,7 @@ QLocale QGeoRoutingManager::locale() const
}
/*!
-\fn void QGeoRoutingManager::finished(QGeoRouteReply* reply)
+\fn void QGeoRoutingManager::finished(QGeoRouteReply *reply)
This signal is emitted when \a reply has finished processing.
@@ -361,7 +361,7 @@ Use deleteLater() instead.
*/
/*!
-\fn void QGeoRoutingManager::error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString)
+\fn void QGeoRoutingManager::error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString)
This signal is emitted when an error has been detected in the processing of
\a reply. The QGeoRoutingManager::finished() signal will probably follow.
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 2bde0389..c4c1b579 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -68,8 +68,8 @@ public:
QString managerName() const;
int managerVersion() const;
- QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request);
- QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
+ QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request);
+ QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
QGeoRouteRequest::TravelModes supportedTravelModes() const;
QGeoRouteRequest::FeatureTypes supportedFeatureTypes() const;
@@ -82,8 +82,8 @@ public:
QLocale locale() const;
Q_SIGNALS:
- void finished(QGeoRouteReply* reply);
- void error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString = QString());
+ void finished(QGeoRouteReply *reply);
+ void error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString = QString());
private:
QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = 0);
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index 416de09d..9a6f7bc6 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -149,7 +149,7 @@ int QGeoRoutingManagerEngine::managerVersion() const
}
/*!
-\fn QGeoRouteReply* QGeoRoutingManagerEngine::calculateRoute(const QGeoRouteRequest& request)
+\fn QGeoRouteReply *QGeoRoutingManagerEngine::calculateRoute(const QGeoRouteRequest &request)
Begins the calculation of the route specified by \a request.
@@ -199,7 +199,7 @@ int QGeoRoutingManagerEngine::managerVersion() const
QGeoRoutingManagerEngine::error(), QGeoRouteReply::finished() or
QGeoRouteReply::error() with deleteLater().
*/
-QGeoRouteReply* QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
+QGeoRouteReply *QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
{
Q_UNUSED(route)
Q_UNUSED(position)
@@ -359,7 +359,7 @@ QLocale QGeoRoutingManagerEngine::locale() const
}
/*!
-\fn void QGeoRoutingManagerEngine::finished(QGeoRouteReply* reply)
+\fn void QGeoRoutingManagerEngine::finished(QGeoRouteReply *reply)
This signal is emitted when \a reply has finished processing.
@@ -373,7 +373,7 @@ Use deleteLater() instead.
*/
/*!
-\fn void QGeoRoutingManagerEngine::error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString)
+\fn void QGeoRoutingManagerEngine::error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString)
This signal is emitted when an error has been detected in the processing of
\a reply. The QGeoRoutingManagerEngine::finished() signal will probably follow.
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 66c01548..91c7b37f 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -68,8 +68,8 @@ public:
QString managerName() const;
int managerVersion() const;
- virtual QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) = 0;
- virtual QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
+ virtual QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) = 0;
+ virtual QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
QGeoRouteRequest::TravelModes supportedTravelModes() const;
QGeoRouteRequest::FeatureTypes supportedFeatureTypes() const;
@@ -82,8 +82,8 @@ public:
QLocale locale() const;
Q_SIGNALS:
- void finished(QGeoRouteReply* reply);
- void error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString = QString());
+ void finished(QGeoRouteReply *reply);
+ void error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString = QString());
protected:
void setSupportedTravelModes(QGeoRouteRequest::TravelModes travelModes);
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index c38f4ff3..8c1b5815 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -311,7 +311,7 @@ Manager *QGeoServiceProviderPrivate::manager(QGeoServiceProvider::Error *_error,
report any errors which occurred during the construction of the
QGeocodingManager.
*/
-QGeocodingManager* QGeoServiceProvider::geocodingManager() const
+QGeocodingManager *QGeoServiceProvider::geocodingManager() const
{
return d_ptr->manager<QGeocodingManager, QGeocodingManagerEngine>(
&(d_ptr->geocodeError), &(d_ptr->geocodeErrorString),
@@ -338,7 +338,7 @@ QGeocodingManager* QGeoServiceProvider::geocodingManager() const
report any errors which occurred during the construction of the
QGeoMappingManager.
*/
-QGeoMappingManager* QGeoServiceProvider::mappingManager() const
+QGeoMappingManager *QGeoServiceProvider::mappingManager() const
{
return d_ptr->manager<QGeoMappingManager, QGeoMappingManagerEngine>(
&(d_ptr->mappingError), &(d_ptr->mappingErrorString),
@@ -365,7 +365,7 @@ QGeoMappingManager* QGeoServiceProvider::mappingManager() const
report any errors which occurred during the construction of the
QGeoRoutingManager.
*/
-QGeoRoutingManager* QGeoServiceProvider::routingManager() const
+QGeoRoutingManager *QGeoServiceProvider::routingManager() const
{
return d_ptr->manager<QGeoRoutingManager, QGeoRoutingManagerEngine>(
&(d_ptr->routingError), &(d_ptr->routingErrorString),
@@ -583,7 +583,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QMap<QString, QVariant> &param
int idx = int(metaData.value(QStringLiteral("index")).toDouble());
// load the actual plugin
- factory = qobject_cast<QGeoServiceProviderFactory*>(loader()->instance(idx));
+ factory = qobject_cast<QGeoServiceProviderFactory *>(loader()->instance(idx));
}
QHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload)
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index f3958148..9bd8ded5 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -147,9 +147,9 @@ public:
MappingFeatures mappingFeatures() const;
PlacesFeatures placesFeatures() const;
- QGeocodingManager* geocodingManager() const;
- QGeoMappingManager* mappingManager() const;
- QGeoRoutingManager* routingManager() const;
+ QGeocodingManager *geocodingManager() const;
+ QGeoMappingManager *mappingManager() const;
+ QGeoRoutingManager *routingManager() const;
QPlaceManager *placeManager() const;
Error error() const;
diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp
index 30e072af..088ae070 100644
--- a/src/location/maps/qgeoserviceproviderfactory.cpp
+++ b/src/location/maps/qgeoserviceproviderfactory.cpp
@@ -78,7 +78,7 @@ Destroys this QGeoServiceProviderFactory instance.
The default implementation returns 0, which causes a
QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
*/
-QGeocodingManagerEngine* QGeoServiceProviderFactory::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeocodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
@@ -102,7 +102,7 @@ QGeocodingManagerEngine* QGeoServiceProviderFactory::createGeocodingManagerEngin
The default implementation returns 0, which causes a
QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
*/
-QGeoMappingManagerEngine* QGeoServiceProviderFactory::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
@@ -126,7 +126,7 @@ QGeoMappingManagerEngine* QGeoServiceProviderFactory::createMappingManagerEngine
The default implementation returns 0, which causes a
QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
*/
-QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoRoutingManagerEngine *QGeoServiceProviderFactory::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
@@ -151,7 +151,7 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine
The default implementation returns 0, which causes a
QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
*/
-QPlaceManagerEngine* QGeoServiceProviderFactory::createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
+QPlaceManagerEngine *QGeoServiceProviderFactory::createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 7e93d0b4..3c87ec5f 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -57,13 +57,13 @@ class Q_LOCATION_EXPORT QGeoServiceProviderFactory
public:
virtual ~QGeoServiceProviderFactory() {}
- virtual QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+ virtual QGeocodingManagerEngine *createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
- virtual QGeoMappingManagerEngine* createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+ virtual QGeoMappingManagerEngine *createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
- virtual QGeoRoutingManagerEngine* createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+ virtual QGeoRoutingManagerEngine *createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
virtual QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
diff --git a/src/location/maps/qgeotilecache_p.h b/src/location/maps/qgeotilecache_p.h
index 52207a71..d7a900de 100644
--- a/src/location/maps/qgeotilecache_p.h
+++ b/src/location/maps/qgeotilecache_p.h
@@ -169,7 +169,7 @@ private:
int extraTextureUsage_;
QMutex cleanupMutex_;
- QList<QGLTexture2D*> cleanupList_;
+ QList<QGLTexture2D *> cleanupList_;
};
QT_END_NAMESPACE
diff --git a/src/location/maps/qgeotiledmapdata.cpp b/src/location/maps/qgeotiledmapdata.cpp
index 9ecf8539..0d331625 100644
--- a/src/location/maps/qgeotiledmapdata.cpp
+++ b/src/location/maps/qgeotiledmapdata.cpp
@@ -155,7 +155,7 @@ void QGeoTiledMapData::newTileFetched(QSharedPointer<QGeoTileTexture> texture)
d->newTileFetched(texture);
}
-QGeoTileCache* QGeoTiledMapData::tileCache()
+QGeoTileCache *QGeoTiledMapData::tileCache()
{
Q_D(QGeoTiledMapData);
return d->tileCache();
@@ -253,7 +253,7 @@ QGeoTiledMapDataPrivate::~QGeoTiledMapDataPrivate()
// However: how to ensure this is done in rendering thread?
}
-QGeoTileCache* QGeoTiledMapDataPrivate::tileCache()
+QGeoTileCache *QGeoTiledMapDataPrivate::tileCache()
{
return cache_;
}
diff --git a/src/location/maps/qgeotiledmapdata_p.h b/src/location/maps/qgeotiledmapdata_p.h
index e91e1aca..73fde8f1 100644
--- a/src/location/maps/qgeotiledmapdata_p.h
+++ b/src/location/maps/qgeotiledmapdata_p.h
@@ -78,7 +78,7 @@ public:
QGeoTiledMapData(QGeoTiledMappingManagerEngine *engine, QObject *parent);
virtual ~QGeoTiledMapData();
- QGeoTileCache* tileCache();
+ QGeoTileCache *tileCache();
void paintGL(QGLPainter *painter);
diff --git a/src/location/maps/qgeotiledmapdata_p_p.h b/src/location/maps/qgeotiledmapdata_p_p.h
index d1e68e9f..e1d2d716 100644
--- a/src/location/maps/qgeotiledmapdata_p_p.h
+++ b/src/location/maps/qgeotiledmapdata_p_p.h
@@ -90,7 +90,7 @@ public:
QGeoTiledMapDataPrivate(QGeoTiledMapData *parent, QGeoTiledMappingManagerEngine *engine);
~QGeoTiledMapDataPrivate();
- QGeoTileCache* tileCache();
+ QGeoTileCache *tileCache();
void paintGL(QGLPainter *painter);
diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp
index 6ac65b37..9d2ba880 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.cpp
+++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp
@@ -120,7 +120,7 @@ QGeoTileFetcher *QGeoTiledMappingManagerEngine::tileFetcher()
return d->fetcher_;
}
-QGeoMap* QGeoTiledMappingManagerEngine::createMap(QObject *parent)
+QGeoMap *QGeoTiledMappingManagerEngine::createMap(QObject *parent)
{
Q_UNUSED(parent);
return NULL;
@@ -136,12 +136,12 @@ void QGeoTiledMappingManagerEngine::deregisterMap(QGeoTiledMapData *map)
d_ptr->tileMaps_.remove(map);
d_ptr->mapHash_.remove(map);
- QHash<QGeoTileSpec, QSet<QGeoTiledMapData*> > newTileHash = d_ptr->tileHash_;
- typedef QHash<QGeoTileSpec, QSet<QGeoTiledMapData*> >::const_iterator h_iter;
+ QHash<QGeoTileSpec, QSet<QGeoTiledMapData *> > newTileHash = d_ptr->tileHash_;
+ typedef QHash<QGeoTileSpec, QSet<QGeoTiledMapData *> >::const_iterator h_iter;
h_iter hi = d_ptr->tileHash_.constBegin();
h_iter hend = d_ptr->tileHash_.constEnd();
for (; hi != hend; ++hi) {
- QSet<QGeoTiledMapData*> maps = hi.value();
+ QSet<QGeoTiledMapData *> maps = hi.value();
if (maps.contains(map)) {
maps.remove(map);
if (maps.isEmpty())
@@ -186,7 +186,7 @@ void QGeoTiledMappingManagerEngine::updateTileRequests(QGeoTiledMapData *map,
rem = tilesRemoved.constBegin();
for (; rem != remEnd; ++rem) {
- QSet<QGeoTiledMapData*> mapSet = d->tileHash_.value(*rem);
+ QSet<QGeoTiledMapData *> mapSet = d->tileHash_.value(*rem);
mapSet.remove(map);
if (mapSet.isEmpty()) {
cancelTiles.insert(*rem);
@@ -198,7 +198,7 @@ void QGeoTiledMappingManagerEngine::updateTileRequests(QGeoTiledMapData *map,
add = tilesAdded.constBegin();
for (; add != addEnd; ++add) {
- QSet<QGeoTiledMapData*> mapSet = d->tileHash_.value(*add);
+ QSet<QGeoTiledMapData *> mapSet = d->tileHash_.value(*add);
if (mapSet.isEmpty()) {
reqTiles.insert(*add);
}
@@ -218,9 +218,9 @@ void QGeoTiledMappingManagerEngine::engineTileFinished(const QGeoTileSpec &spec,
{
Q_D(QGeoTiledMappingManagerEngine);
- QSet<QGeoTiledMapData*> maps = d->tileHash_.value(spec);
+ QSet<QGeoTiledMapData *> maps = d->tileHash_.value(spec);
- typedef QSet<QGeoTiledMapData*>::const_iterator map_iter;
+ typedef QSet<QGeoTiledMapData *>::const_iterator map_iter;
map_iter map = maps.constBegin();
map_iter mapEnd = maps.constEnd();
@@ -235,7 +235,7 @@ void QGeoTiledMappingManagerEngine::engineTileFinished(const QGeoTileSpec &spec,
d->tileHash_.remove(spec);
- typedef QSet<QGeoTileCache*>::const_iterator cache_iter;
+ typedef QSet<QGeoTileCache *>::const_iterator cache_iter;
tileCache()->insert(spec, bytes, format, d->cacheHint_);
@@ -252,8 +252,8 @@ void QGeoTiledMappingManagerEngine::engineTileError(const QGeoTileSpec &spec, co
{
Q_D(QGeoTiledMappingManagerEngine);
- QSet<QGeoTiledMapData*> maps = d->tileHash_.value(spec);
- typedef QSet<QGeoTiledMapData*>::const_iterator map_iter;
+ QSet<QGeoTiledMapData *> maps = d->tileHash_.value(spec);
+ typedef QSet<QGeoTiledMapData *>::const_iterator map_iter;
map_iter map = maps.constBegin();
map_iter mapEnd = maps.constEnd();
for (; map != mapEnd; ++map) {
diff --git a/src/location/maps/qgeotiledmappingmanagerengine.h b/src/location/maps/qgeotiledmappingmanagerengine.h
index ea1433a0..3c6d65d0 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine.h
@@ -86,7 +86,7 @@ public:
QGeoTileFetcher *tileFetcher();
- virtual QGeoMap* createMap(QObject *parent);
+ virtual QGeoMap *createMap(QObject *parent);
void registerMap(QGeoTiledMapData *map);
void deregisterMap(QGeoTiledMapData *map);
@@ -115,7 +115,7 @@ protected:
void setTileSize(const QSize &tileSize);
void setCacheHint(QGeoTiledMappingManagerEngine::CacheAreas cacheHint);
- QGeoTileCache *createTileCacheWithDir(const QString& cacheDirectory);
+ QGeoTileCache *createTileCacheWithDir(const QString &cacheDirectory);
private:
QGeoTiledMappingManagerEnginePrivate *d_ptr;
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index 7948f203..07b2d5d4 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -76,9 +76,9 @@ public:
QThread *thread_;
QSize tileSize_;
- QSet<QGeoTiledMapData*> tileMaps_;
- QHash<QGeoTiledMapData*, QSet<QGeoTileSpec> > mapHash_;
- QHash<QGeoTileSpec, QSet<QGeoTiledMapData*> > tileHash_;
+ QSet<QGeoTiledMapData *> tileMaps_;
+ QHash<QGeoTiledMapData *, QSet<QGeoTileSpec> > mapHash_;
+ QHash<QGeoTileSpec, QSet<QGeoTiledMapData *> > tileHash_;
QGeoTiledMappingManagerEngine::CacheAreas cacheHint_;
QGeoTileCache *tileCache_;
QGeoTileFetcher *fetcher_;
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index ff34432d..8584465e 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -62,7 +62,7 @@ class QGeoTiledMapReplyPrivate
{
public:
QGeoTiledMapReplyPrivate(const QGeoTileSpec &spec);
- QGeoTiledMapReplyPrivate(QGeoTiledMapReply::Error error, const QString& errorString);
+ QGeoTiledMapReplyPrivate(QGeoTiledMapReply::Error error, const QString &errorString);
~QGeoTiledMapReplyPrivate();
QGeoTiledMapReply::Error error;
diff --git a/src/location/maps/qgeotilefetcher.cpp b/src/location/maps/qgeotilefetcher.cpp
index 8b83b881..79b838bb 100644
--- a/src/location/maps/qgeotilefetcher.cpp
+++ b/src/location/maps/qgeotilefetcher.cpp
@@ -180,7 +180,7 @@ void QGeoTileFetcher::finished()
QMutexLocker ml(&d->queueMutex_);
- QGeoTiledMapReply *reply = qobject_cast<QGeoTiledMapReply*>(sender());
+ QGeoTiledMapReply *reply = qobject_cast<QGeoTiledMapReply *>(sender());
if (!reply)
return;
diff --git a/src/location/maps/qgeotilefetcher.h b/src/location/maps/qgeotilefetcher.h
index 5e996b26..e40f21ef 100644
--- a/src/location/maps/qgeotilefetcher.h
+++ b/src/location/maps/qgeotilefetcher.h
@@ -87,7 +87,7 @@ protected:
private:
QGeoTileFetcherPrivate *d_ptr;
- virtual QGeoTiledMapReply* getTileImage(const QGeoTileSpec &spec) = 0;
+ virtual QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) = 0;
void handleReply(QGeoTiledMapReply *reply, const QGeoTileSpec &spec);
Q_DECLARE_PRIVATE(QGeoTileFetcher)
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index b50e15a1..68d73233 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -83,7 +83,7 @@ public:
QTimer *timer_;
QMutex queueMutex_;
QList<QGeoTileSpec> queue_;
- QHash<QGeoTileSpec, QGeoTiledMapReply*> invmap_;
+ QHash<QGeoTileSpec, QGeoTiledMapReply *> invmap_;
private:
Q_DISABLE_COPY(QGeoTileFetcherPrivate)
diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp
index dca33cb0..563df456 100644
--- a/src/location/maps/qgeotilerequestmanager.cpp
+++ b/src/location/maps/qgeotilerequestmanager.cpp
@@ -118,7 +118,7 @@ QList<QSharedPointer<QGeoTileTexture> > QGeoTileRequestManagerPrivate::requestTi
QList<QSharedPointer<QGeoTileTexture> > cachedTex;
QGeoTiledMappingManagerEngine *engine = map_ ?
- static_cast<QGeoTiledMappingManagerEngine*>(map_->engine()) : 0;
+ static_cast<QGeoTiledMappingManagerEngine *>(map_->engine()) : 0;
// remove tiles in cache from request tiles
if (engine) {
@@ -193,7 +193,7 @@ void RetryFuture::retry()
requestTiles.insert(tile_);
if (map_) {
QGeoTiledMappingManagerEngine *engine =
- static_cast<QGeoTiledMappingManagerEngine*>(map_->engine());
+ static_cast<QGeoTiledMappingManagerEngine *>(map_->engine());
engine->updateTileRequests(map_, requestTiles, cancelTiles);
}
}
diff --git a/src/location/maps/qgeotilespec.cpp b/src/location/maps/qgeotilespec.cpp
index cb768c37..272d8b1d 100644
--- a/src/location/maps/qgeotilespec.cpp
+++ b/src/location/maps/qgeotilespec.cpp
@@ -56,7 +56,7 @@ QGeoTileSpec::QGeoTileSpec(const QGeoTileSpec &other)
QGeoTileSpec::~QGeoTileSpec() {
}
-QGeoTileSpec& QGeoTileSpec::operator = (const QGeoTileSpec &other)
+QGeoTileSpec &QGeoTileSpec::operator = (const QGeoTileSpec &other)
{
if (this == &other)
return *this;
@@ -159,7 +159,7 @@ QGeoTileSpecPrivate::QGeoTileSpecPrivate(const QString &plugin, int mapId, int z
QGeoTileSpecPrivate::~QGeoTileSpecPrivate() {}
-QGeoTileSpecPrivate& QGeoTileSpecPrivate::operator = (const QGeoTileSpecPrivate &other)
+QGeoTileSpecPrivate &QGeoTileSpecPrivate::operator = (const QGeoTileSpecPrivate &other)
{
if (this == &other)
return *this;
diff --git a/src/location/maps/qgeotilespec.h b/src/location/maps/qgeotilespec.h
index 959f816d..10be4294 100644
--- a/src/location/maps/qgeotilespec.h
+++ b/src/location/maps/qgeotilespec.h
@@ -61,7 +61,7 @@ public:
QGeoTileSpec(const QString &plugin, int mapId, int zoom, int x, int y);
~QGeoTileSpec();
- QGeoTileSpec& operator = (const QGeoTileSpec &other);
+ QGeoTileSpec &operator = (const QGeoTileSpec &other);
QString plugin() const;
diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h
index 787dd6a9..8392e617 100644
--- a/src/location/maps/qgeotilespec_p.h
+++ b/src/location/maps/qgeotilespec_p.h
@@ -65,7 +65,7 @@ public:
QGeoTileSpecPrivate(const QString &plugin, int mapId, int zoom, int x, int y);
~QGeoTileSpecPrivate();
- QGeoTileSpecPrivate& operator = (const QGeoTileSpecPrivate &other);
+ QGeoTileSpecPrivate &operator = (const QGeoTileSpecPrivate &other);
bool operator == (const QGeoTileSpecPrivate &rhs) const;
bool operator < (const QGeoTileSpecPrivate &rhs) const;
diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h
index b8e7761a..14ee8090 100644
--- a/src/location/places/placemacro.h
+++ b/src/location/places/placemacro.h
@@ -51,23 +51,23 @@ QT_BEGIN_NAMESPACE
#define Q_DECLARE_D_FUNC(Class) \
- inline Class##Private* d_func(); \
- inline const Class##Private* d_func() const;\
+ inline Class##Private *d_func(); \
+ inline const Class##Private *d_func() const;\
friend class Class##Private;
#define Q_DECLARE_COPY_CTOR(Class, BaseClass) \
Class(const BaseClass &other);
#define Q_IMPLEMENT_D_FUNC(Class) \
- Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
- const Class##Private* Class::d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.constData()); }
+ Class##Private *Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
+ const Class##Private *Class::d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.constData()); }
#define Q_IMPLEMENT_COPY_CTOR(Class, BaseClass) \
- Class::Class(const BaseClass& other) : BaseClass() { Class##Private::copyIfPossible(d_ptr, other); }
+ Class::Class(const BaseClass &other) : BaseClass() { Class##Private::copyIfPossible(d_ptr, other); }
#define Q_DEFINE_PRIVATE_HELPER(Class, BaseClass, ClassType) \
- BaseClass##Private* clone() const { return new Class##Private(*this); } \
- static void copyIfPossible(QSharedDataPointer<BaseClass##Private>& d_ptr, const BaseClass &other) \
+ BaseClass##Private *clone() const { return new Class##Private(*this); } \
+ static void copyIfPossible(QSharedDataPointer<BaseClass##Private> &d_ptr, const BaseClass &other) \
{ \
if (other.type() == ClassType) \
d_ptr = extract_d(other); \
diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp
index 926b0ce5..f6743a80 100644
--- a/src/location/places/qplace.cpp
+++ b/src/location/places/qplace.cpp
@@ -153,12 +153,12 @@ QPlace &QPlace::operator= (const QPlace & other)
return *this;
}
-inline QPlacePrivate* QPlace::d_func()
+inline QPlacePrivate *QPlace::d_func()
{
return static_cast<QPlacePrivate *>(d_ptr.data());
}
-inline const QPlacePrivate* QPlace::d_func() const
+inline const QPlacePrivate *QPlace::d_func() const
{
return static_cast<const QPlacePrivate *>(d_ptr.constData());
}
@@ -647,7 +647,7 @@ QPlacePrivate::QPlacePrivate(const QPlacePrivate &other)
QPlacePrivate::~QPlacePrivate() {}
-QPlacePrivate& QPlacePrivate::operator= (const QPlacePrivate & other)
+QPlacePrivate &QPlacePrivate::operator= (const QPlacePrivate & other)
{
if (this == &other)
return *this;
diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h
index c3bfc34d..9ab0a5ec 100644
--- a/src/location/places/qplace.h
+++ b/src/location/places/qplace.h
@@ -73,7 +73,7 @@ public:
QPlace(const QPlace &other);
~QPlace();
- QPlace& operator=(const QPlace &other);
+ QPlace &operator=(const QPlace &other);
bool operator==(const QPlace &other) const;
bool operator!=(const QPlace &other) const;
diff --git a/src/location/places/qplaceattribute_p.h b/src/location/places/qplaceattribute_p.h
index b8f94d33..c5fb862f 100644
--- a/src/location/places/qplaceattribute_p.h
+++ b/src/location/places/qplaceattribute_p.h
@@ -68,7 +68,7 @@ public:
virtual bool operator== (const QPlaceAttributePrivate &other) const;
- virtual QPlaceAttributePrivate* clone() const { return new QPlaceAttributePrivate(*this); }
+ virtual QPlaceAttributePrivate *clone() const { return new QPlaceAttributePrivate(*this); }
bool isEmpty() const;
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index b75a9740..8581e535 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE
#define Q_DECLARE_CONTENT_D_FUNC(Class) \
- inline Class##Private* d_func(); \
- inline const Class##Private* d_func() const;\
+ inline Class##Private *d_func(); \
+ inline const Class##Private *d_func() const;\
friend class Class##Private;
#define Q_DECLARE_CONTENT_COPY_CTOR(Class) \
diff --git a/src/location/places/qplacecontent_p.h b/src/location/places/qplacecontent_p.h
index 4fbc9e60..ee9fb8d5 100644
--- a/src/location/places/qplacecontent_p.h
+++ b/src/location/places/qplacecontent_p.h
@@ -65,16 +65,16 @@ QT_BEGIN_NAMESPACE
#define Q_IMPLEMENT_CONTENT_D_FUNC(Class) \
- Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
- const Class##Private* Class::d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.constData()); } \
+ Class##Private *Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
+ const Class##Private *Class::d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.constData()); } \
#define Q_IMPLEMENT_CONTENT_COPY_CTOR(Class) \
- Class::Class(const QPlaceContent& other) : QPlaceContent() { Class##Private::copyIfPossible(d_ptr, other); }
+ Class::Class(const QPlaceContent &other) : QPlaceContent() { Class##Private::copyIfPossible(d_ptr, other); }
#define Q_DEFINE_CONTENT_PRIVATE_HELPER(Class, ContentType) \
- QPlaceContentPrivate* clone() const { return new Class##Private(*this); } \
+ QPlaceContentPrivate *clone() const { return new Class##Private(*this); } \
virtual QPlaceContent::Type type() const {return ContentType;} \
- static void copyIfPossible(QSharedDataPointer<QPlaceContentPrivate>& d_ptr, const QPlaceContent& other) \
+ static void copyIfPossible(QSharedDataPointer<QPlaceContentPrivate> &d_ptr, const QPlaceContent &other) \
{ \
if (other.type() == ContentType) \
d_ptr = extract_d(other); \
@@ -89,11 +89,11 @@ public:
virtual ~QPlaceContentPrivate(){}
virtual bool compare(const QPlaceContentPrivate *other) const;
- virtual QPlaceContentPrivate* clone() const = 0;
+ virtual QPlaceContentPrivate *clone() const = 0;
virtual QPlaceContent::Type type() const = 0;
/* Helper functions for C++ protection rules */
- static const QSharedDataPointer<QPlaceContentPrivate>& extract_d(const QPlaceContent& other) {return other.d_ptr;}
+ static const QSharedDataPointer<QPlaceContentPrivate> &extract_d(const QPlaceContent &other) {return other.d_ptr;}
QPlaceSupplier supplier;
QPlaceUser user;
diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp
index a48ffb37..9c5ac14e 100644
--- a/src/location/places/qplacecontentrequest.cpp
+++ b/src/location/places/qplacecontentrequest.cpp
@@ -224,12 +224,12 @@ void QPlaceContentRequest::clear()
d->clear();
}
-inline QPlaceContentRequestPrivate* QPlaceContentRequest::d_func()
+inline QPlaceContentRequestPrivate *QPlaceContentRequest::d_func()
{
return static_cast<QPlaceContentRequestPrivate *>(d_ptr.data());
}
-inline const QPlaceContentRequestPrivate* QPlaceContentRequest::d_func() const
+inline const QPlaceContentRequestPrivate *QPlaceContentRequest::d_func() const
{
return static_cast<const QPlaceContentRequestPrivate *>(d_ptr.constData());
}
diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
index 3d7100ca..034411dd 100644
--- a/src/location/places/qplacecontentrequest.h
+++ b/src/location/places/qplacecontentrequest.h
@@ -61,7 +61,7 @@ public:
QPlaceContentRequest(const QPlaceContentRequest &other);
~QPlaceContentRequest();
- QPlaceContentRequest& operator=(const QPlaceContentRequest &other);
+ QPlaceContentRequest &operator=(const QPlaceContentRequest &other);
bool operator==(const QPlaceContentRequest &other) const;
bool operator!=(const QPlaceContentRequest &other) const;
diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp
index 8db4dfe0..205ae5e1 100644
--- a/src/location/places/qplaceicon.cpp
+++ b/src/location/places/qplaceicon.cpp
@@ -51,7 +51,7 @@ QPlaceIconPrivate::QPlaceIconPrivate()
{
}
-QPlaceIconPrivate::QPlaceIconPrivate(const QPlaceIconPrivate&other)
+QPlaceIconPrivate::QPlaceIconPrivate(const QPlaceIconPrivate &other)
: QSharedData(other),
manager(other.manager),
parameters(other.parameters)
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index 68ba0df5..0cd9aee7 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -416,7 +416,7 @@ QPlaceMatchReply *QPlaceManager::matchingPlaces(const QPlaceMatchRequest &reques
}
/*!
- \fn void QPlaceManager::finished(QPlaceReply* reply)
+ \fn void QPlaceManager::finished(QPlaceReply *reply)
This signal is emitted when \a reply has finished processing.
@@ -430,7 +430,7 @@ QPlaceMatchReply *QPlaceManager::matchingPlaces(const QPlaceMatchRequest &reques
*/
/*!
- \fn void QPlaceManager::error(QPlaceReply* reply, QPlaceReply::Error error, const QString &errorString)
+ \fn void QPlaceManager::error(QPlaceReply *reply, QPlaceReply::Error error, const QString &errorString)
This signal is emitted when an error has been detected in the processing of
\a reply. The QPlaceManager::finished() signal will probably follow.
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index 66f7410e..f53fd331 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -379,7 +379,7 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate()
}
/*!
- \fn void QPlaceManagerEngine::finished(QPlaceReply* reply)
+ \fn void QPlaceManagerEngine::finished(QPlaceReply *reply)
This signal is emitted when \a reply has finished processing.
diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp
index 963ec977..a1c87aa6 100644
--- a/src/location/places/qplacematchrequest.cpp
+++ b/src/location/places/qplacematchrequest.cpp
@@ -246,12 +246,12 @@ void QPlaceMatchRequest::clear()
d->clear();
}
-inline QPlaceMatchRequestPrivate* QPlaceMatchRequest::d_func()
+inline QPlaceMatchRequestPrivate *QPlaceMatchRequest::d_func()
{
return static_cast<QPlaceMatchRequestPrivate *>(d_ptr.data());
}
-inline const QPlaceMatchRequestPrivate* QPlaceMatchRequest::d_func() const
+inline const QPlaceMatchRequestPrivate *QPlaceMatchRequest::d_func() const
{
return static_cast<const QPlaceMatchRequestPrivate *>(d_ptr.constData());
}
diff --git a/src/location/places/qplacematchrequest.h b/src/location/places/qplacematchrequest.h
index 459d3ef7..7bca1256 100644
--- a/src/location/places/qplacematchrequest.h
+++ b/src/location/places/qplacematchrequest.h
@@ -62,7 +62,7 @@ public:
QPlaceMatchRequest(const QPlaceMatchRequest &other);
- QPlaceMatchRequest& operator=(const QPlaceMatchRequest &other);
+ QPlaceMatchRequest &operator=(const QPlaceMatchRequest &other);
bool operator==(const QPlaceMatchRequest &other) const;
bool operator!=(const QPlaceMatchRequest &other) const;
diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp
index 05568000..ad654891 100644
--- a/src/location/places/qplacesearchrequest.cpp
+++ b/src/location/places/qplacesearchrequest.cpp
@@ -422,12 +422,12 @@ void QPlaceSearchRequest::clear()
d->clear();
}
-inline QPlaceSearchRequestPrivate* QPlaceSearchRequest::d_func()
+inline QPlaceSearchRequestPrivate *QPlaceSearchRequest::d_func()
{
return static_cast<QPlaceSearchRequestPrivate *>(d_ptr.data());
}
-inline const QPlaceSearchRequestPrivate* QPlaceSearchRequest::d_func() const
+inline const QPlaceSearchRequestPrivate *QPlaceSearchRequest::d_func() const
{
return static_cast<const QPlaceSearchRequestPrivate *>(d_ptr.constData());
}
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index 6cbcc5ad..256d3df9 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -69,7 +69,7 @@ public:
QPlaceSearchRequest(const QPlaceSearchRequest &other);
- QPlaceSearchRequest& operator=(const QPlaceSearchRequest &other);
+ QPlaceSearchRequest &operator=(const QPlaceSearchRequest &other);
bool operator==(const QPlaceSearchRequest &other) const;
bool operator!=(const QPlaceSearchRequest &other) const;
diff --git a/src/location/qgeoareamonitor_polling.cpp b/src/location/qgeoareamonitor_polling.cpp
index 2135948e..1300cb10 100644
--- a/src/location/qgeoareamonitor_polling.cpp
+++ b/src/location/qgeoareamonitor_polling.cpp
@@ -65,7 +65,7 @@ QGeoAreaMonitorPolling::~QGeoAreaMonitorPolling()
location->stopUpdates();
}
-void QGeoAreaMonitorPolling::setCenter(const QGeoCoordinate& coordinate)
+void QGeoAreaMonitorPolling::setCenter(const QGeoCoordinate &coordinate)
{
if (coordinate.isValid()) {
QGeoAreaMonitor::setCenter(coordinate);
diff --git a/src/location/qgeoboundingbox.cpp b/src/location/qgeoboundingbox.cpp
index 1d2967fc..1b464502 100644
--- a/src/location/qgeoboundingbox.cpp
+++ b/src/location/qgeoboundingbox.cpp
@@ -146,7 +146,7 @@ QGeoBoundingBox::~QGeoBoundingBox() {}
Assigns \a other to this bounding box and returns a reference to this
bounding box.
*/
-QGeoBoundingBox& QGeoBoundingBox::operator = (const QGeoBoundingBox & other)
+QGeoBoundingBox &QGeoBoundingBox::operator = (const QGeoBoundingBox & other)
{
if (this == &other)
return *this;
@@ -739,7 +739,7 @@ QGeoBoundingBox QGeoBoundingBox::united(const QGeoBoundingBox &boundingBox) cons
independent of the order of the operands.
*/
-QGeoBoundingBox& QGeoBoundingBox::operator |= (const QGeoBoundingBox & boundingBox)
+QGeoBoundingBox &QGeoBoundingBox::operator |= (const QGeoBoundingBox & boundingBox)
{
// If non-intersecting goes for most narrow box
diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h
index 106d1b37..e0372689 100644
--- a/src/location/qgeoboundingbox.h
+++ b/src/location/qgeoboundingbox.h
@@ -62,7 +62,7 @@ public:
~QGeoBoundingBox();
- QGeoBoundingBox& operator = (const QGeoBoundingBox &other);
+ QGeoBoundingBox &operator = (const QGeoBoundingBox &other);
using QGeoBoundingArea::operator==;
bool operator==(const QGeoBoundingBox &other) const;
@@ -100,7 +100,7 @@ public:
QGeoBoundingBox united(const QGeoBoundingBox &boundingBox) const;
QGeoBoundingBox operator | (const QGeoBoundingBox &boundingBox) const;
- QGeoBoundingBox& operator |= (const QGeoBoundingBox &boundingBox);
+ QGeoBoundingBox &operator |= (const QGeoBoundingBox &boundingBox);
private:
inline QGeoBoundingBoxPrivate *d_func();
diff --git a/src/location/qgeoboundingcircle.cpp b/src/location/qgeoboundingcircle.cpp
index 67736c70..5a2fcd0d 100644
--- a/src/location/qgeoboundingcircle.cpp
+++ b/src/location/qgeoboundingcircle.cpp
@@ -119,7 +119,7 @@ QGeoBoundingCircle::~QGeoBoundingCircle() {}
Assigns \a other to this bounding circle and returns a reference to this
bounding circle.
*/
-QGeoBoundingCircle& QGeoBoundingCircle::operator = (const QGeoBoundingCircle & other)
+QGeoBoundingCircle &QGeoBoundingCircle::operator = (const QGeoBoundingCircle & other)
{
if (this == &other)
return *this;
diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h
index 10b23e29..56754f5f 100644
--- a/src/location/qgeoboundingcircle.h
+++ b/src/location/qgeoboundingcircle.h
@@ -65,7 +65,7 @@ public:
~QGeoBoundingCircle();
- QGeoBoundingCircle& operator = (const QGeoBoundingCircle &other);
+ QGeoBoundingCircle &operator = (const QGeoBoundingCircle &other);
using QGeoBoundingArea::operator==;
bool operator==(const QGeoBoundingCircle &other) const;
diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index cfa8e57d..857c47cf 100644
--- a/src/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
@@ -118,7 +118,7 @@ void QGeoPositionInfoSourcePrivate::loadPlugin()
int idx = int(metaData.value(QStringLiteral("index")).toDouble());
if (idx < 0)
return;
- factory = qobject_cast<QGeoPositionInfoSourceFactory*>(loader()->instance(idx));
+ factory = qobject_cast<QGeoPositionInfoSourceFactory *>(loader()->instance(idx));
}
QHash<QString, QJsonObject> QGeoPositionInfoSourcePrivate::plugins(bool reload)
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp b/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp
index 2bd6a095..7d7a7b8a 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp
+++ b/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp
@@ -131,7 +131,7 @@ void QPlaceContentReplyImplV1::resultReady(const QPlaceJSonParser::Error &errorI
{
if (errorId == QPlaceJSonParser::NoError) {
if (request().contentType() == QPlaceContent::ImageType) {
- QPlaceJSonMediaParser * mediaParser = qobject_cast<QPlaceJSonMediaParser*>(parser);
+ QPlaceJSonMediaParser * mediaParser = qobject_cast<QPlaceJSonMediaParser *>(parser);
QList<QPlaceImage> imageOjects = mediaParser->resultMedia();
QPlaceContent::Collection collection;
for (int i=0; i < imageOjects.count(); ++i)
@@ -139,7 +139,7 @@ void QPlaceContentReplyImplV1::resultReady(const QPlaceJSonParser::Error &errorI
setContent(collection);
setTotalCount(mediaParser->allMediaCount());
} else if (request().contentType() == QPlaceContent::ReviewType) {
- QPlaceJSonReviewParser *reviewParser = qobject_cast<QPlaceJSonReviewParser*>(parser);
+ QPlaceJSonReviewParser *reviewParser = qobject_cast<QPlaceJSonReviewParser *>(parser);
QList<QPlaceReview> reviewObjects = reviewParser->results();
QPlaceContent::Collection collection;
for (int i=0; i < reviewObjects.count(); ++i)
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp
index 7269b788..009a0749 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp
@@ -700,7 +700,7 @@ void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QJSValue &
int insertionIndex = 0;
if (!images.keys().isEmpty())
insertionIndex = images.keys().last() + 1;
- images.insert(insertionIndex,*obj);
+ images.insert(insertionIndex, *obj);
targetPlace->setContent(QPlaceContent::ImageType, images);
delete obj;
}
@@ -822,7 +822,7 @@ void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QJSValue &conte
if (it.name() != "length") {
QPlaceImage *obj = processAdContentMediaObject(it.value());
if (obj) {
- images.insert(insertionIndex,*obj);
+ images.insert(insertionIndex, *obj);
insertionIndex++;
delete obj;
}
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp
index fb44d15c..258c1505 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp
+++ b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp
@@ -116,7 +116,7 @@ QPlaceRestManager *QPlaceRestManager::instance()
/*!
Sets the network access manager used for requests.
*/
-void QPlaceRestManager::setNetworkAccessManager(QGeoNetworkAccessManager* manager)
+void QPlaceRestManager::setNetworkAccessManager(QGeoNetworkAccessManager *manager)
{
if (manager) {
delete mManager;
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h
index bea2bee4..90eb3521 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h
@@ -68,7 +68,7 @@ class QPlaceRestManager : public QObject
public:
static QPlaceRestManager *instance();
- void setNetworkAccessManager(QGeoNetworkAccessManager* networkManager);
+ void setNetworkAccessManager(QGeoNetworkAccessManager *networkManager);
QPlaceRestReply *sendPlaceRequest(const QString &placeId);
QPlaceRestReply *sendPlaceImagesRequest(const QString &placeId, const QPlaceContentRequest &params);
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
index 282809ff..6b06fef0 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
@@ -64,7 +64,7 @@ QGeoCodeXmlParser::~QGeoCodeXmlParser()
delete m_reader;
}
-bool QGeoCodeXmlParser::parse(QIODevice* source)
+bool QGeoCodeXmlParser::parse(QIODevice *source)
{
if (m_reader)
delete m_reader;
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
index fffbecda..120c80a8 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
@@ -68,7 +68,7 @@ public:
QGeoCodeXmlParser();
~QGeoCodeXmlParser();
- bool parse(QIODevice* source);
+ bool parse(QIODevice *source);
QList<QGeoLocation> results() const;
QString errorString() const;
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
index a8488ac6..c37cadf9 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
@@ -60,7 +60,7 @@
QT_BEGIN_NAMESPACE
QGeocodingManagerEngineNokia::QGeocodingManagerEngineNokia(
- QGeoNetworkAccessManager* networkManager,
+ QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString)
@@ -116,7 +116,7 @@ QString QGeocodingManagerEngineNokia::getAuthenticationString() const
}
-QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address,
+QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address,
const QGeoBoundingArea &bounds)
{
QString requestString = "http://";
@@ -185,7 +185,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address,
return geocode(requestString, bounds);
}
-QGeocodeReply* QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate,
+QGeocodeReply *QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate,
const QGeoBoundingArea &bounds)
{
QString requestString = "http://";
@@ -205,7 +205,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate
return geocode(requestString, bounds);
}
-QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QString &address,
+QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QString &address,
int limit,
int offset,
const QGeoBoundingArea &bounds)
@@ -235,7 +235,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QString &address,
return geocode(requestString, bounds, limit, offset);
}
-QGeocodeReply* QGeocodingManagerEngineNokia::geocode(QString requestString,
+QGeocodeReply *QGeocodingManagerEngineNokia::geocode(QString requestString,
const QGeoBoundingArea &bounds,
int limit,
int offset)
@@ -270,7 +270,7 @@ QString QGeocodingManagerEngineNokia::trimDouble(double degree, int decimalDigit
void QGeocodingManagerEngineNokia::placesFinished()
{
- QGeocodeReply *reply = qobject_cast<QGeocodeReply*>(sender());
+ QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender());
if (!reply)
return;
@@ -285,12 +285,12 @@ void QGeocodingManagerEngineNokia::placesFinished()
void QGeocodingManagerEngineNokia::placesError(QGeocodeReply::Error error, const QString &errorString)
{
- QGeocodeReply *reply = qobject_cast<QGeocodeReply*>(sender());
+ QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender());
if (!reply)
return;
- if (receivers(SIGNAL(error(QGeocodeReply*, QGeocodeReply::Error, QString))) == 0) {
+ if (receivers(SIGNAL(error(QGeocodeReply *, QGeocodeReply::Error, QString))) == 0) {
reply->deleteLater();
return;
}
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
index 4bcf0479..d021191d 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
@@ -66,18 +66,18 @@ class QGeocodingManagerEngineNokia : public QGeocodingManagerEngine
{
Q_OBJECT
public:
- QGeocodingManagerEngineNokia(QGeoNetworkAccessManager* networkManager,
+ QGeocodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString);
~QGeocodingManagerEngineNokia();
- QGeocodeReply* geocode(const QGeoAddress &address,
+ QGeocodeReply *geocode(const QGeoAddress &address,
const QGeoBoundingArea &bounds);
- QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate,
+ QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
const QGeoBoundingArea &bounds);
- QGeocodeReply* geocode(const QString &searchString,
+ QGeocodeReply *geocode(const QString &searchString,
int limit,
int offset,
const QGeoBoundingArea &bounds);
@@ -88,7 +88,7 @@ private Q_SLOTS:
private:
static QString trimDouble(double degree, int decimalDigits = 10);
- QGeocodeReply* geocode(QString requestString, const QGeoBoundingArea &bounds, int limit = -1, int offset = 0);
+ QGeocodeReply *geocode(QString requestString, const QGeoBoundingArea &bounds, int limit = -1, int offset = 0);
QString languageToMarc(QLocale::Language language);
QString getAuthenticationString() const;
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
index 118a2d24..b9b0bbf9 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
@@ -89,7 +89,7 @@ void QGeoIntrinsicNetworkAccessManager::configure(const QMap<QString, QVariant>
}
}
-QNetworkReply* QGeoIntrinsicNetworkAccessManager::get(const QNetworkRequest& request)
+QNetworkReply *QGeoIntrinsicNetworkAccessManager::get(const QNetworkRequest &request)
{
return m_networkManager->get(request);
}
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
index c1b85c9d..267b7f2e 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
@@ -56,14 +56,14 @@ public:
explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0);
QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> &parameters, const QString &token = QString(), QObject *parent = 0);
- virtual QNetworkReply* get(const QNetworkRequest& request);
+ virtual QNetworkReply *get(const QNetworkRequest &request);
virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
private:
void configure(const QMap<QString, QVariant> &parameters);
const QString m_customProxyToken;
- QNetworkAccessManager* m_networkManager;
+ QNetworkAccessManager *m_networkManager;
};
QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
index b249a194..60a18c3c 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
@@ -78,7 +78,7 @@ QGeoMapReplyNokia::~QGeoMapReplyNokia()
{
}
-QNetworkReply* QGeoMapReplyNokia::networkReply() const
+QNetworkReply *QGeoMapReplyNokia::networkReply() const
{
return m_reply;
}
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index bf5f9384..70fd8570 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -65,7 +65,7 @@ public:
void abort();
- QNetworkReply* networkReply() const;
+ QNetworkReply *networkReply() const;
private Q_SLOTS:
void replyDestroyed();
diff --git a/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h
index 73a4c208..8bc7ecb1 100644
--- a/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h
+++ b/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h
@@ -55,11 +55,11 @@ class QGeoNetworkAccessManager : public QObject
Q_OBJECT
public:
virtual ~QGeoNetworkAccessManager() {}
- virtual QNetworkReply* get(const QNetworkRequest& request) = 0;
+ virtual QNetworkReply *get(const QNetworkRequest &request) = 0;
virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) = 0;
protected:
- QGeoNetworkAccessManager(QObject* parent) : QObject(parent) {}
+ QGeoNetworkAccessManager(QObject *parent) : QObject(parent) {}
};
QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
index 9eabc593..7c98ea79 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
@@ -74,7 +74,7 @@ QGeoRouteXmlParser::~QGeoRouteXmlParser()
delete m_reader;
}
-bool QGeoRouteXmlParser::parse(QIODevice* source)
+bool QGeoRouteXmlParser::parse(QIODevice *source)
{
if (m_reader)
delete m_reader;
@@ -522,7 +522,7 @@ bool QGeoRouteXmlParser::parseLink()
return true;
}
-bool QGeoRouteXmlParser::parseGeoPoints(const QString& strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName)
+bool QGeoRouteXmlParser::parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName)
{
QStringList rawPoints = strPoints.split(' ');
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
index c798b233..ee659192 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
@@ -99,7 +99,7 @@ public:
QGeoRouteXmlParser(const QGeoRouteRequest &request);
~QGeoRouteXmlParser();
- bool parse(QIODevice* source);
+ bool parse(QIODevice *source);
QList<QGeoRoute> results() const;
QString errorString() const;
@@ -110,7 +110,7 @@ private:
bool parseCoordinates(QGeoCoordinate &coord);
bool parseMode(QGeoRoute *route);
bool parseSummary(QGeoRoute *route);
- bool parseGeoPoints(const QString& strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName);
+ bool parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName);
bool parseLeg();
bool parseManeuver();
bool parseLink();
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 8fa7d33a..f4295f57 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
- QGeoNetworkAccessManager* networkManager,
+ QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString)
@@ -124,7 +124,7 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
QGeoRoutingManagerEngineNokia::~QGeoRoutingManagerEngineNokia() {}
-QGeoRouteReply* QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteRequest& request)
+QGeoRouteReply *QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteRequest &request)
{
QString reqString = calculateRouteRequestString(request);
@@ -150,7 +150,7 @@ QGeoRouteReply* QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteReq
return reply;
}
-QGeoRouteReply* QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
+QGeoRouteReply *QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
{
QString reqString = updateRouteRequestString(route, position);
@@ -453,7 +453,7 @@ QString QGeoRoutingManagerEngineNokia::trimDouble(double degree, int decimalDigi
void QGeoRoutingManagerEngineNokia::routeFinished()
{
- QGeoRouteReply *reply = qobject_cast<QGeoRouteReply*>(sender());
+ QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender());
if (!reply)
return;
@@ -468,7 +468,7 @@ void QGeoRoutingManagerEngineNokia::routeFinished()
void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, const QString &errorString)
{
- QGeoRouteReply *reply = qobject_cast<QGeoRouteReply*>(sender());
+ QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender());
if (!reply)
return;
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 8e9b9ef9..f5bb9541 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -62,14 +62,14 @@ class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine
{
Q_OBJECT
public:
- QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager* networkInterface,
+ QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager *networkInterface,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString);
~QGeoRoutingManagerEngineNokia();
- QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request);
- QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
+ QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request);
+ QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
private Q_SLOTS:
void routeFinished();
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 2f2a4dc4..d031d1cd 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -80,7 +80,7 @@ static bool isValidParameter(const QString &param)
static QGeoNetworkAccessManager *tryGetNetworkAccessManager(const QVariantMap &parameters)
{
- return static_cast<QGeoNetworkAccessManager*>(qvariant_cast<void*>(parameters.value(QStringLiteral("nam"))));
+ return static_cast<QGeoNetworkAccessManager *>(qvariant_cast<void *>(parameters.value(QStringLiteral("nam"))));
}
QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia()
@@ -89,42 +89,42 @@ QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia()
QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {}
-QGeocodingManagerEngine* QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine(
+QGeocodingManagerEngine *QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine(
const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
informOnceAboutUsageTermsIfNecessary(parameters);
- QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+ QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
if (!networkManager)
networkManager = new QGeoIntrinsicNetworkAccessManager(parameters);
return new QGeocodingManagerEngineNokia(networkManager, parameters, error, errorString);
}
-QGeoMappingManagerEngine* QGeoServiceProviderFactoryNokia::createMappingManagerEngine(
+QGeoMappingManagerEngine *QGeoServiceProviderFactoryNokia::createMappingManagerEngine(
const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
informOnceAboutUsageTermsIfNecessary(parameters);
- QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+ QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
if (!networkManager)
networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("mapping.proxy"));
return new QGeoTiledMappingManagerEngineNokia(networkManager, parameters, error, errorString);
}
-QGeoRoutingManagerEngine* QGeoServiceProviderFactoryNokia::createRoutingManagerEngine(
+QGeoRoutingManagerEngine *QGeoServiceProviderFactoryNokia::createRoutingManagerEngine(
const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
informOnceAboutUsageTermsIfNecessary(parameters);
- QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+ QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
if (!networkManager)
networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("routing.proxy"));
@@ -138,7 +138,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryNokia::createPlaceManagerEngine(
{
informOnceAboutUsageTermsIfNecessary(parameters);
- QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+ QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
if (!networkManager)
networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("places.proxy"));
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
index ed9ad35c..917117de 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
@@ -67,13 +67,13 @@ public:
QGeoServiceProviderFactoryNokia();
~QGeoServiceProviderFactoryNokia();
- QGeocodingManagerEngine* createGeocodingManagerEngine(const QVariantMap &parameters,
+ QGeocodingManagerEngine *createGeocodingManagerEngine(const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
- QGeoMappingManagerEngine* createMappingManagerEngine(const QVariantMap &parameters,
+ QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
- QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap &parameters,
+ QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index a436315b..e71d4378 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -80,7 +80,7 @@ void QGeoTiledMapDataNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visible
const int shadowWidth = 2;
const int fontSize = 10;
- QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia*>(engine());
+ QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia *>(engine());
QString copyrightsString = engineNokia->evaluateCopyrightsText(activeMapType().style(), mapController()->zoom(), visibleTiles);
if (width() > 0 && height() > 0 && (lastCopyrightsString.isNull() || copyrightsString != lastCopyrightsString)) {
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index 76305e57..15c67ded 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -66,7 +66,7 @@
QT_BEGIN_NAMESPACE
QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
- QGeoNetworkAccessManager* networkManager,
+ QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString)
@@ -110,7 +110,7 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
if (parameters.contains(QLatin1String("mapping.cache.directory")))
cacheDir = parameters.value(QLatin1String("mapping.cache.directory")).toString();
- QGeoTileCache* tileCache = createTileCacheWithDir(cacheDir);
+ QGeoTileCache *tileCache = createTileCacheWithDir(cacheDir);
if (parameters.contains(QLatin1String("mapping.cache.disk.size"))) {
bool ok = false;
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
index 91171e03..92b634cd 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
@@ -70,13 +70,13 @@ class QGeoTiledMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine
Q_OBJECT
public:
- QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager* networkManager,
+ QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString);
~QGeoTiledMappingManagerEngineNokia();
- virtual QGeoMapData* createMapData();
+ virtual QGeoMapData *createMapData();
QString evaluateCopyrightsText(const QGeoMapType::MapStyle mapStyle,
const int zoomLevel,
const QSet<QGeoTileSpec> &tiles);
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index c8ff5ad6..c33000c3 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -66,13 +66,13 @@
QT_BEGIN_NAMESPACE
-const char* MAPTILES_HOST = "1-4.maptile.lbs.ovi.com";
-const char* MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn";
+const char *MAPTILES_HOST = "1-4.maptile.lbs.ovi.com";
+const char *MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn";
-QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager,
+QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager *networkManager,
QGeoTiledMappingManagerEngine *engine)
: QGeoTileFetcher(engine),
- m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia*>(engine)),
+ m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia *>(engine)),
m_networkManager(networkManager),
m_firstSubdomain(QChar::Null),
m_copyrightsReply(0),
@@ -120,7 +120,7 @@ bool QGeoTileFetcherNokia::init()
return true;
}
-QGeoTiledMapReply* QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec)
+QGeoTiledMapReply *QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec)
{
// TODO add error detection for if request.connectivityMode() != QGraphicsGeoMap::OnlineMode
QString rawRequest = getRequestString(spec);
@@ -128,9 +128,9 @@ QGeoTiledMapReply* QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec)
QNetworkRequest netRequest((QUrl(rawRequest))); // The extra pair of parens disambiguates this from a function declaration
netRequest.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
- QNetworkReply* netReply = m_networkManager->get(netRequest);
+ QNetworkReply *netReply = m_networkManager->get(netRequest);
- QGeoTiledMapReply* mapReply = new QGeoMapReplyNokia(netReply, spec);
+ QGeoTiledMapReply *mapReply = new QGeoMapReplyNokia(netReply, spec);
return mapReply;
}
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
index 3280e870..6a51e8de 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
@@ -74,18 +74,18 @@ class QGeoTileFetcherNokia : public QGeoTileFetcher
Q_OBJECT
public:
- QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager, QGeoTiledMappingManagerEngine *engine);
+ QGeoTileFetcherNokia(QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngine *engine);
~QGeoTileFetcherNokia();
bool init();
- QGeoTiledMapReply* getTileImage(const QGeoTileSpec &spec);
+ QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec);
- const QString& host() const;
+ const QString &host() const;
QChar firstSubdomain() const;
unsigned char maxSubdomains() const;
- const QString& token() const;
- const QString& applicationId() const;
+ const QString &token() const;
+ const QString &applicationId() const;
void setParams(const QMap<QString, QVariant> &parameters);
void setTileSize(QSize tileSize);
@@ -96,7 +96,7 @@ public Q_SLOTS:
#ifdef USE_CHINA_NETWORK_REGISTRATION
private Q_SLOTS:
- void currentMobileCountryCodeChanged(int interface, const QString& mcc);
+ void currentMobileCountryCodeChanged(int interface, const QString &mcc);
#endif
private:
@@ -107,7 +107,7 @@ private:
static QString sizeToStr(const QSize &size);
static QString mapIdToStr(int mapId);
- void setHost(const QString& host);
+ void setHost(const QString &host);
QGeoTiledMappingManagerEngineNokia *m_engineNokia;
QGeoNetworkAccessManager *m_networkManager;
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp
index 97a1340e..19d6d94b 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp
@@ -64,7 +64,7 @@
QT_USE_NAMESPACE
QPlaceManagerEngineNokiaV1::QPlaceManagerEngineNokiaV1(
- QGeoNetworkAccessManager* networkManager,
+ QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString)
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
index dff8adb7..45a11859 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
@@ -64,7 +64,7 @@ class QPlaceManagerEngineNokiaV1 : public QPlaceManagerEngine
Q_OBJECT
public:
- QPlaceManagerEngineNokiaV1(QGeoNetworkAccessManager* networkManager,
+ QPlaceManagerEngineNokiaV1(QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString);
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index 25a12ff7..6a465441 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -93,7 +93,7 @@ static const char * const placesServerInternational = "http://api.places.lbs.map
static const char * const placesServerChina = "http://api.places.lbs.maps.nokia.com.cn/places";
QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(
- QGeoNetworkAccessManager* networkManager,
+ QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString)
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index 3ed4af61..60539aa5 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -77,7 +77,7 @@ class QPlaceManagerEngineNokiaV2 : public QPlaceManagerEngine
Q_OBJECT
public:
- QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager* networkManager,
+ QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager *networkManager,
const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString);
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
index 4c2bd548..5eefd26b 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
@@ -51,7 +51,7 @@ QGeoServiceProviderFactoryJsonDb::QGeoServiceProviderFactoryJsonDb() {}
QGeoServiceProviderFactoryJsonDb::~QGeoServiceProviderFactoryJsonDb() {}
-QGeocodingManagerEngine* QGeoServiceProviderFactoryJsonDb::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeocodingManagerEngine *QGeoServiceProviderFactoryJsonDb::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
@@ -62,7 +62,7 @@ QGeocodingManagerEngine* QGeoServiceProviderFactoryJsonDb::createGeocodingManage
return 0;
}
-QGeoMappingManagerEngine* QGeoServiceProviderFactoryJsonDb::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoMappingManagerEngine *QGeoServiceProviderFactoryJsonDb::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
@@ -73,7 +73,7 @@ QGeoMappingManagerEngine* QGeoServiceProviderFactoryJsonDb::createMappingManager
return 0;
}
-QGeoRoutingManagerEngine* QGeoServiceProviderFactoryJsonDb::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoRoutingManagerEngine *QGeoServiceProviderFactoryJsonDb::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const
{
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
index 59a19abb..e3b40284 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
@@ -58,13 +58,13 @@ public:
QGeoServiceProviderFactoryJsonDb();
~QGeoServiceProviderFactoryJsonDb();
- QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+ QGeocodingManagerEngine *createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
- QGeoMappingManagerEngine* createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+ QGeoMappingManagerEngine *createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
- QGeoRoutingManagerEngine* createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+ QGeoRoutingManagerEngine *createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index 37a93b1c..d9a7f2dc 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -66,9 +66,9 @@ static void position_changed (GeocluePosition *position,
Q_UNUSED(position);
if (!(fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)) {
- static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->regularUpdateFailed();
+ static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->regularUpdateFailed();
} else {
- static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->regularUpdateSucceeded(
+ static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->regularUpdateSucceeded(
fields, timestamp, latitude, longitude, altitude, accuracy);
}
}
@@ -87,10 +87,10 @@ static void velocity_changed (GeoclueVelocity *velocity,
Q_UNUSED(direction)
Q_UNUSED(climb)
if (!(fields & GEOCLUE_VELOCITY_FIELDS_SPEED)) {
- static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->velocityUpdateFailed();
+ static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->velocityUpdateFailed();
return;
}
- static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->velocityUpdateSucceeded(speed);
+ static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->velocityUpdateSucceeded(speed);
}
// Callback for single async update
@@ -111,10 +111,10 @@ static void position_callback (GeocluePosition *pos,
g_error_free (error);
if (!(fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)) {
- static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->singleUpdateFailed();
+ static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->singleUpdateFailed();
} else {
- static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->singleUpdateSucceeded(
+ static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->singleUpdateSucceeded(
fields, timestamp, latitude, longitude, altitude, accuracy);
}
}
@@ -232,8 +232,8 @@ void QGeoPositionInfoSourceGeoclueMaster::regularUpdateSucceeded(GeocluePosition
bool QGeoPositionInfoSourceGeoclueMaster::tryGPS()
{
// Check if the gconf value is set properly
- GConfClient* client;
- gchar* device_name;
+ GConfClient *client;
+ gchar *device_name;
client = gconf_client_get_default();
device_name = gconf_client_get_string(client, "/apps/geoclue/master/org.freedesktop.Geoclue.GPSDevice", NULL);
QString deviceName(QString::fromLatin1(device_name));
@@ -465,9 +465,9 @@ void QGeoPositionInfoSourceGeoclueMaster::stopUpdates()
if (m_updateTimer.isActive())
m_updateTimer.stop();
if (m_pos) {
- g_signal_handlers_disconnect_by_func(G_OBJECT(m_pos), (void*)position_changed, this);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(m_pos), (void *)position_changed, this);
} if (m_vel) {
- g_signal_handlers_disconnect_by_func(G_OBJECT(m_vel), (void*)velocity_changed, this);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(m_vel), (void *)velocity_changed, this);
}
}
@@ -523,7 +523,7 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo(
double latitude,
double longitude,
double altitude,
- GeoclueAccuracy* accuracy)
+ GeoclueAccuracy * accuracy)
{
QGeoCoordinate coordinate(latitude, longitude);
QDateTime dateTime = QDateTime();
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
index 8946767a..cd4db044 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
@@ -118,14 +118,14 @@ private:
double latitude,
double longitude,
double altitude,
- GeoclueAccuracy* accuracy);
+ GeoclueAccuracy * accuracy);
private:
int m_updateInterval;
GeoclueResourceFlags m_preferredResources;
GeoclueAccuracyLevel m_preferredAccuracy;
GeoclueMasterClient *m_client;
GeocluePosition *m_pos;
- GeoclueVelocity* m_vel;
+ GeoclueVelocity *m_vel;
QTimer m_updateTimer;
QTimer m_requestTimer;
bool m_lastPositionIsFresh;
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
index cbfb31ae..4c4606cb 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
@@ -59,10 +59,10 @@ static void satellites_changed (GypsySatellite *satellite,
#ifdef Q_LOCATION_GYPSY_DEBUG
qDebug() << "QGeoSatelliteInfoSourceGypsy Gypsy satellites-changed -signal received.";
#endif
- ((QGeoSatelliteInfoSourceGypsy*)userdata)->satellitesChanged(satellite, satellites);
+ ((QGeoSatelliteInfoSourceGypsy *)userdata)->satellitesChanged(satellite, satellites);
}
-SatelliteGypsyEngine::SatelliteGypsyEngine(QGeoSatelliteInfoSource* parent) :
+SatelliteGypsyEngine::SatelliteGypsyEngine(QGeoSatelliteInfoSource *parent) :
m_owner(parent)
{
}
@@ -72,7 +72,7 @@ SatelliteGypsyEngine::~SatelliteGypsyEngine()
// Glib symbols
gulong SatelliteGypsyEngine::eng_g_signal_connect(gpointer instance,
- const gchar* detailed_signal,
+ const gchar *detailed_signal,
GCallback c_handler,
gpointer data)
{
@@ -90,11 +90,11 @@ void SatelliteGypsyEngine::eng_g_free(gpointer mem)
return ::g_free(mem);
}
// Gypsy symbols
-GypsyControl* SatelliteGypsyEngine::eng_gypsy_control_get_default (void)
+GypsyControl *SatelliteGypsyEngine::eng_gypsy_control_get_default (void)
{
return ::gypsy_control_get_default();
}
-char *SatelliteGypsyEngine::eng_gypsy_control_create (GypsyControl *control, const char*device_name, GError **error)
+char *SatelliteGypsyEngine::eng_gypsy_control_create (GypsyControl *control, const char *device_name, GError **error)
{
return ::gypsy_control_create(control, device_name, error);
}
@@ -133,11 +133,11 @@ void SatelliteGypsyEngine::eng_gypsy_satellite_free_satellite_array (GPtrArray *
return ::gypsy_satellite_free_satellite_array(satellites);
}
// GConf symbols (mockability due to X11 requirement)
-GConfClient* SatelliteGypsyEngine::eng_gconf_client_get_default(void)
+GConfClient *SatelliteGypsyEngine::eng_gconf_client_get_default(void)
{
return ::gconf_client_get_default();
}
-gchar* SatelliteGypsyEngine::eng_gconf_client_get_string(GConfClient* client, const gchar* key, GError** err)
+gchar *SatelliteGypsyEngine::eng_gconf_client_get_string(GConfClient *client, const gchar *key, GError** err)
{
return ::gconf_client_get_string(client, key, err);
}
@@ -158,7 +158,7 @@ void QGeoSatelliteInfoSourceGypsy::createEngine()
QGeoSatelliteInfoSourceGypsy::~QGeoSatelliteInfoSourceGypsy()
{
- GError* error = NULL;
+ GError *error = NULL;
if (m_device) {
m_engine->eng_gypsy_device_stop (m_device, &error);
g_object_unref(m_device);
@@ -171,8 +171,8 @@ QGeoSatelliteInfoSourceGypsy::~QGeoSatelliteInfoSourceGypsy()
delete m_engine;
}
-void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite* satellite,
- GPtrArray* satellites)
+void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite *satellite,
+ GPtrArray *satellites)
{
if (!satellite || !satellites)
return;
@@ -185,7 +185,7 @@ void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite* satellite,
unsigned int i;
for (i = 0; i < satellites->len; i++) {
- GypsySatelliteDetails *details = (GypsySatelliteDetails*)satellites->pdata[i];
+ GypsySatelliteDetails *details = (GypsySatelliteDetails *)satellites->pdata[i];
QGeoSatelliteInfo info;
info.setAttribute(QGeoSatelliteInfo::Elevation, details->elevation);
info.setAttribute(QGeoSatelliteInfo::Azimuth, details->azimuth);
@@ -202,7 +202,7 @@ void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite* satellite,
m_requestOngoing = false;
// If there is no regular updates ongoing, disconnect now.
if (!m_updatesOngoing) {
- m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void*)satellites_changed, this);
+ m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void *)satellites_changed, this);
}
}
// If regular updates are to be delivered as they come:
@@ -219,8 +219,8 @@ int QGeoSatelliteInfoSourceGypsy::init()
{
GError *error = NULL;
char *path;
- GConfClient* client;
- gchar* device_name;
+ GConfClient *client;
+ gchar *device_name;
g_type_init ();
createEngine();
@@ -306,7 +306,7 @@ void QGeoSatelliteInfoSourceGypsy::stopUpdates()
// is completed and it notices that there is no active update ongoing, it will disconnect
// the signal.
if (!m_requestTimer.isActive())
- m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void*)satellites_changed, this);
+ m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void *)satellites_changed, this);
}
void QGeoSatelliteInfoSourceGypsy::requestUpdate(int timeout)
@@ -326,7 +326,7 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdate(int timeout)
#ifdef Q_LOCATION_GYPSY_DEBUG
qDebug() << "QGeoSatelliteInfoSourceGypsy fix available, requesting current satellite data";
#endif
- GPtrArray* satelliteData = m_engine->eng_gypsy_satellite_get_satellites(m_satellite, &error);
+ GPtrArray *satelliteData = m_engine->eng_gypsy_satellite_get_satellites(m_satellite, &error);
if (!error) {
// The fix was available and we have satellite data to deliver right away.
satellitesChanged(m_satellite, satelliteData);
@@ -358,7 +358,7 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdateTimeout()
// Emit timeout and disconnect from signal if regular updates are not
// ongoing (as we were listening just for one single requestUpdate).
if (!m_updatesOngoing) {
- m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void*)satellites_changed, this);
+ m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void *)satellites_changed, this);
}
m_requestOngoing = false;
emit requestTimeout();
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
index 956836ad..a6079a8e 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
@@ -70,11 +70,11 @@ QT_BEGIN_NAMESPACE
class SatelliteGypsyEngine
{
public:
- SatelliteGypsyEngine(QGeoSatelliteInfoSource* parent = 0);
+ SatelliteGypsyEngine(QGeoSatelliteInfoSource *parent = 0);
virtual ~SatelliteGypsyEngine();
// Glib symbols
virtual gulong eng_g_signal_connect(gpointer instance,
- const gchar* detailed_signal,
+ const gchar *detailed_signal,
GCallback c_handler,
gpointer data);
virtual guint eng_g_signal_handlers_disconnect_by_func(gpointer instance,
@@ -82,8 +82,8 @@ public:
gpointer data);
virtual void eng_g_free(gpointer mem);
// Gypsy symbols
- virtual GypsyControl* eng_gypsy_control_get_default (void);
- virtual char *eng_gypsy_control_create (GypsyControl *control, const char*device_name, GError **error);
+ virtual GypsyControl *eng_gypsy_control_get_default (void);
+ virtual char *eng_gypsy_control_create (GypsyControl *control, const char *device_name, GError **error);
virtual GypsyDevice *eng_gypsy_device_new (const char *object_path);
virtual GypsySatellite *eng_gypsy_satellite_new (const char *object_path);
virtual gboolean eng_gypsy_device_start (GypsyDevice *device, GError **error);
@@ -92,10 +92,10 @@ public:
virtual GPtrArray *eng_gypsy_satellite_get_satellites (GypsySatellite *satellite, GError **error);
virtual void eng_gypsy_satellite_free_satellite_array (GPtrArray *satellites);
// GConf symbols (mockability due to X11 requirement)
- virtual GConfClient* eng_gconf_client_get_default(void);
- virtual gchar* eng_gconf_client_get_string(GConfClient* client, const gchar* key, GError** err);
+ virtual GConfClient *eng_gconf_client_get_default(void);
+ virtual gchar *eng_gconf_client_get_string(GConfClient *client, const gchar *key, GError** err);
protected:
- QGeoSatelliteInfoSource* m_owner;
+ QGeoSatelliteInfoSource *m_owner;
};
class QGeoSatelliteInfoSourceGypsy : public QGeoSatelliteInfoSource
@@ -111,7 +111,7 @@ public slots:
virtual void startUpdates();
void stopUpdates();
void requestUpdate(int timeout = 5000);
- void satellitesChanged(GypsySatellite* satellite, GPtrArray* satellites);
+ void satellitesChanged(GypsySatellite *satellite, GPtrArray *satellites);
signals:
void satellitesInViewUpdated(const QList<QGeoSatelliteInfo> &satellites);
@@ -124,12 +124,12 @@ protected:
// Creates an engine which encapsulates all used symbols
// that we want to be also able to mock.
virtual void createEngine();
- SatelliteGypsyEngine* m_engine;
+ SatelliteGypsyEngine *m_engine;
private:
Q_DISABLE_COPY(QGeoSatelliteInfoSourceGypsy)
- GypsySatellite* m_satellite;
- GypsyDevice* m_device;
+ GypsySatellite *m_satellite;
+ GypsyDevice *m_device;
QTimer m_requestTimer;
bool m_updatesOngoing;
bool m_requestOngoing;
diff --git a/src/plugins/position/maemo/dbuscomm_maemo.cpp b/src/plugins/position/maemo/dbuscomm_maemo.cpp
index 0aeb2b50..1a1db1d5 100644
--- a/src/plugins/position/maemo/dbuscomm_maemo.cpp
+++ b/src/plugins/position/maemo/dbuscomm_maemo.cpp
@@ -50,8 +50,8 @@ const QString DBusComm::positioningdService = QString("com.nokia.positioningd.
const QString DBusComm::positioningdPath = QString("/com/nokia/positioningd/client");
const QString DBusComm::positioningdInterface = QString("com.nokia.positioningd.client");
-DBusComm::DBusComm(QObject *parent) : QObject(parent),
- minimumUpdateInterval(1000),
+DBusComm::DBusComm(QObject *parent) : QObject(parent),
+ minimumUpdateInterval(1000),
availablePositioningMethods(QGeoPositionInfoSource::AllPositioningMethods)
{
}
@@ -67,7 +67,7 @@ int DBusComm::init()
// Application auto-start by dbus may take a while, so try
// connecting a few times.
- int cnt = 10;
+ int cnt = 10;
positioningdProxy = new QDBusInterface(positioningdService,
positioningdPath,
positioningdInterface,
@@ -87,20 +87,20 @@ int DBusComm::init()
cerr << "DBus connection to positioning daemon failed.\n";
return -1;
}
- serviceDisconnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(),
+ serviceDisconnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(),
QDBusServiceWatcher::WatchForUnregistration, this);
-
+
QObject::connect(serviceDisconnectWatcher, SIGNAL(serviceUnregistered ( const QString &)),
this,SLOT(onServiceDisconnect(const QString &)));
- serviceConnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(),
+ serviceConnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(),
QDBusServiceWatcher::WatchForRegistration, this);
-
+
QObject::connect(serviceConnectWatcher, SIGNAL(serviceRegistered ( const QString &)),
this,SLOT(onServiceConnect(const QString &)));
-
- if (createUniqueName() == false) { // set myService, myPath
+
+ if (createUniqueName() == false) { // set myService, myPath
return -1;
}
@@ -194,12 +194,12 @@ int DBusComm::minimumInterval() const
bool DBusComm::sendConfigRequest(Command command, QGeoPositionInfoSource::PositioningMethods method,
int interval) const
{
- QDBusReply<int> reply;
+ QDBusReply<int> reply;
reply = positioningdProxy->call("configSession", clientId, command, int(method), interval);
-
+
//cout << "sessionConfigRequest cmd: cmd:" << command << " method: ";
//cout << method << " interval: " << interval << "\n";
-
+
if (reply.isValid()) {
int n = reply.value();
} else {
@@ -213,9 +213,9 @@ bool DBusComm::sendConfigRequest(Command command, QGeoPositionInfoSource::Positi
}
-QGeoPositionInfo& DBusComm::requestLastKnownPosition(bool satelliteMethodOnly)
+QGeoPositionInfo &DBusComm::requestLastKnownPosition(bool satelliteMethodOnly)
{
- QDBusReply<QByteArray> reply;
+ QDBusReply<QByteArray> reply;
reply = positioningdProxy->call("latestPosition", satelliteMethodOnly);
static QGeoPositionInfo update;
@@ -232,7 +232,7 @@ QGeoPositionInfo& DBusComm::requestLastKnownPosition(bool satelliteMethodOnly)
}
return update;
-}
+}
bool DBusComm::createUniqueName()
diff --git a/src/plugins/position/maemo/dbuscomm_maemo_p.h b/src/plugins/position/maemo/dbuscomm_maemo_p.h
index ca25d7d9..66a28fc0 100644
--- a/src/plugins/position/maemo/dbuscomm_maemo_p.h
+++ b/src/plugins/position/maemo/dbuscomm_maemo_p.h
@@ -71,16 +71,16 @@ class DBusComm: public QObject, DBusServerIF
public:
- enum Command {CommandStart = 1, CommandStop = 2, CommandOneShot = 3,
- CommandSetMethods = 4, CommandSetInterval = 8,
+ enum Command {CommandStart = 1, CommandStop = 2, CommandOneShot = 3,
+ CommandSetMethods = 4, CommandSetInterval = 8,
CommandSatStart = 16, CommandSatStop = 32, CommandSatOneShot = 48};
DBusComm(QObject *parent = 0);
int init();
bool sendDBusRegister();
- bool sendConfigRequest(Command command, QGeoPositionInfoSource::PositioningMethods method,
+ bool sendConfigRequest(Command command, QGeoPositionInfoSource::PositioningMethods method,
int interval) const;
- QGeoPositionInfo& requestLastKnownPosition(bool satelliteMethodOnly);
+ QGeoPositionInfo &requestLastKnownPosition(bool satelliteMethodOnly);
QGeoPositionInfoSource::PositioningMethods availableMethods() const;
int minimumInterval() const;
@@ -104,7 +104,7 @@ private:
void receiveSettings(QGeoPositionInfoSource::PositioningMethod methods, qint32 interval);
QDBusInterface *positioningdProxy;
- DBusServer* dbusServer;
+ DBusServer *dbusServer;
QObject serverObj;
QString myService;
QString myPath;
diff --git a/src/plugins/position/maemo/dbusserver_maemo.cpp b/src/plugins/position/maemo/dbusserver_maemo.cpp
index ca73b85e..a7cea4cc 100644
--- a/src/plugins/position/maemo/dbusserver_maemo.cpp
+++ b/src/plugins/position/maemo/dbusserver_maemo.cpp
@@ -43,8 +43,8 @@
QT_BEGIN_NAMESPACE
-DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj),
- interface(iface)
+DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj),
+ interface(iface)
{
}
diff --git a/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp b/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp
index 0305c69c..ff52688e 100644
--- a/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp
+++ b/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp
@@ -78,9 +78,9 @@ void QGeoPositionInfoSourceMaemo::onServiceDisconnect()
void QGeoPositionInfoSourceMaemo::onServiceConnect()
{
- DBusComm::Command command =
+ DBusComm::Command command =
(DBusComm::Command)
- ( DBusComm::CommandSetInterval |
+ ( DBusComm::CommandSetInterval |
DBusComm::CommandSetMethods );
int interval = QGeoPositionInfoSource::updateInterval();
@@ -110,7 +110,7 @@ void QGeoPositionInfoSourceMaemo::newPositionUpdate(const QGeoPositionInfo &upda
QGeoPositionInfo QGeoPositionInfoSourceMaemo::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
{
- QGeoPositionInfo update = dbusComm->requestLastKnownPosition(fromSatellitePositioningMethodsOnly);
+ QGeoPositionInfo update = dbusComm->requestLastKnownPosition(fromSatellitePositioningMethodsOnly);
return update;
}
@@ -163,13 +163,13 @@ void QGeoPositionInfoSourceMaemo::stopUpdates()
void QGeoPositionInfoSourceMaemo::requestUpdate(int timeout)
{
- if ( QGeoPositionInfoSource::updateInterval() !=
+ if ( QGeoPositionInfoSource::updateInterval() !=
dbusComm->minimumInterval() )
- dbusComm->sendConfigRequest(dbusComm->CommandSetInterval, 0,
+ dbusComm->sendConfigRequest(dbusComm->CommandSetInterval, 0,
dbusComm->minimumInterval());
if ( !QGeoPositionInfoSource::preferredPositioningMethods().testFlag(QGeoPositionInfoSource::AllPositioningMethods) )
- dbusComm->sendConfigRequest(dbusComm->CommandSetMethods,
+ dbusComm->sendConfigRequest(dbusComm->CommandSetMethods,
QGeoPositionInfoSource::AllPositioningMethods, 0);
if ( !locationOngoing )
diff --git a/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h b/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h
index e82ba344..ac495321 100644
--- a/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h
+++ b/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h
@@ -92,10 +92,10 @@ public Q_SLOTS:
void requestUpdate(int timeout = 5000);
private:
- DBusComm* dbusComm;
- QTimer* requestTimer;
+ DBusComm *dbusComm;
+ QTimer *requestTimer;
bool locationOngoing;
-
+
void shutdownRequestSession();
private Q_SLOTS:
diff --git a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp
index 4922549b..9ff7d486 100644
--- a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp
+++ b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp
@@ -103,7 +103,7 @@ void QGeoSatelliteInfoSourceMaemo::newSatellitesInView(const QList<QGeoSatellite
requestTimer->stop();
if ( !running )
dbusComm->sendConfigRequest(DBusComm::CommandSatStop, 0, 0);
- else
+ else
emit satellitesInViewUpdated(update);
} else {
emit satellitesInViewUpdated(update);
diff --git a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h
index dfa1494b..eac30d97 100644
--- a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h
+++ b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h
@@ -84,10 +84,10 @@ private Q_SLOTS:
void requestTimerExpired();
private:
- DBusComm* dbusComm;
+ DBusComm *dbusComm;
bool running;
bool satInViewSeen;
- QTimer* requestTimer;
+ QTimer *requestTimer;
Q_DISABLE_COPY(QGeoSatelliteInfoSourceMaemo)
};
diff --git a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp
index 1ad8905b..4a060fe6 100644
--- a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp
+++ b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp
@@ -65,7 +65,7 @@ bool QGeoPositionInfoSourceNpeBackend::init()
QGeoPositionInfo QGeoPositionInfoSourceNpeBackend::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
{
- const PositionData& position = m_locationdConn->lastKnownPosition(fromSatellitePositioningMethodsOnly);
+ const PositionData &position = m_locationdConn->lastKnownPosition(fromSatellitePositioningMethodsOnly);
QGeoCoordinate coordinate;
QGeoPositionInfo lastPosition;
coordinate.setLatitude(position.latitude);
@@ -216,7 +216,7 @@ void QGeoPositionInfoSourceNpeBackend::shutdownRequestSession()
}
-void QGeoPositionInfoSourceNpeBackend::onPositionUpdate(const PositionData& position)
+void QGeoPositionInfoSourceNpeBackend::onPositionUpdate(const PositionData &position)
{
if (position.valid) {
QGeoPositionInfo update;
diff --git a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h
index 0f170c85..6c9c2c7c 100644
--- a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h
+++ b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h
@@ -80,10 +80,10 @@ public Q_SLOTS:
private:
void setError(QGeoPositionInfoSource::Error positionError);
void shutdownRequestSession();
- LocationDaemonConnection* m_locationdConn;
+ LocationDaemonConnection *m_locationdConn;
bool trackingOngoing;
bool timeoutSent;
- QTimer* requestTimer;
+ QTimer *requestTimer;
QGeoPositionInfoSource::Error mPositionError;
diff --git a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp
index 055fa229..ad05d161 100644
--- a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp
+++ b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp
@@ -156,7 +156,7 @@ void QGeoSatelliteInfoSourceNpeBackend::shutdownRequestSession()
}
-void QGeoSatelliteInfoSourceNpeBackend::onSatelliteUpdate(const QList<SatelliteData>& satellites)
+void QGeoSatelliteInfoSourceNpeBackend::onSatelliteUpdate(const QList<SatelliteData> &satellites)
{
QList<QGeoSatelliteInfo> inUse;
QList<QGeoSatelliteInfo> inView;
@@ -166,7 +166,7 @@ void QGeoSatelliteInfoSourceNpeBackend::onSatelliteUpdate(const QList<SatelliteD
while (it.hasNext())
{
QGeoSatelliteInfo satinfo;
- const SatelliteData& satellite = it.next();
+ const SatelliteData &satellite = it.next();
satinfo.setAttribute(QGeoSatelliteInfo::Elevation, satellite.elevation);
satinfo.setAttribute(QGeoSatelliteInfo::Azimuth, satellite.azimuth);
satinfo.setSatelliteIdentifier(satellite.id);
diff --git a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h
index 1a8f3568..78a78ef9 100644
--- a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h
+++ b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h
@@ -77,14 +77,14 @@ public Q_SLOTS:
private:
void setError(QGeoSatelliteInfoSource::Error satelliteError);
void shutdownRequestSession();
- LocationDaemonConnection* m_locationdConn;
+ LocationDaemonConnection *m_locationdConn;
bool satOngoing;
- QTimer* requestTimer;
+ QTimer *requestTimer;
QGeoSatelliteInfoSource::Error mSatelliteError;
private Q_SLOTS:
- void onSatelliteUpdate(const QList<SatelliteData>& satellites);
+ void onSatelliteUpdate(const QList<SatelliteData> &satellites);
void onConnectionError(LocationDaemonConnection::SocketError socketError);
void requestTimerExpired();
};