Merge remote-tracking branch 'origin/KDE/4.11'

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

diff --git a/src/kitemviews/kitemliststyleoption.cpp b/src/kitemviews/kitemliststyleoption.cpp
index 5266ef6bdacfaf061945c1bf5819da17422c2a1f..ac2587962e847791788e55cdbdf78439022abf25 100644 (file)
--- a/src/kitemviews/kitemliststyleoption.cpp
+++ b/src/kitemviews/kitemliststyleoption.cpp
@@ -26,10 +26,12 @@ KItemListStyleOption::KItemListStyleOption() :
     font(),
     fontMetrics(QFont()),
     palette(),
-    padding(0),
-    horizontalMargin(0),
-    verticalMargin(0),
-    iconSize(KIconLoader::SizeMedium)
+    padding(-1),
+    horizontalMargin(-1),
+    verticalMargin(-1),
+    iconSize(-1),
+    extendedSelectionRegion(false),
+    maxTextSize()
 {
 }
 
@@ -41,7 +43,9 @@ KItemListStyleOption::KItemListStyleOption(const KItemListStyleOption& other) :
     padding(other.padding),
     horizontalMargin(other.horizontalMargin),
     verticalMargin(other.verticalMargin),
-    iconSize(other.iconSize)
+    iconSize(other.iconSize),
+    extendedSelectionRegion(other.extendedSelectionRegion),
+    maxTextSize(other.maxTextSize)
 {
 }