From bd0d8a3adb98ff6f659e44e9a46decee32e9d94c Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 22 Jul 2021 15:46:17 +0200 Subject: Update QtConcurrent docs and examples for reductor object usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After 6ebe3d0f0806069f906522dfe9b81baa3f3478de users don't have to specify the result type when using functors for as a reductor. Task-number: QTBUG-88448 Change-Id: I065fed11c1a66833ba0aac3d18e7ff0545247be1 Reviewed-by: MÃ¥rten Nordheim --- .../doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp | 10 ++++------ .../doc/snippets/code/src_concurrent_qtconcurrentmap.cpp | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src/concurrent/doc/snippets') diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp index 0e0f414b130..b9ff35c7988 100644 --- a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp +++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp @@ -177,9 +177,7 @@ struct StringTransform }; QFuture fooString = - QtConcurrent::filteredReduced(strings, - StartsWith(QLatin1String("Foo")), - StringTransform()); + QtConcurrent::filteredReduced(strings, StartsWith(QLatin1String("Foo")), StringTransform()); //! [14] //! [15] @@ -196,7 +194,7 @@ QList results = future.results(); // add up all even integers QList list3 { 1, 2, 3, 4 }; -int sum = QtConcurrent::filteredReduced(list3, +QFuture sum = QtConcurrent::filteredReduced(list3, [](int x) { return (x & 1) == 0; }, @@ -213,7 +211,7 @@ void intSumReduce(int &sum, int x) } QList list { 1, 2, 3, 4 }; -int sum = QtConcurrent::filteredReduced(list, +QFuture sum = QtConcurrent::filteredReduced(list, [] (int x) { return (x & 1) == 0; }, @@ -228,7 +226,7 @@ bool keepEvenIntegers(int x) } QList list { 1, 2, 3, 4 }; -int sum = QtConcurrent::filteredReduced(list, +QFuture 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 659925a1c68..9c91715ac0e 100644 --- a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp +++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp @@ -165,10 +165,8 @@ struct ImageTransform }; QFuture thumbNails = - QtConcurrent::mappedReduced(images, - Scaled(100), - ImageTransform(), - QtConcurrent::SequentialReduce); + QtConcurrent::mappedReduced(images, Scaled(100), ImageTransform(), + QtConcurrent::SequentialReduce); //! [11] //! [13] @@ -223,7 +221,7 @@ QList collage = QtConcurrent::mappedReduced(images, //! [16] //! [17] -QList collage = QtConcurrent::mappedReduced(images, +QList collage = QtConcurrent::mappedReduced(images, [&size](const QImage &image) { return image.scaled(size, size); }, -- cgit v1.2.3