diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-02-15 11:48:32 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-03 11:44:56 +0200 |
| commit | 04c54858c705fc8c951a438127c7791dd455b194 (patch) | |
| tree | ec290c37d1edeafaa20b114adaed252e3ecd0c52 /src/corelib/text/qregularexpression.h | |
| parent | ff4f2e939732f0878d1be088da6667c9a6f76df8 (diff) | |
QRegularExpression: eradicate QT_STRINGVIEW_LEVEL
It's not used and not useful.
Task-number: QTBUG-100861
Pick-to: 6.3 6.2
Change-Id: Ie28d07474ee8fae96b569632d835dbb0ffd0e48f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib/text/qregularexpression.h')
| -rw-r--r-- | src/corelib/text/qregularexpression.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/text/qregularexpression.h b/src/corelib/text/qregularexpression.h index b5fee16057..ffe2f6f184 100644 --- a/src/corelib/text/qregularexpression.h +++ b/src/corelib/text/qregularexpression.h @@ -153,7 +153,6 @@ public: }; Q_DECLARE_FLAGS(WildcardConversionOptions, WildcardConversionOption) -#if QT_STRINGVIEW_LEVEL < 2 static QString escape(const QString &str) { return escape(qToStringViewIgnoringNull(str)); @@ -168,7 +167,6 @@ public: { return anchoredPattern(qToStringViewIgnoringNull(expression)); } -#endif static QString escape(QStringView str); static QString wildcardToRegularExpression(QStringView str, WildcardConversionOptions options = DefaultWildcardConversion); @@ -231,21 +229,16 @@ public: int lastCapturedIndex() const; -#if QT_STRINGVIEW_LEVEL < 2 bool hasCaptured(const QString &name) const { return hasCaptured(QStringView(name)); } -#endif bool hasCaptured(QStringView name) const; bool hasCaptured(int nth) const; QString captured(int nth = 0) const; QStringView capturedView(int nth = 0) const; -#if QT_STRINGVIEW_LEVEL < 2 QString captured(const QString &name) const { return captured(QStringView(name)); } -#endif - QString captured(QStringView name) const; QStringView capturedView(QStringView name) const; @@ -255,14 +248,12 @@ public: qsizetype capturedLength(int nth = 0) const; qsizetype capturedEnd(int nth = 0) const; -#if QT_STRINGVIEW_LEVEL < 2 qsizetype capturedStart(const QString &name) const { return capturedStart(QStringView(name)); } qsizetype capturedLength(const QString &name) const { return capturedLength(QStringView(name)); } qsizetype capturedEnd(const QString &name) const { return capturedEnd(QStringView(name)); } -#endif qsizetype capturedStart(QStringView name) const; qsizetype capturedLength(QStringView name) const; |