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 a5727d6..1b513a7 100644 (file)
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -32,7 +32,7 @@
 #include "util.h"
 
 QHash<QString, ActionCollection *> QtUi::_actionCollections;
 #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;
 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 52c06b3..9a00ef4 100644 (file)
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -24,6 +24,7 @@
 #include "quasselui.h"
 
 #include "abstractnotificationbackend.h"
 #include "quasselui.h"
 
 #include "abstractnotificationbackend.h"

+#include "mainwin.h"

 
 class ActionCollection;
 class MainWin;
 
 class ActionCollection;
 class MainWin;


@@ -78,7 +79,7 @@ protected slots:
 private:
   AbstractActionProvider *_actionProvider;
 
 private:
   AbstractActionProvider *_actionProvider;
 

-  static MainWin *_mainWin;
+  static QPointer<MainWin> _mainWin;

   static QHash<QString, ActionCollection *> _actionCollections;
   static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QHash<QString, ActionCollection *> _actionCollections;
   static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;