summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.h
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-20 13:37:55 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-20 15:12:07 (GMT)
commitfe00645222c4a96a966c8f6938286cf136a6377a (patch)
treed640d30d2f1a854312f285f2dda631edb6cb3afa /src/gui/image/qpixmap.h
parentc2bde443f2510798de9d815af13d5947317fc7d1 (diff)
downloadQt-fe00645222c4a96a966c8f6938286cf136a6377a.zip
Qt-fe00645222c4a96a966c8f6938286cf136a6377a.tar.gz
Qt-fe00645222c4a96a966c8f6938286cf136a6377a.tar.bz2
Use QExplicitlySharedDataPointer wherever possible
Remove QScopedSharedPointer, this class will go soon.
Diffstat (limited to 'src/gui/image/qpixmap.h')
-rw-r--r--src/gui/image/qpixmap.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index bce1f5e..961008f 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -46,6 +46,7 @@
#include <QtGui/qcolor.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qstring.h> // char*->QString conversion
+#include <QtCore/qsharedpointer.h>
#include <QtGui/qimage.h>
#include <QtGui/qtransform.h>
@@ -227,7 +228,7 @@ public:
#endif
private:
- QPixmapData *data;
+ QExplicitlySharedDataPointer<QPixmapData> data;
bool doImageIO(QImageWriter *io, int quality) const;
@@ -272,7 +273,7 @@ public:
QPixmapData* pixmapData() const;
public:
- typedef QPixmapData * DataPtr;
+ typedef QExplicitlySharedDataPointer<QPixmapData> DataPtr;
inline DataPtr &data_ptr() { return data; }
};