diff options
Diffstat (limited to 'src/location/declarativemaps')
5 files changed, 17 insertions, 17 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h index e2361045..a1454337 100644 --- a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h +++ b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h @@ -116,13 +116,13 @@ public: virtual ~QDeclarativeGeocodeModel(); // From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; // From QAbstractListModel - virtual int rowCount(const QModelIndex &parent) const; - virtual QVariant data(const QModelIndex &index, int role) const; - virtual QHash<int,QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int,QByteArray> roleNames() const override; void setPlugin(QDeclarativeGeoServiceProvider *plugin); QDeclarativeGeoServiceProvider *plugin() const; diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp index 721d941b..6621cefa 100644 --- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp @@ -51,7 +51,7 @@ class QDeclarativeGeoMapCopyrightNoticePrivate: public QQuickPaintedItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeGeoMapCopyrightNotice) public: - virtual void setVisible(bool visible); + void setVisible(bool visible) override; }; /*! diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h index 61a67f59..2d2a842c 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h @@ -106,7 +106,7 @@ public: void setLodThreshold(int lt); unsigned int zoomForLOD(int zoom) const; - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); QGeoMap::ItemType itemType() const; @@ -144,7 +144,7 @@ protected Q_SLOTS: protected: float zoomLevelOpacity() const; - bool childMouseEventFilter(QQuickItem *item, QEvent *event); + bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; bool isPolishScheduled() const; virtual void setMaterialDirty(); diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h index 39fd84d6..d5286cf7 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h @@ -119,13 +119,13 @@ public: ~QDeclarativeGeoRouteModel(); // From QQmlParserStatus - void classBegin() {} - void componentComplete(); + void classBegin() override {} + void componentComplete() override; // From QAbstractListModel - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - virtual QHash<int,QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int,QByteArray> roleNames() const override; void setPlugin(QDeclarativeGeoServiceProvider *plugin); QDeclarativeGeoServiceProvider *plugin() const; @@ -308,8 +308,8 @@ public: ~QDeclarativeGeoRouteQuery(); // From QQmlParserStatus - void classBegin() {} - void componentComplete(); + void classBegin() override {} + void componentComplete() override; QGeoRouteRequest routeRequest(); QVariantMap extraParameters(); diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h index 165f7ba4..6c1b0f63 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h @@ -155,8 +155,8 @@ public: Q_FLAGS(NavigationFeatures) // From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; void setName(const QString &name); QString name() const; |