QtGui: mark some image functions as obsolete

Mark functions which were obsolete since Qt4 times as deprecated so they
can be removed with Qt6:
 - QBitmap::transformed(QMatrix)
 - QImageIOHandler::name()
 - QImageWriter::setDescription()
 - QImageWriter::description()
 - QPixmap::fill()
 - QPixmap::grabWindow()
 - QPixmap::grabWidget()
 - QTransform::det()

Change-Id: I8523065eb59a3242c4c4c195f31ae15c4dcbf8f7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

8 files changed, 45 insertions, 5 deletions

diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 2453242fa8..455045eb57 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -310,6 +310,7 @@ QBitmap QBitmap::transformed(const QTransform &matrix) const
     return bm;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   \overload
   \obsolete
@@ -321,5 +322,6 @@ QBitmap QBitmap::transformed(const QMatrix &matrix) const
 {
     return transformed(QTransform(matrix));
 }
+#endif
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index 188064fccf..f7895bb1e0 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -76,7 +76,10 @@ public:
     static QBitmap fromData(const QSize &size, const uchar *bits,
                             QImage::Format monoFormat = QImage::Format_MonoLSB);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QBitmap::transformed(QTransform) instead")
     QBitmap transformed(const QMatrix &) const;
+#endif
     QBitmap transformed(const QTransform &matrix) const;
 
     typedef QExplicitlySharedDataPointer<QPlatformPixmap> DataPtr;
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 5d1f8fa91f..9fe3b863b3 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -416,6 +416,7 @@ QByteArray QImageIOHandler::format() const
     \sa read(), QIODevice::peek()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -426,6 +427,7 @@ QByteArray QImageIOHandler::name() const
 {
     return format();
 }
+#endif
 
 /*!
     Writes the image \a image to the assigned device. Returns \c true on
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index 990df96534..c20b84afbb 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -69,7 +69,10 @@ public:
     void setFormat(const QByteArray &format) const;
     QByteArray format() const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QImageIOHandler::format() instead")
     virtual QByteArray name() const;
+#endif
 
     virtual bool canRead() const = 0;
     virtual bool read(QImage *image) = 0;
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index d3f9a9b881..41048fa681 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -648,6 +648,7 @@ QImageIOHandler::Transformations QImageWriter::transformation() const
     return d->transformation;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -679,6 +680,7 @@ QString QImageWriter::description() const
 {
     return d->description;
 }
+#endif
 
 /*!
     \since 4.1
diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h
index 29c06ccdd2..ef84a59b7c 100644
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@@ -100,9 +100,12 @@ public:
     QImageIOHandler::Transformations transformation() const;
     void setTransformation(QImageIOHandler::Transformations orientation);
 
-    // Obsolete as of 4.1
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QImageWriter::setText() instead")
     void setDescription(const QString &description);
+    QT_DEPRECATED_X("Use QImageReader::text() instead")
     QString description() const;
+#endif
 
     void setText(const QString &key, const QString &text);
 
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 918e200549..091095f3fc 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -856,6 +856,7 @@ bool QPixmap::doImageIO(QImageWriter *writer, int quality) const
 }
 
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -876,6 +877,14 @@ void QPixmap::fill(const QPaintDevice *device, const QPoint &p)
 
     Use QPainter or the fill(QColor) overload instead.
 */
+void QPixmap::fill(const QPaintDevice *device, int xofs, int yofs)
+{
+    Q_UNUSED(device)
+    Q_UNUSED(xofs)
+    Q_UNUSED(yofs)
+    qWarning("this function is deprecated, ignored");
+}
+#endif
 
 
 /*!
@@ -959,6 +968,7 @@ static void sendResizeEvents(QWidget *target)
 }
 #endif
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -982,6 +992,11 @@ QPixmap QPixmap::grabWidget(QObject *widget, const QRect &rectangle)
 
     Use QWidget::grab() instead.
 */
+QPixmap QPixmap::grabWidget(QObject *widget, int x, int y, int w, int h)
+{
+    return grabWidget(widget, QRect(x, y, w, h));
+}
+#endif
 
 /*****************************************************************************
   QPixmap stream functions
@@ -1578,6 +1593,7 @@ QPixmap QPixmap::fromImageReader(QImageReader *imageReader, Qt::ImageConversionF
     return QPixmap(data.take());
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QPixmap QPixmap::grabWindow(WId window, int x, int y, int
     width, int height)
@@ -1631,6 +1647,7 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h)
              " Defaulting to primary screen.");
     return QGuiApplication::primaryScreen()->grabWindow(window, x, y, w, h);
 }
+#endif
 
 /*!
   \internal
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 55cca7a766..2a7393225e 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -94,8 +94,12 @@ public:
     static int defaultDepth();
 
     void fill(const QColor &fillColor = Qt::white);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X(" Use QPainter or the fill(QColor)")
     void fill(const QPaintDevice *device, const QPoint &ofs);
-    inline void fill(const QPaintDevice *device, int xofs, int yofs) { fill(device, QPoint(xofs, yofs)); }
+    QT_DEPRECATED_X(" Use QPainter or the fill(QColor)")
+    void fill(const QPaintDevice *device, int xofs, int yofs);
+#endif
 
     QBitmap mask() const;
     void setMask(const QBitmap &);
@@ -111,10 +115,14 @@ public:
 #endif
     QBitmap createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode = Qt::MaskInColor) const;
 
-    static QPixmap grabWindow(WId, int x=0, int y=0, int w=-1, int h=-1);
+#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);
-    static inline QPixmap grabWidget(QObject *widget, int x=0, int y=0, int w=-1, int h=-1)
-    { return grabWidget(widget, QRect(x, y, w, h)); }
+    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