Add Q_DECL_OVERRIDE where missing

clang 3.6 and later print a warning for such cases. This patch fixes
all override warnings caused by the content of the qtlocation itself.
The remaining cases are triggered by headers outside of the qtlocation
repo.

This patch only fixes cases which clang on Linux can reach. It is
possible that some of the platform specific plugins still have some
ovveride related cases.

Change-Id: I9f93062511d38cba4449b7fc70e65c93d4251a8b
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

11 files changed, 83 insertions, 72 deletions

diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h
index ac21fa60..ba4669bc 100644
--- a/src/imports/location/qdeclarativecirclemapitem_p.h
+++ b/src/imports/location/qdeclarativecirclemapitem_p.h
@@ -64,8 +64,8 @@ public:
     explicit QDeclarativeCircleMapItem(QQuickItem *parent = 0);
     ~QDeclarativeCircleMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 
     QGeoCoordinate center();
     void setCenter(const QGeoCoordinate &center);
@@ -78,7 +78,7 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point) const;
+    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void centerChanged(const QGeoCoordinate &center);
@@ -89,9 +89,9 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
-    virtual void updateMapItem();
+    virtual void updateMapItem() Q_DECL_OVERRIDE;
     void updateMapItemAssumeDirty();
-    void afterViewportChanged(const QGeoMapViewportChangeEvent &event);
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
 
 private:
     bool preserveCircleGeometry(QList<QGeoCoordinate> &path, const QGeoCoordinate &center,
diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h
index 5ca44b1e..228d4673 100644
--- a/src/imports/location/qdeclarativegeomapquickitem_p.h
+++ b/src/imports/location/qdeclarativegeomapquickitem_p.h
@@ -54,7 +54,7 @@ public:
     explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0);
     ~QDeclarativeGeoMapQuickItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
 
     void setCoordinate(const QGeoCoordinate &coordinate);
     QGeoCoordinate coordinate();
@@ -78,9 +78,9 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
-    virtual void updateMapItem();
-    virtual void afterChildrenChanged();
-    void afterViewportChanged(const QGeoMapViewportChangeEvent &event);
+    virtual void updateMapItem() Q_DECL_OVERRIDE;
+    virtual void afterChildrenChanged() Q_DECL_OVERRIDE;
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
 
 private:
     qreal scaleFactor();
diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h
index 19a79be6..e368dacf 100644
--- a/src/imports/location/qdeclarativepolygonmapitem_p.h
+++ b/src/imports/location/qdeclarativepolygonmapitem_p.h
@@ -74,9 +74,9 @@ public:
     explicit QDeclarativePolygonMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolygonMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
     //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 
     Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate);
     Q_INVOKABLE void removeCoordinate(const QGeoCoordinate &coordinate);
@@ -89,7 +89,7 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point) const;
+    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void pathChanged();
@@ -99,9 +99,9 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
-    virtual void updateMapItem();
+    virtual void updateMapItem() Q_DECL_OVERRIDE;
     void handleBorderUpdated();
-    void afterViewportChanged(const QGeoMapViewportChangeEvent &event);
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
 
 private:
     void pathPropertyChanged();
diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h
index 7484cc11..a748f329 100644
--- a/src/imports/location/qdeclarativepolylinemapitem_p.h
+++ b/src/imports/location/qdeclarativepolylinemapitem_p.h
@@ -98,9 +98,9 @@ public:
     explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolylineMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
        //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 
     Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate);
     Q_INVOKABLE void removeCoordinate(const QGeoCoordinate &coordinate);
@@ -108,7 +108,7 @@ public:
     QJSValue path() const;
     void setPath(const QJSValue &value);
 
-    bool contains(const QPointF &point) const;
+    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
 
     QDeclarativeMapLineProperties *line();
 
@@ -119,9 +119,9 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
-    virtual void updateMapItem();
+    virtual void updateMapItem() Q_DECL_OVERRIDE;
     void updateAfterLinePropertiesChanged();
-    void afterViewportChanged(const QGeoMapViewportChangeEvent &event);
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
 
 private:
     void pathPropertyChanged();
diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h
index 9f576d71..05656679 100644
--- a/src/imports/location/qdeclarativerectanglemapitem_p.h
+++ b/src/imports/location/qdeclarativerectanglemapitem_p.h
@@ -67,9 +67,9 @@ public:
     explicit QDeclarativeRectangleMapItem(QQuickItem *parent = 0);
     ~QDeclarativeRectangleMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
     //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 
     QGeoCoordinate topLeft();
     void setTopLeft(const QGeoCoordinate &center);
@@ -82,7 +82,7 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point) const;
+    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void topLeftChanged(const QGeoCoordinate &topLeft);
@@ -93,9 +93,9 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
-    virtual void updateMapItem();
+    virtual void updateMapItem() Q_DECL_OVERRIDE;
     void updateMapItemAssumeDirty();
-    void afterViewportChanged(const QGeoMapViewportChangeEvent &event);
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
 
 private:
     QGeoCoordinate topLeft_;
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index 633057e9..9bd4b460 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -42,6 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
+// defines must be in sync with class below
 #define Q_IMPLEMENT_SEARCHRESULT_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()); } \
@@ -50,8 +51,8 @@ QT_BEGIN_NAMESPACE
     Class::Class(const QPlaceSearchResult &other) : QPlaceSearchResult() { Class##Private::copyIfPossible(d_ptr, other); }
 
 #define Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(Class, ResultType) \
-    virtual QPlaceSearchResultPrivate *clone() const { return new Class##Private(*this); } \
-    virtual QPlaceSearchResult::SearchResultType type() const {return ResultType;} \
+    virtual QPlaceSearchResultPrivate *clone() const Q_DECL_OVERRIDE { return new Class##Private(*this); } \
+    virtual QPlaceSearchResult::SearchResultType type() const Q_DECL_OVERRIDE {return ResultType;} \
     static void copyIfPossible(QSharedDataPointer<QPlaceSearchResultPrivate> &d_ptr, const QPlaceSearchResult &other) \
     { \
         if (other.type() == ResultType) \
@@ -71,7 +72,15 @@ public:
     static const QSharedDataPointer<QPlaceSearchResultPrivate>
             &extract_d(const QPlaceSearchResult &other) { return other.d_ptr; }
 
-    Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceSearchResult, QPlaceSearchResult::UnknownSearchResult)
+    virtual QPlaceSearchResultPrivate *clone() const { return new QPlaceSearchResultPrivate(*this); }
+    virtual QPlaceSearchResult::SearchResultType type() const  { return QPlaceSearchResult::UnknownSearchResult; }
+    static void copyIfPossible(QSharedDataPointer<QPlaceSearchResultPrivate> &d_ptr, const QPlaceSearchResult &other)
+    {
+        if (other.type() == QPlaceSearchResult::UnknownSearchResult)
+            d_ptr = extract_d(other);
+        else
+            d_ptr = new QPlaceSearchResultPrivate;
+    }
 
     QString title;
     QPlaceIcon icon;
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index 3753c47a..c5088735 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -75,33 +75,33 @@ public:
                                QString *errorString);
     ~QPlaceManagerEngineNokiaV2();
 
-    QPlaceDetailsReply *getPlaceDetails(const QString &placeId);
+    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) Q_DECL_OVERRIDE;
 
     QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) Q_DECL_OVERRIDE;
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &query);
+    QPlaceSearchReply *search(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query);
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
 
-    QPlaceIdReply *savePlace(const QPlace &place);
-    QPlaceIdReply *removePlace(const QString &placeId);
+    QPlaceIdReply *savePlace(const QPlace &place) Q_DECL_OVERRIDE;
+    QPlaceIdReply *removePlace(const QString &placeId) Q_DECL_OVERRIDE;
 
-    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId);
-    QPlaceIdReply *removeCategory(const QString &categoryId);
+    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) Q_DECL_OVERRIDE;
+    QPlaceIdReply *removeCategory(const QString &categoryId) Q_DECL_OVERRIDE;
 
-    QPlaceReply *initializeCategories();
-    QString parentCategoryId(const QString &categoryId) const;
-    QStringList childCategoryIds(const QString &categoryId) const;
-    QPlaceCategory category(const QString &categoryId) const;
-    QList<QPlaceCategory> childCategories(const QString &parentId) const;
+    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
+    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
+    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
+    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
 
-    QList<QLocale> locales() const;
-    void setLocales(const QList<QLocale> &locales);
+    QList<QLocale> locales() const Q_DECL_OVERRIDE;
+    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
 
     QPlaceIcon icon(const QString &remotePath,
                     const QList<QPlaceCategory> &categories = QList<QPlaceCategory>()) const;
 
-    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const;
+    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE;
 
 private:
     QNetworkReply *sendRequest(const QUrl &url);
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
index 2b8fa657..a44cdb19 100644
--- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
@@ -79,8 +79,8 @@ private:
     QGeoAreaMonitorPollingPrivate* d;
     QGeoAreaMonitorSource::Error lastError;
 
-    void connectNotify(const QMetaMethod &signal);
-    void disconnectNotify(const QMetaMethod &signal);
+    void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
+    void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
 
     int idForSignal(const char *signal);
 };
diff --git a/src/positioning/qgeocircle_p.h b/src/positioning/qgeocircle_p.h
index 5af2aef6..7fc0231f 100644
--- a/src/positioning/qgeocircle_p.h
+++ b/src/positioning/qgeocircle_p.h
@@ -58,17 +58,17 @@ public:
     QGeoCirclePrivate(const QGeoCirclePrivate &other);
     ~QGeoCirclePrivate();
 
-    bool isValid() const;
-    bool isEmpty() const;
-    bool contains(const QGeoCoordinate &coordinate) const;
+    bool isValid() const Q_DECL_OVERRIDE;
+    bool isEmpty() const Q_DECL_OVERRIDE;
+    bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
 
     QGeoCoordinate center() const Q_DECL_OVERRIDE;
 
-    void extendShape(const QGeoCoordinate &coordinate);
+    void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
 
-    QGeoShapePrivate *clone() const;
+    QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
 
-    bool operator==(const QGeoShapePrivate &other) const;
+    bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
 
     QGeoCoordinate m_center;
     qreal radius;
diff --git a/src/positioning/qgeorectangle_p.h b/src/positioning/qgeorectangle_p.h
index dbe879e7..34b3842b 100644
--- a/src/positioning/qgeorectangle_p.h
+++ b/src/positioning/qgeorectangle_p.h
@@ -58,17 +58,17 @@ public:
     QGeoRectanglePrivate(const QGeoRectanglePrivate &other);
     ~QGeoRectanglePrivate();
 
-    bool isValid() const;
-    bool isEmpty() const;
-    bool contains(const QGeoCoordinate &coordinate) const;
+    bool isValid() const Q_DECL_OVERRIDE;
+    bool isEmpty() const Q_DECL_OVERRIDE;
+    bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
 
     QGeoCoordinate center() const Q_DECL_OVERRIDE;
 
-    void extendShape(const QGeoCoordinate &coordinate);
+    void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
 
-    QGeoShapePrivate *clone() const;
+    QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
 
-    bool operator==(const QGeoShapePrivate &other) const;
+    bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
 
     QGeoCoordinate topLeft;
     QGeoCoordinate bottomRight;
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index aefdb972..fcd5f792 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -340,7 +340,7 @@ public:
         }
     }
 
-    QPlaceDetailsReply *getPlaceDetails(const QString &placeId)
+    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) Q_DECL_OVERRIDE
     {
         DetailsReply *reply = new DetailsReply(this);
 
@@ -424,7 +424,7 @@ public:
         return reply;
     }
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &query)
+    QPlaceSearchReply *search(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE
     {
         QList<QPlaceSearchResult> results;
 
@@ -469,7 +469,7 @@ public:
         return reply;
     }
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query)
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE
     {
         QStringList suggestions;
         if (query.searchTerm() == QLatin1String("test")) {
@@ -485,7 +485,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *savePlace(const QPlace &place)
+    QPlaceIdReply *savePlace(const QPlace &place) Q_DECL_OVERRIDE
     {
         IdReply *reply = new IdReply(QPlaceIdReply::SavePlace, this);
 
@@ -508,7 +508,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *removePlace(const QString &placeId)
+    QPlaceIdReply *removePlace(const QString &placeId) Q_DECL_OVERRIDE
     {
         IdReply *reply = new IdReply(QPlaceIdReply::RemovePlace, this);
         reply->setId(placeId);
@@ -525,7 +525,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId)
+    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) Q_DECL_OVERRIDE
     {
         IdReply *reply = new IdReply(QPlaceIdReply::SaveCategory, this);
 
@@ -566,7 +566,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *removeCategory(const QString &categoryId)
+    QPlaceIdReply *removeCategory(const QString &categoryId) Q_DECL_OVERRIDE
     {
         IdReply *reply = new IdReply(QPlaceIdReply::RemoveCategory, this);
         reply->setId(categoryId);
@@ -589,7 +589,7 @@ public:
         return reply;
     }
 
-    QPlaceReply *initializeCategories()
+    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE
     {
         QPlaceReply *reply = new PlaceReply(this);
 
@@ -598,7 +598,7 @@ public:
         return reply;
     }
 
-    QString parentCategoryId(const QString &categoryId) const
+    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE
     {
         QHashIterator<QString, QStringList> i(m_childCategories);
         while (i.hasNext()) {
@@ -610,17 +610,17 @@ public:
         return QString();
     }
 
-    virtual QStringList childCategoryIds(const QString &categoryId) const
+    virtual QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE
     {
         return m_childCategories.value(categoryId);
     }
 
-    virtual QPlaceCategory category(const QString &categoryId) const
+    virtual QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE
     {
         return m_categories.value(categoryId);
     }
 
-    QList<QPlaceCategory> childCategories(const QString &parentId) const
+    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE
     {
         QList<QPlaceCategory> categories;
 
@@ -630,17 +630,18 @@ public:
         return categories;
     }
 
-    QList<QLocale> locales() const
+    QList<QLocale> locales() const Q_DECL_OVERRIDE
     {
         return m_locales;
     }
 
-    void setLocales(const QList<QLocale> &locales)
+    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE
     {
         m_locales = locales;
     }
 
-    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const {
+    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE
+    {
         QList<QPair<int, QUrl> > candidates;
 
         QMap<QString, int> sizeDictionary;
@@ -676,7 +677,8 @@ public:
         }
     }
 
-    QPlace compatiblePlace(const QPlace &original) const {
+    QPlace compatiblePlace(const QPlace &original) const Q_DECL_OVERRIDE
+    {
         QPlace place;
         place.setName(original.name());
         return place;