projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99678e1
)
Qt::escape moved to QString::toHtmlEscaped in Qt 5
author
Bas Pape
<baspape@gmail.com>
Sat, 20 Apr 2013 11:24:34 +0000
(13:24 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 24 Mar 2014 23:21:25 +0000
(
00:21
+0100)
src/client/networkmodel.cpp
patch
|
blob
|
history
src/qtui/knotificationbackend.cpp
patch
|
blob
|
history
src/qtui/statusnotifieritem.cpp
patch
|
blob
|
history
src/qtui/topicwidget.cpp
patch
|
blob
|
history
src/uisupport/multilineedit.cpp
patch
|
blob
|
history
src/uisupport/styledlabel.cpp
patch
|
blob
|
history
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
00811d8
..
63a123e
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-22,7
+22,9
@@
#include <QAbstractItemView>
#include <QMimeData>
#include <QAbstractItemView>
#include <QMimeData>
+#if QT_VERSION < 0x050000
#include <QTextDocument> // for Qt::escape()
#include <QTextDocument> // for Qt::escape()
+#endif
#include "buffermodel.h"
#include "buffersettings.h"
#include "buffermodel.h"
#include "buffersettings.h"
@@
-209,8
+211,13
@@
QString NetworkItem::toolTip(int column) const
{
Q_UNUSED(column);
{
Q_UNUSED(column);
+#if QT_VERSION < 0x050000
QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
+#else
+ QStringList toolTip(QString("<b>%1</b>").arg(networkName().toHtmlEscaped()));
+ toolTip.append(tr("Server: %1").arg(currentServer().toHtmlEscaped()));
+#endif
toolTip.append(tr("Users: %1").arg(nickCount()));
if (_network) {
toolTip.append(tr("Users: %1").arg(nickCount()));
if (_network) {
@@
-572,7
+579,11
@@
QString ChannelBufferItem::toolTip(int column) const
Q_UNUSED(column);
QStringList toolTip;
Q_UNUSED(column);
QStringList toolTip;
+#if QT_VERSION < 0x050000
toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
+#else
+ toolTip.append(tr("<b>Channel %1</b>").arg(bufferName().toHtmlEscaped()));
+#endif
if (isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
if (isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
@@
-588,7
+599,11
@@
QString ChannelBufferItem::toolTip(int column) const
QString _topic = topic();
if (_topic != "") {
_topic = stripFormatCodes(_topic);
QString _topic = topic();
if (_topic != "") {
_topic = stripFormatCodes(_topic);
+#if QT_VERSION < 0x050000
_topic = Qt::escape(_topic);
_topic = Qt::escape(_topic);
+#else
+ _topic = _topic.toHtmlEscaped();
+#endif
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
diff --git
a/src/qtui/knotificationbackend.cpp
b/src/qtui/knotificationbackend.cpp
index
6a2908e
..
20d84d9
100644
(file)
--- a/
src/qtui/knotificationbackend.cpp
+++ b/
src/qtui/knotificationbackend.cpp
@@
-56,7
+56,11
@@
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));
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());
+#endif
KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
KNotification::RaiseWidgetOnActivation
|KNotification::CloseWhenWidgetActivated
KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
KNotification::RaiseWidgetOnActivation
|KNotification::CloseWhenWidgetActivated
diff --git
a/src/qtui/statusnotifieritem.cpp
b/src/qtui/statusnotifieritem.cpp
index
4eb73b3
..
df04252
100644
(file)
--- a/
src/qtui/statusnotifieritem.cpp
+++ b/
src/qtui/statusnotifieritem.cpp
@@
-314,7
+314,11
@@
void StatusNotifierItem::showMessage(const QString &title, const QString &messag
QString message = message_;
if (_notificationsClient->isValid()) {
if (_notificationsClientSupportsMarkup)
QString message = message_;
if (_notificationsClient->isValid()) {
if (_notificationsClientSupportsMarkup)
+#if QT_VERSION < 0x050000
message = Qt::escape(message);
message = Qt::escape(message);
+#else
+ message = message.toHtmlEscaped();
+#endif
QStringList actions;
if (_notificationsClientSupportsActions)
QStringList actions;
if (_notificationsClientSupportsActions)
diff --git
a/src/qtui/topicwidget.cpp
b/src/qtui/topicwidget.cpp
index
ed02936
..
ae83501
100644
(file)
--- a/
src/qtui/topicwidget.cpp
+++ b/
src/qtui/topicwidget.cpp
@@
-114,11
+114,19
@@
void TopicWidget::setTopic(const QModelIndex &index)
switch (Client::networkModel()->bufferType(id)) {
case BufferInfo::StatusBuffer:
if (network) {
switch (Client::networkModel()->bufferType(id)) {
case BufferInfo::StatusBuffer:
if (network) {
+#if QT_VERSION < 0x050000
newtopic = QString("%1 (%2) | %3 | %4")
.arg(Qt::escape(network->networkName()))
.arg(Qt::escape(network->currentServer()))
.arg(tr("Users: %1").arg(network->ircUsers().count()))
.arg(tr("Lag: %1 msecs").arg(network->latency()));
newtopic = QString("%1 (%2) | %3 | %4")
.arg(Qt::escape(network->networkName()))
.arg(Qt::escape(network->currentServer()))
.arg(tr("Users: %1").arg(network->ircUsers().count()))
.arg(tr("Lag: %1 msecs").arg(network->latency()));
+#else
+ newtopic = QString("%1 (%2) | %3 | %4")
+ .arg(network->networkName().toHtmlEscaped())
+ .arg(network->currentServer().toHtmlEscaped())
+ .arg(tr("Users: %1").arg(network->ircUsers().count()))
+ .arg(tr("Lag: %1 msecs").arg(network->latency()));
+#endif
}
else {
newtopic = index0.data(Qt::DisplayRole).toString();
}
else {
newtopic = index0.data(Qt::DisplayRole).toString();
diff --git
a/src/uisupport/multilineedit.cpp
b/src/uisupport/multilineedit.cpp
index
c56b03c
..
f5ed317
100644
(file)
--- a/
src/uisupport/multilineedit.cpp
+++ b/
src/uisupport/multilineedit.cpp
@@
-718,7
+718,11
@@
void MultiLineEdit::on_textChanged()
QString msg = tr("Do you really want to paste %n line(s)?", "", lines.count());
msg += "<p>";
for (int i = 0; i < 4; i++) {
QString msg = tr("Do you really want to paste %n line(s)?", "", lines.count());
msg += "<p>";
for (int i = 0; i < 4; i++) {
+#if QT_VERSION < 0x050000
msg += Qt::escape(lines[i].left(40));
msg += Qt::escape(lines[i].left(40));
+#else
+ msg += lines[i].left(40).toHtmlEscaped();
+#endif
if (lines[i].count() > 40)
msg += "...";
msg += "<br />";
if (lines[i].count() > 40)
msg += "...";
msg += "<br />";
diff --git
a/src/uisupport/styledlabel.cpp
b/src/uisupport/styledlabel.cpp
index
af294c4
..
4aac994
100644
(file)
--- a/
src/uisupport/styledlabel.cpp
+++ b/
src/uisupport/styledlabel.cpp
@@
-156,7
+156,11
@@
void StyledLabel::setText(const QString &text)
void StyledLabel::updateToolTip()
{
if (frameRect().width() - 2*frameWidth() < _layout.minimumWidth())
void StyledLabel::updateToolTip()
{
if (frameRect().width() - 2*frameWidth() < _layout.minimumWidth())
+#if QT_VERSION < 0x050000
setToolTip(QString("<qt>%1</qt>").arg(Qt::escape(_layout.text()))); // only rich text gets wordwrapped!
setToolTip(QString("<qt>%1</qt>").arg(Qt::escape(_layout.text()))); // only rich text gets wordwrapped!
+#else
+ setToolTip(QString("<qt>%1</qt>").arg(_layout.text().toHtmlEscaped())); // only rich text gets wordwrapped!
+#endif
else
setToolTip(QString());
}
else
setToolTip(QString());
}