diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 13:18:03 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 13:18:03 (GMT) |
| commit | a0065aa78c9a95c707a8f814f61cc99f74d3fc30 (patch) | |
| tree | 187695a1129f7989076de7682aca7553bf350ce2 /src/corelib/tools/qscopedpointer.cpp | |
| parent | 8ef96fd9b2b1d505795ca9ec4cfd936a0bc096e3 (diff) | |
| parent | 5a56da702779d9775f02d17e85c701494036ccf8 (diff) | |
| download | Qt-a0065aa78c9a95c707a8f814f61cc99f74d3fc30.zip Qt-a0065aa78c9a95c707a8f814f61cc99f74d3fc30.tar.gz Qt-a0065aa78c9a95c707a8f814f61cc99f74d3fc30.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/tools/qscopedpointer.cpp')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index ef6cc39..5296bae 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -170,7 +170,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn bool QScopedPointer::operator==(const QScopedPointer<T> &other) const + \fn bool QScopedPointer::operator==(const QScopedPointer<T, Cleanup> &other) const Equality operator. Returns true if the scoped pointer \a other is pointing to the same object as this pointer, otherwise returns false. @@ -178,7 +178,7 @@ QT_BEGIN_NAMESPACE /*! - \fn bool QScopedPointer::operator!=(const QScopedPointer<T> &other) const + \fn bool QScopedPointer::operator!=(const QScopedPointer<T, Cleanup> &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. |