fixed possible crash when showing tooltips and switching between views

BUG: 161201
CCMAIL: ubuntu@martin-graesslin.com

svn path=/trunk/KDE/kdebase/apps/; revision=818325

diff --git a/src/tooltipmanager.cpp b/src/tooltipmanager.cpp
index c133980166167f3fe74fb18ff5a99e1c90f510a7..32b196912a5819f536c8bffcb49f242182e0c52a 100644 (file)
--- a/src/tooltipmanager.cpp
+++ b/src/tooltipmanager.cpp
@@ -21,11 +21,15 @@
 
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "ktooltip.h"
-#include "kicon.h"
+
+#include <kformattedballoontipdelegate.h>
+#include <kicon.h>
+#include <ktooltip.h>
 
 #include <QTimer>
 
+K_GLOBAL_STATIC(KFormattedBalloonTipDelegate, g_delegate);
+
 ToolTipManager::ToolTipManager(QAbstractItemView* parent,
                                DolphinSortFilterProxyModel* model) :
     QObject(parent),
@@ -34,10 +38,9 @@ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
     m_proxyModel(model),
     m_timer(0),
     m_item(),
-    m_pos(),
-    m_delegate()
+    m_pos()
 {
-    KToolTip::setToolTipDelegate(&m_delegate);
+    KToolTip::setToolTipDelegate(g_delegate);
 
     m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
     connect(parent, SIGNAL(entered(const QModelIndex&)),

diff --git a/src/tooltipmanager.h b/src/tooltipmanager.h
index 1902ac8f0cc603c122fac19302c458115c29c995..420b48a1a94d385631163c2ab1da9e3c3287ad58 100644 (file)
--- a/src/tooltipmanager.h
+++ b/src/tooltipmanager.h
@@ -24,7 +24,6 @@
 #include <QPoint>
 
 #include <kfileitem.h>
-#include <kformattedballoontipdelegate.h>
 
 class DolphinModel;
 class DolphinSortFilterProxyModel;
@@ -71,7 +70,6 @@ private:
     QTimer* m_timer;
     KFileItem m_item;
     QPoint m_pos;
-    KFormattedBalloonTipDelegate m_delegate;
 };
 
 #endif