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