diff options
Diffstat (limited to 'src/gui/image/qbitmap.h')
-rw-r--r-- | src/gui/image/qbitmap.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index b37eed212d..a3104f5083 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -74,34 +74,11 @@ public: QBitmap transformed(const QMatrix &) const; QBitmap transformed(const QTransform &matrix) const; -#ifdef QT3_SUPPORT - inline QT3_SUPPORT_CONSTRUCTOR QBitmap(int w, int h, bool clear); - inline QT3_SUPPORT_CONSTRUCTOR QBitmap(const QSize &, bool clear); - QT3_SUPPORT_CONSTRUCTOR QBitmap(int w, int h, const uchar *bits, bool isXbitmap=false); - QT3_SUPPORT_CONSTRUCTOR QBitmap(const QSize &, const uchar *bits, bool isXbitmap=false); - inline QT3_SUPPORT QBitmap xForm(const QMatrix &matrix) const { return transformed(QTransform(matrix)); } - QT3_SUPPORT_CONSTRUCTOR QBitmap(const QImage &image) { *this = fromImage(image); } - QT3_SUPPORT QBitmap &operator=(const QImage &image) { *this = fromImage(image); return *this; } -#endif - typedef QExplicitlySharedDataPointer<QPixmapData> DataPtr; + typedef QExplicitlySharedDataPointer<QPlatformPixmap> DataPtr; }; Q_DECLARE_SHARED(QBitmap) -#ifdef QT3_SUPPORT -inline QBitmap::QBitmap(int w, int h, bool clear) - : QPixmap(QSize(w, h), 1) -{ - if (clear) this->clear(); -} - -inline QBitmap::QBitmap(const QSize &size, bool clear) - : QPixmap(size, 1) -{ - if (clear) this->clear(); -} -#endif - QT_END_NAMESPACE QT_END_HEADER |