From af00402d6446c0f8f085a2a482fc83c4318aa457 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Mon, 2 Mar 2020 14:22:10 +0100
Subject: [PATCH] Remove QImageIOHandler::name()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It has been marked obsolete for a very long time, and deprecated
in code since f9e6f8efda350689211286db9154677924df8aab.

Change-Id: Ib351025369584bf3b8a3a17f980a567d2b9556ca
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 src/gui/image/qimageiohandler.cpp | 11 -----------
 src/gui/image/qimageiohandler.h   |  3 ---
 2 files changed, 14 deletions(-)

diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 6a17df99558..9c9ebbccdc1 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -416,17 +416,6 @@ QByteArray QImageIOHandler::format() const
     \sa read(), QIODevice::peek()
 */
 
-/*!
-    \obsolete
-
-    Use format() instead.
-*/
-
-QByteArray QImageIOHandler::name() const // ### Qt6: remove
-{
-    return format();
-}
-
 /*!
     Writes the image \a image to the assigned device. Returns \c true on
     success; otherwise returns \c false.
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index a4acf9dfe02..b6b40029b6b 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -69,9 +69,6 @@ public:
     void setFormat(const QByteArray &format) const;
     QByteArray format() const;
 
-    QT_DEPRECATED_X("Use QImageIOHandler::format() instead")
-    virtual QByteArray name() const;
-
     virtual bool canRead() const = 0;
     virtual bool read(QImage *image) = 0;
     virtual bool write(const QImage &image);