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

QByteArrayList: simplify the join() overload set already now

Browse Source 
... instead of waiting for Qt 7.

Found in API review.

[ChangeLog][QtCore][Potentially Source-Incompatible Changes]
[QByteArrayList] The join() overload set has changed. Code such as
qOverload<>(&QByteArrayList::join) will have to be rewritten,
e.g. using lambdas. We advise against taking addresses of library
functions other than signals and slots.

Pick-to: 6.3
Change-Id: I67449df9adc2efea7f1163034caa135f31f39e7c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2022-01-21 10:08:37 +01:00
parent 806ba27419
commit 31a39bd55d
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/text/qbytearraylist.cpp
View File

@ -102,12 +102,6 @@ QT_BEGIN_NAMESPACE
\sa QByteArray, QStringList \sa QByteArray, QStringList
*/ */
/*!
\fn QByteArray QByteArrayList::join() const
Joins all the byte arrays into a single byte array.
*/
/*! /*!
\fn QByteArray QByteArrayList::join(const QByteArray &separator) const \fn QByteArray QByteArrayList::join(const QByteArray &separator) const
@ -120,7 +114,7 @@ QT_BEGIN_NAMESPACE
\since 6.3 \since 6.3
Joins all the byte arrays into a single byte array with each Joins all the byte arrays into a single byte array with each
element separated by the given \a separator. element separated by the given \a separator, if any.
*/ */
/*! /*!

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

@ -80,9 +80,7 @@ public:
using QListSpecialMethodsBase<QByteArray>::lastIndexOf; using QListSpecialMethodsBase<QByteArray>::lastIndexOf;
using QListSpecialMethodsBase<QByteArray>::contains; using QListSpecialMethodsBase<QByteArray>::contains;
inline QByteArray join() const QByteArray join(QByteArrayView sep = {}) const
{ return join(QByteArrayView{}); }
inline QByteArray join(QByteArrayView sep) const // ### Qt 7: merge with the () overload
{ {
return QtPrivate::QByteArrayList_join(self(), sep); return QtPrivate::QByteArrayList_join(self(), sep);
} }