diff options
author | Jonas Kvinge <jonas@jkvinge.net> | 2021-10-09 14:52:31 +0200 |
---|---|---|
committer | Jonas Kvinge <jonas@jkvinge.net> | 2021-10-12 12:52:02 +0200 |
commit | 18e1711f7a6b240bde9b8dc5366394c9b01b3a7f (patch) | |
tree | f68883738aa9af198ca2de5bb2e83148759acdd1 /src/corelib/thread | |
parent | 231fec7ca2f61da7d94c8aa072b41fd7ee893861 (diff) |
corelib: Fix typos in documentation
Pick-to: 5.15 6.2
Change-Id: I64d63af708bc6ddaabd12450eb3089e5077f849e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qfuture.qdoc | 6 | ||||
-rw-r--r-- | src/corelib/thread/qfuturewatcher.cpp | 4 | ||||
-rw-r--r-- | src/corelib/thread/qsemaphore.cpp | 2 | ||||
-rw-r--r-- | src/corelib/thread/qthread.cpp | 2 | ||||
-rw-r--r-- | src/corelib/thread/qthreadpool.cpp | 2 | ||||
-rw-r--r-- | src/corelib/thread/qthreadstorage.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 592e43cddc..e57fe236e8 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -99,7 +99,7 @@ If \c testFuture gets canceled, its state is propagated to the next then(), which will be also canceled. So in this case \c {Block 6} will be called. - QFuture also offers ways to interact with a runnning computation. For + QFuture also offers ways to interact with a running computation. For instance, the computation can be canceled with the cancel() function. To suspend or resume the computation, use the setSuspended() function or one of the suspend(), resume(), or toggleSuspended() convenience functions. Be aware @@ -173,8 +173,8 @@ /*! \fn template <typename T> void QFuture<T>::cancel() Cancels the asynchronous computation represented by this future. Note that - the cancelation is asynchronous. Use waitForFinished() after calling - cancel() when you need synchronous cancelation. + the cancellation is asynchronous. Use waitForFinished() after calling + cancel() when you need synchronous cancellation. Results currently available may still be accessed on a canceled future, but new results will \e not become available after calling this function. diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp index 75d9a73147..f86f0ce6ba 100644 --- a/src/corelib/thread/qfuturewatcher.cpp +++ b/src/corelib/thread/qfuturewatcher.cpp @@ -114,8 +114,8 @@ QFutureWatcherBase::QFutureWatcherBase(QObject *parent) /*! \fn template <typename T> void QFutureWatcher<T>::cancel() Cancels the asynchronous computation represented by the future(). Note that - the cancelation is asynchronous. Use waitForFinished() after calling - cancel() when you need synchronous cancelation. + the cancellation is asynchronous. Use waitForFinished() after calling + cancel() when you need synchronous cancellation. Currently available results may still be accessed on a canceled QFuture, but new results will \e not become available after calling this function. diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index cbabb43dc8..898b15ae2d 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -622,7 +622,7 @@ bool QSemaphore::tryAcquire(int n, int timeout) /*! \fn QSemaphoreReleaser::swap(QSemaphoreReleaser &other) - Exchanges the responsibilites of \c{*this} and \a other. + Exchanges the responsibilities of \c{*this} and \a other. Unlike move assignment, neither of the two objects ever releases its semaphore, if any, as a consequence of swapping. diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 3453fd0fc1..302d34d512 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -253,7 +253,7 @@ QThreadPrivate::~QThreadPrivate() \section1 Managing Threads - QThread will notifiy you via a signal when the thread is + QThread will notify you via a signal when the thread is started() and finished(), or you can use isFinished() and isRunning() to query the state of the thread. diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index b067522ed2..713c436371 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -427,7 +427,7 @@ void QThreadPoolPrivate::stealAndRunRunnable(QRunnable *runnable) \ingroup thread - QThreadPool manages and recyles individual QThread objects to help reduce + QThreadPool manages and recycles individual QThread objects to help reduce thread creation costs in programs that use threads. Each Qt application has one global QThreadPool object, which can be accessed by calling globalInstance(). diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp index 98d8e87459..ee8273687b 100644 --- a/src/corelib/thread/qthreadstorage.cpp +++ b/src/corelib/thread/qthreadstorage.cpp @@ -225,7 +225,7 @@ void QThreadStorageData::finish(void **p) The hasLocalData() function allows the programmer to determine if data has previously been set using the setLocalData() function. - This is also useful for lazy initializiation. + This is also useful for lazy initialization. If T is a pointer type, QThreadStorage takes ownership of the data (which must be created on the heap with \c new) and deletes it when |