aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/projectresolver.cpp
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2020-07-22 14:54:08 +0200
committerChristian Stenger <christian.stenger@qt.io>2020-07-23 14:47:26 +0000
commit36caa1f292ddfd45b877d331e6d68f813563d259 (patch)
tree28b703a7c0beb14466ebc1e2682d3f76837aadbe /src/lib/corelib/language/projectresolver.cpp
parent7401a6bc4e53d920fd7ced3249c735fd232d191c (diff)
Replace QRegExp by QRegularExpression
Change-Id: I6c86565b8464efd0b7aec61c12879d3b95a5871c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
-rw-r--r--src/lib/corelib/language/projectresolver.cpp10
1 files changed, 5 insertions, 5 deletions
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,