Replace use of deprecated Qt::escape

qgis · Sep 5, 2017 · 77c4edf · 77c4edf
1 parent 84774ee
commit 77c4edf
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/core/qgsstringutils.cpp b/src/core/qgsstringutils.cpp
@@ -16,7 +16,6 @@
 #include "qgsstringutils.h"
 #include <QVector>
 #include <QRegExp>
-#include <QTextDocument> // for Qt::escape
 #include <QStringList>
 #include <QTextBoundaryFinder>
 
@@ -362,7 +361,7 @@ QString QgsStringUtils::insertLinks( const QString &string, bool *foundLinks )
     {
       protoUrl.prepend( "http://" );
     }
-    QString anchor = QStringLiteral( "<a href=\"%1\">%2</a>" ).arg( Qt::escape( protoUrl ), Qt::escape( url ) );
+    QString anchor = QStringLiteral( "<a href=\"%1\">%2</a>" ).arg( protoUrl.toHtmlEscaped(), url.toHtmlEscaped() );
     converted.replace( urlRegEx.pos( 1 ), url.length(), anchor );
     offset = urlRegEx.pos( 1 ) + anchor.length();
   }
@@ -371,7 +370,7 @@ QString QgsStringUtils::insertLinks( const QString &string, bool *foundLinks )
   {
     found = true;
     QString email = emailRegEx.cap( 1 );
-    QString anchor = QStringLiteral( "<a href=\"mailto:%1\">%1</a>" ).arg( Qt::escape( email ), Qt::escape( email ) );
+    QString anchor = QStringLiteral( "<a href=\"mailto:%1\">%1</a>" ).arg( email.toHtmlEscaped(), email.toHtmlEscaped() );
     converted.replace( emailRegEx.pos( 1 ), email.length(), anchor );
     offset = emailRegEx.pos( 1 ) + anchor.length();
   }