diff options
Diffstat (limited to 'src/corelib/text/qstringlist.h')
| -rw-r--r-- | src/corelib/text/qstringlist.h | 99 |
1 files changed, 47 insertions, 52 deletions
diff --git a/src/corelib/text/qstringlist.h b/src/corelib/text/qstringlist.h index 5ec95036be..fc5c49bfe1 100644 --- a/src/corelib/text/qstringlist.h +++ b/src/corelib/text/qstringlist.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. -** 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) 2020 The Qt Company Ltd. +// Copyright (C) 2016 Intel Corporation. +// 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> @@ -63,14 +27,29 @@ namespace QtPrivate { qsizetype Q_CORE_EXPORT QStringList_removeDuplicates(QStringList *that); QString Q_CORE_EXPORT QStringList_join(const QStringList *that, QStringView sep); QString Q_CORE_EXPORT QStringList_join(const QStringList *that, const QChar *sep, qsizetype seplen); - Q_CORE_EXPORT QString QStringList_join(const QStringList &list, QLatin1String sep); + Q_CORE_EXPORT QString QStringList_join(const QStringList &list, QLatin1StringView sep); QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, QStringView str, Qt::CaseSensitivity cs); + Q_CORE_EXPORT QStringList QStringList_filter(const QStringList &that, QLatin1StringView needle, + Qt::CaseSensitivity cs); + Q_CORE_EXPORT QStringList QStringList_filter(const QStringList &that, + const QStringMatcher &matcher); + bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QStringView str, Qt::CaseSensitivity cs); - bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QLatin1String str, Qt::CaseSensitivity cs); + bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QLatin1StringView str, Qt::CaseSensitivity cs); void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, QStringView before, QStringView after, Qt::CaseSensitivity cs); + qsizetype Q_CORE_EXPORT QStringList_indexOf(const QStringList &that, QStringView str, + qsizetype from, Qt::CaseSensitivity cs); + qsizetype Q_CORE_EXPORT QStringList_indexOf(const QStringList &that, QLatin1StringView str, + qsizetype from, Qt::CaseSensitivity cs); + + Q_CORE_EXPORT qsizetype QStringList_lastIndexOf(const QStringList &that, QStringView str, + qsizetype from, Qt::CaseSensitivity cs); + Q_CORE_EXPORT qsizetype QStringList_lastIndexOf(const QStringList &that, QLatin1StringView str, + qsizetype from, Qt::CaseSensitivity cs); + #if QT_CONFIG(regularexpression) void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QRegularExpression &rx, const QString &after); QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QRegularExpression &re); @@ -109,11 +88,15 @@ public: inline QString join(QStringView sep) const { return QtPrivate::QStringList_join(self(), sep); } - inline QString join(QLatin1String sep) const + inline QString join(QLatin1StringView sep) const { return QtPrivate::QStringList_join(*self(), sep); } inline QString join(QChar sep) const { return QtPrivate::QStringList_join(self(), &sep, 1); } + QStringList filter(const QStringMatcher &matcher) const + { return QtPrivate::QStringList_filter(*self(), matcher); } + QStringList filter(QLatin1StringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + { return QtPrivate::QStringList_filter(*self(), needle, cs); } inline QStringList filter(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return QtPrivate::QStringList_filter(self(), str, cs); } inline QStringList &replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs = Qt::CaseSensitive) @@ -122,9 +105,8 @@ public: return *self(); } -#if QT_STRINGVIEW_LEVEL < 2 inline QString join(const QString &sep) const - { return QtPrivate::QStringList_join(self(), sep.constData(), sep.length()); } + { return QtPrivate::QStringList_join(self(), sep.constData(), sep.size()); } inline QStringList filter(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return QtPrivate::QStringList_filter(self(), str, cs); } inline QStringList &replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) @@ -142,24 +124,37 @@ public: QtPrivate::QStringList_replaceInStrings(self(), before, after, cs); return *self(); } -#endif using QListSpecialMethodsBase<QString>::contains; using QListSpecialMethodsBase<QString>::indexOf; using QListSpecialMethodsBase<QString>::lastIndexOf; - inline bool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + inline bool contains(QLatin1StringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::QStringList_contains(self(), str, cs); } inline bool contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::QStringList_contains(self(), str, cs); } -#if QT_STRINGVIEW_LEVEL < 2 inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::QStringList_contains(self(), str, cs); } - qsizetype indexOf(const QString &str, qsizetype from = 0) const noexcept - { return indexOf(QStringView(str), from); } - qsizetype lastIndexOf(const QString &str, qsizetype from = -1) const noexcept - { return lastIndexOf(QStringView(str), from); } -#endif + + qsizetype indexOf(const QString &str, qsizetype from = 0, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return indexOf(QStringView(str), from, cs); } + qsizetype indexOf(QStringView needle, qsizetype from = 0, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::QStringList_indexOf(*self(), needle, from, cs); } + qsizetype indexOf(QLatin1StringView needle, qsizetype from = 0, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::QStringList_indexOf(*self(), needle, from, cs); } + + qsizetype lastIndexOf(const QString &str, qsizetype from = -1, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return lastIndexOf(QStringView(str), from, cs); } + qsizetype lastIndexOf(QStringView str, qsizetype from = -1, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::QStringList_lastIndexOf(*self(), str, from, cs); } + qsizetype lastIndexOf(QLatin1StringView needle, qsizetype from = -1, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::QStringList_lastIndexOf(*self(), needle, from, cs); } #if QT_CONFIG(regularexpression) inline QStringList filter(const QRegularExpression &re) const |