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/styles/qs60style_s60.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/styles/qs60style_s60.cpp')
-rw-r--r-- | src/widgets/styles/qs60style_s60.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/styles/qs60style_s60.cpp b/src/widgets/styles/qs60style_s60.cpp index f272ff4a90..f7ced9e8f8 100644 --- a/src/widgets/styles/qs60style_s60.cpp +++ b/src/widgets/styles/qs60style_s60.cpp @@ -647,17 +647,17 @@ QPixmap QS60StyleModeSpecifics::fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask return QPixmap(); QPixmap pixmap; - QScopedPointer<QPixmapData> pd(QPixmapData::create(0, 0, QPixmapData::PixmapType)); + QScopedPointer<QPlatformPixmap> pd(QPlatformPixmap::create(0, 0, QPlatformPixmap::PixmapType)); if (mask) { // Try the efficient path with less copying and conversion. QVolatileImage img(icon, mask); - pd->fromNativeType(&img, QPixmapData::VolatileImage); + pd->fromNativeType(&img, QPlatformPixmap::VolatileImage); if (!pd->isNull()) pixmap = QPixmap(pd.take()); } if (pixmap.isNull()) { // Potentially more expensive path. - pd->fromNativeType(icon, QPixmapData::FbsBitmap); + pd->fromNativeType(icon, QPlatformPixmap::FbsBitmap); pixmap = QPixmap(pd.take()); if (mask) { pixmap.setAlphaChannel(QPixmap::fromSymbianCFbsBitmap(mask)); |