summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2009-06-16 10:27:29 (GMT)
committerLiang Qi <liang.qi@nokia.com>2009-06-16 10:27:29 (GMT)
commit9af7b50fba565b201cb938b128650f125b7f7291 (patch)
tree8825626dbe8b14406d44fa46f595ec3d0d55bb26 /src
parentba0ad632b7058b2dc8b780d0e713a5f577a1bb3b (diff)
parent6119bb129df56ac5c3f1044f1d6b03b500d0f599 (diff)
downloadQt-9af7b50fba565b201cb938b128650f125b7f7291.zip
Qt-9af7b50fba565b201cb938b128650f125b7f7291.tar.gz
Qt-9af7b50fba565b201cb938b128650f125b7f7291.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qscopedpointer.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 6a1ffb6..912edb6 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -80,6 +80,21 @@
\note QScopedPointer does not work with arrays.
+ \section1 Forward Declared Pointers
+
+ Classes that are forward declared can be used within QScopedPointer, as
+ long as the destructor of the forward declared class is available whenever
+ a QScopedPointer needs to clean up.
+
+ Concretely, this means that all classes containing a QScopedPointer that
+ points to a forward declared class must have non-inline constructors,
+ destructors and assignment operators:
+
+ \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 4
+
+ Otherwise, the compiler output a warning about not being able to destruct
+ \c MyPrivateClass.
+
\sa QSharedPointer
*/
@@ -142,7 +157,7 @@
/*!
- \fn bool QScopedPointer::operator!=(const QScopedPointer<T> *other) const
+ \fn bool QScopedPointer::operator!=(const QScopedPointer<T> &other) const
Inequality operator. Returns true if the scoped pointer \a other
is not pointing to the same object as this pointer, otherwise returns false.