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

kcm/kcmakonadicontactactions.h

@@ -35,9 +35,9 @@ class KCMAkonadiContactActions : public KCModule
 public:
     KCMAkonadiContactActions(QWidget *parent, const QVariantList &args);
 
-    void load() Q_DECL_OVERRIDE;
-    void save() Q_DECL_OVERRIDE;
-    void defaults() Q_DECL_OVERRIDE;
+    void load() override;
+    void save() override;
+    void defaults() override;
 
 private Q_SLOTS:
     void slotDialPhoneNumberActionChanged(int);

src/actions/qekigadialer.h

@@ -30,8 +30,8 @@ public:
     explicit QEkigaDialer(const QString &applicationName);
     ~QEkigaDialer();
 
-    bool dialNumber(const QString &number) Q_DECL_OVERRIDE;
-    bool sendSms(const QString &number, const QString &text) Q_DECL_OVERRIDE;
+    bool dialNumber(const QString &number) override;
+    bool sendSms(const QString &number, const QString &text) override;
 private:
     bool initializeEkiga();
     QDBusInterface *mInterface;

src/actions/qsflphonedialer.h

@@ -29,8 +29,8 @@ public:
     explicit QSflPhoneDialer(const QString &applicationName);
     ~QSflPhoneDialer();
 
-    bool dialNumber(const QString &number) Q_DECL_OVERRIDE;
-    bool sendSms(const QString &number, const QString &text) Q_DECL_OVERRIDE;
+    bool dialNumber(const QString &number) override;
+    bool sendSms(const QString &number, const QString &text) override;
 
 private:
     bool initializeSflPhone();

src/actions/qskypedialer.h

@@ -34,8 +34,8 @@ public:
     explicit QSkypeDialer(const QString &applicationName);
     ~QSkypeDialer();
 
-    bool dialNumber(const QString &number) Q_DECL_OVERRIDE;
-    bool sendSms(const QString &number, const QString &text) Q_DECL_OVERRIDE;
+    bool dialNumber(const QString &number) override;
+    bool sendSms(const QString &number, const QString &text) override;
 
 private:
     bool initializeSkype();

src/attributes/contactmetadataattribute_p.h

@@ -59,10 +59,10 @@ public:
      */
     QVariantMap metaData() 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:
     //@cond PRIVATE

src/collectionfiltermodel_p.h

@@ -70,7 +70,7 @@ public:
     void setRightsFilter(Akonadi::Collection::Rights rights);
 
 protected:
-    bool filterAcceptsRow(int row, const QModelIndex &parent) const Q_DECL_OVERRIDE;
+    bool filterAcceptsRow(int row, const QModelIndex &parent) const override;
 
 private:
     QSet<QString> mContentMimeTypes;

src/contactcompletionmodel_p.h

@@ -41,10 +41,10 @@ public:
     explicit ContactCompletionModel(Monitor *monitor, QObject *parent = nullptr);
     virtual ~ContactCompletionModel();
 
-    QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    QVariant entityData(const Collection &collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE;
-    int entityColumnCount(HeaderGroup) const Q_DECL_OVERRIDE;
+    QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const override;
+    QVariant entityData(const Collection &collection, int column, int role = Qt::DisplayRole) const override;
+    int columnCount(const QModelIndex &parent) const override;
+    int entityColumnCount(HeaderGroup) const override;
 
     static QAbstractItemModel *self();
 

src/contacteditordialog.h

@@ -157,7 +157,7 @@ Q_SIGNALS:
     void error(const QString &errMsg);
 
 public Q_SLOTS:
-    void accept() Q_DECL_OVERRIDE;
+    void accept() override;
 
 private:
     //@cond PRIVATE

src/contactgroupeditordelegate.cpp

@@ -50,7 +50,7 @@ public:
     }
 
 protected:
-    bool filterAcceptsRow(int row, const QModelIndex &parent) const Q_DECL_OVERRIDE
+    bool filterAcceptsRow(int row, const QModelIndex &parent) const override
     {
         const QModelIndex index = sourceModel()->index(row, Akonadi::ContactCompletionModel::EmailColumn, parent);
         if (!index.isValid()) {

src/contactgroupeditordelegate_p.h

@@ -63,16 +63,16 @@ public:
     explicit ContactGroupEditorDelegate(QAbstractItemView *view, QObject *parent = nullptr);
     ~ContactGroupEditorDelegate();
 
-    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
-    void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const override;
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
-    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
+    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
 
 private Q_SLOTS:
     void completed(QWidget *widget);

src/contactgroupmodel_p.h

@@ -47,16 +47,16 @@ public:
 
     QString lastErrorMessage() const;
 
-    QModelIndex index(int row, int col, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
-    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
+    QModelIndex index(int row, int col, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
 
 private:
     class Private;

src/contactgroupviewer.h

@@ -106,13 +106,13 @@ private:
     /**
      * This method is called whenever the displayed contact @p group has been changed.
      */
-    void itemChanged(const Item &group) Q_DECL_OVERRIDE;
+    void itemChanged(const Item &group) override;
 
     /**
      * This method is called whenever the displayed contact group has been
      * removed from Akonadi.
      */
-    void itemRemoved() Q_DECL_OVERRIDE;
+    void itemRemoved() override;
 
 private:
     //@cond PRIVATE

src/contactsfilterproxymodel.h

@@ -89,7 +89,7 @@ public:
     */
     void setFilterFlags(ContactsFilterProxyModel::FilterFlags flags);
 
-    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
 
     /**
      * Sets whether we want virtual collections to be filtered or not.
@@ -110,8 +110,8 @@ public Q_SLOTS:
 
 protected:
     //@cond PRIVATE
-    bool filterAcceptsRow(int row, const QModelIndex &parent) const Q_DECL_OVERRIDE;
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
+    bool filterAcceptsRow(int row, const QModelIndex &parent) const override;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
     //@endcond
 
 private:

src/contactstreemodel.h

@@ -188,10 +188,10 @@ public:
     Columns columns() const;
 
     //@cond PRIVATE
-    QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    QVariant entityData(const Collection &collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
-    int entityColumnCount(HeaderGroup headerGroup) const Q_DECL_OVERRIDE;
+    QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const override;
+    QVariant entityData(const Collection &collection, int column, int role = Qt::DisplayRole) const override;
+    QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const override;
+    int entityColumnCount(HeaderGroup headerGroup) const override;
     //@endcond
 
 private:

src/contactviewer.h

@@ -183,13 +183,13 @@ private:
     /**
      * This method is called whenever the displayed contact has been changed.
      */
-    void itemChanged(const Item &contact) Q_DECL_OVERRIDE;
+    void itemChanged(const Item &contact) override;
 
     /**
      * This method is called whenever the displayed contact has been
      * removed from Akonadi.
      */
-    void itemRemoved() Q_DECL_OVERRIDE;
+    void itemRemoved() override;
 
 private:
     //@cond PRIVATE

src/editor/addresseditor/webengine/addresseslocationenginepage.h

@@ -37,7 +37,7 @@ Q_SIGNALS:
     void urlClicked(const QUrl &url);
 
 protected:
-    bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) Q_DECL_OVERRIDE;
+    bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) override;
 };
 }
 

src/editor/contacteditorwidget.h

@@ -60,19 +60,19 @@ public:
      * Initializes the fields of the contact editor
      * with the values from a @p contact.
      */
-    void loadContact(const KContacts::Addressee &contact, const Akonadi::ContactMetaDataBase &metaData) Q_DECL_OVERRIDE;
+    void loadContact(const KContacts::Addressee &contact, const Akonadi::ContactMetaDataBase &metaData) override;
 
     /**
      * Stores back the fields of the contact editor
      * into the given @p contact.
      */
-    void storeContact(KContacts::Addressee &contact, Akonadi::ContactMetaDataBase &metaData) const Q_DECL_OVERRIDE;
+    void storeContact(KContacts::Addressee &contact, Akonadi::ContactMetaDataBase &metaData) const override;
 
     /**
      * Sets whether the contact in the editor allows
      * the user to edit the contact or not.
      */
-    void setReadOnly(bool readOnly) Q_DECL_OVERRIDE;
+    void setReadOnly(bool readOnly) override;
 
 private:
     class Private;

src/editor/customfieldeditor/customfieldslistdelegate.h

@@ -33,13 +33,13 @@ public:
     explicit CustomFieldsListDelegate(QAbstractItemView *view, QObject *parent = nullptr);
     ~CustomFieldsListDelegate();
 
-    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
-    void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE;
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
-    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const override;
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
 
 private:
     void setFirstColumnAsCurrent();

src/editor/customfieldeditor/customfieldsmodel.h

@@ -41,17 +41,17 @@ public:
     void setCustomFields(const CustomField::List &addresses);
     CustomField::List customFields() const;
 
-    QModelIndex index(int row, int col, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
-    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-
-    bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
+    QModelIndex index(int row, int col, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
 
 private:
     CustomField::List mCustomFields;

src/editor/generalinfoeditor/displaynameeditwidget.cpp

@@ -80,7 +80,7 @@ public:
         return mMaxDescriptionWidth;
     }
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
         QStyledItemDelegate::paint(painter, option, index);
         const QRect rect(option.rect.width() - mMaxDescriptionWidth, option.rect.y(), mMaxDescriptionWidth, option.rect.height());
@@ -97,7 +97,7 @@ public:
         painter->restore();
     }
 
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
         QSize size = QStyledItemDelegate::sizeHint(option, index);
         size.setWidth(size.width() + mMaxDescriptionWidth);

src/editor/generalinfoeditor/displaynameeditwidget.h

@@ -67,7 +67,7 @@ public Q_SLOTS:
     void changeOrganization(const QString &organization);
 
 protected:
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
 
 private:
     void displayTypeChanged(int);

src/editor/generalinfoeditor/mail/mailwidgetlister.h

@@ -42,7 +42,7 @@ public:
     void storeContact(KContacts::Addressee &contact) const;
 
 protected:
-    QWidget *createWidget(QWidget *) Q_DECL_OVERRIDE;
+    QWidget *createWidget(QWidget *) override;
 
 private Q_SLOTS:
     void slotAddWidget(MailWidget *w);

src/editor/generalinfoeditor/messaging/messagingwidgetlister.h

@@ -42,7 +42,7 @@ public:
     void storeContact(KContacts::Addressee &contact) const;
 
 protected:
-    QWidget *createWidget(QWidget *) Q_DECL_OVERRIDE;
+    QWidget *createWidget(QWidget *) override;
 
 private Q_SLOTS:
     void slotAddWidget(MessagingWidget *w);

src/editor/generalinfoeditor/phone/phonewidgetlister.h

@@ -43,7 +43,7 @@ public:
     void storeContact(KContacts::Addressee &contact) const;
 
 protected:
-    QWidget *createWidget(QWidget *) Q_DECL_OVERRIDE;
+    QWidget *createWidget(QWidget *) override;
 
 private Q_SLOTS:
     void slotAddWidget(PhoneWidget *w);

src/editor/generalinfoeditor/web/webwidgetlister.h

@@ -41,7 +41,7 @@ public:
     void loadContact(const KContacts::Addressee &contact);
     void storeContact(KContacts::Addressee &contact) const;
 protected:
-    QWidget *createWidget(QWidget *) Q_DECL_OVERRIDE;
+    QWidget *createWidget(QWidget *) override;
 
 private Q_SLOTS:
     void slotAddWidget(WebWidget *w);

src/editor/personaleditor/dateeditwidget.h

@@ -42,7 +42,7 @@ Q_SIGNALS:
     void resetDate();
 
 protected:
-    void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *event) override;
 
 private Q_SLOTS:
     void emitSignal();

src/editor/personaleditor/kdatepickerpopup.cpp

@@ -38,12 +38,12 @@ public:
     }
 
 protected:
-    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE {
+    QWidget *createWidget(QWidget *parent) override {
         mDatePicker->setParent(parent);
         return mDatePicker;
     }
 
-    void deleteWidget(QWidget *widget) Q_DECL_OVERRIDE {
+    void deleteWidget(QWidget *widget) override {
         if (widget != mDatePicker)
         {
             return;

src/editor/widgets/akonadicontactcombobox.h

@@ -34,7 +34,7 @@ public:
     ~AkonadiContactComboBox();
 
 protected:
-    QSize minimumSizeHint() const Q_DECL_OVERRIDE;
+    QSize minimumSizeHint() const override;
 };
 }
 #endif // AKONADICONTACTCOMBOBOX_H

src/editor/widgets/imagewidget.h

@@ -54,15 +54,15 @@ public:
 
 protected:
     // image drop handling
-    void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
-    void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
 
     // image drag handling
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
 
     // context menu handling
-    void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *event) override;
 
 private:
     void updateView();

src/emailaddressselectionproxymodel_p.h

@@ -43,24 +43,24 @@ public:
     explicit EmailAddressSelectionProxyModel(QObject *parent = nullptr);
     ~EmailAddressSelectionProxyModel();
 
-    QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const override;
 
 protected:
     /**
      * This method is called to retrieve the row count for the given leaf @p index.
      */
-    int leafRowCount(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    int leafRowCount(const QModelIndex &index) const override;
 
     /**
      * This methid is called to retrieve the column count for the given leaf @p index.
      */
-    int leafColumnCount(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    int leafColumnCount(const QModelIndex &index) const override;
 
     /**
      * This methid is called to retrieve the data of the child of the given leaf @p index
      * at @p row and @p column with the given @p role.
      */
-    QVariant leafData(const QModelIndex &index, int row, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    QVariant leafData(const QModelIndex &index, int row, int column, int role = Qt::DisplayRole) const override;
 
 private:
 };

src/emailaddressselectionwidget.cpp

@@ -63,7 +63,7 @@ public:
     }
 
 protected:
-    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE {
+    void keyPressEvent(QKeyEvent *event) override {
         if (event->key() == Qt::Key_Down)
         {
             QMetaObject::invokeMethod(mReceiver, "setFocus");

src/job/contactgroupexpandjob.h

@@ -98,7 +98,7 @@ public:
     /**
      * Starts the expand job.
      */
-    void start() Q_DECL_OVERRIDE;
+    void start() override;
 
 private:
     //@cond PRIVATE

src/leafextensionproxymodel_p.h

@@ -36,19 +36,19 @@ public:
     explicit LeafExtensionProxyModel(QObject *parent = nullptr);
     ~LeafExtensionProxyModel();
 
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex &index) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex &index) const Q_DECL_OVERRIDE;
-
-    QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
-    bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::EditRole) Q_DECL_OVERRIDE;
-    bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex buddy(const QModelIndex &index) const Q_DECL_OVERRIDE;
-    void fetchMore(const QModelIndex &index) Q_DECL_OVERRIDE;
-
-    void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    int rowCount(const QModelIndex &index) const override;
+    int columnCount(const QModelIndex &index) const override;
+
+    QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::EditRole) override;
+    bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex buddy(const QModelIndex &index) const override;
+    void fetchMore(const QModelIndex &index) override;
+
+    void setSourceModel(QAbstractItemModel *sourceModel) override;
 
 protected:
     /**

src/standardcontactformatter.h

@@ -67,7 +67,7 @@ public:
     /**
      * Returns the contact formatted as HTML.
      */
-    QString toHtml(HtmlForm form = SelfcontainedForm) const Q_DECL_OVERRIDE;
+    QString toHtml(HtmlForm form = SelfcontainedForm) const override;
 
     /*
      * @since 4.9.1

src/standardcontactgroupformatter.h

@@ -67,7 +67,7 @@ public:
     /**
      * Returns the contact group formatted as HTML.
      */
-    QString toHtml(HtmlForm form = SelfcontainedForm) const Q_DECL_OVERRIDE;
+    QString toHtml(HtmlForm form = SelfcontainedForm) const override;
 
 private:
     //@cond PRIVATE

src/textbrowser_p.h

@@ -41,7 +41,7 @@ private Q_SLOTS:
     void slotCopyData();
 protected:
 #ifndef QT_NO_CONTEXTMENU
-    void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *event) override;
 #endif
 private:
     QVariant mDataToCopy;

src/waitingoverlay_p.h

@@ -44,7 +44,7 @@ public:
     ~WaitingOverlay();
 
 protected:
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
 
 private:
     void reposition();