summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qbitmap.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-03 22:37:25 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-03 22:37:25 +0200
commit181df199d31a8018cfcfc31b548909fe4b57ccbd (patch)
tree76833450e7d545d8345a4f529ef5320f24188c1e /src/gui/image/qbitmap.h
parent52352c6c572f15c10c4c3de641db81723aada468 (diff)
remove more QT3_SUPPORT code
Diffstat (limited to 'src/gui/image/qbitmap.h')
-rw-r--r--src/gui/image/qbitmap.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index f1771e3e43..9dff0816dd 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;
};
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