diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-08 08:57:04 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-08 08:57:04 (GMT) |
| commit | a5dc543041511c73b87fbda685c041febc81b7d9 (patch) | |
| tree | 8c08b8e34e8381084c9a547b33624657310ee67f | |
| parent | 904b56a9cc810b340d1b7db81199fc0e15b4aab6 (diff) | |
| download | Qt-a5dc543041511c73b87fbda685c041febc81b7d9.zip Qt-a5dc543041511c73b87fbda685c041febc81b7d9.tar.gz Qt-a5dc543041511c73b87fbda685c041febc81b7d9.tar.bz2 | |
Fixed grammar mistake.
Task-number: QTBUG-13712
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index 5fac960..0310baa 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -395,7 +395,7 @@ \section1 Tracking QObject - QWeakPointer can be used to track deletion classes derives from QObject, + QWeakPointer can be used to track deletion classes that derive from QObject, even if they are not managed by QSharedPointer. When used in that role, QWeakPointer replaces the older QPointer in all use-cases. QWeakPointer is also more efficient than QPointer, so it should be preferred in all @@ -1163,7 +1163,7 @@ \since 4.6 \brief The qSharedPointerObjectCast function is for casting a shared pointer. - + Returns a shared pointer to the pointer held by \a other, using a \l qobject_cast() to type \tt X to obtain an internal pointer of the appropriate type. If the \tt qobject_cast fails, the object @@ -1432,7 +1432,7 @@ void QtSharedPointer::internalSafetyCheckAdd2(const void *d_ptr, const volatile Q_ASSERT(!kp->dPointers.contains(d_ptr)); //qDebug("Adding d=%p value=%p", d_ptr, ptr); - + const void *other_d_ptr = kp->dataPointers.value(ptr, 0); if (other_d_ptr) { # ifdef BACKTRACE_SUPPORTED |