Modernize: Use override where possible

Also use override instead of Q_DECL_OVERRIDE

7 files changed, 26 insertions, 26 deletions

diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h
index d1b5b5d96..7d1ab610a 100644
--- a/src/panels/places/placesitem.h
+++ b/src/panels/places/placesitem.h
@@ -49,7 +49,7 @@ public:
     };
 
     explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = 0);
-    virtual ~PlacesItem();
+    ~PlacesItem() override;
 
     void setUrl(const QUrl& url);
     QUrl url() const;
@@ -82,12 +82,12 @@ public:
     PlacesItemSignalHandler* signalHandler() const;
 
 protected:
-    virtual void onDataValueChanged(const QByteArray& role,
+    void onDataValueChanged(const QByteArray& role,
                                     const QVariant& current,
-                                    const QVariant& previous) Q_DECL_OVERRIDE;
+                                    const QVariant& previous) override;
 
-    virtual void onDataChanged(const QHash<QByteArray, QVariant>& current,
-                               const QHash<QByteArray, QVariant>& previous) Q_DECL_OVERRIDE;
+    void onDataChanged(const QHash<QByteArray, QVariant>& current,
+                               const QHash<QByteArray, QVariant>& previous) override;
 
 private:
     PlacesItem(const PlacesItem& item);
diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h
index f2d69781a..5f61eede2 100644
--- a/src/panels/places/placesitemeditdialog.h
+++ b/src/panels/places/placesitemeditdialog.h
@@ -39,7 +39,7 @@ class PlacesItemEditDialog: public QDialog
 
 public:
     explicit PlacesItemEditDialog(QWidget* parent = 0);
-    virtual ~PlacesItemEditDialog();
+    ~PlacesItemEditDialog() override;
 
     void setIcon(const QString& icon);
     QString icon() const;
@@ -54,7 +54,7 @@ public:
     bool allowGlobal() const;
 
 protected:
-    virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
+    bool event(QEvent* event) override;
 
 private slots:
     void slotUrlChanged(const QString& text);
diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index ec845e0ae..f3cdaa6a6 100644
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -28,12 +28,12 @@ class PlacesItemListGroupHeader : public KStandardItemListGroupHeader
 
 public:
     PlacesItemListGroupHeader(QGraphicsWidget* parent = 0);
-    virtual ~PlacesItemListGroupHeader();
+    ~PlacesItemListGroupHeader() override;
 
 protected:
-    virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE;
+    void paintSeparator(QPainter* painter, const QColor& color) override;
 
-    virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
+    QPalette::ColorRole normalTextColorRole() const override;
 };
 #endif
 
diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h
index e9e6a0767..3be5dde7c 100644
--- a/src/panels/places/placesitemlistwidget.h
+++ b/src/panels/places/placesitemlistwidget.h
@@ -32,11 +32,11 @@ class PlacesItemListWidget : public KStandardItemListWidget
 
 public:
     PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
-    virtual ~PlacesItemListWidget();
+    ~PlacesItemListWidget() override;
 
 protected:
-    virtual bool isHidden() const Q_DECL_OVERRIDE;
-    virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
+    bool isHidden() const override;
+    QPalette::ColorRole normalTextColorRole() const override;
 };
 
 #endif
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index 7dd49bf5a..9c91f7b08 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -51,7 +51,7 @@ class PlacesItemModel: public KStandardItemModel
 
 public:
     explicit PlacesItemModel(QObject* parent = 0);
-    virtual ~PlacesItemModel();
+    ~PlacesItemModel() override;
 
     /**
      * @return A new instance of a places item with the given
@@ -107,9 +107,9 @@ public:
     bool storageSetupNeeded(int index) const;
     void requestStorageSetup(int index);
 
-    virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE;
+    QMimeData* createMimeData(const KItemSet& indexes) const override;
 
-    virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE;
+    bool supportsDropping(int index) const override;
 
     void dropMimeDataBefore(int index, const QMimeData* mimeData);
 
@@ -121,7 +121,7 @@ public:
      */
     static QUrl convertedUrl(const QUrl& url);
 
-    virtual void clear() Q_DECL_OVERRIDE;
+    void clear() override;
 
     void proceedWithTearDown();
 
@@ -132,7 +132,7 @@ public:
      */
     void saveBookmarks();
 
-    bool isDir(int index) const Q_DECL_OVERRIDE;
+    bool isDir(int index) const override;
 signals:
     void errorMessage(const QString& message);
     void storageSetupDone(int index, bool success);
@@ -140,9 +140,9 @@ signals:
     void storageTearDownExternallyRequested(const QString& mountPath);
 
 protected:
-    virtual void onItemInserted(int index) Q_DECL_OVERRIDE;
-    virtual void onItemRemoved(int index, KStandardItem* removedItem) Q_DECL_OVERRIDE;
-    virtual void onItemChanged(int index, const QSet<QByteArray>& changedRoles) Q_DECL_OVERRIDE;
+    void onItemInserted(int index) override;
+    void onItemRemoved(int index, KStandardItem* removedItem) override;
+    void onItemChanged(int index, const QSet<QByteArray>& changedRoles) override;
 
 private slots:
     void slotDeviceAdded(const QString& udi);
diff --git a/src/panels/places/placesitemsignalhandler.h b/src/panels/places/placesitemsignalhandler.h
index 6110f717d..49c8e43c9 100644
--- a/src/panels/places/placesitemsignalhandler.h
+++ b/src/panels/places/placesitemsignalhandler.h
@@ -48,7 +48,7 @@ class PlacesItemSignalHandler: public QObject
 
 public:
     explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr);
-    virtual ~PlacesItemSignalHandler();
+    ~PlacesItemSignalHandler() override;
 
 public slots:
     /**
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 4e525a037..f5c90b1f9 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -40,7 +40,7 @@ class PlacesPanel : public Panel
 
 public:
     explicit PlacesPanel(QWidget* parent);
-    virtual ~PlacesPanel();
+    ~PlacesPanel() override;
     void proceedWithTearDown();
 
 signals:
@@ -51,11 +51,11 @@ signals:
     void storageTearDownExternallyRequested(const QString& mountPath);
 
 protected:
-    virtual bool urlChanged() Q_DECL_OVERRIDE;
-    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    bool urlChanged() override;
+    void showEvent(QShowEvent* event) override;
 
 public slots:
-    virtual void readSettings() Q_DECL_OVERRIDE;
+    void readSettings() override;
 
 private slots:
     void slotItemActivated(int index);