diff options
Diffstat (limited to 'src/corelib/text/qstringlist.h')
-rw-r--r-- | src/corelib/text/qstringlist.h | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/src/corelib/text/qstringlist.h b/src/corelib/text/qstringlist.h index f4502570dd..fc5c49bfe1 100644 --- a/src/corelib/text/qstringlist.h +++ b/src/corelib/text/qstringlist.h @@ -30,11 +30,26 @@ namespace QtPrivate { 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, 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); @@ -78,6 +93,10 @@ public: 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) @@ -86,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) @@ -106,7 +124,6 @@ public: QtPrivate::QStringList_replaceInStrings(self(), before, after, cs); return *self(); } -#endif using QListSpecialMethodsBase<QString>::contains; using QListSpecialMethodsBase<QString>::indexOf; using QListSpecialMethodsBase<QString>::lastIndexOf; @@ -116,14 +133,28 @@ public: 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 |