Merge branch 'master' into frameworks

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

diff --git a/src/kitemviews/kitemliststyleoption.cpp b/src/kitemviews/kitemliststyleoption.cpp
index 261dfc07b956713c34996af6aaf400c8032ef198..1ebcad141509fc499bc01211c7bc2f98f1b17aa3 100644 (file)
--- a/src/kitemviews/kitemliststyleoption.cpp
+++ b/src/kitemviews/kitemliststyleoption.cpp
@@ -19,17 +19,35 @@
 
 #include "kitemliststyleoption.h"
 
+
 KItemListStyleOption::KItemListStyleOption() :
-    QStyleOption(QStyleOption::Version, QStyleOption::SO_CustomBase + 1)
+    rect(),
+    font(),
+    fontMetrics(QFont()),
+    palette(),
+    padding(-1),
+    horizontalMargin(-1),
+    verticalMargin(-1),
+    iconSize(-1),
+    extendedSelectionRegion(false),
+    maxTextLines(0),
+    maxTextWidth(0)
 {
 }
 
 KItemListStyleOption::KItemListStyleOption(const KItemListStyleOption& other) :
-    QStyleOption(other)
+    rect(other.rect),
+    font(other.font),
+    fontMetrics(other.fontMetrics),
+    palette(other.palette),
+    padding(other.padding),
+    horizontalMargin(other.horizontalMargin),
+    verticalMargin(other.verticalMargin),
+    iconSize(other.iconSize),
+    extendedSelectionRegion(other.extendedSelectionRegion),
+    maxTextLines(other.maxTextLines),
+    maxTextWidth(other.maxTextWidth)
 {
-    margin = other.margin;
-    iconSize = other.iconSize;
-    font = other.font;
 }
 
 KItemListStyleOption::~KItemListStyleOption()