diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-12 13:53:14 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-12 13:53:14 (GMT) |
| commit | 2e5706eeee2fb9ce543466f469ace2d49ed4be64 (patch) | |
| tree | 559b42064c06b5de59c053a2e5a99fe3b5e5db68 /src/corelib | |
| parent | 5e6a3e2f8f7f0b6b85534fb9cf30a5fd0fbac9ee (diff) | |
| parent | 05c1839531008d3cab40fb6fdaa22667c2133d7e (diff) | |
| download | Qt-2e5706eeee2fb9ce543466f469ace2d49ed4be64.zip Qt-2e5706eeee2fb9ce543466f469ace2d49ed4be64.tar.gz Qt-2e5706eeee2fb9ce543466f469ace2d49ed4be64.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/corelib')
| -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) }; |