Replace QRegExp by QRegularExpression

Change-Id: I6c86565b8464efd0b7aec61c12879d3b95a5871c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index 7b21bc12a..0b472a668 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -102,7 +102,7 @@ void FileTagger::setPatterns(const QStringList &patterns)
     m_patterns.clear();
     for (const QString &pattern : patterns) {
         QBS_CHECK(!pattern.isEmpty());
-        m_patterns << QRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
+        m_patterns << QRegularExpression(QRegularExpression::wildcardToRegularExpression(pattern));
     }
 }
 
@@ -347,8 +347,8 @@ FileTags ResolvedProduct::fileTagsForFileName(const QString &fileName) const
     FileTags result;
     std::unique_ptr<int> priority;
     for (const FileTaggerConstPtr &tagger : qAsConst(fileTaggers)) {
-        for (const QRegExp &pattern : tagger->patterns()) {
-            if (FileInfo::globMatches(pattern, fileName)) {
+        for (const QRegularExpression &pattern : tagger->patterns()) {
+            if (pattern.match(fileName).hasMatch()) {
                 if (priority) {
                     if (*priority != tagger->priority()) {
                         // The taggers are expected to be sorted by priority.
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index bbd851333..23a5f1d1a 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -58,7 +58,7 @@
 #include <QtCore/qdatastream.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qprocess.h>
-#include <QtCore/qregexp.h>
+#include <QtCore/qregularexpression.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
@@ -88,7 +88,7 @@ public:
         return FileTaggerPtr(new FileTagger(patterns, fileTags, priority));
     }
 
-    const QList<QRegExp> &patterns() const { return m_patterns; }
+    const QList<QRegularExpression> &patterns() const { return m_patterns; }
     const FileTags &fileTags() const { return m_fileTags; }
     int priority() const { return m_priority; }
 
@@ -103,7 +103,7 @@ private:
 
     void setPatterns(const QStringList &patterns);
 
-    QList<QRegExp> m_patterns;
+    QList<QRegularExpression> m_patterns;
     FileTags m_fileTags;
     int m_priority = 0;
 };
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index fd6063381..4e8e94b4e 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -68,7 +68,7 @@
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
-#include <QtCore/qregexp.h>
+#include <QtCore/qregularexpression.h>
 
 #include <algorithm>
 #include <memory>
@@ -1052,12 +1052,12 @@ void ProjectResolver::setupExportedProperties(const Item *item, const QString &n
     std::sort(properties.begin(), properties.end(), less);
 }
 
-static bool usesImport(const ExportedProperty &prop, const QRegExp &regex)
+static bool usesImport(const ExportedProperty &prop, const QRegularExpression &regex)
 {
-    return regex.indexIn(prop.sourceCode) != -1;
+    return prop.sourceCode.indexOf(regex) != -1;
 }
 
-static bool usesImport(const ExportedItem &item, const QRegExp &regex)
+static bool usesImport(const ExportedItem &item, const QRegularExpression &regex)
 {
     return any_of(item.properties,
                   [regex](const ExportedProperty &p) { return usesImport(p, regex); })
@@ -1073,7 +1073,7 @@ static bool usesImport(const ExportedModule &module, const QString &name)
     // (3) var obj = DataCollection;
     const QString pattern = QStringLiteral("\\b%1\\b");
 
-    const QRegExp regex(pattern.arg(name)); // std::regex is much slower
+    const QRegularExpression regex(pattern.arg(name)); // std::regex is much slower
     return any_of(module.m_properties,
                   [regex](const ExportedProperty &p) { return usesImport(p, regex); })
             || any_of(module.children,