X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritem.h;fp=src%2Fqtui%2Fstatusnotifieritem.h;h=297391956c6ca26b0a77705d02f4215b28a7918b;hp=5a103b61992d4418e19d8ebce47e5f73128dcb79;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/qtui/statusnotifieritem.h b/src/qtui/statusnotifieritem.h index 5a103b61..29739195 100644 --- a/src/qtui/statusnotifieritem.h +++ b/src/qtui/statusnotifieritem.h @@ -25,21 +25,21 @@ #ifdef HAVE_DBUS -#include -#include -#include -#include - -#include "notificationsclient.h" -#include "systemtray.h" -#include "statusnotifierwatcher.h" - -#ifdef QT_NO_SYSTEMTRAYICON -# define StatusNotifierItemParent SystemTray -#else -# define StatusNotifierItemParent LegacySystemTray -# include "legacysystemtray.h" -#endif +# include +# include +# include +# include + +# include "notificationsclient.h" +# include "statusnotifierwatcher.h" +# include "systemtray.h" + +# ifdef QT_NO_SYSTEMTRAYICON +# define StatusNotifierItemParent SystemTray +# else +# define StatusNotifierItemParent LegacySystemTray +# include "legacysystemtray.h" +# endif class QDBusServiceWatcher; @@ -50,12 +50,16 @@ class StatusNotifierItem : public StatusNotifierItemParent Q_OBJECT public: - explicit StatusNotifierItem(QWidget *parent); + explicit StatusNotifierItem(QWidget* parent); bool isSystemTrayAvailable() const override; public slots: - void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0) override; + void showMessage(const QString& title, + const QString& message, + MessageIcon icon = Information, + int msTimeout = 10000, + uint notificationId = 0) override; void closeMessage(uint notificationId) override; protected: @@ -66,16 +70,16 @@ protected: QString iconThemePath() const; QString menuObjectPath() const; - bool eventFilter(QObject *watched, QEvent *event) override; + bool eventFilter(QObject* watched, QEvent* event) override; private slots: - void activated(const QPoint &pos); - void serviceChange(const QString &name, const QString &oldOwner, const QString &newOwner); + void activated(const QPoint& pos); + void serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner); void checkForRegisteredHosts(); - void onDBusError(const QDBusError &error); + void onDBusError(const QDBusError& error); void notificationClosed(uint id, uint reason); - void notificationInvoked(uint id, const QString &action); + void notificationInvoked(uint id, const QString& action); void refreshIcons(); @@ -86,14 +90,14 @@ private slots: private: void registerToWatcher(); - QDBusServiceWatcher *_serviceWatcher{nullptr}; - StatusNotifierItemDBus *_statusNotifierItemDBus{nullptr}; - org::kde::StatusNotifierWatcher *_statusNotifierWatcher{nullptr}; - org::freedesktop::Notifications *_notificationsClient{nullptr}; + QDBusServiceWatcher* _serviceWatcher{nullptr}; + StatusNotifierItemDBus* _statusNotifierItemDBus{nullptr}; + org::kde::StatusNotifierWatcher* _statusNotifierWatcher{nullptr}; + org::freedesktop::Notifications* _notificationsClient{nullptr}; bool _notificationsClientSupportsMarkup{false}; bool _notificationsClientSupportsActions{false}; quint32 _lastNotificationsDBusId{0}; - QHash _notificationsIdMap; ///< Maps our own notification ID to the D-Bus one + QHash _notificationsIdMap; ///< Maps our own notification ID to the D-Bus one QString _iconThemePath; QString _menuObjectPath;