From 31a39bd55da1635742ef7d4324e980c2a6b5b641 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 21 Jan 2022 10:08:37 +0100 Subject: [PATCH] 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 --- src/corelib/text/qbytearraylist.cpp | 8 +------- 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 cd77cd905a9..e23bdc7bd85 100644 --- a/src/corelib/text/qbytearraylist.cpp +++ b/src/corelib/text/qbytearraylist.cpp @@ -102,12 +102,6 @@ QT_BEGIN_NAMESPACE \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 @@ -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 890cbcef2d6..ce613fbe3f8 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -80,9 +80,7 @@ public: using QListSpecialMethodsBase::lastIndexOf; using QListSpecialMethodsBase::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); }