X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.h;h=a359ae1676f37117e6bdad7587c342ec0e4bbef6;hp=850ad520d703b6b748fd5f4f25b9cdb3edba429d;hb=f3d6f8088d8be6af9319a99fb8d2fee2837b540a;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/qtui/systemtray.h b/src/qtui/systemtray.h
index 850ad520..a359ae16 100644
--- a/src/qtui/systemtray.h
+++ b/src/qtui/systemtray.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
- *   This program 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) version 3.                                           *
+ *   This file is free software; you can redistribute it and/or modify     *
+ *   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        *
@@ -15,13 +15,13 @@
  *   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 SYSTEMTRAY_H_
 #define SYSTEMTRAY_H_
 
-#include "icon.h"
+#include <QIcon>
 
 class Action;
 class QMenu;
@@ -84,7 +84,7 @@ public slots:
 
 signals:
     void activated(SystemTray::ActivationReason);
-    void iconChanged(const Icon &);
+    void iconChanged(const QIcon &icon);
     void animationEnabledChanged(bool);
     void toolTipChanged(const QString &title, const QString &subtitle);
     void messageClicked(uint notificationId);
@@ -97,8 +97,8 @@ protected:
     virtual void setMode(Mode mode);
     inline bool shouldBeVisible() const;
 
-    virtual Icon stateIcon() const;
-    Icon stateIcon(State state) const;
+    virtual QIcon stateIcon() const;
+    QIcon stateIcon(State state) const;
     inline QString toolTipTitle() const;
     inline QString toolTipSubTitle() const;
     inline QMenu *trayMenu() const;
@@ -116,7 +116,7 @@ private:
     bool _shouldBeVisible;
 
     QString _toolTipTitle, _toolTipSubTitle;
-    Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
+    QIcon _passiveIcon, _activeIcon, _needsAttentionIcon;
     bool _animationEnabled;
 
     QMenu *_trayMenu;