From cc1078c653704063f146e621f305c852bfa86fd1 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 18 Dec 2022 12:04:33 +0000 Subject: [PATCH] kimgio: remove now unused QImageIOPlugin::keys() reimplementations Katie no longer requires them Signed-off-by: Ivailo Monev --- kimgio/ico.cpp | 5 ----- kimgio/ico.h | 5 ++--- kimgio/jp2.cpp | 5 ----- kimgio/jp2.h | 5 ++--- kimgio/jpg.cpp | 5 ----- kimgio/jpg.h | 5 ++--- kimgio/raw.cpp | 5 ----- kimgio/raw.h | 5 ++--- kimgio/tiff.cpp | 5 ----- kimgio/tiff.h | 5 ++--- kimgio/webp.cpp | 9 +++------ kimgio/webp.h | 11 +++++------ 12 files changed, 18 insertions(+), 52 deletions(-) diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp index 4e28d6f7..b80686c8 100644 --- a/kimgio/ico.cpp +++ b/kimgio/ico.cpp @@ -399,11 +399,6 @@ bool ICOHandler::canRead(QIODevice *device) return false; } -QStringList ICOPlugin::keys() const -{ - return QStringList() << s_icopluginformat; -} - QList ICOPlugin::mimeTypes() const { static const QList list = QList() diff --git a/kimgio/ico.h b/kimgio/ico.h index 1c738804..0bb20f41 100644 --- a/kimgio/ico.h +++ b/kimgio/ico.h @@ -40,9 +40,8 @@ public: class ICOPlugin : public QImageIOPlugin { public: - QStringList keys() const; - QList mimeTypes() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; + QList mimeTypes() const final; + QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final; }; diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index 30b7cc10..820aa44b 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -312,11 +312,6 @@ bool JP2Handler::canRead(QIODevice *device) return (guessOJCodec(data) != OPJ_CODEC_UNKNOWN); } -QStringList JP2Plugin::keys() const -{ - return QStringList() << s_jp2pluginformat; -} - QList JP2Plugin::mimeTypes() const { static const QList list = QList() diff --git a/kimgio/jp2.h b/kimgio/jp2.h index 65cdefc8..8c9949e2 100644 --- a/kimgio/jp2.h +++ b/kimgio/jp2.h @@ -40,9 +40,8 @@ public: class JP2Plugin : public QImageIOPlugin { public: - QStringList keys() const; - QList mimeTypes() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; + QList mimeTypes() const final; + QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final; }; diff --git a/kimgio/jpg.cpp b/kimgio/jpg.cpp index 339b49db..bbedf0d5 100644 --- a/kimgio/jpg.cpp +++ b/kimgio/jpg.cpp @@ -239,11 +239,6 @@ bool JPGHandler::canRead(QIODevice *device) return false; } -QStringList JPGPlugin::keys() const -{ - return QStringList() << s_jpgpluginformat; -} - QList JPGPlugin::mimeTypes() const { static const QList list = QList() diff --git a/kimgio/jpg.h b/kimgio/jpg.h index a645793f..2b6bfe95 100644 --- a/kimgio/jpg.h +++ b/kimgio/jpg.h @@ -47,9 +47,8 @@ private: class JPGPlugin : public QImageIOPlugin { public: - QStringList keys() const; - QList mimeTypes() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; + QList mimeTypes() const final; + QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final; }; diff --git a/kimgio/raw.cpp b/kimgio/raw.cpp index ed12dc91..756529d9 100644 --- a/kimgio/raw.cpp +++ b/kimgio/raw.cpp @@ -291,11 +291,6 @@ bool RAWHandler::canRead(QIODevice *device) return true; } -QStringList RAWPlugin::keys() const -{ - return QStringList() << s_rawpluginformat; -} - QList RAWPlugin::mimeTypes() const { static const QList list = QList() diff --git a/kimgio/raw.h b/kimgio/raw.h index 8225a0e5..95aa45d9 100644 --- a/kimgio/raw.h +++ b/kimgio/raw.h @@ -40,9 +40,8 @@ public: class RAWPlugin : public QImageIOPlugin { public: - QStringList keys() const; - QList mimeTypes() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; + QList mimeTypes() const final; + QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final; }; diff --git a/kimgio/tiff.cpp b/kimgio/tiff.cpp index 23d7d73e..2e877adc 100644 --- a/kimgio/tiff.cpp +++ b/kimgio/tiff.cpp @@ -267,11 +267,6 @@ bool TIFFHandler::canRead(QIODevice *device) return false; } -QStringList TIFFPlugin::keys() const -{ - return QStringList() << s_tiffpluginformat; -} - QList TIFFPlugin::mimeTypes() const { static const QList list = QList() diff --git a/kimgio/tiff.h b/kimgio/tiff.h index 29e28a28..14562087 100644 --- a/kimgio/tiff.h +++ b/kimgio/tiff.h @@ -40,9 +40,8 @@ public: class TIFFPlugin : public QImageIOPlugin { public: - QStringList keys() const; - QList mimeTypes() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; + QList mimeTypes() const final; + QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final; }; diff --git a/kimgio/webp.cpp b/kimgio/webp.cpp index 8c800cd4..b2998ad7 100644 --- a/kimgio/webp.cpp +++ b/kimgio/webp.cpp @@ -25,6 +25,8 @@ #include #include +static const char* const s_webppluginformat = "tiff"; + static const ushort s_peekbuffsize = 32; WebPHandler::WebPHandler() @@ -288,11 +290,6 @@ bool WebPHandler::canRead(QIODevice *device) return false; } -QStringList WebPPlugin::keys() const -{ - return QStringList() << "webp"; -} - QList WebPPlugin::mimeTypes() const { static const QList list = QList() @@ -302,7 +299,7 @@ QList WebPPlugin::mimeTypes() const QImageIOPlugin::Capabilities WebPPlugin::capabilities(QIODevice *device, const QByteArray &format) const { - if (format == "webp") { + if (format == s_webppluginformat) { return QImageIOPlugin::Capabilities(QImageIOPlugin::CanRead | QImageIOPlugin::CanWrite); } if (!device || !device->isOpen()) { diff --git a/kimgio/webp.h b/kimgio/webp.h index 55def2af..c008d5d7 100644 --- a/kimgio/webp.h +++ b/kimgio/webp.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef WEBP_H -#define WEBP_H +#ifndef KIMGIO_WEBP_H +#define KIMGIO_WEBP_H #include #include @@ -58,10 +58,9 @@ private: class WebPPlugin : public QImageIOPlugin { public: - QStringList keys() const; - QList mimeTypes() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; + QList mimeTypes() const final; + QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const final; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const final; }; -#endif +#endif // KIMGIO_WEBP_H