Fix a bunch of clazy warnings

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

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index 5dec2b1f880e7beee53a874e2e59aa6aeaa45cc7..418c9bfe8d636c02d6f245040bb61ecf6e8d64cd 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -7,6 +7,7 @@
 #include "dolphinitemlistview.h"
 
 #include "dolphin_compactmodesettings.h"
 #include "dolphinitemlistview.h"
 
 #include "dolphin_compactmodesettings.h"

+#include "dolphin_contentdisplaysettings.h"

 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"


@@ -17,12 +18,11 @@
 #include <KIO/PreviewJob>
 #include <QtMath>
 
 #include <KIO/PreviewJob>
 #include <QtMath>
 

-
-DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) :
-    KFileItemListView(parent),
-    m_zoomLevel(0)
+DolphinItemListView::DolphinItemListView(QGraphicsWidget *parent)
+    : KFileItemListView(parent)
+    , m_zoomLevel(0)

 {
 {

-    updateFont();
+    DolphinItemListView::updateFont();

     updateGridSize();
 }
 
     updateGridSize();
 }
 


@@ -82,6 +82,8 @@ void DolphinItemListView::readSettings()
     CompactModeSettings::self()->load();
     DetailsModeSettings::self()->load();
 
     CompactModeSettings::self()->load();
     DetailsModeSettings::self()->load();
 

+    ContentDisplaySettings::self()->load();
+

     beginTransaction();
 
     setEnabledSelectionToggles(m_selectionTogglesEnabled);
     beginTransaction();
 
     setEnabledSelectionToggles(m_selectionTogglesEnabled);


@@ -104,7 +106,7 @@ void DolphinItemListView::writeSettings()
     DetailsModeSettings::self()->save();
 }
 
     DetailsModeSettings::self()->save();
 }
 

-KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const
+KItemListWidgetCreatorBase *DolphinItemListView::defaultWidgetCreator() const

 {
     return new KItemListWidgetCreator<DolphinFileItemListWidget>();
 }
 {
     return new KItemListWidgetCreator<DolphinFileItemListWidget>();
 }


@@ -135,8 +137,7 @@ void DolphinItemListView::onPreviewsShownChanged(bool shown)
     updateGridSize();
 }
 
     updateGridSize();
 }
 

-void DolphinItemListView::onVisibleRolesChanged(const QList<QByteArray>& current,
-                                                const QList<QByteArray>& previous)
+void DolphinItemListView::onVisibleRolesChanged(const QList<QByteArray> &current, const QList<QByteArray> &previous)

 {
     KFileItemListView::onVisibleRolesChanged(current, previous);
     updateGridSize();
 {
     KFileItemListView::onVisibleRolesChanged(current, previous);
     updateGridSize();


@@ -180,7 +181,6 @@ void DolphinItemListView::updateGridSize()
 
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {
 
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {

-

         // an exponential factor based on zoom, 0 -> 1, 4 -> 1.36 8 -> ~1.85, 16 -> 3.4
         auto zoomFactor = qExp(m_zoomLevel / 13.0);
         // 9 is the average char width for 10pt Noto Sans, making fontFactor =1
         // an exponential factor based on zoom, 0 -> 1, 4 -> 1.36 8 -> ~1.85, 16 -> 3.4
         auto zoomFactor = qExp(m_zoomLevel / 13.0);
         // 9 is the average char width for 10pt Noto Sans, making fontFactor =1


@@ -237,3 +237,5 @@ void DolphinItemListView::updateGridSize()
     setItemSize(QSizeF(itemWidth, itemHeight));
     endTransaction();
 }
     setItemSize(QSizeF(itemWidth, itemHeight));
     endTransaction();
 }

+
+#include "moc_dolphinitemlistview.cpp"