diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-02 14:22:10 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-05 16:09:40 +0100 |
| commit | af00402d6446c0f8f085a2a482fc83c4318aa457 (patch) | |
| tree | 7a0a07ead1bc656355cb252c9da3c7a6f2f286c2 | |
| parent | d1882c79f2e2366a2a77e64ef9d7a5a918a776a8 (diff) | |
Remove QImageIOHandler::name()
It has been marked obsolete for a very long time, and deprecated
in code since f9e6f8efda350689211286db9154677924df8aab.
Change-Id: Ib351025369584bf3b8a3a17f980a567d2b9556ca
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| -rw-r--r-- | src/gui/image/qimageiohandler.cpp | 11 | ||||
| -rw-r--r-- | src/gui/image/qimageiohandler.h | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index 6a17df9955..9c9ebbccdc 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -417,17 +417,6 @@ QByteArray QImageIOHandler::format() const */ /*! - \obsolete - - Use format() instead. -*/ - -QByteArray QImageIOHandler::name() const // ### Qt6: remove -{ - return format(); -} - -/*! Writes the image \a image to the assigned device. Returns \c true on success; otherwise returns \c false. diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index a4acf9dfe0..b6b40029b6 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -69,9 +69,6 @@ public: void setFormat(const QByteArray &format) const; QByteArray format() const; - QT_DEPRECATED_X("Use QImageIOHandler::format() instead") - virtual QByteArray name() const; - virtual bool canRead() const = 0; virtual bool read(QImage *image) = 0; virtual bool write(const QImage &image); |