whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some qdoc warnings: QtConcurrent functors and exceptions 

Change-Id: I32e45c85cedb74a6dcbd99930910b730f1160fae
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
bb10
Volker Hilsheimer 2020-09-21 23:54:40 +02:00
parent 2692cb0e61
commit 89627fd7f9
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/concurrent/doc/src/qtconcurrent-module.qdoc
View File

@ -37,17 +37,3 @@
The Qt Concurrent module extends the basic threading support found in \l{Qt Core} module and
simplifies the development of code that can be executed in parallel on all available CPU cores.
*/
/*!
\typedef QtConcurrent::Exception
\obsolete
Use QException from \l{Qt Core} instead.
*/
/*!
\typedef QtConcurrent::UnhandledException
\obsolete
Use QUnhandledException from \l{Qt Core} instead.
*/

8
src/concurrent/qtconcurrentmap.cpp
View File

@ -407,7 +407,7 @@
\fn template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor> QFuture<ResultType> QtConcurrent::mappedReduced(QThreadPool *pool, const Sequence &sequence, MapFunctor mapFunction, ReduceFunctor reduceFunction, QtConcurrent::ReduceOptions reduceOptions)
Calls \a mapFunction once for each item in \a sequence.
All calls to \a function are invoked from the threads taken from the QThreadPool \a pool.
All calls to \a mapFunction are invoked from the threads taken from the QThreadPool \a pool.
The return value of each \a mapFunction is passed to \a reduceFunction.
Note that while \a mapFunction is called concurrently, only one thread at a
@ -434,7 +434,7 @@
\fn template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> QFuture<ResultType> QtConcurrent::mappedReduced(QThreadPool *pool, const Sequence &sequence, MapFunctor mapFunction, ReduceFunctor reduceFunction, InitialValueType &&initialValue, QtConcurrent::ReduceOptions reduceOptions)
Calls \a mapFunction once for each item in \a sequence.
All calls to \a function are invoked from the threads taken from the QThreadPool \a pool.
All calls to \a mapFunction are invoked from the threads taken from the QThreadPool \a pool.
The return value of each \a mapFunction is passed to \a reduceFunction.
The result value is initialized to \a initialValue when the function is
called, and the first call to \a reduceFunction will operate on
@ -467,7 +467,7 @@
\fn template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor> QFuture<ResultType> QtConcurrent::mappedReduced(QThreadPool *pool, Iterator begin, Iterator end, MapFunctor mapFunction, ReduceFunctor reduceFunction, QtConcurrent::ReduceOptions reduceOptions)
Calls \a mapFunction once for each item from \a begin to \a end.
All calls to \a function are invoked from the threads taken from the QThreadPool \a pool.
All calls to \a mapFunction are invoked from the threads taken from the QThreadPool \a pool.
The return value of each \a mapFunction is passed to \a reduceFunction.
Note that while \a mapFunction is called concurrently, only one thread at a
@ -498,7 +498,7 @@
\fn template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> QFuture<ResultType> QtConcurrent::mappedReduced(QThreadPool *pool, Iterator begin, Iterator end, MapFunctor mapFunction, ReduceFunctor reduceFunction, InitialValueType &&initialValue, QtConcurrent::ReduceOptions reduceOptions)
Calls \a mapFunction once for each item from \a begin to \a end.
All calls to \a function are invoked from the threads taken from the QThreadPool \a pool.
All calls to \a mapFunction are invoked from the threads taken from the QThreadPool \a pool.
The return value of each \a mapFunction is passed to \a reduceFunction.
The result value is initialized to \a initialValue when the function is
called, and the first call to \a reduceFunction will operate on