Commit 0c8dcfff authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Fully port away from KIconThemes

Summary:
Depends on D26350

Mostly just removing unused includes
In two places replace KIconLoade::SizeSmall with QStyle equivalent

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: apol

Maniphest Tasks: T11637

Differential Revision: https://phabricator.kde.org/D26352
parent 505c43c5
......@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
WidgetsAddons
ItemViews
IconThemes
KIO
Config
Archive
......
......@@ -25,7 +25,6 @@
#include <QPushButton>
#include <KLocalizedString>
#include <kiconloader.h>
#include "generalConfigurationWidget.h"
......
......@@ -24,7 +24,6 @@
// Qt includes
#include <QIcon>
#include <kiconloader.h>
#include <KLocalizedString>
#include <KGuiItem>
#include <KStandardGuiItem>
......
......@@ -55,7 +55,6 @@ target_link_libraries(ksystemlog_lib
KF5::Archive
KF5::ConfigWidgets
KF5::ItemViews
KF5::IconThemes
KF5::KIOCore
KF5::Completion
)
......@@ -30,7 +30,6 @@
#include <QHBoxLayout>
#include <KLocalizedString>
#include <kiconloader.h>
class LoadingBarPrivate
{
......
......@@ -21,7 +21,6 @@
#include "logLevel.h"
#include <kiconloader.h>
#include <QIcon>
class LogLevelPrivate
{
......
......@@ -24,8 +24,6 @@
#include <QAction>
#include <QFileInfo>
#include <kiconloader.h>
#include "multipleActions.h"
#include "logModeItemBuilder.h"
......
......@@ -24,8 +24,6 @@
#include <QString>
#include <QDataStream>
#include <kiconloader.h>
class LogViewColumnPrivate
{
public:
......
......@@ -36,7 +36,6 @@
#include <QStandardItemModel>
#include <kcombobox.h>
#include <kiconloader.h>
#include <KLocalizedString>
class ComboBoxDelegate : public QStyledItemDelegate
......@@ -134,7 +133,7 @@ LogViewFilterWidget::LogViewFilterWidget()
d->filterLine->setPlaceholderText(i18n("Enter your search here..."));
QLabel *filterIcon = new QLabel();
filterIcon->setPixmap(QIcon::fromTheme(QStringLiteral("view-filter")).pixmap(KIconLoader::SizeSmall));
filterIcon->setPixmap(QIcon::fromTheme(QStringLiteral("view-filter")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)));
filterIcon->setBuddy(d->filterLine);
filterBarLayout->addWidget(filterIcon);
......
......@@ -28,7 +28,6 @@
#include <QColor>
#include <QTimer>
#include <kiconloader.h>
#include <QIcon>
#include <KLocalizedString>
......@@ -285,7 +284,7 @@ void LogViewSearchWidget::showMessage(const QString &text, const QString &iconTe
message->setText(text);
message->show();
messageIcon->setPixmap(QIcon::fromTheme(iconText).pixmap(KIconLoader::SizeSmall));
messageIcon->setPixmap(QIcon::fromTheme(iconText).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)));
messageIcon->show();
d->messageHidingTimer->start();
......
......@@ -28,7 +28,6 @@
#include <KLocalizedString>
#include <kmessagebox.h>
#include <kiconloader.h>
#include "defaults.h"
......
......@@ -24,7 +24,6 @@
#include <QPushButton>
#include <kstandardguiitem.h>
#include <kiconloader.h>
LogLevelSelectionDialog::LogLevelSelectionDialog(QWidget *parent)
: QDialog(parent)
......
......@@ -26,7 +26,6 @@
#include <QMenu>
#include <KLocalizedString>
#include <kiconloader.h>
#include <QIcon>
#include "logging.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment