diff options
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/dds/qddshandler.h | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/icns/qicnshandler.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/icns/qicnshandler_p.h | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.cpp | 11 | ||||
-rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler_p.h | 3 | ||||
-rw-r--r-- | src/plugins/imageformats/macjp2/qmacjp2handler.cpp | 6 | ||||
-rw-r--r-- | src/plugins/imageformats/macjp2/qmacjp2handler.h | 1 | ||||
-rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.cpp | 6 | ||||
-rw-r--r-- | src/plugins/imageformats/mng/qmnghandler_p.h | 1 | ||||
-rw-r--r-- | src/plugins/imageformats/tga/qtgahandler.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/tga/qtgahandler.h | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler_p.h | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/webp/qwebphandler.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/webp/qwebphandler_p.h | 4 |
16 files changed, 0 insertions, 83 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp index 845f9b3..a0ac19b 100644 --- a/src/plugins/imageformats/dds/qddshandler.cpp +++ b/src/plugins/imageformats/dds/qddshandler.cpp @@ -1382,13 +1382,6 @@ QDDSHandler::QDDSHandler() : { } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QDDSHandler::name() const -{ - return QByteArrayLiteral("dds"); -} -#endif - bool QDDSHandler::canRead() const { if (m_scanState == ScanNotScanned && !canRead(device())) diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h index f4bc888..0c6449a 100644 --- a/src/plugins/imageformats/dds/qddshandler.h +++ b/src/plugins/imageformats/dds/qddshandler.h @@ -53,10 +53,6 @@ class QDDSHandler : public QImageIOHandler public: QDDSHandler(); -#if QT_DEPRECATED_SINCE(5, 13) - QByteArray name() const override; -#endif - bool canRead() const override; bool read(QImage *image) override; bool write(const QImage &image) override; diff --git a/src/plugins/imageformats/icns/qicnshandler.cpp b/src/plugins/imageformats/icns/qicnshandler.cpp index 9733ed7..dde783c 100644 --- a/src/plugins/imageformats/icns/qicnshandler.cpp +++ b/src/plugins/imageformats/icns/qicnshandler.cpp @@ -651,13 +651,6 @@ QICNSHandler::QICNSHandler() : { } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QICNSHandler::name() const -{ - return QByteArrayLiteral("icns"); -} -#endif - bool QICNSHandler::canRead(QIODevice *device) { if (!device || !device->isReadable()) { diff --git a/src/plugins/imageformats/icns/qicnshandler_p.h b/src/plugins/imageformats/icns/qicnshandler_p.h index b532045..e83d4eb 100644 --- a/src/plugins/imageformats/icns/qicnshandler_p.h +++ b/src/plugins/imageformats/icns/qicnshandler_p.h @@ -132,10 +132,6 @@ public: bool read(QImage *image) override; bool write(const QImage &image) override; -#if QT_DEPRECATED_SINCE(5, 13) - QByteArray name() const override; -#endif - bool supportsOption(ImageOption option) const override; QVariant option(ImageOption option) const override; diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp index ce23480..e9a470c 100644 --- a/src/plugins/imageformats/jp2/qjp2handler.cpp +++ b/src/plugins/imageformats/jp2/qjp2handler.cpp @@ -308,17 +308,6 @@ bool QJp2Handler::supportsOption(ImageOption option) const return (option == Quality || option == SubType); } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - Return the common identifier of the format. - For JPEG 2000 this will return "jp2". - */ -QByteArray QJp2Handler::name() const -{ - return QByteArrayLiteral("jp2"); -} -#endif - /*! Automatic resource handling for a jas_image_t*. */ diff --git a/src/plugins/imageformats/jp2/qjp2handler_p.h b/src/plugins/imageformats/jp2/qjp2handler_p.h index 16ddc8a..bdaf601 100644 --- a/src/plugins/imageformats/jp2/qjp2handler_p.h +++ b/src/plugins/imageformats/jp2/qjp2handler_p.h @@ -64,9 +64,6 @@ public: QVariant option(ImageOption option) const override; void setOption(ImageOption option, const QVariant &value) override; bool supportsOption(ImageOption option) const override; -#if QT_DEPRECATED_SINCE(5, 13) - QByteArray name() const override; -#endif private: Q_DECLARE_PRIVATE(QJp2Handler) diff --git a/src/plugins/imageformats/macjp2/qmacjp2handler.cpp b/src/plugins/imageformats/macjp2/qmacjp2handler.cpp index 72f753a..11df94a 100644 --- a/src/plugins/imageformats/macjp2/qmacjp2handler.cpp +++ b/src/plugins/imageformats/macjp2/qmacjp2handler.cpp @@ -118,10 +118,4 @@ bool QMacJp2Handler::supportsOption(ImageOption option) const return (option == Quality); } -QByteArray QMacJp2Handler::name() const -{ - return QByteArrayLiteral("jp2"); -} - - QT_END_NAMESPACE diff --git a/src/plugins/imageformats/macjp2/qmacjp2handler.h b/src/plugins/imageformats/macjp2/qmacjp2handler.h index bf0496d..e1deaf7 100644 --- a/src/plugins/imageformats/macjp2/qmacjp2handler.h +++ b/src/plugins/imageformats/macjp2/qmacjp2handler.h @@ -63,7 +63,6 @@ public: QVariant option(ImageOption option) const override; void setOption(ImageOption option, const QVariant &value) override; bool supportsOption(ImageOption option) const override; - QByteArray name() const override; static bool canRead(QIODevice *iod); diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp index 4106ba6..b37dca1 100644 --- a/src/plugins/imageformats/mng/qmnghandler.cpp +++ b/src/plugins/imageformats/mng/qmnghandler.cpp @@ -403,12 +403,6 @@ bool QMngHandler::canRead(QIODevice *device) } /*! \reimp */ -QByteArray QMngHandler::name() const -{ - return "mng"; -} - -/*! \reimp */ bool QMngHandler::read(QImage *image) { Q_D(QMngHandler); diff --git a/src/plugins/imageformats/mng/qmnghandler_p.h b/src/plugins/imageformats/mng/qmnghandler_p.h index 0f9a207..de2ff5c 100644 --- a/src/plugins/imageformats/mng/qmnghandler_p.h +++ b/src/plugins/imageformats/mng/qmnghandler_p.h @@ -57,7 +57,6 @@ class QMngHandler : public QImageIOHandler QMngHandler(); ~QMngHandler(); bool canRead() const override; - QByteArray name() const override; bool read(QImage *image) override; bool write(const QImage &image) override; int currentImageNumber() const override; diff --git a/src/plugins/imageformats/tga/qtgahandler.cpp b/src/plugins/imageformats/tga/qtgahandler.cpp index 9277e50..bc70f39 100644 --- a/src/plugins/imageformats/tga/qtgahandler.cpp +++ b/src/plugins/imageformats/tga/qtgahandler.cpp @@ -98,13 +98,6 @@ bool QTgaHandler::read(QImage *image) return !image->isNull(); } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QTgaHandler::name() const -{ - return "tga"; -} -#endif - QVariant QTgaHandler::option(ImageOption option) const { if (option == Size && canRead()) { diff --git a/src/plugins/imageformats/tga/qtgahandler.h b/src/plugins/imageformats/tga/qtgahandler.h index 6550a11..8e16bb6 100644 --- a/src/plugins/imageformats/tga/qtgahandler.h +++ b/src/plugins/imageformats/tga/qtgahandler.h @@ -55,10 +55,6 @@ public: bool canRead() const override; bool read(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; diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index f8645ec..bf4bc36 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -816,13 +816,6 @@ bool QTiffHandler::write(const QImage &image) return true; } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QTiffHandler::name() const -{ - return "tiff"; -} -#endif - QVariant QTiffHandler::option(ImageOption option) const { if (option == Size && canRead()) { diff --git a/src/plugins/imageformats/tiff/qtiffhandler_p.h b/src/plugins/imageformats/tiff/qtiffhandler_p.h index c2eb412..97a63e1 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler_p.h +++ b/src/plugins/imageformats/tiff/qtiffhandler_p.h @@ -55,10 +55,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; diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp index aab7aad..c1898d0 100644 --- a/src/plugins/imageformats/webp/qwebphandler.cpp +++ b/src/plugins/imageformats/webp/qwebphandler.cpp @@ -379,13 +379,6 @@ bool QWebpHandler::supportsOption(ImageOption option) const || option == BackgroundColor; } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QWebpHandler::name() const -{ - return QByteArrayLiteral("webp"); -} -#endif - int QWebpHandler::imageCount() const { if (!ensureScanned()) diff --git a/src/plugins/imageformats/webp/qwebphandler_p.h b/src/plugins/imageformats/webp/qwebphandler_p.h index 96a8811..849afe3 100644 --- a/src/plugins/imageformats/webp/qwebphandler_p.h +++ b/src/plugins/imageformats/webp/qwebphandler_p.h @@ -57,10 +57,6 @@ public: ~QWebpHandler(); public: -#if QT_DEPRECATED_SINCE(5, 13) - QByteArray name() const override; -#endif - bool canRead() const override; bool read(QImage *image) override; |