From 916b5c69e1ed5667e4fe97a21e7e15abfd60ec3d Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Thu, 9 Jul 2009 13:41:40 +0200
Subject: doc: Minor edits of reentrant/thread-safe expalantion.
Task-number: 189232
---
doc/src/threads.qdoc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/src/threads.qdoc b/doc/src/threads.qdoc
index e3da0d4..8469f51 100644
--- a/doc/src/threads.qdoc
+++ b/doc/src/threads.qdoc
@@ -278,7 +278,7 @@
\e{reentrant} function is not always \e{thread-safe}.
By extension, a class is said to be \e{reentrant} if its member
- functions can be called safely from multiple threads as long as
+ functions can be called safely from multiple threads, as long as
each thread uses a \e{different} instance of the class. The class
is \e{thread-safe} if its member functions can be called safely
from multiple threads, even if all the threads use the \e{same}
@@ -325,14 +325,14 @@
declared with the \c mutable qualifier because we need to lock
and unlock the mutex in \c value(), which is a const function.
- Most Qt classes are \e{reentrant}, but they are not made
+ Many Qt classes are \e{reentrant}, but they are not made
\e{thread-safe}, because making them thread-safe would incur the
extra overhead of repeatedly locking and unlocking a QMutex. For
example, QString is reentrant but not thread-safe. You can safely
access \e{different} instances of QString from multiple threads
- simultaneously, but you can't access the \e{same} instance of
- QString from multiple threads simultaneously (unless you protect
- the accesses yourself with a QMutex).
+ simultaneously, but you can't safely access the \e{same} instance
+ of QString from multiple threads simultaneously (unless you
+ protect the accesses yourself with a QMutex).
Some Qt classes and functions are thread-safe. These are mainly
the thread-related classes (e.g. QMutex) and fundamental functions
@@ -345,7 +345,7 @@
standardized. POSIX uses definitions of reentrant and thread-safe
that are somewhat different for its C APIs. When using other
object-oriented C++ class libraries with Qt, be sure the
- definitions in use are understood.
+ definitions are understood.
\section1 Threads and QObjects
--
cgit v0.12