Merge branch 'release/19.12'

[dolphin.git] / src / views / dolphinitemlistview.h

diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index 2b16825f4f244bd29f110a9f500857a99e123d4a..b8e3ab7de69d1f8318d5dea0880441d766030cf3 100644 (file)
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -20,10 +20,9 @@
 #ifndef DOLPHINITEMLISTVIEW_H
 #define DOLPHINITEMLISTVIEW_H
 
-#include <kitemviews/kfileitemlistview.h>
-#include <settings/viewmodes/viewmodesettings.h>
-
-#include "libdolphin_export.h"
+#include "dolphin_export.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "settings/viewmodes/viewmodesettings.h"
 
 class KFileItemListView;
 
@@ -34,13 +33,13 @@ class KFileItemListView;
  * the view-properties into the corresponding KItemListView
  * properties.
  */
-class LIBDOLPHINPRIVATE_EXPORT DolphinItemListView : public KFileItemListView
+class DOLPHIN_EXPORT DolphinItemListView : public KFileItemListView
 {
     Q_OBJECT
 
 public:
-    explicit DolphinItemListView(QGraphicsWidget* parent = 0);
-    virtual ~DolphinItemListView();
+    explicit DolphinItemListView(QGraphicsWidget* parent = nullptr);
+    ~DolphinItemListView() override;
 
     void setZoomLevel(int level);
     int zoomLevel() const;
@@ -49,14 +48,14 @@ public:
     void writeSettings();
 
 protected:
-    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE;
-    virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const Q_DECL_OVERRIDE;
-    virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE;
-    virtual void onPreviewsShownChanged(bool shown) Q_DECL_OVERRIDE;
-    virtual void onVisibleRolesChanged(const QList<QByteArray>& current,
-                                       const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
+    KItemListWidgetCreatorBase* defaultWidgetCreator() const override;
+    bool itemLayoutSupportsItemExpanding(ItemLayout layout) const override;
+    void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override;
+    void onPreviewsShownChanged(bool shown) override;
+    void onVisibleRolesChanged(const QList<QByteArray>& current,
+                                       const QList<QByteArray>& previous) override;
 
-    virtual void updateFont() Q_DECL_OVERRIDE;
+    void updateFont() override;
 
 private:
     void updateGridSize();