diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-09-23 06:31:23 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-09-23 13:10:41 (GMT) |
| commit | 7dcf984f85a3a75ce4c078cc931bd9d2304bc235 (patch) | |
| tree | d18699427b8ffe5843e82c3057c70b9db53d136d /src/gui/image/qpixmap.h | |
| parent | 48d0f84958fdc2dcffab75f33842a9dbc3d4d7b1 (diff) | |
| download | Qt-7dcf984f85a3a75ce4c078cc931bd9d2304bc235.zip Qt-7dcf984f85a3a75ce4c078cc931bd9d2304bc235.tar.gz Qt-7dcf984f85a3a75ce4c078cc931bd9d2304bc235.tar.bz2 | |
Modify functions for native pixmap data conversion on Symbian.
We need a way to support converion to and from multiple native pixmap
types from multiple pixmap backends. Instead of adding more virtual
functions to QPixmapData, make the existing one more generic but pass
an opaque pointer and a type and do some internal casting.
Currently this function is Symbian only, but could easily be extended
to work on other platforms.
Reviewed-by: Aleksandar Babic
Reviewed-by: Jani Hautakangas
Diffstat (limited to 'src/gui/image/qpixmap.h')
| -rw-r--r-- | src/gui/image/qpixmap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 2ed65ea..a891637 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -161,10 +161,8 @@ public: #endif #if defined(Q_OS_SYMBIAN) - enum ConversionMode { CopyData, DuplicateHandle }; - - CFbsBitmap *toSymbianCFbsBitmap(ConversionMode mode = DuplicateHandle) const; - static QPixmap fromSymbianCFbsBitmap(CFbsBitmap *bitmap, ConversionMode mode = DuplicateHandle); + CFbsBitmap *toSymbianCFbsBitmap() const; + static QPixmap fromSymbianCFbsBitmap(CFbsBitmap *bitmap); RSgImage* toSymbianRSgImage() const; static QPixmap fromSymbianRSgImage(RSgImage *sgImage); #endif |