From e817100b9cddad04c6b65c5d3985f3fe3e54ee06 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 19 Jun 2020 14:09:27 +0200
Subject: [PATCH] Utils: Replace some QRegExp to QRegularExpression

Task-number: QTCREATORBUG-24098
Change-Id: I7d12992506bbe33306c0ab750f73c7db1626abc3
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/qmldebug/qmloutputparser.cpp |  9 +++++----
 src/libs/utils/consoleprocess.cpp     |  4 ++--
 src/libs/utils/outputformatter.cpp    |  1 -
 src/libs/utils/outputformatter.h      |  1 -
 src/libs/utils/persistentsettings.cpp | 11 ++++++-----
 src/libs/utils/settingsaccessor.cpp   |  1 -
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/libs/qmldebug/qmloutputparser.cpp b/src/libs/qmldebug/qmloutputparser.cpp
index 9e6102598b7..4b13cad2cdb 100644
--- a/src/libs/qmldebug/qmloutputparser.cpp
+++ b/src/libs/qmldebug/qmloutputparser.cpp
@@ -25,7 +25,7 @@
 
 #include "qmloutputparser.h"
 #include "qmldebugconstants.h"
-#include <QRegExp>
+#include <QRegularExpression>
 
 namespace QmlDebug {
 
@@ -78,11 +78,12 @@ void QmlOutputParser::processOutput(const QString &output)
             if (status.startsWith(waitingForConnection)) {
                 status.remove(0, waitingForConnection.size()); // chop of 'Waiting for connection '
 
-                static QRegExp waitingTcp(
+                static QRegularExpression waitingTcp(
                             QString::fromLatin1(Constants::STR_ON_PORT_PATTERN));
-                if (waitingTcp.indexIn(status) > -1) {
+                const QRegularExpressionMatch match = waitingTcp.match(status);
+                if (match.hasMatch()) {
                     bool canConvert;
-                    quint16 port = waitingTcp.cap(1).toUShort(&canConvert);
+                    quint16 port = match.captured(1).toUShort(&canConvert);
                     if (canConvert)
                         emit waitingForConnectionOnPort(Utils::Port(port));
                     continue;
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index b0b684428ae..0edcd131638 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -424,13 +424,13 @@ bool ConsoleProcess::start()
         const QStringList fixedEnvironment = [env] {
             QStringList envStrings = env;
             // add PATH if necessary (for DLL loading)
-            if (envStrings.filter(QRegExp(QLatin1String("^PATH="),Qt::CaseInsensitive)).isEmpty()) {
+            if (envStrings.filter(QRegularExpression("^PATH=.*", QRegularExpression::CaseInsensitiveOption)).isEmpty()) {
                 QByteArray path = qgetenv("PATH");
                 if (!path.isEmpty())
                     envStrings.prepend(QString::fromLatin1("PATH=%1").arg(QString::fromLocal8Bit(path)));
             }
             // add systemroot if needed
-            if (envStrings.filter(QRegExp(QLatin1String("^SystemRoot="),Qt::CaseInsensitive)).isEmpty()) {
+            if (envStrings.filter(QRegularExpression("^SystemRoot=.*", QRegularExpression::CaseInsensitiveOption)).isEmpty()) {
                 QByteArray systemRoot = qgetenv("SystemRoot");
                 if (!systemRoot.isEmpty())
                     envStrings.prepend(QString::fromLatin1("SystemRoot=%1").arg(QString::fromLocal8Bit(systemRoot)));
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index ac4412c8d3c..31ed8100128 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -37,7 +37,6 @@
 #include <QPair>
 #include <QPlainTextEdit>
 #include <QPointer>
-#include <QRegExp>
 #include <QRegularExpressionMatch>
 #include <QTextCursor>
 
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index 7d0a4f54284..6cc9ca7b80f 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -36,7 +36,6 @@
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
-class QRegExp;
 class QRegularExpressionMatch;
 class QTextCharFormat;
 class QTextCursor;
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 39418816e05..d17a578292a 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -33,7 +33,7 @@
 #include <QXmlStreamWriter>
 #include <QDateTime>
 #include <QTextStream>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QRect>
 
 #ifdef QT_GUI_LIB
@@ -59,11 +59,12 @@ static QString rectangleToString(const QRect &r)
 
 static QRect stringToRectangle(const QString &v)
 {
-    static QRegExp pattern(QLatin1String("(\\d+)x(\\d+)([-+]\\d+)([-+]\\d+)"));
+    static QRegularExpression pattern("^(\\d+)x(\\d+)([-+]\\d+)([-+]\\d+)$");
     Q_ASSERT(pattern.isValid());
-    return pattern.exactMatch(v) ?
-        QRect(QPoint(pattern.cap(3).toInt(), pattern.cap(4).toInt()),
-              QSize(pattern.cap(1).toInt(), pattern.cap(2).toInt())) :
+    const QRegularExpressionMatch match = pattern.match(v);
+    return match.hasMatch() ?
+        QRect(QPoint(match.captured(3).toInt(), match.captured(4).toInt()),
+              QSize(match.captured(1).toInt(), match.captured(2).toInt())) :
         QRect();
 }
 
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index 6c692ed2142..709c5c823bd 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -31,7 +31,6 @@
 #include <QApplication>
 #include <QDebug>
 #include <QDir>
-#include <QRegExp>
 
 namespace {