From 91218299166942548cd0c1776d391f565249b112 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 2 Apr 2020 14:21:06 +0200 Subject: QRegularExpression: rename AnchoredMatchOption to AnchorAtOffsetMatchOption The name of the option may cause confusion due to the fact that it's not _fully_ anchoring the match, only anchoring it at the offset passed to match() -- in other words, it's a "left" anchoring. Deprecate the old name and introduce a new one that should explain the situation better. [ChangeLog][QtCore][QRegularExpression] The AnchoredMatchOption match option has been deprecated in favor of AnchorAtOffsetMatchOption, which should better describe that the match is only anchored at the offset. Change-Id: Ib751e5e488f2d0309a2da6496378247dfa4648de Reviewed-by: Samuel Gaist Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/corelib/text/qregularexpression.cpp | 11 +++++++++-- src/corelib/text/qregularexpression.h | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/corelib/text') diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp index 003bc59e1c..6544abb646 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -553,7 +553,7 @@ QT_BEGIN_NAMESPACE \section2 Caret modes - The AnchoredMatchOption match option can be used to emulate the + The AnchorAtOffsetMatchOption match option can be used to emulate the QRegExp::CaretAtOffset behaviour. There is no equivalent for the other QRegExp::CaretMode modes. @@ -788,9 +788,16 @@ QT_BEGIN_NAMESPACE No match options are set. \value AnchoredMatchOption + Use AnchorAtOffsetMatchOption instead. + + \value AnchorAtOffsetMatchOption The match is constrained to start exactly at the offset passed to match() in order to be successful, even if the pattern string does not contain any metacharacter that anchors the match at that point. + Note that passing this option does not anchor the end of the match + to the end of the subject; if you want to fully anchor a regular + expression, use anchoredPattern(). + This enum value has been introduced in Qt 6.0. \value DontCheckSubjectStringMatchOption The subject string is not checked for UTF-16 validity before @@ -832,7 +839,7 @@ static int convertToPcreOptions(QRegularExpression::MatchOptions matchOptions) { int options = 0; - if (matchOptions & QRegularExpression::AnchoredMatchOption) + if (matchOptions & QRegularExpression::AnchorAtOffsetMatchOption) options |= PCRE2_ANCHORED; if (matchOptions & QRegularExpression::DontCheckSubjectStringMatchOption) options |= PCRE2_NO_UTF_CHECK; diff --git a/src/corelib/text/qregularexpression.h b/src/corelib/text/qregularexpression.h index 9e703a4eea..9f618bf7f5 100644 --- a/src/corelib/text/qregularexpression.h +++ b/src/corelib/text/qregularexpression.h @@ -110,7 +110,8 @@ public: enum MatchOption { NoMatchOption = 0x0000, - AnchoredMatchOption = 0x0001, + AnchoredMatchOption Q_DECL_ENUMERATOR_DEPRECATED_X("Use AnchorAtOffsetMatchOption instead") = 0x0001, + AnchorAtOffsetMatchOption = 0x0001, DontCheckSubjectStringMatchOption = 0x0002 }; Q_DECLARE_FLAGS(MatchOptions, MatchOption) -- cgit v1.2.3