From dae6003f55206168e6d3c5cbace84e5b0c65990c Mon Sep 17 00:00:00 2001 From: Bas Pape Date: Sat, 20 Apr 2013 13:24:34 +0200 Subject: [PATCH] Qt::escape moved to QString::toHtmlEscaped in Qt 5 --- src/client/networkmodel.cpp | 15 +++++++++++++++ src/qtui/knotificationbackend.cpp | 4 ++++ src/qtui/statusnotifieritem.cpp | 4 ++++ src/qtui/topicwidget.cpp | 8 ++++++++ src/uisupport/multilineedit.cpp | 4 ++++ src/uisupport/styledlabel.cpp | 4 ++++ 6 files changed, 39 insertions(+) diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 00811d83..63a123e6 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -22,7 +22,9 @@ #include #include +#if QT_VERSION < 0x050000 #include // for Qt::escape() +#endif #include "buffermodel.h" #include "buffersettings.h" @@ -209,8 +211,13 @@ QString NetworkItem::toolTip(int column) const { Q_UNUSED(column); +#if QT_VERSION < 0x050000 QStringList toolTip(QString("%1").arg(Qt::escape(networkName()))); toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer()))); +#else + QStringList toolTip(QString("%1").arg(networkName().toHtmlEscaped())); + toolTip.append(tr("Server: %1").arg(currentServer().toHtmlEscaped())); +#endif toolTip.append(tr("Users: %1").arg(nickCount())); if (_network) { @@ -572,7 +579,11 @@ QString ChannelBufferItem::toolTip(int column) const Q_UNUSED(column); QStringList toolTip; +#if QT_VERSION < 0x050000 toolTip.append(tr("Channel %1").arg(Qt::escape(bufferName()))); +#else + toolTip.append(tr("Channel %1").arg(bufferName().toHtmlEscaped())); +#endif if (isActive()) { //TODO: add channel modes toolTip.append(tr("Users: %1").arg(nickCount())); @@ -588,7 +599,11 @@ QString ChannelBufferItem::toolTip(int column) const QString _topic = topic(); if (_topic != "") { _topic = stripFormatCodes(_topic); +#if QT_VERSION < 0x050000 _topic = Qt::escape(_topic); +#else + _topic = _topic.toHtmlEscaped(); +#endif toolTip.append(QString(" ")); toolTip.append(tr("Topic: %1").arg(_topic)); } diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp index 6a2908eb..20d84d90 100644 --- a/src/qtui/knotificationbackend.cpp +++ b/src/qtui/knotificationbackend.cpp @@ -56,7 +56,11 @@ void KNotificationBackend::notify(const Notification &n) type = "PrivMsgFocused"; break; } +#if QT_VERSION < 0x050000 QString message = QString("<%1> %2").arg(n.sender, Qt::escape(n.message)); +#else + QString message = QString("<%1> %2").arg(n.sender, n.message.toHtmlEscaped()); +#endif 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 4eb73b36..df04252b 100644 --- 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) +#if QT_VERSION < 0x050000 message = Qt::escape(message); +#else + message = message.toHtmlEscaped(); +#endif QStringList actions; if (_notificationsClientSupportsActions) diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp index ed02936e..ae835013 100644 --- 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) { +#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())); +#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(); diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp index c56b03cd..f5ed3172 100644 --- 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 += "

"; for (int i = 0; i < 4; i++) { +#if QT_VERSION < 0x050000 msg += Qt::escape(lines[i].left(40)); +#else + msg += lines[i].left(40).toHtmlEscaped(); +#endif if (lines[i].count() > 40) msg += "..."; msg += "
"; diff --git a/src/uisupport/styledlabel.cpp b/src/uisupport/styledlabel.cpp index af294c40..4aac9945 100644 --- 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()) +#if QT_VERSION < 0x050000 setToolTip(QString("%1").arg(Qt::escape(_layout.text()))); // only rich text gets wordwrapped! +#else + setToolTip(QString("%1").arg(_layout.text().toHtmlEscaped())); // only rich text gets wordwrapped! +#endif else setToolTip(QString()); } -- 2.20.1