diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-01-21 10:08:37 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-22 04:12:48 +0100 |
| commit | 31a39bd55da1635742ef7d4324e980c2a6b5b641 (patch) | |
| tree | 8b9d9cd7349ed1e0c0d8479ec814f373aeab46f6 | |
| parent | 806ba27419f27bb5264c252a0d8faac7c3854b19 (diff) | |
QByteArrayList: simplify the join() overload set already now
... 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>
| -rw-r--r-- | src/corelib/text/qbytearraylist.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/text/qbytearraylist.h | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/text/qbytearraylist.cpp b/src/corelib/text/qbytearraylist.cpp index cd77cd905a..e23bdc7bd8 100644 --- a/src/corelib/text/qbytearraylist.cpp +++ b/src/corelib/text/qbytearraylist.cpp @@ -103,12 +103,6 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QByteArray QByteArrayList::join() const - - Joins all the byte arrays into a single byte array. -*/ - -/*! \fn QByteArray QByteArrayList::join(const QByteArray &separator) const Joins all the byte arrays into a single byte array with each @@ -120,7 +114,7 @@ QT_BEGIN_NAMESPACE \since 6.3 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. */ /*! diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h index 890cbcef2d..ce613fbe3f 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -80,9 +80,7 @@ public: using QListSpecialMethodsBase<QByteArray>::lastIndexOf; using QListSpecialMethodsBase<QByteArray>::contains; - inline QByteArray join() const - { return join(QByteArrayView{}); } - inline QByteArray join(QByteArrayView sep) const // ### Qt 7: merge with the () overload + QByteArray join(QByteArrayView sep = {}) const { return QtPrivate::QByteArrayList_join(self(), sep); } |