Merge branch 'Applications/18.08'

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

diff --git a/src/kitemviews/kitemliststyleoption.cpp b/src/kitemviews/kitemliststyleoption.cpp
index 261dfc07b956713c34996af6aaf400c8032ef198..bcfb86064b39182175d0234ed5d414efb87e4d49 100644 (file)
--- a/src/kitemviews/kitemliststyleoption.cpp
+++ b/src/kitemviews/kitemliststyleoption.cpp
@@ -19,19 +19,57 @@
 
 #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()
 {
 }
+
+bool KItemListStyleOption::operator==(const KItemListStyleOption& other) const
+{
+    return 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;
+}
+
+bool KItemListStyleOption::operator!=(const KItemListStyleOption& other) const
+{
+    return !(*this == other);
+}