summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-04 09:55:43 +0200
committerMontel Laurent <[email protected]>2017-06-04 09:55:43 +0200
commit110641b2e4341285309ed90790bccf7e9de7e653 (patch)
treea4470115f923dc9b12f77cf744d62ccddbe4497a
parent4bc8fd9e200fe8f8fe329243161784d09871b358 (diff)
Use override here
-rw-r--r--agents/invitations/incidenceattribute.h8
-rw-r--r--agents/invitations/invitationsagent.h4
-rw-r--r--agents/maildispatcher/maildispatcheragent.h4
-rw-r--r--agents/maildispatcher/sendjob.h2
-rw-r--r--agents/maildispatcher/storeresultjob.h2
-rw-r--r--agents/migration/autotests/dummymigrator.h12
-rw-r--r--agents/migration/autotests/schedulertest.cpp20
-rw-r--r--agents/migration/migrationagent.h2
-rw-r--r--agents/migration/migrationexecutor.h6
-rw-r--r--agents/migration/migrationscheduler.h12
-rw-r--r--agents/newmailnotifier/newmailnotifieragent.h12
-rw-r--r--agents/newmailnotifier/newmailnotifierselectcollectionwidget.h6
-rw-r--r--agents/newmailnotifier/newmailnotifiershowmessagejob.h2
-rw-r--r--kioslave/akonadi/akonadislave.h8
-rw-r--r--kioslave/pop3/pop3.h14
-rw-r--r--migration/entitytreecreatejob.h2
-rw-r--r--migration/gid/gidmigrationjob.h6
-rw-r--r--migration/gid/gidmigrator.h10
-rw-r--r--plugins/akonadi_serializer_addressee.h8
-rw-r--r--plugins/akonadi_serializer_contactgroup.h8
-rw-r--r--plugins/akonadi_serializer_kalarm.h8
-rw-r--r--plugins/akonadi_serializer_kcalcore.h8
-rw-r--r--plugins/akonadi_serializer_mail.h8
-rw-r--r--resources/akonotes/akonotesresource.h6
-rw-r--r--resources/birthdays/birthdaysresource.h8
-rw-r--r--resources/contacts/contactsresource.h26
-rw-r--r--resources/dav/resource/ctagattribute.h8
-rw-r--r--resources/dav/resource/davgroupwareresource.h26
-rw-r--r--resources/dav/resource/davprotocolattribute.h8
-rw-r--r--resources/dav/resource/setupwizard.h12
-rw-r--r--resources/google/calendar/calendarresource.h32
-rw-r--r--resources/google/calendar/defaultreminderattribute.h8
-rw-r--r--resources/google/calendar/settingsdialog.h2
-rw-r--r--resources/google/common/googleresource.h8
-rw-r--r--resources/google/contacts/contactsresource.h30
-rw-r--r--resources/google/contacts/settingsdialog.h2
-rw-r--r--resources/ical/notes/notesresource.h4
-rw-r--r--resources/ical/shared/icalresource.h8
-rw-r--r--resources/ical/shared/icalresourcebase.h14
-rw-r--r--resources/icaldir/icaldirresource.h18
-rw-r--r--resources/imap/addcollectiontask.h2
-rw-r--r--resources/imap/additemtask.h2
-rw-r--r--resources/imap/autotests/dummypasswordrequester.h2
-rw-r--r--resources/imap/autotests/dummyresourcestate.h118
-rw-r--r--resources/imap/batchfetcher.h2
-rw-r--r--resources/imap/changecollectiontask.h2
-rw-r--r--resources/imap/changeitemsflagstask.h2
-rw-r--r--resources/imap/changeitemtask.h2
-rw-r--r--resources/imap/expungecollectiontask.h2
-rw-r--r--resources/imap/gmailpasswordrequester.h4
-rw-r--r--resources/imap/highestmodseqattribute.h8
-rw-r--r--resources/imap/imapresource.h8
-rw-r--r--resources/imap/imapresourcebase.h44
-rw-r--r--resources/imap/movecollectiontask.h2
-rw-r--r--resources/imap/moveitemstask.h2
-rw-r--r--resources/imap/noinferiorsattribute.h8
-rw-r--r--resources/imap/noselectattribute.h8
-rw-r--r--resources/imap/passwordrequester.h4
-rw-r--r--resources/imap/removecollectionrecursivetask.h2
-rw-r--r--resources/imap/replacemessagejob.h2
-rw-r--r--resources/imap/resourcestate.h118
-rw-r--r--resources/imap/retrievecollectionmetadatatask.h2
-rw-r--r--resources/imap/retrievecollectionstask.h2
-rw-r--r--resources/imap/retrieveitemstask.h2
-rw-r--r--resources/imap/retrieveitemtask.h2
-rw-r--r--resources/imap/searchtask.h2
-rw-r--r--resources/imap/serverinfodialog.h2
-rw-r--r--resources/imap/sessionuiproxy.h2
-rw-r--r--resources/imap/settingspasswordrequester.h4
-rw-r--r--resources/imap/subscriptiondialog.h2
-rw-r--r--resources/imap/tracer.cpp8
-rw-r--r--resources/imap/uidnextattribute.h8
-rw-r--r--resources/imap/uidvalidityattribute.h8
-rw-r--r--resources/kalarm/kalarm/kalarmresource.h20
-rw-r--r--resources/kalarm/kalarmdir/kalarmdirresource.h18
-rw-r--r--resources/kalarm/shared/alarmtyperadiowidget.h2
-rw-r--r--resources/kolab/kolabaddtagtask.h2
-rw-r--r--resources/kolab/kolabchangeitemsrelationstask.h2
-rw-r--r--resources/kolab/kolabchangeitemstagstask.h2
-rw-r--r--resources/kolab/kolabchangetagtask.h2
-rw-r--r--resources/kolab/kolabmessagehelper.h2
-rw-r--r--resources/kolab/kolabrelationresourcetask.h2
-rw-r--r--resources/kolab/kolabremovetagtask.h2
-rw-r--r--resources/kolab/kolabresource.h38
-rw-r--r--resources/kolab/kolabresourcestate.h6
-rw-r--r--resources/kolab/kolabretrievecollectionstask.h4
-rw-r--r--resources/kolab/kolabretrievetagstask.h2
-rw-r--r--resources/kolab/tagchangehelper.cpp2
-rw-r--r--resources/kolab/updatemessagejob.h2
-rw-r--r--resources/maildir/maildirresource.h26
-rw-r--r--resources/maildir/retrieveitemsjob.h2
-rw-r--r--resources/mbox/deleteditemsattribute.h8
-rw-r--r--resources/mbox/mboxresource.h20
-rw-r--r--resources/mixedmaildir/autotests/templatemethodstest.cpp6
-rw-r--r--resources/mixedmaildir/mixedmaildirresource.h32
-rw-r--r--resources/mixedmaildir/mixedmaildirstore.cpp24
-rw-r--r--resources/mixedmaildir/mixedmaildirstore.h12
-rw-r--r--resources/mixedmaildir/retrieveitemsjob.h2
-rw-r--r--resources/openxchange/openxchangeresource.h28
-rw-r--r--resources/openxchange/oxa/connectiontestjob.h2
-rw-r--r--resources/openxchange/oxa/foldercreatejob.h2
-rw-r--r--resources/openxchange/oxa/folderdeletejob.h2
-rw-r--r--resources/openxchange/oxa/foldermodifyjob.h2
-rw-r--r--resources/openxchange/oxa/foldermovejob.h2
-rw-r--r--resources/openxchange/oxa/folderrequestjob.h2
-rw-r--r--resources/openxchange/oxa/foldersrequestdeltajob.h2
-rw-r--r--resources/openxchange/oxa/foldersrequestjob.h2
-rw-r--r--resources/openxchange/oxa/objectcreatejob.h2
-rw-r--r--resources/openxchange/oxa/objectdeletejob.h2
-rw-r--r--resources/openxchange/oxa/objectmodifyjob.h2
-rw-r--r--resources/openxchange/oxa/objectmovejob.h2
-rw-r--r--resources/openxchange/oxa/objectrequestjob.h2
-rw-r--r--resources/openxchange/oxa/objectsrequestdeltajob.h2
-rw-r--r--resources/openxchange/oxa/objectsrequestjob.h2
-rw-r--r--resources/openxchange/oxa/updateusersjob.h2
-rw-r--r--resources/openxchange/oxa/useridrequestjob.h2
-rw-r--r--resources/openxchange/oxa/usersrequestjob.h2
-rw-r--r--resources/pop3/autotests/fakeserver/fakeserver.h2
-rw-r--r--resources/pop3/jobs.h28
-rw-r--r--resources/pop3/pop3resource.h14
-rw-r--r--resources/shared/filestore/abstractlocalstore.cpp48
-rw-r--r--resources/shared/filestore/abstractlocalstore.h30
-rw-r--r--resources/shared/filestore/autotests/abstractlocalstoretest.cpp26
-rw-r--r--resources/shared/filestore/collectioncreatejob.h2
-rw-r--r--resources/shared/filestore/collectiondeletejob.h2
-rw-r--r--resources/shared/filestore/collectionfetchjob.h2
-rw-r--r--resources/shared/filestore/collectionmodifyjob.h2
-rw-r--r--resources/shared/filestore/collectionmovejob.h2
-rw-r--r--resources/shared/filestore/entitycompactchangeattribute.h8
-rw-r--r--resources/shared/filestore/itemcreatejob.h2
-rw-r--r--resources/shared/filestore/itemdeletejob.h2
-rw-r--r--resources/shared/filestore/itemfetchjob.h2
-rw-r--r--resources/shared/filestore/itemmodifyjob.h2
-rw-r--r--resources/shared/filestore/itemmovejob.h2
-rw-r--r--resources/shared/filestore/job.h2
-rw-r--r--resources/shared/filestore/sessionimpls.cpp26
-rw-r--r--resources/shared/filestore/sessionimpls_p.h6
-rw-r--r--resources/shared/filestore/storecompactjob.h2
-rw-r--r--resources/shared/singlefileresource/collectionannotationsattribute.h8
-rw-r--r--resources/shared/singlefileresource/collectionflagsattribute.h8
-rw-r--r--resources/shared/singlefileresource/createandsettagsjob.h2
-rw-r--r--resources/shared/singlefileresource/imapaclattribute.h8
-rw-r--r--resources/shared/singlefileresource/imapquotaattribute.h8
-rw-r--r--resources/shared/singlefileresource/singlefileresource.h16
-rw-r--r--resources/shared/singlefileresource/singlefileresourcebase.h2
-rw-r--r--resources/shared/singlefileresource/singlefileresourceconfigdialog.h2
-rw-r--r--resources/tomboynotes/o2/o0settingsstore.h4
-rw-r--r--resources/tomboynotes/o2/o1.h4
-rw-r--r--resources/tomboynotes/o2/o2.h4
-rw-r--r--resources/tomboynotes/tomboycollectionsdownloadjob.h2
-rw-r--r--resources/tomboynotes/tomboyitemdownloadjob.h2
-rw-r--r--resources/tomboynotes/tomboyitemsdownloadjob.h2
-rw-r--r--resources/tomboynotes/tomboyitemuploadjob.h2
-rw-r--r--resources/tomboynotes/tomboynotesresource.h16
-rw-r--r--resources/tomboynotes/tomboyserverauthenticatejob.h2
-rw-r--r--resources/vcard/vcardresource.h18
-rw-r--r--resources/vcarddir/vcarddirresource.h16
157 files changed, 711 insertions, 711 deletions
diff --git a/agents/invitations/incidenceattribute.h b/agents/invitations/incidenceattribute.h
index 21ccc0d..3bceeae 100644
--- a/agents/invitations/incidenceattribute.h
+++ b/agents/invitations/incidenceattribute.h
@@ -32,11 +32,11 @@ public:
explicit IncidenceAttribute();
~IncidenceAttribute();
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *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;
/**
* The status the invitation is in.
diff --git a/agents/invitations/invitationsagent.h b/agents/invitations/invitationsagent.h
index 52c6a35..bebbf21 100644
--- a/agents/invitations/invitationsagent.h
+++ b/agents/invitations/invitationsagent.h
@@ -65,7 +65,7 @@ public:
Akonadi::Collection collection() const;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
private Q_SLOTS:
void initStart();
@@ -76,7 +76,7 @@ private:
const KCalCore::MemoryCalendar::Ptr &calendar,
const Akonadi::Item &item);
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
private:
QString m_resourceId;
diff --git a/agents/maildispatcher/maildispatcheragent.h b/agents/maildispatcher/maildispatcheragent.h
index 3d944a8..6702846 100644
--- a/agents/maildispatcher/maildispatcheragent.h
+++ b/agents/maildispatcher/maildispatcheragent.h
@@ -42,7 +42,7 @@ public:
~MailDispatcherAgent();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
Q_SIGNALS:
/**
@@ -56,7 +56,7 @@ Q_SIGNALS:
Q_SCRIPTABLE void itemDispatchStarted();
protected:
- void doSetOnline(bool online) Q_DECL_OVERRIDE;
+ void doSetOnline(bool online) override;
private:
//@cond PRIVATE
diff --git a/agents/maildispatcher/sendjob.h b/agents/maildispatcher/sendjob.h
index 41df8b8..3daf03b 100644
--- a/agents/maildispatcher/sendjob.h
+++ b/agents/maildispatcher/sendjob.h
@@ -55,7 +55,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* If this function is called before the job is started, the SendJob will
diff --git a/agents/maildispatcher/storeresultjob.h b/agents/maildispatcher/storeresultjob.h
index ef2465a..69e7aca 100644
--- a/agents/maildispatcher/storeresultjob.h
+++ b/agents/maildispatcher/storeresultjob.h
@@ -60,7 +60,7 @@ public:
protected:
// reimpl from TransactionSequence
- void doStart() Q_DECL_OVERRIDE;
+ void doStart() override;
private:
//@cond PRIVATE
diff --git a/agents/migration/autotests/dummymigrator.h b/agents/migration/autotests/dummymigrator.h
index 30a7ec7..af4a6c3 100644
--- a/agents/migration/autotests/dummymigrator.h
+++ b/agents/migration/autotests/dummymigrator.h
@@ -34,14 +34,14 @@ class DummyMigrator : public MigratorBase
public:
explicit DummyMigrator(const QString &identifier);
- QString displayName() const Q_DECL_OVERRIDE;
- void startWork() Q_DECL_OVERRIDE;
+ QString displayName() const override;
+ void startWork() override;
- bool shouldAutostart() const Q_DECL_OVERRIDE;
- bool canStart() Q_DECL_OVERRIDE;
- void pause() Q_DECL_OVERRIDE;
+ bool shouldAutostart() const override;
+ bool canStart() override;
+ void pause() override;
- void abort() Q_DECL_OVERRIDE;
+ void abort() override;
private Q_SLOTS:
void onTimerElapsed();
};
diff --git a/agents/migration/autotests/schedulertest.cpp b/agents/migration/autotests/schedulertest.cpp
index 8d93460..3c60b9f 100644
--- a/agents/migration/autotests/schedulertest.cpp
+++ b/agents/migration/autotests/schedulertest.cpp
@@ -37,15 +37,15 @@ public:
MigratorBase(QLatin1String("testmigrator") + identifier, QString(), QString(), parent), mAutostart(false)
{}
- QString displayName() const Q_DECL_OVERRIDE
+ QString displayName() const override
{
return QStringLiteral("name");
}
- void startWork() Q_DECL_OVERRIDE
+ void startWork() override
{}
- void abort() Q_DECL_OVERRIDE {
+ void abort() override {
setMigrationState(Aborted);
}
@@ -54,16 +54,16 @@ public:
setMigrationState(Complete);
}
- bool shouldAutostart() const Q_DECL_OVERRIDE
+ bool shouldAutostart() const override
{
return mAutostart;
}
- void pause() Q_DECL_OVERRIDE {
+ void pause() override {
setMigrationState(Paused);
}
- void resume() Q_DECL_OVERRIDE {
+ void resume() override {
setMigrationState(InProgress);
}
@@ -76,20 +76,20 @@ public:
TestJobTracker() : mPercent(0)
{}
- void registerJob(KJob *job) Q_DECL_OVERRIDE {
+ void registerJob(KJob *job) override {
KJobTrackerInterface::registerJob(job);
mJobs << job;
}
- void unregisterJob(KJob *job) Q_DECL_OVERRIDE {
+ void unregisterJob(KJob *job) override {
mJobs.removeAll(job);
}
- void finished(KJob *job) Q_DECL_OVERRIDE {
+ void finished(KJob *job) override {
mJobs.removeAll(job);
}
- void percent(KJob *job, long unsigned int percent) Q_DECL_OVERRIDE {
+ void percent(KJob *job, long unsigned int percent) override {
Q_UNUSED(job);
mPercent = percent;
}
diff --git a/agents/migration/migrationagent.h b/agents/migration/migrationagent.h
index 690cdab..9114e30 100644
--- a/agents/migration/migrationagent.h
+++ b/agents/migration/migrationagent.h
@@ -33,7 +33,7 @@ class MigrationAgent : public AgentBase, public AgentBase::ObserverV2
Q_OBJECT
public:
explicit MigrationAgent(const QString &id);
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
private:
MigrationScheduler mScheduler;
};
diff --git a/agents/migration/migrationexecutor.h b/agents/migration/migrationexecutor.h
index 2e50e89..50b4aba 100644
--- a/agents/migration/migrationexecutor.h
+++ b/agents/migration/migrationexecutor.h
@@ -40,11 +40,11 @@ class MigrationExecutor : public KJob
public:
MigrationExecutor();
void add(const QSharedPointer<MigratorBase> &);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
protected:
- bool doResume() Q_DECL_OVERRIDE;
- bool doSuspend() Q_DECL_OVERRIDE;
+ bool doResume() override;
+ bool doSuspend() override;
private Q_SLOTS:
void onStoppedProcessing();
diff --git a/agents/migration/migrationscheduler.h b/agents/migration/migrationscheduler.h
index 2cef26a..b7e85e6 100644
--- a/agents/migration/migrationscheduler.h
+++ b/agents/migration/migrationscheduler.h
@@ -71,12 +71,12 @@ public:
};
bool addMigrator(const QSharedPointer<MigratorBase> &migrator);
- 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;
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
- QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
- QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_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;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &child) const override;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QSharedPointer<MigratorBase> migrator(const QString &identifier) const;
QList< QSharedPointer<MigratorBase> > migrators() const;
diff --git a/agents/newmailnotifier/newmailnotifieragent.h b/agents/newmailnotifier/newmailnotifieragent.h
index 38fb8dc..0b74a14 100644
--- a/agents/newmailnotifier/newmailnotifieragent.h
+++ b/agents/newmailnotifier/newmailnotifieragent.h
@@ -87,15 +87,15 @@ public:
void setShowButtonToDisplayMail(bool b);
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemsMoved(const Akonadi::Item::List &items, const Akonadi::Collection &sourceCollection, const Akonadi::Collection &destinationCollection) Q_DECL_OVERRIDE;
- void itemsRemoved(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
- void itemsFlagsChanged(const Akonadi::Item::List &items, const QSet<QByteArray> &addedFlags, const QSet<QByteArray> &removedFlags) Q_DECL_OVERRIDE;
- void doSetOnline(bool online) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemsMoved(const Akonadi::Item::List &items, const Akonadi::Collection &sourceCollection, const Akonadi::Collection &destinationCollection) override;
+ void itemsRemoved(const Akonadi::Item::List &items) override;
+ void itemsFlagsChanged(const Akonadi::Item::List &items, const QSet<QByteArray> &addedFlags, const QSet<QByteArray> &removedFlags) override;
+ void doSetOnline(bool online) override;
private Q_SLOTS:
void slotShowNotifications();
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
void slotInstanceStatusChanged(const Akonadi::AgentInstance &instance);
void slotInstanceRemoved(const Akonadi::AgentInstance &instance);
void slotInstanceAdded(const Akonadi::AgentInstance &instance);
diff --git a/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h b/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h
index 4c3a81f..da3d875 100644
--- a/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h
+++ b/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h
@@ -40,10 +40,10 @@ class NewMailNotifierCollectionProxyModel : public QIdentityProxyModel
public:
explicit NewMailNotifierCollectionProxyModel(QObject *parent = nullptr);
- QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role) const override;
- bool setData(const QModelIndex &index, const QVariant &_data, int role) Q_DECL_OVERRIDE;
- Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
+ bool setData(const QModelIndex &index, const QVariant &_data, int role) override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
QHash<Akonadi::Collection, bool> notificationCollection() const;
diff --git a/agents/newmailnotifier/newmailnotifiershowmessagejob.h b/agents/newmailnotifier/newmailnotifiershowmessagejob.h
index d9cf963..1cf2ab1 100644
--- a/agents/newmailnotifier/newmailnotifiershowmessagejob.h
+++ b/agents/newmailnotifier/newmailnotifiershowmessagejob.h
@@ -30,7 +30,7 @@ public:
explicit NewMailNotifierShowMessageJob(Akonadi::Item::Id id, QObject *parent = nullptr);
~NewMailNotifierShowMessageJob();
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private:
Akonadi::Item::Id mId;
diff --git a/kioslave/akonadi/akonadislave.h b/kioslave/akonadi/akonadislave.h
index 130d4d6..67605f3 100644
--- a/kioslave/akonadi/akonadislave.h
+++ b/kioslave/akonadi/akonadislave.h
@@ -37,22 +37,22 @@ public:
/**
* Reimplemented from SlaveBase
*/
- void get(const QUrl &url) Q_DECL_OVERRIDE;
+ void get(const QUrl &url) override;
/**
* Reimplemented from SlaveBase
*/
- void stat(const QUrl &url) Q_DECL_OVERRIDE;
+ void stat(const QUrl &url) override;
/**
* Reimplemented from SlaveBase
*/
- void listDir(const QUrl &url) Q_DECL_OVERRIDE;
+ void listDir(const QUrl &url) override;
/**
* Reimplemented from SlaveBase
*/
- void del(const QUrl &url, bool isFile) Q_DECL_OVERRIDE;
+ void del(const QUrl &url, bool isFile) override;
private:
static KIO::UDSEntry entryForItem(const Akonadi::Item &item);
diff --git a/kioslave/pop3/pop3.h b/kioslave/pop3/pop3.h
index 97a6898..a4632c8 100644
--- a/kioslave/pop3/pop3.h
+++ b/kioslave/pop3/pop3.h
@@ -46,12 +46,12 @@ public:
virtual ~ POP3Protocol();
virtual void setHost(const QString &host, quint16 port,
- const QString &user, const QString &pass) Q_DECL_OVERRIDE;
+ const QString &user, const QString &pass) override;
- void get(const QUrl &url) Q_DECL_OVERRIDE;
- void stat(const QUrl &url) Q_DECL_OVERRIDE;
- void del(const QUrl &url, bool isfile) Q_DECL_OVERRIDE;
- void listDir(const QUrl &url) Q_DECL_OVERRIDE;
+ void get(const QUrl &url) override;
+ void stat(const QUrl &url) override;
+ void del(const QUrl &url, bool isfile) override;
+ void listDir(const QUrl &url) override;
protected:
@@ -95,13 +95,13 @@ protected:
Resp getResponse(char *buf, unsigned int len);
/** Call int pop3_open() and report an error, if if fails */
- void openConnection() Q_DECL_OVERRIDE;
+ void openConnection() override;
/**
* Attempt to properly shut down the POP3 connection by sending
* "QUIT\r\n" before closing the socket.
*/
- void closeConnection() Q_DECL_OVERRIDE;
+ void closeConnection() override;
/**
* Attempt to initiate a POP3 connection via a TCP socket. If no port
diff --git a/migration/entitytreecreatejob.h b/migration/entitytreecreatejob.h
index 80874f9..143114e 100644
--- a/migration/entitytreecreatejob.h
+++ b/migration/entitytreecreatejob.h
@@ -31,7 +31,7 @@ class EntityTreeCreateJob : public Akonadi::TransactionSequence
public:
explicit EntityTreeCreateJob(const QList<Akonadi::Collection::List> &collections, const Akonadi::Item::List &items, QObject *parent = nullptr);
- void doStart() Q_DECL_OVERRIDE;
+ void doStart() override;
private Q_SLOTS:
void collectionCreateJobDone(KJob *);
diff --git a/migration/gid/gidmigrationjob.h b/migration/gid/gidmigrationjob.h
index 12ff344..62e8210 100644
--- a/migration/gid/gidmigrationjob.h
+++ b/migration/gid/gidmigrationjob.h
@@ -49,7 +49,7 @@ public:
*/
virtual ~GidMigrationJob();
- void doStart() Q_DECL_OVERRIDE;
+ void doStart() override;
private Q_SLOTS:
void collectionsReceived(const Akonadi::Collection::List &);
@@ -72,8 +72,8 @@ public:
explicit UpdateJob(const Akonadi::Collection &col, QObject *parent = nullptr);
virtual ~UpdateJob();
- void doStart() Q_DECL_OVERRIDE;
- void slotResult(KJob *job) Q_DECL_OVERRIDE;
+ void doStart() override;
+ void slotResult(KJob *job) override;
private Q_SLOTS:
void itemsReceived(const Akonadi::Item::List &items);
diff --git a/migration/gid/gidmigrator.h b/migration/gid/gidmigrator.h
index dadcb12..0f5191b 100644
--- a/migration/gid/gidmigrator.h
+++ b/migration/gid/gidmigrator.h
@@ -30,15 +30,15 @@ public:
GidMigrator(const QString &mimeType);
virtual ~GidMigrator();
- QString displayName() const Q_DECL_OVERRIDE;
- QString description() const Q_DECL_OVERRIDE;
+ QString displayName() const override;
+ QString description() const override;
- bool canStart() Q_DECL_OVERRIDE;
+ bool canStart() override;
- bool shouldAutostart() const Q_DECL_OVERRIDE;
+ bool shouldAutostart() const override;
protected:
- void startWork() Q_DECL_OVERRIDE;
+ void startWork() override;
private Q_SLOTS:
void migrationFinished(KJob *);
private:
diff --git a/plugins/akonadi_serializer_addressee.h b/plugins/akonadi_serializer_addressee.h
index 25d5a85..25ac7ae 100644
--- a/plugins/akonadi_serializer_addressee.h
+++ b/plugins/akonadi_serializer_addressee.h
@@ -41,14 +41,14 @@ class SerializerPluginAddressee : public QObject,
Q_INTERFACES(Akonadi::GidExtractorInterface)
Q_PLUGIN_METADATA(IID "org.kde.akonadi.SerializerPluginAddressee")
public:
- bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) Q_DECL_OVERRIDE;
- void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) Q_DECL_OVERRIDE;
+ bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) override;
+ void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) override;
void compare(Akonadi::AbstractDifferencesReporter *reporter,
const Akonadi::Item &leftItem,
- const Akonadi::Item &rightItem) Q_DECL_OVERRIDE;
+ const Akonadi::Item &rightItem) override;
- QString extractGid(const Item &item) const Q_DECL_OVERRIDE;
+ QString extractGid(const Item &item) const override;
private:
KContacts::VCardConverter m_converter;
diff --git a/plugins/akonadi_serializer_contactgroup.h b/plugins/akonadi_serializer_contactgroup.h
index d01ab06..101cd61 100644
--- a/plugins/akonadi_serializer_contactgroup.h
+++ b/plugins/akonadi_serializer_contactgroup.h
@@ -43,14 +43,14 @@ class SerializerPluginContactGroup : public QObject,
Q_INTERFACES(Akonadi::GidExtractorInterface)
Q_PLUGIN_METADATA(IID "org.kde.akonadi.SerializerPluginContactGroup")
public:
- bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) Q_DECL_OVERRIDE;
- void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) Q_DECL_OVERRIDE;
+ bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) override;
+ void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) override;
void compare(Akonadi::AbstractDifferencesReporter *reporter,
const Akonadi::Item &leftItem,
- const Akonadi::Item &rightItem) Q_DECL_OVERRIDE;
+ const Akonadi::Item &rightItem) override;
- QString extractGid(const Item &item) const Q_DECL_OVERRIDE;
+ QString extractGid(const Item &item) const override;
};
}
diff --git a/plugins/akonadi_serializer_kalarm.h b/plugins/akonadi_serializer_kalarm.h
index 876cadf..e295c9a 100644
--- a/plugins/akonadi_serializer_kalarm.h
+++ b/plugins/akonadi_serializer_kalarm.h
@@ -47,10 +47,10 @@ class SerializerPluginKAlarm : public QObject,
Q_INTERFACES(Akonadi::GidExtractorInterface)
Q_PLUGIN_METADATA(IID "org.kde.akonadi.SerializerPluginKAlarm")
public:
- bool deserialize(Akonadi::Item &item, const QByteArray &label, QIODevice &data, int version) Q_DECL_OVERRIDE;
- void serialize(const Akonadi::Item &item, const QByteArray &label, QIODevice &data, int &version) Q_DECL_OVERRIDE;
- void compare(Akonadi::AbstractDifferencesReporter *, const Akonadi::Item &left, const Akonadi::Item &right) Q_DECL_OVERRIDE;
- QString extractGid(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
+ bool deserialize(Akonadi::Item &item, const QByteArray &label, QIODevice &data, int version) override;
+ void serialize(const Akonadi::Item &item, const QByteArray &label, QIODevice &data, int &version) override;
+ void compare(Akonadi::AbstractDifferencesReporter *, const Akonadi::Item &left, const Akonadi::Item &right) override;
+ QString extractGid(const Akonadi::Item &item) const override;
private:
void reportDifference(Akonadi::AbstractDifferencesReporter *, KAEventFormatter::Parameter);
diff --git a/plugins/akonadi_serializer_kcalcore.h b/plugins/akonadi_serializer_kcalcore.h
index 872581e..e51d534 100644
--- a/plugins/akonadi_serializer_kcalcore.h
+++ b/plugins/akonadi_serializer_kcalcore.h
@@ -43,14 +43,14 @@ class SerializerPluginKCalCore : public QObject,
Q_PLUGIN_METADATA(IID "org.kde.akonadi.SerializerPluginKCalCore")
public:
SerializerPluginKCalCore();
- bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) Q_DECL_OVERRIDE;
- void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) Q_DECL_OVERRIDE;
+ bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) override;
+ void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) override;
void compare(Akonadi::AbstractDifferencesReporter *reporter,
const Akonadi::Item &leftItem,
- const Akonadi::Item &rightItem) Q_DECL_OVERRIDE;
+ const Akonadi::Item &rightItem) override;
- QString extractGid(const Item &item) const Q_DECL_OVERRIDE;
+ QString extractGid(const Item &item) const override;
private:
KCalCore::ICalFormat mFormat;
diff --git a/plugins/akonadi_serializer_mail.h b/plugins/akonadi_serializer_mail.h
index 1bf17a8..a18f34d 100644
--- a/plugins/akonadi_serializer_mail.h
+++ b/plugins/akonadi_serializer_mail.h
@@ -55,10 +55,10 @@ class SerializerPluginMail : public QObject, public ItemSerializerPlugin, public
Q_INTERFACES(Akonadi::ItemSerializerPlugin Akonadi::GidExtractorInterface)
Q_PLUGIN_METADATA(IID "org.kde.akonadi.SerializerPluginMail")
public:
- bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) Q_DECL_OVERRIDE;
- void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) Q_DECL_OVERRIDE;
- QSet<QByteArray> parts(const Item &item) const Q_DECL_OVERRIDE;
- QString extractGid(const Item &item) const Q_DECL_OVERRIDE;
+ bool deserialize(Item &item, const QByteArray &label, QIODevice &data, int version) override;
+ void serialize(const Item &item, const QByteArray &label, QIODevice &data, int &version) override;
+ QSet<QByteArray> parts(const Item &item) const override;
+ QString extractGid(const Item &item) const override;
private:
StringPool m_stringPool;
};
diff --git a/resources/akonotes/akonotesresource.h b/resources/akonotes/akonotesresource.h
index 100d009..eb759f2 100644
--- a/resources/akonotes/akonotesresource.h
+++ b/resources/akonotes/akonotesresource.h
@@ -29,11 +29,11 @@ public:
explicit AkonotesResource(const QString &id);
~AkonotesResource();
- QString defaultResourceType() Q_DECL_OVERRIDE;
+ QString defaultResourceType() override;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
protected:
- QString itemMimeType() const Q_DECL_OVERRIDE;
+ QString itemMimeType() const override;
};
#endif
diff --git a/resources/birthdays/birthdaysresource.h b/resources/birthdays/birthdaysresource.h
index 9f39fb9..09e211e 100644
--- a/resources/birthdays/birthdaysresource.h
+++ b/resources/birthdays/birthdaysresource.h
@@ -38,15 +38,15 @@ public:
~BirthdaysResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &collection) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
private:
void addPendingEvent(const KCalCore::Event::Ptr &event, const QString &remoteId);
diff --git a/resources/contacts/contactsresource.h b/resources/contacts/contactsresource.h
index cbf4706..066df1f 100644
--- a/resources/contacts/contactsresource.h
+++ b/resources/contacts/contactsresource.h
@@ -42,33 +42,33 @@ public:
~ContactsResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
+ void aboutToQuit() override;
protected:
using ResourceBase::retrieveItems; // suppress -Woverload-virtual warnings
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &collection) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection) override;
// do not hide the other variant, use implementation from base class
// which just forwards to the one above
using Akonadi::AgentBase::ObserverV2::collectionChanged;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &collectionSource,
- const Akonadi::Collection &collectionDestination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &collectionDestination) override;
void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &collectionSource,
- const Akonadi::Collection &collectionDestination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &collectionDestination) override;
private:
Akonadi::Collection::List createCollectionsForDirectory(const QDir &parentDirectory,
diff --git a/resources/dav/resource/ctagattribute.h b/resources/dav/resource/ctagattribute.h
index a71b715..417d981 100644
--- a/resources/dav/resource/ctagattribute.h
+++ b/resources/dav/resource/ctagattribute.h
@@ -31,10 +31,10 @@ public:
void setCTag(const QString &ctag);
QString CTag() const;
- Akonadi::Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray type() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ Akonadi::Attribute *clone() const override;
+ QByteArray type() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
QString mCTag;
diff --git a/resources/dav/resource/davgroupwareresource.h b/resources/dav/resource/davgroupwareresource.h
index 6d4b817..eb3d738 100644
--- a/resources/dav/resource/davgroupwareresource.h
+++ b/resources/dav/resource/davgroupwareresource.h
@@ -46,15 +46,15 @@ public:
explicit DavGroupwareResource(const QString &id);
~DavGroupwareResource();
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void cleanup() Q_DECL_OVERRIDE;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
+ void cleanup() override;
- QDateTime lastCacheUpdate() const Q_DECL_OVERRIDE;
- void canHandleFreeBusy(const QString &email) const Q_DECL_OVERRIDE;
- void retrieveFreeBusy(const QString &email, const QDateTime &start, const QDateTime &end) Q_DECL_OVERRIDE;
+ QDateTime lastCacheUpdate() const override;
+ void canHandleFreeBusy(const QString &email) const override;
+ void retrieveFreeBusy(const QString &email, const QDateTime &start, const QDateTime &end) override;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
private Q_SLOTS:
void createInitialCache();
@@ -65,15 +65,15 @@ protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &collection) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
- void doSetOnline(bool online) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
+ void doSetOnline(bool online) override;
private:
enum ItemFetchUpdateType {
diff --git a/resources/dav/resource/davprotocolattribute.h b/resources/dav/resource/davprotocolattribute.h
index ae67637..5c9199a 100644
--- a/resources/dav/resource/davprotocolattribute.h
+++ b/resources/dav/resource/davprotocolattribute.h
@@ -31,10 +31,10 @@ public:
void setDavProtocol(int protocol);
int davProtocol() const;
- Akonadi::Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray type() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ Akonadi::Attribute *clone() const override;
+ QByteArray type() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
int mDavProtocol;
diff --git a/resources/dav/resource/setupwizard.h b/resources/dav/resource/setupwizard.h
index 3c9392d..50c6b2d 100644
--- a/resources/dav/resource/setupwizard.h
+++ b/resources/dav/resource/setupwizard.h
@@ -71,8 +71,8 @@ class PredefinedProviderPage : public QWizardPage
public:
explicit PredefinedProviderPage(QWidget *parent = nullptr);
- void initializePage() Q_DECL_OVERRIDE;
- int nextId() const Q_DECL_OVERRIDE;
+ void initializePage() override;
+ int nextId() const override;
private:
QLabel *mLabel;
@@ -85,7 +85,7 @@ class CredentialsPage : public QWizardPage
{
public:
explicit CredentialsPage(QWidget *parent = nullptr);
- int nextId() const Q_DECL_OVERRIDE;
+ int nextId() const override;
private:
KLineEdit *mUserName;
@@ -99,7 +99,7 @@ class ServerTypePage : public QWizardPage
public:
explicit ServerTypePage(QWidget *parent = nullptr);
- bool validatePage() Q_DECL_OVERRIDE;
+ bool validatePage() override;
private:
void manualConfigToggled(bool toggled);
@@ -114,8 +114,8 @@ class ConnectionPage : public QWizardPage
public:
explicit ConnectionPage(QWidget *parent = nullptr);
- void initializePage() Q_DECL_OVERRIDE;
- void cleanupPage() Q_DECL_OVERRIDE;
+ void initializePage() override;
+ void cleanupPage() override;
private:
void urlElementChanged();
diff --git a/resources/google/calendar/calendarresource.h b/resources/google/calendar/calendarresource.h
index 449df18..e1dd235 100644
--- a/resources/google/calendar/calendarresource.h
+++ b/resources/google/calendar/calendarresource.h
@@ -34,32 +34,32 @@ public:
public:
using GoogleResource::collectionChanged; // So we don't trigger -Woverloaded-virtual
- GoogleSettings *settings() const Q_DECL_OVERRIDE;
- QList< QUrl > scopes() const Q_DECL_OVERRIDE;
+ GoogleSettings *settings() const override;
+ QList< QUrl > scopes() const override;
protected:
// Freebusy
- QDateTime lastCacheUpdate() const Q_DECL_OVERRIDE;
- void canHandleFreeBusy(const QString &email) const Q_DECL_OVERRIDE;
- void retrieveFreeBusy(const QString &email, const QDateTime &start, const QDateTime &end) Q_DECL_OVERRIDE;
+ QDateTime lastCacheUpdate() const override;
+ void canHandleFreeBusy(const QString &email) const override;
+ void retrieveFreeBusy(const QString &email, const QDateTime &start, const QDateTime &end) override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &collection) override;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet< QByteArray > &partIdentifiers) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet< QByteArray > &partIdentifiers) override;
+ void itemRemoved(const Akonadi::Item &item) override;
void itemMoved(const Akonadi::Item &item,
const Akonadi::Collection &collectionSource,
- const Akonadi::Collection &collectionDestination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &collectionDestination) override;
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection) override;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
void slotItemsRetrieved(KGAPI2::Job *job);
void slotCollectionsRetrieved(KGAPI2::Job *job);
@@ -74,8 +74,8 @@ protected Q_SLOTS:
void slotRetrieveFreeBusyJobFinished(KGAPI2::Job *job);
protected:
- int runConfigurationDialog(WId windowId) Q_DECL_OVERRIDE;
- void updateResourceName() Q_DECL_OVERRIDE;
+ int runConfigurationDialog(WId windowId) override;
+ void updateResourceName() override;
private:
QMap<QString, Akonadi::Collection> m_collections;
diff --git a/resources/google/calendar/defaultreminderattribute.h b/resources/google/calendar/defaultreminderattribute.h
index dbc37b3..48976dd 100644
--- a/resources/google/calendar/defaultreminderattribute.h
+++ b/resources/google/calendar/defaultreminderattribute.h
@@ -30,10 +30,10 @@ class DefaultReminderAttribute : public Akonadi::Attribute
public:
explicit DefaultReminderAttribute();
- Attribute *clone() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- QByteArray type() const Q_DECL_OVERRIDE;
+ Attribute *clone() const override;
+ void deserialize(const QByteArray &data) override;
+ QByteArray serialized() const override;
+ QByteArray type() const override;
void setReminders(const KGAPI2::RemindersList &reminders);
KCalCore::Alarm::List alarms(KCalCore::Incidence *incidence) const;
diff --git a/resources/google/calendar/settingsdialog.h b/resources/google/calendar/settingsdialog.h
index bdd2d3e..3c796cc 100644
--- a/resources/google/calendar/settingsdialog.h
+++ b/resources/google/calendar/settingsdialog.h
@@ -39,7 +39,7 @@ private Q_SLOTS:
void slotTaskListsRetrieved(KGAPI2::Job *job);
void slotCalendarsRetrieved(KGAPI2::Job *job);
- void saveSettings() Q_DECL_OVERRIDE;
+ void saveSettings() override;
private:
QGroupBox *m_calendarsBox;
diff --git a/resources/google/common/googleresource.h b/resources/google/common/googleresource.h
index 609b960..6c04407 100644
--- a/resources/google/common/googleresource.h
+++ b/resources/google/common/googleresource.h
@@ -53,15 +53,15 @@ public:
virtual GoogleSettings *settings() const = 0;
virtual QList<QUrl> scopes() const = 0;
- void cleanup() Q_DECL_OVERRIDE;
+ void cleanup() override;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
void reloadConfig();
protected Q_SLOTS:
- bool retrieveItem(const Akonadi::Item &item, const QSet< QByteArray > &parts) Q_DECL_OVERRIDE;
+ bool retrieveItem(const Akonadi::Item &item, const QSet< QByteArray > &parts) override;
bool handleError(KGAPI2::Job *job, bool cancelTask = true);
@@ -105,7 +105,7 @@ protected:
GoogleAccountManager *accountManager() const;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
virtual int runConfigurationDialog(WId windowId) = 0;
virtual void updateResourceName() = 0;
diff --git a/resources/google/contacts/contactsresource.h b/resources/google/contacts/contactsresource.h
index c032d15..3a7d877 100644
--- a/resources/google/contacts/contactsresource.h
+++ b/resources/google/contacts/contactsresource.h
@@ -44,22 +44,22 @@ protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &collection) override;
virtual void retrieveContactsPhotos(const QVariant &argument);
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet< QByteArray > &partIdentifiers) Q_DECL_OVERRIDE;
+ void itemRemoved(const Akonadi::Item &item) override;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet< QByteArray > &partIdentifiers) override;
void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &collectionSource,
- const Akonadi::Collection &collectionDestination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &collectionDestination) override;
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection) override;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
- void itemLinked(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemUnlinked(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void itemLinked(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemUnlinked(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
void slotItemsRetrieved(KGAPI2::Job *job);
void slotCollectionsRetrieved(KGAPI2::Job *job);
@@ -69,10 +69,10 @@ protected Q_SLOTS:
void slotCreateJobFinished(KGAPI2::Job *job);
- GoogleSettings *settings() const Q_DECL_OVERRIDE;
- int runConfigurationDialog(WId windowId) Q_DECL_OVERRIDE;
- void updateResourceName() Q_DECL_OVERRIDE;
- QList< QUrl > scopes() const Q_DECL_OVERRIDE;
+ GoogleSettings *settings() const override;
+ int runConfigurationDialog(WId windowId) override;
+ void updateResourceName() override;
+ QList< QUrl > scopes() const override;
private:
diff --git a/resources/google/contacts/settingsdialog.h b/resources/google/contacts/settingsdialog.h
index c7fbdd8..b310abb 100644
--- a/resources/google/contacts/settingsdialog.h
+++ b/resources/google/contacts/settingsdialog.h
@@ -30,7 +30,7 @@ public:
~SettingsDialog();
private Q_SLOTS:
- void saveSettings() Q_DECL_OVERRIDE;
+ void saveSettings() override;
};
diff --git a/resources/ical/notes/notesresource.h b/resources/ical/notes/notesresource.h
index b16d348..098dd9f 100644
--- a/resources/ical/notes/notesresource.h
+++ b/resources/ical/notes/notesresource.h
@@ -34,12 +34,12 @@ protected:
/**
Returns the Akonadi specific @c text/calendar sub MIME type of the given @p incidence.
*/
- QString mimeType(const KCalCore::IncidenceBase::Ptr &incidence) const Q_DECL_OVERRIDE;
+ QString mimeType(const KCalCore::IncidenceBase::Ptr &incidence) const override;
/**
Returns a list of all calendar component sub MIME types.
*/
- QStringList allMimeTypes() const Q_DECL_OVERRIDE;
+ QStringList allMimeTypes() const override;
};
#endif
diff --git a/resources/ical/shared/icalresource.h b/resources/ical/shared/icalresource.h
index 3f1cc0d..dda590c 100644
--- a/resources/ical/shared/icalresource.h
+++ b/resources/ical/shared/icalresource.h
@@ -41,11 +41,11 @@ protected:
*/
ICalResource(const QString &id, const QStringList &mimeTypes, const QString &icon);
- bool doRetrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void doRetrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
+ bool doRetrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void doRetrieveItems(const Akonadi::Collection &col) override;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
/**
Returns the Akonadi specific @c text/calendar sub MIME type of the given @p incidence.
diff --git a/resources/ical/shared/icalresourcebase.h b/resources/ical/shared/icalresourcebase.h
index 58f6f66..b7ad1f4 100644
--- a/resources/ical/shared/icalresourcebase.h
+++ b/resources/ical/shared/icalresourcebase.h
@@ -39,22 +39,22 @@ protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void retrieveItems(const Akonadi::Collection &col) override;
protected:
enum CheckType { CheckForAdded, CheckForChanged };
void initialise(const QStringList &mimeTypes, const QString &icon);
- bool readFromFile(const QString &fileName) Q_DECL_OVERRIDE;
- bool writeToFile(const QString &fileName) Q_DECL_OVERRIDE;
+ bool readFromFile(const QString &fileName) override;
+ bool writeToFile(const QString &fileName) override;
/**
* Customize the configuration dialog before it is displayed.
*/
- void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<SETTINGS_NAMESPACE::Settings> *dlg) Q_DECL_OVERRIDE;
+ void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<SETTINGS_NAMESPACE::Settings> *dlg) override;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
/**
* Retrieve an incidence from the calendar, and set it into a new item's payload.
@@ -80,7 +80,7 @@ protected:
*/
template <typename PayloadPtr> bool checkItemAddedChanged(const Akonadi::Item &item, CheckType type);
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemRemoved(const Akonadi::Item &item) override;
/** Return the local calendar. */
KCalCore::MemoryCalendar::Ptr calendar() const;
diff --git a/resources/icaldir/icaldirresource.h b/resources/icaldir/icaldirresource.h
index f46bdc5..2e7fcf2 100644
--- a/resources/icaldir/icaldirresource.h
+++ b/resources/icaldir/icaldirresource.h
@@ -36,23 +36,23 @@ public:
~ICalDirResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
+ void aboutToQuit() override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionChanged(const Akonadi::Collection &collection) override;
private:
bool loadIncidences();
diff --git a/resources/imap/addcollectiontask.h b/resources/imap/addcollectiontask.h
index d24466d..4e97468 100644
--- a/resources/imap/addcollectiontask.h
+++ b/resources/imap/addcollectiontask.h
@@ -38,7 +38,7 @@ public:
virtual ~AddCollectionTask();
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void onCreateDone(KJob *job);
diff --git a/resources/imap/additemtask.h b/resources/imap/additemtask.h
index f88692d..897aa82 100644
--- a/resources/imap/additemtask.h
+++ b/resources/imap/additemtask.h
@@ -34,7 +34,7 @@ public:
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void onAppendMessageDone(KJob *job);
diff --git a/resources/imap/autotests/dummypasswordrequester.h b/resources/imap/autotests/dummypasswordrequester.h
index 1c0a8a1..5794bf6 100644
--- a/resources/imap/autotests/dummypasswordrequester.h
+++ b/resources/imap/autotests/dummypasswordrequester.h
@@ -37,7 +37,7 @@ public:
public:
void requestPassword(RequestType request = StandardRequest,
- const QString &serverError = QString()) Q_DECL_OVERRIDE;
+ const QString &serverError = QString()) override;
private Q_SLOTS:
void emitResult();
diff --git a/resources/imap/autotests/dummyresourcestate.h b/resources/imap/autotests/dummyresourcestate.h
index 27a13a1..bab20a2 100644
--- a/resources/imap/autotests/dummyresourcestate.h
+++ b/resources/imap/autotests/dummyresourcestate.h
@@ -38,114 +38,114 @@ public:
~DummyResourceState();
void setUserName(const QString &name);
- QString userName() const Q_DECL_OVERRIDE;
+ QString userName() const override;
void setResourceName(const QString &name);
- QString resourceName() const Q_DECL_OVERRIDE;
+ QString resourceName() const override;
void setResourceIdentifier(const QString &identifier);
- QString resourceIdentifier() const Q_DECL_OVERRIDE;
+ QString resourceIdentifier() const override;
void setServerCapabilities(const QStringList &capabilities);
- QStringList serverCapabilities() const Q_DECL_OVERRIDE;
+ QStringList serverCapabilities() const override;
void setServerNamespaces(const QList<KIMAP::MailBoxDescriptor> &namespaces);
- QList<KIMAP::MailBoxDescriptor> serverNamespaces() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> personalNamespaces() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> userNamespaces() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> sharedNamespaces() const Q_DECL_OVERRIDE;
+ QList<KIMAP::MailBoxDescriptor> serverNamespaces() const override;
+ QList<KIMAP::MailBoxDescriptor> personalNamespaces() const override;
+ QList<KIMAP::MailBoxDescriptor> userNamespaces() const override;
+ QList<KIMAP::MailBoxDescriptor> sharedNamespaces() const override;
void setAutomaticExpungeEnagled(bool enabled);
- bool isAutomaticExpungeEnabled() const Q_DECL_OVERRIDE;
+ bool isAutomaticExpungeEnabled() const override;
void setSubscriptionEnabled(bool enabled);
- bool isSubscriptionEnabled() const Q_DECL_OVERRIDE;
+ bool isSubscriptionEnabled() const override;
void setDisconnectedModeEnabled(bool enabled);
- bool isDisconnectedModeEnabled() const Q_DECL_OVERRIDE;
+ bool isDisconnectedModeEnabled() const override;
void setIntervalCheckTime(int interval);
- int intervalCheckTime() const Q_DECL_OVERRIDE;
+ int intervalCheckTime() const override;
void setCollection(const Akonadi::Collection &collection);
- Akonadi::Collection collection() const Q_DECL_OVERRIDE;
+ Akonadi::Collection collection() const override;
void setItem(const Akonadi::Item &item);
- Akonadi::Item item() const Q_DECL_OVERRIDE;
- Akonadi::Item::List items() const Q_DECL_OVERRIDE;
+ Akonadi::Item item() const override;
+ Akonadi::Item::List items() const override;
void setParentCollection(const Akonadi::Collection &collection);
- Akonadi::Collection parentCollection() const Q_DECL_OVERRIDE;
+ Akonadi::Collection parentCollection() const override;
void setSourceCollection(const Akonadi::Collection &collection);
- Akonadi::Collection sourceCollection() const Q_DECL_OVERRIDE;
+ Akonadi::Collection sourceCollection() const override;
void setTargetCollection(const Akonadi::Collection &collection);
- Akonadi::Collection targetCollection() const Q_DECL_OVERRIDE;
+ Akonadi::Collection targetCollection() const override;
void setParts(const QSet<QByteArray> &parts);
- QSet<QByteArray> parts() const Q_DECL_OVERRIDE;
+ QSet<QByteArray> parts() const override;
void setTag(const Akonadi::Tag &tag);
- Akonadi::Tag tag() const Q_DECL_OVERRIDE;
+ Akonadi::Tag tag() const override;
void setAddedTags(const QSet<Akonadi::Tag> &addedTags);
- QSet<Akonadi::Tag> addedTags() const Q_DECL_OVERRIDE;
+ QSet<Akonadi::Tag> addedTags() const override;
void setRemovedTags(const QSet<Akonadi::Tag> &removedTags);
- QSet<Akonadi::Tag> removedTags() const Q_DECL_OVERRIDE;
+ QSet<Akonadi::Tag> removedTags() const override;
- Akonadi::Relation::List addedRelations() const Q_DECL_OVERRIDE;
- Akonadi::Relation::List removedRelations() const Q_DECL_OVERRIDE;
+ Akonadi::Relation::List addedRelations() const override;
+ Akonadi::Relation::List removedRelations() const override;
- QString rootRemoteId() const Q_DECL_OVERRIDE;
+ QString rootRemoteId() const override;
- void setIdleCollection(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void applyCollectionChanges(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void setIdleCollection(const Akonadi::Collection &collection) override;
+ void applyCollectionChanges(const Akonadi::Collection &collection) override;
- void collectionAttributesRetrieved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAttributesRetrieved(const Akonadi::Collection &collection) override;
- void itemRetrieved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemRetrieved(const Akonadi::Item &item) override;
- void itemsRetrieved(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
- void itemsRetrievedIncremental(const Akonadi::Item::List &changed, const Akonadi::Item::List &removed) Q_DECL_OVERRIDE;
- void itemsRetrievalDone() Q_DECL_OVERRIDE;
+ void itemsRetrieved(const Akonadi::Item::List &items) override;
+ void itemsRetrievedIncremental(const Akonadi::Item::List &changed, const Akonadi::Item::List &removed) override;
+ void itemsRetrievalDone() override;
- void setTotalItems(int) Q_DECL_OVERRIDE;
+ void setTotalItems(int) override;
- QSet< QByteArray > addedFlags() const Q_DECL_OVERRIDE;
- QSet< QByteArray > removedFlags() const Q_DECL_OVERRIDE;
+ QSet< QByteArray > addedFlags() const override;
+ QSet< QByteArray > removedFlags() const override;
- void itemChangeCommitted(const Akonadi::Item &item) Q_DECL_OVERRIDE;
- void itemsChangesCommitted(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
+ void itemChangeCommitted(const Akonadi::Item &item) override;
+ void itemsChangesCommitted(const Akonadi::Item::List &items) override;
- void collectionsRetrieved(const Akonadi::Collection::List &collections) Q_DECL_OVERRIDE;
+ void collectionsRetrieved(const Akonadi::Collection::List &collections) override;
- void collectionChangeCommitted(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionChangeCommitted(const Akonadi::Collection &collection) override;
- void tagsRetrieved(const Akonadi::Tag::List &tags, const QHash<QString, Akonadi::Item::List> &) Q_DECL_OVERRIDE;
- void relationsRetrieved(const Akonadi::Relation::List &tags) Q_DECL_OVERRIDE;
- void tagChangeCommitted(const Akonadi::Tag &tag) Q_DECL_OVERRIDE;
+ void tagsRetrieved(const Akonadi::Tag::List &tags, const QHash<QString, Akonadi::Item::List> &) override;
+ void relationsRetrieved(const Akonadi::Relation::List &tags) override;
+ void tagChangeCommitted(const Akonadi::Tag &tag) override;
- void searchFinished(const QVector<qint64> &result, bool isRid = true) Q_DECL_OVERRIDE;
+ void searchFinished(const QVector<qint64> &result, bool isRid = true) override;
- void changeProcessed() Q_DECL_OVERRIDE;
+ void changeProcessed() override;
- void cancelTask(const QString &errorString) Q_DECL_OVERRIDE;
- void deferTask() Q_DECL_OVERRIDE;
- void restartItemRetrieval(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
- void taskDone() Q_DECL_OVERRIDE;
+ void cancelTask(const QString &errorString) override;
+ void deferTask() override;
+ void restartItemRetrieval(Akonadi::Collection::Id col) override;
+ void taskDone() override;
- void emitError(const QString &message) Q_DECL_OVERRIDE;
- void emitWarning(const QString &message) Q_DECL_OVERRIDE;
- void emitPercent(int percent) Q_DECL_OVERRIDE;
+ void emitError(const QString &message) override;
+ void emitWarning(const QString &message) override;
+ void emitPercent(int percent) override;
- void synchronizeCollectionTree() Q_DECL_OVERRIDE;
- void scheduleConnectionAttempt() Q_DECL_OVERRIDE;
+ void synchronizeCollectionTree() override;
+ void scheduleConnectionAttempt() override;
- QChar separatorCharacter() const Q_DECL_OVERRIDE;
- void setSeparatorCharacter(QChar separator) Q_DECL_OVERRIDE;
+ QChar separatorCharacter() const override;
+ void setSeparatorCharacter(QChar separator) override;
- void showInformationDialog(const QString &message, const QString &title, const QString &dontShowAgainName) Q_DECL_OVERRIDE;
+ void showInformationDialog(const QString &message, const QString &title, const QString &dontShowAgainName) override;
- int batchSize() const Q_DECL_OVERRIDE;
- void setItemMergingMode(Akonadi::ItemSync::MergeMode mergeMode) Q_DECL_OVERRIDE;
+ int batchSize() const override;
+ void setItemMergingMode(Akonadi::ItemSync::MergeMode mergeMode) override;
- MessageHelper::Ptr messageHelper() const Q_DECL_OVERRIDE;
+ MessageHelper::Ptr messageHelper() const override;
QList< QPair<QByteArray, QVariant> > calls() const;
diff --git a/resources/imap/batchfetcher.h b/resources/imap/batchfetcher.h
index 3acbc53..af847b9 100644
--- a/resources/imap/batchfetcher.h
+++ b/resources/imap/batchfetcher.h
@@ -41,7 +41,7 @@ public:
int batchSize,
KIMAP::Session *session);
virtual ~BatchFetcher();
- void start() Q_DECL_OVERRIDE;
+ void start() override;
void fetchNextBatch();
void setUidBased(bool);
void setSearchUids(const KIMAP::ImapInterval &interval);
diff --git a/resources/imap/changecollectiontask.h b/resources/imap/changecollectiontask.h
index 586e3e9..c4efe49 100644
--- a/resources/imap/changecollectiontask.h
+++ b/resources/imap/changecollectiontask.h
@@ -41,7 +41,7 @@ private Q_SLOTS:
void onSetMetaDataDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void endTaskIfNeeded();
diff --git a/resources/imap/changeitemsflagstask.h b/resources/imap/changeitemsflagstask.h
index 3ca3745..c96880e 100644
--- a/resources/imap/changeitemsflagstask.h
+++ b/resources/imap/changeitemsflagstask.h
@@ -43,7 +43,7 @@ protected Q_SLOTS:
protected:
KIMAP::StoreJob *prepareJob(KIMAP::Session *session);
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
virtual void triggerAppendFlagsJob(KIMAP::Session *session);
virtual void triggerRemoveFlagsJob(KIMAP::Session *session);
diff --git a/resources/imap/changeitemtask.h b/resources/imap/changeitemtask.h
index 1ebc08f..1a71d52 100644
--- a/resources/imap/changeitemtask.h
+++ b/resources/imap/changeitemtask.h
@@ -43,7 +43,7 @@ private Q_SLOTS:
void onDeleteDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void triggerStoreJob();
diff --git a/resources/imap/expungecollectiontask.h b/resources/imap/expungecollectiontask.h
index 1ca4234..ae7a80a 100644
--- a/resources/imap/expungecollectiontask.h
+++ b/resources/imap/expungecollectiontask.h
@@ -37,7 +37,7 @@ private Q_SLOTS:
void onExpungeDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void triggerExpungeJob(KIMAP::Session *session);
diff --git a/resources/imap/gmailpasswordrequester.h b/resources/imap/gmailpasswordrequester.h
index 610ee75..2dfb6de 100644
--- a/resources/imap/gmailpasswordrequester.h
+++ b/resources/imap/gmailpasswordrequester.h
@@ -37,8 +37,8 @@ public:
explicit GmailPasswordRequester(ImapResourceBase *resource, QObject *parent = nullptr);
~GmailPasswordRequester();
- void requestPassword(RequestType request, const QString &serverError) Q_DECL_OVERRIDE;
- void cancelPasswordRequests() Q_DECL_OVERRIDE;
+ void requestPassword(RequestType request, const QString &serverError) override;
+ void cancelPasswordRequests() override;
private Q_SLOTS:
void onPasswordRequestCompleted(const QString &password, bool userRejected);
diff --git a/resources/imap/highestmodseqattribute.h b/resources/imap/highestmodseqattribute.h
index f0ab649..38dae4b 100644
--- a/resources/imap/highestmodseqattribute.h
+++ b/resources/imap/highestmodseqattribute.h
@@ -29,10 +29,10 @@ public:
void setHighestModSeq(qint64 highestModSequence);
qint64 highestModSequence() const;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- Akonadi::Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray type() const Q_DECL_OVERRIDE;
+ void deserialize(const QByteArray &data) override;
+ QByteArray serialized() const override;
+ Akonadi::Attribute *clone() const override;
+ QByteArray type() const override;
private:
qint64 m_highestModSeq;
diff --git a/resources/imap/imapresource.h b/resources/imap/imapresource.h
index 89d971b..3877a41 100644
--- a/resources/imap/imapresource.h
+++ b/resources/imap/imapresource.h
@@ -37,12 +37,12 @@ public:
explicit ImapResource(const QString &id);
virtual ~ImapResource();
- QDialog *createConfigureDialog(WId windowId) Q_DECL_OVERRIDE;
- void cleanup() Q_DECL_OVERRIDE;
+ QDialog *createConfigureDialog(WId windowId) override;
+ void cleanup() override;
protected:
- QString defaultName() const Q_DECL_OVERRIDE;
- QByteArray clientId() const Q_DECL_OVERRIDE;
+ QString defaultName() const override;
+ QByteArray clientId() const override;
private Q_SLOTS:
void onConfigurationDone(int result);
diff --git a/resources/imap/imapresourcebase.h b/resources/imap/imapresourcebase.h
index 8d55081..25cc275 100644
--- a/resources/imap/imapresourcebase.h
+++ b/resources/imap/imapresourcebase.h
@@ -62,12 +62,12 @@ public:
virtual QDialog *createConfigureDialog(WId windowId) = 0;
- void cleanup() Q_DECL_OVERRIDE;
+ void cleanup() override;
virtual Settings *settings() const;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
// DBus methods
Q_SCRIPTABLE void requestManualExpunge(qint64 collectionId);
@@ -75,7 +75,7 @@ public Q_SLOTS:
Q_SCRIPTABLE QStringList serverCapabilities() const;
// pseudo-virtual called by ResourceBase
- QString dumpResourceToString() const Q_DECL_OVERRIDE;
+ QString dumpResourceToString() const override;
protected:
using ResourceBase::retrieveItems; // supress -Woverload-virtual
@@ -84,38 +84,38 @@ protected Q_SLOTS:
void startIdleIfNeeded();
void startIdle();
- void abortActivity() Q_DECL_OVERRIDE;
+ void abortActivity() override;
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveCollectionAttributes(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveCollectionAttributes(const Akonadi::Collection &col) override;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemsFlagsChanged(const Akonadi::Item::List &items, const QSet<QByteArray> &addedFlags, const QSet<QByteArray> &removedFlags) Q_DECL_OVERRIDE;
- void itemsRemoved(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemsFlagsChanged(const Akonadi::Item::List &items, const QSet<QByteArray> &addedFlags, const QSet<QByteArray> &removedFlags) override;
+ void itemsRemoved(const Akonadi::Item::List &items) override;
virtual void itemsMoved(const Akonadi::Item::List &item, const Akonadi::Collection &source,
- const Akonadi::Collection &destination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &destination) override;
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection, const QSet<QByteArray> &parts) override;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
virtual void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &source,
- const Akonadi::Collection &destination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &destination) override;
- void addSearch(const QString &query, const QString &queryLanguage, const Akonadi::Collection &resultCollection) Q_DECL_OVERRIDE;
- void removeSearch(const Akonadi::Collection &resultCollection) Q_DECL_OVERRIDE;
- void search(const QString &query, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void addSearch(const QString &query, const QString &queryLanguage, const Akonadi::Collection &resultCollection) override;
+ void removeSearch(const Akonadi::Collection &resultCollection) override;
+ void search(const QString &query, const Akonadi::Collection &collection) override;
- void doSetOnline(bool online) Q_DECL_OVERRIDE;
+ void doSetOnline(bool online) override;
QChar separatorCharacter() const;
void setSeparatorCharacter(const QChar &separator);
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
virtual ResourceStateInterface::Ptr createResourceState(const TaskArguments &);
virtual QString defaultName() const = 0;
diff --git a/resources/imap/movecollectiontask.h b/resources/imap/movecollectiontask.h
index a44d0a4..b6bab27 100644
--- a/resources/imap/movecollectiontask.h
+++ b/resources/imap/movecollectiontask.h
@@ -38,7 +38,7 @@ private Q_SLOTS:
void onSubscribeDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void doRename(KIMAP::Session *session);
diff --git a/resources/imap/moveitemstask.h b/resources/imap/moveitemstask.h
index 6c950cc..a110e94 100644
--- a/resources/imap/moveitemstask.h
+++ b/resources/imap/moveitemstask.h
@@ -44,7 +44,7 @@ private Q_SLOTS:
void onSearchDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void startMove(KIMAP::Session *session);
diff --git a/resources/imap/noinferiorsattribute.h b/resources/imap/noinferiorsattribute.h
index 6113bd2..ff839ba 100644
--- a/resources/imap/noinferiorsattribute.h
+++ b/resources/imap/noinferiorsattribute.h
@@ -27,10 +27,10 @@ public:
explicit NoInferiorsAttribute(bool noInferiors = false);
void setNoInferiors(bool noInferiors);
bool noInferiors() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
bool mNoInferiors;
diff --git a/resources/imap/noselectattribute.h b/resources/imap/noselectattribute.h
index 4f33a68..1254186 100644
--- a/resources/imap/noselectattribute.h
+++ b/resources/imap/noselectattribute.h
@@ -28,10 +28,10 @@ public:
explicit NoSelectAttribute(bool noSelect = false);
void setNoSelect(bool noSelect);
bool noSelect() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
bool mNoSelect;
diff --git a/resources/imap/passwordrequester.h b/resources/imap/passwordrequester.h
index 555f2c1..ac01c25 100644
--- a/resources/imap/passwordrequester.h
+++ b/resources/imap/passwordrequester.h
@@ -32,8 +32,8 @@ public:
explicit PasswordRequester(ImapResourceBase *resource, QObject *parent = nullptr);
~PasswordRequester();
- void requestPassword(RequestType request, const QString &serverError) Q_DECL_OVERRIDE;
- void cancelPasswordRequests() Q_DECL_OVERRIDE;
+ void requestPassword(RequestType request, const QString &serverError) override;
+ void cancelPasswordRequests() override;
private:
PasswordRequesterInterface *requesterImpl();
diff --git a/resources/imap/removecollectionrecursivetask.h b/resources/imap/removecollectionrecursivetask.h
index 57399a6..f97d975 100644
--- a/resources/imap/removecollectionrecursivetask.h
+++ b/resources/imap/removecollectionrecursivetask.h
@@ -42,7 +42,7 @@ private Q_SLOTS:
void onJobDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void deleteNextMailbox();
diff --git a/resources/imap/replacemessagejob.h b/resources/imap/replacemessagejob.h
index 7a7bc83..4882e8f 100644
--- a/resources/imap/replacemessagejob.h
+++ b/resources/imap/replacemessagejob.h
@@ -36,7 +36,7 @@ public:
qint64 newUid() const;
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private:
void triggerSearchJob();
diff --git a/resources/imap/resourcestate.h b/resources/imap/resourcestate.h
index 54e24ab..6fe64c6 100644
--- a/resources/imap/resourcestate.h
+++ b/resources/imap/resourcestate.h
@@ -65,95 +65,95 @@ public:
public:
~ResourceState();
- QString userName() const Q_DECL_OVERRIDE;
- QString resourceName() const Q_DECL_OVERRIDE;
- QString resourceIdentifier() const Q_DECL_OVERRIDE;
- QStringList serverCapabilities() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> serverNamespaces() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> personalNamespaces() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> userNamespaces() const Q_DECL_OVERRIDE;
- QList<KIMAP::MailBoxDescriptor> sharedNamespaces() const Q_DECL_OVERRIDE;
+ QString userName() const override;
+ QString resourceName() const override;
+ QString resourceIdentifier() const override;
+ QStringList serverCapabilities() const override;
+ QList<KIMAP::MailBoxDescriptor> serverNamespaces() const override;
+ QList<KIMAP::MailBoxDescriptor> personalNamespaces() const override;
+ QList<KIMAP::MailBoxDescriptor> userNamespaces() const override;
+ QList<KIMAP::MailBoxDescriptor> sharedNamespaces() const override;
- bool isAutomaticExpungeEnabled() const Q_DECL_OVERRIDE;
- bool isSubscriptionEnabled() const Q_DECL_OVERRIDE;
- bool isDisconnectedModeEnabled() const Q_DECL_OVERRIDE;
- int intervalCheckTime() const Q_DECL_OVERRIDE;
+ bool isAutomaticExpungeEnabled() const override;
+ bool isSubscriptionEnabled() const override;
+ bool isDisconnectedModeEnabled() const override;
+ int intervalCheckTime() const override;
- Akonadi::Collection collection() const Q_DECL_OVERRIDE;
- Akonadi::Item item() const Q_DECL_OVERRIDE;
- Akonadi::Item::List items() const Q_DECL_OVERRIDE;
+ Akonadi::Collection collection() const override;
+ Akonadi::Item item() const override;
+ Akonadi::Item::List items() const override;
- Akonadi::Collection parentCollection() const Q_DECL_OVERRIDE;
+ Akonadi::Collection parentCollection() const override;
- Akonadi::Collection sourceCollection() const Q_DECL_OVERRIDE;
- Akonadi::Collection targetCollection() const Q_DECL_OVERRIDE;
+ Akonadi::Collection sourceCollection() const override;
+ Akonadi::Collection targetCollection() const override;
- QSet<QByteArray> parts() const Q_DECL_OVERRIDE;
- QSet<QByteArray> addedFlags() const Q_DECL_OVERRIDE;
- QSet<QByteArray> removedFlags() const Q_DECL_OVERRIDE;
+ QSet<QByteArray> parts() const override;
+ QSet<QByteArray> addedFlags() const override;
+ QSet<QByteArray> removedFlags() const override;
- Akonadi::Tag tag() const Q_DECL_OVERRIDE;
- QSet<Akonadi::Tag> addedTags() const Q_DECL_OVERRIDE;
- QSet<Akonadi::Tag> removedTags() const Q_DECL_OVERRIDE;
+ Akonadi::Tag tag() const override;
+ QSet<Akonadi::Tag> addedTags() const override;
+ QSet<Akonadi::Tag> removedTags() const override;
- Akonadi::Relation::List addedRelations() const Q_DECL_OVERRIDE;
- Akonadi::Relation::List removedRelations() const Q_DECL_OVERRIDE;
+ Akonadi::Relation::List addedRelations() const override;
+ Akonadi::Relation::List removedRelations() const override;
- QString rootRemoteId() const Q_DECL_OVERRIDE;
+ QString rootRemoteId() const override;
- void setIdleCollection(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void applyCollectionChanges(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void setIdleCollection(const Akonadi::Collection &collection) override;
+ void applyCollectionChanges(const Akonadi::Collection &collection) override;
- void collectionAttributesRetrieved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAttributesRetrieved(const Akonadi::Collection &collection) override;
- void itemRetrieved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemRetrieved(const Akonadi::Item &item) override;
- void itemsRetrieved(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
- void itemsRetrievedIncremental(const Akonadi::Item::List &changed, const Akonadi::Item::List &removed) Q_DECL_OVERRIDE;
- void itemsRetrievalDone() Q_DECL_OVERRIDE;
+ void itemsRetrieved(const Akonadi::Item::List &items) override;
+ void itemsRetrievedIncremental(const Akonadi::Item::List &changed, const Akonadi::Item::List &removed) override;
+ void itemsRetrievalDone() override;
- void setTotalItems(int) Q_DECL_OVERRIDE;
+ void setTotalItems(int) override;
- void itemChangeCommitted(const Akonadi::Item &item) Q_DECL_OVERRIDE;
- void itemsChangesCommitted(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
+ void itemChangeCommitted(const Akonadi::Item &item) override;
+ void itemsChangesCommitted(const Akonadi::Item::List &items) override;
- void collectionsRetrieved(const Akonadi::Collection::List &collections) Q_DECL_OVERRIDE;
+ void collectionsRetrieved(const Akonadi::Collection::List &collections) override;
- void tagsRetrieved(const Akonadi::Tag::List &tags, const QHash<QString, Akonadi::Item::List> &) Q_DECL_OVERRIDE;
- void relationsRetrieved(const Akonadi::Relation::List &tags) Q_DECL_OVERRIDE;
+ void tagsRetrieved(const Akonadi::Tag::List &tags, const QHash<QString, Akonadi::Item::List> &) override;
+ void relationsRetrieved(const Akonadi::Relation::List &tags) override;
- void collectionChangeCommitted(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionChangeCommitted(const Akonadi::Collection &collection) override;
- void tagChangeCommitted(const Akonadi::Tag &tag) Q_DECL_OVERRIDE;
+ void tagChangeCommitted(const Akonadi::Tag &tag) override;
- void changeProcessed() Q_DECL_OVERRIDE;
+ void changeProcessed() override;
- void searchFinished(const QVector<qint64> &result, bool isRid = true) Q_DECL_OVERRIDE;
+ void searchFinished(const QVector<qint64> &result, bool isRid = true) override;
- void cancelTask(const QString &errorString) Q_DECL_OVERRIDE;
- void deferTask() Q_DECL_OVERRIDE;
- void restartItemRetrieval(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
- void taskDone() Q_DECL_OVERRIDE;
+ void cancelTask(const QString &errorString) override;
+ void deferTask() override;
+ void restartItemRetrieval(Akonadi::Collection::Id col) override;
+ void taskDone() override;
- void emitError(const QString &message) Q_DECL_OVERRIDE;
- void emitWarning(const QString &message) Q_DECL_OVERRIDE;
+ void emitError(const QString &message) override;
+ void emitWarning(const QString &message) override;
- void emitPercent(int percent) Q_DECL_OVERRIDE;
+ void emitPercent(int percent) override;
virtual void synchronizeCollection(Akonadi::Collection::Id);
- void synchronizeCollectionTree() Q_DECL_OVERRIDE;
- void scheduleConnectionAttempt() Q_DECL_OVERRIDE;
+ void synchronizeCollectionTree() override;
+ void scheduleConnectionAttempt() override;
- QChar separatorCharacter() const Q_DECL_OVERRIDE;
- void setSeparatorCharacter(QChar separator) Q_DECL_OVERRIDE;
+ QChar separatorCharacter() const override;
+ void setSeparatorCharacter(QChar separator) override;
- void showInformationDialog(const QString &message, const QString &title, const QString &dontShowAgainName) Q_DECL_OVERRIDE;
+ void showInformationDialog(const QString &message, const QString &title, const QString &dontShowAgainName) override;
- int batchSize() const Q_DECL_OVERRIDE;
+ int batchSize() const override;
- MessageHelper::Ptr messageHelper() const Q_DECL_OVERRIDE;
+ MessageHelper::Ptr messageHelper() const override;
- void setItemMergingMode(Akonadi::ItemSync::MergeMode mergeMode) Q_DECL_OVERRIDE;
+ void setItemMergingMode(Akonadi::ItemSync::MergeMode mergeMode) override;
private:
ImapResourceBase *m_resource;
diff --git a/resources/imap/retrievecollectionmetadatatask.h b/resources/imap/retrievecollectionmetadatatask.h
index 50c9944..49b54e5 100644
--- a/resources/imap/retrievecollectionmetadatatask.h
+++ b/resources/imap/retrievecollectionmetadatatask.h
@@ -39,7 +39,7 @@ private Q_SLOTS:
void onQuotasReceived(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void endTaskIfNeeded();
diff --git a/resources/imap/retrievecollectionstask.h b/resources/imap/retrievecollectionstask.h
index 9b5885d..6876eb1 100644
--- a/resources/imap/retrievecollectionstask.h
+++ b/resources/imap/retrievecollectionstask.h
@@ -44,7 +44,7 @@ private Q_SLOTS:
void onFullMailBoxesReceiveDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
protected:
QHash<QString, Akonadi::Collection> m_reportedCollections;
diff --git a/resources/imap/retrieveitemstask.h b/resources/imap/retrieveitemstask.h
index 8d417ab..1b4c379 100644
--- a/resources/imap/retrieveitemstask.h
+++ b/resources/imap/retrieveitemstask.h
@@ -57,7 +57,7 @@ private Q_SLOTS:
void onFlagsFetchDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
virtual BatchFetcher *createBatchFetcher(MessageHelper::Ptr messageHelper, const KIMAP::ImapSet &set,
const KIMAP::FetchJob::FetchScope &scope, int batchSize,
diff --git a/resources/imap/retrieveitemtask.h b/resources/imap/retrieveitemtask.h
index d2f0aeb..2e1daed 100644
--- a/resources/imap/retrieveitemtask.h
+++ b/resources/imap/retrieveitemtask.h
@@ -43,7 +43,7 @@ private Q_SLOTS:
void onContentFetchDone(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void triggerFetchJob();
diff --git a/resources/imap/searchtask.h b/resources/imap/searchtask.h
index 8501fb4..d1f8146 100644
--- a/resources/imap/searchtask.h
+++ b/resources/imap/searchtask.h
@@ -32,7 +32,7 @@ public:
~SearchTask();
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private Q_SLOTS:
void onSelectDone(KJob *job);
diff --git a/resources/imap/serverinfodialog.h b/resources/imap/serverinfodialog.h
index b1e73d2..5bd54d3 100644
--- a/resources/imap/serverinfodialog.h
+++ b/resources/imap/serverinfodialog.h
@@ -32,7 +32,7 @@ public:
explicit ServerInfoTextBrowser(QWidget *parent = nullptr);
~ServerInfoTextBrowser();
protected:
- void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
+ void paintEvent(QPaintEvent *event) override;
};
class ServerInfoDialog : public QDialog
diff --git a/resources/imap/sessionuiproxy.h b/resources/imap/sessionuiproxy.h
index 24e7a4b..0691072 100644
--- a/resources/imap/sessionuiproxy.h
+++ b/resources/imap/sessionuiproxy.h
@@ -28,7 +28,7 @@
class SessionUiProxy : public KIMAP::SessionUiProxy
{
public:
- bool ignoreSslError(const KSslErrorUiData &errorData) Q_DECL_OVERRIDE {
+ bool ignoreSslError(const KSslErrorUiData &errorData) override {
if (KIO::SslUi::askIgnoreSslErrors(errorData, KIO::SslUi::RecallAndStoreRules))
{
return true;
diff --git a/resources/imap/settingspasswordrequester.h b/resources/imap/settingspasswordrequester.h
index 03a1a17..6af3f40 100644
--- a/resources/imap/settingspasswordrequester.h
+++ b/resources/imap/settingspasswordrequester.h
@@ -36,8 +36,8 @@ public:
virtual ~SettingsPasswordRequester();
virtual void requestPassword(RequestType request = StandardRequest,
- const QString &serverError = QString()) Q_DECL_OVERRIDE;
- void cancelPasswordRequests() Q_DECL_OVERRIDE;
+ const QString &serverError = QString()) override;
+ void cancelPasswordRequests() override;
private Q_SLOTS:
void askUserInput(const QString &serverError);
diff --git a/resources/imap/subscriptiondialog.h b/resources/imap/subscriptiondialog.h
index 23882ff..aeaf636 100644
--- a/resources/imap/subscriptiondialog.h
+++ b/resources/imap/subscriptiondialog.h
@@ -50,7 +50,7 @@ public Q_SLOTS:
void setIncludeCheckedOnly(int checkedOnlyState);
protected:
- bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
+ bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const override;
private:
QString m_pattern;
diff --git a/resources/imap/tracer.cpp b/resources/imap/tracer.cpp
index 78c97eb..375dc79 100644
--- a/resources/imap/tracer.cpp
+++ b/resources/imap/tracer.cpp
@@ -18,17 +18,17 @@ public:
}
virtual ~DebugStream() {}
- bool isSequential() const Q_DECL_OVERRIDE
+ bool isSequential() const override
{
return true;
}
- qint64 readData(char *, qint64) Q_DECL_OVERRIDE {
+ qint64 readData(char *, qint64) override {
return 0; /* eof */
}
- qint64 readLineData(char *, qint64) Q_DECL_OVERRIDE {
+ qint64 readLineData(char *, qint64) override {
return 0; /* eof */
}
- qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE {
+ qint64 writeData(const char *data, qint64 len) override {
const QByteArray buf = QByteArray::fromRawData(data, len);
if (!qEnvironmentVariableIsEmpty("IMAP_TRACE"))
{
diff --git a/resources/imap/uidnextattribute.h b/resources/imap/uidnextattribute.h
index 8d72567..3382da2 100644
--- a/resources/imap/uidnextattribute.h
+++ b/resources/imap/uidnextattribute.h
@@ -28,10 +28,10 @@ public:
explicit UidNextAttribute(int uidnext = 0);
void setUidNext(int uidnext);
int uidNext() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
int mUidNext;
diff --git a/resources/imap/uidvalidityattribute.h b/resources/imap/uidvalidityattribute.h
index a12c60a..bc1f9f0 100644
--- a/resources/imap/uidvalidityattribute.h
+++ b/resources/imap/uidvalidityattribute.h
@@ -28,10 +28,10 @@ public:
explicit UidValidityAttribute(int uidvalidity = 0);
void setUidValidity(int uidvalidity);
int uidValidity() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
int mUidValidity;
diff --git a/resources/kalarm/kalarm/kalarmresource.h b/resources/kalarm/kalarm/kalarmresource.h
index 97918c2..351cf2f 100644
--- a/resources/kalarm/kalarm/kalarmresource.h
+++ b/resources/kalarm/kalarm/kalarmresource.h
@@ -46,17 +46,17 @@ protected:
/**
* Customize the configuration dialog before it is displayed.
*/
- void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<Akonadi_KAlarm_Resource::Settings> *) Q_DECL_OVERRIDE;
- void configDialogAcceptedActions(Akonadi::SingleFileResourceConfigDialog<Akonadi_KAlarm_Resource::Settings> *) Q_DECL_OVERRIDE;
+ void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<Akonadi_KAlarm_Resource::Settings> *) override;
+ void configDialogAcceptedActions(Akonadi::SingleFileResourceConfigDialog<Akonadi_KAlarm_Resource::Settings> *) override;
- void doRetrieveItems(const Akonadi::Collection &) Q_DECL_OVERRIDE;
- bool doRetrieveItem(const Akonadi::Item &, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- bool readFromFile(const QString &fileName) Q_DECL_OVERRIDE;
- bool writeToFile(const QString &fileName) Q_DECL_OVERRIDE;
- void itemAdded(const Akonadi::Item &, const Akonadi::Collection &) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &) Q_DECL_OVERRIDE;
- void retrieveCollections() Q_DECL_OVERRIDE;
+ void doRetrieveItems(const Akonadi::Collection &) override;
+ bool doRetrieveItem(const Akonadi::Item &, const QSet<QByteArray> &parts) override;
+ bool readFromFile(const QString &fileName) override;
+ bool writeToFile(const QString &fileName) override;
+ void itemAdded(const Akonadi::Item &, const Akonadi::Collection &) override;
+ void itemChanged(const Akonadi::Item &, const QSet<QByteArray> &parts) override;
+ void collectionChanged(const Akonadi::Collection &) override;
+ void retrieveCollections() override;
private Q_SLOTS:
void settingsChanged();
diff --git a/resources/kalarm/kalarmdir/kalarmdirresource.h b/resources/kalarm/kalarmdir/kalarmdirresource.h
index 357d18f..e599bfe 100644
--- a/resources/kalarm/kalarmdir/kalarmdirresource.h
+++ b/resources/kalarm/kalarmdir/kalarmdirresource.h
@@ -41,22 +41,22 @@ public:
~KAlarmDirResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
+ void aboutToQuit() override;
protected:
using ResourceBase::retrieveItems; // suppress -Woverload-virtual warnings
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &) override;
+ bool retrieveItem(const Akonadi::Item &, const QSet<QByteArray> &parts) override;
protected:
- void collectionChanged(const Akonadi::Collection &) Q_DECL_OVERRIDE;
- void itemAdded(const Akonadi::Item &, const Akonadi::Collection &) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &) Q_DECL_OVERRIDE;
+ void collectionChanged(const Akonadi::Collection &) override;
+ void itemAdded(const Akonadi::Item &, const Akonadi::Collection &) override;
+ void itemChanged(const Akonadi::Item &, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &) override;
private Q_SLOTS:
void settingsChanged();
diff --git a/resources/kalarm/shared/alarmtyperadiowidget.h b/resources/kalarm/shared/alarmtyperadiowidget.h
index f32de20..b60a7a7 100644
--- a/resources/kalarm/shared/alarmtyperadiowidget.h
+++ b/resources/kalarm/shared/alarmtyperadiowidget.h
@@ -38,7 +38,7 @@ public:
explicit AlarmTypeRadioWidget(QWidget *parent = nullptr);
void setAlarmType(CalEvent::Type);
CalEvent::Type alarmType() const;
- bool validate() const Q_DECL_OVERRIDE;
+ bool validate() const override;
private:
Ui::AlarmTypeRadioWidget ui;
diff --git a/resources/kolab/kolabaddtagtask.h b/resources/kolab/kolabaddtagtask.h
index 413c07f..8acccc2 100644
--- a/resources/kolab/kolabaddtagtask.h
+++ b/resources/kolab/kolabaddtagtask.h
@@ -31,7 +31,7 @@ public:
explicit KolabAddTagTask(const ResourceStateInterface::Ptr &resource, QObject *parent = nullptr);
protected:
- void startRelationTask(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void startRelationTask(KIMAP::Session *session) override;
private:
QByteArray mMessageId;
diff --git a/resources/kolab/kolabchangeitemsrelationstask.h b/resources/kolab/kolabchangeitemsrelationstask.h
index ee31934..7a68e38 100644
--- a/resources/kolab/kolabchangeitemsrelationstask.h
+++ b/resources/kolab/kolabchangeitemsrelationstask.h
@@ -31,7 +31,7 @@ public:
explicit KolabChangeItemsRelationsTask(const ResourceStateInterface::Ptr &resource, QObject *parent = nullptr);
protected:
- void startRelationTask(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void startRelationTask(KIMAP::Session *session) override;
private Q_SLOTS:
void onRelationFetchDone(KJob *job);
diff --git a/resources/kolab/kolabchangeitemstagstask.h b/resources/kolab/kolabchangeitemstagstask.h
index fc73c44..0a9db8b 100644
--- a/resources/kolab/kolabchangeitemstagstask.h
+++ b/resources/kolab/kolabchangeitemstagstask.h
@@ -32,7 +32,7 @@ public:
explicit KolabChangeItemsTagsTask(const ResourceStateInterface::Ptr &resource, const QSharedPointer<TagConverter> &tagConverter, QObject *parent = nullptr);
protected:
- void startRelationTask(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void startRelationTask(KIMAP::Session *session) override;
private:
KIMAP::Session *mSession;
diff --git a/resources/kolab/kolabchangetagtask.h b/resources/kolab/kolabchangetagtask.h
index b2deea9..6a0ec5a 100644
--- a/resources/kolab/kolabchangetagtask.h
+++ b/resources/kolab/kolabchangetagtask.h
@@ -32,7 +32,7 @@ public:
explicit KolabChangeTagTask(const ResourceStateInterface::Ptr &resource, const QSharedPointer<TagConverter> &tagConverter, QObject *parent = nullptr);
protected:
- void startRelationTask(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void startRelationTask(KIMAP::Session *session) override;
private:
KIMAP::Session *mSession;
diff --git a/resources/kolab/kolabmessagehelper.h b/resources/kolab/kolabmessagehelper.h
index 76dc036..bb42321 100644
--- a/resources/kolab/kolabmessagehelper.h
+++ b/resources/kolab/kolabmessagehelper.h
@@ -34,7 +34,7 @@ public:
const QList<KIMAP::MessageAttribute> &attrs,
const QList<QByteArray> &flags,
const KIMAP::FetchJob::FetchScope &scope,
- bool &ok) const Q_DECL_OVERRIDE;
+ bool &ok) const override;
private:
Akonadi::Collection mCollection;
diff --git a/resources/kolab/kolabrelationresourcetask.h b/resources/kolab/kolabrelationresourcetask.h
index b8563ad..bcf3a9c 100644
--- a/resources/kolab/kolabrelationresourcetask.h
+++ b/resources/kolab/kolabrelationresourcetask.h
@@ -39,7 +39,7 @@ protected:
Akonadi::Collection mRelationCollection;
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
virtual void startRelationTask(KIMAP::Session *session) = 0;
diff --git a/resources/kolab/kolabremovetagtask.h b/resources/kolab/kolabremovetagtask.h
index 6a87fda..de6a252 100644
--- a/resources/kolab/kolabremovetagtask.h
+++ b/resources/kolab/kolabremovetagtask.h
@@ -31,7 +31,7 @@ public:
explicit KolabRemoveTagTask(const ResourceStateInterface::Ptr &resource, QObject *parent = nullptr);
protected:
- void startRelationTask(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void startRelationTask(KIMAP::Session *session) override;
private:
void triggerStoreJob(KIMAP::Session *session);
diff --git a/resources/kolab/kolabresource.h b/resources/kolab/kolabresource.h
index 634d397..522bd50 100644
--- a/resources/kolab/kolabresource.h
+++ b/resources/kolab/kolabresource.h
@@ -34,42 +34,42 @@ public:
explicit KolabResource(const QString &id);
~KolabResource();
- QDialog *createConfigureDialog(WId windowId) Q_DECL_OVERRIDE;
- Settings *settings() const Q_DECL_OVERRIDE;
- void cleanup() Q_DECL_OVERRIDE;
+ QDialog *createConfigureDialog(WId windowId) override;
+ Settings *settings() const override;
+ void cleanup() override;
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
void delayedInit();
protected:
- ResourceStateInterface::Ptr createResourceState(const TaskArguments &) Q_DECL_OVERRIDE;
+ ResourceStateInterface::Ptr createResourceState(const TaskArguments &) override;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
void itemsMoved(const Akonadi::Item::List &item, const Akonadi::Collection &source,
- const Akonadi::Collection &destination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &destination) override;
//itemsRemoved and itemsFlags changed do not require translation, because they don't use the payload
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection, const QSet<QByteArray> &parts) override;
//collectionRemoved & collectionMoved do not require adjustments since they don't change the annotations
- void tagAdded(const Akonadi::Tag &tag) Q_DECL_OVERRIDE;
- void tagChanged(const Akonadi::Tag &tag) Q_DECL_OVERRIDE;
- void tagRemoved(const Akonadi::Tag &tag) Q_DECL_OVERRIDE;
- void itemsTagsChanged(const Akonadi::Item::List &items, const QSet<Akonadi::Tag> &addedTags, const QSet<Akonadi::Tag> &removedTags) Q_DECL_OVERRIDE;
+ void tagAdded(const Akonadi::Tag &tag) override;
+ void tagChanged(const Akonadi::Tag &tag) override;
+ void tagRemoved(const Akonadi::Tag &tag) override;
+ void itemsTagsChanged(const Akonadi::Item::List &items, const QSet<Akonadi::Tag> &addedTags, const QSet<Akonadi::Tag> &removedTags) override;
void itemsRelationsChanged(const Akonadi::Item::List &items,
const Akonadi::Relation::List &addedRelations,
- const Akonadi::Relation::List &removedRelations) Q_DECL_OVERRIDE;
+ const Akonadi::Relation::List &removedRelations) override;
- QString defaultName() const Q_DECL_OVERRIDE;
- QByteArray clientId() const Q_DECL_OVERRIDE;
+ QString defaultName() const override;
+ QByteArray clientId() const override;
private Q_SLOTS:
- void retrieveTags() Q_DECL_OVERRIDE;
- void retrieveRelations() Q_DECL_OVERRIDE;
+ void retrieveTags() override;
+ void retrieveRelations() override;
void onConfigurationDone(int result);
};
diff --git a/resources/kolab/kolabresourcestate.h b/resources/kolab/kolabresourcestate.h
index 749c6e4..c048240 100644
--- a/resources/kolab/kolabresourcestate.h
+++ b/resources/kolab/kolabresourcestate.h
@@ -30,9 +30,9 @@ public:
explicit KolabResourceState(ImapResourceBase *resource, const TaskArguments &arguments);
private:
- void collectionAttributesRetrieved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void collectionsRetrieved(const Akonadi::Collection::List &collections) Q_DECL_OVERRIDE;
- MessageHelper::Ptr messageHelper() const Q_DECL_OVERRIDE;
+ void collectionAttributesRetrieved(const Akonadi::Collection &collection) override;
+ void collectionsRetrieved(const Akonadi::Collection::List &collections) override;
+ MessageHelper::Ptr messageHelper() const override;
};
#endif
diff --git a/resources/kolab/kolabretrievecollectionstask.h b/resources/kolab/kolabretrievecollectionstask.h
index 2b1ccfa..4a9fc0b 100644
--- a/resources/kolab/kolabretrievecollectionstask.h
+++ b/resources/kolab/kolabretrievecollectionstask.h
@@ -46,7 +46,7 @@ private Q_SLOTS:
void onMetadataRetrieved(KJob *job);
protected:
- void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void doStart(KIMAP::Session *session) override;
private:
void checkDone();
@@ -77,7 +77,7 @@ class RetrieveMetadataJob : public KJob
Q_OBJECT
public:
RetrieveMetadataJob(KIMAP::Session *session, const QStringList &mailboxes, const QStringList &serverCapabilities, const QSet<QByteArray> &requestedMetadata, const QString &separator, const QList <KIMAP::MailBoxDescriptor > &sharedNamespace, const QList <KIMAP::MailBoxDescriptor > &userNamespace, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
QHash<QString, QMap<QByteArray, QByteArray> > mMetadata;
QHash<QString, KIMAP::Acl::Rights> mRights;
diff --git a/resources/kolab/kolabretrievetagstask.h b/resources/kolab/kolabretrievetagstask.h
index 1e83b80..efba4b6 100644
--- a/resources/kolab/kolabretrievetagstask.h
+++ b/resources/kolab/kolabretrievetagstask.h
@@ -41,7 +41,7 @@ public:
explicit KolabRetrieveTagTask(const ResourceStateInterface::Ptr &resource, RetrieveType type, QObject *parent = nullptr);
protected:
- void startRelationTask(KIMAP::Session *session) Q_DECL_OVERRIDE;
+ void startRelationTask(KIMAP::Session *session) override;
private:
KIMAP::Session *mSession;
diff --git a/resources/kolab/tagchangehelper.cpp b/resources/kolab/tagchangehelper.cpp
index 00f04d8..ce45dc4 100644
--- a/resources/kolab/tagchangehelper.cpp
+++ b/resources/kolab/tagchangehelper.cpp
@@ -59,7 +59,7 @@ KMime::Message::Ptr TagConverter::createMessage(const Akonadi::Tag &tag, const A
struct TagMerger : public Merger {
virtual ~TagMerger() {}
- KMime::Message::Ptr merge(const KMime::Message::Ptr &newMessage, const QList<KMime::Message::Ptr> &conflictingMessages) const Q_DECL_OVERRIDE
+ KMime::Message::Ptr merge(const KMime::Message::Ptr &newMessage, const QList<KMime::Message::Ptr> &conflictingMessages) const override
{
qCDebug(KOLABRESOURCE_LOG) << "Got " << conflictingMessages.size() << " conflicting relation configuration objects. Overwriting with local version.";
return newMessage;
diff --git a/resources/kolab/updatemessagejob.h b/resources/kolab/updatemessagejob.h
index c1c0c94..9e26c59 100644
--- a/resources/kolab/updatemessagejob.h
+++ b/resources/kolab/updatemessagejob.h
@@ -41,7 +41,7 @@ public:
qint64 newUid() const;
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private:
void fetchHeaders();
diff --git a/resources/maildir/maildirresource.h b/resources/maildir/maildirresource.h
index 74d95c1..500a8a0 100644
--- a/resources/maildir/maildirresource.h
+++ b/resources/maildir/maildirresource.h
@@ -45,30 +45,30 @@ public:
virtual QString defaultResourceType();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItems(const Akonadi::Item::List &items, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItems(const Akonadi::Item::List &items, const QSet<QByteArray> &parts) override;
protected:
virtual QString itemMimeType() const;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &source, const Akonadi::Collection &dest) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &source, const Akonadi::Collection &dest) override;
+ void itemRemoved(const Akonadi::Item &item) override;
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection) override;
// do not hide the other variant, use implementation from base class
// which just forwards to the one above
using Akonadi::AgentBase::ObserverV2::collectionChanged;
- void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &source, const Akonadi::Collection &dest) Q_DECL_OVERRIDE;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &source, const Akonadi::Collection &dest) override;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
private Q_SLOTS:
void configurationChanged();
diff --git a/resources/maildir/retrieveitemsjob.h b/resources/maildir/retrieveitemsjob.h
index 9ae06d1..9645305 100644
--- a/resources/maildir/retrieveitemsjob.h
+++ b/resources/maildir/retrieveitemsjob.h
@@ -44,7 +44,7 @@ public:
void setMimeType(const QString &mimeType);
protected:
- void doStart() Q_DECL_OVERRIDE;
+ void doStart() override;
private:
void entriesProcessed();
diff --git a/resources/mbox/deleteditemsattribute.h b/resources/mbox/deleteditemsattribute.h
index 6d8c6ed..27e5c2b 100644
--- a/resources/mbox/deleteditemsattribute.h
+++ b/resources/mbox/deleteditemsattribute.h
@@ -40,21 +40,21 @@ public:
void addDeletedItemOffset(quint64);
- DeletedItemsAttribute *clone() const Q_DECL_OVERRIDE;
+ DeletedItemsAttribute *clone() const override;
QSet<quint64> deletedItemOffsets() const;
KMBox::MBoxEntry::List deletedItemEntries() const;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ void deserialize(const QByteArray &data) override;
/**
* Returns the number of offsets stored in this attribute.
*/
int offsetCount() const;
- QByteArray serialized() const Q_DECL_OVERRIDE;
+ QByteArray serialized() const override;
- QByteArray type() const Q_DECL_OVERRIDE;
+ QByteArray type() const override;
bool operator ==(const DeletedItemsAttribute &other) const;
private:
diff --git a/resources/mbox/mboxresource.h b/resources/mbox/mboxresource.h
index 6a9d541..86f5dba 100644
--- a/resources/mbox/mboxresource.h
+++ b/resources/mbox/mboxresource.h
@@ -37,24 +37,24 @@ public:
~MboxResource();
protected Q_SLOTS:
- bool retrieveItems(const Akonadi::Item::List &items, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
+ bool retrieveItems(const Akonadi::Item::List &items, const QSet<QByteArray> &parts) override;
+ void retrieveItems(const Akonadi::Collection &col) override;
protected:
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
// From SingleFileResourceBase
- void handleHashChange() Q_DECL_OVERRIDE;
- bool readFromFile(const QString &fileName) Q_DECL_OVERRIDE;
- bool writeToFile(const QString &fileName) Q_DECL_OVERRIDE;
+ void handleHashChange() override;
+ bool readFromFile(const QString &fileName) override;
+ bool writeToFile(const QString &fileName) override;
/**
* Customize the configuration dialog before it is displayed.
*/
- void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<Settings> *dlg) Q_DECL_OVERRIDE;
+ void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<Settings> *dlg) override;
private Q_SLOTS:
void onCollectionFetch(KJob *job);
diff --git a/resources/mixedmaildir/autotests/templatemethodstest.cpp b/resources/mixedmaildir/autotests/templatemethodstest.cpp
index 4ca5da2..0cb8374 100644
--- a/resources/mixedmaildir/autotests/templatemethodstest.cpp
+++ b/resources/mixedmaildir/autotests/templatemethodstest.cpp
@@ -60,11 +60,11 @@ public:
mutable QString mErrorText;
protected:
- void setTopLevelCollection(const Collection &collection) Q_DECL_OVERRIDE {
+ void setTopLevelCollection(const Collection &collection) override {
MixedMaildirStore::setTopLevelCollection(collection);
}
- void checkCollectionMove(FileStore::CollectionMoveJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkCollectionMove(FileStore::CollectionMoveJob *job, int &errorCode, QString &errorText) const override
{
MixedMaildirStore::checkCollectionMove(job, errorCode, errorText);
@@ -73,7 +73,7 @@ protected:
mErrorText = errorText;
}
- void checkItemCreate(FileStore::ItemCreateJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkItemCreate(FileStore::ItemCreateJob *job, int &errorCode, QString &errorText) const override
{
MixedMaildirStore::checkItemCreate(job, errorCode, errorText);
diff --git a/resources/mixedmaildir/mixedmaildirresource.h b/resources/mixedmaildir/mixedmaildirresource.h
index 59c862a..a6baa87 100644
--- a/resources/mixedmaildir/mixedmaildirresource.h
+++ b/resources/mixedmaildir/mixedmaildirresource.h
@@ -38,26 +38,26 @@ public:
~MixedMaildirResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItems(const Akonadi::Item::List &items, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItems(const Akonadi::Item::List &items, const QSet<QByteArray> &parts) override;
protected:
- void aboutToQuit() Q_DECL_OVERRIDE;
-
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &source, const Akonadi::Collection &dest) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
-
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection, const QSet<QByteArray> &changedAttributes) Q_DECL_OVERRIDE;
- void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &source, const Akonadi::Collection &dest) Q_DECL_OVERRIDE;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
+
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &source, const Akonadi::Collection &dest) override;
+ void itemRemoved(const Akonadi::Item &item) override;
+
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection) override;
+ void collectionChanged(const Akonadi::Collection &collection, const QSet<QByteArray> &changedAttributes) override;
+ void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &source, const Akonadi::Collection &dest) override;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
private:
bool ensureDirExists();
diff --git a/resources/mixedmaildir/mixedmaildirstore.cpp b/resources/mixedmaildir/mixedmaildirstore.cpp
index a3f19b3..4810dc1 100644
--- a/resources/mixedmaildir/mixedmaildirstore.cpp
+++ b/resources/mixedmaildir/mixedmaildirstore.cpp
@@ -531,18 +531,18 @@ public:
void updateContextHashes(const QString &oldPath, const QString &newPath);
public: // visitor interface implementation
- bool visit(FileStore::Job *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::CollectionCreateJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::CollectionDeleteJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::CollectionFetchJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::CollectionModifyJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::CollectionMoveJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::ItemCreateJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::ItemDeleteJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::ItemFetchJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::ItemModifyJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::ItemMoveJob *job) Q_DECL_OVERRIDE;
- bool visit(FileStore::StoreCompactJob *job) Q_DECL_OVERRIDE;
+ bool visit(FileStore::Job *job) override;
+ bool visit(FileStore::CollectionCreateJob *job) override;
+ bool visit(FileStore::CollectionDeleteJob *job) override;
+ bool visit(FileStore::CollectionFetchJob *job) override;
+ bool visit(FileStore::CollectionModifyJob *job) override;
+ bool visit(FileStore::CollectionMoveJob *job) override;
+ bool visit(FileStore::ItemCreateJob *job) override;
+ bool visit(FileStore::ItemDeleteJob *job) override;
+ bool visit(FileStore::ItemFetchJob *job) override;
+ bool visit(FileStore::ItemModifyJob *job) override;
+ bool visit(FileStore::ItemMoveJob *job) override;
+ bool visit(FileStore::StoreCompactJob *job) override;
public:
typedef QHash<QString, MBoxPtr> MBoxHash;
diff --git a/resources/mixedmaildir/mixedmaildirstore.h b/resources/mixedmaildir/mixedmaildirstore.h
index 82bba47..c501f09 100644
--- a/resources/mixedmaildir/mixedmaildirstore.h
+++ b/resources/mixedmaildir/mixedmaildirstore.h
@@ -33,16 +33,16 @@ public:
~MixedMaildirStore();
protected:
- void setTopLevelCollection(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void processJob(Akonadi::FileStore::Job *job) Q_DECL_OVERRIDE;
+ void setTopLevelCollection(const Akonadi::Collection &collection) override;
+ void processJob(Akonadi::FileStore::Job *job) override;
- void checkCollectionMove(Akonadi::FileStore::CollectionMoveJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE;
+ void checkCollectionMove(Akonadi::FileStore::CollectionMoveJob *job, int &errorCode, QString &errorText) const override;
- void checkItemCreate(Akonadi::FileStore::ItemCreateJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE;
+ void checkItemCreate(Akonadi::FileStore::ItemCreateJob *job, int &errorCode, QString &errorText) const override;
- void checkItemModify(Akonadi::FileStore::ItemModifyJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE;
+ void checkItemModify(Akonadi::FileStore::ItemModifyJob *job, int &errorCode, QString &errorText) const override;
- void checkItemFetch(Akonadi::FileStore::ItemFetchJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE;
+ void checkItemFetch(Akonadi::FileStore::ItemFetchJob *job, int &errorCode, QString &errorText) const override;
private:
class Private;
diff --git a/resources/mixedmaildir/retrieveitemsjob.h b/resources/mixedmaildir/retrieveitemsjob.h
index b50bf1e..61222ca 100644
--- a/resources/mixedmaildir/retrieveitemsjob.h
+++ b/resources/mixedmaildir/retrieveitemsjob.h
@@ -49,7 +49,7 @@ public:
Akonadi::Item::List itemsMarkedAsDeleted() const;
protected:
- void doStart() Q_DECL_OVERRIDE;
+ void doStart() override;
private:
class Private;
diff --git a/resources/openxchange/openxchangeresource.h b/resources/openxchange/openxchangeresource.h
index 80814df..4d6ee83 100644
--- a/resources/openxchange/openxchangeresource.h
+++ b/resources/openxchange/openxchangeresource.h
@@ -30,35 +30,35 @@ public:
explicit OpenXchangeResource(const QString &id);
~OpenXchangeResource();
- void cleanup() Q_DECL_OVERRIDE;
+ void cleanup() override;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
+ void aboutToQuit() override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &collection) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
virtual void itemMoved(const Akonadi::Item &item, const Akonadi::Collection &collectionSource,
- const Akonadi::Collection &collectionDestination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &collectionDestination) override;
- void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) Q_DECL_OVERRIDE;
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override;
+ void collectionChanged(const Akonadi::Collection &collection) override;
// do not hide the other variant, use implementation from base class
// which just forwards to the one above
using Akonadi::AgentBase::ObserverV2::collectionChanged;
- void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionRemoved(const Akonadi::Collection &collection) override;
virtual void collectionMoved(const Akonadi::Collection &collection, const Akonadi::Collection &collectionSource,
- const Akonadi::Collection &collectionDestination) Q_DECL_OVERRIDE;
+ const Akonadi::Collection &collectionDestination) override;
private Q_SLOTS:
void onUpdateUsersJobFinished(KJob *);
diff --git a/resources/openxchange/oxa/connectiontestjob.h b/resources/openxchange/oxa/connectiontestjob.h
index f416ea0..5969e80 100644
--- a/resources/openxchange/oxa/connectiontestjob.h
+++ b/resources/openxchange/oxa/connectiontestjob.h
@@ -34,7 +34,7 @@ class ConnectionTestJob : public KJob
public:
ConnectionTestJob(const QString &url, const QString &user, const QString &password, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
void httpJobFinished(KJob *);
diff --git a/resources/openxchange/oxa/foldercreatejob.h b/resources/openxchange/oxa/foldercreatejob.h
index 5832584..7abe7fe 100644
--- a/resources/openxchange/oxa/foldercreatejob.h
+++ b/resources/openxchange/oxa/foldercreatejob.h
@@ -50,7 +50,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the updated folder that has been created.
diff --git a/resources/openxchange/oxa/folderdeletejob.h b/resources/openxchange/oxa/folderdeletejob.h
index febb5cb..bf7f785 100644
--- a/resources/openxchange/oxa/folderdeletejob.h
+++ b/resources/openxchange/oxa/folderdeletejob.h
@@ -52,7 +52,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
void davJobFinished(KJob *);
diff --git a/resources/openxchange/oxa/foldermodifyjob.h b/resources/openxchange/oxa/foldermodifyjob.h
index 1bb0cd2..b7daf48 100644
--- a/resources/openxchange/oxa/foldermodifyjob.h
+++ b/resources/openxchange/oxa/foldermodifyjob.h
@@ -52,7 +52,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the updated folder that has been modified.
diff --git a/resources/openxchange/oxa/foldermovejob.h b/resources/openxchange/oxa/foldermovejob.h
index d30718f..c152d1d 100644
--- a/resources/openxchange/oxa/foldermovejob.h
+++ b/resources/openxchange/oxa/foldermovejob.h
@@ -54,7 +54,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the updated folder that has been moved.
diff --git a/resources/openxchange/oxa/folderrequestjob.h b/resources/openxchange/oxa/folderrequestjob.h
index 790f467..4a49a69 100644
--- a/resources/openxchange/oxa/folderrequestjob.h
+++ b/resources/openxchange/oxa/folderrequestjob.h
@@ -52,7 +52,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the requested folder.
diff --git a/resources/openxchange/oxa/foldersrequestdeltajob.h b/resources/openxchange/oxa/foldersrequestdeltajob.h
index 7bed44a..432e3ba 100644
--- a/resources/openxchange/oxa/foldersrequestdeltajob.h
+++ b/resources/openxchange/oxa/foldersrequestdeltajob.h
@@ -51,7 +51,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the list of all added and modified folders.
diff --git a/resources/openxchange/oxa/foldersrequestjob.h b/resources/openxchange/oxa/foldersrequestjob.h
index 06f4157..dbfda60 100644
--- a/resources/openxchange/oxa/foldersrequestjob.h
+++ b/resources/openxchange/oxa/foldersrequestjob.h
@@ -60,7 +60,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the list of all requested folders.
diff --git a/resources/openxchange/oxa/objectcreatejob.h b/resources/openxchange/oxa/objectcreatejob.h
index 9944c5a..9cb89c2 100644
--- a/resources/openxchange/oxa/objectcreatejob.h
+++ b/resources/openxchange/oxa/objectcreatejob.h
@@ -36,7 +36,7 @@ class ObjectCreateJob : public KJob
public:
explicit ObjectCreateJob(const Object &object, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
Object object() const;
diff --git a/resources/openxchange/oxa/objectdeletejob.h b/resources/openxchange/oxa/objectdeletejob.h
index d6bacf4..cff2ea0 100644
--- a/resources/openxchange/oxa/objectdeletejob.h
+++ b/resources/openxchange/oxa/objectdeletejob.h
@@ -36,7 +36,7 @@ class ObjectDeleteJob : public KJob
public:
explicit ObjectDeleteJob(const Object &object, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
void davJobFinished(KJob *);
diff --git a/resources/openxchange/oxa/objectmodifyjob.h b/resources/openxchange/oxa/objectmodifyjob.h
index aaa0188..6ede402 100644
--- a/resources/openxchange/oxa/objectmodifyjob.h
+++ b/resources/openxchange/oxa/objectmodifyjob.h
@@ -36,7 +36,7 @@ class ObjectModifyJob : public KJob
public:
explicit ObjectModifyJob(const Object &object, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
Object object() const;
diff --git a/resources/openxchange/oxa/objectmovejob.h b/resources/openxchange/oxa/objectmovejob.h
index f099102..f37b721 100644
--- a/resources/openxchange/oxa/objectmovejob.h
+++ b/resources/openxchange/oxa/objectmovejob.h
@@ -37,7 +37,7 @@ class ObjectMoveJob : public KJob
public:
ObjectMoveJob(const Object &object, const Folder &destinationFolder, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
Object object() const;
diff --git a/resources/openxchange/oxa/objectrequestjob.h b/resources/openxchange/oxa/objectrequestjob.h
index ebaf818..97d76c5 100644
--- a/resources/openxchange/oxa/objectrequestjob.h
+++ b/resources/openxchange/oxa/objectrequestjob.h
@@ -36,7 +36,7 @@ class ObjectRequestJob : public KJob
public:
explicit ObjectRequestJob(const Object &object, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
Object object() const;
diff --git a/resources/openxchange/oxa/objectsrequestdeltajob.h b/resources/openxchange/oxa/objectsrequestdeltajob.h
index 4e5b4b4..46ba446 100644
--- a/resources/openxchange/oxa/objectsrequestdeltajob.h
+++ b/resources/openxchange/oxa/objectsrequestdeltajob.h
@@ -52,7 +52,7 @@ public:
/**
* Starts the job.
*/
- void start() Q_DECL_OVERRIDE;
+ void start() override;
/**
* Returns the list of all added and modified objects.
diff --git a/resources/openxchange/oxa/objectsrequestjob.h b/resources/openxchange/oxa/objectsrequestjob.h
index 25708e2..aac949d 100644
--- a/resources/openxchange/oxa/objectsrequestjob.h
+++ b/resources/openxchange/oxa/objectsrequestjob.h
@@ -54,7 +54,7 @@ public:
*/
explicit ObjectsRequestJob(const Folder &folder, qulonglong lastSync = 0, Mode mode = Modified, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
Object::List objects() const;
diff --git a/resources/openxchange/oxa/updateusersjob.h b/resources/openxchange/oxa/updateusersjob.h
index 8966e4f..ad6b9b3 100644
--- a/resources/openxchange/oxa/updateusersjob.h
+++ b/resources/openxchange/oxa/updateusersjob.h
@@ -36,7 +36,7 @@ class UpdateUsersJob : public KJob
public:
explicit UpdateUsersJob(QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
void userIdRequestJobFinished(KJob *);
diff --git a/resources/openxchange/oxa/useridrequestjob.h b/resources/openxchange/oxa/useridrequestjob.h
index c9981ea..d74f3b2 100644
--- a/resources/openxchange/oxa/useridrequestjob.h
+++ b/resources/openxchange/oxa/useridrequestjob.h
@@ -34,7 +34,7 @@ class UserIdRequestJob : public KJob
public:
explicit UserIdRequestJob(QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
qlonglong userId() const;
diff --git a/resources/openxchange/oxa/usersrequestjob.h b/resources/openxchange/oxa/usersrequestjob.h
index e168cdc..1e0fb31 100644
--- a/resources/openxchange/oxa/usersrequestjob.h
+++ b/resources/openxchange/oxa/usersrequestjob.h
@@ -36,7 +36,7 @@ class UsersRequestJob : public KJob
public:
explicit UsersRequestJob(QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
User::List users() const;
diff --git a/resources/pop3/autotests/fakeserver/fakeserver.h b/resources/pop3/autotests/fakeserver/fakeserver.h
index 3cf43ff..1fc2064 100644
--- a/resources/pop3/autotests/fakeserver/fakeserver.h
+++ b/resources/pop3/autotests/fakeserver/fakeserver.h
@@ -88,7 +88,7 @@ class FakeServerThread : public QThread
public:
explicit FakeServerThread(QObject *parent);
- void run() Q_DECL_OVERRIDE;
+ void run() override;
// Returns the FakeServer use. Be careful when using this and make sure
// the methods you use are actually thread-safe!!
diff --git a/resources/pop3/jobs.h b/resources/pop3/jobs.h
index 9a971f0..3ac77e2 100644
--- a/resources/pop3/jobs.h
+++ b/resources/pop3/jobs.h
@@ -88,8 +88,8 @@ protected Q_SLOTS:
virtual void slotSlaveResult(KJob *job);
protected:
- QString errorString() const Q_DECL_OVERRIDE;
- bool doKill() Q_DECL_OVERRIDE;
+ QString errorString() const override;
+ bool doKill() override;
void startJob(const QString &path);
virtual void connectJob();
@@ -102,16 +102,16 @@ class LoginJob : public SlaveBaseJob
Q_OBJECT
public:
LoginJob(POPSession *popSession);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
protected:
- QString errorString() const Q_DECL_OVERRIDE;
+ QString errorString() const override;
private Q_SLOTS:
void slaveConnected(KIO::Slave *slave);
private:
- void slaveError(int errorCode, const QString &errorMessage) Q_DECL_OVERRIDE;
+ void slaveError(int errorCode, const QString &errorMessage) override;
QString mErrorString;
};
@@ -122,10 +122,10 @@ class ListJob : public SlaveBaseJob
public:
ListJob(POPSession *popSession);
QMap<int, int> idList() const;
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private:
- void slotSlaveData(KIO::Job *job, const QByteArray &data) Q_DECL_OVERRIDE;
+ void slotSlaveData(KIO::Job *job, const QByteArray &data) override;
private:
QMap<int, int> mIdList;
@@ -138,10 +138,10 @@ public:
UIDListJob(POPSession *popSession);
QMap<int, QString> uidList() const;
QMap<QString, int> idList() const;
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private:
- void slotSlaveData(KIO::Job *job, const QByteArray &data) Q_DECL_OVERRIDE;
+ void slotSlaveData(KIO::Job *job, const QByteArray &data) override;
QMap<int, QString> mUidList;
QMap<QString, int> mIdList;
@@ -153,7 +153,7 @@ class DeleteJob : public SlaveBaseJob
public:
DeleteJob(POPSession *popSession);
void setDeleteIds(const QList<int> &ids);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
QList<int> deletedIDs() const;
private:
@@ -167,7 +167,7 @@ class QuitJob : public SlaveBaseJob
public:
QuitJob(POPSession *popSession);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
};
class FetchJob : public SlaveBaseJob
@@ -177,7 +177,7 @@ public:
FetchJob(POPSession *session);
void setFetchIds(const QList<int> &ids, const QList<int> &sizes);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
void slotInfoMessage(KJob *job, const QString &infoMessage, const QString &);
@@ -187,8 +187,8 @@ Q_SIGNALS:
private:
- void connectJob() Q_DECL_OVERRIDE;
- void slotSlaveData(KIO::Job *job, const QByteArray &data) Q_DECL_OVERRIDE;
+ void connectJob() override;
+ void slotSlaveData(KIO::Job *job, const QByteArray &data) override;
QList<int> mIdsPendingDownload;
QByteArray mCurrentMessage;
diff --git a/resources/pop3/pop3resource.h b/resources/pop3/pop3resource.h
index 544b25b..8fd0920 100644
--- a/resources/pop3/pop3resource.h
+++ b/resources/pop3/pop3resource.h
@@ -49,23 +49,23 @@ public:
void clearCachedPassword();
- void cleanup() Q_DECL_OVERRIDE;
+ void cleanup() override;
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void aboutToQuit() Q_DECL_OVERRIDE;
- void doSetOnline(bool online) Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
+ void doSetOnline(bool online) override;
private Q_SLOTS:
diff --git a/resources/shared/filestore/abstractlocalstore.cpp b/resources/shared/filestore/abstractlocalstore.cpp
index 2e4e566..f45a906 100644
--- a/resources/shared/filestore/abstractlocalstore.cpp
+++ b/resources/shared/filestore/abstractlocalstore.cpp
@@ -51,62 +51,62 @@ public:
}
public: // Job::Visitor interface implementation
- bool visit(FileStore::Job *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::Job *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::CollectionCreateJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionCreateJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::CollectionDeleteJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionDeleteJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::CollectionFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionFetchJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::CollectionModifyJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionModifyJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::CollectionMoveJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionMoveJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::ItemCreateJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemCreateJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::ItemDeleteJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemDeleteJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::ItemFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemFetchJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::ItemModifyJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemModifyJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::ItemMoveJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemMoveJob *job) override {
Q_UNUSED(job);
return false;
}
- bool visit(FileStore::StoreCompactJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::StoreCompactJob *job) override {
Q_UNUSED(job);
return false;
}
@@ -131,7 +131,7 @@ public:
public:
using JobProcessingAdaptor::visit;
- bool visit(FileStore::CollectionFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionFetchJob *job) override {
if (job->type() == FileStore::CollectionFetchJob::Base &&
job->collection().remoteId() == mTopLevelCollection.remoteId())
{
@@ -162,7 +162,7 @@ public:
public:
using JobProcessingAdaptor::visit;
- bool visit(FileStore::CollectionCreateJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionCreateJob *job) override {
Q_ASSERT(!mCollections.isEmpty());
if (mCollections.count() > 1)
{
@@ -174,7 +174,7 @@ public:
return true;
}
- bool visit(FileStore::CollectionDeleteJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionDeleteJob *job) override {
Q_ASSERT(!mCollections.isEmpty());
if (mCollections.count() > 1)
{
@@ -186,12 +186,12 @@ public:
return true;
}
- bool visit(FileStore::CollectionFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionFetchJob *job) override {
mSession->notifyCollectionsReceived(job, mCollections);
return true;
}
- bool visit(FileStore::CollectionModifyJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionModifyJob *job) override {
Q_ASSERT(!mCollections.isEmpty());
if (mCollections.count() > 1)
{
@@ -203,7 +203,7 @@ public:
return true;
}
- bool visit(FileStore::CollectionMoveJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionMoveJob *job) override {
Q_ASSERT(!mCollections.isEmpty());
if (mCollections.count() > 1)
{
@@ -215,7 +215,7 @@ public:
return true;
}
- bool visit(FileStore::StoreCompactJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::StoreCompactJob *job) override {
mSession->notifyCollectionsChanged(job, mCollections);
return true;
}
@@ -245,7 +245,7 @@ public:
public:
using JobProcessingAdaptor::visit;
- bool visit(FileStore::ItemCreateJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemCreateJob *job) override {
Q_ASSERT(!mItems.isEmpty());
if (mItems.count() > 1)
{
@@ -257,12 +257,12 @@ public:
return true;
}
- bool visit(FileStore::ItemFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemFetchJob *job) override {
mSession->notifyItemsReceived(job, mItems);
return true;
}
- bool visit(FileStore::ItemModifyJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemModifyJob *job) override {
Q_ASSERT(!mItems.isEmpty());
if (mItems.count() > 1)
{
@@ -274,7 +274,7 @@ public:
return true;
}
- bool visit(FileStore::ItemMoveJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemMoveJob *job) override {
Q_ASSERT(!mItems.isEmpty());
if (mItems.count() > 1)
{
@@ -286,7 +286,7 @@ public:
return true;
}
- bool visit(FileStore::StoreCompactJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::StoreCompactJob *job) override {
mSession->notifyItemsChanged(job, mItems);
return true;
}
diff --git a/resources/shared/filestore/abstractlocalstore.h b/resources/shared/filestore/abstractlocalstore.h
index 11b43bb..06f05a2 100644
--- a/resources/shared/filestore/abstractlocalstore.h
+++ b/resources/shared/filestore/abstractlocalstore.h
@@ -49,33 +49,33 @@ public:
virtual void setPath(const QString &path);
QString path() const;
- Collection topLevelCollection() const Q_DECL_OVERRIDE;
+ Collection topLevelCollection() const override;
- CollectionCreateJob *createCollection(const Collection &collection, const Collection &targetParent) Q_DECL_OVERRIDE;
+ CollectionCreateJob *createCollection(const Collection &collection, const Collection &targetParent) override;
- CollectionFetchJob *fetchCollections(const Collection &collection, CollectionFetchJob::Type type = CollectionFetchJob::FirstLevel) const Q_DECL_OVERRIDE;
+ CollectionFetchJob *fetchCollections(const Collection &collection, CollectionFetchJob::Type type = CollectionFetchJob::FirstLevel) const override;
- CollectionDeleteJob *deleteCollection(const Collection &collection) Q_DECL_OVERRIDE;
+ CollectionDeleteJob *deleteCollection(const Collection &collection) override;
- CollectionModifyJob *modifyCollection(const Collection &collection) Q_DECL_OVERRIDE;
+ CollectionModifyJob *modifyCollection(const Collection &collection) override;
- CollectionMoveJob *moveCollection(const Collection &collection, const Collection &targetParent) Q_DECL_OVERRIDE;
+ CollectionMoveJob *moveCollection(const Collection &collection, const Collection &targetParent) override;
- ItemFetchJob *fetchItems(const Collection &collection) const Q_DECL_OVERRIDE;
+ ItemFetchJob *fetchItems(const Collection &collection) const override;
- ItemFetchJob *fetchItems(const Item::List &items) const Q_DECL_OVERRIDE;
+ ItemFetchJob *fetchItems(const Item::List &items) const override;
- ItemFetchJob *fetchItem(const Item &item) const Q_DECL_OVERRIDE;
+ ItemFetchJob *fetchItem(const Item &item) const override;
- ItemCreateJob *createItem(const Item &item, const Collection &collection) Q_DECL_OVERRIDE;
+ ItemCreateJob *createItem(const Item &item, const Collection &collection) override;
- ItemModifyJob *modifyItem(const Item &item) Q_DECL_OVERRIDE;
+ ItemModifyJob *modifyItem(const Item &item) override;
- ItemDeleteJob *deleteItem(const Item &item) Q_DECL_OVERRIDE;
+ ItemDeleteJob *deleteItem(const Item &item) override;
- ItemMoveJob *moveItem(const Item &item, const Collection &targetParent) Q_DECL_OVERRIDE;
+ ItemMoveJob *moveItem(const Item &item, const Collection &targetParent) override;
- StoreCompactJob *compactStore() Q_DECL_OVERRIDE;
+ StoreCompactJob *compactStore() override;
protected: // job processing
virtual void processJob(Job *job) = 0;
@@ -89,7 +89,7 @@ protected: // job processing
void notifyItemsProcessed(const Item::List &items) const;
protected: // template methods
- void setTopLevelCollection(const Collection &collection) Q_DECL_OVERRIDE;
+ void setTopLevelCollection(const Collection &collection) override;
virtual void checkCollectionCreate(CollectionCreateJob *job, int &errorCode, QString &errorText) const;
diff --git a/resources/shared/filestore/autotests/abstractlocalstoretest.cpp b/resources/shared/filestore/autotests/abstractlocalstoretest.cpp
index 6fa8cfc..552ec27 100644
--- a/resources/shared/filestore/autotests/abstractlocalstoretest.cpp
+++ b/resources/shared/filestore/autotests/abstractlocalstoretest.cpp
@@ -57,10 +57,10 @@ public:
QString mErrorText;
protected:
- void processJob(Akonadi::FileStore::Job *job) Q_DECL_OVERRIDE;
+ void processJob(Akonadi::FileStore::Job *job) override;
protected:
- void setTopLevelCollection(const Collection &collection) Q_DECL_OVERRIDE {
+ void setTopLevelCollection(const Collection &collection) override {
mTopLevelCollection = collection;
Collection modifiedCollection = collection;
@@ -69,77 +69,77 @@ protected:
AbstractLocalStore::setTopLevelCollection(modifiedCollection);
}
- void checkCollectionCreate(Akonadi::FileStore::CollectionCreateJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkCollectionCreate(Akonadi::FileStore::CollectionCreateJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkCollectionDelete(Akonadi::FileStore::CollectionDeleteJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkCollectionDelete(Akonadi::FileStore::CollectionDeleteJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkCollectionFetch(Akonadi::FileStore::CollectionFetchJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkCollectionFetch(Akonadi::FileStore::CollectionFetchJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkCollectionModify(Akonadi::FileStore::CollectionModifyJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkCollectionModify(Akonadi::FileStore::CollectionModifyJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkCollectionMove(Akonadi::FileStore::CollectionMoveJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkCollectionMove(Akonadi::FileStore::CollectionMoveJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkItemCreate(Akonadi::FileStore::ItemCreateJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkItemCreate(Akonadi::FileStore::ItemCreateJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkItemDelete(Akonadi::FileStore::ItemDeleteJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkItemDelete(Akonadi::FileStore::ItemDeleteJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkItemFetch(Akonadi::FileStore::ItemFetchJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkItemFetch(Akonadi::FileStore::ItemFetchJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkItemModify(Akonadi::FileStore::ItemModifyJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkItemModify(Akonadi::FileStore::ItemModifyJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkItemMove(Akonadi::FileStore::ItemMoveJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkItemMove(Akonadi::FileStore::ItemMoveJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
errorText = mErrorText;
}
- void checkStoreCompact(Akonadi::FileStore::StoreCompactJob *job, int &errorCode, QString &errorText) const Q_DECL_OVERRIDE
+ void checkStoreCompact(Akonadi::FileStore::StoreCompactJob *job, int &errorCode, QString &errorText) const override
{
mLastCheckedJob = job;
errorCode = mErrorCode;
diff --git a/resources/shared/filestore/collectioncreatejob.h b/resources/shared/filestore/collectioncreatejob.h
index 499a46d..c5e42bf 100644
--- a/resources/shared/filestore/collectioncreatejob.h
+++ b/resources/shared/filestore/collectioncreatejob.h
@@ -48,7 +48,7 @@ public:
Collection targetParent() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleCollectionCreated(const Collection &collection);
diff --git a/resources/shared/filestore/collectiondeletejob.h b/resources/shared/filestore/collectiondeletejob.h
index 0f66c24..c019423 100644
--- a/resources/shared/filestore/collectiondeletejob.h
+++ b/resources/shared/filestore/collectiondeletejob.h
@@ -46,7 +46,7 @@ public:
Collection collection() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleCollectionDeleted(const Collection &collection);
diff --git a/resources/shared/filestore/collectionfetchjob.h b/resources/shared/filestore/collectionfetchjob.h
index 06126e7..f712ad5 100644
--- a/resources/shared/filestore/collectionfetchjob.h
+++ b/resources/shared/filestore/collectionfetchjob.h
@@ -61,7 +61,7 @@ public:
Collection::List collections() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
Q_SIGNALS:
void collectionsReceived(const Akonadi::Collection::List &items);
diff --git a/resources/shared/filestore/collectionmodifyjob.h b/resources/shared/filestore/collectionmodifyjob.h
index cd361f6..34ebb04 100644
--- a/resources/shared/filestore/collectionmodifyjob.h
+++ b/resources/shared/filestore/collectionmodifyjob.h
@@ -46,7 +46,7 @@ public:
Collection collection() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleCollectionModified(const Collection &collection);
diff --git a/resources/shared/filestore/collectionmovejob.h b/resources/shared/filestore/collectionmovejob.h
index 558573f..016136f 100644
--- a/resources/shared/filestore/collectionmovejob.h
+++ b/resources/shared/filestore/collectionmovejob.h
@@ -48,7 +48,7 @@ public:
Collection targetParent() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleCollectionMoved(const Collection &collection);
diff --git a/resources/shared/filestore/entitycompactchangeattribute.h b/resources/shared/filestore/entitycompactchangeattribute.h
index b2b5406..ec63ff6 100644
--- a/resources/shared/filestore/entitycompactchangeattribute.h
+++ b/resources/shared/filestore/entitycompactchangeattribute.h
@@ -47,13 +47,13 @@ public:
QString remoteRevision() const;
public:
- QByteArray type() const Q_DECL_OVERRIDE;
+ QByteArray type() const override;
- EntityCompactChangeAttribute *clone() const Q_DECL_OVERRIDE;
+ EntityCompactChangeAttribute *clone() const override;
- QByteArray serialized() const Q_DECL_OVERRIDE;
+ QByteArray serialized() const override;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ void deserialize(const QByteArray &data) override;
private:
//@cond PRIVATE
diff --git a/resources/shared/filestore/itemcreatejob.h b/resources/shared/filestore/itemcreatejob.h
index bf77440..6576779 100644
--- a/resources/shared/filestore/itemcreatejob.h
+++ b/resources/shared/filestore/itemcreatejob.h
@@ -48,7 +48,7 @@ public:
Item item() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleItemCreated(const Akonadi::Item &item);
diff --git a/resources/shared/filestore/itemdeletejob.h b/resources/shared/filestore/itemdeletejob.h
index 4827647..ac838b1 100644
--- a/resources/shared/filestore/itemdeletejob.h
+++ b/resources/shared/filestore/itemdeletejob.h
@@ -45,7 +45,7 @@ public:
Item item() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleItemDeleted(const Akonadi::Item &item);
diff --git a/resources/shared/filestore/itemfetchjob.h b/resources/shared/filestore/itemfetchjob.h
index 4ea405f..2898248 100644
--- a/resources/shared/filestore/itemfetchjob.h
+++ b/resources/shared/filestore/itemfetchjob.h
@@ -62,7 +62,7 @@ public:
Item::List items() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
Q_SIGNALS:
void itemsReceived(const Akonadi::Item::List &items);
diff --git a/resources/shared/filestore/itemmodifyjob.h b/resources/shared/filestore/itemmodifyjob.h
index 07dbbdf..c7a40dc 100644
--- a/resources/shared/filestore/itemmodifyjob.h
+++ b/resources/shared/filestore/itemmodifyjob.h
@@ -53,7 +53,7 @@ public:
const QSet<QByteArray> &parts() const;
void setParts(const QSet<QByteArray> &parts);
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleItemModified(const Akonadi::Item &item);
diff --git a/resources/shared/filestore/itemmovejob.h b/resources/shared/filestore/itemmovejob.h
index 94dbaca..597b232 100644
--- a/resources/shared/filestore/itemmovejob.h
+++ b/resources/shared/filestore/itemmovejob.h
@@ -49,7 +49,7 @@ public:
Item item() const;
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
private:
void handleItemMoved(const Item &item);
diff --git a/resources/shared/filestore/job.h b/resources/shared/filestore/job.h
index 588fb39..5a33717 100644
--- a/resources/shared/filestore/job.h
+++ b/resources/shared/filestore/job.h
@@ -92,7 +92,7 @@ public:
virtual ~Job();
- void start() Q_DECL_OVERRIDE;
+ void start() override;
virtual bool accept(Visitor *visitor);
diff --git a/resources/shared/filestore/sessionimpls.cpp b/resources/shared/filestore/sessionimpls.cpp
index 3e2a400..5eda080 100644
--- a/resources/shared/filestore/sessionimpls.cpp
+++ b/resources/shared/filestore/sessionimpls.cpp
@@ -41,62 +41,62 @@ using namespace Akonadi;
class AbstractEnqueueVisitor : public FileStore::Job::Visitor
{
public:
- bool visit(FileStore::Job *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::Job *job) override {
enqueue(job, "Job");
return true;
}
- bool visit(FileStore::CollectionCreateJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionCreateJob *job) override {
enqueue(job, "CollectionCreateJob");
return true;
}
- bool visit(FileStore::CollectionDeleteJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionDeleteJob *job) override {
enqueue(job, "CollectionDeleteJob");
return true;
}
- bool visit(FileStore::CollectionFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionFetchJob *job) override {
enqueue(job, "CollectionFetchJob");
return true;
}
- bool visit(FileStore::CollectionModifyJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionModifyJob *job) override {
enqueue(job, "CollectionModifyJob");
return true;
}
- bool visit(FileStore::CollectionMoveJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::CollectionMoveJob *job) override {
enqueue(job, "CollectionMoveJob");
return true;
}
- bool visit(FileStore::ItemCreateJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemCreateJob *job) override {
enqueue(job, "ItemCreateJob");
return true;
}
- bool visit(FileStore::ItemDeleteJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemDeleteJob *job) override {
enqueue(job, "ItemDeleteJob");
return true;
}
- bool visit(FileStore::ItemFetchJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemFetchJob *job) override {
enqueue(job, "ItemFetchJob");
return true;
}
- bool visit(FileStore::ItemModifyJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemModifyJob *job) override {
enqueue(job, "ItemModifyJob");
return true;
}
- bool visit(FileStore::ItemMoveJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::ItemMoveJob *job) override {
enqueue(job, "ItemMoveJob");
return true;
}
- bool visit(FileStore::StoreCompactJob *job) Q_DECL_OVERRIDE {
+ bool visit(FileStore::StoreCompactJob *job) override {
enqueue(job, "StoreCompactJob");
return true;
}
@@ -152,7 +152,7 @@ public:
QTimer mJobRunTimer;
protected:
- void enqueue(FileStore::Job *job, const char *className) Q_DECL_OVERRIDE {
+ void enqueue(FileStore::Job *job, const char *className) override {
Q_UNUSED(className);
mJobQueue.enqueue(job);
diff --git a/resources/shared/filestore/sessionimpls_p.h b/resources/shared/filestore/sessionimpls_p.h
index 4a73294..3c79941 100644
--- a/resources/shared/filestore/sessionimpls_p.h
+++ b/resources/shared/filestore/sessionimpls_p.h
@@ -39,12 +39,12 @@ public:
virtual ~FiFoQueueJobSession();
- void addJob(Job *job) Q_DECL_OVERRIDE;
+ void addJob(Job *job) override;
- void cancelAllJobs() Q_DECL_OVERRIDE;
+ void cancelAllJobs() override;
protected:
- void removeJob(Job *job) Q_DECL_OVERRIDE;
+ void removeJob(Job *job) override;
private:
class Private;
diff --git a/resources/shared/filestore/storecompactjob.h b/resources/shared/filestore/storecompactjob.h
index 34a13c9..66bc070 100644
--- a/resources/shared/filestore/storecompactjob.h
+++ b/resources/shared/filestore/storecompactjob.h
@@ -44,7 +44,7 @@ public:
virtual ~StoreCompactJob();
- bool accept(Visitor *visitor) Q_DECL_OVERRIDE;
+ bool accept(Visitor *visitor) override;
Item::List changedItems() const;
diff --git a/resources/shared/singlefileresource/collectionannotationsattribute.h b/resources/shared/singlefileresource/collectionannotationsattribute.h
index 1a621ed..0f80a63 100644
--- a/resources/shared/singlefileresource/collectionannotationsattribute.h
+++ b/resources/shared/singlefileresource/collectionannotationsattribute.h
@@ -34,10 +34,10 @@ public:
CollectionAnnotationsAttribute(const QMap<QByteArray, QByteArray> &annotations);
void setAnnotations(const QMap<QByteArray, QByteArray> &annotations);
QMap<QByteArray, QByteArray> annotations() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
QMap<QByteArray, QByteArray> mAnnotations;
diff --git a/resources/shared/singlefileresource/collectionflagsattribute.h b/resources/shared/singlefileresource/collectionflagsattribute.h
index f967fde..5fa0473 100644
--- a/resources/shared/singlefileresource/collectionflagsattribute.h
+++ b/resources/shared/singlefileresource/collectionflagsattribute.h
@@ -32,10 +32,10 @@ public:
explicit CollectionFlagsAttribute(const QList<QByteArray> &flags = QList<QByteArray>());
void setFlags(const QList<QByteArray> &flags);
QList<QByteArray> flags() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
QList<QByteArray> mFlags;
diff --git a/resources/shared/singlefileresource/createandsettagsjob.h b/resources/shared/singlefileresource/createandsettagsjob.h
index f370724..63bf331 100644
--- a/resources/shared/singlefileresource/createandsettagsjob.h
+++ b/resources/shared/singlefileresource/createandsettagsjob.h
@@ -30,7 +30,7 @@ class AKONADI_SINGLEFILERESOURCE_EXPORT CreateAndSetTagsJob : public KJob
public:
explicit CreateAndSetTagsJob(const Akonadi::Item &item, const Akonadi::Tag::List &tags, QObject *parent = nullptr);
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
void onCreateDone(KJob *);
diff --git a/resources/shared/singlefileresource/imapaclattribute.h b/resources/shared/singlefileresource/imapaclattribute.h
index ff7390c..569a0b1 100644
--- a/resources/shared/singlefileresource/imapaclattribute.h
+++ b/resources/shared/singlefileresource/imapaclattribute.h
@@ -41,10 +41,10 @@ public:
QMap<QByteArray, KIMAP::Acl::Rights> oldRights() const;
void setMyRights(KIMAP::Acl::Rights rights);
KIMAP::Acl::Rights myRights() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- ImapAclAttribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ ImapAclAttribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
bool operator==(const ImapAclAttribute &other) const;
private:
diff --git a/resources/shared/singlefileresource/imapquotaattribute.h b/resources/shared/singlefileresource/imapquotaattribute.h
index 93bb2e1..0e17a57 100644
--- a/resources/shared/singlefileresource/imapquotaattribute.h
+++ b/resources/shared/singlefileresource/imapquotaattribute.h
@@ -44,10 +44,10 @@ public:
QList< QMap<QByteArray, qint64> > limits() const;
QList< QMap<QByteArray, qint64> > usages() const;
- QByteArray type() const Q_DECL_OVERRIDE;
- Attribute *clone() const Q_DECL_OVERRIDE;
- QByteArray serialized() const Q_DECL_OVERRIDE;
- void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+ QByteArray type() const override;
+ Attribute *clone() const override;
+ QByteArray serialized() const override;
+ void deserialize(const QByteArray &data) override;
private:
QList<QByteArray> mRoots;
diff --git a/resources/shared/singlefileresource/singlefileresource.h b/resources/shared/singlefileresource/singlefileresource.h
index 2961957..e1fbc24 100644
--- a/resources/shared/singlefileresource/singlefileresource.h
+++ b/resources/shared/singlefileresource/singlefileresource.h
@@ -65,7 +65,7 @@ public:
/**
* Read changes from the backend file.
*/
- void readFile(bool taskContext = false) Q_DECL_OVERRIDE {
+ void readFile(bool taskContext = false) override {
if (KDirWatch::self()->contains(mCurrentUrl.toLocalFile()))
{
KDirWatch::self()->removeFile(mCurrentUrl.toLocalFile());
@@ -182,14 +182,14 @@ public:
}
}
- void writeFile(const QVariant &task_context) Q_DECL_OVERRIDE {
+ void writeFile(const QVariant &task_context) override {
writeFile(task_context.canConvert<bool>() &&task_context.toBool());
}
/**
* Write changes to the backend file.
*/
- void writeFile(bool taskContext = false) Q_DECL_OVERRIDE {
+ void writeFile(bool taskContext = false) override {
if (mSettings->readOnly())
{
const QString message = i18n("Trying to write to a read-only file: '%1'.", mSettings->path());
@@ -288,7 +288,7 @@ public:
}
}
- void collectionChanged(const Collection &collection) Q_DECL_OVERRIDE {
+ void collectionChanged(const Collection &collection) override {
QString newName;
if (collection.hasAttribute<EntityDisplayAttribute>())
{
@@ -304,7 +304,7 @@ public:
SingleFileResourceBase::collectionChanged(collection);
}
- Collection rootCollection() const Q_DECL_OVERRIDE
+ Collection rootCollection() const override
{
Collection c;
c.setParentCollection(Collection::root());
@@ -332,7 +332,7 @@ public Q_SLOTS:
/**
* Display the configuration dialog for the resource.
*/
- void configure(WId windowId) Q_DECL_OVERRIDE {
+ void configure(WId windowId) override {
QPointer<SingleFileResourceConfigDialog<Settings> > dlg
= new SingleFileResourceConfigDialog<Settings>(windowId, mSettings);
customizeConfigDialog(dlg);
@@ -369,13 +369,13 @@ protected:
Q_UNUSED(dlg);
}
- void retrieveCollections() Q_DECL_OVERRIDE {
+ void retrieveCollections() override {
Collection::List list;
list << rootCollection();
collectionsRetrieved(list);
}
- bool readOnly() const Q_DECL_OVERRIDE
+ bool readOnly() const override
{
return mSettings->readOnly();
}
diff --git a/resources/shared/singlefileresource/singlefileresourcebase.h b/resources/shared/singlefileresource/singlefileresourcebase.h
index 4a35690..c974fa4 100644
--- a/resources/shared/singlefileresource/singlefileresourcebase.h
+++ b/resources/shared/singlefileresource/singlefileresourcebase.h
@@ -51,7 +51,7 @@ public:
*/
void setSupportedMimetypes(const QStringList &mimeTypes, const QString &icon = QString());
- void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+ void collectionChanged(const Akonadi::Collection &collection) override;
public Q_SLOTS:
void reloadFile();
diff --git a/resources/shared/singlefileresource/singlefileresourceconfigdialog.h b/resources/shared/singlefileresource/singlefileresourceconfigdialog.h
index 3b6695f..0ee1d4d 100644
--- a/resources/shared/singlefileresource/singlefileresourceconfigdialog.h
+++ b/resources/shared/singlefileresource/singlefileresourceconfigdialog.h
@@ -48,7 +48,7 @@ public:
}
protected:
- void save() Q_DECL_OVERRIDE {
+ void save() override {
mManager->updateSettings();
mSettings->setPath(ui.kcfg_Path->url().toString());
mSettings->save();
diff --git a/resources/tomboynotes/o2/o0settingsstore.h b/resources/tomboynotes/o2/o0settingsstore.h
index b5f1524..a657897 100644
--- a/resources/tomboynotes/o2/o0settingsstore.h
+++ b/resources/tomboynotes/o2/o0settingsstore.h
@@ -25,10 +25,10 @@ public:
void setGroupKey(const QString &groupKey);
/// Get a string value for a key
- QString value(const QString &key, const QString &defaultValue = QString()) Q_DECL_OVERRIDE;
+ QString value(const QString &key, const QString &defaultValue = QString()) override;
/// Set a string value for a key
- void setValue(const QString &key, const QString &value) Q_DECL_OVERRIDE;
+ void setValue(const QString &key, const QString &value) override;
Q_SIGNALS:
// Property change signals
diff --git a/resources/tomboynotes/o2/o1.h b/resources/tomboynotes/o2/o1.h
index d9142ec..6374823 100644
--- a/resources/tomboynotes/o2/o1.h
+++ b/resources/tomboynotes/o2/o1.h
@@ -80,10 +80,10 @@ public:
public Q_SLOTS:
/// Authenticate.
- Q_INVOKABLE virtual void link() Q_DECL_OVERRIDE;
+ Q_INVOKABLE virtual void link() override;
/// De-authenticate.
- Q_INVOKABLE virtual void unlink() Q_DECL_OVERRIDE;
+ Q_INVOKABLE virtual void unlink() override;
Q_SIGNALS:
void requestTokenUrlChanged();
diff --git a/resources/tomboynotes/o2/o2.h b/resources/tomboynotes/o2/o2.h
index fb97153..1f61603 100644
--- a/resources/tomboynotes/o2/o2.h
+++ b/resources/tomboynotes/o2/o2.h
@@ -100,10 +100,10 @@ public:
public Q_SLOTS:
/// Authenticate.
- Q_INVOKABLE virtual void link() Q_DECL_OVERRIDE;
+ Q_INVOKABLE virtual void link() override;
/// De-authenticate.
- Q_INVOKABLE virtual void unlink() Q_DECL_OVERRIDE;
+ Q_INVOKABLE virtual void unlink() override;
/// Refresh token.
Q_INVOKABLE void refresh();
diff --git a/resources/tomboynotes/tomboycollectionsdownloadjob.h b/resources/tomboynotes/tomboycollectionsdownloadjob.h
index efc892b..9f11eae 100644
--- a/resources/tomboynotes/tomboycollectionsdownloadjob.h
+++ b/resources/tomboynotes/tomboycollectionsdownloadjob.h
@@ -33,7 +33,7 @@ public:
Akonadi::Collection::List collections() const;
// automatically called by KJob
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
// This will be called once the request is finished.
diff --git a/resources/tomboynotes/tomboyitemdownloadjob.h b/resources/tomboynotes/tomboyitemdownloadjob.h
index 905dbe5..3d893b9 100644
--- a/resources/tomboynotes/tomboyitemdownloadjob.h
+++ b/resources/tomboynotes/tomboyitemdownloadjob.h
@@ -32,7 +32,7 @@ public:
Akonadi::Item item() const;
// automatically called by KJob
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
// This will be called once the request is finished.
diff --git a/resources/tomboynotes/tomboyitemsdownloadjob.h b/resources/tomboynotes/tomboyitemsdownloadjob.h
index d670ede..c9e01f0 100644
--- a/resources/tomboynotes/tomboyitemsdownloadjob.h
+++ b/resources/tomboynotes/tomboyitemsdownloadjob.h
@@ -33,7 +33,7 @@ public:
Akonadi::Item::List items() const;
// automatically called by KJob
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
// This will be called once the request is finished.
diff --git a/resources/tomboynotes/tomboyitemuploadjob.h b/resources/tomboynotes/tomboyitemuploadjob.h
index 56aecf8..c150014 100644
--- a/resources/tomboynotes/tomboyitemuploadjob.h
+++ b/resources/tomboynotes/tomboyitemuploadjob.h
@@ -42,7 +42,7 @@ public:
JobType jobType() const;
// automatically called by KJob
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private Q_SLOTS:
// This will be called once the request is finished.
diff --git a/resources/tomboynotes/tomboynotesresource.h b/resources/tomboynotes/tomboynotesresource.h
index f7017af..9c6f11a 100644
--- a/resources/tomboynotes/tomboynotesresource.h
+++ b/resources/tomboynotes/tomboynotesresource.h
@@ -33,16 +33,16 @@ public:
~TomboyNotesResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
// Standard akonadi slots
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
// Slots for Job result handling
void onAuthorizationFinished(KJob *kjob);
@@ -56,12 +56,12 @@ private Q_SLOTS:
void onSslError(QNetworkReply *reply, const QList<QSslError> &errors);
protected:
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void aboutToQuit() override;
// Standard akonadi
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
private:
bool configurationNotValid() const;
diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.h b/resources/tomboynotes/tomboyserverauthenticatejob.h
index 6eba15f..5fd7e1e 100644
--- a/resources/tomboynotes/tomboyserverauthenticatejob.h
+++ b/resources/tomboynotes/tomboyserverauthenticatejob.h
@@ -37,7 +37,7 @@ public:
QString getContentUrl() const;
QString getUserURL() const;
- void start() Q_DECL_OVERRIDE;
+ void start() override;
private:
void onLinkingFailed();
diff --git a/resources/vcard/vcardresource.h b/resources/vcard/vcardresource.h
index e483c29..70adc99 100644
--- a/resources/vcard/vcardresource.h
+++ b/resources/vcard/vcardresource.h
@@ -38,22 +38,22 @@ protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void retrieveItems(const Akonadi::Collection &col) override;
protected:
/**
* Customize the configuration dialog before it is displayed.
*/
- void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<Akonadi_VCard_Resource::Settings> *dlg) Q_DECL_OVERRIDE;
+ void customizeConfigDialog(Akonadi::SingleFileResourceConfigDialog<Akonadi_VCard_Resource::Settings> *dlg) override;
- bool readFromFile(const QString &fileName) Q_DECL_OVERRIDE;
- bool writeToFile(const QString &fileName) Q_DECL_OVERRIDE;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ bool readFromFile(const QString &fileName) override;
+ bool writeToFile(const QString &fileName) override;
+ void aboutToQuit() override;
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
private:
QMap<QString, KContacts::Addressee> mAddressees;
diff --git a/resources/vcarddir/vcarddirresource.h b/resources/vcarddir/vcarddirresource.h
index 1202db9..1701e73 100644
--- a/resources/vcarddir/vcarddirresource.h
+++ b/resources/vcarddir/vcarddirresource.h
@@ -34,21 +34,21 @@ public:
~VCardDirResource();
public Q_SLOTS:
- void configure(WId windowId) Q_DECL_OVERRIDE;
- void aboutToQuit() Q_DECL_OVERRIDE;
+ void configure(WId windowId) override;
+ void aboutToQuit() override;
protected:
using ResourceBase::retrieveItems; // Suppress -Woverload-virtual
protected Q_SLOTS:
- void retrieveCollections() Q_DECL_OVERRIDE;
- void retrieveItems(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
- bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
+ void retrieveCollections() override;
+ void retrieveItems(const Akonadi::Collection &col) override;
+ bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
protected:
- void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
- void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
- void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+ void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override;
+ void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+ void itemRemoved(const Akonadi::Item &item) override;
private:
bool loadAddressees();