diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 7f9238763..2b1dbd2e3 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -192,15 +192,14 @@ QBitmap::QBitmap(const QString& fileName, const char *format) QBitmap &QBitmap::operator=(const QPixmap &pixmap) { - if (pixmap.isNull()) { // a null pixmap + if (pixmap.isNull()) { // a null pixmap QBitmap bm(0, 0); QBitmap::operator=(bm); } else if (pixmap.depth() == 1) { // 1-bit pixmap - QPixmap::operator=(pixmap); // shallow assignment - } else { // n-bit depth pixmap - QImage image; - image = pixmap.toImage(); // convert pixmap to image - *this = fromImage(image); // will dither image + QPixmap::operator=(pixmap); // shallow assignment + } else { // n-bit depth pixmap + QImage image = pixmap.toImage(); // convert pixmap to image + *this = fromImage(image); // will dither image } return *this; } @@ -299,30 +298,6 @@ QBitmap QBitmap::fromData(const QSize &size, const uchar *bits, QImage::Format m return QBitmap::fromImage(image); } -/*! - Returns a copy of this bitmap, transformed according to the given - \a matrix. - - \sa QPixmap::transformed() - */ -QBitmap QBitmap::transformed(const QTransform &matrix) const -{ - return QPixmap::transformed(matrix); -} - -/*! - \overload - \obsolete - - This convenience function converts the \a matrix to a QTransform - and calls the overloaded function. -*/ -QBitmap QBitmap::transformed(const QMatrix &matrix) const -{ - return transformed(QTransform(matrix)); -} - - QT_END_NAMESPACE diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index 2f4274c1e..a78563111 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -63,9 +63,6 @@ public: static QBitmap fromData(const QSize &size, const uchar *bits, QImage::Format monoFormat = QImage::Format_MonoLSB); - QBitmap transformed(const QMatrix &) const; - QBitmap transformed(const QTransform &matrix) const; - typedef QExplicitlySharedDataPointer DataPtr; }; Q_DECLARE_SHARED(QBitmap)