diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-02 14:32:37 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-03 14:26:42 +0100 |
commit | 5a1a12b0e135eb49f7b232c729859583b76bd507 (patch) | |
tree | 5d0c2938d6940f0f1fbbb73c9155c7502d042c30 /src/plugins/imageformats/jp2 | |
parent | 93e1e4fd7e4c097f06912db965e50947fd311233 (diff) |
Remove overrides of QImageIOHandler::name()v5.15.0-beta2
Since name() returns format() by default, these haven't been necessary
for a long time. We will remove the base class function in Qt 6, so
we should remove the overrides and other uses now to ensure that it
will be OK. Followup to 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c.
Change-Id: If3b83a36a36747f8e57775053166edd98512e684
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/plugins/imageformats/jp2')
-rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.cpp | 11 | ||||
-rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler_p.h | 3 |
2 files changed, 0 insertions, 14 deletions
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) |