diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /src/gui/image/qpicture.h | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'src/gui/image/qpicture.h')
| -rw-r--r-- | src/gui/image/qpicture.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index 1e80ab798..6effae7e0 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -42,8 +42,9 @@ #ifndef QPICTURE_H #define QPICTURE_H -#include <QtGui/qpaintdevice.h> #include <QtCore/qstringlist.h> +#include <QtCore/qsharedpointer.h> +#include <QtGui/qpaintdevice.h> QT_BEGIN_HEADER @@ -106,15 +107,15 @@ private: bool exec(QPainter *p, QDataStream &ds, int i); void detach_helper(); - QScopedSharedPointer<QPicturePrivate> d_ptr; + QExplicitlySharedDataPointer<QPicturePrivate> d_ptr; friend class QPicturePaintEngine; friend class Q3Picture; friend class QAlphaPaintEngine; friend class QPreviewPaintEngine; public: - typedef QPicturePrivate* DataPtr; - inline DataPtr &data_ptr() { return d_ptr.data_ptr(); } + typedef QExplicitlySharedDataPointer<QPicturePrivate> DataPtr; + inline DataPtr &data_ptr() { return d_ptr; } }; Q_DECLARE_SHARED(QPicture) |