PE: Replace QRegExp by QRegularExpression

Task-number: QTCREATORBUG-24098
Change-Id: I2d83026b7733d83a68c1ddcca6b409d3c3125fb5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/projectexplorer/addrunconfigdialog.cpp

@@ -39,7 +39,6 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QRegExp>
 #include <QSortFilterProxyModel>
 #include <QVBoxLayout>
 

src/plugins/projectexplorer/allprojectsfind.cpp

@@ -36,11 +36,9 @@
 #include <utils/filesearch.h>
 #include <utils/algorithm.h>
 
-#include <QSettings>
-#include <QRegExp>
-
 #include <QGridLayout>
 #include <QLabel>
+#include <QSettings>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;

src/plugins/projectexplorer/customwizard/customwizardpage.cpp

@@ -31,7 +31,6 @@
 #include <utils/textfieldcheckbox.h>
 #include <utils/textfieldcombobox.h>
 
-#include <QRegExp>
 #include <QDebug>
 #include <QDir>
 #include <QDate>

src/plugins/projectexplorer/osparser.h

@@ -29,8 +29,6 @@
 
 #include <projectexplorer/task.h>
 
-#include <QRegExp>
-
 namespace ProjectExplorer {
 
 class PROJECTEXPLORER_EXPORT OsParser : public ProjectExplorer::OutputTaskParser

src/plugins/projectexplorer/xcodebuildparser.cpp

@@ -42,13 +42,13 @@ static const char buildRe[] = "=== BUILD (AGGREGATE )?TARGET (.*) OF PROJECT (.*
 static const char signatureChangeEndsWithPattern[] = ": replacing existing signature";
 
 XcodebuildParser::XcodebuildParser()
+    : m_failureRe(QLatin1String(failureRe))
+    , m_successRe(QLatin1String(successRe))
+    , m_buildRe(QLatin1String(buildRe))
 {
     setObjectName(QLatin1String("XcodeParser"));
-    m_failureRe.setPattern(QLatin1String(failureRe));
     QTC_CHECK(m_failureRe.isValid());
-    m_successRe.setPattern(QLatin1String(successRe));
     QTC_CHECK(m_successRe.isValid());
-    m_buildRe.setPattern(QLatin1String(buildRe));
     QTC_CHECK(m_buildRe.isValid());
 }
 
@@ -56,15 +56,17 @@ OutputLineParser::Result XcodebuildParser::handleLine(const QString &line, Outpu
 {
     const QString lne = rightTrimmed(line);
     if (type == StdOutFormat) {
-        if (m_buildRe.indexIn(lne) > -1) {
+        QRegularExpressionMatch match = m_buildRe.match(line);
+        if (match.hasMatch()) {
             m_xcodeBuildParserState = InXcodebuild;
-            m_lastTarget = m_buildRe.cap(2);
-            m_lastProject = m_buildRe.cap(3);
+            m_lastTarget = match.captured(2);
+            m_lastProject = match.captured(3);
             return Status::Done;
         }
         if (m_xcodeBuildParserState == InXcodebuild
                 || m_xcodeBuildParserState == UnknownXcodebuildState) {
-            if (m_successRe.indexIn(lne) > -1) {
+            match = m_successRe.match(lne);
+            if (match.hasMatch()) {
                 m_xcodeBuildParserState = OutsideXcodebuild;
                 return Status::Done;
             }
@@ -83,7 +85,8 @@ OutputLineParser::Result XcodebuildParser::handleLine(const QString &line, Outpu
         }
         return Status::NotHandled;
     }
-    if (m_failureRe.indexIn(lne) > -1) {
+    const QRegularExpressionMatch match = m_failureRe.match(lne);
+    if (match.hasMatch()) {
         ++m_fatalErrorCount;
         m_xcodeBuildParserState = UnknownXcodebuildState;
         // unfortunately the m_lastTarget, m_lastProject might not be in sync

src/plugins/projectexplorer/xcodebuildparser.h

@@ -29,7 +29,7 @@
 #include "ioutputparser.h"
 #include "devicesupport/idevice.h"
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 
 namespace ProjectExplorer {
@@ -52,9 +52,9 @@ private:
     bool hasFatalErrors() const override { return m_fatalErrorCount > 0; }
 
     int m_fatalErrorCount = 0;
-    QRegExp m_failureRe;
-    QRegExp m_successRe;
-    QRegExp m_buildRe;
+    const QRegularExpression m_failureRe;
+    const QRegularExpression m_successRe;
+    const QRegularExpression m_buildRe;
     XcodebuildStatus m_xcodeBuildParserState = OutsideXcodebuild;
     QString m_lastTarget;
     QString m_lastProject;