diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 11:45:50 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 13:10:57 +0200 |
commit | 9a189a096f134e80e0c11523db14c8580275b4ad (patch) | |
tree | 154a408d7607a9aa9cf10f66ed552dfbcfe18292 /src/corelib/text/qstringlist.cpp | |
parent | 999f62531a784b8f0f1f6d3cb7aaaa5455485d17 (diff) |
Remove non-Qt6 compile time switches from QtCore
We already manage to compile without this code, and none of it are full
classes or separate functions suitable for qt5compat.
Change-Id: I47facac7ec621cfc4b0b26214b7de37897443519
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/text/qstringlist.cpp')
-rw-r--r-- | src/corelib/text/qstringlist.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/corelib/text/qstringlist.cpp b/src/corelib/text/qstringlist.cpp index 6d5228ce6b..33b49d26b6 100644 --- a/src/corelib/text/qstringlist.cpp +++ b/src/corelib/text/qstringlist.cpp @@ -320,20 +320,6 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, QStringView s return res; } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -/// Not really needed anymore, but kept for binary compatibility -QStringList QtPrivate::QStringList_filter(const QStringList *that, const QString &str, - Qt::CaseSensitivity cs) -{ - QStringMatcher matcher(str, cs); - QStringList res; - for (qsizetype i = 0; i < that->size(); ++i) - if (matcher.indexIn(that->at(i)) != -1) - res << that->at(i); - return res; -} -#endif - template<typename T> static bool stringList_contains(const QStringList &stringList, const T &str, Qt::CaseSensitivity cs) { @@ -357,15 +343,6 @@ static bool stringList_contains(const QStringList &stringList, const T &str, Qt: */ #endif -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -/// Not really needed anymore, but kept for binary compatibility -bool QtPrivate::QStringList_contains(const QStringList *that, const QString &str, - Qt::CaseSensitivity cs) -{ - return stringList_contains(*that, str, cs); -} -#endif - /*! \fn bool QStringList::contains(QStringView str, Qt::CaseSensitivity cs) const \overload @@ -510,16 +487,6 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, QStringView befo (*that)[i].replace(before.data(), before.length(), after.data(), after.length(), cs); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -/// Not really needed anymore, but kept for binary compatibility -void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QString &before, - const QString &after, Qt::CaseSensitivity cs) -{ - for (qsizetype i = 0; i < that->size(); ++i) - (*that)[i].replace(before, after, cs); -} -#endif - #if QT_CONFIG(regularexpression) /*! \fn QStringList &QStringList::replaceInStrings(const QRegularExpression &re, const QString &after) |