From d0e9b9ff20a9b8e41b7983c6601aa4e04a50062f Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 25 Dec 2008 00:35:54 +0100 Subject: [PATCH] Make _mainWin a QPointer, to avoid problems with double deletion in case we use KDE --- src/qtui/qtui.cpp | 2 +- src/qtui/qtui.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 QtUi::_actionCollections; -MainWin *QtUi::_mainWin = 0; +QPointer QtUi::_mainWin = 0; QList QtUi::_notificationBackends; QList 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; static QHash _actionCollections; static QtUiStyle *_style; static QList _notificationBackends; -- 2.20.1