summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Wilson <alex.wilson@nokia.com>2012-05-14 17:35:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-15 06:03:33 +0200
commit91fef5b781609a0ccbccb9d282148fc04feca585 (patch)
tree7ea8a7eacfc55b91a20532acf69ac0728da2c74a /src
parent402f904f8c37e0b14ce07d49aaa391ee2d71de64 (diff)
downloadqtlocation-91fef5b781609a0ccbccb9d282148fc04feca585.tar.gz
Coding style fixes: use Q_SIGNALS/Q_SLOTS
Change-Id: I64fd9e5430dcd6cca38bcef3cbe73a944223b17a Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativecategory_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeperiod_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplace_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeratings_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h6
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h6
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h4
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupplier_p.h2
-rw-r--r--src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h6
-rw-r--r--src/imports/location/qdeclarativegeoaddress_p.h2
-rw-r--r--src/imports/location/qdeclarativegeoboundingbox_p.h4
-rw-r--r--src/imports/location/qdeclarativegeoboundingcircle_p.h4
-rw-r--r--src/imports/location/qdeclarativegeolocation_p.h2
-rw-r--r--src/imports/location/qdeclarativegeomapflickable_p.h2
-rw-r--r--src/imports/location/qdeclarativegeomapgesturearea_p.h4
-rw-r--r--src/imports/location/qdeclarativegeomappincharea_p.h2
-rw-r--r--src/imports/location/qdeclarativegeoserviceprovider_p.h2
-rw-r--r--src/location/maps/qgeomapcontroller_p.h4
-rw-r--r--src/location/maps/qgeotilecache_p.h2
-rw-r--r--src/location/maps/qgeotilerequestmanager.cpp2
-rw-r--r--src/location/qgeoareamonitor_polling_p.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeocodereply_nokia.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeomapreply_nokia.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutereply_nokia.h2
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h2
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h2
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h2
36 files changed, 51 insertions, 51 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h
index 8042d82d..bee90a14 100644
--- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h
@@ -75,7 +75,7 @@ public:
void setValue(const QString &value);
-signals:
+Q_SIGNALS:
void keyChanged();
void labelChanged();
void valueChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h
index b15976ba..7c35fbca 100644
--- a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h
@@ -115,7 +115,7 @@ public:
Q_INVOKABLE void save(const QString &parentId = QString());
Q_INVOKABLE void remove();
-signals:
+Q_SIGNALS:
void pluginChanged();
void categoryIdChanged();
void nameChanged();
@@ -123,7 +123,7 @@ signals:
void iconChanged();
void statusChanged();
-private slots:
+private Q_SLOTS:
void replyFinished();
void pluginReady();
diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h b/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h
index 03c7a871..65c3c98a 100644
--- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h
@@ -70,7 +70,7 @@ public:
QString value() const;
void setValue(const QString &value);
-signals:
+Q_SIGNALS:
void labelChanged();
void valueChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h
index 130af588..d53aa33f 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h
@@ -75,7 +75,7 @@ public:
QTime endTime() const;
void setEndTime(const QTime &data);
-signals:
+Q_SIGNALS:
void startDateChanged();
void startTimeChanged();
void endDateChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
index b5aa8227..8715c36e 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
@@ -176,7 +176,7 @@ public:
Q_INVOKABLE void copyFrom(QDeclarativePlace *original);
Q_INVOKABLE void initializeFavorite(QDeclarativeGeoServiceProvider *plugin);
-signals:
+Q_SIGNALS:
void pluginChanged();
void categoriesChanged();
void locationChanged();
@@ -202,7 +202,7 @@ signals:
void visibilityChanged();
void favoriteChanged();
-private slots:
+private Q_SLOTS:
void finished();
void contactsModified(const QString &, const QVariant &);
void pluginReady();
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h
index a7aa87a3..aca92a04 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h
@@ -73,7 +73,7 @@ public:
QString label() const;
void setLabel(const QString &label);
-signals:
+Q_SIGNALS:
void labelChanged();
void textChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h b/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h
index de7b20f7..031adb19 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h
@@ -99,12 +99,12 @@ public:
void classBegin();
void componentComplete();
-signals:
+Q_SIGNALS:
void placeChanged();
void batchSizeChanged();
void totalCountChanged();
-private slots:
+private Q_SLOTS:
void fetchFinished();
protected:
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h
index 37dca7e5..621aa12d 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h
@@ -77,7 +77,7 @@ public:
void setPlugin(QDeclarativeGeoServiceProvider *plugin);
QDeclarativeGeoServiceProvider *plugin() const;
-signals:
+Q_SIGNALS:
void pluginChanged();
void parametersChanged(); //in practice is never emitted since parameters cannot be re-assigned
//the declaration is needed to avoid warnings about non-notifyable properties
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h
index a29c0443..ee9cb46e 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h
@@ -70,7 +70,7 @@ public:
QString name() const;
void setName(const QString &name);
-signals:
+Q_SIGNALS:
void userIdChanged();
void nameChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h
index fa959a0c..4a4fddf5 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h
@@ -75,7 +75,7 @@ public:
int count() const;
void setCount(int count);
-signals:
+Q_SIGNALS:
void averageChanged();
void maximumChanged();
void countChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h
index 57c333c9..6222985c 100644
--- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h
@@ -61,7 +61,7 @@ public:
QString placeId() const;
void setPlaceId(const QString &placeId);
-signals:
+Q_SIGNALS:
void placeIdChanged();
protected:
diff --git a/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h b/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h
index b46531b2..992c3063 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeresultmodelbase_p.h
@@ -71,15 +71,15 @@ public:
virtual QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const;
Q_INVOKABLE QVariant data(int index, const QString &roleName) const;
-signals:
+Q_SIGNALS:
void rowCountChanged();
void favoritesPluginChanged();
void favoritesMatchParametersChanged();
-protected slots:
+protected Q_SLOTS:
virtual void queryFinished();
-private slots:
+private Q_SLOTS:
void updateLayout(const QList<QPlace> &favoritePlaces = QList<QPlace>());
protected:
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h
index cc7328f7..8ea83aa7 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h
@@ -112,7 +112,7 @@ public:
virtual void classBegin();
virtual void componentComplete();
-signals:
+Q_SIGNALS:
void pluginChanged();
void searchAreaChanged();
void offsetChanged();
@@ -122,10 +122,10 @@ signals:
protected:
virtual void initializePlugin(QDeclarativeGeoServiceProvider *plugin);
-protected slots:
+protected Q_SLOTS:
virtual void queryFinished() = 0;
-private slots:
+private Q_SLOTS:
void pluginNameChanged();
protected:
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
index 225f118f..075d92a9 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
@@ -99,7 +99,7 @@ public:
QVariant data(const QModelIndex &index, int role) const;
-signals:
+Q_SIGNALS:
void searchTermChanged();
void categoriesChanged();
void maximumCorrectionsChanged();
@@ -110,7 +110,7 @@ protected:
QPlaceReply *sendQuery(QPlaceManager *manager, const QPlaceSearchRequest &request);
virtual void initializePlugin(QDeclarativeGeoServiceProvider *plugin);
-private slots:
+private Q_SLOTS:
void placeUpdated(const QString &placeId);
void placeRemoved(const QString &placeId);
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
index 86479d45..9a50bace 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
@@ -77,10 +77,10 @@ public:
SearchSuggestionRole = Qt::UserRole
};
-protected slots:
+protected Q_SLOTS:
virtual void queryFinished();
-signals:
+Q_SIGNALS:
void searchTermChanged();
void suggestionsChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
index ba93c5e1..8012f116 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
@@ -86,7 +86,7 @@ public:
QDeclarativePlaceIcon *icon() const;
void setIcon(QDeclarativePlaceIcon *icon);
-signals:
+Q_SIGNALS:
void nameChanged();
void supplierIdChanged();
void urlChanged();
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index 03cab768..a70748dd 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -115,15 +115,15 @@ public:
Status status() const;
void setStatus(Status status);
-signals:
+Q_SIGNALS:
void pluginChanged();
void hierarchicalChanged();
void statusChanged();
-public slots:
+public Q_SLOTS:
void update();
-private slots:
+private Q_SLOTS:
void replyFinished();
void addedCategory(const QPlaceCategory &category, const QString &parentId);
void updatedCategory(const QPlaceCategory &category, const QString &parentId);
diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h
index ea5379db..8678f9f6 100644
--- a/src/imports/location/qdeclarativegeoaddress_p.h
+++ b/src/imports/location/qdeclarativegeoaddress_p.h
@@ -91,7 +91,7 @@ public:
void setPostalCode(const QString& postalCode);
bool isTextGenerated() const;
-signals:
+Q_SIGNALS:
void textChanged();
void countryChanged();
void countryCodeChanged();
diff --git a/src/imports/location/qdeclarativegeoboundingbox_p.h b/src/imports/location/qdeclarativegeoboundingbox_p.h
index 1f96ba69..7ae82b3c 100644
--- a/src/imports/location/qdeclarativegeoboundingbox_p.h
+++ b/src/imports/location/qdeclarativegeoboundingbox_p.h
@@ -87,7 +87,7 @@ public:
double width();
void setWidth(double width);
-signals:
+Q_SIGNALS:
void bottomLeftChanged();
void bottomRightChanged();
void topLeftChanged();
@@ -96,7 +96,7 @@ signals:
void heightChanged();
void widthChanged();
-private slots:
+private Q_SLOTS:
void coordinateChanged();
private:
diff --git a/src/imports/location/qdeclarativegeoboundingcircle_p.h b/src/imports/location/qdeclarativegeoboundingcircle_p.h
index 7be8c7bf..15ba43c8 100644
--- a/src/imports/location/qdeclarativegeoboundingcircle_p.h
+++ b/src/imports/location/qdeclarativegeoboundingcircle_p.h
@@ -73,11 +73,11 @@ public:
qreal radius() const;
void setRadius(qreal radius);
-signals:
+Q_SIGNALS:
void centerChanged();
void radiusChanged();
-private slots:
+private Q_SLOTS:
void coordinateChanged();
private:
diff --git a/src/imports/location/qdeclarativegeolocation_p.h b/src/imports/location/qdeclarativegeolocation_p.h
index 9225ec29..785956d2 100644
--- a/src/imports/location/qdeclarativegeolocation_p.h
+++ b/src/imports/location/qdeclarativegeolocation_p.h
@@ -76,7 +76,7 @@ public:
QDeclarativeGeoBoundingBox *boundingBox();
void setBoundingBox(QDeclarativeGeoBoundingBox *boundingBox);
-signals:
+Q_SIGNALS:
void addressChanged();
void coordinateChanged();
void boundingBoxChanged();
diff --git a/src/imports/location/qdeclarativegeomapflickable_p.h b/src/imports/location/qdeclarativegeomapflickable_p.h
index f5e581e6..84d35425 100644
--- a/src/imports/location/qdeclarativegeomapflickable_p.h
+++ b/src/imports/location/qdeclarativegeomapflickable_p.h
@@ -78,7 +78,7 @@ public:
void setMap(QGeoMap* map){ gestureArea_->setMap(map); }
-signals:
+Q_SIGNALS:
void decelerationChanged();
void enabledChanged();
void movementStarted();
diff --git a/src/imports/location/qdeclarativegeomapgesturearea_p.h b/src/imports/location/qdeclarativegeomapgesturearea_p.h
index a6c6e22f..2d1b6c4d 100644
--- a/src/imports/location/qdeclarativegeomapgesturearea_p.h
+++ b/src/imports/location/qdeclarativegeomapgesturearea_p.h
@@ -209,7 +209,7 @@ public:
void registerPinchDeprecated(QDeclarativeGeoMapPinchArea *pinchArea){
pinchDep_ = pinchArea; }
-signals:
+Q_SIGNALS:
void pinchActiveChanged();
void enabledChanged();
void minimumZoomLevelChanged();
@@ -263,7 +263,7 @@ private:
void updatePan();
bool tryStartFlick();
void startFlick(int dx, int dy, int timeMs = 0);
-private slots:
+private Q_SLOTS:
void endFlick();
private:
diff --git a/src/imports/location/qdeclarativegeomappincharea_p.h b/src/imports/location/qdeclarativegeomappincharea_p.h
index 8c3de3f3..90f810db 100644
--- a/src/imports/location/qdeclarativegeomappincharea_p.h
+++ b/src/imports/location/qdeclarativegeomappincharea_p.h
@@ -151,7 +151,7 @@ public:
void zoomLevelLimits(qreal min, qreal max){ gestureArea_->zoomLevelLimits(min, max); }
void setMap(QGeoMap* map){ gestureArea_->setMap(map); }
-signals:
+Q_SIGNALS:
void activeChanged();
void enabledChanged();
void minimumZoomLevelChanged();
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h
index b82e3e8e..d8d88169 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider_p.h
+++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h
@@ -253,7 +253,7 @@ public:
Q_INVOKABLE bool matches(const QGeoServiceProvider *provider) const;
-signals:
+Q_SIGNALS:
void mappingRequirementsChanged(const QDeclarativeGeoServiceProvider::MappingFeatures &features);
void routingRequirementsChanged(const QDeclarativeGeoServiceProvider::RoutingFeatures &features);
void geocodingRequirementsChanged(const QDeclarativeGeoServiceProvider::GeocodingFeatures &features);
diff --git a/src/location/maps/qgeomapcontroller_p.h b/src/location/maps/qgeomapcontroller_p.h
index 53f270ae..7b650851 100644
--- a/src/location/maps/qgeomapcontroller_p.h
+++ b/src/location/maps/qgeomapcontroller_p.h
@@ -114,10 +114,10 @@ public:
void pan(qreal dx, qreal dy);
-private slots:
+private Q_SLOTS:
void cameraDataChanged(const QGeoCameraData &cameraData);
-signals:
+Q_SIGNALS:
void centerChanged(const AnimatableCoordinate &center);
void bearingChanged(qreal bearing);
void tiltChanged(qreal tilt);
diff --git a/src/location/maps/qgeotilecache_p.h b/src/location/maps/qgeotilecache_p.h
index 0f19510b..f282e08c 100644
--- a/src/location/maps/qgeotilecache_p.h
+++ b/src/location/maps/qgeotilecache_p.h
@@ -146,7 +146,7 @@ public:
QGeoTiledMappingManagerEngine::CacheAreas areas = QGeoTiledMappingManagerEngine::AllCaches);
void handleError(const QGeoTileSpec &spec, const QString &errorString);
-public slots:
+public Q_SLOTS:
void printStats();
private:
diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp
index f4fc791b..73400f29 100644
--- a/src/location/maps/qgeotilerequestmanager.cpp
+++ b/src/location/maps/qgeotilerequestmanager.cpp
@@ -174,7 +174,7 @@ class RetryFuture : public QObject
public:
RetryFuture(const QGeoTileSpec &tile, QGeoTiledMapData *map, QObject *parent=0);
-public slots:
+public Q_SLOTS:
void retry();
private:
diff --git a/src/location/qgeoareamonitor_polling_p.h b/src/location/qgeoareamonitor_polling_p.h
index 849f7e0b..ac9ffbf5 100644
--- a/src/location/qgeoareamonitor_polling_p.h
+++ b/src/location/qgeoareamonitor_polling_p.h
@@ -74,7 +74,7 @@ public :
inline bool isValid() { return location; }
-private slots:
+private Q_SLOTS:
void positionUpdated(const QGeoPositionInfo &info);
private:
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
index 6f77a09c..14cb6980 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
@@ -63,7 +63,7 @@ public:
void abort();
-private slots:
+private Q_SLOTS:
void networkFinished();
void networkError(QNetworkReply::NetworkError error);
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
index 447965ef..4bcf0479 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
@@ -82,7 +82,7 @@ public:
int offset,
const QGeoBoundingArea &bounds);
-private slots:
+private Q_SLOTS:
void placesFinished();
void placesError(QGeocodeReply::Error error, const QString &errorString);
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index dd80e9ae..bf5f9384 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -67,7 +67,7 @@ public:
QNetworkReply* networkReply() const;
-private slots:
+private Q_SLOTS:
void replyDestroyed();
void networkFinished();
void networkError(QNetworkReply::NetworkError error);
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
index 462fe0cf..3db861b0 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
@@ -63,7 +63,7 @@ public:
void abort();
-private slots:
+private Q_SLOTS:
void networkFinished();
void networkError(QNetworkReply::NetworkError error);
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 0dc93fee..8e9b9ef9 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -71,7 +71,7 @@ public:
QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request);
QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
-private slots:
+private Q_SLOTS:
void routeFinished();
void routeError(QGeoRouteReply::Error error, const QString &errorString);
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
index bc0c8642..dff8adb7 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
@@ -94,7 +94,7 @@ public:
QList<QLocale> locales() const;
void setLocales(const QList<QLocale> &locales);
-private slots:
+private Q_SLOTS:
void processingError(QPlaceReply *reply, const QPlaceReply::Error &error, const QString &errorMessage);
void processingFinished(QPlaceReply *reply);
};
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index 679ad9e6..3ed4af61 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -113,7 +113,7 @@ private:
QNetworkReply *sendRequest(const QUrl &url);
QByteArray createLanguageString() const;
-private slots:
+private Q_SLOTS:
void replyFinished();
void replyError(QPlaceReply::Error error_, const QString &errorString);
void categoryReplyFinished();