Commit 32c631a2 authored by Nicolas Fella's avatar Nicolas Fella Committed by Laurent Montel
Browse files

Port away from KIconLoader

parent 4f89dbf7
Pipeline #186085 passed with stage
in 1 minute and 40 seconds
......@@ -8,7 +8,6 @@
#include <Akonadi/ChangeRecorder>
#include <KColorScheme>
#include <KIconLoader>
#include <KLocalizedString>
#include <QFontDatabase>
......@@ -39,7 +38,7 @@ void KNotesAkonadiTray::slotGeneralPaletteChanged()
void KNotesAkonadiTray::updateNumberOfNotes(int number)
{
if (KNotesGlobalConfig::self()->systemTrayShowNotes() && number != 0) {
const int overlaySize = KIconLoader::SizeSmallMedium;
const int overlaySize = 22;
const QString countString = QString::number(number);
QFont countFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
......
......@@ -6,7 +6,6 @@
#include "knotestray.h"
#include <KColorScheme>
#include <KIconLoader>
#include <KLocalizedString>
#include <QFontDatabase>
......@@ -30,7 +29,7 @@ KNotesTray::~KNotesTray()
void KNotesTray::updateNumberOfNotes(int value)
{
const int overlaySize = KIconLoader::SizeSmallMedium;
const int overlaySize = 22;
const QString countString = QString::number(value);
QFont countFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
......
......@@ -17,7 +17,6 @@
#include <KMime/Message>
#include <KIconEffect>
#include <KIconLoader>
#include <QEvent>
#include <QMouseEvent>
#include <QToolTip>
......@@ -310,7 +309,7 @@ void KNotesIconViewItem::updateSettings()
KIconEffect effect;
const QColor color(mDisplayAttribute->backgroundColor());
if (mDefaultPixmap.isNull()) {
mDefaultPixmap = KIconLoader::global()->loadIcon(QStringLiteral("knotes"), KIconLoader::Desktop);
mDefaultPixmap = QIcon::fromTheme(QStringLiteral("knotes")).pixmap(48);
}
QPixmap icon = effect.apply(mDefaultPixmap, KIconEffect::Colorize, 1, color, false);
setFont(mDisplayAttribute->titleFont());
......
......@@ -8,8 +8,6 @@
#include "knotebutton.h"
#include <KIconLoader>
#include <QPainter>
#include <QStyleOption>
......@@ -22,7 +20,7 @@ KNoteButton::KNoteButton(const QString &icon, QWidget *parent)
setFlat(true);
if (!icon.isEmpty()) {
setIcon(KIconLoader::global()->loadIcon(icon, KIconLoader::Small, 10));
setIcon(QIcon::fromTheme(icon));
}
}
......
Supports Markdown
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