X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=33a84620557a65d4aaa77c504fa3f71737d78131;hp=1e2144c2eeef69fc92f2c46cce7ad7f52daf9db6;hb=580662426b8b734566b37de61deccf5b89970c6e;hpb=34cbd014160c25232e6f407ba6dcd0fe92ae7c17

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 1e2144c2..33a84620 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -25,11 +25,11 @@
 
 #include "abstractnotificationbackend.h"
 #include "mainwin.h"
+#include "qtuistyle.h"
 
 class MainWin;
 class MessageModel;
 class QtUiMessageProcessor;
-class QtUiStyle;
 
 //! This class encapsulates Quassel's Qt-based GUI.
 /** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
@@ -49,6 +49,7 @@ public:
   inline static QtUiStyle *style();
   inline static MainWin *mainWindow();
 
+  static bool haveSystemTray();
 
   /* Notifications */
 
@@ -56,7 +57,7 @@ public:
   static void unregisterNotificationBackend(AbstractNotificationBackend *);
   static void unregisterAllNotificationBackends();
   static const QList<AbstractNotificationBackend *> &notificationBackends();
-  static uint invokeNotification(BufferId bufId, const QString &sender, const QString &text);
+  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();
@@ -67,18 +68,17 @@ public slots:
 protected slots:
   void connectedToCore();
   void disconnectedFromCore();
-  void notificationActivated();
+  void notificationActivated(uint notificationId);
 
 private:
   static QPointer<QtUi> _instance;
   static QPointer<MainWin> _mainWin;
-  static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QList<AbstractNotificationBackend::Notification> _notifications;
 };
 
 QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi(); }
-QtUiStyle *QtUi::style() { return _style; }
+QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle*>(uiStyle()); }
 MainWin *QtUi::mainWindow() { return _mainWin; }
 
 #endif