diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-06-15 12:18:55 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-06-15 12:18:55 (GMT) |
| commit | 768a10eed71771ce3e38c1ddcd5db6d1293e27d8 (patch) | |
| tree | a8aa9c9e8f9babe15185a15741b4e9eb71246127 | |
| parent | 17975c71e2578b1eab92d93085f0737251666fc8 (diff) | |
| parent | 2a91ca517826c8a4e5f432ad026106542f02f852 (diff) | |
| download | Qt-768a10eed71771ce3e38c1ddcd5db6d1293e27d8.zip Qt-768a10eed71771ce3e38c1ddcd5db6d1293e27d8.tar.gz Qt-768a10eed71771ce3e38c1ddcd5db6d1293e27d8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | doc/src/topics.qdoc | 11 | ||||
| -rw-r--r-- | src/corelib/tools/qscopedpointer.cpp | 15 |
2 files changed, 26 insertions, 0 deletions
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc index 6ef3a89..09a86bd 100644 --- a/doc/src/topics.qdoc +++ b/doc/src/topics.qdoc @@ -300,3 +300,14 @@ including ARM, Intel x86, MIPS and SH-4. \endlist \endtable */ + +/*! +\group qts60 +\title Qt for S60 +\ingroup topics +\brief Documents related to Qt for S60 + +\list + \o \l {Exception Safety with Symbian} +\endlist +*/ diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index 0239575..6a1ffb6 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -134,6 +134,21 @@ */ /*! + \fn bool QScopedPointer::operator==(const QScopedPointer<T> &other) const + + Equality operator. Returns true if the scoped pointer \a other + is pointing to the same object as this pointer, otherwise returns false. +*/ + + +/*! + \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. +*/ + +/*! \fn bool QScopedPointer::isNull() const Returns \c true if this object is holding a pointer that is \c null. |