diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-21 23:54:40 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-22 20:55:41 +0200 |
| commit | 89627fd7f977c74494c5c7578ce1f58f2ffbe26a (patch) | |
| tree | 5939e2d10e6a4935334dd8d90847ee5e9bddd4c0 | |
| parent | 2692cb0e613e53df78e67a8826295b02d9079f88 (diff) | |
Fix some qdoc warnings: QtConcurrent functors and exceptions
Change-Id: I32e45c85cedb74a6dcbd99930910b730f1160fae
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/concurrent/doc/src/qtconcurrent-module.qdoc | 14 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentmap.cpp | 8 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/concurrent/doc/src/qtconcurrent-module.qdoc b/src/concurrent/doc/src/qtconcurrent-module.qdoc index 6e7f325375..72bf3f45d7 100644 --- a/src/concurrent/doc/src/qtconcurrent-module.qdoc +++ b/src/concurrent/doc/src/qtconcurrent-module.qdoc @@ -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. -*/ diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp index 9e5e6aab32..43763a441f 100644 --- a/src/concurrent/qtconcurrentmap.cpp +++ b/src/concurrent/qtconcurrentmap.cpp @@ -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 |