Migrate the service framework to QRegularExpression

This patch updates the service framework code to use QRegularExpression
in place of QRegExp which is to be considered deprecated.

Task-number: QTBUG-72593
Change-Id: Ic1f464d7af1bc075ff004c0c4cb8425a83efa649
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

2 files changed, 15 insertions, 12 deletions

diff --git a/src/serviceframework/qservicefilter.cpp b/src/serviceframework/qservicefilter.cpp
index 5bc0ddd8..de6a5648 100644
--- a/src/serviceframework/qservicefilter.cpp
+++ b/src/serviceframework/qservicefilter.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QDebug>
 #ifndef QT_NO_DATASTREAM
@@ -256,14 +256,15 @@ void QServiceFilter::setInterface(const QString &interfaceName, const QString& v
     // Match x.y as version format.
     // This differs from regex in servicemetadata in that 0.x versions are
     // accepted for the search filter.
-    QRegExp rx(QLatin1String("^(0+|[1-9][0-9]*)\\.(0+|[1-9][0-9]*)$"));
-    int pos = rx.indexIn(version);
-    QStringList list = rx.capturedTexts();
+    QRegularExpression rx(QLatin1String("^(0+|[1-9][0-9]*)\\.(0+|[1-9][0-9]*)$"));
+    QRegularExpressionMatch match = rx.match(version);
+    int pos = match.capturedStart();
+    QStringList list = match.capturedTexts();
     bool success = false;
     int temp_major = -1;
     int temp_minor = -1;
     if (pos == 0 && list.count() == 3
-            && rx.matchedLength() == version.length() )
+            && match.capturedLength() == version.length() )
     {
         temp_major = list[1].toInt(&success);
         if ( success ) {
diff --git a/src/serviceframework/servicemetadata.cpp b/src/serviceframework/servicemetadata.cpp
index a08b399a..c3a275f1 100644
--- a/src/serviceframework/servicemetadata.cpp
+++ b/src/serviceframework/servicemetadata.cpp
@@ -41,6 +41,7 @@
 #include <QFile>
 #include <QDataStream>
 #include <QDebug>
+#include <QRegularExpression>
 #include "qserviceinterfacedescriptor_p.h"
 
 //XML tags and attributes
@@ -673,12 +674,13 @@ bool ServiceMetaData::greaterThan(const QString &v1, const QString &v2) const
 bool ServiceMetaData::checkVersion(const QString &version) const
 {
     //match x.y as version format
-    QRegExp rx(QLatin1String("^([1-9][0-9]*)\\.(0+|[1-9][0-9]*)$"));
-    int pos = rx.indexIn(version);
-    QStringList list = rx.capturedTexts();
+    QRegularExpression rx(QLatin1String("^([1-9][0-9]*)\\.(0+|[1-9][0-9]*)$"));
+    QRegularExpressionMatch match = rx.match(version);
+    int pos = match.capturedStart();
+    QStringList list = match.capturedTexts();
     bool success = false;
     if (pos == 0 && list.count() == 3
-            && rx.matchedLength() == version.length() )
+            && match.capturedLength() == version.length() )
     {
         list[1].toInt(&success);
         if ( success ) {
@@ -696,9 +698,9 @@ void ServiceMetaData::transformVersion(const QString &version, int *major, int *
         *major = -1;
         *minor = -1;
     } else {
-        QRegExp rx(QLatin1String("^([1-9][0-9]*)\\.(0+|[1-9][0-9]*)$"));
-        rx.indexIn(version);
-        QStringList list = rx.capturedTexts();
+        QRegularExpression rx(QLatin1String("^([1-9][0-9]*)\\.(0+|[1-9][0-9]*)$"));
+        QRegularExpressionMatch match = rx.match(version);
+        QStringList list = match.capturedTexts();
         Q_ASSERT(list.count() == 3);
         *major = list[1].toInt();
         *minor = list[2].toInt();