diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ find_package(KF5Parts ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5TextEditor ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Notifications ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Syndication ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/configuration/CMakeLists.txt b/configuration/CMakeLists.txt --- a/configuration/CMakeLists.txt +++ b/configuration/CMakeLists.txt @@ -111,7 +111,6 @@ akregatorinterfaces KF5::KCMUtils KF5::I18n - KF5::IconThemes KF5::WebEngineViewer ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,7 +117,6 @@ KF5::Syndication akregatorinterfaces KF5::PimCommon - KF5::IconThemes KF5::PimTextEdit KF5::GrantleeTheme Grantlee5::Templates @@ -212,7 +211,6 @@ KF5::PimTextEdit KF5::GrantleeTheme KF5::MessageViewer - KF5::IconThemes KF5::Parts KF5::Notifications Qt5::WebEngineWidgets diff --git a/src/addfeeddialog.cpp b/src/addfeeddialog.cpp --- a/src/addfeeddialog.cpp +++ b/src/addfeeddialog.cpp @@ -27,21 +27,20 @@ #include "kernel.h" #include "akregator_debug.h" -#include -#include #include #include #include #include #include #include +#include using namespace Akregator; AddFeedWidget::AddFeedWidget(QWidget *parent) : QWidget(parent) { setupUi(this); - pixmapLabel1->setPixmap(QIcon::fromTheme(QStringLiteral("applications-internet")).pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop))); + pixmapLabel1->setPixmap(QIcon::fromTheme(QStringLiteral("applications-internet")).pixmap(style()->pixelMetric(QStyle::PM_MessageBoxIconSize))); statusLabel->setText(QString()); } diff --git a/src/subscription/subscriptionlistdelegate.cpp b/src/subscription/subscriptionlistdelegate.cpp --- a/src/subscription/subscriptionlistdelegate.cpp +++ b/src/subscription/subscriptionlistdelegate.cpp @@ -27,10 +27,11 @@ #include "subscriptionlistmodel.h" #include "akregator_debug.h" -#include +#include #include #include +#include using namespace Akregator; @@ -77,8 +78,7 @@ void Akregator::SubscriptionListDelegate::recalculateRowHeight() { - KIconTheme *iconTheme = KIconLoader::global()->theme(); - m_viewIconHeight = iconTheme ? iconTheme->defaultSize(KIconLoader::Small) : 0; + m_viewIconHeight = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); qCDebug(AKREGATOR_LOG) << "icon height" << m_viewIconHeight; } diff --git a/src/subscription/subscriptionlistmodel.cpp b/src/subscription/subscriptionlistmodel.cpp --- a/src/subscription/subscriptionlistmodel.cpp +++ b/src/subscription/subscriptionlistmodel.cpp @@ -30,17 +30,18 @@ #include "treenode.h" #include "akregator_debug.h" -#include #include +#include #include #include #include #include #include #include #include #include +#include using namespace Akregator; using namespace Syndication; @@ -250,7 +251,8 @@ return QVariant(); } const Feed *const feed = qobject_cast(node); - return feed && feed->isFetching() ? node->icon().pixmap(KIconLoader::SizeSmall, QIcon::Active) : node->icon(); + const auto iconSize = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); + return feed && feed->isFetching() ? node->icon().pixmap(iconSize, QIcon::Active) : node->icon(); } case SubscriptionIdRole: return node->id(); diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp --- a/src/tabwidget.cpp +++ b/src/tabwidget.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include "actionmanager.h" #include "akregatorconfig.h"