Remove IconThemes dependency from kpmcore.

CMakeLists.txt

@@ -55,7 +55,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
 # Load the frameworks we need
 find_package(KF5 REQUIRED
   I18n
-  IconThemes
   KIO
   Service
   WidgetsAddons

src/CMakeLists.txt

@@ -45,7 +45,6 @@ target_link_libraries( kpmcore
     ${LIBATASMART_LIBRARIES}
     Qt5::DBus
     KF5::I18n
-    KF5::IconThemes
     KF5::KIOCore
     KF5::Service
     KF5::WidgetsAddons

src/jobs/job.cpp

@@ -30,7 +30,6 @@
 #include <QIcon>
 #include <QTime>
 
-#include <KIconLoader>
 #include <KLocalizedString>
 
 Job::Job() :
@@ -188,7 +187,7 @@ void Job::jobFinished(Report& report, bool b)
 }
 
 /** @return the Job's current status icon */
-QIcon Job::statusIcon() const
+QString Job::statusIcon() const
 {
     static const QString icons[] = {
         QStringLiteral("dialog-information"),
@@ -199,9 +198,9 @@ QIcon Job::statusIcon() const
     Q_ASSERT(status() >= 0 && static_cast<quint32>(status()) < sizeof(icons) / sizeof(icons[0]));
 
     if (status() < 0 || static_cast<quint32>(status()) >= sizeof(icons) / sizeof(icons[0]))
-        return QIcon();
+        return QString();
 
-    return QIcon::fromTheme(icons[status()]).pixmap(IconSize(KIconLoader::Small));
+    return icons[status()];
 }
 
 /** @return the Job's current status text */

src/jobs/job.h

@@ -73,7 +73,7 @@ public:
     virtual QString description() const = 0; /**< @return the Job's description */
     virtual bool run(Report& parent) = 0; /**< @param parent parent Report to add new child to for this Job @return true if successfully run */
 
-    virtual QIcon statusIcon() const;
+    virtual QString statusIcon() const;
     virtual QString statusText() const;
 
     JobStatus status() const {

src/ops/operation.cpp

@@ -29,7 +29,6 @@
 #include <QIcon>
 #include <QString>
 
-#include <KIconLoader>
 #include <KLocalizedString>
 
 Operation::Operation() :
@@ -89,7 +88,7 @@ QString Operation::statusText() const
 }
 
 /** @return icon for the current Operation's status */
-QIcon Operation::statusIcon() const
+QString Operation::statusIcon() const
 {
     static const QString icons[] = {
         QString(),
@@ -104,13 +103,13 @@ QIcon Operation::statusIcon() const
 
     if (status() < 0 || static_cast<quint32>(status()) >= sizeof(icons) / sizeof(icons[0])) {
         qWarning() << "invalid status " << status();
-        return QIcon();
+        return QString();
     }
 
     if (status() == StatusNone)
-        return QIcon();
+        return QString();
 
-    return QIcon::fromTheme(icons[status()]).pixmap(IconSize(KIconLoader::Small));
+    return icons[status()];
 }
 
 void Operation::addJob(Job* job)

src/ops/operation.h

@@ -112,7 +112,7 @@ public:
         return m_Status;    /**< @return the current status */
     }
     virtual QString statusText() const;
-    virtual QIcon statusIcon() const;
+    virtual QString statusIcon() const;
 
     virtual void setStatus(OperationStatus s) {
         m_Status = s;    /**< @param s the new status */