diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt --- a/src/runtime/kwalletd/CMakeLists.txt +++ b/src/runtime/kwalletd/CMakeLists.txt @@ -6,7 +6,6 @@ find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) @@ -96,7 +95,6 @@ KF5::CoreAddons KF5::ConfigCore KF5::ConfigWidgets - KF5::IconThemes KF5::Service KF5::DBusAddons KF5::WidgetsAddons diff --git a/src/runtime/kwalletd/kbetterthankdialog.cpp b/src/runtime/kwalletd/kbetterthankdialog.cpp --- a/src/runtime/kwalletd/kbetterthankdialog.cpp +++ b/src/runtime/kwalletd/kbetterthankdialog.cpp @@ -17,7 +17,6 @@ #include "kbetterthankdialog.h" #include -#include KBetterThanKDialog::KBetterThanKDialog(QWidget *parent) : QDialog(parent) @@ -33,10 +32,10 @@ void KBetterThanKDialog::init() { - _allowOnce->setIcon(KDE::icon(QStringLiteral("dialog-ok"))); - _allowAlways->setIcon(KDE::icon(QStringLiteral("dialog-ok"))); - _deny->setIcon(KDE::icon(QStringLiteral("dialog-cancel"))); - _denyForever->setIcon(KDE::icon(QStringLiteral("dialog-cancel"))); + _allowOnce->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok"))); + _allowAlways->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok"))); + _deny->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel"))); + _denyForever->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel"))); _allowOnce->setFocus(); } diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp --- a/src/runtime/kwalletd/kwalletd.cpp +++ b/src/runtime/kwalletd/kwalletd.cpp @@ -46,13 +46,13 @@ #include #include #include -#include #ifdef HAVE_GPGMEPP #include #endif #include #include +#include #include #include #include @@ -633,9 +633,7 @@ // kpd->setButtonGuiItem(KDialog::Ok,KGuiItem( // i18n( "&Open" ), "wallet-open")); kpd->setWindowTitle(i18n("KDE Wallet Service")); - kpd->setPixmap( - KIconLoader::global()->loadIcon(QStringLiteral("kwalletmanager"), - KIconLoader::Desktop, KIconLoader::SizeHuge)); + kpd->setIcon(QIcon::fromTheme(QStringLiteral("kwalletmanager"))); if (w != KWindowSystem::activeWindow() && w != 0L) { // If the dialog is modal to a minimized window it // might not be visible @@ -780,9 +778,7 @@ kpd->setWindowTitle(i18n("KDE Wallet Service")); // KF5 FIXME what should we use now instead of this: // kpd->setButtonGuiItem(KDialog::Ok,KGuiItem(i18n("C&reate"),"document-new")); - kpd->setPixmap( - KIconLoader::global()->loadIcon(QStringLiteral("kwalletmanager"), - KIconLoader::Desktop, KIconLoader::SizeHuge)); + kpd->setIcon(QIcon::fromTheme(QStringLiteral("kwalletmanager"))); while (!b->isOpen()) { setupDialog(kpd, w, appid, modal); if (kpd->exec() == QDialog::Accepted) { diff --git a/src/runtime/kwalletd/kwalletwizard.cpp b/src/runtime/kwalletd/kwalletwizard.cpp --- a/src/runtime/kwalletd/kwalletwizard.cpp +++ b/src/runtime/kwalletd/kwalletwizard.cpp @@ -27,9 +27,9 @@ #endif #include -#include #include #include +#include #ifdef HAVE_GPGMEPP #include @@ -49,12 +49,7 @@ ui.setupUi(this); ui.ktitlewidget->setText("

" + i18n("KWallet") + "

"); - - int iconSize = 3 * fontMetrics().height(); - // round to multiple of 16 - iconSize = (iconSize + 8) & ~15; - QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("kwalletmanager"), KIconLoader::Dialog, iconSize); - ui.ktitlewidget->setPixmap(pix); + ui.ktitlewidget->setIcon(QIcon::fromTheme(QStringLiteral("kwalletmanager"))); bg = new QButtonGroup(this); bg->setExclusive(true); diff --git a/tests/kwalletd/CMakeLists.txt b/tests/kwalletd/CMakeLists.txt --- a/tests/kwalletd/CMakeLists.txt +++ b/tests/kwalletd/CMakeLists.txt @@ -10,7 +10,6 @@ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) find_package(Gpgmepp) # provided by GpgME @@ -42,7 +41,6 @@ Qt5::Test KF5::CoreAddons KF5::I18n - KF5::IconThemes KF5::WidgetsAddons) if (Gpgmepp_FOUND) target_link_libraries(kwalletwizardtest Gpgmepp)