diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-25 13:58:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 04:56:14 +0100 |
| commit | 0f48d1a52327695d7c9d3d9753fedc366e2fd878 (patch) | |
| tree | 2b807db93d9791cbfa45b04c7148ae4d905ad1d7 /src/widgets/kernel/qiconloader_p.h | |
| parent | 0fdb881987574bac77112dd056ed5cd54b87a2f9 (diff) | |
Remove QIconEngineV2 and fold it into QIconEngine
Change-Id: Ife590b7639f4aadcfbd4d77ca170285b623c14ae
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qiconloader_p.h')
| -rw-r--r-- | src/widgets/kernel/qiconloader_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qiconloader_p.h b/src/widgets/kernel/qiconloader_p.h index 9c0349cf90..1b9043675b 100644 --- a/src/widgets/kernel/qiconloader_p.h +++ b/src/widgets/kernel/qiconloader_p.h @@ -109,7 +109,7 @@ struct PixmapEntry : public QIconLoaderEngineEntry typedef QList<QIconLoaderEngineEntry*> QThemeIconEntries; -class QIconLoaderEngine : public QIconEngineV2 +class QIconLoaderEngine : public QIconEngine { public: QIconLoaderEngine(const QString& iconName = QString()); @@ -118,7 +118,7 @@ public: void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state); QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state); QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state); - QIconEngineV2 *clone() const; + QIconEngine *clone() const; bool read(QDataStream &in); bool write(QDataStream &out) const; |