diff options
author | gunnar <gunnar@trolltech.com> | 2009-08-24 09:37:21 (GMT) |
---|---|---|
committer | gunnar <gunnar@trolltech.com> | 2009-08-24 10:55:39 (GMT) |
commit | dd21f5600a8bf07d1ac9b5367005790db86892ae (patch) | |
tree | 8b83795c3c20064da0bd3f1196df14ea38d6ef7f /src/gui/image/qpixmapdata_p.h | |
parent | d1111859c26526227c07793aa6747efa65496055 (diff) | |
download | Qt-dd21f5600a8bf07d1ac9b5367005790db86892ae.zip Qt-dd21f5600a8bf07d1ac9b5367005790db86892ae.tar.gz Qt-dd21f5600a8bf07d1ac9b5367005790db86892ae.tar.bz2 |
make QPixmap rely on QPixmapData for loading from files and from data...
Reviewed-By: Eskil
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
-rw-r--r-- | src/gui/image/qpixmapdata_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 70890c0..9040641 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -75,8 +75,12 @@ public: virtual void resize(int width, int height) = 0; virtual void fromImage(const QImage &image, Qt::ImageConversionFlags flags) = 0; - virtual void fromFile(const QString &filename, const char *format, + + virtual bool fromFile(const QString &filename, const char *format, + Qt::ImageConversionFlags flags); + virtual bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags); + virtual void copy(const QPixmapData *data, const QRect &rect); virtual bool scroll(int dx, int dy, const QRect &rect); |