diff --git a/src/kontactplugin/korganizer/CMakeLists.txt b/src/kontactplugin/korganizer/CMakeLists.txt --- a/src/kontactplugin/korganizer/CMakeLists.txt +++ b/src/kontactplugin/korganizer/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(kontact_korganizerplugin MODULE ${kontact_korganizerplugin_PART_SRCS}) -target_link_libraries(kontact_korganizerplugin KF5::AkonadiCalendar KF5::CalendarUtils KF5::Contacts KF5::CalendarCore KF5::Libkdepim KF5::KontactInterface korganizerprivate KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem KF5::I18n KF5::IconThemes) +target_link_libraries(kontact_korganizerplugin KF5::AkonadiCalendar KF5::CalendarUtils KF5::Contacts KF5::CalendarCore KF5::Libkdepim KF5::KontactInterface korganizerprivate KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem KF5::I18n) ########### next target ############### @@ -18,7 +18,7 @@ add_library(kontact_todoplugin MODULE ${kontact_todoplugin_PART_SRCS}) -target_link_libraries(kontact_todoplugin KF5::AkonadiCalendar KF5::Contacts KF5::Libkdepim KF5::KontactInterface KF5::CalendarCore KF5::CalendarUtils KF5::CalendarSupport KF5::AkonadiCalendar KF5::IconThemes KF5::Notifications KF5::WindowSystem) +target_link_libraries(kontact_todoplugin KF5::AkonadiCalendar KF5::Contacts KF5::Libkdepim KF5::KontactInterface KF5::CalendarCore KF5::CalendarUtils KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem) ########### next target ############### @@ -28,7 +28,7 @@ add_library(kontact_journalplugin MODULE ${kontact_journalplugin_PART_SRCS}) -target_link_libraries(kontact_journalplugin KF5::KontactInterface KF5::IconThemes KF5::WindowSystem) +target_link_libraries(kontact_journalplugin KF5::KontactInterface KF5::WindowSystem) ########### next target ############### diff --git a/src/kontactplugin/korganizer/apptsummarywidget.cpp b/src/kontactplugin/korganizer/apptsummarywidget.cpp --- a/src/kontactplugin/korganizer/apptsummarywidget.cpp +++ b/src/kontactplugin/korganizer/apptsummarywidget.cpp @@ -42,15 +42,15 @@ #include #include -#include #include #include #include #include #include #include #include +#include ApptSummaryWidget::ApptSummaryWidget(KOrganizerPlugin *plugin, QWidget *parent) : KontactInterface::Summary(parent) @@ -123,11 +123,9 @@ QLabel *label = nullptr; int counter = 0; - KIconLoader loader(QStringLiteral("korganizer")); - QPixmap pm = loader.loadIcon(QStringLiteral("view-calendar-day"), KIconLoader::Small); - QPixmap pmb = loader.loadIcon(QStringLiteral("view-calendar-birthday"), KIconLoader::Small); - QPixmap pma = loader.loadIcon(QStringLiteral( - "view-calendar-wedding-anniversary"), KIconLoader::Small); + QPixmap pm = QIcon::fromTheme(QStringLiteral("view-calendar-day")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)); + QPixmap pmb = QIcon::fromTheme(QStringLiteral("view-calendar-birthday")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)); + QPixmap pma = QIcon::fromTheme(QStringLiteral("view-calendar-wedding-anniversary")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)); QStringList uidList; SummaryEventInfo::setShowSpecialEvents(mShowBirthdaysFromCal, @@ -275,8 +273,7 @@ QAction *editIt = popup.addAction(i18n("&Edit Appointment...")); QAction *delIt = popup.addAction(i18n("&Delete Appointment")); - delIt->setIcon(KIconLoader::global()-> - loadIcon(QStringLiteral("edit-delete"), KIconLoader::Small)); + delIt->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete"))); Akonadi::Item item = mCalendar->item(uid); delIt->setEnabled(mCalendar->hasRight(item, Akonadi::Collection::CanDeleteItem)); diff --git a/src/kontactplugin/korganizer/journalplugin.cpp b/src/kontactplugin/korganizer/journalplugin.cpp --- a/src/kontactplugin/korganizer/journalplugin.cpp +++ b/src/kontactplugin/korganizer/journalplugin.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include "korganizerplugin_debug.h" #include @@ -43,8 +42,6 @@ { setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer")); - KIconLoader::global()->addAppDir(QStringLiteral("korganizer")); - QAction *action = new QAction(QIcon::fromTheme(QStringLiteral("journal-new")), i18nc("@action:inmenu", "New Journal..."), this); diff --git a/src/kontactplugin/korganizer/korganizerplugin.cpp b/src/kontactplugin/korganizer/korganizerplugin.cpp --- a/src/kontactplugin/korganizer/korganizerplugin.cpp +++ b/src/kontactplugin/korganizer/korganizerplugin.cpp @@ -42,7 +42,6 @@ #include #include "korganizerplugin_debug.h" #include -#include #include #include #include @@ -57,7 +56,6 @@ , mIface(nullptr) { setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer")); - KIconLoader::global()->addAppDir(QStringLiteral("korganizer")); QAction *action = new QAction(QIcon::fromTheme(QStringLiteral("appointment-new")), diff --git a/src/kontactplugin/korganizer/todoplugin.cpp b/src/kontactplugin/korganizer/todoplugin.cpp --- a/src/kontactplugin/korganizer/todoplugin.cpp +++ b/src/kontactplugin/korganizer/todoplugin.cpp @@ -41,7 +41,6 @@ #include #include "korganizerplugin_debug.h" #include -#include #include #include #include @@ -55,7 +54,6 @@ , mIface(nullptr) { setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer")); - KIconLoader::global()->addAppDir(QStringLiteral("korganizer")); QAction *action = new QAction(QIcon::fromTheme(QStringLiteral("task-new")), diff --git a/src/kontactplugin/korganizer/todosummarywidget.cpp b/src/kontactplugin/korganizer/todosummarywidget.cpp --- a/src/kontactplugin/korganizer/todosummarywidget.cpp +++ b/src/kontactplugin/korganizer/todosummarywidget.cpp @@ -40,15 +40,15 @@ #include #include -#include #include #include #include #include #include #include // for Qt::mightBeRichText #include +#include using namespace KCalUtils; @@ -177,8 +177,7 @@ QLabel *label = nullptr; if (!prList.isEmpty()) { - KIconLoader loader(QStringLiteral("korganizer")); - QPixmap pm = loader.loadIcon(QStringLiteral("view-calendar-tasks"), KIconLoader::Small); + QPixmap pm = QIcon::fromTheme(QStringLiteral("view-calendar-tasks")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize)); QString str; @@ -358,16 +357,14 @@ QMenu popup(this); QAction *editIt = popup.addAction(i18n("&Edit To-do...")); QAction *delIt = popup.addAction(i18n("&Delete To-do")); - delIt->setIcon(KIconLoader::global()->loadIcon(QStringLiteral( - "edit-delete"), KIconLoader::Small)); + delIt->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete"))); QAction *doneIt = nullptr; delIt->setEnabled(mCalendar->hasRight(item, Akonadi::Collection::CanDeleteItem)); if (!todo->isCompleted()) { doneIt = popup.addAction(i18n("&Mark To-do Completed")); - doneIt->setIcon(KIconLoader::global()->loadIcon(QStringLiteral("task-complete"), - KIconLoader::Small)); + doneIt->setIcon(QIcon::fromTheme(QStringLiteral("task-complete"))); doneIt->setEnabled(mCalendar->hasRight(item, Akonadi::Collection::CanChangeItem)); } // TODO: add icons to the menu actions diff --git a/src/kontactplugin/specialdates/CMakeLists.txt b/src/kontactplugin/specialdates/CMakeLists.txt --- a/src/kontactplugin/specialdates/CMakeLists.txt +++ b/src/kontactplugin/specialdates/CMakeLists.txt @@ -18,7 +18,6 @@ KF5::AkonadiCore KF5::AkonadiContact KF5::CalendarSupport - KF5::IconThemes ) ########### next target ############### diff --git a/src/kontactplugin/specialdates/sdsummarywidget.cpp b/src/kontactplugin/specialdates/sdsummarywidget.cpp --- a/src/kontactplugin/specialdates/sdsummarywidget.cpp +++ b/src/kontactplugin/specialdates/sdsummarywidget.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -52,6 +51,7 @@ #include #include #include +#include using namespace KHolidays; @@ -463,7 +463,7 @@ } label = new QLabel(this); if (icon_img.isNull()) { - label->setPixmap(KIconLoader::global()->loadIcon(icon_name, KIconLoader::Small)); + label->setPixmap(QIcon::fromTheme(icon_name).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize))); } else { label->setPixmap(QPixmap::fromImage(icon_img)); } @@ -691,13 +691,9 @@ { QMenu popup(this); const QAction *sendMailAction - = popup.addAction(KIconLoader::global()->loadIcon(QStringLiteral("mail-message-new"), - KIconLoader::Small), - i18n("Send &Mail")); + = popup.addAction(QIcon::fromTheme(QStringLiteral("mail-message-new")), i18n("Send &Mail")); const QAction *viewContactAction - = popup.addAction(KIconLoader::global()->loadIcon(QStringLiteral("view-pim-contacts"), - KIconLoader::Small), - i18n("View &Contact")); + = popup.addAction(QIcon::fromTheme(QStringLiteral("view-pim-contacts")), i18n("View &Contact")); const QAction *ret = popup.exec(QCursor::pos()); if (ret == sendMailAction) { diff --git a/src/widgets/navigatorbar.cpp b/src/widgets/navigatorbar.cpp --- a/src/widgets/navigatorbar.cpp +++ b/src/widgets/navigatorbar.cpp @@ -25,7 +25,6 @@ #include "navigatorbar.h" #include "koglobals.h" -#include #include #include @@ -221,9 +220,7 @@ { QToolButton *button = new QToolButton(this); - button->setIcon( - KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, KIconLoader::SizeSmall)); - button->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall)); + button->setIcon(QIcon::fromTheme(icon)); button->setToolButtonStyle(Qt::ToolButtonIconOnly); button->setAutoRaise(true); button->setToolTip(toolTip);