Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / kitemviews / kitemliststyleoption.cpp

diff --git a/src/kitemviews/kitemliststyleoption.cpp b/src/kitemviews/kitemliststyleoption.cpp
index 36cfeb088c58e8b103990b2bfc6307a2669b3e07..1ebcad141509fc499bc01211c7bc2f98f1b17aa3 100644 (file)
--- a/src/kitemviews/kitemliststyleoption.cpp
+++ b/src/kitemviews/kitemliststyleoption.cpp
@@ -19,19 +19,19 @@
 
 #include "kitemliststyleoption.h"
 
-#include <KIconLoader>
 
 KItemListStyleOption::KItemListStyleOption() :
     rect(),
     font(),
     fontMetrics(QFont()),
     palette(),
-    padding(0),
-    horizontalMargin(0),
-    verticalMargin(0),
-    iconSize(KIconLoader::SizeMedium),
+    padding(-1),
+    horizontalMargin(-1),
+    verticalMargin(-1),
+    iconSize(-1),
     extendedSelectionRegion(false),
-    maxTextSize()
+    maxTextLines(0),
+    maxTextWidth(0)
 {
 }
 
@@ -45,7 +45,8 @@ KItemListStyleOption::KItemListStyleOption(const KItemListStyleOption& other) :
     verticalMargin(other.verticalMargin),
     iconSize(other.iconSize),
     extendedSelectionRegion(other.extendedSelectionRegion),
-    maxTextSize(other.maxTextSize)
+    maxTextLines(other.maxTextLines),
+    maxTextWidth(other.maxTextWidth)
 {
 }