diff options
Diffstat (limited to 'src/location')
27 files changed, 65 insertions, 65 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; diff --git a/src/location/declarativeplaces/qdeclarativecategory_p.h b/src/location/declarativeplaces/qdeclarativecategory_p.h index 96983c1f..65a6e995 100644 --- a/src/location/declarativeplaces/qdeclarativecategory_p.h +++ b/src/location/declarativeplaces/qdeclarativecategory_p.h @@ -96,8 +96,8 @@ public: enum Status {Ready, Saving, Removing, Error}; //From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; void setPlugin(QDeclarativeGeoServiceProvider *plugin); QDeclarativeGeoServiceProvider *plugin() const; diff --git a/src/location/declarativeplaces/qdeclarativecontactdetail_p.h b/src/location/declarativeplaces/qdeclarativecontactdetail_p.h index ad60c3b5..c077a2fc 100644 --- a/src/location/declarativeplaces/qdeclarativecontactdetail_p.h +++ b/src/location/declarativeplaces/qdeclarativecontactdetail_p.h @@ -62,7 +62,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetails : public QQmlProperty public: explicit QDeclarativeContactDetails(QObject *parent = 0); - virtual QVariant updateValue(const QString &key, const QVariant &input); + QVariant updateValue(const QString &key, const QVariant &input) override; }; class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetail : public QObject diff --git a/src/location/declarativeplaces/qdeclarativeplace_p.h b/src/location/declarativeplaces/qdeclarativeplace_p.h index 309bd64c..bfe36936 100644 --- a/src/location/declarativeplaces/qdeclarativeplace_p.h +++ b/src/location/declarativeplaces/qdeclarativeplace_p.h @@ -121,8 +121,8 @@ public: }; //From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; void setPlugin(QDeclarativeGeoServiceProvider *plugin); QDeclarativeGeoServiceProvider *plugin() const; diff --git a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h index 53e24f42..267bf7f7 100644 --- a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h +++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h @@ -91,9 +91,9 @@ public: void initializeCollection(int totalCount, const QPlaceContent::Collection &collection); // from QAbstractListModel - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - 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; enum Roles { SupplierRole = Qt::UserRole, @@ -102,12 +102,12 @@ public: UserRole //indicator for next conten type specific role }; - bool canFetchMore(const QModelIndex &parent) const; - void fetchMore(const QModelIndex &parent); + bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; // from QQmlParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void placeChanged(); diff --git a/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h index b00e2af3..04a8aa6f 100644 --- a/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h +++ b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h @@ -61,8 +61,8 @@ public: explicit QDeclarativePlaceEditorialModel(QObject *parent = 0); ~QDeclarativePlaceEditorialModel(); - QVariant data(const QModelIndex &index, int role) const; - QHash<int, QByteArray> roleNames() const; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; enum Roles { TextRole = UserRole, diff --git a/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h b/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h index 2c244219..71d8601d 100644 --- a/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h +++ b/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h @@ -63,8 +63,8 @@ public: explicit QDeclarativePlaceImageModel(QObject *parent = 0); ~QDeclarativePlaceImageModel(); - QVariant data(const QModelIndex &index, int role) const; - QHash<int, QByteArray> roleNames() const; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; enum Roles { UrlRole = UserRole, diff --git a/src/location/declarativeplaces/qdeclarativereviewmodel_p.h b/src/location/declarativeplaces/qdeclarativereviewmodel_p.h index e6d2bd95..6dc861fb 100644 --- a/src/location/declarativeplaces/qdeclarativereviewmodel_p.h +++ b/src/location/declarativeplaces/qdeclarativereviewmodel_p.h @@ -61,8 +61,8 @@ public: explicit QDeclarativeReviewModel(QObject *parent = 0); ~QDeclarativeReviewModel(); - QVariant data(const QModelIndex &index, int role) const; - QHash<int, QByteArray> roleNames() const; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; enum Roles { DateTimeRole = UserRole, TextRole, diff --git a/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h index b85137a6..8ff0afcd 100644 --- a/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h +++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h @@ -117,8 +117,8 @@ public: virtual void clearData(bool suppressSignal = false); // From QQmlParserStatus - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void pluginChanged(); diff --git a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h index 5d75ee4b..53b5e01f 100644 --- a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h +++ b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h @@ -74,26 +74,26 @@ public: QStringList suggestions() const; - void clearData(bool suppressSignal = false); + void clearData(bool suppressSignal = false) override; // From QAbstractListModel - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - 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; enum Roles { SearchSuggestionRole = Qt::UserRole }; protected Q_SLOTS: - virtual void queryFinished(); + void queryFinished() override; Q_SIGNALS: void searchTermChanged(); void suggestionsChanged(); protected: - QPlaceReply *sendQuery(QPlaceManager *manager, const QPlaceSearchRequest &request); + QPlaceReply *sendQuery(QPlaceManager *manager, const QPlaceSearchRequest &request) override; private: QStringList m_suggestions; diff --git a/src/location/declarativeplaces/qdeclarativesupplier_p.h b/src/location/declarativeplaces/qdeclarativesupplier_p.h index b344d674..45e84360 100644 --- a/src/location/declarativeplaces/qdeclarativesupplier_p.h +++ b/src/location/declarativeplaces/qdeclarativesupplier_p.h @@ -77,8 +77,8 @@ public: ~QDeclarativeSupplier(); // From QQmlParserStatus - void classBegin() { } - void componentComplete(); + void classBegin() override { } + void componentComplete() override; QPlaceSupplier supplier(); void setSupplier(const QPlaceSupplier &src, QDeclarativeGeoServiceProvider *plugin = 0); diff --git a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h index 9f17ab4d..e34a8bf2 100644 --- a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h +++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h @@ -94,18 +94,18 @@ public: virtual ~QDeclarativeSupportedCategoriesModel(); // From QQmlParserStatus - virtual void classBegin() {} - virtual void componentComplete(); + void classBegin() override {} + void componentComplete() override; // From QAbstractItemModel - int rowCount(const QModelIndex &parent) const; - int columnCount(const QModelIndex &parent) const; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &child) const; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; - Q_INVOKABLE QVariant data(const QModelIndex &index, int role) const; - QHash<int, QByteArray> roleNames() const; + Q_INVOKABLE QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; enum Roles { CategoryRole = Qt::UserRole, diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h index 88880424..2a915b0c 100644 --- a/src/location/maps/qgeotilefetcher_p.h +++ b/src/location/maps/qgeotilefetcher_p.h @@ -86,7 +86,7 @@ Q_SIGNALS: protected: QGeoTileFetcher(QGeoTileFetcherPrivate &dd, QGeoMappingManagerEngine *parent); - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; QAbstractGeoTileCache::CacheAreas cacheHint() const; virtual bool initialized() const; virtual bool fetchingEnabled() const; diff --git a/src/location/places/qplacecontent_p.h b/src/location/places/qplacecontent_p.h index 23b176bc..f2bbe6bf 100644 --- a/src/location/places/qplacecontent_p.h +++ b/src/location/places/qplacecontent_p.h @@ -67,8 +67,8 @@ QT_BEGIN_NAMESPACE Class::Class(const QPlaceContent &other) : QPlaceContent() { Class##Private::copyIfPossible(d_ptr, other); } #define Q_DEFINE_CONTENT_PRIVATE_HELPER(Class, ContentType) \ - virtual QPlaceContentPrivate *clone() const { return new Class##Private(*this); } \ - virtual QPlaceContent::Type type() const {return ContentType;} \ + QPlaceContentPrivate *clone() const override { return new Class##Private(*this); } \ + QPlaceContent::Type type() const override {return ContentType;} \ static void copyIfPossible(QSharedDataPointer<QPlaceContentPrivate> &d_ptr, const QPlaceContent &other) \ { \ if (other.type() == ContentType) \ diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h index 929d3384..dd8039f3 100644 --- a/src/location/places/qplacecontentreply.h +++ b/src/location/places/qplacecontentreply.h @@ -52,7 +52,7 @@ public: explicit QPlaceContentReply(QObject *parent = nullptr); virtual ~QPlaceContentReply(); - QPlaceReply::Type type() const; + QPlaceReply::Type type() const override; QPlaceContent::Collection content() const; diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h index 6c3acca7..97806bc9 100644 --- a/src/location/places/qplacedetailsreply.h +++ b/src/location/places/qplacedetailsreply.h @@ -50,7 +50,7 @@ public: explicit QPlaceDetailsReply(QObject *parent = nullptr); virtual ~QPlaceDetailsReply(); - QPlaceReply::Type type() const; + QPlaceReply::Type type() const override; QPlace place() const; diff --git a/src/location/places/qplaceeditorial_p.h b/src/location/places/qplaceeditorial_p.h index f502db73..d2f96da5 100644 --- a/src/location/places/qplaceeditorial_p.h +++ b/src/location/places/qplaceeditorial_p.h @@ -63,7 +63,7 @@ public: ~QPlaceEditorialPrivate(); - bool compare(const QPlaceContentPrivate *other) const; + bool compare(const QPlaceContentPrivate *other) const override; Q_DEFINE_CONTENT_PRIVATE_HELPER(QPlaceEditorial, QPlaceContent::EditorialType) diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h index 6ecf12c8..24b56e4b 100644 --- a/src/location/places/qplaceidreply.h +++ b/src/location/places/qplaceidreply.h @@ -58,7 +58,7 @@ public: explicit QPlaceIdReply(OperationType operationType, QObject *parent = nullptr); virtual ~QPlaceIdReply(); - QPlaceReply::Type type() const; + QPlaceReply::Type type() const override; OperationType operationType() const; QString id() const; diff --git a/src/location/places/qplaceimage_p.h b/src/location/places/qplaceimage_p.h index 4030b08d..8930dcc2 100644 --- a/src/location/places/qplaceimage_p.h +++ b/src/location/places/qplaceimage_p.h @@ -64,7 +64,7 @@ public: ~QPlaceImagePrivate(); - bool compare(const QPlaceContentPrivate *other) const; + bool compare(const QPlaceContentPrivate *other) const override; Q_DEFINE_CONTENT_PRIVATE_HELPER(QPlaceImage, QPlaceContent::ImageType) diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h index 8e195663..7a3853ee 100644 --- a/src/location/places/qplacematchreply.h +++ b/src/location/places/qplacematchreply.h @@ -50,7 +50,7 @@ public: explicit QPlaceMatchReply(QObject *parent = nullptr); ~QPlaceMatchReply(); - QPlaceReply::Type type() const; + QPlaceReply::Type type() const override; QList<QPlace> places() const; QPlaceMatchRequest request() const; diff --git a/src/location/places/qplacereview_p.h b/src/location/places/qplacereview_p.h index 345aa192..87ca124b 100644 --- a/src/location/places/qplacereview_p.h +++ b/src/location/places/qplacereview_p.h @@ -63,7 +63,7 @@ public: ~QPlaceReviewPrivate(); - bool compare(const QPlaceContentPrivate *other) const; + bool compare(const QPlaceContentPrivate *other) const override; Q_DEFINE_CONTENT_PRIVATE_HELPER(QPlaceReview, QPlaceContent::ReviewType); diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h index 3562aede..ef4e1adb 100644 --- a/src/location/places/qplacesearchreply.h +++ b/src/location/places/qplacesearchreply.h @@ -52,7 +52,7 @@ public: explicit QPlaceSearchReply(QObject *parent = nullptr); ~QPlaceSearchReply(); - QPlaceReply::Type type() const; + QPlaceReply::Type type() const override; QList<QPlaceSearchResult> results() const; QPlaceSearchRequest request() const; diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h index 49088874..7f5e1ef3 100644 --- a/src/location/places/qplacesearchsuggestionreply.h +++ b/src/location/places/qplacesearchsuggestionreply.h @@ -53,7 +53,7 @@ public: ~QPlaceSearchSuggestionReply(); QStringList suggestions() const; - Type type() const; + Type type() const override; protected: void setSuggestions(const QStringList &suggestions); |