Modernize: Use override where possible

Also use override instead of Q_DECL_OVERRIDE

25 files changed, 71 insertions, 71 deletions

diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h
index fd72a7ce1..2a4cd7dba 100644
--- a/src/settings/additionalinfodialog.h
+++ b/src/settings/additionalinfodialog.h
@@ -34,11 +34,11 @@ class AdditionalInfoDialog : public QDialog
 
 public:
     AdditionalInfoDialog(QWidget* parent, const QList<QByteArray>& visibleRoles);
-    virtual ~AdditionalInfoDialog();
+    ~AdditionalInfoDialog() override;
     QList<QByteArray> visibleRoles() const;
 
 public slots:
-    void accept() Q_DECL_OVERRIDE;
+    void accept() override;
 
 private:
     QList<QByteArray> m_visibleRoles;
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index ea9688718..aeb4a60c6 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -60,11 +60,11 @@ public:
      *                  sub directories.
      */
     ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps);
-    virtual ~ApplyViewPropsJob();
+    ~ApplyViewPropsJob() override;
     int progress() const;
 
 private slots:
-    virtual void slotResult(KJob* job) Q_DECL_OVERRIDE;
+    void slotResult(KJob* job) override;
     void slotEntries(KIO::Job*, const KIO::UDSEntryList&);
 
 private:
diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 194af28fc..ca35b0aad 100644
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -37,7 +37,7 @@ class DolphinSettingsDialog : public KPageDialog
 
 public:
     explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0);
-    virtual ~DolphinSettingsDialog();
+    ~DolphinSettingsDialog() override;
 
 signals:
     void settingsChanged();
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 96eaf3d64..16a3e95c2 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -37,13 +37,13 @@ class BehaviorSettingsPage : public SettingsPageBase
 
 public:
     BehaviorSettingsPage(const QUrl &url, QWidget* parent);
-    virtual ~BehaviorSettingsPage();
+    ~BehaviorSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     void loadSettings();
diff --git a/src/settings/general/configurepreviewplugindialog.h b/src/settings/general/configurepreviewplugindialog.h
index 620caeb51..e54fb464a 100644
--- a/src/settings/general/configurepreviewplugindialog.h
+++ b/src/settings/general/configurepreviewplugindialog.h
@@ -40,7 +40,7 @@ public:
     ConfigurePreviewPluginDialog(const QString& pluginName,
                                  const QString& desktopEntryName,
                                  QWidget* parent);
-    virtual ~ConfigurePreviewPluginDialog() = default;
+    ~ConfigurePreviewPluginDialog() override = default;
 };
 
 #endif
diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index e702fe8ae..f8e5e3540 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -32,13 +32,13 @@ class ConfirmationsSettingsPage : public SettingsPageBase
 
 public:
     ConfirmationsSettingsPage(QWidget* parent);
-    virtual ~ConfirmationsSettingsPage();
+    ~ConfirmationsSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     void loadSettings();
diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index 7073258ff..a68fc933b 100644
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -41,13 +41,13 @@ class GeneralSettingsPage : public SettingsPageBase
 
 public:
     GeneralSettingsPage(const QUrl& url, QWidget* parent);
-    virtual ~GeneralSettingsPage();
+    ~GeneralSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index 6e896f05e..0bac4da65 100644
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -35,20 +35,20 @@ class PreviewsSettingsPage : public SettingsPageBase
 
 public:
     PreviewsSettingsPage(QWidget* parent);
-    virtual ~PreviewsSettingsPage();
+    ~PreviewsSettingsPage() override;
 
     /**
      * Applies the general settings for the view modes
      * The settings are persisted automatically when
      * closing Dolphin.
      */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** Restores the settings to default values. */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 protected:
-    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent* event) override;
 
 private slots:
     void configureService(const QModelIndex& index);
diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 608354371..d85f0aaa1 100644
--- a/src/settings/general/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
@@ -32,13 +32,13 @@ class StatusBarSettingsPage : public SettingsPageBase
 
 public:
     StatusBarSettingsPage(QWidget* parent);
-    virtual ~StatusBarSettingsPage();
+    ~StatusBarSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     void loadSettings();
diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
index 50331a75c..66e42009f 100644
--- a/src/settings/kcm/kcmdolphingeneral.h
+++ b/src/settings/kcm/kcmdolphingeneral.h
@@ -34,10 +34,10 @@ class DolphinGeneralConfigModule : public KCModule
 
 public:
     DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args);
-    virtual ~DolphinGeneralConfigModule();
+    ~DolphinGeneralConfigModule() override;
 
-    virtual void save() Q_DECL_OVERRIDE;
-    virtual void defaults() Q_DECL_OVERRIDE;
+    void save() override;
+    void defaults() override;
 
 private:
     QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h
index e8de0753e..2bcc7abab 100644
--- a/src/settings/kcm/kcmdolphinnavigation.h
+++ b/src/settings/kcm/kcmdolphinnavigation.h
@@ -33,10 +33,10 @@ class DolphinNavigationConfigModule : public KCModule
 
 public:
     DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args);
-    virtual ~DolphinNavigationConfigModule();
+    ~DolphinNavigationConfigModule() override;
 
-    virtual void save() Q_DECL_OVERRIDE;
-    virtual void defaults() Q_DECL_OVERRIDE;
+    void save() override;
+    void defaults() override;
 
 private:
     NavigationSettingsPage* m_navigation;
diff --git a/src/settings/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h
index 8a63bb045..6c6af6728 100644
--- a/src/settings/kcm/kcmdolphinservices.h
+++ b/src/settings/kcm/kcmdolphinservices.h
@@ -33,10 +33,10 @@ class DolphinServicesConfigModule : public KCModule
 
 public:
     DolphinServicesConfigModule(QWidget* parent, const QVariantList& args);
-    virtual ~DolphinServicesConfigModule();
+    ~DolphinServicesConfigModule() override;
 
-    virtual void save() Q_DECL_OVERRIDE;
-    virtual void defaults() Q_DECL_OVERRIDE;
+    void save() override;
+    void defaults() override;
 
 private:
     ServicesSettingsPage* m_services;
diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h
index 0a0b0ff10..c3775adff 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.h
+++ b/src/settings/kcm/kcmdolphinviewmodes.h
@@ -33,10 +33,10 @@ class DolphinViewModesConfigModule : public KCModule
 
 public:
     DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args);
-    virtual ~DolphinViewModesConfigModule();
+    ~DolphinViewModesConfigModule() override;
 
-    virtual void save() Q_DECL_OVERRIDE;
-    virtual void defaults() Q_DECL_OVERRIDE;
+    void save() override;
+    void defaults() override;
 
 private:
     void reparseConfiguration();
diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 5410a4efa..d58a8e811 100644
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -32,13 +32,13 @@ class NavigationSettingsPage : public SettingsPageBase
 
 public:
     NavigationSettingsPage(QWidget* parent);
-    virtual ~NavigationSettingsPage();
+    ~NavigationSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     void loadSettings();
diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h
index 9f0ced40c..27fb15c20 100644
--- a/src/settings/serviceitemdelegate.h
+++ b/src/settings/serviceitemdelegate.h
@@ -34,19 +34,19 @@ class ServiceItemDelegate : public KWidgetItemDelegate
 
 public:
     explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = 0);
-    virtual ~ServiceItemDelegate();
+    ~ServiceItemDelegate() override;
 
-    virtual QSize sizeHint(const QStyleOptionViewItem &option,
-                           const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QSize sizeHint(const QStyleOptionViewItem &option,
+                           const QModelIndex &index) const override;
 
-    virtual 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;
 
-    virtual QList<QWidget*> createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE;
+    QList<QWidget*> createItemWidgets(const QModelIndex&) const override;
 
-    virtual void updateItemWidgets(const QList<QWidget*> widgets,
+    void updateItemWidgets(const QList<QWidget*> widgets,
                                    const QStyleOptionViewItem& option,
-                                   const QPersistentModelIndex& index) const Q_DECL_OVERRIDE;
+                                   const QPersistentModelIndex& index) const override;
 
 signals:
     void requestServiceConfiguration(const QModelIndex& index);
diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h
index f2b91c7e4..47fe54d6a 100644
--- a/src/settings/servicemodel.h
+++ b/src/settings/servicemodel.h
@@ -45,12 +45,12 @@ public:
     };
 
     explicit ServiceModel(QObject* parent = 0);
-    virtual ~ServiceModel();
+    ~ServiceModel() override;
 
-    virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) Q_DECL_OVERRIDE;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
  private:
     struct ServiceItem
diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index a883aa947..c1239c9f5 100644
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -36,16 +36,16 @@ class ServicesSettingsPage : public SettingsPageBase
 
 public:
     ServicesSettingsPage(QWidget* parent);
-    virtual ~ServicesSettingsPage();
+    ~ServicesSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 protected:
-    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent* event) override;
 
 private slots:
     /**
diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h
index 05973d452..5e50a8df0 100644
--- a/src/settings/settingspagebase.h
+++ b/src/settings/settingspagebase.h
@@ -32,7 +32,7 @@ class SettingsPageBase : public QWidget
 
 public:
     explicit SettingsPageBase(QWidget* parent = 0);
-    virtual ~SettingsPageBase();
+    ~SettingsPageBase() override;
 
     /**
      * Must be implemented by a derived class to
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index 7a69cd3d6..da278e371 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -37,13 +37,13 @@ class StartupSettingsPage : public SettingsPageBase
 
 public:
     StartupSettingsPage(const QUrl& url, QWidget* parent);
-    virtual ~StartupSettingsPage();
+    ~StartupSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private slots:
     void slotSettingsChanged();
diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h
index 5c88aeab7..57631b760 100644
--- a/src/settings/trash/trashsettingspage.h
+++ b/src/settings/trash/trashsettingspage.h
@@ -31,13 +31,13 @@ class TrashSettingsPage : public SettingsPageBase
 
 public:
     TrashSettingsPage(QWidget* parent);
-    virtual ~TrashSettingsPage();
+    ~TrashSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     void loadSettings();
diff --git a/src/settings/viewmodes/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h
index 6ef6e3e72..3f355e314 100644
--- a/src/settings/viewmodes/dolphinfontrequester.h
+++ b/src/settings/viewmodes/dolphinfontrequester.h
@@ -41,7 +41,7 @@ public:
     };
 
     DolphinFontRequester(QWidget* parent);
-    virtual ~DolphinFontRequester();
+    ~DolphinFontRequester() override;
 
     void setMode(Mode mode);
     Mode mode() const;
diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 61671077e..4f57e5c19 100644
--- a/src/settings/viewmodes/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
@@ -37,13 +37,13 @@ class ViewSettingsPage : public SettingsPageBase
 
 public:
     ViewSettingsPage(QWidget* parent);
-    virtual ~ViewSettingsPage();
+    ~ViewSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
     QList<ViewSettingsTab*> m_tabs;
diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index 6bea95b90..4f4071c1a 100644
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -44,7 +44,7 @@ public:
     };
 
     explicit ViewSettingsTab(Mode mode, QWidget* parent = 0);
-    virtual ~ViewSettingsTab();
+    ~ViewSettingsTab() override;
 
     void applySettings();
     void restoreDefaultSettings();
diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index 5490be85b..35c18718e 100644
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -45,10 +45,10 @@ class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog
 
 public:
     explicit ViewPropertiesDialog(DolphinView* dolphinView);
-    virtual ~ViewPropertiesDialog();
+    ~ViewPropertiesDialog() override;
 
 public slots:
-    void accept() Q_DECL_OVERRIDE;
+    void accept() override;
 
 private slots:
     void slotApply();
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index cd7aa50ce..e69de2976 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -53,13 +53,13 @@ public:
                           const QUrl& dir,
                           const ViewProperties& viewProps);
 
-    virtual ~ViewPropsProgressInfo();
+    ~ViewPropsProgressInfo() override;
 
 protected:
-    virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent* event) override;
 
 public slots:
-    void reject() Q_DECL_OVERRIDE;
+    void reject() override;
 
 private slots:
     void updateProgress();