X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Ftaskbarnotificationbackend.cpp;h=c4c8f71ab9bbd439a0ca42cdbfcf2ffda27e43b9;hb=faa66f7e00aeeea661b46f01bdfc715567eef669;hp=81165f23d3662aaeefd3ae51b74b05eb72740c1e;hpb=db66cc58b1329fe25b6a26b3824b3de3103ee539;p=quassel.git diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp index 81165f23..c4c8f71a 100644 --- a/src/qtui/taskbarnotificationbackend.cpp +++ b/src/qtui/taskbarnotificationbackend.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,12 +21,12 @@ #include #include #include +#include #include #include "taskbarnotificationbackend.h" #include "clientsettings.h" -#include "iconloader.h" #include "mainwin.h" #include "qtui.h" @@ -79,12 +79,12 @@ SettingsPage *TaskbarNotificationBackend::createConfigWidget() const TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "TaskbarNotification", parent) { QHBoxLayout *layout = new QHBoxLayout(this); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC layout->addWidget(enabledBox = new QCheckBox(tr("Activate dock entry, timeout:"), this)); #else layout->addWidget(enabledBox = new QCheckBox(tr("Mark taskbar entry, timeout:"), this)); #endif - enabledBox->setIcon(SmallIcon("flag-blue")); + enabledBox->setIcon(QIcon::fromTheme("flag-blue")); enabledBox->setEnabled(true); timeoutBox = new QSpinBox(this);