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/s60/qpixmap_s60_p.h | |
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/s60/qpixmap_s60_p.h')
-rw-r--r-- | src/widgets/platforms/s60/qpixmap_s60_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/platforms/s60/qpixmap_s60_p.h b/src/widgets/platforms/s60/qpixmap_s60_p.h index e48154963b..2f282e9498 100644 --- a/src/widgets/platforms/s60/qpixmap_s60_p.h +++ b/src/widgets/platforms/s60/qpixmap_s60_p.h @@ -81,17 +81,17 @@ private: bool wasLocked; }; -class QS60PixmapData : public QRasterPixmapData +class QS60PlatformPixmap : public QRasterPlatformPixmap { public: - QS60PixmapData(PixelType type); - ~QS60PixmapData(); + QS60PlatformPixmap(PixelType type); + ~QS60PlatformPixmap(); - QPixmapData *createCompatiblePixmapData() const; + QPlatformPixmap *createCompatiblePlatformPixmap() const; void resize(int width, int height); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); - void copy(const QPixmapData *data, const QRect &rect); + void copy(const QPlatformPixmap *data, const QRect &rect); bool scroll(int dx, int dy, const QRect &rect); int metric(QPaintDevice::PaintDeviceMetric metric) const; @@ -122,11 +122,11 @@ private: bool formatLocked; - QS60PixmapData *next; - QS60PixmapData *prev; + QS60PlatformPixmap *next; + QS60PlatformPixmap *prev; - static void qt_symbian_register_pixmap(QS60PixmapData *pd); - static void qt_symbian_unregister_pixmap(QS60PixmapData *pd); + static void qt_symbian_register_pixmap(QS60PlatformPixmap *pd); + static void qt_symbian_unregister_pixmap(QS60PlatformPixmap *pd); static void qt_symbian_release_pixmaps(); friend class QPixmap; |