uisupport: Provide helpers for dealing with widget changes

[quassel.git] / src / qtui / knotificationbackend.cpp

diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index c23a83b..4faea24 100644 (file)
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -20,28 +20,24 @@
 
 #include "knotificationbackend.h"
 
-#include <QIcon>
 #include <QTextDocument>
 #include <QVBoxLayout>
 
-#ifdef HAVE_KDE4
-#  include <KNotification>
-#  include <KNotifyConfigWidget>
-#else
-#  include <KNotifications/KNotification>
-#  include <KNotifyConfig/KNotifyConfigWidget>
-#endif
+#include <KNotifications/KNotification>
+#include <KNotifyConfig/KNotifyConfigWidget>
 
 #include "client.h"
+#include "icon.h"
 #include "mainwin.h"
 #include "networkmodel.h"
 #include "qtui.h"
+#include "util.h"
 
 KNotificationBackend::KNotificationBackend(QObject *parent)
     : AbstractNotificationBackend(parent)
 {
-    connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
-        SLOT(notificationActivated(SystemTray::ActivationReason)));
+    connect(QtUi::mainWindow()->systemTray(), &SystemTray::activated,
+            this, selectOverload<SystemTray::ActivationReason>(&KNotificationBackend::notificationActivated));
 
     updateToolTip();
 }
@@ -61,16 +57,12 @@ void KNotificationBackend::notify(const Notification &n)
         type = "PrivMsgFocused"; break;
     }
 
-#if QT_VERSION < 0x050000
-    QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, Qt::escape(n.message));
-#else
     QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, n.message.toHtmlEscaped());
-#endif
-    KNotification *notification = KNotification::event(type, message, QIcon::fromTheme("dialog-information").pixmap(48), QtUi::mainWindow(),
+    KNotification *notification = KNotification::event(type, message, icon::get("dialog-information").pixmap(48), QtUi::mainWindow(),
         KNotification::RaiseWidgetOnActivation
         |KNotification::CloseWhenWidgetActivated
         |KNotification::CloseOnTimeout);
-    connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
+    connect(notification, selectOverload<uint>(&KNotification::activated), this, selectOverload<>(&KNotificationBackend::notificationActivated));
     notification->setActions(QStringList("View"));
     notification->setProperty("notificationId", n.notificationId);
 
@@ -154,7 +146,7 @@ KNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(_widget);
 
-    connect(_widget, SIGNAL(changed(bool)), SLOT(widgetChanged(bool)));
+    connect(_widget, &KNotifyConfigWidget::changed, this, &ConfigWidget::widgetChanged);
 }