Port away from KIconThemes

At least where trivially possible.

Differential Revision: https://phabricator.kde.org/D24756

applets/systemtray/CMakeLists.txt

@@ -20,7 +20,6 @@ target_link_libraries(org.kde.plasma.private.systemtray
                       Qt5::Quick
                       KF5::Plasma
                       Qt5::DBus
-                      KF5::IconThemes
                       KF5::XmlGui
                       KF5::I18n)
 

klipper/CMakeLists.txt

@@ -46,7 +46,6 @@ target_link_libraries(kdeinit_klipper
     KF5::CoreAddons
     KF5::DBusAddons
     KF5::GlobalAccel
-    KF5::IconThemes
     KF5::KIOWidgets
     KF5::Notifications
     KF5::Service
@@ -80,7 +79,6 @@ target_link_libraries(plasma_engine_clipboard
     KF5::ConfigGui
     KF5::CoreAddons    # KUrlMimeData
     KF5::GlobalAccel
-    KF5::IconThemes
     KF5::KIOWidgets    # PreviewJob
     KF5::Plasma
     KF5::Notifications

klipper/editactiondialog.cpp

@@ -20,12 +20,12 @@
 
 #include "editactiondialog.h"
 
+#include <QIcon>
 #include <QItemDelegate>
 #include <QComboBox>
 #include "klipper_debug.h"
 #include <QDialogButtonBox>
 
-#include <KIconLoader>
 #include <kwindowconfig.h>
 #include <KWindowConfig>
 
@@ -129,12 +129,7 @@ void ActionDetailModel::setIconForCommand(ClipCommand& cmd)
         command = command.section( QLatin1Char(' '), 0, 0 );
     }
 
-    QPixmap iconPix = KIconLoader::global()->loadIcon(
-                                        command, KIconLoader::Small, 0,
-                                        KIconLoader::DefaultState,
-                                        QStringList(), nullptr, true /* canReturnNull */ );
-
-    if ( !iconPix.isNull() ) {
+    if (QIcon::hasThemeIcon(command)) {
         cmd.icon = command;
     } else {
         cmd.icon.clear();

klipper/urlgrabber.cpp

@@ -23,6 +23,7 @@
 #include "klipper_debug.h"
 #include <QMimeDatabase>
 #include <QHash>
+#include <QIcon>
 #include <QTimer>
 #include <QUuid>
 #include <QFile>
@@ -30,7 +31,6 @@
 
 #include <KLocalizedString>
 #include <KService>
-#include <KIconLoader>
 #include <KStringHandler>
 #include <KMimeTypeTrader>
 #include <KRun>
@@ -393,11 +393,7 @@ ClipCommand::ClipCommand(const QString&_command, const QString& _description,
         QString appName = command.section( QLatin1Char(' '), 0, 0 );
         if ( !appName.isEmpty() )
         {
-            QPixmap iconPix = KIconLoader::global()->loadIcon(
-                                         appName, KIconLoader::Small, 0,
-                                         KIconLoader::DefaultState,
-                                         QStringList(), nullptr, true /* canReturnNull */ );
-            if ( !iconPix.isNull() )
+            if (QIcon::hasThemeIcon(appName))
                 icon = appName;
             else
                 icon.clear();

logout-greeter/CMakeLists.txt

@@ -15,7 +15,6 @@ target_link_libraries(ksmserver-logout-greeter
     Qt5::Quick
     Qt5::X11Extras
     KF5::Declarative
-    KF5::IconThemes
     KF5::I18n
     KF5::Package
     KF5::QuickAddons

logout-greeter/shutdowndlg.cpp

@@ -46,7 +46,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <KPackage/PackageLoader>
 
 #include <KAuthorized>
-#include <KIconLoader>
 #include <KLocalizedString>
 #include <KUser>
 #include <Solid/PowerManagement>

shell/CMakeLists.txt

@@ -60,7 +60,6 @@ target_link_libraries(plasmashell
  KF5::Solid
  KF5::Declarative
  KF5::I18n
- KF5::IconThemes
  KF5::Activities
  KF5::GlobalAccel
  KF5::CoreAddons