diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-08-03 10:42:46 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-08-10 13:07:18 +0200 |
commit | d61820e5ab3176818b8a2326fa25d05a9f135244 (patch) | |
tree | 30e2882f34a9d70a0206482f58d1a956da79e992 /src/corelib/doc/snippets | |
parent | f5aeb4f970844ef6fbdc97d99fc7c57786d75dae (diff) |
Improve docs for QFuture continuations
Replace phrases like "future has been running", "parent" with more
precise descriptions.
Pick-to: 6.1 6.2
Fixes: QTBUG-95273
Change-Id: Ibd5a464007d41cc437da49ba250b9ea0a46078c6
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/doc/snippets')
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp index a53ca13cc6..f4278abcbc 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp @@ -114,10 +114,10 @@ QFuture<int> future = ...; //! [5] //! [6] -QFuture<int> parentFuture = ...; -auto continuation = parentFuture.then([](int res1){ ... }).then([](int res2){ ... })... +QFuture<int> future = ...; +auto continuation = future.then([](int res1){ ... }).then([](int res2){ ... })... ... -// parentFuture throws an exception +// future throws an exception try { auto result = continuation.result(); } catch (QException &e) { @@ -286,9 +286,9 @@ auto future = QtConcurrent::run([] { //! [20] QObject *context = ...; -auto parentFuture = cachedResultsReady ? QtFuture::makeReadyFuture(results) - : QtConcurrent::run([] { /* compute results */}); -auto future = parentFuture.then(context, [] (Results results) { +auto future = cachedResultsReady ? QtFuture::makeReadyFuture(results) + : QtConcurrent::run([] { /* compute results */}); +auto continuation = future.then(context, [] (Results results) { // Runs in the context's thread }).then([] { // May or may not run in the context's thread |