X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritemdbus.h;h=719c82590557e4db4b378093d350189441b1e694;hp=d033c9c2d356b66015bff331d15ee2c0e94b3f86;hb=98144aaad0cd747f186edcd0e36a1d67326ac766;hpb=5d9af8ed007d38faf3995ea18174249121f246fe

diff --git a/src/qtui/statusnotifieritemdbus.h b/src/qtui/statusnotifieritemdbus.h
index d033c9c2..719c8259 100644
--- a/src/qtui/statusnotifieritemdbus.h
+++ b/src/qtui/statusnotifieritemdbus.h
@@ -4,9 +4,9 @@
  *   Quasselfied 2010 by Manuel Nickschas <sputnick@quassel-irc.org>       *
  *                                                                         *
  *   This file is free software; you can redistribute it and/or modify     *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   it under the terms of the GNU Library General Public License (LGPL)   *
+ *   as published by the Free Software Foundation; either version 2 of the *
+ *   License, or (at your option) any later version.                       *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef 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
@@ -227,7 +227,6 @@ Q_SIGNALS:
 
 private:
     StatusNotifierItem *m_statusNotifierItem;
-    QString m_service;
     QDBusConnection m_dbus;
     static int s_serviceCount;
 };