summaryrefslogtreecommitdiffstats
path: root/src/qdbus/qdbusviewer/qdbusviewer.cpp
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-09-30 15:37:58 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-30 08:06:01 +0200
commite3a679e7330af8168d5ebcfb4331cb115ddeeff5 (patch)
tree01c8557a8598c7f1d3b2615dbd1cdced7806f9fc /src/qdbus/qdbusviewer/qdbusviewer.cpp
parentd59c6ba36cdcc85f66019ab90bfcaeb734501010 (diff)
Fixed compile (Qt::escape -> toHtmlEscaped())
Fixed compile after source-incompatible qtbase change b863df7de926448cf0057272c16da04b7cfb11ee . Change-Id: I400ead7bd2ec80057dba9c4c3163427ffa4b7c4c Reviewed-on: http://codereview.qt-project.org/5830 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/qdbus/qdbusviewer/qdbusviewer.cpp')
-rw-r--r--src/qdbus/qdbusviewer/qdbusviewer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 8d86353c2..893baa4dc 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -159,7 +159,7 @@ void QDBusViewer::logMessage(const QString &msg)
void QDBusViewer::logError(const QString &msg)
{
- log->append(QLatin1String("<font color=\"red\">Error: </font>") + Qt::escape(msg) + QLatin1String("<br>"));
+ log->append(QLatin1String("<font color=\"red\">Error: </font>") + msg.toHtmlEscaped() + QLatin1String("<br>"));
}
void QDBusViewer::refresh()
@@ -411,7 +411,7 @@ void QDBusViewer::dumpMessage(const QDBusMessage &message)
} else {
out += QLatin1String("&nbsp;&nbsp;Arguments: ");
foreach (QVariant arg, args) {
- QString str = Qt::escape(QDBusUtil::argumentToString(arg));
+ QString str = QDBusUtil::argumentToString(arg).toHtmlEscaped();
// turn object paths into clickable links
str.replace(objectPathRegExp, QLatin1String("[ObjectPath: <a href=\"qdbus://bus\\1\">\\1</a>]"));
out += str;