X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=56139e32201fe5d04b555be1e1a1e046566170a7;hb=dae6003f55206168e6d3c5cbace84e5b0c65990c;hp=a3e706aa175c02ac4a4ba4d14d684cdf6b89a288;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e;p=quassel.git diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp index a3e706aa..56139e32 100644 --- a/src/qtui/legacysystemtray.cpp +++ b/src/qtui/legacysystemtray.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-2013 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 * @@ -37,7 +37,7 @@ LegacySystemTray::LegacySystemTray(QWidget *parent) disconnect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), _trayIcon, SLOT(activateOrHide(QSystemTrayIcon::ActivationReason))); #endif -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC connect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(on_activated(QSystemTrayIcon::ActivationReason))); #endif @@ -67,7 +67,7 @@ void LegacySystemTray::syncLegacyIcon() { _trayIcon->setIcon(stateIcon()); -#if defined Q_WS_MAC || defined Q_WS_WIN +#if defined Q_OS_MAC || defined Q_OS_WIN QString tooltip = QString("%1").arg(toolTipTitle()); if (!toolTipSubTitle().isEmpty()) tooltip += QString("\n%1").arg(toolTipSubTitle());