diff options
author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
commit | 9093368f33ddc422047103a89effcd40338b4dbc (patch) | |
tree | 78c9660b403214de7ba793c9b06bbb0b65cd5eac /src/corelib/tools/qshareddata.h | |
parent | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (diff) | |
parent | 1af6fc12def29e3f44dd7fcf5635c688902f29c8 (diff) | |
download | Qt-9093368f33ddc422047103a89effcd40338b4dbc.zip Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.gz Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.bz2 |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/tools/qshareddata.h')
-rw-r--r-- | src/corelib/tools/qshareddata.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index dde6e88..8aace0f 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -69,6 +69,9 @@ private: template <class T> class QSharedDataPointer { public: + typedef T Type; + typedef T *pointer; + inline void detach() { if (d && d->ref != 1) detach_helper(); } inline T &operator*() { detach(); return *d; } inline const T &operator*() const { return *d; } @@ -127,6 +130,7 @@ template <class T> class QExplicitlySharedDataPointer { public: typedef T Type; + typedef T *pointer; inline T &operator*() const { return *d; } inline T *operator->() { return d; } |