diff --git a/plugins/akregator/konqfeedicon.cpp b/plugins/akregator/konqfeedicon.cpp --- a/plugins/akregator/konqfeedicon.cpp +++ b/plugins/akregator/konqfeedicon.cpp @@ -40,7 +40,9 @@ #include #include +#include #include +#include using namespace Akregator; @@ -139,7 +141,7 @@ m_menu = new QMenu(m_part->widget()); if (m_feedList.count() == 1) { m_menu->setTitle(m_feedList.first().title()); - m_menu->addAction(SmallIcon("bookmark-new"), i18n("Add Feed to Akregator"), this, SLOT(addAllFeeds())); + m_menu->addAction(QIcon::fromTheme("bookmark-new"), i18n("Add Feed to Akregator"), this, SLOT(addAllFeeds())); } else { m_menu->setTitle(i18n("Add Feeds to Akregator")); int id = 0; @@ -169,7 +171,7 @@ m_feedIcon = new KUrlLabel(m_statusBarEx->statusBar()); // from khtmlpart's ualabel - m_feedIcon->setFixedHeight(KIconLoader::global()->currentSize(KIconLoader::Small)); + m_feedIcon->setFixedHeight(qApp->style()->pixelMetric(QStyle::PM_SmallIconSize)); m_feedIcon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); m_feedIcon->setUseCursor(false); diff --git a/plugins/searchbar/searchbar.cpp b/plugins/searchbar/searchbar.cpp --- a/plugins/searchbar/searchbar.cpp +++ b/plugins/searchbar/searchbar.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -258,15 +257,15 @@ void SearchBarPlugin::setIcon() { if (m_searchMode == FindInThisPage) { - m_searchIcon = SmallIcon(QStringLiteral("edit-find")); + m_searchIcon = QIcon::fromTheme(QStringLiteral("edit-find")).pixmap(qApp->style()->pixelMetric(QStyle::PM_SmallIconSize)); } else { const QString engine = (m_currentEngine.isEmpty() ? m_searchEngines.first() : m_currentEngine); //kDebug() << "Icon Name:" << m_searchProviders.value(engine).iconName(); const QString iconName = m_searchProviders.value(engine).iconName(); if (iconName.startsWith(QLatin1Char('/'))) { m_searchIcon = QPixmap(iconName); } else { - m_searchIcon = SmallIcon(iconName); + m_searchIcon = QIcon::fromTheme(iconName).pixmap(qApp->style()->pixelMetric(QStyle::PM_SmallIconSize)); } } diff --git a/src/konqcombo.cpp b/src/konqcombo.cpp --- a/src/konqcombo.cpp +++ b/src/konqcombo.cpp @@ -643,7 +643,8 @@ QPainter p(this); p.setClipRect(re); - QPixmap pix = SmallIcon(QLatin1String(m_pageSecurity == KonqMainWindow::Encrypted ? "security-high" : "security-medium")); + const auto icon = QIcon::fromTheme(QLatin1String(m_pageSecurity == KonqMainWindow::Encrypted ? "security-high" : "security-medium")); + QPixmap pix = icon.pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)); QRect r = edit->geometry(); r.setRight(re.right() - pix.width() - 2); diff --git a/src/konqstatusbarmessagelabel.cpp b/src/konqstatusbarmessagelabel.cpp --- a/src/konqstatusbarmessagelabel.cpp +++ b/src/konqstatusbarmessagelabel.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include #include "konqdebug.h" @@ -155,7 +154,7 @@ break; } - d->m_pixmap = (iconName == nullptr) ? QPixmap() : SmallIcon(iconName); + d->m_pixmap = (iconName == nullptr) ? QPixmap() : QIcon::fromTheme(iconName).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)); QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText())); if (type == Error) {