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 c512fa43ec09f0caf3ee05243bdfceb2a937fad3..1ebcad141509fc499bc01211c7bc2f98f1b17aa3 100644 (file)
--- a/src/kitemviews/kitemliststyleoption.cpp
+++ b/src/kitemviews/kitemliststyleoption.cpp
@@ -19,18 +19,19 @@
 
 #include "kitemliststyleoption.h"
 
-#include <KIconLoader>
 
 KItemListStyleOption::KItemListStyleOption() :
     rect(),
     font(),
     fontMetrics(QFont()),
     palette(),
-    padding(0),
-    horizontalMargin(0),
-    verticalMargin(0),
-    iconSize(KIconLoader::SizeMedium),
-    extendedSelectionRegion(false)
+    padding(-1),
+    horizontalMargin(-1),
+    verticalMargin(-1),
+    iconSize(-1),
+    extendedSelectionRegion(false),
+    maxTextLines(0),
+    maxTextWidth(0)
 {
 }
 
@@ -43,7 +44,9 @@ KItemListStyleOption::KItemListStyleOption(const KItemListStyleOption& other) :
     horizontalMargin(other.horizontalMargin),
     verticalMargin(other.verticalMargin),
     iconSize(other.iconSize),
-    extendedSelectionRegion(other.extendedSelectionRegion)
+    extendedSelectionRegion(other.extendedSelectionRegion),
+    maxTextLines(other.maxTextLines),
+    maxTextWidth(other.maxTextWidth)
 {
 }