andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Remove IconThemes dependency from kpmcore.

This commit is contained in:
Andrius Štikonas 2017-09-08 15:05:55 +01:00
parent 5a83e741cb
commit f1accd1e0d
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

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

1
src/CMakeLists.txt
View File

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

7
src/jobs/job.cpp
View File

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

2
src/jobs/job.h
View File

@ -73,7 +73,7 @@ public:
virtual QString description() const = 0; /**< @return the Job's description */ 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 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; virtual QString statusText() const;
JobStatus status() const { JobStatus status() const {

9
src/ops/operation.cpp
View File

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

2
src/ops/operation.h
View File

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