From 6d407b6badf42c7c7ab06f3bd0795e5312313fd5 Mon Sep 17 00:00:00 2001
From: Sebastian Sauer <mail@dipe.org>
Date: Wed, 30 Jul 2008 00:11:41 +0000
Subject: [PATCH] initialize activeMargins, now it asserts on startup on
 icon_p.h#282 rather then crashing what should help to fix the prob ;)

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=839403
---
 widgets/icon.cpp | 3 ++-
 widgets/icon_p.h | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/widgets/icon.cpp b/widgets/icon.cpp
index 181675de7..c28b4dab5 100644
--- a/widgets/icon.cpp
+++ b/widgets/icon.cpp
@@ -68,7 +68,8 @@ IconPrivate::IconPrivate(Icon *i)
       numDisplayLines(2),
       invertLayout(false),
       drawBg(false),
-      action(0)
+      action(0),
+      activeMargins(0)
 {
     m_hoverAnimId = -1;
     m_hoverAlpha = 20/255;
diff --git a/widgets/icon_p.h b/widgets/icon_p.h
index 2e01789cd..b9ad5f265 100644
--- a/widgets/icon_p.h
+++ b/widgets/icon_p.h
@@ -265,24 +265,28 @@ void IconPrivate::setHorizontalMargin(MarginType type, qreal horizontal, qreal v
 
 QRectF IconPrivate::addMargin(const QRectF &rect, MarginType type) const
 {
+    Q_ASSERT(activeMargins);
     const Margin &m = activeMargins[type];
     return rect.adjusted(-m.left, -m.top, m.right, m.bottom);
 }
 
 QRectF IconPrivate::subtractMargin(const QRectF &rect, MarginType type) const
 {
+    Q_ASSERT(activeMargins);
     const Margin &m = activeMargins[type];
     return rect.adjusted(m.left, m.top, -m.right, -m.bottom);
 }
 
 QSizeF IconPrivate::addMargin(const QSizeF &size, MarginType type) const
 {
+    Q_ASSERT(activeMargins);
     const Margin &m = activeMargins[type];
     return QSizeF(size.width() + m.left + m.right, size.height() + m.top + m.bottom);
 }
 
 QSizeF IconPrivate::subtractMargin(const QSizeF &size, MarginType type) const
 {
+    Q_ASSERT(activeMargins);
     const Margin &m = activeMargins[type];
     return QSizeF(size.width() - m.left - m.right, size.height() - m.top - m.bottom);
 }