Modernize: Use override where possible

Also use override instead of Q_DECL_OVERRIDE

4 files changed, 9 insertions, 9 deletions

diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h
index 2278762e3..5a4595c4a 100644
--- a/src/panels/folders/foldersitemlistwidget.h
+++ b/src/panels/folders/foldersitemlistwidget.h
@@ -31,10 +31,10 @@ class FoldersItemListWidget : public KFileItemListWidget
 
 public:
     FoldersItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
-    virtual ~FoldersItemListWidget();
+    ~FoldersItemListWidget() override;
 
 protected:
-    virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
+    QPalette::ColorRole normalTextColorRole() const override;
 };
 
 #endif
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index eef27ce47..6659c7c91 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -91,7 +91,7 @@ void FoldersPanel::setLimitFoldersPanelToHome(bool enable)
 
 bool FoldersPanel::limitFoldersPanelToHome() const
 {
-    return FoldersPanelSettings::limitFoldersPanelToHome();
+    return limitFoldersPanelToHome();
 }
 
 void FoldersPanel::setAutoScrolling(bool enable)
@@ -325,7 +325,7 @@ void FoldersPanel::loadTree(const QUrl& url)
     QUrl baseUrl;
     if (url.isLocalFile()) {
         const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url);
-        if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) {
+        if (limitFoldersPanelToHome() && isInHomeFolder) {
             baseUrl = Dolphin::homeUrl();
         } else {
             // Use the root directory as base for local URLs (#150941)
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index ab6c41b34..75a603681 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -40,7 +40,7 @@ class FoldersPanel : public Panel
 
 public:
     explicit FoldersPanel(QWidget* parent = nullptr);
-    virtual ~FoldersPanel();
+    ~FoldersPanel() override;
 
     void setShowHiddenFiles(bool show);
     void setLimitFoldersPanelToHome(bool enable);
@@ -59,13 +59,13 @@ signals:
 
 protected:
     /** @see Panel::urlChanged() */
-    virtual bool urlChanged() Q_DECL_OVERRIDE;
+    bool urlChanged() override;
 
     /** @see QWidget::showEvent() */
-    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent* event) override;
 
     /** @see QWidget::keyPressEvent() */
-    virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent* event) override;
 
 private slots:
     void slotItemActivated(int index);
diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index 93ddd7aef..3e61c4941 100644
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -45,7 +45,7 @@ public:
     TreeViewContextMenu(FoldersPanel* parent,
                         const KFileItem& fileInfo);
 
-    virtual ~TreeViewContextMenu();
+    ~TreeViewContextMenu() override;
 
     /** Opens the context menu modal. */
     void open();