From 4a12757e5d192527137d543815a1324c113cf39b Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 22 Jun 2020 10:25:58 +0200
Subject: Use QList instead of QVector in QtConcurrent

Task-number: QTBUG-84469
Change-Id: I99e41c1fef5459d7358b20a97a1dbefcd43bb4e5
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 src/concurrent/qtconcurrentfilter.cpp      | 2 +-
 src/concurrent/qtconcurrentiteratekernel.h | 2 +-
 src/concurrent/qtconcurrentmap.cpp         | 2 +-
 src/concurrent/qtconcurrentreducekernel.h  | 2 +-
 src/concurrent/qtconcurrentthreadengine.h  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp
index 6839de4641..223aad5b1f 100644
--- a/src/concurrent/qtconcurrentfilter.cpp
+++ b/src/concurrent/qtconcurrentfilter.cpp
@@ -44,7 +44,7 @@
 
     The QtConcurrent::filter(), QtConcurrent::filtered() and
     QtConcurrent::filteredReduced() functions filter items in a sequence such
-    as a QList or a QVector in parallel. QtConcurrent::filter() modifies a
+    as a QList in parallel. QtConcurrent::filter() modifies a
     sequence in-place, QtConcurrent::filtered() returns a new sequence
     containing the filtered content, and QtConcurrent::filteredReduced()
     returns a single result.
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h
index a8decf5cf8..985b03ee79 100644
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@@ -124,7 +124,7 @@ public:
 
     int currentResultCount;
     ThreadEngine<T> *threadEngine;
-    QVector<T> vector;
+    QList<T> vector;
 };
 
 template <>
diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp
index e60e35af32..26a4113303 100644
--- a/src/concurrent/qtconcurrentmap.cpp
+++ b/src/concurrent/qtconcurrentmap.cpp
@@ -148,7 +148,7 @@
 
     The QtConcurrent::map(), QtConcurrent::mapped() and
     QtConcurrent::mappedReduced() functions run computations in parallel on
-    the items in a sequence such as a QList or a QVector. QtConcurrent::map()
+    the items in a sequence such as a QList. QtConcurrent::map()
     modifies a sequence in-place, QtConcurrent::mapped() returns a new
     sequence containing the modified content, and QtConcurrent::mappedReduced()
     returns a single result.
diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h
index 35e9ca22b1..de25b19453 100644
--- a/src/concurrent/qtconcurrentreducekernel.h
+++ b/src/concurrent/qtconcurrentreducekernel.h
@@ -86,7 +86,7 @@ class IntermediateResults
 {
 public:
     int begin, end;
-    QVector<T> vector;
+    QList<T> vector;
 };
 
 enum ReduceOption {
diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
index 82bff5fb3a..cbd8ad04d7 100644
--- a/src/concurrent/qtconcurrentthreadengine.h
+++ b/src/concurrent/qtconcurrentthreadengine.h
@@ -195,7 +195,7 @@ public:
             futureInterfaceTyped()->reportResult(_result, index);
     }
 
-    void reportResults(const QVector<T> &_result, int index = -1, int count = -1)
+    void reportResults(const QList<T> &_result, int index = -1, int count = -1)
     {
         if (futureInterface)
             futureInterfaceTyped()->reportResults(_result, index, count);
-- 
cgit v1.2.3