uisupport: Provide helpers for dealing with widget changes

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

diff --git a/src/qtui/statusnotifieritemdbus.h b/src/qtui/statusnotifieritemdbus.h
index cfccc33..9eb6e22 100644 (file)
--- a/src/qtui/statusnotifieritemdbus.h
+++ b/src/qtui/statusnotifieritemdbus.h
@@ -35,7 +35,7 @@ struct DBusImageStruct {
     QByteArray data;
 };
 
-typedef QVector<DBusImageStruct> DBusImageVector;
+using DBusImageVector = QVector<DBusImageStruct>;
 
 struct DBusToolTipStruct {
     QString icon;
@@ -69,7 +69,7 @@ class StatusNotifierItemDBus : public QObject
     friend class StatusNotifierItem;
 public:
     StatusNotifierItemDBus(StatusNotifierItem *parent);
-    ~StatusNotifierItemDBus();
+    ~StatusNotifierItemDBus() override;
 
     /**
      * @return the dbus connection used by this object
@@ -77,14 +77,14 @@ public:
     QDBusConnection dbusConnection() const;
 
     /**
-     * Register the service to DBus
+     * Register the StatusNotifierItem to DBus
      */
-    void registerService();
+    void registerTrayIcon();
 
     /**
-     * Unregister the service from DBus
+     * Unregister the StatusNotifierItem from DBus
      */
-    void unregisterService();
+    void unregisterTrayIcon();
 
     /**
      * @return the service this object is registered on the bus under
@@ -172,7 +172,7 @@ public:
      */
     QDBusObjectPath Menu() const;
 
-public Q_SLOTS:
+public slots:
     //interaction
     /**
      * Shows the context menu associated to this item
@@ -196,7 +196,7 @@ public Q_SLOTS:
      */
     void Scroll(int delta, const QString &orientation);
 
-Q_SIGNALS:
+signals:
     /**
      * Inform the systemtray that the own main icon has been changed,
      * so should be reloaded
@@ -227,7 +227,6 @@ Q_SIGNALS:
 
 private:
     StatusNotifierItem *m_statusNotifierItem;
-    QString m_service;
     QDBusConnection m_dbus;
     static int s_serviceCount;
 };