/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This file is free software; you can redistribute it and/or modify *
_blinkState(false),
_lastMessageId(0)
{
-#ifndef HAVE_KDE
+#ifndef HAVE_KDE4
_trayIcon = new QSystemTrayIcon(associatedWidget());
#else
_trayIcon = new KSystemTrayIcon(associatedWidget());
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
{
_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());
}
-Icon LegacySystemTray::stateIcon() const
+QIcon LegacySystemTray::stateIcon() const
{
if (mode() == Legacy && state() == NeedsAttention && !_blinkState)
return SystemTray::stateIcon(Active);