diff options
Diffstat (limited to 'src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp')
| -rw-r--r-- | src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp | 83 |
1 files changed, 27 insertions, 56 deletions
diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp index 60d276cde6..f934abdd9e 100644 --- a/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp +++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [0] extern void aFunction(); @@ -147,7 +100,7 @@ QtConcurrent::run(&o, 42).waitForFinished(); // compilation error //! [9] extern void aFunction(QPromise<void> &promise); -QFuture<void> future = QtConcurrent::runWithPromise(aFunction); +QFuture<void> future = QtConcurrent::run(aFunction); //! [9] //! [10] @@ -156,7 +109,7 @@ extern void aFunction(QPromise<void> &promise, int arg1, const QString &arg2); int integer = ...; QString string = ...; -QFuture<void> future = QtConcurrent::runWithPromise(aFunction, integer, string); +QFuture<void> future = QtConcurrent::run(aFunction, integer, string); //! [10] //! [11] @@ -166,7 +119,7 @@ void helloWorldFunction(QPromise<QString> &promise) promise.addResult("world"); } -QFuture<QString> future = QtConcurrent::runWithPromise(helloWorldFunction); +QFuture<QString> future = QtConcurrent::run(helloWorldFunction); ... QList<QString> results = future.results(); //! [11] @@ -185,7 +138,7 @@ void aFunction(QPromise<int> &promise) } } -QFuture<int> future = QtConcurrent::runWithPromise(aFunction); +QFuture<int> future = QtConcurrent::run(aFunction); ... // user pressed a pause button after 10 seconds future.suspend(); @@ -216,7 +169,7 @@ QObject::connect(&watcher, &QFutureWatcher::progressValueChanged, [](int progres ... ; // update GUI with a progress qDebug() << "current progress:" << progress; }); -watcher.setFuture(QtConcurrent::runWithPromise(aFunction)); +watcher.setFuture(QtConcurrent::run(aFunction)); //! [13] //! [14] @@ -226,7 +179,25 @@ struct Functor { }; Functor f; -runWithPromise<double>(f); // this will select the 2nd overload -// runWithPromise(f); // error, both candidate overloads potentially match +run<double>(f); // this will select the 2nd overload +// run(f); // error, both candidate overloads potentially match //! [14] +//! [15] +void foo(int arg); +void foo(int arg1, int arg2); +... +QFuture<void> future = QtConcurrent::run(foo, 42); +//! [15] + +//! [16] +QFuture<void> future = QtConcurrent::run([] { foo(42); }); +//! [16] + +//! [17] +QFuture<void> future = QtConcurrent::run(static_cast<void(*)(int)>(foo), 42); +//! [17] + +//! [18] +QFuture<void> future = QtConcurrent::run(qOverload<int>(foo), 42); +//! [18] |