X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=44c47411d02535afcf28ae456013fe441308a1e9;hb=28825f3c6c222c2828107c6627710f34b27b5066;hp=1eb038f2f85591ca123b1fbfca9068c73dac90c9;hpb=2e9492d9ef198bde37da1f858602ab9624c0a12a;p=quassel.git diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h index 1eb038f2..44c47411 100644 --- a/src/qtui/qtui.h +++ b/src/qtui/qtui.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2010 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -24,7 +24,6 @@ #include "graphicalui.h" #include "abstractnotificationbackend.h" -#include "mainwin.h" #include "qtuistyle.h" class MainWin; @@ -78,15 +77,15 @@ private slots: void useSystemTrayChanged(const QVariant &); private: - static QPointer _instance; - static QPointer _mainWin; + static QtUi *_instance; + static MainWin *_mainWin; static QList _notificationBackends; static QList _notifications; bool _useSystemTray; }; -QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi(); } +QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); } QtUiStyle *QtUi::style() { return qobject_cast(uiStyle()); } MainWin *QtUi::mainWindow() { return _mainWin; }