Remove overrides of QImageIOHandler::name()

We will remove the virtual base class function in Qt 6.
For now, name() returns format().

Change-Id: I1597e823b859e4db148b3e5ac0f1c15350a582eb
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

src/gui/image/qbmphandler.cpp

@@ -866,13 +866,6 @@ void QBmpHandler::setOption(ImageOption option, const QVariant &value)
     Q_UNUSED(value);
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QBmpHandler::name() const
-{
-    return formatName();
-}
-#endif
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_IMAGEFORMAT_BMP

src/gui/image/qbmphandler_p.h

@@ -113,9 +113,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
     static bool canRead(QIODevice *device);
 
     QVariant option(ImageOption option) const override;

src/gui/image/qpnghandler.cpp

@@ -1296,13 +1296,6 @@ void QPngHandler::setOption(ImageOption option, const QVariant &value)
         d->scaledSize = value.toSize();
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QPngHandler::name() const
-{
-    return "png";
-}
-#endif
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_IMAGEFORMAT_PNG

src/gui/image/qpnghandler_p.h

@@ -69,10 +69,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     QVariant option(ImageOption option) const override;
     void setOption(ImageOption option, const QVariant &value) override;
     bool supportsOption(ImageOption option) const override;

src/gui/image/qppmhandler.cpp

@@ -576,13 +576,6 @@ void QPpmHandler::setOption(ImageOption option, const QVariant &value)
         subType = value.toByteArray().toLower();
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QPpmHandler::name() const
-{
-    return subType.isEmpty() ? QByteArray("ppm") : subType;
-}
-#endif
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_IMAGEFORMAT_PPM

src/gui/image/qppmhandler_p.h

@@ -67,10 +67,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     static bool canRead(QIODevice *device, QByteArray *subType = nullptr);
 
     QVariant option(ImageOption option) const override;

src/gui/image/qxbmhandler.cpp

@@ -357,13 +357,6 @@ void QXbmHandler::setOption(ImageOption option, const QVariant &value)
         fileName = value.toString();
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QXbmHandler::name() const
-{
-    return "xbm";
-}
-#endif
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_IMAGEFORMAT_XBM

src/gui/image/qxbmhandler_p.h

@@ -66,10 +66,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     static bool canRead(QIODevice *device);
 
     QVariant option(ImageOption option) const override;

src/gui/image/qxpmhandler.cpp

@@ -1280,13 +1280,6 @@ void QXpmHandler::setOption(ImageOption option, const QVariant &value)
         fileName = value.toString();
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QXpmHandler::name() const
-{
-    return "xpm";
-}
-#endif
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_IMAGEFORMAT_XPM

src/gui/image/qxpmhandler_p.h

@@ -68,10 +68,6 @@ public:
 
     static bool canRead(QIODevice *device);
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     QVariant option(ImageOption option) const override;
     void setOption(ImageOption option, const QVariant &value) override;
     bool supportsOption(ImageOption option) const override;

src/plugins/imageformats/gif/qgifhandler.cpp

@@ -1215,11 +1215,4 @@ int QGifHandler::currentImageNumber() const
     return frameNumber;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QGifHandler::name() const
-{
-    return "gif";
-}
-#endif
-
 QT_END_NAMESPACE

src/plugins/imageformats/gif/qgifhandler_p.h

@@ -73,10 +73,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     static bool canRead(QIODevice *device);
 
     QVariant option(ImageOption option) const override;

src/plugins/imageformats/ico/qicohandler.cpp

@@ -809,17 +809,6 @@ bool QtIcoHandler::write(const QImage &image)
     return ICOReader::write(device, imgs);
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
- * Return the common identifier of the format.
- * For ICO format this will return "ico".
- */
-QByteArray QtIcoHandler::name() const
-{
-    return "ico";
-}
-#endif
-
 /*! \reimp
 
 */

src/plugins/imageformats/ico/qicohandler.h

@@ -54,10 +54,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     int imageCount() const override;
     bool jumpToImage(int imageNumber) override;
     bool jumpToNextImage() override;

src/plugins/imageformats/jpeg/qjpeghandler.cpp

@@ -1184,11 +1184,4 @@ void QJpegHandler::setOption(ImageOption option, const QVariant &value)
     }
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QByteArray QJpegHandler::name() const
-{
-    return "jpeg";
-}
-#endif
-
 QT_END_NAMESPACE

src/plugins/imageformats/jpeg/qjpeghandler_p.h

@@ -68,10 +68,6 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QByteArray name() const override;
-#endif
-
     static bool canRead(QIODevice *device);
 
     QVariant option(ImageOption option) const override;