diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-08-11 22:40:47 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-08-29 10:03:10 +0200 |
commit | 648610259528b6cc7ef14704af8b15bb835cce95 (patch) | |
tree | aef8ed0ed5659e8f65762282a6d6e4d05bf572cb /src/gui/image/qiconloader_p.h | |
parent | 319462559f6a93f36aeb2c32e2f04896221cf90f (diff) |
QIconLoader: port to use new virtual functions
Add override functions and move the implementation
out of virtual_hook().
Task-number: QTBUG-85885
Change-Id: I35ed81a3483dd85d49474b78572d5302b0e5b608
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/image/qiconloader_p.h')
-rw-r--r-- | src/gui/image/qiconloader_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index dca22f725f..a17cea183e 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -132,13 +132,17 @@ public: bool read(QDataStream &in) override; bool write(QDataStream &out) const override; + QString iconName() override; + bool isNull() override; + QPixmap scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) override; + QList<QSize> availableSizes(QIcon::Mode mode, QIcon::State state) override; + Q_GUI_EXPORT static QIconLoaderEngineEntry *entryForSize(const QThemeIconInfo &info, const QSize &size, int scale = 1); private: QString key() const override; bool hasIcon() const; void ensureLoaded(); - void virtual_hook(int id, void *data) override; QIconLoaderEngine(const QIconLoaderEngine &other); QThemeIconInfo m_info; |