diff --git a/src/akonadi/akonadiapplicationselectedattribute.h b/src/akonadi/akonadiapplicationselectedattribute.h --- a/src/akonadi/akonadiapplicationselectedattribute.h +++ b/src/akonadi/akonadiapplicationselectedattribute.h @@ -39,11 +39,11 @@ void setSelected(bool selected); bool isSelected() const; - QByteArray type() const Q_DECL_OVERRIDE; - ApplicationSelectedAttribute *clone() const Q_DECL_OVERRIDE; + QByteArray type() const override; + ApplicationSelectedAttribute *clone() const override; - QByteArray serialized() const Q_DECL_OVERRIDE; - void deserialize(const QByteArray &data) Q_DECL_OVERRIDE; + QByteArray serialized() const override; + void deserialize(const QByteArray &data) override; private: bool m_selected; diff --git a/src/akonadi/akonadicachingstorage.h b/src/akonadi/akonadicachingstorage.h --- a/src/akonadi/akonadicachingstorage.h +++ b/src/akonadi/akonadicachingstorage.h @@ -36,30 +36,30 @@ explicit CachingStorage(const Cache::Ptr &cache, const StorageInterface::Ptr &storage); virtual ~CachingStorage(); - Akonadi::Collection defaultCollection() Q_DECL_OVERRIDE; - - KJob *createItem(Item item, Collection collection) Q_DECL_OVERRIDE; - KJob *updateItem(Item item, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *removeItem(Akonadi::Item item) Q_DECL_OVERRIDE; - KJob *removeItems(Item::List items, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *moveItem(Item item, Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *moveItems(Item::List item, Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - - KJob *createCollection(Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *updateCollection(Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *removeCollection(Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - - KJob *createTransaction() Q_DECL_OVERRIDE; - - KJob *createTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - KJob *updateTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - KJob *removeTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - - CollectionFetchJobInterface *fetchCollections(Akonadi::Collection collection, FetchDepth depth) Q_DECL_OVERRIDE; - ItemFetchJobInterface *fetchItems(Akonadi::Collection collection) Q_DECL_OVERRIDE; - ItemFetchJobInterface *fetchItem(Akonadi::Item item) Q_DECL_OVERRIDE; - ItemFetchJobInterface *fetchTagItems(Akonadi::Tag tag) Q_DECL_OVERRIDE; - TagFetchJobInterface *fetchTags() Q_DECL_OVERRIDE; + Akonadi::Collection defaultCollection() override; + + KJob *createItem(Item item, Collection collection) override; + KJob *updateItem(Item item, QObject *parent = Q_NULLPTR) override; + KJob *removeItem(Akonadi::Item item) override; + KJob *removeItems(Item::List items, QObject *parent = Q_NULLPTR) override; + KJob *moveItem(Item item, Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *moveItems(Item::List item, Collection collection, QObject *parent = Q_NULLPTR) override; + + KJob *createCollection(Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *updateCollection(Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *removeCollection(Collection collection, QObject *parent = Q_NULLPTR) override; + + KJob *createTransaction() override; + + KJob *createTag(Akonadi::Tag tag) override; + KJob *updateTag(Akonadi::Tag tag) override; + KJob *removeTag(Akonadi::Tag tag) override; + + CollectionFetchJobInterface *fetchCollections(Akonadi::Collection collection, FetchDepth depth) override; + ItemFetchJobInterface *fetchItems(Akonadi::Collection collection) override; + ItemFetchJobInterface *fetchItem(Akonadi::Item item) override; + ItemFetchJobInterface *fetchTagItems(Akonadi::Tag tag) override; + TagFetchJobInterface *fetchTags() override; private: Cache::Ptr m_cache; diff --git a/src/akonadi/akonadicontextqueries.h b/src/akonadi/akonadicontextqueries.h --- a/src/akonadi/akonadicontextqueries.h +++ b/src/akonadi/akonadicontextqueries.h @@ -54,8 +54,8 @@ const Cache::Ptr &cache); - ContextResult::Ptr findAll() const Q_DECL_OVERRIDE; - TaskResult::Ptr findTopLevelTasks(Domain::Context::Ptr context) const Q_DECL_OVERRIDE; + ContextResult::Ptr findAll() const override; + TaskResult::Ptr findTopLevelTasks(Domain::Context::Ptr context) const override; private: SerializerInterface::Ptr m_serializer; diff --git a/src/akonadi/akonadicontextrepository.h b/src/akonadi/akonadicontextrepository.h --- a/src/akonadi/akonadicontextrepository.h +++ b/src/akonadi/akonadicontextrepository.h @@ -41,13 +41,13 @@ ContextRepository(const StorageInterface::Ptr &storage, const SerializerInterface::Ptr &serializer); - KJob *create(Domain::Context::Ptr context) Q_DECL_OVERRIDE; - KJob *update(Domain::Context::Ptr context) Q_DECL_OVERRIDE; - KJob *remove(Domain::Context::Ptr context) Q_DECL_OVERRIDE; + KJob *create(Domain::Context::Ptr context) override; + KJob *update(Domain::Context::Ptr context) override; + KJob *remove(Domain::Context::Ptr context) override; - KJob *associate(Domain::Context::Ptr parent, Domain::Task::Ptr child) Q_DECL_OVERRIDE; - KJob *dissociate(Domain::Context::Ptr parent, Domain::Task::Ptr child) Q_DECL_OVERRIDE; - KJob *dissociateAll(Domain::Task::Ptr child) Q_DECL_OVERRIDE; + KJob *associate(Domain::Context::Ptr parent, Domain::Task::Ptr child) override; + KJob *dissociate(Domain::Context::Ptr parent, Domain::Task::Ptr child) override; + KJob *dissociateAll(Domain::Task::Ptr child) override; private: StorageInterface::Ptr m_storage; diff --git a/src/akonadi/akonadidatasourcequeries.h b/src/akonadi/akonadidatasourcequeries.h --- a/src/akonadi/akonadidatasourcequeries.h +++ b/src/akonadi/akonadidatasourcequeries.h @@ -50,15 +50,15 @@ const SerializerInterface::Ptr &serializer, const MonitorInterface::Ptr &monitor); - bool isDefaultSource(Domain::DataSource::Ptr source) const Q_DECL_OVERRIDE; + bool isDefaultSource(Domain::DataSource::Ptr source) const override; private: - void changeDefaultSource(Domain::DataSource::Ptr source) Q_DECL_OVERRIDE; + void changeDefaultSource(Domain::DataSource::Ptr source) override; public: - DataSourceResult::Ptr findTopLevel() const Q_DECL_OVERRIDE; - DataSourceResult::Ptr findChildren(Domain::DataSource::Ptr source) const Q_DECL_OVERRIDE; - DataSourceResult::Ptr findAllSelected() const Q_DECL_OVERRIDE; - ProjectResult::Ptr findProjects(Domain::DataSource::Ptr source) const Q_DECL_OVERRIDE; + DataSourceResult::Ptr findTopLevel() const override; + DataSourceResult::Ptr findChildren(Domain::DataSource::Ptr source) const override; + DataSourceResult::Ptr findAllSelected() const override; + ProjectResult::Ptr findProjects(Domain::DataSource::Ptr source) const override; private: CollectionInputQuery::PredicateFunction createFetchPredicate(const Collection &root) const; diff --git a/src/akonadi/akonadidatasourcerepository.h b/src/akonadi/akonadidatasourcerepository.h --- a/src/akonadi/akonadidatasourcerepository.h +++ b/src/akonadi/akonadidatasourcerepository.h @@ -43,10 +43,10 @@ DataSourceRepository(const StorageInterface::Ptr &storage, const SerializerInterface::Ptr &serializer); - KJob *update(Domain::DataSource::Ptr source) Q_DECL_OVERRIDE; + KJob *update(Domain::DataSource::Ptr source) override; - void showConfigDialog() Q_DECL_OVERRIDE; - void windowNeedsDataBackend(QWidget *window) Q_DECL_OVERRIDE; + void showConfigDialog() override; + void windowNeedsDataBackend(QWidget *window) override; private: StorageInterface::Ptr m_storage; diff --git a/src/akonadi/akonadiprojectqueries.h b/src/akonadi/akonadiprojectqueries.h --- a/src/akonadi/akonadiprojectqueries.h +++ b/src/akonadi/akonadiprojectqueries.h @@ -49,8 +49,8 @@ const SerializerInterface::Ptr &serializer, const MonitorInterface::Ptr &monitor); - ProjectResult::Ptr findAll() const Q_DECL_OVERRIDE; - TaskResult::Ptr findTopLevel(Domain::Project::Ptr project) const Q_DECL_OVERRIDE; + ProjectResult::Ptr findAll() const override; + TaskResult::Ptr findTopLevel(Domain::Project::Ptr project) const override; private: SerializerInterface::Ptr m_serializer; diff --git a/src/akonadi/akonadiprojectrepository.h b/src/akonadi/akonadiprojectrepository.h --- a/src/akonadi/akonadiprojectrepository.h +++ b/src/akonadi/akonadiprojectrepository.h @@ -40,12 +40,12 @@ ProjectRepository(const StorageInterface::Ptr &storage, const SerializerInterface::Ptr &serializer); - KJob *create(Domain::Project::Ptr project, Domain::DataSource::Ptr source) Q_DECL_OVERRIDE; - KJob *update(Domain::Project::Ptr project) Q_DECL_OVERRIDE; - KJob *remove(Domain::Project::Ptr project) Q_DECL_OVERRIDE; + KJob *create(Domain::Project::Ptr project, Domain::DataSource::Ptr source) override; + KJob *update(Domain::Project::Ptr project) override; + KJob *remove(Domain::Project::Ptr project) override; - KJob *associate(Domain::Project::Ptr parent, Domain::Task::Ptr child) Q_DECL_OVERRIDE; - KJob *dissociate(Domain::Task::Ptr child) Q_DECL_OVERRIDE; + KJob *associate(Domain::Project::Ptr parent, Domain::Task::Ptr child) override; + KJob *dissociate(Domain::Task::Ptr child) override; private: StorageInterface::Ptr m_storage; diff --git a/src/akonadi/akonadiserializer.h b/src/akonadi/akonadiserializer.h --- a/src/akonadi/akonadiserializer.h +++ b/src/akonadi/akonadiserializer.h @@ -38,43 +38,43 @@ Serializer(); virtual ~Serializer(); - bool representsCollection(QObjectPtr object, Collection collection) Q_DECL_OVERRIDE; - bool representsItem(QObjectPtr object, Item item) Q_DECL_OVERRIDE; - - QString itemUid(const Item &item) Q_DECL_OVERRIDE; - - Domain::DataSource::Ptr createDataSourceFromCollection(Akonadi::Collection collection, DataSourceNameScheme naming) Q_DECL_OVERRIDE; - void updateDataSourceFromCollection(Domain::DataSource::Ptr dataSource, Akonadi::Collection collection, DataSourceNameScheme naming) Q_DECL_OVERRIDE; - virtual Akonadi::Collection createCollectionFromDataSource(Domain::DataSource::Ptr dataSource) Q_DECL_OVERRIDE; - virtual bool isSelectedCollection(Akonadi::Collection collection) Q_DECL_OVERRIDE; - virtual bool isTaskCollection(Akonadi::Collection collection) Q_DECL_OVERRIDE; - - bool isTaskItem(Akonadi::Item item) Q_DECL_OVERRIDE; - Domain::Task::Ptr createTaskFromItem(Akonadi::Item item) Q_DECL_OVERRIDE; - void updateTaskFromItem(Domain::Task::Ptr task, Akonadi::Item item) Q_DECL_OVERRIDE; - Akonadi::Item createItemFromTask(Domain::Task::Ptr task) Q_DECL_OVERRIDE; - bool isTaskChild(Domain::Task::Ptr task, Akonadi::Item item) Q_DECL_OVERRIDE; - QString relatedUidFromItem(Akonadi::Item item) Q_DECL_OVERRIDE; - void updateItemParent(Akonadi::Item item, Domain::Task::Ptr parent) Q_DECL_OVERRIDE; - void updateItemProject(Akonadi::Item item, Domain::Project::Ptr project) Q_DECL_OVERRIDE; - void removeItemParent(Akonadi::Item item) Q_DECL_OVERRIDE; - void promoteItemToProject(Akonadi::Item item) Q_DECL_OVERRIDE; - void clearItem(Akonadi::Item *item) Q_DECL_OVERRIDE; - Akonadi::Item::List filterDescendantItems(const Akonadi::Item::List &potentialChildren, const Akonadi::Item &ancestorItem) Q_DECL_OVERRIDE; - - bool isProjectItem(Akonadi::Item item) Q_DECL_OVERRIDE; - Domain::Project::Ptr createProjectFromItem(Akonadi::Item item) Q_DECL_OVERRIDE; - void updateProjectFromItem(Domain::Project::Ptr project, Akonadi::Item item) Q_DECL_OVERRIDE; - Akonadi::Item createItemFromProject(Domain::Project::Ptr project) Q_DECL_OVERRIDE; - bool isProjectChild(Domain::Project::Ptr project, Akonadi::Item item) Q_DECL_OVERRIDE; - - Domain::Context::Ptr createContextFromTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - void updateContextFromTag(Domain::Context::Ptr context, Akonadi::Tag tag) Q_DECL_OVERRIDE; - Akonadi::Tag createTagFromContext(Domain::Context::Ptr context) Q_DECL_OVERRIDE; - bool isContextTag(const Domain::Context::Ptr &context, const Akonadi::Tag &tag) const Q_DECL_OVERRIDE; - bool isContextChild(Domain::Context::Ptr context, Akonadi::Item item) const Q_DECL_OVERRIDE; - - bool hasContextTags(Akonadi::Item item) const Q_DECL_OVERRIDE; + bool representsCollection(QObjectPtr object, Collection collection) override; + bool representsItem(QObjectPtr object, Item item) override; + + QString itemUid(const Item &item) override; + + Domain::DataSource::Ptr createDataSourceFromCollection(Akonadi::Collection collection, DataSourceNameScheme naming) override; + void updateDataSourceFromCollection(Domain::DataSource::Ptr dataSource, Akonadi::Collection collection, DataSourceNameScheme naming) override; + virtual Akonadi::Collection createCollectionFromDataSource(Domain::DataSource::Ptr dataSource) override; + virtual bool isSelectedCollection(Akonadi::Collection collection) override; + virtual bool isTaskCollection(Akonadi::Collection collection) override; + + bool isTaskItem(Akonadi::Item item) override; + Domain::Task::Ptr createTaskFromItem(Akonadi::Item item) override; + void updateTaskFromItem(Domain::Task::Ptr task, Akonadi::Item item) override; + Akonadi::Item createItemFromTask(Domain::Task::Ptr task) override; + bool isTaskChild(Domain::Task::Ptr task, Akonadi::Item item) override; + QString relatedUidFromItem(Akonadi::Item item) override; + void updateItemParent(Akonadi::Item item, Domain::Task::Ptr parent) override; + void updateItemProject(Akonadi::Item item, Domain::Project::Ptr project) override; + void removeItemParent(Akonadi::Item item) override; + void promoteItemToProject(Akonadi::Item item) override; + void clearItem(Akonadi::Item *item) override; + Akonadi::Item::List filterDescendantItems(const Akonadi::Item::List &potentialChildren, const Akonadi::Item &ancestorItem) override; + + bool isProjectItem(Akonadi::Item item) override; + Domain::Project::Ptr createProjectFromItem(Akonadi::Item item) override; + void updateProjectFromItem(Domain::Project::Ptr project, Akonadi::Item item) override; + Akonadi::Item createItemFromProject(Domain::Project::Ptr project) override; + bool isProjectChild(Domain::Project::Ptr project, Akonadi::Item item) override; + + Domain::Context::Ptr createContextFromTag(Akonadi::Tag tag) override; + void updateContextFromTag(Domain::Context::Ptr context, Akonadi::Tag tag) override; + Akonadi::Tag createTagFromContext(Domain::Context::Ptr context) override; + bool isContextTag(const Domain::Context::Ptr &context, const Akonadi::Tag &tag) const override; + bool isContextChild(Domain::Context::Ptr context, Akonadi::Item item) const override; + + bool hasContextTags(Akonadi::Item item) const override; private: bool isContext(const Akonadi::Tag &tag) const; diff --git a/src/akonadi/akonadistorage.h b/src/akonadi/akonadistorage.h --- a/src/akonadi/akonadistorage.h +++ b/src/akonadi/akonadistorage.h @@ -37,30 +37,30 @@ Storage(); virtual ~Storage(); - Akonadi::Collection defaultCollection() Q_DECL_OVERRIDE; - - KJob *createItem(Item item, Collection collection) Q_DECL_OVERRIDE; - KJob *updateItem(Item item, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *removeItem(Akonadi::Item item) Q_DECL_OVERRIDE; - KJob *removeItems(Item::List items, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *moveItem(Item item, Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *moveItems(Item::List item, Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - - KJob *createCollection(Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *updateCollection(Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *removeCollection(Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - - KJob *createTransaction() Q_DECL_OVERRIDE; - - KJob *createTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - KJob *updateTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - KJob *removeTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - - CollectionFetchJobInterface *fetchCollections(Akonadi::Collection collection, FetchDepth depth) Q_DECL_OVERRIDE; - ItemFetchJobInterface *fetchItems(Akonadi::Collection collection) Q_DECL_OVERRIDE; - ItemFetchJobInterface *fetchItem(Akonadi::Item item) Q_DECL_OVERRIDE; - ItemFetchJobInterface *fetchTagItems(Akonadi::Tag tag) Q_DECL_OVERRIDE; - TagFetchJobInterface *fetchTags() Q_DECL_OVERRIDE; + Akonadi::Collection defaultCollection() override; + + KJob *createItem(Item item, Collection collection) override; + KJob *updateItem(Item item, QObject *parent = Q_NULLPTR) override; + KJob *removeItem(Akonadi::Item item) override; + KJob *removeItems(Item::List items, QObject *parent = Q_NULLPTR) override; + KJob *moveItem(Item item, Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *moveItems(Item::List item, Collection collection, QObject *parent = Q_NULLPTR) override; + + KJob *createCollection(Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *updateCollection(Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *removeCollection(Collection collection, QObject *parent = Q_NULLPTR) override; + + KJob *createTransaction() override; + + KJob *createTag(Akonadi::Tag tag) override; + KJob *updateTag(Akonadi::Tag tag) override; + KJob *removeTag(Akonadi::Tag tag) override; + + CollectionFetchJobInterface *fetchCollections(Akonadi::Collection collection, FetchDepth depth) override; + ItemFetchJobInterface *fetchItems(Akonadi::Collection collection) override; + ItemFetchJobInterface *fetchItem(Akonadi::Item item) override; + ItemFetchJobInterface *fetchTagItems(Akonadi::Tag tag) override; + TagFetchJobInterface *fetchTags() override; private: CollectionFetchJob::Type jobTypeFromDepth(StorageInterface::FetchDepth depth); diff --git a/src/akonadi/akonadistorage.cpp b/src/akonadi/akonadistorage.cpp --- a/src/akonadi/akonadistorage.cpp +++ b/src/akonadi/akonadistorage.cpp @@ -63,7 +63,7 @@ { } - Collection::List collections() const Q_DECL_OVERRIDE + Collection::List collections() const override { auto collections = CollectionFetchJob::collections(); @@ -112,7 +112,7 @@ return collections; } - void setResource(const QString &resource) Q_DECL_OVERRIDE + void setResource(const QString &resource) override { fetchScope().setResource(resource); } @@ -128,9 +128,9 @@ public: using ItemFetchJob::ItemFetchJob; - Item::List items() const Q_DECL_OVERRIDE { return ItemFetchJob::items(); } + Item::List items() const override { return ItemFetchJob::items(); } - void setCollection(const Collection &collection) Q_DECL_OVERRIDE + void setCollection(const Collection &collection) override { ItemFetchJob::setCollection(collection); } @@ -142,7 +142,7 @@ public: using TagFetchJob::TagFetchJob; - Tag::List tags() const Q_DECL_OVERRIDE { return TagFetchJob::tags(); } + Tag::List tags() const override { return TagFetchJob::tags(); } }; Storage::Storage() diff --git a/src/akonadi/akonaditaskqueries.h b/src/akonadi/akonaditaskqueries.h --- a/src/akonadi/akonaditaskqueries.h +++ b/src/akonadi/akonaditaskqueries.h @@ -62,14 +62,14 @@ int workdayPollInterval() const; void setWorkdayPollInterval(int interval); - TaskResult::Ptr findAll() const Q_DECL_OVERRIDE; - TaskResult::Ptr findChildren(Domain::Task::Ptr task) const Q_DECL_OVERRIDE; - TaskResult::Ptr findTopLevel() const Q_DECL_OVERRIDE; - TaskResult::Ptr findInboxTopLevel() const Q_DECL_OVERRIDE; - TaskResult::Ptr findWorkdayTopLevel() const Q_DECL_OVERRIDE; - ContextResult::Ptr findContexts(Domain::Task::Ptr task) const Q_DECL_OVERRIDE; - ProjectResult::Ptr findProject(Domain::Task::Ptr task) const Q_DECL_OVERRIDE; - DataSourceResult::Ptr findDataSource(Domain::Task::Ptr task) const Q_DECL_OVERRIDE; + TaskResult::Ptr findAll() const override; + TaskResult::Ptr findChildren(Domain::Task::Ptr task) const override; + TaskResult::Ptr findTopLevel() const override; + TaskResult::Ptr findInboxTopLevel() const override; + TaskResult::Ptr findWorkdayTopLevel() const override; + ContextResult::Ptr findContexts(Domain::Task::Ptr task) const override; + ProjectResult::Ptr findProject(Domain::Task::Ptr task) const override; + DataSourceResult::Ptr findDataSource(Domain::Task::Ptr task) const override; private slots: diff --git a/src/akonadi/akonaditaskrepository.h b/src/akonadi/akonaditaskrepository.h --- a/src/akonadi/akonaditaskrepository.h +++ b/src/akonadi/akonaditaskrepository.h @@ -43,19 +43,19 @@ TaskRepository(const StorageInterface::Ptr &storage, const SerializerInterface::Ptr &serializer); - virtual KJob *create(Domain::Task::Ptr task) Q_DECL_OVERRIDE; - virtual KJob *createChild(Domain::Task::Ptr task, Domain::Task::Ptr parent) Q_DECL_OVERRIDE; - virtual KJob *createInProject(Domain::Task::Ptr task, Domain::Project::Ptr project) Q_DECL_OVERRIDE; - virtual KJob *createInContext(Domain::Task::Ptr task, Domain::Context::Ptr context) Q_DECL_OVERRIDE; + virtual KJob *create(Domain::Task::Ptr task) override; + virtual KJob *createChild(Domain::Task::Ptr task, Domain::Task::Ptr parent) override; + virtual KJob *createInProject(Domain::Task::Ptr task, Domain::Project::Ptr project) override; + virtual KJob *createInContext(Domain::Task::Ptr task, Domain::Context::Ptr context) override; - virtual KJob *update(Domain::Task::Ptr task) Q_DECL_OVERRIDE; - virtual KJob *remove(Domain::Task::Ptr task) Q_DECL_OVERRIDE; + virtual KJob *update(Domain::Task::Ptr task) override; + virtual KJob *remove(Domain::Task::Ptr task) override; - virtual KJob *promoteToProject(Domain::Task::Ptr task) Q_DECL_OVERRIDE; + virtual KJob *promoteToProject(Domain::Task::Ptr task) override; - virtual KJob *associate(Domain::Task::Ptr parent, Domain::Task::Ptr child) Q_DECL_OVERRIDE; - virtual KJob *dissociate(Domain::Task::Ptr child) Q_DECL_OVERRIDE; - virtual KJob *dissociateAll(Domain::Task::Ptr child) Q_DECL_OVERRIDE; + virtual KJob *associate(Domain::Task::Ptr parent, Domain::Task::Ptr child) override; + virtual KJob *dissociate(Domain::Task::Ptr child) override; + virtual KJob *dissociateAll(Domain::Task::Ptr child) override; private: StorageInterface::Ptr m_storage; diff --git a/src/akonadi/akonaditimestampattribute.h b/src/akonadi/akonaditimestampattribute.h --- a/src/akonadi/akonaditimestampattribute.h +++ b/src/akonadi/akonaditimestampattribute.h @@ -39,11 +39,11 @@ qint64 timestamp() const; void refreshTimestamp(); - QByteArray type() const Q_DECL_OVERRIDE; - TimestampAttribute *clone() const Q_DECL_OVERRIDE; + QByteArray type() const override; + TimestampAttribute *clone() const override; - QByteArray serialized() const Q_DECL_OVERRIDE; - void deserialize(const QByteArray &data) Q_DECL_OVERRIDE; + QByteArray serialized() const override; + void deserialize(const QByteArray &data) override; private: qint64 m_timestamp; diff --git a/src/domain/livequery.h b/src/domain/livequery.h --- a/src/domain/livequery.h +++ b/src/domain/livequery.h @@ -90,7 +90,7 @@ clear(); } - typename Result::Ptr result() Q_DECL_OVERRIDE + typename Result::Ptr result() override { typename Provider::Ptr provider(m_provider.toStrongRef()); @@ -135,13 +135,13 @@ m_represents = represents; } - void reset() Q_DECL_OVERRIDE + void reset() override { clear(); doFetch(); } - void onAdded(const InputType &input) Q_DECL_OVERRIDE + void onAdded(const InputType &input) override { typename Provider::Ptr provider(m_provider.toStrongRef()); @@ -152,7 +152,7 @@ addToProvider(provider, input); } - void onChanged(const InputType &input) Q_DECL_OVERRIDE + void onChanged(const InputType &input) override { typename Provider::Ptr provider(m_provider.toStrongRef()); @@ -185,7 +185,7 @@ } } - void onRemoved(const InputType &input) Q_DECL_OVERRIDE + void onRemoved(const InputType &input) override { typename Provider::Ptr provider(m_provider.toStrongRef()); @@ -293,7 +293,7 @@ clear(); } - typename Result::Ptr result() Q_DECL_OVERRIDE + typename Result::Ptr result() override { typename Provider::Ptr provider(m_provider.toStrongRef()); @@ -337,13 +337,13 @@ m_represents = represents; } - void reset() Q_DECL_OVERRIDE + void reset() override { clear(); doFetch(); } - void onAdded(const InputType &input) Q_DECL_OVERRIDE + void onAdded(const InputType &input) override { typename Provider::Ptr provider(m_provider.toStrongRef()); @@ -355,7 +355,7 @@ addToProvider(provider, input); } - void onChanged(const InputType &input) Q_DECL_OVERRIDE + void onChanged(const InputType &input) override { Q_ASSERT(m_compare); const bool found = std::any_of(m_intermediaryResults.constBegin(), m_intermediaryResults.constEnd(), @@ -366,7 +366,7 @@ reset(); } - void onRemoved(const InputType &input) Q_DECL_OVERRIDE + void onRemoved(const InputType &input) override { onChanged(input); } diff --git a/src/presentation/contextpagemodel.h b/src/presentation/contextpagemodel.h --- a/src/presentation/contextpagemodel.h +++ b/src/presentation/contextpagemodel.h @@ -47,12 +47,12 @@ Domain::Context::Ptr context() const; public slots: - Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) Q_DECL_OVERRIDE; - void removeItem(const QModelIndex &index) Q_DECL_OVERRIDE; - void promoteItem(const QModelIndex &index) Q_DECL_OVERRIDE; + Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) override; + void removeItem(const QModelIndex &index) override; + void promoteItem(const QModelIndex &index) override; private: - QAbstractItemModel *createCentralListModel() Q_DECL_OVERRIDE; + QAbstractItemModel *createCentralListModel() override; Domain::Context::Ptr m_context; Domain::ContextQueries::Ptr m_contextQueries; diff --git a/src/presentation/inboxpagemodel.h b/src/presentation/inboxpagemodel.h --- a/src/presentation/inboxpagemodel.h +++ b/src/presentation/inboxpagemodel.h @@ -40,12 +40,12 @@ const Domain::TaskRepository::Ptr &taskRepository, QObject *parent = Q_NULLPTR); - Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) Q_DECL_OVERRIDE; - void removeItem(const QModelIndex &index) Q_DECL_OVERRIDE; - void promoteItem(const QModelIndex &index) Q_DECL_OVERRIDE; + Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) override; + void removeItem(const QModelIndex &index) override; + void promoteItem(const QModelIndex &index) override; private: - QAbstractItemModel *createCentralListModel() Q_DECL_OVERRIDE; + QAbstractItemModel *createCentralListModel() override; Domain::TaskQueries::Ptr m_taskQueries; Domain::TaskRepository::Ptr m_taskRepository; diff --git a/src/presentation/projectpagemodel.h b/src/presentation/projectpagemodel.h --- a/src/presentation/projectpagemodel.h +++ b/src/presentation/projectpagemodel.h @@ -47,12 +47,12 @@ Domain::Project::Ptr project() const; - Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) Q_DECL_OVERRIDE; - void removeItem(const QModelIndex &index) Q_DECL_OVERRIDE; - void promoteItem(const QModelIndex &index) Q_DECL_OVERRIDE; + Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) override; + void removeItem(const QModelIndex &index) override; + void promoteItem(const QModelIndex &index) override; private: - QAbstractItemModel *createCentralListModel() Q_DECL_OVERRIDE; + QAbstractItemModel *createCentralListModel() override; Domain::ProjectQueries::Ptr m_projectQueries; Domain::ProjectRepository::Ptr m_projectRepository; diff --git a/src/presentation/querytreemodel.h b/src/presentation/querytreemodel.h --- a/src/presentation/querytreemodel.h +++ b/src/presentation/querytreemodel.h @@ -77,7 +77,7 @@ } protected: - QMimeData *createMimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE + QMimeData *createMimeData(const QModelIndexList &indexes) const override { if (m_dragFunction) { QList items; diff --git a/src/presentation/querytreemodelbase.h b/src/presentation/querytreemodelbase.h --- a/src/presentation/querytreemodelbase.h +++ b/src/presentation/querytreemodelbase.h @@ -80,19 +80,19 @@ ~QueryTreeModelBase(); - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - Qt::DropActions supportedDragActions() const Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; + + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + QStringList mimeTypes() const override; + Qt::DropActions supportedDragActions() const override; + Qt::DropActions supportedDropActions() const override; protected: explicit QueryTreeModelBase(QueryTreeNodeBase *rootNode, diff --git a/src/presentation/querytreenode.h b/src/presentation/querytreenode.h --- a/src/presentation/querytreenode.h +++ b/src/presentation/querytreenode.h @@ -81,19 +81,19 @@ ItemType item() const { return m_item; } - Qt::ItemFlags flags() const Q_DECL_OVERRIDE { return m_flagsFunction(m_item); } + Qt::ItemFlags flags() const override { return m_flagsFunction(m_item); } - QVariant data(int role) const Q_DECL_OVERRIDE + QVariant data(int role) const override { if (role == QueryTreeModelBase::ObjectRole) return QVariant::fromValue(m_item); return m_dataFunction(m_item, role, m_additionalInfo); } - bool setData(const QVariant &value, int role) Q_DECL_OVERRIDE { return m_setDataFunction(m_item, value, role); } + bool setData(const QVariant &value, int role) override { return m_setDataFunction(m_item, value, role); } - bool dropMimeData(const QMimeData *data, Qt::DropAction action) Q_DECL_OVERRIDE + bool dropMimeData(const QMimeData *data, Qt::DropAction action) override { if (m_dropFunction) return m_dropFunction(data, action, m_item); diff --git a/src/presentation/runningtaskmodel.h b/src/presentation/runningtaskmodel.h --- a/src/presentation/runningtaskmodel.h +++ b/src/presentation/runningtaskmodel.h @@ -42,14 +42,14 @@ QObject *parent = nullptr); ~RunningTaskModel(); - Domain::Task::Ptr runningTask() const Q_DECL_OVERRIDE; - void setRunningTask(const Domain::Task::Ptr &runningTask) Q_DECL_OVERRIDE; + Domain::Task::Ptr runningTask() const override; + void setRunningTask(const Domain::Task::Ptr &runningTask) override; - void taskDeleted(const Domain::Task::Ptr &task) Q_DECL_OVERRIDE; + void taskDeleted(const Domain::Task::Ptr &task) override; public slots: - void stopTask() Q_DECL_OVERRIDE; - void doneTask() Q_DECL_OVERRIDE; + void stopTask() override; + void doneTask() override; private: void taskTitleChanged(const QString &title); diff --git a/src/presentation/taskfilterproxymodel.h b/src/presentation/taskfilterproxymodel.h --- a/src/presentation/taskfilterproxymodel.h +++ b/src/presentation/taskfilterproxymodel.h @@ -50,8 +50,8 @@ void setShowFutureTasks(bool show); protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE; - bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE; + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: SortType m_sortType; diff --git a/src/presentation/workdaypagemodel.h b/src/presentation/workdaypagemodel.h --- a/src/presentation/workdaypagemodel.h +++ b/src/presentation/workdaypagemodel.h @@ -40,12 +40,12 @@ const Domain::TaskRepository::Ptr &taskRepository, QObject *parent = Q_NULLPTR); - Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) Q_DECL_OVERRIDE; - void removeItem(const QModelIndex &index) Q_DECL_OVERRIDE; - void promoteItem(const QModelIndex &index) Q_DECL_OVERRIDE; + Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) override; + void removeItem(const QModelIndex &index) override; + void promoteItem(const QModelIndex &index) override; private: - QAbstractItemModel *createCentralListModel() Q_DECL_OVERRIDE; + QAbstractItemModel *createCentralListModel() override; Domain::TaskQueries::Ptr m_taskQueries; Domain::TaskRepository::Ptr m_taskRepository; diff --git a/src/utils/compositejob.h b/src/utils/compositejob.h --- a/src/utils/compositejob.h +++ b/src/utils/compositejob.h @@ -37,14 +37,14 @@ using KCompositeJob::addSubjob; - virtual void start() Q_DECL_OVERRIDE; + virtual void start() override; virtual bool install(KJob *job, const JobHandler::ResultHandlerWithJob &handler); virtual bool install(KJob *job, const JobHandler::ResultHandler &handler); void emitError(const QString &errorText); private slots: - virtual void slotResult(KJob *job) Q_DECL_OVERRIDE; + virtual void slotResult(KJob *job) override; }; } diff --git a/src/widgets/datasourcedelegate.h b/src/widgets/datasourcedelegate.h --- a/src/widgets/datasourcedelegate.h +++ b/src/widgets/datasourcedelegate.h @@ -39,8 +39,8 @@ public: explicit DataSourceDelegate(QObject *parent = Q_NULLPTR); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; } diff --git a/src/widgets/editorview.h b/src/widgets/editorview.h --- a/src/widgets/editorview.h +++ b/src/widgets/editorview.h @@ -74,7 +74,7 @@ void recurrenceChanged(Domain::Task::Recurrence recurrence); protected: - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; private slots: void onTaskChanged(); diff --git a/src/widgets/itemdelegate.h b/src/widgets/itemdelegate.h --- a/src/widgets/itemdelegate.h +++ b/src/widgets/itemdelegate.h @@ -36,10 +36,10 @@ explicit ItemDelegate(QObject *parent = Q_NULLPTR); QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; }; } diff --git a/src/widgets/messagebox.h b/src/widgets/messagebox.h --- a/src/widgets/messagebox.h +++ b/src/widgets/messagebox.h @@ -36,8 +36,8 @@ virtual ~MessageBox(); - QMessageBox::Button askConfirmation(QWidget *parent, const QString &title, const QString &text) Q_DECL_OVERRIDE; - QString askTextInput(QWidget *parent, const QString &title, const QString &text) Q_DECL_OVERRIDE; + QMessageBox::Button askConfirmation(QWidget *parent, const QString &title, const QString &text) override; + QString askTextInput(QWidget *parent, const QString &title, const QString &text) override; }; } diff --git a/src/widgets/newprojectdialog.h b/src/widgets/newprojectdialog.h --- a/src/widgets/newprojectdialog.h +++ b/src/widgets/newprojectdialog.h @@ -45,14 +45,14 @@ explicit NewProjectDialog(QWidget *parent = Q_NULLPTR); ~NewProjectDialog(); - int exec() Q_DECL_OVERRIDE; + int exec() override; - void accept() Q_DECL_OVERRIDE; + void accept() override; - void setDataSourcesModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setDataSourcesModel(QAbstractItemModel *model) override; - QString name() const Q_DECL_OVERRIDE; - Domain::DataSource::Ptr dataSource() const Q_DECL_OVERRIDE; + QString name() const override; + Domain::DataSource::Ptr dataSource() const override; private slots: void onUserInputChanged(); diff --git a/src/widgets/newprojectdialog.cpp b/src/widgets/newprojectdialog.cpp --- a/src/widgets/newprojectdialog.cpp +++ b/src/widgets/newprojectdialog.cpp @@ -45,7 +45,7 @@ } protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &) const Q_DECL_OVERRIDE + bool filterAcceptsRow(int sourceRow, const QModelIndex &) const override { auto sourceIndex = sourceModel()->index(sourceRow, 0); auto source = sourceIndex.data(Presentation::QueryTreeModelBase::ObjectRole) diff --git a/src/widgets/pageview.h b/src/widgets/pageview.h --- a/src/widgets/pageview.h +++ b/src/widgets/pageview.h @@ -84,7 +84,7 @@ void onRunningTaskChanged(const Domain::Task::Ptr &task); private: - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; void updateRunTaskAction(); Domain::Task::Ptr currentTask() const; diff --git a/src/widgets/pageview.cpp b/src/widgets/pageview.cpp --- a/src/widgets/pageview.cpp +++ b/src/widgets/pageview.cpp @@ -60,16 +60,16 @@ using QTreeView::QTreeView; protected: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE + void keyPressEvent(QKeyEvent *event) override { if (event->key() == Qt::Key_Escape && state() != EditingState) { selectionModel()->clear(); } QTreeView::keyPressEvent(event); } - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE + void resizeEvent(QResizeEvent *event) override { header()->resizeSection(0, event->size().width()); QTreeView::resizeEvent(event); @@ -100,7 +100,7 @@ connect(m_hideTimer, &QTimer::timeout, this, &QWidget::hide); } - void setVisible(bool visible) Q_DECL_OVERRIDE + void setVisible(bool visible) override { if (visible) { m_hideTimer->start(2000); diff --git a/src/widgets/pageviewerrorhandler.h b/src/widgets/pageviewerrorhandler.h --- a/src/widgets/pageviewerrorhandler.h +++ b/src/widgets/pageviewerrorhandler.h @@ -39,7 +39,7 @@ void setPageView(Widgets::PageView *pageView); private: - void doDisplayMessage(const QString &message) Q_DECL_OVERRIDE; + void doDisplayMessage(const QString &message) override; Widgets::PageView *m_pageView; }; diff --git a/src/widgets/quickselectdialog.h b/src/widgets/quickselectdialog.h --- a/src/widgets/quickselectdialog.h +++ b/src/widgets/quickselectdialog.h @@ -47,14 +47,14 @@ public: explicit QuickSelectDialog(QWidget *parent = Q_NULLPTR); - int exec() Q_DECL_OVERRIDE; + int exec() override; - QPersistentModelIndex selectedIndex() const Q_DECL_OVERRIDE; - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + QPersistentModelIndex selectedIndex() const override; + void setModel(QAbstractItemModel *model) override; private slots: void applyFilterChanged(const QString &textFilter); - bool eventFilter(QObject *object, QEvent *ev) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *ev) override; private: QString m_filter; diff --git a/src/widgets/runningtaskwidget.h b/src/widgets/runningtaskwidget.h --- a/src/widgets/runningtaskwidget.h +++ b/src/widgets/runningtaskwidget.h @@ -59,8 +59,8 @@ void setCollapsed(bool b); protected: - void enterEvent(QEvent *ev) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *ev) Q_DECL_OVERRIDE; + void enterEvent(QEvent *ev) override; + void leaveEvent(QEvent *ev) override; private: void resize(); diff --git a/src/zanshin/kontact/kontact_plugin.h b/src/zanshin/kontact/kontact_plugin.h --- a/src/zanshin/kontact/kontact_plugin.h +++ b/src/zanshin/kontact/kontact_plugin.h @@ -33,10 +33,10 @@ public: Plugin(KontactInterface::Core *core, const QVariantList &); - int weight() const Q_DECL_OVERRIDE { return 449; } + int weight() const override { return 449; } protected: - KParts::ReadOnlyPart *createPart() Q_DECL_OVERRIDE; + KParts::ReadOnlyPart *createPart() override; }; #endif diff --git a/src/zanshin/kontact/part.h b/src/zanshin/kontact/part.h --- a/src/zanshin/kontact/part.h +++ b/src/zanshin/kontact/part.h @@ -35,7 +35,7 @@ ~Part(); protected: - virtual bool openFile() Q_DECL_OVERRIDE; + virtual bool openFile() override; }; #endif diff --git a/tests/testlib/akonadifakejobs.h b/tests/testlib/akonadifakejobs.h --- a/tests/testlib/akonadifakejobs.h +++ b/tests/testlib/akonadifakejobs.h @@ -40,10 +40,10 @@ using FakeJob::FakeJob; void setCollections(const Akonadi::Collection::List &collections); - Akonadi::Collection::List collections() const Q_DECL_OVERRIDE; + Akonadi::Collection::List collections() const override; QString resource() const; - void setResource(const QString &resource) Q_DECL_OVERRIDE; + void setResource(const QString &resource) override; private: Akonadi::Collection::List m_collections; @@ -57,10 +57,10 @@ using FakeJob::FakeJob; void setItems(const Akonadi::Item::List &items); - Akonadi::Item::List items() const Q_DECL_OVERRIDE; + Akonadi::Item::List items() const override; Akonadi::Collection collection() const; - void setCollection(const Akonadi::Collection &collection) Q_DECL_OVERRIDE; + void setCollection(const Akonadi::Collection &collection) override; private: Akonadi::Item::List m_items; @@ -74,7 +74,7 @@ using FakeJob::FakeJob; void setTags(const Akonadi::Tag::List &tags); - Akonadi::Tag::List tags() const Q_DECL_OVERRIDE; + Akonadi::Tag::List tags() const override; private: Akonadi::Tag::List m_tags; diff --git a/tests/testlib/akonadifakestorage.h b/tests/testlib/akonadifakestorage.h --- a/tests/testlib/akonadifakestorage.h +++ b/tests/testlib/akonadifakestorage.h @@ -35,30 +35,30 @@ public: explicit AkonadiFakeStorage(AkonadiFakeData *data); - Akonadi::Collection defaultCollection() Q_DECL_OVERRIDE; - - KJob *createItem(Akonadi::Item item, Akonadi::Collection collection) Q_DECL_OVERRIDE; - KJob *updateItem(Akonadi::Item item, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *removeItem(Akonadi::Item item) Q_DECL_OVERRIDE; - KJob *removeItems(Akonadi::Item::List items, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *moveItem(Akonadi::Item item, Akonadi::Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *moveItems(Akonadi::Item::List items, Akonadi::Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - - KJob *createCollection(Akonadi::Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *updateCollection(Akonadi::Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - KJob *removeCollection(Akonadi::Collection collection, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE; - - KJob *createTransaction() Q_DECL_OVERRIDE; - - KJob *createTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - KJob *updateTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - KJob *removeTag(Akonadi::Tag tag) Q_DECL_OVERRIDE; - - Akonadi::CollectionFetchJobInterface *fetchCollections(Akonadi::Collection collection, FetchDepth depth) Q_DECL_OVERRIDE; - Akonadi::ItemFetchJobInterface *fetchItems(Akonadi::Collection collection) Q_DECL_OVERRIDE; - Akonadi::ItemFetchJobInterface *fetchItem(Akonadi::Item item) Q_DECL_OVERRIDE; - Akonadi::ItemFetchJobInterface *fetchTagItems(Akonadi::Tag tag) Q_DECL_OVERRIDE; - Akonadi::TagFetchJobInterface *fetchTags() Q_DECL_OVERRIDE; + Akonadi::Collection defaultCollection() override; + + KJob *createItem(Akonadi::Item item, Akonadi::Collection collection) override; + KJob *updateItem(Akonadi::Item item, QObject *parent = Q_NULLPTR) override; + KJob *removeItem(Akonadi::Item item) override; + KJob *removeItems(Akonadi::Item::List items, QObject *parent = Q_NULLPTR) override; + KJob *moveItem(Akonadi::Item item, Akonadi::Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *moveItems(Akonadi::Item::List items, Akonadi::Collection collection, QObject *parent = Q_NULLPTR) override; + + KJob *createCollection(Akonadi::Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *updateCollection(Akonadi::Collection collection, QObject *parent = Q_NULLPTR) override; + KJob *removeCollection(Akonadi::Collection collection, QObject *parent = Q_NULLPTR) override; + + KJob *createTransaction() override; + + KJob *createTag(Akonadi::Tag tag) override; + KJob *updateTag(Akonadi::Tag tag) override; + KJob *removeTag(Akonadi::Tag tag) override; + + Akonadi::CollectionFetchJobInterface *fetchCollections(Akonadi::Collection collection, FetchDepth depth) override; + Akonadi::ItemFetchJobInterface *fetchItems(Akonadi::Collection collection) override; + Akonadi::ItemFetchJobInterface *fetchItem(Akonadi::Item item) override; + Akonadi::ItemFetchJobInterface *fetchTagItems(Akonadi::Tag tag) override; + Akonadi::TagFetchJobInterface *fetchTags() override; private: Akonadi::Tag::Id findId(const Akonadi::Tag &tag); diff --git a/tests/testlib/akonadifakestorage.cpp b/tests/testlib/akonadifakestorage.cpp --- a/tests/testlib/akonadifakestorage.cpp +++ b/tests/testlib/akonadifakestorage.cpp @@ -44,7 +44,7 @@ } private slots: - void onTimeout() Q_DECL_OVERRIDE + void onTimeout() override { auto jobs = childJobs(); if (m_nextIdx == 0) { diff --git a/tests/units/akonadi/akonadicachingstorageintegrationtest.cpp b/tests/units/akonadi/akonadicachingstorageintegrationtest.cpp --- a/tests/units/akonadi/akonadicachingstorageintegrationtest.cpp +++ b/tests/units/akonadi/akonadicachingstorageintegrationtest.cpp @@ -40,15 +40,15 @@ { } - Akonadi::StorageInterface::Ptr createStorage() Q_DECL_OVERRIDE + Akonadi::StorageInterface::Ptr createStorage() override { auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer); return Akonadi::StorageInterface::Ptr(new Akonadi::CachingStorage(Akonadi::Cache::Ptr::create(serializer, createMonitor()), Akonadi::StorageInterface::Ptr(new Akonadi::Storage))); } - Akonadi::MonitorInterface::Ptr createMonitor() Q_DECL_OVERRIDE + Akonadi::MonitorInterface::Ptr createMonitor() override { return Akonadi::MonitorInterface::Ptr(new Akonadi::MonitorImpl); } diff --git a/tests/units/akonadi/akonadistoragetest.cpp b/tests/units/akonadi/akonadistoragetest.cpp --- a/tests/units/akonadi/akonadistoragetest.cpp +++ b/tests/units/akonadi/akonadistoragetest.cpp @@ -38,12 +38,12 @@ { } - Akonadi::StorageInterface::Ptr createStorage() Q_DECL_OVERRIDE + Akonadi::StorageInterface::Ptr createStorage() override { return Akonadi::StorageInterface::Ptr(new Akonadi::Storage); } - Akonadi::MonitorInterface::Ptr createMonitor() Q_DECL_OVERRIDE + Akonadi::MonitorInterface::Ptr createMonitor() override { return Akonadi::MonitorInterface::Ptr(new Akonadi::MonitorImpl); } diff --git a/tests/units/presentation/applicationmodeltest.cpp b/tests/units/presentation/applicationmodeltest.cpp --- a/tests/units/presentation/applicationmodeltest.cpp +++ b/tests/units/presentation/applicationmodeltest.cpp @@ -58,12 +58,12 @@ explicit FakePageModel(QObject *parent = Q_NULLPTR) : Presentation::PageModel(parent) {} - Domain::Task::Ptr addItem(const QString &, const QModelIndex &) Q_DECL_OVERRIDE { return {}; } - void removeItem(const QModelIndex &) Q_DECL_OVERRIDE {} - void promoteItem(const QModelIndex &) Q_DECL_OVERRIDE {} + Domain::Task::Ptr addItem(const QString &, const QModelIndex &) override { return {}; } + void removeItem(const QModelIndex &) override {} + void promoteItem(const QModelIndex &) override {} private: - QAbstractItemModel *createCentralListModel() Q_DECL_OVERRIDE { return {}; } + QAbstractItemModel *createCentralListModel() override { return {}; } }; class ApplicationModelTest : public QObject diff --git a/tests/units/testlib/akonadifakestoragetest.cpp b/tests/units/testlib/akonadifakestoragetest.cpp --- a/tests/units/testlib/akonadifakestoragetest.cpp +++ b/tests/units/testlib/akonadifakestoragetest.cpp @@ -44,12 +44,12 @@ loader.load(SOURCE_DIR "/../akonadi/testenv/data/testdata.xml"); } - Akonadi::StorageInterface::Ptr createStorage() Q_DECL_OVERRIDE + Akonadi::StorageInterface::Ptr createStorage() override { return Akonadi::StorageInterface::Ptr(m_data.createStorage()); } - Akonadi::MonitorInterface::Ptr createMonitor() Q_DECL_OVERRIDE + Akonadi::MonitorInterface::Ptr createMonitor() override { return Akonadi::MonitorInterface::Ptr(m_data.createMonitor()); } diff --git a/tests/units/utils/dependencymanagertest.cpp b/tests/units/utils/dependencymanagertest.cpp --- a/tests/units/utils/dependencymanagertest.cpp +++ b/tests/units/utils/dependencymanagertest.cpp @@ -95,7 +95,7 @@ explicit AnotherFirstImplementation(const Interface0::Ptr &iface) : m_iface(iface) {} - void doSomethingDelegated() Q_DECL_OVERRIDE { m_iface->doSomething(); } + void doSomethingDelegated() override { m_iface->doSomething(); } Interface0::Ptr iface() const { return m_iface; } @@ -139,7 +139,7 @@ { } - void doSomethingDelegated() Q_DECL_OVERRIDE { m_iface1->doSomething(); } + void doSomethingDelegated() override { m_iface1->doSomething(); } Interface0::Ptr iface0() const { return m_iface0; } Interface1::Ptr iface1() const { return m_iface1; } diff --git a/tests/units/widgets/applicationcomponentstest.cpp b/tests/units/widgets/applicationcomponentstest.cpp --- a/tests/units/widgets/applicationcomponentstest.cpp +++ b/tests/units/widgets/applicationcomponentstest.cpp @@ -256,11 +256,11 @@ { } - Domain::Task::Ptr runningTask() const Q_DECL_OVERRIDE { return {}; } - void setRunningTask(const Domain::Task::Ptr &) Q_DECL_OVERRIDE {} - void taskDeleted(const Domain::Task::Ptr &) Q_DECL_OVERRIDE {} - void stopTask() Q_DECL_OVERRIDE {} - void doneTask() Q_DECL_OVERRIDE {} + Domain::Task::Ptr runningTask() const override { return {}; } + void setRunningTask(const Domain::Task::Ptr &) override {} + void taskDeleted(const Domain::Task::Ptr &) override {} + void stopTask() override {} + void doneTask() override {} }; class QuickSelectDialogStub : public Widgets::QuickSelectDialogInterface @@ -275,18 +275,18 @@ { } - int exec() Q_DECL_OVERRIDE + int exec() override { execCount++; return QDialog::Accepted; } - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE + void setModel(QAbstractItemModel *model) override { itemModel = model; } - QPersistentModelIndex selectedIndex() const Q_DECL_OVERRIDE + QPersistentModelIndex selectedIndex() const override { return index; } diff --git a/tests/units/widgets/availablepagesviewtest.cpp b/tests/units/widgets/availablepagesviewtest.cpp --- a/tests/units/widgets/availablepagesviewtest.cpp +++ b/tests/units/widgets/availablepagesviewtest.cpp @@ -57,23 +57,23 @@ { } - int exec() Q_DECL_OVERRIDE + int exec() override { execCount++; return QDialog::Accepted; } - void setDataSourcesModel(QAbstractItemModel *model) Q_DECL_OVERRIDE + void setDataSourcesModel(QAbstractItemModel *model) override { sourceModel = model; } - QString name() const Q_DECL_OVERRIDE + QString name() const override { return QStringLiteral("name"); } - Domain::DataSource::Ptr dataSource() const Q_DECL_OVERRIDE + Domain::DataSource::Ptr dataSource() const override { return source; } @@ -96,18 +96,18 @@ { } - int exec() Q_DECL_OVERRIDE + int exec() override { execCount++; return QDialog::Accepted; } - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE + void setModel(QAbstractItemModel *model) override { itemModel = model; } - QPersistentModelIndex selectedIndex() const Q_DECL_OVERRIDE + QPersistentModelIndex selectedIndex() const override { return index; } diff --git a/tests/units/widgets/messageboxstub.h b/tests/units/widgets/messageboxstub.h --- a/tests/units/widgets/messageboxstub.h +++ b/tests/units/widgets/messageboxstub.h @@ -33,12 +33,12 @@ MessageBoxStub() : m_called(false) {} - QMessageBox::Button askConfirmation(QWidget *, const QString &, const QString &) Q_DECL_OVERRIDE { + QMessageBox::Button askConfirmation(QWidget *, const QString &, const QString &) override { m_called = true; return QMessageBox::Yes; } - QString askTextInput(QWidget *, const QString &, const QString &) Q_DECL_OVERRIDE { + QString askTextInput(QWidget *, const QString &, const QString &) override { m_called = true; return m_textInput; } diff --git a/tests/units/widgets/pageviewtest.cpp b/tests/units/widgets/pageviewtest.cpp --- a/tests/units/widgets/pageviewtest.cpp +++ b/tests/units/widgets/pageviewtest.cpp @@ -130,11 +130,11 @@ { Q_OBJECT public: - Domain::Task::Ptr runningTask() const Q_DECL_OVERRIDE { return m_runningTask; } - void setRunningTask(const Domain::Task::Ptr &task) Q_DECL_OVERRIDE { m_runningTask = task; } - void taskDeleted(const Domain::Task::Ptr &task) Q_DECL_OVERRIDE { m_deletedTask = task; } - void stopTask() Q_DECL_OVERRIDE {} - void doneTask() Q_DECL_OVERRIDE {} + Domain::Task::Ptr runningTask() const override { return m_runningTask; } + void setRunningTask(const Domain::Task::Ptr &task) override { m_runningTask = task; } + void taskDeleted(const Domain::Task::Ptr &task) override { m_deletedTask = task; } + void stopTask() override {} + void doneTask() override {} private: Domain::Task::Ptr m_runningTask; Domain::Task::Ptr m_deletedTask; diff --git a/tests/units/widgets/runningtaskwidgettest.cpp b/tests/units/widgets/runningtaskwidgettest.cpp --- a/tests/units/widgets/runningtaskwidgettest.cpp +++ b/tests/units/widgets/runningtaskwidgettest.cpp @@ -31,27 +31,27 @@ { Q_OBJECT public: - Domain::Task::Ptr runningTask() const Q_DECL_OVERRIDE { return m_runningTask; } - void setRunningTask(const Domain::Task::Ptr &runningTask) Q_DECL_OVERRIDE + Domain::Task::Ptr runningTask() const override { return m_runningTask; } + void setRunningTask(const Domain::Task::Ptr &runningTask) override { m_runningTask = runningTask; emit runningTaskChanged(m_runningTask); } - void stopTask() Q_DECL_OVERRIDE + void stopTask() override { Q_ASSERT(m_runningTask); setRunningTask(Domain::Task::Ptr()); } - void doneTask() Q_DECL_OVERRIDE + void doneTask() override { Q_ASSERT(m_runningTask); m_runningTask->setDone(true); stopTask(); } - void taskDeleted(const Domain::Task::Ptr &task) Q_DECL_OVERRIDE + void taskDeleted(const Domain::Task::Ptr &task) override { Q_ASSERT(task); if (m_runningTask == task)