From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 24 Dec 2008 23:35:54 +0000 (+0100)
Subject: Make _mainWin a QPointer, to avoid problems with double deletion in case we use KDE
X-Git-Tag: 0.4.0~331
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d0e9b9ff20a9b8e41b7983c6601aa4e04a50062f;ds=sidebyside

Make _mainWin a QPointer, to avoid problems with double deletion in case we use KDE
---

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index a5727d64..1b513a76 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -32,7 +32,7 @@
 #include "util.h"
 
 QHash<QString, ActionCollection *> QtUi::_actionCollections;
-MainWin *QtUi::_mainWin = 0;
+QPointer<MainWin> QtUi::_mainWin = 0;
 QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
 QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
 QtUiStyle *QtUi::_style = 0;
diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 52c06b3a..9a00ef4e 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -24,6 +24,7 @@
 #include "quasselui.h"
 
 #include "abstractnotificationbackend.h"
+#include "mainwin.h"
 
 class ActionCollection;
 class MainWin;
@@ -78,7 +79,7 @@ protected slots:
 private:
   AbstractActionProvider *_actionProvider;
 
-  static MainWin *_mainWin;
+  static QPointer<MainWin> _mainWin;
   static QHash<QString, ActionCollection *> _actionCollections;
   static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;