diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 17:42:00 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-29 06:20:07 +0200 |
| commit | 0fda43cf33cc7715f16d8764c4d96c6f88238712 (patch) | |
| tree | c693c9ce99f1f02f8ec5de204cfe93bf1517b105 /src/gui/image/qiconengine.h | |
| parent | 0303d8ddfa968e0c5a9ac08a12836ea3f34d4088 (diff) | |
Remove deprecated members from QtGui/image classes
Cleaning up those that are trivial to remove because they have direct
replacements.
Change-Id: I4f5c25884a01474fa2db8b369f0d883bd21edd5b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/image/qiconengine.h')
| -rw-r--r-- | src/gui/image/qiconengine.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h index 89fed5ccda..401c8034eb 100644 --- a/src/gui/image/qiconengine.h +++ b/src/gui/image/qiconengine.h @@ -51,7 +51,6 @@ class Q_GUI_EXPORT QIconEngine { public: QIconEngine(); - QIconEngine(const QIconEngine &other); // ### Qt6: make protected virtual ~QIconEngine(); virtual void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) = 0; virtual QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state); @@ -93,14 +92,13 @@ public: // ### Qt6: move content to proper virtual functions virtual void virtual_hook(int id, void *data); +protected: + QIconEngine(const QIconEngine &other); + private: QIconEngine &operator=(const QIconEngine &other) = delete; }; -#if QT_DEPRECATED_SINCE(5, 0) -typedef QIconEngine QIconEngineV2; -#endif - QT_END_NAMESPACE #endif // QICONENGINE_H |