Replace QRegExp with QRegularExpression (#2945)

2021-07-04 13:02:12 +02:00
parent 670ad90242
commit 3b0d62f5c5
2 changed files with 13 additions and 10 deletions
@@ -105,12 +105,15 @@ QString getJSONValue(QJsonValue responseJson, QString jsonPattern)

 QString getLinkFromResponse(NetworkResult response, QString pattern)
 {
-    QRegExp regExp("\\{(.+)\\}");
-    regExp.setMinimal(true);
-    while (regExp.indexIn(pattern) != -1)
+    QRegularExpression regExp("{(.+)}",
+                              QRegularExpression::InvertedGreedinessOption);
+    auto match = regExp.match(pattern);
+
+    while (match.hasMatch())
    {
-        pattern.replace(regExp.cap(0),
-                        getJSONValue(response.parseJson(), regExp.cap(1)));
+        pattern.replace(match.captured(0),
+                        getJSONValue(response.parseJson(), match.captured(1)));
+        match = regExp.match(pattern);
    }
    return pattern;
 }