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

src/iconsidepane.cpp

@@ -57,13 +57,13 @@ public:
     }
 
 public Q_SLOTS:
-    void clear() Q_DECL_OVERRIDE {
+    void clear() override {
         // Don't allow the current selection to be cleared. QListView doesn't call to this method
         // nowadays, but just to cover of future change of implementation, since QTreeView does call
         // to this one when clearing the selection.
     }
 
-    void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE {
+    void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) override {
         // Don't allow the current selection to be cleared
         if (!index.isValid() && (command & QItemSelectionModel::Clear))
         {
@@ -73,7 +73,7 @@ public Q_SLOTS:
     }
 
     void select(const QItemSelection &selection,
-                QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE {
+                QItemSelectionModel::SelectionFlags command) override {
         // Don't allow the current selection to be cleared
         if (!selection.count() && (command & QItemSelectionModel::Clear))
         {
@@ -107,7 +107,7 @@ public:
         pluginList = list;
     }
 
-    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE
+    Qt::ItemFlags flags(const QModelIndex &index) const override
     {
         Qt::ItemFlags flags = QStringListModel::flags(index);
 
@@ -129,7 +129,7 @@ public:
     }
 
     QModelIndex index(int row, int column,
-                      const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE
+                      const QModelIndex &parent = QModelIndex()) const override
     {
         Q_UNUSED(parent);
         if (row < 0 || row >= pluginList.count()) {
@@ -138,7 +138,7 @@ public:
         return createIndex(row, column, pluginList[row]);
     }
 
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
     {
         if (!index.isValid() || !index.internalPointer()) {
             return QVariant();
@@ -183,7 +183,7 @@ public:
         sort(0);
     }
 protected:
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override
     {
         KontactInterface::Plugin *leftPlugin =
             static_cast<KontactInterface::Plugin *>(left.internalPointer());
@@ -210,7 +210,7 @@ public:
     }
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
-               const QModelIndex &index) const Q_DECL_OVERRIDE
+               const QModelIndex &index) const override
     {
         if (!index.isValid() || !index.internalPointer()) {
             return;
@@ -223,7 +223,7 @@ public:
         QStyledItemDelegate::paint(painter, optionCopy, index);
     }
 
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
         if (!index.isValid() || !index.internalPointer()) {
             return QSize();

src/iconsidepane.h

@@ -66,16 +66,16 @@ public:
         return mShowText;
     }
 
-    QSize sizeHint() const Q_DECL_OVERRIDE;
+    QSize sizeHint() const override;
 
 Q_SIGNALS:
     void pluginActivated(KontactInterface::Plugin *plugin);
 
 protected:
-    void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
-    void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
-    void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
-    void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dragMoveEvent(QDragMoveEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
+    void showEvent(QShowEvent *event) override;
 
 private Q_SLOTS:
     void slotCurrentChanged(const QModelIndex &current);
@@ -107,13 +107,13 @@ public:
     IconSidePane(KontactInterface::Core *core, QWidget *parent);
     ~IconSidePane();
 
-    void setCurrentPlugin(const QString &plugin) Q_DECL_OVERRIDE;
+    void setCurrentPlugin(const QString &plugin) override;
 
 public Q_SLOTS:
-    void updatePlugins() Q_DECL_OVERRIDE;
+    void updatePlugins() override;
 
 protected:
-    void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent *event) override;
 
 private:
     Navigator *mNavigator;

src/kcmkontact.h

@@ -40,7 +40,7 @@ class KcmKontact : public KPrefsModule
 public:
     explicit KcmKontact(QWidget *parent = nullptr);
 
-    const KAboutData *aboutData() const Q_DECL_OVERRIDE;
+    const KAboutData *aboutData() const override;
 };
 
 class PluginSelection : public KPrefsWid
@@ -51,10 +51,10 @@ public:
     PluginSelection(KConfigSkeleton::ItemString *item, QWidget *parent);
     ~PluginSelection();
 
-    void readConfig() Q_DECL_OVERRIDE;
-    void writeConfig() Q_DECL_OVERRIDE;
+    void readConfig() override;
+    void writeConfig() override;
 
-    QList<QWidget *> widgets() const Q_DECL_OVERRIDE;
+    QList<QWidget *> widgets() const override;
     KComboBox *comboBox() const;
 
 private:

src/main.cpp

@@ -60,7 +60,7 @@ public:
     }
     ~KontactApp() {}
 
-    int activate(const QStringList &arguments, const QString &workingDir) Q_DECL_OVERRIDE;
+    int activate(const QStringList &arguments, const QString &workingDir) override;
 
     void setMainWindow(MainWindow *window)
     {

src/mainwindow.cpp

@@ -95,7 +95,7 @@ public:
     virtual int startServiceFor(const QString &serviceType,
                                 const QString &constraint = QString(),
                                 QString *error = nullptr, QString *dbusService = nullptr,
-                                int flags = 0) Q_DECL_OVERRIDE;
+                                int flags = 0) override;
 
     // We need to keep track of the plugins which are loaded, so pass a pointer
     // to the plugin list here. Be sure to reset it back to 0 with

src/mainwindow.h

@@ -55,7 +55,7 @@ public:
     MainWindow();
     ~MainWindow();
 
-    PluginList pluginList() const Q_DECL_OVERRIDE
+    PluginList pluginList() const override
     {
         return mPlugins;
     }
@@ -66,8 +66,8 @@ public:
                                      const KontactInterface::Plugin *right);
 
 public Q_SLOTS:
-    void selectPlugin(KontactInterface::Plugin *plugin) Q_DECL_OVERRIDE;
-    Q_SCRIPTABLE void selectPlugin(const QString &pluginName) Q_DECL_OVERRIDE;
+    void selectPlugin(KontactInterface::Plugin *plugin) override;
+    Q_SCRIPTABLE void selectPlugin(const QString &pluginName) override;
     void slotActionTriggered();
 
     void updateConfig();
@@ -100,11 +100,11 @@ private:
     void updateShortcuts();
     bool removePlugin(const KPluginInfo &);
     void addPlugin(KontactInterface::Plugin *plugin);
-    void partLoaded(KontactInterface::Plugin *plugin, KParts::ReadOnlyPart *part) Q_DECL_OVERRIDE;
+    void partLoaded(KontactInterface::Plugin *plugin, KParts::ReadOnlyPart *part) override;
     void setupActions();
-    bool queryClose() Q_DECL_OVERRIDE;
-    void readProperties(const KConfigGroup &config) Q_DECL_OVERRIDE;
-    void saveProperties(KConfigGroup &config) Q_DECL_OVERRIDE;
+    bool queryClose() override;
+    void readProperties(const KConfigGroup &config) override;
+    void saveProperties(KConfigGroup &config) override;
     void paintAboutScreen(const QString &templateName, const QVariantHash &data);
     static QVariantHash introductionData();
     KToolBar *findToolBar(const char *name);
@@ -113,7 +113,7 @@ private Q_SLOTS:
     void pluginsChanged();
 
     void configureShortcuts();
-    void configureToolbars() Q_DECL_OVERRIDE;
+    void configureToolbars() override;
     void slotShowHideSideBar();
 
 private:

src/webengine/introductionwebenginepage.h

@@ -31,7 +31,7 @@ public:
 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;
 };
 
 #endif // INTRODUCTIONWEBENGINEPAGE_H