whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QBAV(QL1SV) and QBAV(QU8SV) constructors 

They were added because of conditional noexcept on the relational
operators that was preventing the other constructors from being picked
up by the compiler.

Now when we removed the conditional noexcept on the relational
operators, we no longer need this constructors.

This patch reverts bd581e35e7485cf42fbefd250be7b146737d9d41 and
partially reverts fff6562f8c.

Change-Id: I22cb4507bff0a929a25d2f15caed66cc30d20dc9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 6cafe0f2b48c5f07f07de52490b1d07c7325557b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bb10
Ivan Solovev 2024-07-09 15:24:31 +02:00 committed by Qt Cherry-pick Bot
parent 65ef677131
commit 4cdb6991c5
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,10 +176,6 @@ public:
constexpr QByteArrayView(const char (&data)[Size]) noexcept
: QByteArrayView(data, lengthHelperCharArray(data, Size)) {}
constexpr QByteArrayView(QLatin1StringView v) noexcept; // defined in qlatin1stringview.h
template <bool UseChar8T>
constexpr QByteArrayView(QBasicUtf8StringView<UseChar8T> v) noexcept; // defined in qutf8stringview.h
#ifdef Q_QDOC
template <typename Byte, size_t Size>
#else

4
src/corelib/text/qlatin1stringview.h
View File

@ -349,10 +349,6 @@ Q_DECLARE_TYPEINFO(QLatin1StringView, Q_RELOCATABLE_TYPE);
Q_DECLARE_TYPEINFO(QLatin1String, Q_RELOCATABLE_TYPE);
#endif
constexpr QByteArrayView::QByteArrayView(QLatin1StringView v) noexcept
: QByteArrayView(v.data(), v.size())
{}
namespace Qt {
inline namespace Literals {
inline namespace StringLiterals {

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

@ -411,11 +411,6 @@ private:
qsizetype m_size;
};
template <bool UseChar8T>
constexpr QByteArrayView::QByteArrayView(QBasicUtf8StringView<UseChar8T> v) noexcept
: QByteArrayView(v.data(), v.size())
{}
#ifdef Q_QDOC
#undef QBasicUtf8StringView
#else