summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/thread')
-rw-r--r--src/corelib/thread/qatomic.cpp2
-rw-r--r--src/corelib/thread/qexception.cpp4
-rw-r--r--src/corelib/thread/qfuture.qdoc2
-rw-r--r--src/corelib/thread/qfutureinterface.cpp2
-rw-r--r--src/corelib/thread/qfutureinterface.h2
-rw-r--r--src/corelib/thread/qfuturesynchronizer.h2
-rw-r--r--src/corelib/thread/qreadwritelock.cpp2
-rw-r--r--src/corelib/thread/qresultstore.cpp8
-rw-r--r--src/corelib/thread/qresultstore.h2
-rw-r--r--src/corelib/thread/qrunnable.cpp2
-rw-r--r--src/corelib/thread/qthread.cpp6
-rw-r--r--src/corelib/thread/qthreadpool.cpp14
12 files changed, 24 insertions, 24 deletions
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index 1c83f23df0..11623f80dc 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -49,7 +49,7 @@
For atomic operations on pointers, see the QAtomicPointer class.
- An \e atomic operation is a complex operation that completes without interruption.
+ An \e atomic operation is a complex operation that completes without interruption.
The QAtomicInt class provides atomic reference counting, test-and-set, fetch-and-store,
and fetch-and-add for integers.
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp
index 263f7d19fe..0c17399d33 100644
--- a/src/corelib/thread/qexception.cpp
+++ b/src/corelib/thread/qexception.cpp
@@ -47,7 +47,7 @@
QT_BEGIN_NAMESPACE
-/*!
+/*!
\class QException
\inmodule QtCore
\brief The QException class provides a base class for exceptions that can transferred across threads.
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
\snippet code/src_corelib_thread_qexception.cpp 3
*/
-/*!
+/*!
\class QUnhandledException
\inmodule QtCore
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc
index 4ab28e81b2..421e683c4a 100644
--- a/src/corelib/thread/qfuture.qdoc
+++ b/src/corelib/thread/qfuture.qdoc
@@ -58,7 +58,7 @@
use the isResultReadyAt() function to determine if a result is ready or
not. For QFuture objects that report more than one result, the
resultCount() function returns the number of continuous results. This
- means that it is always safe to iterate through the results from 0 to
+ means that it is always safe to iterate through the results from 0 to
resultCount().
QFuture provides a \l{Java-style iterators}{Java-style iterator}
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index f5590d95f8..0f7d04a7c5 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -288,7 +288,7 @@ void QFutureInterfaceBase::waitForResult(int resultIndex)
return;
lock.unlock();
- // To avoid deadlocks and reduce the number of threads used, try to
+ // To avoid deadlocks and reduce the number of threads used, try to
// run the runnable in the current thread.
QThreadPool::globalInstance()->d_func()->stealRunnable(d->runnable);
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
index d2d58a9332..e0a59697a1 100644
--- a/src/corelib/thread/qfutureinterface.h
+++ b/src/corelib/thread/qfutureinterface.h
@@ -234,7 +234,7 @@ inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int b
this->reportResultsReady(resultCountBefore, store.count());
} else {
const int insertIndex = store.addResults(beginIndex, &_results, count);
- this->reportResultsReady(insertIndex, insertIndex + _results.count());
+ this->reportResultsReady(insertIndex, insertIndex + _results.count());
}
}
diff --git a/src/corelib/thread/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h
index 426bb42b0d..39dbfc52a8 100644
--- a/src/corelib/thread/qfuturesynchronizer.h
+++ b/src/corelib/thread/qfuturesynchronizer.h
@@ -80,7 +80,7 @@ public:
m_futures[i].cancel();
}
}
-
+
for (int i = 0; i < m_futures.count(); ++i) {
m_futures[i].waitForFinished();
}
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index b6bb22b314..0de826fddf 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
\sa QReadLocker, QWriteLocker, QMutex, QSemaphore
*/
-/*!
+/*!
\enum QReadWriteLock::RecursionMode
\since 4.4
diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp
index 940fd45027..65c2437064 100644
--- a/src/corelib/thread/qresultstore.cpp
+++ b/src/corelib/thread/qresultstore.cpp
@@ -97,7 +97,7 @@ bool ResultIteratorBase::canIncrementVectorIndex() const
return (m_vectorIndex + 1 < mapIterator.value().m_count);
}
-ResultStoreBase::ResultStoreBase()
+ResultStoreBase::ResultStoreBase()
: insertIndex(0), resultCount(0), m_filterMode(false), filteredResults(0) { }
void ResultStoreBase::setFilterMode(bool enable)
@@ -148,7 +148,7 @@ void ResultStoreBase::syncPendingResults()
// check if we can insert any of the pending results:
QMap<int, ResultItem>::iterator it = pendingResults.begin();
while (it != pendingResults.end()) {
- int index = it.key();
+ int index = it.key();
if (index != resultCount + filteredResults)
break;
@@ -165,7 +165,7 @@ int ResultStoreBase::addResult(int index, const void *result)
return insertResultItem(index, resultItem);
}
-int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount)
+int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount)
{
if (m_filterMode == false || vectorSize == totalCount) {
ResultItem resultItem(results, vectorSize);
@@ -218,7 +218,7 @@ ResultIteratorBase ResultStoreBase::resultAt(int index) const
}
const int vectorIndex = index - it.key();
-
+
if (vectorIndex >= it.value().count())
return ResultIteratorBase(m_results.end());
else if (it.value().isVector() == false && vectorIndex != 0)
diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h
index c14146656a..11ce23936d 100644
--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -148,7 +148,7 @@ protected:
bool m_filterMode;
QMap<int, ResultItem> pendingResults;
int filteredResults;
-
+
};
template <typename T>
diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp
index eed716af37..e271582b9b 100644
--- a/src/corelib/thread/qrunnable.cpp
+++ b/src/corelib/thread/qrunnable.cpp
@@ -57,7 +57,7 @@
change the auto-deletion flag.
QThreadPool supports executing the same QRunnable more than once
- by calling QThreadPool::tryStart(this) from within the run() function.
+ by calling QThreadPool::tryStart(this) from within the run() function.
If autoDelete is enabled the QRunnable will be deleted when
the last thread exits the run function. Calling QThreadPool::start()
multiple times with the same QRunnable when autoDelete is enabled
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 79199c97e0..dd4d4e74ae 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -524,9 +524,9 @@ int QThread::exec()
Note that unlike the C library function of the same name, this
function \e does return to the caller -- it is event processing
- that stops.
-
- No QEventLoops will be started anymore in this thread until
+ that stops.
+
+ No QEventLoops will be started anymore in this thread until
QThread::exec() has been called again. If the eventloop in QThread::exec()
is not running then the next call to QThread::exec() will also return
immediately.
diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
index 2b099706ff..1616fb9fab 100644
--- a/src/corelib/thread/qthreadpool.cpp
+++ b/src/corelib/thread/qthreadpool.cpp
@@ -133,7 +133,7 @@ void QThreadPoolThread::run()
// wait for work, exiting after the expiry timeout is reached
expired = !manager->runnableReady.wait(locker.mutex(), manager->expiryTimeout);
++manager->activeThreads;
-
+
if (expired)
--manager->waitingThreads;
}
@@ -223,7 +223,7 @@ void QThreadPoolPrivate::enqueueTask(QRunnable *runnable, int priority)
int QThreadPoolPrivate::activeThreadCount() const
{
- // To improve scalability this function is called without holding
+ // To improve scalability this function is called without holding
// the mutex lock -- keep it thread-safe.
return (allThreads.count()
- expiredThreads.count()
@@ -301,7 +301,7 @@ bool QThreadPoolPrivate::waitForDone(int msecs)
QElapsedTimer timer;
timer.start();
int t;
- while (!(queue.isEmpty() && activeThreads == 0) &&
+ while (!(queue.isEmpty() && activeThreads == 0) &&
((t = msecs - timer.elapsed()) > 0))
noActiveThreads.wait(locker.mutex(), t);
}
@@ -367,11 +367,11 @@ void QThreadPoolPrivate::stealRunnable(QRunnable *runnable)
\snippet code/src_corelib_concurrent_qthreadpool.cpp 0
- QThreadPool deletes the QRunnable automatically by default. Use
+ QThreadPool deletes the QRunnable automatically by default. Use
QRunnable::setAutoDelete() to change the auto-deletion flag.
QThreadPool supports executing the same QRunnable more than once
- by calling tryStart(this) from within QRunnable::run().
+ by calling tryStart(this) from within QRunnable::run().
If autoDelete is enabled the QRunnable will be deleted when
the last thread exits the run function. Calling start()
multiple times with the same QRunnable when autoDelete is enabled
@@ -595,8 +595,8 @@ void QThreadPool::releaseThread()
}
/*!
- Waits up to \a msecs milliseconds for all threads to exit and removes all
- threads from the thread pool. Returns true if all threads were removed;
+ Waits up to \a msecs milliseconds for all threads to exit and removes all
+ threads from the thread pool. Returns true if all threads were removed;
otherwise it returns false. If \a msecs is -1 (the default), the timeout
is ignored (waits for the last thread to exit).
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 03:49:22 +0000