diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-02 14:36:28 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-03 14:26:07 +0100 |
commit | 215a6642a48b1272a54ce2d125346fa0b8c89847 (patch) | |
tree | 7ba8c8f2df0232b3766f6b4fce3ed706762c5af8 | |
parent | aa42f80935314623865ba35693d73881f2a6157d (diff) | |
download | qtsvg-215a6642a48b1272a54ce2d125346fa0b8c89847.tar.gz |
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 <eirik.aavitsland@qt.io>
-rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.h | 3 |
2 files changed, 0 insertions, 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; |