X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.h;h=1fa9739fb01b1245d4e95bbe00cfbd4119556a20;hp=65b6e8d8317d6c9005bc3c1dfc3bd79a413425a3;hb=092e6b212637ffbf68800584b7c1f32d1931b602;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e diff --git a/src/qtui/systemtray.h b/src/qtui/systemtray.h index 65b6e8d8..1fa9739f 100644 --- a/src/qtui/systemtray.h +++ b/src/qtui/systemtray.h @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2018 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 * @@ -21,7 +21,7 @@ #ifndef SYSTEMTRAY_H_ #define SYSTEMTRAY_H_ -#include "icon.h" +#include 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;