Fix Qt::escape that is deprecated in Qt 5.0 use QString::toHtmlEscaped() instead

1 files changed, 26 insertions, 16 deletions

diff --git a/examples/qtmail/plugins/viewers/generic/browserwidget.cpp b/examples/qtmail/plugins/viewers/generic/browserwidget.cpp
index 0268d79c..4bb13dd4 100644
--- a/examples/qtmail/plugins/viewers/generic/browserwidget.cpp
+++ b/examples/qtmail/plugins/viewers/generic/browserwidget.cpp
@@ -87,6 +87,16 @@ static QString dateString(const QDateTime& dt)
     }
 }
 
+//QString Qt::escape ( const QString & plain ) is deprecated in Qt 5.0
+static QString htmlEscaped(const QString& plain)
+{
+#if QT_VERSION >= 0x050000
+    return plain.toHtmlEscaped();
+#else
+    return Qt::escape(plain);
+#endif
+}
+
 #if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
 
 QT_BEGIN_NAMESPACE
@@ -406,10 +416,10 @@ void BrowserWidget::setPartResource(const QMailMessagePart& part)
     QString name(part.displayName());
     if (!name.isEmpty()) {
         // use 'qmf-part' url scheme to ensure inline images without a contentId are rendered
-        names.insert(QUrl("qmf-part:" + Qt::escape(name)));
+        names.insert(QUrl("qmf-part:" + htmlEscaped(name)));
     }
 
-    name = Qt::escape(part.contentID());
+    name = htmlEscaped(part.contentID());
     if (!name.isEmpty()) {
         // We can only resolve URLs using the cid: scheme
         if (name.startsWith("cid:", Qt::CaseInsensitive)) {
@@ -421,10 +431,10 @@ void BrowserWidget::setPartResource(const QMailMessagePart& part)
 #else
     QString name(part.displayName());
     if (!name.isEmpty()) {
-        names.insert(QUrl(Qt::escape(name)));
+        names.insert(QUrl(htmlEscaped(name)));
     }
 
-    name = Qt::escape(part.contentID());
+    name = htmlEscaped(part.contentID());
     if (!name.isEmpty()) {
         // Add the content both with and without the cid: prefix
         names.insert(name);
@@ -437,7 +447,7 @@ void BrowserWidget::setPartResource(const QMailMessagePart& part)
 
     name = part.contentType().name();
     if (!name.isEmpty()) {
-        names.insert(QUrl(Qt::escape(name)));
+        names.insert(QUrl(htmlEscaped(name)));
     }
 #endif
 
@@ -669,7 +679,7 @@ QString BrowserWidget::renderSimplePart(const QMailMessagePart& part)
 {
     QString result;
 
-    QString partId = Qt::escape(part.displayName());
+    QString partId = htmlEscaped(part.displayName());
 
     QMailMessageContentType contentType = part.contentType();
     if ( contentType.type().toLower() == "text") { // No tr
@@ -702,7 +712,7 @@ QString BrowserWidget::renderSimplePart(const QMailMessagePart& part)
 
 QString BrowserWidget::renderAttachment(const QMailMessagePart& part)
 {
-    QString partId = Qt::escape(part.displayName());
+    QString partId = htmlEscaped(part.displayName());
 
     QString attachmentTemplate = 
 "<hr><b>ATTACHMENT_TEXT</b>: <a href=\"attachment;ATTACHMENT_ACTION;ATTACHMENT_LOCATION\">NAME_TEXT</a>DISPOSITION<br>";
@@ -927,7 +937,7 @@ void BrowserWidget::displayHtml(const QMailMessage* mail)
 
     headerTemplate = replaceLast(headerTemplate, "HIGHLIGHT_COLOR", palette().color(QPalette::Highlight).name());
     headerTemplate = replaceLast(headerTemplate, "LINK_COLOR", palette().color(QPalette::HighlightedText).name());
-    headerTemplate = replaceLast(headerTemplate, "SUBJECT_TEXT", Qt::escape(subjectText));
+    headerTemplate = replaceLast(headerTemplate, "SUBJECT_TEXT", htmlEscaped(subjectText));
     headerTemplate = replaceLast(headerTemplate, "WINDOW_COLOR", palette().color(QPalette::Window).name());
 
     QString itemTemplate =
@@ -942,7 +952,7 @@ void BrowserWidget::displayHtml(const QMailMessage* mail)
 
     QString metadataText;
     foreach (const TextPair item, metadata) {
-        QString element = replaceLast(itemTemplate, "ID_TEXT", Qt::escape(item.first));
+        QString element = replaceLast(itemTemplate, "ID_TEXT", htmlEscaped(item.first));
         element = replaceLast(element, "CONTENT_TEXT", item.second);
         metadataText.append(element);
     }
@@ -1376,7 +1386,7 @@ QString BrowserWidget::encodeUrlAndMail(const QString& txt)
         }
 
         // Write the unmatched text out in escaped form
-        result.append(Qt::escape(txt.mid(lastPos, (*matchPos - lastPos))));
+        result.append(htmlEscaped(txt.mid(lastPos, (*matchPos - lastPos))));
 
         result.append(replacement);
 
@@ -1397,7 +1407,7 @@ QString BrowserWidget::encodeUrlAndMail(const QString& txt)
     }
 
     if (lastPos < txt.length()) {
-        result.append(Qt::escape(txt.mid(lastPos)));
+        result.append(htmlEscaped(txt.mid(lastPos)));
     }
 
     return result.join("");
@@ -1461,28 +1471,28 @@ QString BrowserWidget::listRefMailTo(const QList<QMailAddress>& list)
 
 QString BrowserWidget::refMailTo(const QMailAddress& address)
 {
-    QString name = Qt::escape(address.toString());
+    QString name = htmlEscaped(address.toString());
     if (name == "System")
         return name;
 
     if (address.isPhoneNumber() || address.isEmailAddress())
-        return "<a href=\"mailto:" + Qt::escape(address.address()) + "\">" + name + "</a>";
+        return "<a href=\"mailto:" + htmlEscaped(address.address()) + "\">" + name + "</a>";
 
     return name;
 }
 
 QString BrowserWidget::refNumber(const QString& number)
 {
-    return "<a href=\"dial;" + Qt::escape(number) + "\">" + number + "</a>";
+    return "<a href=\"dial;" + htmlEscaped(number) + "\">" + number + "</a>";
 }
 
 QString BrowserWidget::refUrl(const QString& url, const QString& scheme, const QString& leading, const QString& trailing)
 {
     // Assume HTTP if there is no scheme
-    QString escaped(Qt::escape(url));
+    QString escaped(htmlEscaped(url));
     QString target(scheme.isEmpty() ? "http://" + escaped : escaped);
 
-    return Qt::escape(leading) + "<a href=\"" + target + "\">" + escaped + "</a>" + Qt::escape(trailing);
+    return htmlEscaped(leading) + "<a href=\"" + target + "\">" + escaped + "</a>" + htmlEscaped(trailing);
 }
 
 #include "browserwidget.moc"