summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 13:13:05 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-07 11:48:45 +0200
commit77bb50de8f3f7defe1329e6c4a6e066d510afc55 (patch)
tree758b5aab51211aaba887e3ffe9bb4d46f9e740cf /src/concurrent
parent989fca660c3556fa957ed9a3f7cd3b948a4166a2 (diff)
Use QList instead of QVector in qtbase
Fixes all other QVector occurrences Task-number: QTBUG-84469 Change-Id: I5f9311298d341a9a3061a6a640539583d1618939 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp22
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp10
-rw-r--r--src/concurrent/doc/src/qtconcurrent-index.qdoc4
-rw-r--r--src/concurrent/qtconcurrentreducekernel.h1
4 files changed, 18 insertions, 19 deletions
diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp
index ef87a60080..0e0f414b13 100644
--- a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp
@@ -184,19 +184,19 @@ QFuture<QString> fooString =
//! [15]
// keep only even integers
-QVector<int> vector { 1, 2, 3, 4 };
-QtConcurrent::blockingFilter(vector, [](int n) { return (n & 1) == 0; });
+QList<int> list { 1, 2, 3, 4 };
+QtConcurrent::blockingFilter(list, [](int n) { return (n & 1) == 0; });
// retrieve only even integers
-QVector<int> vector2 { 1, 2, 3, 4 };
-QFuture<int> future = QtConcurrent::filtered(vector2, [](int x) {
+QList<int> list2 { 1, 2, 3, 4 };
+QFuture<int> future = QtConcurrent::filtered(list2, [](int x) {
return (x & 1) == 0;
});
-QVector<int> results = future.results();
+QList<int> results = future.results();
// add up all even integers
-QVector<int> vector3 { 1, 2, 3, 4 };
-int sum = QtConcurrent::filteredReduced<int>(vector3,
+QList<int> list3 { 1, 2, 3, 4 };
+int sum = QtConcurrent::filteredReduced<int>(list3,
[](int x) {
return (x & 1) == 0;
},
@@ -212,8 +212,8 @@ void intSumReduce(int &sum, int x)
sum += x;
}
-QVector<int> vector { 1, 2, 3, 4 };
-int sum = QtConcurrent::filteredReduced(vector,
+QList<int> list { 1, 2, 3, 4 };
+int sum = QtConcurrent::filteredReduced(list,
[] (int x) {
return (x & 1) == 0;
},
@@ -227,8 +227,8 @@ bool keepEvenIntegers(int x)
return (x & 1) == 0;
}
-QVector<int> vector { 1, 2, 3, 4 };
-int sum = QtConcurrent::filteredReduced<int>(vector,
+QList<int> list { 1, 2, 3, 4 };
+int sum = QtConcurrent::filteredReduced<int>(list,
keepEvenIntegers,
[](int &sum, int x) {
sum += x;
diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp
index dd3e0103bb..659925a1c6 100644
--- a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp
@@ -200,13 +200,13 @@ QFuture<QImage> thumbnails = QtConcurrent::mapped(images, Scaled(100));
//! [14]
//! [15]
-QVector<int> vector { 1, 2, 3, 4 };
+QList<int> vector { 1, 2, 3, 4 };
QtConcurrent::blockingMap(vector, [](int &x) { x *= 2; });
int size = 100;
-QVector<QImage> images = ...;
+QList<QImage> images = ...;
-QVector<QImage> thumbnails = QtConcurrent::mapped(images,
+QList<QImage> thumbnails = QtConcurrent::mapped(images,
[&size](const QImage &image) {
return image.scaled(size, size);
}
@@ -214,7 +214,7 @@ QVector<QImage> thumbnails = QtConcurrent::mapped(images,
//! [15]
//! [16]
-QVector<QImage> collage = QtConcurrent::mappedReduced(images,
+QList<QImage> collage = QtConcurrent::mappedReduced(images,
[&size](const QImage &image) {
return image.scaled(size, size);
},
@@ -223,7 +223,7 @@ QVector<QImage> collage = QtConcurrent::mappedReduced(images,
//! [16]
//! [17]
-QVector<QImage> collage = QtConcurrent::mappedReduced<QImage>(images,
+QList<QImage> collage = QtConcurrent::mappedReduced<QImage>(images,
[&size](const QImage &image) {
return image.scaled(size, size);
},
diff --git a/src/concurrent/doc/src/qtconcurrent-index.qdoc b/src/concurrent/doc/src/qtconcurrent-index.qdoc
index 4338977221..cf4711476c 100644
--- a/src/concurrent/doc/src/qtconcurrent-index.qdoc
+++ b/src/concurrent/doc/src/qtconcurrent-index.qdoc
@@ -107,7 +107,7 @@
Qt Concurrent supports several STL-compatible container and iterator types,
but works best with Qt containers that have random-access iterators, such as
- QList or QVector. The map and filter functions accept both containers and begin/end iterators.
+ QList. The map and filter functions accept both containers and begin/end iterators.
STL Iterator support overview:
@@ -134,7 +134,7 @@
\li Supported
\row
\li Random Access Iterator
- \li QList, QVector, std::vector
+ \li QList, std::vector
\li Supported and Recommended
\endtable
diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h
index de25b19453..694ac2b5a9 100644
--- a/src/concurrent/qtconcurrentreducekernel.h
+++ b/src/concurrent/qtconcurrentreducekernel.h
@@ -50,7 +50,6 @@
#include <QtCore/qmutex.h>
#include <QtCore/qthread.h>
#include <QtCore/qthreadpool.h>
-#include <QtCore/qvector.h>
#include <mutex>