Fix #984 without breaking topic input

[quassel.git] / src / qtui / qtui.h

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 1eb038f..437cc15 100644 (file)
--- 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;
@@ -57,18 +56,20 @@ public:
   static void unregisterNotificationBackend(AbstractNotificationBackend *);
   static void unregisterAllNotificationBackends();
   static const QList<AbstractNotificationBackend *> &notificationBackends();
-  static uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
-  static void closeNotification(uint notificationId);
-  static void closeNotifications(BufferId bufferId = BufferId());
   static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
 
 public slots:
   virtual void init();
 
+  uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
+  void closeNotification(uint notificationId);
+  void closeNotifications(BufferId bufferId = BufferId());
+
 protected slots:
   void connectedToCore();
   void disconnectedFromCore();
   void notificationActivated(uint notificationId);
+  void bufferMarkedAsRead(BufferId);
 
 protected:
   virtual void minimizeRestore(bool show);
@@ -78,15 +79,15 @@ private slots:
   void useSystemTrayChanged(const QVariant &);
 
 private:
-  static QPointer<QtUi> _instance;
-  static QPointer<MainWin> _mainWin;
+  static QtUi *_instance;
+  static MainWin *_mainWin;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QList<AbstractNotificationBackend::Notification> _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<QtUiStyle*>(uiStyle()); }
 MainWin *QtUi::mainWindow() { return _mainWin; }