diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
| commit | 3286c4d489905d27183a9ba18048c11a5af8913c (patch) | |
| tree | 392cc7137ffd69b305272f672db55a73be4f1dae /src/corelib/tools | |
| parent | 1bc1e5c0b76a92594c5254e72d25165879e753d2 (diff) | |
| parent | 6b651e5f69b656c6c6fa05b6a81674a4fd56a160 (diff) | |
| download | Qt-3286c4d489905d27183a9ba18048c11a5af8913c.zip Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.gz Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qscopedpointer_p.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/corelib/tools/qscopedpointer_p.h b/src/corelib/tools/qscopedpointer_p.h index b1636d5..fb627a4 100644 --- a/src/corelib/tools/qscopedpointer_p.h +++ b/src/corelib/tools/qscopedpointer_p.h @@ -76,6 +76,16 @@ public: return this->d; } + inline bool operator==(const QCustomScopedPointer<T, Cleanup> &other) const + { + return this->d == other.d; + } + + inline bool operator!=(const QCustomScopedPointer<T, Cleanup> &other) const + { + return this->d != other.d; + } + private: Q_DISABLE_COPY(QCustomScopedPointer) }; @@ -120,6 +130,16 @@ public: QScopedPointerSharedDeleter<T>::cleanup(oldD); } + inline bool operator==(const QScopedSharedPointer<T> &other) const + { + return this->d == other.d; + } + + inline bool operator!=(const QScopedSharedPointer<T> &other) const + { + return this->d != other.d; + } + private: Q_DISABLE_COPY(QScopedSharedPointer) }; |