From a9aa206b7b8ac4e69f8c46233b4080e00e845ff5 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 27 May 2019 19:13:54 +0200 Subject: Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer --- src/corelib/tools/qstringlist.h | 406 ---------------------------------------- 1 file changed, 406 deletions(-) delete mode 100644 src/corelib/tools/qstringlist.h (limited to 'src/corelib/tools/qstringlist.h') diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h deleted file mode 100644 index a464d443dc..0000000000 --- a/src/corelib/tools/qstringlist.h +++ /dev/null @@ -1,406 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ - -#include - -#ifndef QSTRINGLIST_H -#define QSTRINGLIST_H - -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QRegExp; -class QRegularExpression; - -#if !defined(QT_NO_JAVA_STYLE_ITERATORS) -typedef QListIterator QStringListIterator; -typedef QMutableListIterator QMutableStringListIterator; -#endif - -class QStringList; - -#ifdef Q_QDOC -class QStringList : public QList -#else -template <> struct QListSpecialMethods -#endif -{ -#ifndef Q_QDOC -protected: - ~QListSpecialMethods() = default; -#endif -public: - inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive); - inline int removeDuplicates(); - -#if QT_STRINGVIEW_LEVEL < 2 - inline QString join(const QString &sep) const; -#endif - inline QString join(QStringView sep) const; - inline QString join(QLatin1String sep) const; - inline QString join(QChar sep) const; - - inline QStringList filter(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QStringList &replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs = Qt::CaseSensitive); -#if QT_STRINGVIEW_LEVEL < 2 - inline QStringList filter(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QStringList &replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); - inline QStringList &replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs = Qt::CaseSensitive); - inline QStringList &replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); -#endif - -#ifndef QT_NO_REGEXP - inline QStringList filter(const QRegExp &rx) const; - inline QStringList &replaceInStrings(const QRegExp &rx, const QString &after); -#endif - -#if QT_CONFIG(regularexpression) - inline QStringList filter(const QRegularExpression &re) const; - inline QStringList &replaceInStrings(const QRegularExpression &re, const QString &after); -#endif // QT_CONFIG(regularexpression) - -#ifndef Q_QDOC -private: - inline QStringList *self(); - inline const QStringList *self() const; -}; - -// ### Qt6: check if there's a better way -class QStringList : public QList -{ -#endif -public: - inline QStringList() noexcept { } - inline explicit QStringList(const QString &i) { append(i); } - inline QStringList(const QList &l) : QList(l) { } - inline QStringList(QList &&l) noexcept : QList(std::move(l)) { } - inline QStringList(std::initializer_list args) : QList(args) { } - template = true> - inline QStringList(InputIterator first, InputIterator last) - : QList(first, last) { } - - QStringList &operator=(const QList &other) - { QList::operator=(other); return *this; } - QStringList &operator=(QList &&other) noexcept - { QList::operator=(std::move(other)); return *this; } - -#if QT_STRINGVIEW_LEVEL < 2 - inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; -#endif - inline bool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline bool contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - - inline QStringList operator+(const QStringList &other) const - { QStringList n = *this; n += other; return n; } - inline QStringList &operator<<(const QString &str) - { append(str); return *this; } - inline QStringList &operator<<(const QStringList &l) - { *this += l; return *this; } - inline QStringList &operator<<(const QList &l) - { *this += l; return *this; } - - inline int indexOf(QStringView str, int from = 0) const; - inline int indexOf(QLatin1String str, int from = 0) const; - - inline int lastIndexOf(QStringView str, int from = -1) const; - inline int lastIndexOf(QLatin1String str, int from = -1) const; - -#ifndef QT_NO_REGEXP - inline int indexOf(const QRegExp &rx, int from = 0) const; - inline int lastIndexOf(const QRegExp &rx, int from = -1) const; - inline int indexOf(QRegExp &rx, int from = 0) const; - inline int lastIndexOf(QRegExp &rx, int from = -1) const; -#endif - -#if QT_CONFIG(regularexpression) - inline int indexOf(const QRegularExpression &re, int from = 0) const; - inline int lastIndexOf(const QRegularExpression &re, int from = -1) const; -#endif // QT_CONFIG(regularexpression) - - using QList::indexOf; - using QList::lastIndexOf; -}; - -Q_DECLARE_TYPEINFO(QStringList, Q_MOVABLE_TYPE); - -#ifndef Q_QDOC -inline QStringList *QListSpecialMethods::self() -{ return static_cast(this); } -inline const QStringList *QListSpecialMethods::self() const -{ return static_cast(this); } - -namespace QtPrivate { - void Q_CORE_EXPORT QStringList_sort(QStringList *that, Qt::CaseSensitivity cs); - int 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, int seplen); - Q_CORE_EXPORT QString QStringList_join(const QStringList &list, QLatin1String sep); - QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, QStringView str, - Qt::CaseSensitivity cs); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QString &str, - Qt::CaseSensitivity cs); -#endif - -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); -#endif - 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); - void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, QStringView before, QStringView after, - Qt::CaseSensitivity cs); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QString &before, const QString &after, - Qt::CaseSensitivity cs); -#endif - -#ifndef QT_NO_REGEXP - void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QRegExp &rx, const QString &after); - QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QRegExp &re); - int Q_CORE_EXPORT QStringList_indexOf(const QStringList *that, const QRegExp &rx, int from); - int Q_CORE_EXPORT QStringList_lastIndexOf(const QStringList *that, const QRegExp &rx, int from); - int Q_CORE_EXPORT QStringList_indexOf(const QStringList *that, QRegExp &rx, int from); - int Q_CORE_EXPORT QStringList_lastIndexOf(const QStringList *that, QRegExp &rx, int from); -#endif - -#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); - int Q_CORE_EXPORT QStringList_indexOf(const QStringList *that, const QRegularExpression &re, int from); - int Q_CORE_EXPORT QStringList_lastIndexOf(const QStringList *that, const QRegularExpression &re, int from); -#endif // QT_CONFIG(regularexpression) -} - -inline void QListSpecialMethods::sort(Qt::CaseSensitivity cs) -{ - QtPrivate::QStringList_sort(self(), cs); -} - -inline int QListSpecialMethods::removeDuplicates() -{ - return QtPrivate::QStringList_removeDuplicates(self()); -} - -#if QT_STRINGVIEW_LEVEL < 2 -inline QString QListSpecialMethods::join(const QString &sep) const -{ - return QtPrivate::QStringList_join(self(), sep.constData(), sep.length()); -} -#endif - -inline QString QListSpecialMethods::join(QStringView sep) const -{ - return QtPrivate::QStringList_join(self(), sep); -} - -QString QListSpecialMethods::join(QLatin1String sep) const -{ - return QtPrivate::QStringList_join(*self(), sep); -} - -inline QString QListSpecialMethods::join(QChar sep) const -{ - return QtPrivate::QStringList_join(self(), &sep, 1); -} - -inline QStringList QListSpecialMethods::filter(QStringView str, Qt::CaseSensitivity cs) const -{ - return QtPrivate::QStringList_filter(self(), str, cs); -} - -#if QT_STRINGVIEW_LEVEL < 2 -inline QStringList QListSpecialMethods::filter(const QString &str, Qt::CaseSensitivity cs) const -{ - return QtPrivate::QStringList_filter(self(), str, cs); -} -#endif - -#if QT_STRINGVIEW_LEVEL < 2 -inline bool QStringList::contains(const QString &str, Qt::CaseSensitivity cs) const -{ - return QtPrivate::QStringList_contains(this, str, cs); -} -#endif - -inline bool QStringList::contains(QLatin1String str, Qt::CaseSensitivity cs) const -{ - return QtPrivate::QStringList_contains(this, str, cs); -} - -inline bool QStringList::contains(QStringView str, Qt::CaseSensitivity cs) const -{ - return QtPrivate::QStringList_contains(this, str, cs); -} - -inline QStringList &QListSpecialMethods::replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs) -{ - QtPrivate::QStringList_replaceInStrings(self(), before, after, cs); - return *self(); -} - -#if QT_STRINGVIEW_LEVEL < 2 -inline QStringList &QListSpecialMethods::replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs) -{ - QtPrivate::QStringList_replaceInStrings(self(), before, after, cs); - return *self(); -} - -inline QStringList &QListSpecialMethods::replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs) -{ - QtPrivate::QStringList_replaceInStrings(self(), before, qToStringViewIgnoringNull(after), cs); - return *self(); -} - -inline QStringList &QListSpecialMethods::replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs) -{ - QtPrivate::QStringList_replaceInStrings(self(), QStringView(before), after, cs); - return *self(); -} -#endif - -inline QStringList operator+(const QList &one, const QStringList &other) -{ - QStringList n = one; - n += other; - return n; -} - -inline int QStringList::indexOf(QStringView string, int from) const -{ - return QtPrivate::indexOf(*this, string, from); -} - -inline int QStringList::indexOf(QLatin1String string, int from) const -{ - return QtPrivate::indexOf(*this, string, from); -} - -inline int QStringList::lastIndexOf(QStringView string, int from) const -{ - return QtPrivate::lastIndexOf(*this, string, from); -} - -inline int QStringList::lastIndexOf(QLatin1String string, int from) const -{ - return QtPrivate::lastIndexOf(*this, string, from); -} - -#ifndef QT_NO_REGEXP -inline QStringList &QListSpecialMethods::replaceInStrings(const QRegExp &rx, const QString &after) -{ - QtPrivate::QStringList_replaceInStrings(self(), rx, after); - return *self(); -} - -inline QStringList QListSpecialMethods::filter(const QRegExp &rx) const -{ - return QtPrivate::QStringList_filter(self(), rx); -} - -inline int QStringList::indexOf(const QRegExp &rx, int from) const -{ - return QtPrivate::QStringList_indexOf(this, rx, from); -} - -inline int QStringList::lastIndexOf(const QRegExp &rx, int from) const -{ - return QtPrivate::QStringList_lastIndexOf(this, rx, from); -} - -inline int QStringList::indexOf(QRegExp &rx, int from) const -{ - return QtPrivate::QStringList_indexOf(this, rx, from); -} - -inline int QStringList::lastIndexOf(QRegExp &rx, int from) const -{ - return QtPrivate::QStringList_lastIndexOf(this, rx, from); -} -#endif - -#if QT_CONFIG(regularexpression) -inline QStringList &QListSpecialMethods::replaceInStrings(const QRegularExpression &rx, const QString &after) -{ - QtPrivate::QStringList_replaceInStrings(self(), rx, after); - return *self(); -} - -inline QStringList QListSpecialMethods::filter(const QRegularExpression &rx) const -{ - return QtPrivate::QStringList_filter(self(), rx); -} - -inline int QStringList::indexOf(const QRegularExpression &rx, int from) const -{ - return QtPrivate::QStringList_indexOf(this, rx, from); -} - -inline int QStringList::lastIndexOf(const QRegularExpression &rx, int from) const -{ - return QtPrivate::QStringList_lastIndexOf(this, rx, from); -} -#endif // QT_CONFIG(regularexpression) -#endif // Q_QDOC - -// -// QString inline functions: -// - -QStringList QString::split(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const -{ return split(sep, _sb(behavior), cs); } -QStringList QString::split(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const -{ return split(sep, _sb(behavior), cs); } -#ifndef QT_NO_REGEXP -QStringList QString::split(const QRegExp &sep, Qt::SplitBehavior behavior) const -{ return split(sep, _sb(behavior)); } -#endif -#if QT_CONFIG(regularexpression) -QStringList QString::split(const QRegularExpression &sep, Qt::SplitBehavior behavior) const -{ return split(sep, _sb(behavior)); } -#endif - -QT_END_NAMESPACE - -#endif // QSTRINGLIST_H -- cgit v1.2.3