projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use raw string literals instead of escaped strings
[quassel.git]
/
src
/
qtui
/
knotificationbackend.cpp
diff --git
a/src/qtui/knotificationbackend.cpp
b/src/qtui/knotificationbackend.cpp
index
1b09927
..
9ca881e
100644
(file)
--- a/
src/qtui/knotificationbackend.cpp
+++ b/
src/qtui/knotificationbackend.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,19
+20,14
@@
#include "knotificationbackend.h"
#include "knotificationbackend.h"
-#include <QIcon>
#include <QTextDocument>
#include <QVBoxLayout>
#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 "client.h"
+#include "icon.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
@@
-61,12
+56,8
@@
void KNotificationBackend::notify(const Notification &n)
type = "PrivMsgFocused"; break;
}
type = "PrivMsgFocused"; break;
}
-#if QT_VERSION < 0x050000
- QString message = QString("<b><%1></b> %2").arg(n.sender, Qt::escape(n.message));
-#else
QString message = QString("<b><%1></b> %2").arg(n.sender, n.message.toHtmlEscaped());
QString message = QString("<b><%1></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);
KNotification::RaiseWidgetOnActivation
|KNotification::CloseWhenWidgetActivated
|KNotification::CloseOnTimeout);
@@
-77,7
+68,6
@@
void KNotificationBackend::notify(const Notification &n)
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
updateToolTip();
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
updateToolTip();
- QtUi::mainWindow()->systemTray()->setAlert(true);
}
}
@@
-101,7
+91,6
@@
void KNotificationBackend::close(uint notificationId)
{
removeNotificationById(notificationId);
//if(!_notifications.count()) // FIXME make configurable
{
removeNotificationById(notificationId);
//if(!_notifications.count()) // FIXME make configurable
- QtUi::mainWindow()->systemTray()->setAlert(false);
}
}