SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index 18bb284ace61ccf2efdecacd590fff0bfce567df..b8e3ab7de69d1f8318d5dea0880441d766030cf3 100644 (file)
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -20,10 +20,9 @@
 #ifndef DOLPHINITEMLISTVIEW_H
 #define DOLPHINITEMLISTVIEW_H
 
 #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;
 
 
 class KFileItemListView;
 


@@ -34,13 +33,13 @@ class KFileItemListView;
  * the view-properties into the corresponding KItemListView
  * properties.
  */
  * the view-properties into the corresponding KItemListView
  * properties.
  */

-class LIBDOLPHINPRIVATE_EXPORT DolphinItemListView : public KFileItemListView
+class DOLPHIN_EXPORT DolphinItemListView : public KFileItemListView

 {
     Q_OBJECT
 
 public:
 {
     Q_OBJECT
 
 public:

-    explicit DolphinItemListView(QGraphicsWidget* parent = 0);
-    virtual ~DolphinItemListView();
+    explicit DolphinItemListView(QGraphicsWidget* parent = nullptr);
+    ~DolphinItemListView() override;

 
     void setZoomLevel(int level);
     int zoomLevel() const;
 
     void setZoomLevel(int level);
     int zoomLevel() const;


@@ -49,16 +48,17 @@ public:
     void writeSettings();
 
 protected:
     void writeSettings();
 
 protected:

-    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const;
-    virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const;
-    virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
-    virtual void onPreviewsShownChanged(bool shown);
-    virtual void onVisibleRolesChanged(const QList<QByteArray>& current,
-                                       const QList<QByteArray>& previous);
+    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;
+
+    void updateFont() override;

 
 private:
     void updateGridSize();
 
 private:
     void updateGridSize();

-    void updateFont();

 
     ViewModeSettings::ViewMode viewMode() const;
 
 
     ViewModeSettings::ViewMode viewMode() const;