diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-15 14:07:12 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-19 09:50:37 +0200 |
commit | 310519d6d11da546b23c1cba307f37c24e0a5c0b (patch) | |
tree | 3118b6539107ba0541abd09005bacc4e592a27e0 /src/widgets/platforms/mac/qpaintdevice_mac.cpp | |
parent | 5abf4f55b1bd1180ea2dbfb867a48364bc89af80 (diff) |
Rename QPixmapData to QPlatformPixmap.
Makes the API symmetric with the other Lighthouse APIs.
Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893
Reviewed-on: http://codereview.qt.nokia.com/1735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/widgets/platforms/mac/qpaintdevice_mac.cpp')
-rw-r--r-- | src/widgets/platforms/mac/qpaintdevice_mac.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/platforms/mac/qpaintdevice_mac.cpp b/src/widgets/platforms/mac/qpaintdevice_mac.cpp index d29047bf50..50bd4b8490 100644 --- a/src/widgets/platforms/mac/qpaintdevice_mac.cpp +++ b/src/widgets/platforms/mac/qpaintdevice_mac.cpp @@ -121,16 +121,16 @@ Q_WIDGETS_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) CGContextRef ret = 0; // It would make sense to put this into a mac #ifdef'ed - // virtual function in the QPixmapData at some point - if (pm->data->classId() == QPixmapData::MacClass) { - const QMacPixmapData *pmData = static_cast<const QMacPixmapData*>(pm->data.data()); + // virtual function in the QPlatformPixmap at some point + if (pm->data->classId() == QPlatformPixmap::MacClass) { + const QMacPlatformPixmap *pmData = static_cast<const QMacPlatformPixmap*>(pm->data.data()); ret = CGBitmapContextCreate(pmData->pixels, pmData->w, pmData->h, 8, pmData->bytesPerRow, colorspace, flags); if(!ret) qWarning("QPaintDevice: Unable to create context for pixmap (%d/%d/%d)", pmData->w, pmData->h, (pmData->bytesPerRow * pmData->h)); - } else if (pm->data->classId() == QPixmapData::RasterClass) { + } else if (pm->data->classId() == QPlatformPixmap::RasterClass) { QImage *image = pm->data->buffer(); ret = CGBitmapContextCreate(image->bits(), image->width(), image->height(), 8, image->bytesPerLine(), colorspace, flags); |