diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-07-22 15:13:28 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-07-26 09:42:45 +0200 |
| commit | c3a9c1ecbca15d2cab14e6c43cd683de4ad59b3a (patch) | |
| tree | c1498f10cadca661f0891215bba09b2d3d1fac14 | |
| parent | 921ff400bbb84b0a5c51a9a04675dce17dac0cd8 (diff) | |
QtConcurrent: Remove the redundant code for QStringList
QStringList is a typedef for QList<QString>, so it doesn't need special
handling.
Change-Id: Ib371f9fa49d9d45da7956287dd0f5b6c0224f439
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 7 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentmap.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 59d2d61af6..be4a09f107 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -42,7 +42,6 @@ #include <QtConcurrent/qtconcurrentcompilertest.h> #include <QtCore/qfuture.h> -#include <QtCore/QStringList> #include <tuple> @@ -193,12 +192,6 @@ struct ReduceResultTypeHelper<Callable, template <class InputSequence, class MapFunctor> struct MapSequenceResultType; -template <class MapFunctor> -struct MapSequenceResultType<QStringList, MapFunctor> -{ - typedef QList<QtPrivate::MapResultType<QStringList, MapFunctor>> ResultType; -}; - #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS template <template <typename...> class InputSequence, typename MapFunctor, typename ...T> diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h index 44a6caea4c..3e20f8b4dc 100644 --- a/src/concurrent/qtconcurrentmap.h +++ b/src/concurrent/qtconcurrentmap.h @@ -47,7 +47,6 @@ #include <QtConcurrent/qtconcurrentmapkernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h> #include <QtConcurrent/qtconcurrentfunctionwrappers.h> -#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE |