Cleanup: remove virtual keyword from overrides

Change-Id: Iac3ac030809f57cfcffbfcc3257551efb6c1ff0f
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

33 files changed, 177 insertions, 177 deletions

diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
index b02e8542..fbbe39a7 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
@@ -81,8 +81,8 @@ public:
     explicit QDeclarativeCircleMapItem(QQuickItem *parent = nullptr);
     ~QDeclarativeCircleMapItem() override;
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
+    void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
+    QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     QGeoCoordinate center();
     void setCenter(const QGeoCoordinate &center);
@@ -116,7 +116,7 @@ protected:
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
     void onLinePropertiesChanged();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
+    void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     void updateCirclePath();
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
index 5e87c7f0..2810eb5d 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
@@ -304,7 +304,7 @@ public:
         m_borderGeometry.markScreenDirty();
         m_circle.polishAndUpdate();
     }
-    virtual void markSourceDirtyAndUpdate() override
+    void markSourceDirtyAndUpdate() override
     {
         updateCirclePath();
         preserveGeometry();
@@ -317,25 +317,25 @@ public:
         m_geometry.setPreserveGeometry(true, m_leftBound);
         m_borderGeometry.setPreserveGeometry(true, m_leftBound);
     }
-    virtual void onMapSet() override
+    void onMapSet() override
     {
         markSourceDirtyAndUpdate();
     }
-    virtual void onGeoGeometryChanged() override
+    void onGeoGeometryChanged() override
     {
 
         markSourceDirtyAndUpdate();
     }
-    virtual void onItemGeometryChanged() override
+    void onItemGeometryChanged() override
     {
         onGeoGeometryChanged();
     }
-    virtual void afterViewportChanged() override
+    void afterViewportChanged() override
     {
         preserveGeometry();
         markScreenDirtyAndUpdate();
     }
-    virtual void updatePolish() override
+    void updatePolish() override
     {
         if (m_circle.m_circle.isEmpty()) {
             m_geometry.clear();
@@ -371,7 +371,7 @@ public:
         m_circle.setPosition(1.0 * geom->firstPointOffset() - QPointF(lineWidth * 0.5,lineWidth * 0.5));
     }
 
-    virtual QSGNode * updateMapItemPaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override
+    QSGNode * updateMapItemPaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override
     {
         Q_UNUSED(data);
 
@@ -421,7 +421,7 @@ public:
         m_rootNode->setSubtreeBlocked(false);
         return m_rootNode;
     }
-    virtual bool contains(const QPointF &point) const override
+    bool contains(const QPointF &point) const override
     {
         const qreal lineWidth = m_circle.m_border.width();
         const QColor &lineColor = m_circle.m_border.color();
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
index 233445dd..23e450c9 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
@@ -85,7 +85,7 @@ public:
     explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0);
     ~QDeclarativeGeoMapQuickItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
+    void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
 
     void setCoordinate(const QGeoCoordinate &coordinate);
     QGeoCoordinate coordinate();
@@ -114,8 +114,8 @@ protected:
     bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
 
 protected Q_SLOTS:
-    virtual void afterChildrenChanged() override;
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
+    void afterChildrenChanged() override;
+    void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     qreal scaleFactor();
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
index d3b8d67d..4b18c9ef 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
@@ -78,9 +78,9 @@ public:
     explicit QDeclarativePolygonMapItem(QQuickItem *parent = nullptr);
     ~QDeclarativePolygonMapItem() override;
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
+    void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
     //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
+    QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate);
     Q_INVOKABLE void removeCoordinate(const QGeoCoordinate &coordinate);
@@ -108,7 +108,7 @@ Q_SIGNALS:
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
     void onLinePropertiesChanged();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
+    void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 protected:
     void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 01895873..b1317944 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -108,9 +108,9 @@ public:
     explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolylineMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
+    void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
        //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
+    QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     Q_INVOKABLE int pathLength() const;
     Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate);
@@ -141,7 +141,7 @@ Q_SIGNALS:
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
     void updateAfterLinePropertiesChanged();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
+    void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 protected:
     void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
index 0a5c5fa8..af2e1ae1 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
@@ -84,9 +84,9 @@ public:
     explicit QDeclarativeRectangleMapItem(QQuickItem *parent = nullptr);
     ~QDeclarativeRectangleMapItem() override;
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
+    void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
     //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
+    QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     QGeoCoordinate topLeft();
     void setTopLeft(const QGeoCoordinate &center);
@@ -119,7 +119,7 @@ protected:
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
     void onLinePropertiesChanged();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
+    void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     QGeoRectangle m_rectangle;
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
index ca3f7736..09d8b3d2 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
@@ -103,33 +103,33 @@ public:
         // mark dirty just in case we're a width change
         markSourceDirtyAndUpdate();
     }
-    virtual void markSourceDirtyAndUpdate() override
+    void markSourceDirtyAndUpdate() override
     {
         m_geometry.markSourceDirty();
         m_borderGeometry.markSourceDirty();
         m_rect.polishAndUpdate();
     }
-    virtual void onMapSet() override
+    void onMapSet() override
     {
         markSourceDirtyAndUpdate();
     }
-    virtual void onGeoGeometryChanged() override
+    void onGeoGeometryChanged() override
     {
         markSourceDirtyAndUpdate();
     }
-    virtual void onItemGeometryChanged() override
+    void onItemGeometryChanged() override
     {
         m_geometry.setPreserveGeometry(true, m_rect.m_rectangle.topLeft());
         m_borderGeometry.setPreserveGeometry(true, m_rect.m_rectangle.topLeft());
         markSourceDirtyAndUpdate();
     }
-    virtual void afterViewportChanged() override
+    void afterViewportChanged() override
     {
         m_geometry.setPreserveGeometry(true, m_rect.m_rectangle.topLeft());
         m_borderGeometry.setPreserveGeometry(true, m_rect.m_rectangle.topLeft());
         markSourceDirtyAndUpdate();
     }
-    virtual void updatePolish() override
+    void updatePolish() override
     {
         if (!m_rect.topLeft().isValid() || !m_rect.bottomRight().isValid()) {
             m_geometry.clear();
@@ -184,7 +184,7 @@ public:
         m_rect.setPositionOnMap(m_geometry.origin(), m_geometry.firstPointOffset());
     }
 
-    virtual QSGNode * updateMapItemPaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override
+    QSGNode * updateMapItemPaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override
     {
         Q_UNUSED(data);
         if (!m_node || !oldNode) {
@@ -208,7 +208,7 @@ public:
         }
         return m_node;
     }
-    virtual bool contains(const QPointF &point) const override
+    bool contains(const QPointF &point) const override
     {
         return (m_geometry.contains(point) || m_borderGeometry.contains(point));
     }
@@ -273,7 +273,7 @@ public:
         m_rect.m_dirtyMaterial = true;
         afterViewportChanged();
     }
-    virtual void markSourceDirtyAndUpdate() override
+    void markSourceDirtyAndUpdate() override
     {
         m_geometry.markSourceDirty();
         m_borderGeometry.markSourceDirty();
@@ -284,25 +284,25 @@ public:
         m_geometry.setPreserveGeometry(true, m_rect.m_rectangle.topLeft());
         m_borderGeometry.setPreserveGeometry(true, m_rect.m_rectangle.topLeft());
     }
-    virtual void onMapSet() override
+    void onMapSet() override
     {
         markSourceDirtyAndUpdate();
     }
-    virtual void onGeoGeometryChanged() override
+    void onGeoGeometryChanged() override
     {
         preserveGeometry();
         markSourceDirtyAndUpdate();
     }
-    virtual void onItemGeometryChanged() override
+    void onItemGeometryChanged() override
     {
         onGeoGeometryChanged();
     }
-    virtual void afterViewportChanged() override
+    void afterViewportChanged() override
     {
         preserveGeometry();
         markScreenDirtyAndUpdate();
     }
-    virtual void updatePolish() override
+    void updatePolish() override
     {
         if (!m_rect.topLeft().isValid() || !m_rect.bottomRight().isValid()) {
             m_geometry.clear();
@@ -338,7 +338,7 @@ public:
         m_rect.setPosition(1.0 * geom->firstPointOffset() - QPointF(lineWidth * 0.5,lineWidth * 0.5));
     }
 
-    virtual QSGNode * updateMapItemPaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override
+    QSGNode * updateMapItemPaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override
     {
         Q_UNUSED(data);
 
@@ -388,7 +388,7 @@ public:
         m_rootNode->setSubtreeBlocked(false);
         return m_rootNode;
     }
-    virtual bool contains(const QPointF &point) const override
+    bool contains(const QPointF &point) const override
     {
         const qreal lineWidth = m_rect.m_border.width();
         const QColor &lineColor = m_rect.m_border.color();
diff --git a/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
index d490ab14..1a11654d 100644
--- a/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
@@ -122,7 +122,7 @@ public:
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
-    virtual void clearData(bool suppressSignal = false) override;
+    void clearData(bool suppressSignal = false) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     Q_INVOKABLE QVariant data(int index, const QString &roleName) const;
     QHash<int, QByteArray> roleNames() const override;
@@ -146,11 +146,11 @@ Q_SIGNALS:
 
 protected:
     QPlaceReply *sendQuery(QPlaceManager *manager, const QPlaceSearchRequest &request) override;
-    virtual void initializePlugin(QDeclarativeGeoServiceProvider *plugin) override;
+    void initializePlugin(QDeclarativeGeoServiceProvider *plugin) override;
 
 protected Q_SLOTS:
-    virtual void queryFinished() override;
-    virtual void onContentUpdated() override;
+    void queryFinished() override;
+    void onContentUpdated() override;
 
 private Q_SLOTS:
     void updateLayout(const QList<QPlace> &favoritePlaces = QList<QPlace>());
diff --git a/src/location/labs/qgeotiledmaplabs.cpp b/src/location/labs/qgeotiledmaplabs.cpp
index 7daabf9e..bd6113d3 100644
--- a/src/location/labs/qgeotiledmaplabs.cpp
+++ b/src/location/labs/qgeotiledmaplabs.cpp
@@ -60,7 +60,7 @@ public:
     virtual ~QGeoTiledMapLabsPrivate();
 
     QGeoMapObjectPrivate *createMapObjectImplementation(QGeoMapObject *obj) override;
-    virtual QList<QGeoMapObject *> mapObjects() const override;
+    QList<QGeoMapObject *> mapObjects() const override;
     void removeMapObject(QGeoMapObject *obj);
     QList<QObject *>mapObjectsAt(const QGeoCoordinate &coordinate) const;
 
diff --git a/src/location/labs/qmapcircleobject_p_p.h b/src/location/labs/qmapcircleobject_p_p.h
index 92432b43..287b4d3b 100644
--- a/src/location/labs/qmapcircleobject_p_p.h
+++ b/src/location/labs/qmapcircleobject_p_p.h
@@ -64,7 +64,7 @@ public:
     QMapCircleObjectPrivate(QGeoMapObject *q);
     ~QMapCircleObjectPrivate() override;
 
-    virtual QGeoMapObject::Type type() const override final;
+    QGeoMapObject::Type type() const override final;
 
     virtual QGeoCoordinate center() const = 0;
     virtual void setCenter(const QGeoCoordinate &center) = 0;
@@ -79,8 +79,8 @@ public:
 
     // QGeoMapObjectPrivate interface
     bool equals(const QGeoMapObjectPrivate &other) const override;
-    virtual QGeoShape geoShape() const override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    QGeoShape geoShape() const override;
+    void setGeoShape(const QGeoShape &shape) override;
 };
 
 
diff --git a/src/location/labs/qmapiconobject_p_p.h b/src/location/labs/qmapiconobject_p_p.h
index a2ccb7e4..a96a8ab9 100644
--- a/src/location/labs/qmapiconobject_p_p.h
+++ b/src/location/labs/qmapiconobject_p_p.h
@@ -63,7 +63,7 @@ public:
     QMapIconObjectPrivate(QGeoMapObject *q);
     ~QMapIconObjectPrivate() override;
 
-    virtual QGeoMapObject::Type type() const override final;
+    QGeoMapObject::Type type() const override final;
 
     virtual QGeoCoordinate coordinate() const = 0;
     virtual void setCoordinate(const QGeoCoordinate &coordinate) = 0;
@@ -88,8 +88,8 @@ public:
     void setCoordinate(const QGeoCoordinate &coordinate) override;
     QVariant content() const override;
     void setContent(const QVariant &content) override;
-    virtual QSizeF iconSize() const override;
-    virtual void setIconSize(const QSizeF &size) override;
+    QSizeF iconSize() const override;
+    void setIconSize(const QSizeF &size) override;
 
     // QGeoMapObjectPrivate interface
     QGeoMapObjectPrivate *clone() override;
diff --git a/src/location/labs/qmapobjectview_p_p.h b/src/location/labs/qmapobjectview_p_p.h
index 43a07320..d9b054e2 100644
--- a/src/location/labs/qmapobjectview_p_p.h
+++ b/src/location/labs/qmapobjectview_p_p.h
@@ -73,7 +73,7 @@ public:
     virtual QQmlComponent *delegate() const = 0;
     virtual void setDelegate(QQmlComponent *delegate) = 0;
 
-    virtual QGeoMapObject::Type type() const override final;
+    QGeoMapObject::Type type() const override final;
 };
 
 class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate
@@ -83,17 +83,17 @@ public:
     QMapObjectViewPrivateDefault(const QMapObjectViewPrivate &other);
     ~QMapObjectViewPrivateDefault() override;
 
-    virtual QVariant model() const override;
-    virtual void setModel(const QVariant &model) override;
-    virtual QQmlComponent *delegate() const override;
-    virtual void setDelegate(QQmlComponent *delegate) override;
+    QVariant model() const override;
+    void setModel(const QVariant &model) override;
+    QQmlComponent *delegate() const override;
+    void setDelegate(QQmlComponent *delegate) override;
 
     // QGeoMapObjectPrivate interface
 public:
     QGeoMapObjectPrivate *clone() override;
     bool equals(const QGeoMapObjectPrivate &other) const override;
-    virtual QGeoShape geoShape() const override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    QGeoShape geoShape() const override;
+    void setGeoShape(const QGeoShape &shape) override;
 
     QVariant m_model;
     QQmlComponent *m_delegate = nullptr;
diff --git a/src/location/labs/qmappolygonobject_p_p.h b/src/location/labs/qmappolygonobject_p_p.h
index 5bcefbca..0eb180e1 100644
--- a/src/location/labs/qmappolygonobject_p_p.h
+++ b/src/location/labs/qmappolygonobject_p_p.h
@@ -65,7 +65,7 @@ public:
     QMapPolygonObjectPrivate(QGeoMapObject *q);
     ~QMapPolygonObjectPrivate() override;
 
-    virtual QGeoMapObject::Type type() const override final;
+    QGeoMapObject::Type type() const override final;
 
     virtual QList<QGeoCoordinate> path() const = 0;
     virtual void setPath(const QList<QGeoCoordinate> &path) = 0;
@@ -78,8 +78,8 @@ public:
 
     // QGeoMapObjectPrivate interface
     bool equals(const QGeoMapObjectPrivate &other) const override;
-    virtual QGeoShape geoShape() const override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    QGeoShape geoShape() const override;
+    void setGeoShape(const QGeoShape &shape) override;
 };
 
 class Q_LOCATION_PRIVATE_EXPORT QMapPolygonObjectPrivateDefault : public QMapPolygonObjectPrivate
@@ -101,8 +101,8 @@ public:
 
     // QGeoMapObjectPrivate interface
     QGeoMapObjectPrivate *clone() override;
-    virtual QGeoShape geoShape() const override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    QGeoShape geoShape() const override;
+    void setGeoShape(const QGeoShape &shape) override;
 
 public:
     QGeoPolygon m_path; // small overhead compared to plain QList<QGeoCoordinate>
diff --git a/src/location/labs/qmappolylineobject_p_p.h b/src/location/labs/qmappolylineobject_p_p.h
index ddf057fa..08edcac8 100644
--- a/src/location/labs/qmappolylineobject_p_p.h
+++ b/src/location/labs/qmappolylineobject_p_p.h
@@ -65,7 +65,7 @@ public:
     QMapPolylineObjectPrivate(QGeoMapObject *q);
     ~QMapPolylineObjectPrivate() override;
 
-    virtual QGeoMapObject::Type type() const override final;
+    QGeoMapObject::Type type() const override final;
 
     virtual QList<QGeoCoordinate> path() const = 0;
     virtual void setPath(const QList<QGeoCoordinate> &path) = 0;
@@ -76,8 +76,8 @@ public:
 
     // QGeoMapObjectPrivate interface
     bool equals(const QGeoMapObjectPrivate &other) const override;
-    virtual QGeoShape geoShape() const override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    QGeoShape geoShape() const override;
+    void setGeoShape(const QGeoShape &shape) override;
 };
 
 class Q_LOCATION_PRIVATE_EXPORT QMapPolylineObjectPrivateDefault : public QMapPolylineObjectPrivate
diff --git a/src/location/labs/qmaprouteobject_p_p.h b/src/location/labs/qmaprouteobject_p_p.h
index 733395f8..e024a0f2 100644
--- a/src/location/labs/qmaprouteobject_p_p.h
+++ b/src/location/labs/qmaprouteobject_p_p.h
@@ -65,7 +65,7 @@ public:
     QMapRouteObjectPrivate(const QMapRouteObjectPrivate &other);
     ~QMapRouteObjectPrivate() override;
 
-    virtual QGeoMapObject::Type type() const override final;
+    QGeoMapObject::Type type() const override final;
 
     QDeclarativeGeoRoute *declarativeGeoRoute() const;
 
@@ -75,8 +75,8 @@ public:
     // QGeoMapObjectPrivate interface
     bool equals(const QGeoMapObjectPrivate &other) const override;
     QGeoMapObjectPrivate *clone() override;
-    virtual QGeoShape geoShape() const override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    QGeoShape geoShape() const override;
+    void setGeoShape(const QGeoShape &shape) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h b/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h
index 89e5ccd7..8965bc7a 100644
--- a/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h
+++ b/src/location/labs/qsg/qmappolygonobjectqsg_p_p.h
@@ -85,7 +85,7 @@ public:
 
     // QGeoMapObjectPrivate
     QGeoMapObjectPrivate *clone() override;
-    virtual void setGeoShape(const QGeoShape &shape) override;
+    void setGeoShape(const QGeoShape &shape) override;
 
     // Data Members
     QDoubleVector2D m_leftBoundMercator;
diff --git a/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h b/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h
index ead1dd24..b5fdddb3 100644
--- a/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h
+++ b/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h
@@ -87,7 +87,7 @@ public:
 
     // QGeoMapObjectPrivate
     QGeoMapObjectPrivate *clone() override;
-    virtual QGeoShape geoShape() const override;
+    QGeoShape geoShape() const override;
 
     unsigned int zoomForLOD(int zoom) const;
 
diff --git a/src/location/labs/qsg/qmaprouteobjectqsg_p_p.h b/src/location/labs/qsg/qmaprouteobjectqsg_p_p.h
index 25e0c352..497f9206 100644
--- a/src/location/labs/qsg/qmaprouteobjectqsg_p_p.h
+++ b/src/location/labs/qsg/qmaprouteobjectqsg_p_p.h
@@ -83,7 +83,7 @@ public:
     QGeoMapObjectPrivate *clone() override;
     void setMap(QGeoMap *map) override;
     void setVisible(bool visible) override;
-    virtual QGeoShape geoShape() const override;
+    QGeoShape geoShape() const override;
 
     // Data Members
     std::unique_ptr<QMapPolylineObjectPrivateQSG> m_polyline;
diff --git a/src/location/maps/qgeomaneuver_p.h b/src/location/maps/qgeomaneuver_p.h
index fb62d6dc..e88a57eb 100644
--- a/src/location/maps/qgeomaneuver_p.h
+++ b/src/location/maps/qgeomaneuver_p.h
@@ -100,34 +100,34 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoManeuverPrivateDefault : public QGeoManeuver
 {
 public:
     ~QGeoManeuverPrivateDefault();
-    virtual QGeoManeuverPrivate *clone() override;
+    QGeoManeuverPrivate *clone() override;
 
-    virtual bool valid() const override;
-    virtual void setValid(bool valid) override;
+    bool valid() const override;
+    void setValid(bool valid) override;
 
-    virtual QString id() const override;
-    virtual void setId(const QString &id) override;
+    QString id() const override;
+    void setId(const QString &id) override;
 
-    virtual QGeoCoordinate position() const override;
-    virtual void setPosition(const QGeoCoordinate &position) override;
+    QGeoCoordinate position() const override;
+    void setPosition(const QGeoCoordinate &position) override;
 
-    virtual QString text() const override;
-    virtual void setText(const QString &text) override;
+    QString text() const override;
+    void setText(const QString &text) override;
 
-    virtual QGeoManeuver::InstructionDirection direction() const override;
-    virtual void setDirection(QGeoManeuver::InstructionDirection direction) override;
+    QGeoManeuver::InstructionDirection direction() const override;
+    void setDirection(QGeoManeuver::InstructionDirection direction) override;
 
-    virtual int timeToNextInstruction() const override;
-    virtual void setTimeToNextInstruction(int timeToNextInstruction) override;
+    int timeToNextInstruction() const override;
+    void setTimeToNextInstruction(int timeToNextInstruction) override;
 
-    virtual qreal distanceToNextInstruction() const override;
-    virtual void setDistanceToNextInstruction(qreal distanceToNextInstruction) override;
+    qreal distanceToNextInstruction() const override;
+    void setDistanceToNextInstruction(qreal distanceToNextInstruction) override;
 
-    virtual QGeoCoordinate waypoint() const override;
-    virtual void setWaypoint(const QGeoCoordinate &waypoint) override;
+    QGeoCoordinate waypoint() const override;
+    void setWaypoint(const QGeoCoordinate &waypoint) override;
 
-    virtual QVariantMap extendedAttributes() const override;
-    virtual void setExtendedAttributes(const QVariantMap &extendedAttributes) override;
+    QVariantMap extendedAttributes() const override;
+    void setExtendedAttributes(const QVariantMap &extendedAttributes) override;
 
     QString m_id;
     QGeoCoordinate m_position;
diff --git a/src/location/maps/qgeoroute_p.h b/src/location/maps/qgeoroute_p.h
index 7fb3f39d..00eba84c 100644
--- a/src/location/maps/qgeoroute_p.h
+++ b/src/location/maps/qgeoroute_p.h
@@ -128,46 +128,46 @@ public:
     QGeoRoutePrivateDefault();
     QGeoRoutePrivateDefault(const QGeoRoutePrivateDefault &other);
     ~QGeoRoutePrivateDefault() override;
-    virtual QGeoRoutePrivate *clone() override;
+    QGeoRoutePrivate *clone() override;
 
-    virtual void setId(const QString &id) override;
-    virtual QString id() const override;
+    void setId(const QString &id) override;
+    QString id() const override;
 
-    virtual void setRequest(const QGeoRouteRequest &request) override;
-    virtual QGeoRouteRequest request() const override;
+    void setRequest(const QGeoRouteRequest &request) override;
+    QGeoRouteRequest request() const override;
 
-    virtual void setBounds(const QGeoRectangle &bounds) override;
-    virtual QGeoRectangle bounds() const override;
+    void setBounds(const QGeoRectangle &bounds) override;
+    QGeoRectangle bounds() const override;
 
-    virtual void setTravelTime(int travelTime) override;
-    virtual int travelTime() const override;
+    void setTravelTime(int travelTime) override;
+    int travelTime() const override;
 
-    virtual void setDistance(qreal distance) override;
-    virtual qreal distance() const override;
+    void setDistance(qreal distance) override;
+    qreal distance() const override;
 
-    virtual void setTravelMode(QGeoRouteRequest::TravelMode mode) override;
-    virtual QGeoRouteRequest::TravelMode travelMode() const override;
+    void setTravelMode(QGeoRouteRequest::TravelMode mode) override;
+    QGeoRouteRequest::TravelMode travelMode() const override;
 
-    virtual void setPath(const QList<QGeoCoordinate> &path) override;
-    virtual QList<QGeoCoordinate> path() const override;
+    void setPath(const QList<QGeoCoordinate> &path) override;
+    QList<QGeoCoordinate> path() const override;
 
-    virtual void setFirstSegment(const QGeoRouteSegment &firstSegment) override;
-    virtual QGeoRouteSegment firstSegment() const override;
+    void setFirstSegment(const QGeoRouteSegment &firstSegment) override;
+    QGeoRouteSegment firstSegment() const override;
 
-    virtual QString engineName() const override;
-    virtual int segmentsCount() const override;
+    QString engineName() const override;
+    int segmentsCount() const override;
 
-    virtual void setRouteLegs(const QList<QGeoRouteLeg> &legs) override;
-    virtual QList<QGeoRouteLeg> routeLegs() const override;
+    void setRouteLegs(const QList<QGeoRouteLeg> &legs) override;
+    QList<QGeoRouteLeg> routeLegs() const override;
 
     void setExtendedAttributes(const QVariantMap &extendedAttributes) override;
     QVariantMap extendedAttributes() const override;
 
     // QGeoRouteLeg API
-    virtual void setLegIndex(int idx) override;
-    virtual int legIndex() const override;
-    virtual void setContainingRoute(const QGeoRoute &route) override;
-    virtual QGeoRoute containingRoute() const override;
+    void setLegIndex(int idx) override;
+    int legIndex() const override;
+    void setContainingRoute(const QGeoRoute &route) override;
+    QGeoRoute containingRoute() const override;
 
     QString m_id;
     QGeoRouteRequest m_request;
diff --git a/src/location/maps/qgeoroutesegment_p.h b/src/location/maps/qgeoroutesegment_p.h
index 7dea3637..3807d4b8 100644
--- a/src/location/maps/qgeoroutesegment_p.h
+++ b/src/location/maps/qgeoroutesegment_p.h
@@ -110,27 +110,27 @@ public:
     QGeoRouteSegmentPrivateDefault();
     QGeoRouteSegmentPrivateDefault(const QGeoRouteSegmentPrivateDefault &other);
     ~QGeoRouteSegmentPrivateDefault();
-    virtual QGeoRouteSegmentPrivate *clone() override;
+    QGeoRouteSegmentPrivate *clone() override;
 
     bool operator ==(const QGeoRouteSegmentPrivateDefault &other) const;
 
-    virtual bool valid() const override;
-    virtual void setValid(bool valid) override;
+    bool valid() const override;
+    void setValid(bool valid) override;
 
-    virtual bool isLegLastSegment() const override;
-    virtual void setLegLastSegment(bool lastSegment) override;
+    bool isLegLastSegment() const override;
+    void setLegLastSegment(bool lastSegment) override;
 
-    virtual int travelTime() const override;
-    virtual void setTravelTime(int travelTime) override;
+    int travelTime() const override;
+    void setTravelTime(int travelTime) override;
 
-    virtual qreal distance() const override;
-    virtual void setDistance(qreal distance) override;
+    qreal distance() const override;
+    void setDistance(qreal distance) override;
 
-    virtual QList<QGeoCoordinate> path() const override;
-    virtual void setPath(const QList<QGeoCoordinate> &path) override;
+    QList<QGeoCoordinate> path() const override;
+    void setPath(const QList<QGeoCoordinate> &path) override;
 
-    virtual QGeoManeuver maneuver() const override;
-    virtual void setManeuver(const QGeoManeuver &maneuver) override;
+    QGeoManeuver maneuver() const override;
+    void setManeuver(const QGeoManeuver &maneuver) override;
 
 
     bool m_valid;
diff --git a/src/location/places/qplace_p.h b/src/location/places/qplace_p.h
index a1c4dfb0..952c68de 100644
--- a/src/location/places/qplace_p.h
+++ b/src/location/places/qplace_p.h
@@ -125,33 +125,33 @@ public:
     QPlacePrivateDefault();
     QPlacePrivateDefault(const QPlacePrivateDefault &other);
     virtual ~QPlacePrivateDefault();
-    virtual QPlacePrivate *clone() override;
-
-    virtual QList<QPlaceCategory> categories() const override;
-    virtual void setCategories(const QList<QPlaceCategory> &categories) override;
-    virtual QGeoLocation location() const override;
-    virtual void setLocation(const QGeoLocation &location) override;
-    virtual QPlaceRatings ratings() const override;
-    virtual void setRatings(const QPlaceRatings &ratings) override;
-    virtual QPlaceSupplier supplier() const override;
-    virtual void setSupplier(const QPlaceSupplier &supplier) override;
-    virtual QString name() const override;
-    virtual void setName(const QString &name) override;
-    virtual QString placeId() const override;
-    virtual void setPlaceId(const QString &placeIdentifier) override;
-    virtual QString attribution() const override;
-    virtual void setAttribution(const QString &attribution) override;
-    virtual QLocation::Visibility visibility() const override;
-    virtual void setVisibility(QLocation::Visibility visibility) override;
-    virtual QPlaceIcon icon() const override;
-    virtual void setIcon(const QPlaceIcon &icon) override;
-    virtual bool detailsFetched() const override;
-    virtual void setDetailsFetched(bool fetched) override;
-
-    virtual QMap<QString, QPlaceAttribute> extendedAttributes() const override;
-    virtual QMap<QString, QPlaceAttribute> &extendedAttributes() override;
-    virtual QMap<QString, QList<QPlaceContactDetail> > contacts() const override;
-    virtual QMap<QString, QList<QPlaceContactDetail> > &contacts() override;
+    QPlacePrivate *clone() override;
+
+    QList<QPlaceCategory> categories() const override;
+    void setCategories(const QList<QPlaceCategory> &categories) override;
+    QGeoLocation location() const override;
+    void setLocation(const QGeoLocation &location) override;
+    QPlaceRatings ratings() const override;
+    void setRatings(const QPlaceRatings &ratings) override;
+    QPlaceSupplier supplier() const override;
+    void setSupplier(const QPlaceSupplier &supplier) override;
+    QString name() const override;
+    void setName(const QString &name) override;
+    QString placeId() const override;
+    void setPlaceId(const QString &placeIdentifier) override;
+    QString attribution() const override;
+    void setAttribution(const QString &attribution) override;
+    QLocation::Visibility visibility() const override;
+    void setVisibility(QLocation::Visibility visibility) override;
+    QPlaceIcon icon() const override;
+    void setIcon(const QPlaceIcon &icon) override;
+    bool detailsFetched() const override;
+    void setDetailsFetched(bool fetched) override;
+
+    QMap<QString, QPlaceAttribute> extendedAttributes() const override;
+    QMap<QString, QPlaceAttribute> &extendedAttributes() override;
+    QMap<QString, QList<QPlaceContactDetail> > contacts() const override;
+    QMap<QString, QList<QPlaceContactDetail> > &contacts() override;
 
 
     // data members
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index ff958af2..72fc98ce 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -68,8 +68,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 override { return new Class##Private(*this); } \
-    virtual QPlaceSearchResult::SearchResultType type() const override {return ResultType;} \
+    QPlaceSearchResultPrivate *clone() const override { return new Class##Private(*this); } \
+    QPlaceSearchResult::SearchResultType type() const override {return ResultType;} \
     static void copyIfPossible(QSharedDataPointer<QPlaceSearchResultPrivate> &d_ptr, const QPlaceSearchResult &other) \
     { \
         if (other.type() == ResultType) \
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
index f6a696fe..7eb45faa 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
@@ -65,7 +65,7 @@ public:
 
 #ifdef LOCATIONLABS
     QGeoMapObjectPrivate *createMapObjectImplementation(QGeoMapObject *obj) override;
-    virtual QList<QGeoMapObject *> mapObjects() const override;
+    QList<QGeoMapObject *> mapObjects() const override;
     void removeMapObject(QGeoMapObject *obj);
     void updateMapObjects(QSGNode *root, QQuickWindow *window);
     QList<QObject *>mapObjectsAt(const QGeoCoordinate &coordinate) const;
diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
index feb02213..e85c5bb1 100644
--- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
@@ -61,8 +61,8 @@ class QGeoRoutePrivateMapbox : public QGeoRoutePrivateDefault
 public:
     QGeoRoutePrivateMapbox(const QGeoRoutePrivateDefault &other, const QVariantMap &metadata);
 
-    virtual QString engineName() const override;
-    virtual QVariantMap metadata() const override;
+    QString engineName() const override;
+    QVariantMap metadata() const override;
 
     QVariantMap m_metadata;
 };
diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
index f8cf8b6c..52318d9b 100644
--- a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
+++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
@@ -52,8 +52,8 @@ public:
     ~QGeoFileTileCacheNokia();
 
 protected:
-    virtual QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
-    virtual QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
+    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
 
     QString m_ppi;
 };
diff --git a/tests/auto/declarativetestplugin/locationtest.cpp b/tests/auto/declarativetestplugin/locationtest.cpp
index c7c59c6b..52fa35ac 100644
--- a/tests/auto/declarativetestplugin/locationtest.cpp
+++ b/tests/auto/declarativetestplugin/locationtest.cpp
@@ -50,7 +50,7 @@ class QLocationDeclarativeTestModule: public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
-    virtual void registerTypes(const char* uri) override
+    void registerTypes(const char* uri) override
     {
         if (QLatin1String(uri) == QLatin1String("QtLocation.Test")) {
             qmlRegisterType<QDeclarativePinchGenerator>(uri, 5, 5, "PinchGenerator");
diff --git a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
index e9411bfe..3c7c019a 100644
--- a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
+++ b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
@@ -70,13 +70,13 @@ public:
     };
 
     // from QQmlParserStatus
-    virtual void componentComplete() override;
-    virtual void classBegin() override {}
+    void componentComplete() override;
+    void classBegin() override {}
 
     // From QAbstractListModel
-    virtual int rowCount(const QModelIndex &parent) const override;
-    virtual QVariant data(const QModelIndex &index, int role) const override;
-    virtual QHash<int, QByteArray> roleNames() const override;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     int datacount() const;
     void setDatacount(int datacount);
diff --git a/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h
index 74d9e6f3..ac78b075 100644
--- a/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h
+++ b/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h
@@ -105,7 +105,7 @@ public:
     };
 
     // from QQmlParserStatus
-    virtual void componentComplete() override;
+    void componentComplete() override;
     // from QQuickItem
     void itemChange(ItemChange change, const ItemChangeData &data) override;
 
diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
index 43e8a44b..e60b2d2b 100644
--- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
@@ -136,7 +136,7 @@ public:
                     QGeoRouteRequest::TruckTravel );
     }
 
-    virtual QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) override
+    QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) override
     {
         routeReply_ = new RouteReplyTest();
         connect(routeReply_, SIGNAL(aborted()), this, SLOT(requestAborted()));
diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.cpp b/tests/auto/geotestplugin/qgeotiledmap_test.cpp
index aa0810eb..bab66fc1 100644
--- a/tests/auto/geotestplugin/qgeotiledmap_test.cpp
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.cpp
@@ -71,7 +71,7 @@ public:
         param->disconnect(q);
     }
 
-    virtual void setVisibleArea(const QRectF &visibleArea) override
+    void setVisibleArea(const QRectF &visibleArea) override
     {
         if (m_options.supportVisibleArea)
             return QGeoTiledMapPrivate::setVisibleArea(visibleArea);
@@ -79,7 +79,7 @@ public:
             return QGeoMapPrivate::setVisibleArea(visibleArea);
     }
 
-    virtual QRectF visibleArea() const override
+    QRectF visibleArea() const override
     {
         if (m_options.supportVisibleArea)
             return QGeoTiledMapPrivate::visibleArea();
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 16e3f94c..44aee74e 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -641,12 +641,12 @@ public:
         return QString();
     }
 
-    virtual QStringList childCategoryIds(const QString &categoryId) const override
+    QStringList childCategoryIds(const QString &categoryId) const override
     {
         return m_childCategories.value(categoryId);
     }
 
-    virtual QPlaceCategory category(const QString &categoryId) const override
+    QPlaceCategory category(const QString &categoryId) const override
     {
         return m_categories.value(categoryId);
     }
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index e19d7348..0a5b7cc6 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -48,7 +48,7 @@ class MockGeoNetworkReply : public QNetworkReply
 {
 public:
     MockGeoNetworkReply( QObject* parent = 0);
-    virtual void abort() override;
+    void abort() override;
 
     void setFile(QFile* file);
     void complete();
@@ -57,8 +57,8 @@ public:
     using QNetworkReply::setError;
 
 protected:
-    virtual qint64 readData(char *data, qint64 maxlen) override;
-    virtual qint64 writeData(const char *data, qint64 len) override;
+    qint64 readData(char *data, qint64 maxlen) override;
+    qint64 writeData(const char *data, qint64 len) override;
 
 private:
     QFile* m_file;