GIT_SILENT: When depending against qt5.7 we can use override directly

autotests/dummykernel.h

@@ -19,23 +19,23 @@ class DummyKernel : public QObject, public MailCommon::IKernel, public MailCommo
 public:
     explicit DummyKernel(QObject *parent = nullptr);
 
-    KIdentityManagement::IdentityManager *identityManager() Q_DECL_OVERRIDE;
-    MessageComposer::MessageSender *msgSender() Q_DECL_OVERRIDE;
-
-    Akonadi::EntityMimeTypeFilterModel *collectionModel() const Q_DECL_OVERRIDE;
-    KSharedConfig::Ptr config() Q_DECL_OVERRIDE;
-    void syncConfig() Q_DECL_OVERRIDE;
-    MailCommon::JobScheduler *jobScheduler() const Q_DECL_OVERRIDE;
-    Akonadi::ChangeRecorder *folderCollectionMonitor() const Q_DECL_OVERRIDE;
-    void updateSystemTray() Q_DECL_OVERRIDE;
-
-    qreal closeToQuotaThreshold() Q_DECL_OVERRIDE;
-    bool excludeImportantMailFromExpiry() Q_DECL_OVERRIDE;
-    QStringList customTemplates() Q_DECL_OVERRIDE;
-    Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
-    void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
-    bool showPopupAfterDnD() Q_DECL_OVERRIDE;
-    void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
+    KIdentityManagement::IdentityManager *identityManager() override;
+    MessageComposer::MessageSender *msgSender() override;
+
+    Akonadi::EntityMimeTypeFilterModel *collectionModel() const override;
+    KSharedConfig::Ptr config() override;
+    void syncConfig() override;
+    MailCommon::JobScheduler *jobScheduler() const override;
+    Akonadi::ChangeRecorder *folderCollectionMonitor() const override;
+    void updateSystemTray() override;
+
+    qreal closeToQuotaThreshold() override;
+    bool excludeImportantMailFromExpiry() override;
+    QStringList customTemplates() override;
+    Akonadi::Collection::Id lastSelectedFolder() override;
+    void setLastSelectedFolder(Akonadi::Collection::Id col) override;
+    bool showPopupAfterDnD() override;
+    void expunge(Akonadi::Collection::Id col, bool sync) override;
 
 private:
     KIdentityManagement::IdentityManager *mIdentityManager;

src/collectionpage/attributes/expirecollectionattribute.h

@@ -48,10 +48,10 @@ public:
         ExpireMove
     };
 
-    QByteArray type() const Q_DECL_OVERRIDE;
-    ExpireCollectionAttribute *clone() const Q_DECL_OVERRIDE;
-    QByteArray serialized() const Q_DECL_OVERRIDE;
-    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+    QByteArray type() const override;
+    ExpireCollectionAttribute *clone() const override;
+    QByteArray serialized() const override;
+    void deserialize(const QByteArray &data) override;
 
     void daysToExpire(int &unreadDays, int &readDays);
 

src/collectionpage/collectionexpirypage.h

@@ -42,9 +42,9 @@ public:
     explicit CollectionExpiryPage(QWidget *parent = nullptr);
     ~CollectionExpiryPage();
 
-    bool canHandle(const Akonadi::Collection &col) const Q_DECL_OVERRIDE;
-    void load(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
-    void save(Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+    bool canHandle(const Akonadi::Collection &col) const override;
+    void load(const Akonadi::Collection &collection) override;
+    void save(Akonadi::Collection &collection) override;
 
 protected:
     void init();

src/collectionpage/collectiongeneralpage.h

@@ -45,8 +45,8 @@ public:
     explicit CollectionGeneralPage(QWidget *parent = nullptr);
     ~CollectionGeneralPage();
 
-    void load(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
-    void save(Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+    void load(const Akonadi::Collection &collection) override;
+    void save(Akonadi::Collection &collection) override;
 
 protected:
     void init(const Akonadi::Collection &);

src/filter/autotests/filteractionwithaddresstest.cpp

@@ -28,12 +28,12 @@ public:
     {
     }
 
-    FilterAction::ReturnCode process(MailCommon::ItemContext &, bool) const Q_DECL_OVERRIDE
+    FilterAction::ReturnCode process(MailCommon::ItemContext &, bool) const override
     {
         return GoOn;
     }
 
-    MailCommon::SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE
+    MailCommon::SearchRule::RequiredPart requiredPart() const override
     {
         return MailCommon::SearchRule::CompleteMessage;
     }

src/filter/autotests/filteractionwithurltest.cpp

@@ -29,12 +29,12 @@ public:
     {
     }
 
-    FilterAction::ReturnCode process(MailCommon::ItemContext &, bool) const Q_DECL_OVERRIDE
+    FilterAction::ReturnCode process(MailCommon::ItemContext &, bool) const override
     {
         return GoOn;
     }
 
-    MailCommon::SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE
+    MailCommon::SearchRule::RequiredPart requiredPart() const override
     {
         return MailCommon::SearchRule::CompleteMessage;
     }

src/filter/filteractions/filteractionaddheader.h

@@ -32,26 +32,26 @@ class FilterActionAddHeader : public FilterActionWithStringList
     Q_OBJECT
 public:
     explicit FilterActionAddHeader(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    void setParamWidgetValue(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    void applyParamWidgetValue(QWidget *paramWidget) Q_DECL_OVERRIDE;
-    void clearParamWidget(QWidget *paramWidget) const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    void setParamWidgetValue(QWidget *paramWidget) const override;
+    void applyParamWidgetValue(QWidget *paramWidget) override;
+    void clearParamWidget(QWidget *paramWidget) const override;
 
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    SearchRule::RequiredPart requiredPart() const override;
 
-    QString argsAsString() const Q_DECL_OVERRIDE;
-    void argsFromString(const QString &argsStr) Q_DECL_OVERRIDE;
+    QString argsAsString() const override;
+    void argsFromString(const QString &argsStr) override;
 
-    QString displayString() const Q_DECL_OVERRIDE;
+    QString displayString() const override;
 
     static FilterAction *newAction();
 
-    QStringList sieveRequires() const Q_DECL_OVERRIDE;
-    QString sieveCode() const Q_DECL_OVERRIDE;
+    QStringList sieveRequires() const override;
+    QString sieveCode() const override;
 
-    bool isEmpty() const Q_DECL_OVERRIDE;
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    bool isEmpty() const override;
+    QString informationAboutNotValidAction() const override;
 private:
     QString mValue;
 };

src/filter/filteractions/filteractionaddtag.h

@@ -36,24 +36,24 @@ class FilterActionAddTag : public FilterAction
     Q_OBJECT
 public:
     explicit FilterActionAddTag(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
 
     static FilterAction *newAction();
 
-    bool isEmpty() const Q_DECL_OVERRIDE;
+    bool isEmpty() const override;
 
-    void argsFromString(const QString &argsStr) Q_DECL_OVERRIDE;
-    QString argsAsString() const Q_DECL_OVERRIDE;
-    QString displayString() const Q_DECL_OVERRIDE;
-    bool argsFromStringInteractive(const QString &argsStr, const QString &filterName) Q_DECL_OVERRIDE;
+    void argsFromString(const QString &argsStr) override;
+    QString argsAsString() const override;
+    QString displayString() const override;
+    bool argsFromStringInteractive(const QString &argsStr, const QString &filterName) override;
 
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    void applyParamWidgetValue(QWidget *paramWidget) Q_DECL_OVERRIDE;
-    void setParamWidgetValue(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    void clearParamWidget(QWidget *paramWidget) const Q_DECL_OVERRIDE;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    void applyParamWidgetValue(QWidget *paramWidget) override;
+    void setParamWidgetValue(QWidget *paramWidget) const override;
+    void clearParamWidget(QWidget *paramWidget) const override;
 
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 private Q_SLOTS:
     void slotTagListingFinished();
 

src/filter/filteractions/filteractionaddtoaddressbook.h

@@ -32,22 +32,22 @@ class FilterActionAddToAddressBook : public FilterActionWithStringList
     Q_OBJECT
 public:
     explicit FilterActionAddToAddressBook(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
     static FilterAction *newAction();
 
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    SearchRule::RequiredPart requiredPart() const override;
 
-    bool isEmpty() const Q_DECL_OVERRIDE;
+    bool isEmpty() const override;
 
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    void setParamWidgetValue(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    void applyParamWidgetValue(QWidget *paramWidget) Q_DECL_OVERRIDE;
-    void clearParamWidget(QWidget *paramWidget) const Q_DECL_OVERRIDE;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    void setParamWidgetValue(QWidget *paramWidget) const override;
+    void applyParamWidgetValue(QWidget *paramWidget) override;
+    void clearParamWidget(QWidget *paramWidget) const override;
 
-    QString argsAsString() const Q_DECL_OVERRIDE;
-    void argsFromString(const QString &argsStr) Q_DECL_OVERRIDE;
+    QString argsAsString() const override;
+    void argsFromString(const QString &argsStr) override;
 
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 private:
     enum HeaderType {
         FromHeader,

src/filter/filteractions/filteractioncopy.h

@@ -34,12 +34,12 @@ class FilterActionCopy : public FilterActionWithFolder
     Q_OBJECT
 public:
     explicit FilterActionCopy(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QString sieveCode() const Q_DECL_OVERRIDE;
-    QStringList sieveRequires() const Q_DECL_OVERRIDE;
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString sieveCode() const override;
+    QStringList sieveRequires() const override;
+    QString informationAboutNotValidAction() const override;
 
 protected Q_SLOTS:
     void jobFinished(KJob *job);

src/filter/filteractions/filteractiondelete.h

@@ -31,11 +31,11 @@ class FilterActionDelete : public FilterActionWithNone
     Q_OBJECT
 public:
     explicit FilterActionDelete(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    QString sieveCode() const Q_DECL_OVERRIDE;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    QString sieveCode() const override;
 };
 }
 

src/filter/filteractions/filteractionexec.h

@@ -32,10 +32,10 @@ class FilterActionExec : public FilterActionWithCommand
     Q_OBJECT
 public:
     explicit FilterActionExec(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 };
 }
 

src/filter/filteractions/filteractionforward.h

@@ -33,18 +33,18 @@ class FilterActionForward : public FilterActionWithAddress
 public:
     explicit FilterActionForward(QObject *parent = nullptr);
     static FilterAction *newAction();
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    void applyParamWidgetValue(QWidget *paramWidget) Q_DECL_OVERRIDE;
-    void setParamWidgetValue(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    void clearParamWidget(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    void argsFromString(const QString &argsStr) Q_DECL_OVERRIDE;
-    QString argsAsString() const Q_DECL_OVERRIDE;
-    QString displayString() const Q_DECL_OVERRIDE;
-    bool argsFromStringInteractive(const QString &argsStr, const QString &filterName) Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    void applyParamWidgetValue(QWidget *paramWidget) override;
+    void setParamWidgetValue(QWidget *paramWidget) const override;
+    void clearParamWidget(QWidget *paramWidget) const override;
+    void argsFromString(const QString &argsStr) override;
+    QString argsAsString() const override;
+    QString displayString() const override;
+    bool argsFromStringInteractive(const QString &argsStr, const QString &filterName) override;
 
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 private:
     mutable QString mTemplate;
 };

src/filter/filteractions/filteractionmove.h

@@ -32,13 +32,13 @@ class FilterActionMove : public FilterActionWithFolder
     Q_OBJECT
 public:
     explicit FilterActionMove(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QString sieveCode() const Q_DECL_OVERRIDE;
-    QStringList sieveRequires() const Q_DECL_OVERRIDE;
+    QString sieveCode() const override;
+    QStringList sieveRequires() const override;
 
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 };
 }
 

src/filter/filteractions/filteractionpipethrough.h

@@ -33,10 +33,10 @@ class FilterActionPipeThrough : public FilterActionWithCommand
     Q_OBJECT
 public:
     explicit FilterActionPipeThrough(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 };
 }
 

src/filter/filteractions/filteractionplaysound.h

@@ -37,13 +37,13 @@ class FilterActionPlaySound : public FilterActionWithTest
 public:
     FilterActionPlaySound();
     ~FilterActionPlaySound();
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    bool argsFromStringInteractive(const QString &argsStr, const QString &filterName) Q_DECL_OVERRIDE;
+    bool argsFromStringInteractive(const QString &argsStr, const QString &filterName) override;
 
-    bool isEmpty() const Q_DECL_OVERRIDE;
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    bool isEmpty() const override;
+    QString informationAboutNotValidAction() const override;
 private:
     mutable Phonon::MediaObject *mPlayer;
 };

src/filter/filteractions/filteractionredirect.h

@@ -32,11 +32,11 @@ class FilterActionRedirect : public FilterActionWithAddress
     Q_OBJECT
 public:
     explicit FilterActionRedirect(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QString sieveCode() const Q_DECL_OVERRIDE;
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString sieveCode() const override;
+    QString informationAboutNotValidAction() const override;
 };
 }
 

src/filter/filteractions/filteractionremoveheader.h

@@ -32,15 +32,15 @@ class FilterActionRemoveHeader : public FilterActionWithStringList
     Q_OBJECT
 public:
     explicit FilterActionRemoveHeader(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    void setParamWidgetValue(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    QStringList sieveRequires() const Q_DECL_OVERRIDE;
-    QString sieveCode() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    void setParamWidgetValue(QWidget *paramWidget) const override;
+    QStringList sieveRequires() const override;
+    QString sieveCode() const override;
 
     static FilterAction *newAction();
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 };
 }
 

src/filter/filteractions/filteractionreplyto.h

@@ -32,10 +32,10 @@ class FilterActionReplyTo : public FilterActionWithAddress
     Q_OBJECT
 public:
     explicit FilterActionReplyTo(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
     static FilterAction *newAction();
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    QString informationAboutNotValidAction() const override;
 };
 }
 

src/filter/filteractions/filteractionrewriteheader.h

@@ -34,22 +34,22 @@ class FilterActionRewriteHeader : public FilterActionWithStringList
     Q_OBJECT
 public:
     explicit FilterActionRewriteHeader(QObject *parent = nullptr);
-    ReturnCode process(ItemContext &context, bool applyOnOutbound) const Q_DECL_OVERRIDE;
-    SearchRule::RequiredPart requiredPart() const Q_DECL_OVERRIDE;
-    QWidget *createParamWidget(QWidget *parent) const Q_DECL_OVERRIDE;
-    void setParamWidgetValue(QWidget *paramWidget) const Q_DECL_OVERRIDE;
-    void applyParamWidgetValue(QWidget *paramWidget) Q_DECL_OVERRIDE;
-    void clearParamWidget(QWidget *paramWidget) const Q_DECL_OVERRIDE;
+    ReturnCode process(ItemContext &context, bool applyOnOutbound) const override;
+    SearchRule::RequiredPart requiredPart() const override;
+    QWidget *createParamWidget(QWidget *parent) const override;
+    void setParamWidgetValue(QWidget *paramWidget) const override;
+    void applyParamWidgetValue(QWidget *paramWidget) override;
+    void clearParamWidget(QWidget *paramWidget) const override;
 
-    QString argsAsString() const Q_DECL_OVERRIDE;
-    void argsFromString(const QString &argsStr) Q_DECL_OVERRIDE;
+    QString argsAsString() const override;
+    void argsFromString(const QString &argsStr) override;
 
-    QString displayString() const Q_DECL_OVERRIDE;
+    QString displayString() const override;
 
     static FilterAction *newAction();
 
-    bool isEmpty() const Q_DECL_OVERRIDE;
-    QString informationAboutNotValidAction() const Q_DECL_OVERRIDE;
+    bool isEmpty() const override;
+    QString informationAboutNotValidAction() const override;
 
 private:
     QRegExp mRegExp;