diff options
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qregularexpression.cpp | 10 | ||||
-rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index b1f9d460b3..8ad907f72b 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -2108,7 +2108,7 @@ QStringView QRegularExpressionMatch::capturedView(int nth) const */ QString QRegularExpressionMatch::captured(const QString &name) const { - return captured(QStringView(name)); + return captured(qToStringViewIgnoringNull(name)); } /*! @@ -2123,7 +2123,7 @@ QString QRegularExpressionMatch::captured(const QString &name) const */ QStringRef QRegularExpressionMatch::capturedRef(const QString &name) const { - return capturedRef(QStringView(name)); + return capturedRef(qToStringViewIgnoringNull(name)); } #endif // QT_STRINGVIEW_LEVEL < 2 @@ -2267,7 +2267,7 @@ int QRegularExpressionMatch::capturedEnd(int nth) const */ int QRegularExpressionMatch::capturedStart(const QString &name) const { - return capturedStart(QStringView(name)); + return capturedStart(qToStringViewIgnoringNull(name)); } /*! @@ -2281,7 +2281,7 @@ int QRegularExpressionMatch::capturedStart(const QString &name) const */ int QRegularExpressionMatch::capturedLength(const QString &name) const { - return capturedLength(QStringView(name)); + return capturedLength(qToStringViewIgnoringNull(name)); } /*! @@ -2294,7 +2294,7 @@ int QRegularExpressionMatch::capturedLength(const QString &name) const */ int QRegularExpressionMatch::capturedEnd(const QString &name) const { - return capturedEnd(QStringView(name)); + return capturedEnd(qToStringViewIgnoringNull(name)); } #endif // QT_STRINGVIEW_LEVEL < 2 diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 4fd10f3ce8..6bd2db0de3 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -7723,7 +7723,7 @@ static QString replaceArgEscapes(QStringView s, const ArgEscapeData &d, int fiel */ QString QString::arg(const QString &a, int fieldWidth, QChar fillChar) const { - return arg(QStringView(a), fieldWidth, fillChar); + return arg(qToStringViewIgnoringNull(a), fieldWidth, fillChar); } #endif // QT_STRINGVIEW_LEVEL < 2 |