diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 17:42:00 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-29 06:20:07 +0200 |
| commit | 0fda43cf33cc7715f16d8764c4d96c6f88238712 (patch) | |
| tree | c693c9ce99f1f02f8ec5de204cfe93bf1517b105 /src/gui/image/qpixmap.h | |
| parent | 0303d8ddfa968e0c5a9ac08a12836ea3f34d4088 (diff) | |
Remove deprecated members from QtGui/image classes
Cleaning up those that are trivial to remove because they have direct
replacements.
Change-Id: I4f5c25884a01474fa2db8b369f0d883bd21edd5b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/image/qpixmap.h')
| -rw-r--r-- | src/gui/image/qpixmap.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 2708d267b9..568ed6ecb5 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -92,12 +92,6 @@ public: static int defaultDepth(); void fill(const QColor &fillColor = Qt::white); -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QPainter or fill(QColor)") - void fill(const QPaintDevice *device, const QPoint &ofs); - QT_DEPRECATED_X("Use QPainter or fill(QColor)") - void fill(const QPaintDevice *device, int xofs, int yofs); -#endif QBitmap mask() const; void setMask(const QBitmap &); @@ -113,15 +107,6 @@ public: #endif QBitmap createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode = Qt::MaskInColor) const; -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QScreen::grabWindow() instead") - static QPixmap grabWindow(WId, int x = 0, int y = 0, int w = -1, int h = -1); - QT_DEPRECATED_X("Use QWidget::grab() instead") - static QPixmap grabWidget(QObject *widget, const QRect &rect); - QT_DEPRECATED_X("Use QWidget::grab() instead") - static QPixmap grabWidget(QObject *widget, int x = 0, int y = 0, int w = -1, int h = -1); -#endif - inline QPixmap scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio, Qt::TransformationMode mode = Qt::FastTransformation) const { return scaled(QSize(w, h), aspectMode, mode); } @@ -154,9 +139,6 @@ public: inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = nullptr); void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = nullptr); -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; } -#endif qint64 cacheKey() const; bool isDetached() const; @@ -168,11 +150,6 @@ public: inline bool operator!() const { return isNull(); } -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED inline QPixmap alphaChannel() const; - QT_DEPRECATED inline void setAlphaChannel(const QPixmap &); -#endif - protected: int metric(PaintDeviceMetric) const override; static QPixmap fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor); @@ -222,23 +199,6 @@ inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format, return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), buf.size(), format, flags); } -#if QT_DEPRECATED_SINCE(5, 0) -inline QPixmap QPixmap::alphaChannel() const -{ - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED - return QPixmap::fromImage(toImage().alphaChannel()); - QT_WARNING_POP -} - -inline void QPixmap::setAlphaChannel(const QPixmap &p) -{ - QImage image = toImage(); - image.setAlphaChannel(p.toImage()); - *this = QPixmap::fromImage(image); - -} -#endif /***************************************************************************** QPixmap stream functions |