From 215a6642a48b1272a54ce2d125346fa0b8c89847 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 2 Mar 2020 14:36:28 +0100 Subject: Remove overridden QSvgIOHandler::name() We will remove the virtual base class function in Qt 6. For now, name() returns format(). Change-Id: Iee5bd4194d23178b3d8b602950cc5c01d097d44b Reviewed-by: Eirik Aavitsland --- src/plugins/imageformats/svg/qsvgiohandler.cpp | 7 ------- src/plugins/imageformats/svg/qsvgiohandler.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp index 6999d51..334c24b 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp @@ -140,13 +140,6 @@ bool QSvgIOHandler::canRead() const return false; } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QSvgIOHandler::name() const -{ - return "svg"; -} -#endif - bool QSvgIOHandler::read(QImage *image) { if (!d->readDone && d->load(device())) { diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h index 5fdf6ee..5a952e1 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.h +++ b/src/plugins/imageformats/svg/qsvgiohandler.h @@ -58,9 +58,6 @@ public: QSvgIOHandler(); ~QSvgIOHandler(); bool canRead() const override; -#if QT_DEPRECATED_SINCE(5, 13) - QByteArray name() const override; -#endif bool read(QImage *image) override; static bool canRead(QIODevice *device); QVariant option(ImageOption option) const override; -- cgit v1.2.1