1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QByteArrayView(QU8SV) constructor

Browse Source 
QUtf8StringView is not a class, but just one of the template
specializations, so use the actual template.

Amends fff6562f8c074d75bda8b80f844dc63c6f2e64d5.

Found in API Review.

Change-Id: I8e28704382765e85096885787172a38ea0f1f23b
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit bd581e35e7485cf42fbefd250be7b146737d9d41)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2024-06-06 11:32:45 +02:00 committed by Qt Cherry-pick Bot
parent 19c4c8e12d
commit ac36373f6c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/text/qbytearrayview.h
View File

@ -169,7 +169,8 @@ public:
: QByteArrayView(data, lengthHelperCharArray(data, Size)) {} : QByteArrayView(data, lengthHelperCharArray(data, Size)) {}
constexpr QByteArrayView(QLatin1StringView v) noexcept; // defined in qlatin1stringview.h constexpr QByteArrayView(QLatin1StringView v) noexcept; // defined in qlatin1stringview.h
constexpr QByteArrayView(QUtf8StringView v) noexcept; // defined in qutf8stringview.h template <bool UseChar8T>
constexpr QByteArrayView(QBasicUtf8StringView<UseChar8T> v) noexcept; // defined in qutf8stringview.h
#ifdef Q_QDOC #ifdef Q_QDOC
template <typename Byte, size_t Size> template <typename Byte, size_t Size>

3
src/corelib/text/qutf8stringview.h
View File

@ -414,7 +414,8 @@ private:
qsizetype m_size; qsizetype m_size;
}; };
constexpr QByteArrayView::QByteArrayView(QUtf8StringView v) noexcept template <bool UseChar8T>
constexpr QByteArrayView::QByteArrayView(QBasicUtf8StringView<UseChar8T> v) noexcept
: QByteArrayView(v.data(), v.size()) : QByteArrayView(v.data(), v.size())
{} {}