diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 22:37:25 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 22:37:25 +0200 |
commit | 181df199d31a8018cfcfc31b548909fe4b57ccbd (patch) | |
tree | 76833450e7d545d8345a4f529ef5320f24188c1e /src/gui/image/qpixmap.h | |
parent | 52352c6c572f15c10c4c3de641db81723aada468 (diff) |
remove more QT3_SUPPORT code
Diffstat (limited to 'src/gui/image/qpixmap.h')
-rw-r--r-- | src/gui/image/qpixmap.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index f2e79c14f4..77f06b060b 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -224,26 +224,6 @@ public: protected: int metric(PaintDeviceMetric) const; -#ifdef QT3_SUPPORT -public: - enum ColorMode { Auto, Color, Mono }; - QT3_SUPPORT_CONSTRUCTOR QPixmap(const QString& fileName, const char *format, ColorMode mode); - QT3_SUPPORT bool load(const QString& fileName, const char *format, ColorMode mode); - QT3_SUPPORT bool loadFromData(const uchar *buf, uint len, const char* format, ColorMode mode); - QT3_SUPPORT_CONSTRUCTOR QPixmap(const QImage& image); - QT3_SUPPORT QPixmap &operator=(const QImage &); - inline QT3_SUPPORT QImage convertToImage() const { return toImage(); } - QT3_SUPPORT bool convertFromImage(const QImage &, ColorMode mode); - inline QT3_SUPPORT operator QImage() const { return toImage(); } - inline QT3_SUPPORT QPixmap xForm(const QMatrix &matrix) const { return transformed(QTransform(matrix)); } - inline QT3_SUPPORT bool selfMask() const { return false; } -private: - void resize_helper(const QSize &s); -public: - inline QT3_SUPPORT void resize(const QSize &s) { resize_helper(s); } - inline QT3_SUPPORT void resize(int width, int height) { resize_helper(QSize(width, height)); } -#endif - private: QExplicitlySharedDataPointer<QPixmapData> data; @@ -320,14 +300,6 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QPixmap &); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &); #endif -/***************************************************************************** - QPixmap (and QImage) helper functions -*****************************************************************************/ -#ifdef QT3_SUPPORT -QT3_SUPPORT Q_GUI_EXPORT void copyBlt(QPixmap *dst, int dx, int dy, const QPixmap *src, - int sx=0, int sy=0, int sw=-1, int sh=-1); -#endif // QT3_SUPPORT - QT_END_NAMESPACE QT_END_HEADER |