From 310519d6d11da546b23c1cba307f37c24e0a5c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Fri, 15 Jul 2011 14:07:12 +0200 Subject: Rename QPixmapData to QPlatformPixmap. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jørgen Lind --- src/widgets/styles/qs60style_s60.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/styles/qs60style_s60.cpp') 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 pd(QPixmapData::create(0, 0, QPixmapData::PixmapType)); + QScopedPointer 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)); -- cgit v1.2.3