From b4807a11e816feaa3b541b4e4b02f77c1fafbf48 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Wed, 31 Jan 2018 14:34:16 +0100 Subject: Replace Q_DECL_OVERRIDE with override Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll --- .../declarativemaps/qdeclarativepolygonmapitem_p.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/location/declarativemaps/qdeclarativepolygonmapitem_p.h') diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h index a928ae39..c49495ab 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h @@ -89,9 +89,9 @@ public: explicit QDeclarativePolygonMapItem(QQuickItem *parent = 0); ~QDeclarativePolygonMapItem(); - virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE; + virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override; //from QuickItem - virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override; Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate); Q_INVOKABLE void removeCoordinate(const QGeoCoordinate &coordinate); @@ -104,22 +104,22 @@ public: QDeclarativeMapLineProperties *border(); - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - const QGeoShape &geoShape() const Q_DECL_OVERRIDE; - QGeoMap::ItemType itemType() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const override; + const QGeoShape &geoShape() const override; + QGeoMap::ItemType itemType() const override; Q_SIGNALS: void pathChanged(); void colorChanged(const QColor &color); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void updatePolish() Q_DECL_OVERRIDE; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void updatePolish() override; protected Q_SLOTS: void markSourceDirtyAndUpdate(); void handleBorderUpdated(); - virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE; + virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override; private: void regenerateCache(); -- cgit v1.2.1