summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qregularexpression.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-03-31 14:12:50 +0200
committerLars Knoll <lars.knoll@qt.io>2020-04-15 14:38:05 +0200
commitcb1000ea02a42de0f79ff8db97219a9923d3efdf (patch)
treea8fe635c88a2870ec12aa7ef9aba576a863ce6fd /src/corelib/text/qregularexpression.h
parent4b37abc0c9c1a0e1bdb182e725e31daaf610dc7a (diff)
Add WildcardConversionOptions to QRegularExpression
There are cases, where the conversion from a wildcard pattern to a regular expression should not lead to an anchored pattern. Allow this, but adding an optional second argument to wildcardToRegularExpression, that allows tuning the conversion. Change-Id: Ida7a32d65ee49bf58d5f8d9906c0a0cd8954a02a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/corelib/text/qregularexpression.h')
-rw-r--r--src/corelib/text/qregularexpression.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/corelib/text/qregularexpression.h b/src/corelib/text/qregularexpression.h
index aa6c48bf54..cfb7f34d9d 100644
--- a/src/corelib/text/qregularexpression.h
+++ b/src/corelib/text/qregularexpression.h
@@ -138,15 +138,21 @@ public:
void optimize() const;
+ enum WildcardConversionOption {
+ DefaultWildcardConversion = 0x0,
+ UnanchoredWildcardConversion = 0x1
+ };
+ Q_DECLARE_FLAGS(WildcardConversionOptions, WildcardConversionOption)
+
#if QT_STRINGVIEW_LEVEL < 2
static QString escape(const QString &str)
{
return escape(qToStringViewIgnoringNull(str));
}
- static QString wildcardToRegularExpression(const QString &str)
+ static QString wildcardToRegularExpression(const QString &str, WildcardConversionOptions options = DefaultWildcardConversion)
{
- return wildcardToRegularExpression(qToStringViewIgnoringNull(str));
+ return wildcardToRegularExpression(qToStringViewIgnoringNull(str), options);
}
static inline QString anchoredPattern(const QString &expression)
@@ -156,7 +162,7 @@ public:
#endif
static QString escape(QStringView str);
- static QString wildcardToRegularExpression(QStringView str);
+ static QString wildcardToRegularExpression(QStringView str, WildcardConversionOptions options = DefaultWildcardConversion);
static QString anchoredPattern(QStringView expression);
bool operator==(const QRegularExpression &re) const;