diff options
author | Alexandros Dermenakis <alexandros.dermenakis@nokia.com> | 2012-08-02 12:51:13 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-10 21:58:29 +0200 |
commit | 59cd316d6c12df60297347ddc10f29e19a241066 (patch) | |
tree | 295c9972f4ebee2d1bd5e36883b2e6b414064116 /src/gui/image/qimage.h | |
parent | 816c5540179362500dfc175b77f05abf3ef25233 (diff) |
Revert "Added default argument for color profile to QImage constructors."
Reverting change after request in the developers mailing list.
This reverts commit 50a5bd5429e0c8b99be81b86d3730737cb7f8514.
Change-Id: Ic4a420d6ad0995810ed61d31edd28e7b603cca5e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/image/qimage.h')
-rw-r--r-- | src/gui/image/qimage.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 60aebacf13..eafd7eb598 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -63,8 +63,6 @@ class QStringList; class QMatrix; class QTransform; class QVariant; -class QColorProfile; - template <class T> class QList; template <class T> class QVector; @@ -130,12 +128,12 @@ public: }; QImage(); - QImage(const QSize &size, Format format, QColorProfile *profile = 0); - QImage(int width, int height, Format format, QColorProfile *profile = 0); - QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0); - QImage(const uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0); - QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0); - QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0); + QImage(const QSize &size, Format format); + QImage(int width, int height, Format format); + QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0); + QImage(const uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0); + QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0); + QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0); #ifndef QT_NO_IMAGEFORMAT_XPM explicit QImage(const char * const xpm[]); |