diff options
| -rw-r--r-- | src/corelib/text/qanystringview.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qbytearrayview.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringview.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qutf8stringview.h | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h index e947ea7fc7..1e61979af8 100644 --- a/src/corelib/text/qanystringview.h +++ b/src/corelib/text/qanystringview.h @@ -352,7 +352,7 @@ template <typename QStringLike, std::enable_if_t<std::disjunction_v< std::is_same<QStringLike, QByteArray> >, bool> = true> [[nodiscard]] inline QAnyStringView qToAnyStringViewIgnoringNull(const QStringLike &s) noexcept -{ return QAnyStringView(s.data(), s.size()); } +{ return QAnyStringView(s.begin(), s.size()); } QT_END_NAMESPACE diff --git a/src/corelib/text/qbytearrayview.h b/src/corelib/text/qbytearrayview.h index 3ebc2f841c..2962453754 100644 --- a/src/corelib/text/qbytearrayview.h +++ b/src/corelib/text/qbytearrayview.h @@ -346,7 +346,7 @@ Q_DECLARE_TYPEINFO(QByteArrayView, Q_PRIMITIVE_TYPE); template<typename QByteArrayLike, std::enable_if_t<std::is_same_v<QByteArrayLike, QByteArray>, bool> = true> [[nodiscard]] inline QByteArrayView qToByteArrayViewIgnoringNull(const QByteArrayLike &b) noexcept -{ return QByteArrayView(b.data(), b.size()); } +{ return QByteArrayView(b.begin(), b.size()); } inline int QByteArrayView::compare(QByteArrayView a, Qt::CaseSensitivity cs) const noexcept { diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index 76acbd92aa..57ae1fe869 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -438,7 +438,7 @@ template <typename QStringLike, typename std::enable_if< std::is_same<QStringLike, QString>::value, bool>::type = true> inline QStringView qToStringViewIgnoringNull(const QStringLike &s) noexcept -{ return QStringView(s.data(), s.size()); } +{ return QStringView(s.begin(), s.size()); } // QChar inline functions: diff --git a/src/corelib/text/qutf8stringview.h b/src/corelib/text/qutf8stringview.h index d653b99cfb..bd83da8946 100644 --- a/src/corelib/text/qutf8stringview.h +++ b/src/corelib/text/qutf8stringview.h @@ -347,7 +347,7 @@ Q_DECLARE_TYPEINFO_BODY(QBasicUtf8StringView<UseChar8T>, Q_PRIMITIVE_TYPE); template <typename QStringLike, std::enable_if_t<std::is_same_v<QStringLike, QByteArray>, bool> = true> [[nodiscard]] inline q_no_char8_t::QUtf8StringView qToUtf8StringViewIgnoringNull(const QStringLike &s) noexcept -{ return q_no_char8_t::QUtf8StringView(s.data(), s.size()); } +{ return q_no_char8_t::QUtf8StringView(s.begin(), s.size()); } #endif // Q_QDOC QT_END_NAMESPACE diff --git a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp index e2842e08d6..6f31d495ec 100644 --- a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp +++ b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp @@ -433,7 +433,7 @@ void tst_QByteArrayView::fromQByteArray() const QByteArray empty = ""; QVERIFY(QByteArrayView(null).isNull()); - QVERIFY(!qToByteArrayViewIgnoringNull(null).isNull()); + QVERIFY(qToByteArrayViewIgnoringNull(null).isNull()); QVERIFY(QByteArrayView(null).isEmpty()); QVERIFY(qToByteArrayViewIgnoringNull(null).isEmpty()); |