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.cpp | |
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.cpp')
-rw-r--r-- | src/widgets/kernel/qiconloader.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp index 9031c4c075..0b86189b5e 100644 --- a/src/widgets/kernel/qiconloader.cpp +++ b/src/widgets/kernel/qiconloader.cpp @@ -45,6 +45,7 @@ #include <private/qicon_p.h> #include <private/qguiplatformplugin_p.h> +#include <QtWidgets/QApplication> #include <QtWidgets/QIconEnginePlugin> #include <QtGui/QPixmapCache> #include <QtWidgets/QIconEngine> @@ -104,7 +105,7 @@ void QIconLoader::ensureInitialized() if (m_systemTheme.isEmpty()) m_systemTheme = fallbackTheme(); #ifndef QT_NO_LIBRARY - QFactoryLoader iconFactoryLoader(QIconEngineFactoryInterfaceV2_iid, + QFactoryLoader iconFactoryLoader(QIconEngineFactoryInterface_iid, QLatin1String("/iconengines"), Qt::CaseInsensitive); if (iconFactoryLoader.keys().contains(QLatin1String("svg"))) @@ -322,13 +323,13 @@ QIconLoaderEngine::~QIconLoaderEngine() } QIconLoaderEngine::QIconLoaderEngine(const QIconLoaderEngine &other) - : QIconEngineV2(other), + : QIconEngine(other), m_iconName(other.m_iconName), m_key(0) { } -QIconEngineV2 *QIconLoaderEngine::clone() const +QIconEngine *QIconLoaderEngine::clone() const { return new QIconLoaderEngine(*this); } @@ -477,7 +478,7 @@ QSize QIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode, return QSize(result, result); } } - return QIconEngineV2::actualSize(size, mode, state); + return QIconEngine::actualSize(size, mode, state); } QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) @@ -489,7 +490,6 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st if (basePixmap.isNull()) basePixmap.load(filename); -#if 0 // ### Qt5 int actualSize = qMin(size.width(), size.height()); QString key = QLatin1Literal("$qt_theme_") % HexString<qint64>(basePixmap.cacheKey()) @@ -507,9 +507,6 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st QPixmapCache::insert(key, cachedPixmap); } return cachedPixmap; -#else - return basePixmap; -#endif } QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) @@ -543,10 +540,10 @@ void QIconLoaderEngine::virtual_hook(int id, void *data) ensureLoaded(); switch (id) { - case QIconEngineV2::AvailableSizesHook: + case QIconEngine::AvailableSizesHook: { - QIconEngineV2::AvailableSizesArgument &arg - = *reinterpret_cast<QIconEngineV2::AvailableSizesArgument*>(data); + QIconEngine::AvailableSizesArgument &arg + = *reinterpret_cast<QIconEngine::AvailableSizesArgument*>(data); const QList<QIconDirInfo> directoryKey = iconLoaderInstance()->theme().keyList(); arg.sizes.clear(); @@ -557,14 +554,14 @@ void QIconLoaderEngine::virtual_hook(int id, void *data) } } break; - case QIconEngineV2::IconNameHook: + case QIconEngine::IconNameHook: { QString &name = *reinterpret_cast<QString*>(data); name = m_iconName; } break; default: - QIconEngineV2::virtual_hook(id, data); + QIconEngine::virtual_hook(id, data); } } |