From 77bb50de8f3f7defe1329e6c4a6e066d510afc55 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 6 Jul 2020 13:13:05 +0200 Subject: Use QList instead of QVector in qtbase Fixes all other QVector occurrences Task-number: QTBUG-84469 Change-Id: I5f9311298d341a9a3061a6a640539583d1618939 Reviewed-by: Friedemann Kleint --- .../code/src_concurrent_qtconcurrentfilter.cpp | 22 +++++++++++----------- .../code/src_concurrent_qtconcurrentmap.cpp | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/concurrent/doc/snippets/code') diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp index ef87a600809..0e0f414b130 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 fooString = //! [15] // keep only even integers -QVector vector { 1, 2, 3, 4 }; -QtConcurrent::blockingFilter(vector, [](int n) { return (n & 1) == 0; }); +QList list { 1, 2, 3, 4 }; +QtConcurrent::blockingFilter(list, [](int n) { return (n & 1) == 0; }); // retrieve only even integers -QVector vector2 { 1, 2, 3, 4 }; -QFuture future = QtConcurrent::filtered(vector2, [](int x) { +QList list2 { 1, 2, 3, 4 }; +QFuture future = QtConcurrent::filtered(list2, [](int x) { return (x & 1) == 0; }); -QVector results = future.results(); +QList results = future.results(); // add up all even integers -QVector vector3 { 1, 2, 3, 4 }; -int sum = QtConcurrent::filteredReduced(vector3, +QList list3 { 1, 2, 3, 4 }; +int sum = QtConcurrent::filteredReduced(list3, [](int x) { return (x & 1) == 0; }, @@ -212,8 +212,8 @@ void intSumReduce(int &sum, int x) sum += x; } -QVector vector { 1, 2, 3, 4 }; -int sum = QtConcurrent::filteredReduced(vector, +QList 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 vector { 1, 2, 3, 4 }; -int sum = QtConcurrent::filteredReduced(vector, +QList list { 1, 2, 3, 4 }; +int sum = QtConcurrent::filteredReduced(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 dd3e0103bbd..659925a1c68 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 thumbnails = QtConcurrent::mapped(images, Scaled(100)); //! [14] //! [15] -QVector vector { 1, 2, 3, 4 }; +QList vector { 1, 2, 3, 4 }; QtConcurrent::blockingMap(vector, [](int &x) { x *= 2; }); int size = 100; -QVector images = ...; +QList images = ...; -QVector thumbnails = QtConcurrent::mapped(images, +QList thumbnails = QtConcurrent::mapped(images, [&size](const QImage &image) { return image.scaled(size, size); } @@ -214,7 +214,7 @@ QVector thumbnails = QtConcurrent::mapped(images, //! [15] //! [16] -QVector collage = QtConcurrent::mappedReduced(images, +QList collage = QtConcurrent::mappedReduced(images, [&size](const QImage &image) { return image.scaled(size, size); }, @@ -223,7 +223,7 @@ QVector collage = QtConcurrent::mappedReduced(images, //! [16] //! [17] -QVector collage = QtConcurrent::mappedReduced(images, +QList collage = QtConcurrent::mappedReduced(images, [&size](const QImage &image) { return image.scaled(size, size); }, -- cgit v1.2.3