diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-20 21:51:31 +0200 |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-20 21:51:31 +0200 |
commit | 1af6fc12def29e3f44dd7fcf5635c688902f29c8 (patch) | |
tree | 3731b65cb36ade6172ed47d27b47b4d358adc2a9 /src/gui/image/qpixmap_x11.cpp | |
parent | 0f42290719ebe6d930ba28fdf256e64d9c97be37 (diff) |
Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.
static_cast'ing this pointer type is not possible. You must call data()
or constData() to get the actual pointer to cast.
Diffstat (limited to 'src/gui/image/qpixmap_x11.cpp')
-rw-r--r-- | src/gui/image/qpixmap_x11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index 047bd332e3..888fc42c7f 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -1875,7 +1875,7 @@ QPixmap QX11PixmapData::transformed(const QTransform &transform, return bm; } else { // color pixmap QPixmap pm; - QX11PixmapData *x11Data = static_cast<QX11PixmapData*>(pm.data); + QX11PixmapData *x11Data = static_cast<QX11PixmapData*>(pm.data.data()); x11Data->flags &= ~QX11PixmapData::Uninitialized; x11Data->xinfo = xinfo; x11Data->d = d; @@ -1940,7 +1940,7 @@ void QPixmap::x11SetScreen(int screen) if (screen < 0) screen = QX11Info::appScreen(); - QX11PixmapData *x11Data = static_cast<QX11PixmapData*>(data); + QX11PixmapData *x11Data = static_cast<QX11PixmapData*>(data.data()); if (screen == x11Data->xinfo.screen()) return; // nothing to do @@ -2037,7 +2037,7 @@ bool QX11PixmapData::hasAlphaChannel() const const QX11Info &QPixmap::x11Info() const { if (data->classId() == QPixmapData::X11Class) - return static_cast<QX11PixmapData*>(data)->xinfo; + return static_cast<QX11PixmapData*>(data.data())->xinfo; else { static QX11Info nullX11Info; return nullX11Info; |