diff options
Diffstat (limited to 'src/corelib/text/qbytearraylist.h')
| -rw-r--r-- | src/corelib/text/qbytearraylist.h | 66 |
1 files changed, 19 insertions, 47 deletions
diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h index e00586291f..f5302884f1 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -1,43 +1,7 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. -** Copyright (C) 2014 by Southwest Research Institute (R) -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2016 Intel Corporation. +// Copyright (C) 2014 by Southwest Research Institute (R) +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtCore/qlist.h> @@ -46,6 +10,8 @@ #include <QtCore/qbytearray.h> +#include <limits> + QT_BEGIN_NAMESPACE #if !defined(QT_NO_JAVA_STYLE_ITERATORS) @@ -53,20 +19,23 @@ typedef QListIterator<QByteArray> QByteArrayListIterator; typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; #endif -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC namespace QtPrivate { +#if QT_CORE_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4 QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *separator, int separatorLength); +#endif + QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *sep, qsizetype len); } #endif -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC class QByteArrayList : public QList<QByteArray> #else template <> struct QListSpecialMethods<QByteArray> : QListSpecialMethodsBase<QByteArray> #endif { -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC protected: ~QListSpecialMethods() = default; #endif @@ -75,12 +44,15 @@ public: using QListSpecialMethodsBase<QByteArray>::lastIndexOf; using QListSpecialMethodsBase<QByteArray>::contains; - inline QByteArray join() const - { return QtPrivate::QByteArrayList_join(self(), nullptr, 0); } + QByteArray join(QByteArrayView sep = {}) const + { + return QtPrivate::QByteArrayList_join(self(), sep.data(), sep.size()); + } + Q_WEAK_OVERLOAD inline QByteArray join(const QByteArray &sep) const - { return QtPrivate::QByteArrayList_join(self(), sep.constData(), sep.size()); } + { return join(qToByteArrayViewIgnoringNull(sep)); } inline QByteArray join(char sep) const - { return QtPrivate::QByteArrayList_join(self(), &sep, 1); } + { return join({&sep, 1}); } }; QT_END_NAMESPACE |