Changeset 846 for trunk/src/corelib/tools/qsharedpointer.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qsharedpointer.cpp (modified) (6 diffs)

trunk/src/corelib/tools/qsharedpointer.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -68 +68 @@
     QSharedPointer and QWeakPointer are thread-safe and operate
     atomically on the pointer value. Different threads can also access
-    the same QSharedPointer or QWeakPointer object at the same time
-    without need for locking mechanisms.
+    the 
+    without need for locking mechanisms.
 
     It should be noted that, while the pointer value can be accessed
@@ -396 +396 @@
     \section1 Tracking QObject
 
-    QWeakPointer can be used to track deletion classes derives from QObject,
+    QWeakPointer can be used to track deletion classes  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
@@ -483 +483 @@
     another QSharedPointer object or deleted outside this object.
 
-    The \a deleter paramter specifies the custom deleter for this
+    The \a deleter paramter specifies the custom deleter for this
     object. The custom deleter is called when the strong reference
     count drops to 0 instead of the operator delete(). This is useful,
@@ -1164 +1164 @@
 
     \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
@@ -1433 +1433 @@
 
     //qDebug("Adding d=%p value=%p", d_ptr, ptr);
-    
+
     const void *other_d_ptr = kp->dataPointers.value(ptr, 0);
     if (other_d_ptr) {