From: Daniel Vrátil <dvratil@kde.org>
Date: Thu, 08 Sep 2016 22:11:06 +0000
Subject: Port from QRegExp to QRegularExpression
X-Git-Tag: v5.27.0
X-Git-Url: http://quickgit.kde.org/?p=kbookmarks.git&a=commitdiff&h=68db76e9d8afce989d246768ebed7a12f9414b34
---
Port from QRegExp to QRegularExpression

Fixes crash on app shutdown due to QRegExp and QStringLiteral
combination

REVIEW: 128650
---


--- a/src/kbookmarkimporter_ie.cpp
+++ b/src/kbookmarkimporter_ie.cpp
@@ -24,6 +24,7 @@
 #include <QtCore/QDebug>
 #include <qtextcodec.h>
 #include <QApplication>
+#include <QRegularExpression>
 
 #include <qplatformdefs.h>
 
@@ -74,9 +75,10 @@
                 continue;
             }
             QByteArray t = s.trimmed();
-            QRegExp rx(QStringLiteral("URL=(.*)"));
-            if (rx.exactMatch(t)) {
-                emit newBookmark(name, rx.cap(1), QLatin1String(""));
+            QRegularExpression rx(QStringLiteral("URL=(.*)"));
+            auto match = rx.match(t);
+            if (match.hasMatch()) {
+                emit newBookmark(name, match.captured(1), QLatin1String(""));
             }
         }
 
@@ -177,7 +179,7 @@
 static QString ieStyleQuote(const QString &str)
 {
     QString s(str);
-    s.replace(QRegExp(QStringLiteral("[/\\:*?\"<>|]")), QStringLiteral("_"));
+    s.replace(QRegularExpression(QStringLiteral("[/\\:*?\"<>|]")), QStringLiteral("_"));
     return s;
 }
 

--- a/src/kbookmarkmanager.cpp
+++ b/src/kbookmarkmanager.cpp
@@ -26,7 +26,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QProcess>
-#include <QtCore/QRegExp>
+#include <QtCore/QRegularExpression>
 #include <QtCore/QTextStream>
 #include <QTextCodec>
 #include <QDBusConnection>
@@ -534,7 +534,7 @@
     // qDebug() << "KBookmarkManager::findByAddress " << address;
     KBookmark result = root();
     // The address is something like /5/10/2+
-    const QStringList addresses = address.split(QRegExp(QStringLiteral("[/+]")), QString::SkipEmptyParts);
+    const QStringList addresses = address.split(QRegularExpression(QStringLiteral("[/+]")), QString::SkipEmptyParts);
     // qWarning() << addresses.join(",");
     for (QStringList::const_iterator it = addresses.begin(); it != addresses.end();) {
         bool append = ((*it) == QLatin1String("+"));