diff options
Diffstat (limited to 'src/location/declarativeplaces')
11 files changed, 36 insertions, 36 deletions
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, |