summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-23 13:52:04 +0200
committerMontel Laurent <[email protected]>2015-08-23 13:52:04 +0200
commiteba02176245d5f9c4a57f3f914d2618b9591f2be (patch)
tree65f00f7ce5ffb214d07cbdd076ebbcebbfef531b
parent165fba933a09125043d9a88cff889ad3fedd5ff8 (diff)
Don't add directory which doesn"t have icons installed
-rw-r--r--kleopatra/kleopatraapplication.cpp1
-rw-r--r--kleopatra/kwatchgnupg/tray.cpp1
-rw-r--r--kmail/kmail_part.cpp1
-rw-r--r--kontact/src/main.cpp1
-rw-r--r--korgac/alarmdockwindow.cpp1
-rw-r--r--korganizer/koglobals.cpp1
-rw-r--r--korganizer/kontactplugin/korganizer/journalplugin.cpp1
-rw-r--r--korganizer/kontactplugin/korganizer/korganizerplugin.cpp1
-rw-r--r--korganizer/kontactplugin/korganizer/todoplugin.cpp1
-rw-r--r--korganizer/kontactplugin/specialdates/specialdates_plugin.cpp1
-rw-r--r--libkleo/tests/test_keyselectiondialog.cpp1
-rw-r--r--plugins/kaddressbook/editorpages/cryptopageplugin.cpp1
12 files changed, 0 insertions, 12 deletions
diff --git a/kleopatra/kleopatraapplication.cpp b/kleopatra/kleopatraapplication.cpp
index 6ce56ea..1516d78 100644
--- a/kleopatra/kleopatraapplication.cpp
+++ b/kleopatra/kleopatraapplication.cpp
@@ -84,7 +84,6 @@ static void add_resources()
{
KIconLoader::global()->addAppDir(QStringLiteral("libkleopatra"));
KIconLoader::global()->addAppDir(QStringLiteral("kwatchgnupg"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
}
static const struct {
diff --git a/kleopatra/kwatchgnupg/tray.cpp b/kleopatra/kwatchgnupg/tray.cpp
index 3fe332c..7b98b99 100644
--- a/kleopatra/kwatchgnupg/tray.cpp
+++ b/kleopatra/kwatchgnupg/tray.cpp
@@ -46,7 +46,6 @@ KWatchGnuPGTray::KWatchGnuPGTray(KWatchGnuPGMainWindow *mainwin)
setObjectName(QStringLiteral("KWatchGnuPG Tray Window"));
KIconLoader::global()->addAppDir(QStringLiteral("kwatchgnupg"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
mNormalPix.addPixmap(KIconLoader::global()->loadIcon(QStringLiteral("kwatchgnupg"), KIconLoader::Panel));
mAttentionPix.addPixmap(KIconLoader::global()->loadIcon(QStringLiteral("kwatchgnupg2"), KIconLoader::Panel));
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 6667e86..916d1a1 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -87,7 +87,6 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QVariantList
canvas->setFocusPolicy(Qt::ClickFocus);
canvas->setObjectName(QStringLiteral("canvas"));
setWidget(canvas);
- KIconLoader::global()->addAppDir(QStringLiteral("libkdepim"));
mainWidget = new KMMainWidget(canvas, this, actionCollection(),
KSharedConfig::openConfig());
mainWidget->setObjectName(QStringLiteral("partmainwidget"));
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 48c22d2..4e343ae 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -57,7 +57,6 @@ public:
, mMainWindow(Q_NULLPTR)
, mSessionRestored(false)
{
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
}
~KontactApp() {}
diff --git a/korgac/alarmdockwindow.cpp b/korgac/alarmdockwindow.cpp
index 59a8842..ace75a5 100644
--- a/korgac/alarmdockwindow.cpp
+++ b/korgac/alarmdockwindow.cpp
@@ -55,7 +55,6 @@ AlarmDockWindow::AlarmDockWindow()
// Set up icons
KIconLoader::global()->addAppDir(QStringLiteral("korgac"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
QString iconPath = KIconLoader::global()->iconPath(QStringLiteral("korgac"), KIconLoader::Panel);
QIcon iconEnabled = QIcon(iconPath);
if (iconEnabled.isNull()) {
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 187c2b7..ae97f02 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -48,7 +48,6 @@ KOGlobals *KOGlobals::self()
KOGlobals::KOGlobals()
: mOwnInstance("korganizer"), mHolidays(Q_NULLPTR)
{
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
}
KConfig *KOGlobals::config() const
diff --git a/korganizer/kontactplugin/korganizer/journalplugin.cpp b/korganizer/kontactplugin/korganizer/journalplugin.cpp
index a48699c..b539bf6 100644
--- a/korganizer/kontactplugin/korganizer/journalplugin.cpp
+++ b/korganizer/kontactplugin/korganizer/journalplugin.cpp
@@ -44,7 +44,6 @@ JournalPlugin::JournalPlugin(KontactInterface::Core *core, const QVariantList &)
setComponentName(QStringLiteral("korganizer"), QStringLiteral("korganizer"));
KIconLoader::global()->addAppDir(QStringLiteral("korganizer"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
QAction *action =
new QAction(QIcon::fromTheme(QStringLiteral("journal-new")),
diff --git a/korganizer/kontactplugin/korganizer/korganizerplugin.cpp b/korganizer/kontactplugin/korganizer/korganizerplugin.cpp
index a93930c..61ad7df 100644
--- a/korganizer/kontactplugin/korganizer/korganizerplugin.cpp
+++ b/korganizer/kontactplugin/korganizer/korganizerplugin.cpp
@@ -58,7 +58,6 @@ KOrganizerPlugin::KOrganizerPlugin(KontactInterface::Core *core, const QVariantL
{
setComponentName(QStringLiteral("korganizer"), QStringLiteral("korganizer"));
KIconLoader::global()->addAppDir(QStringLiteral("korganizer"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
QAction *action =
new QAction(QIcon::fromTheme(QStringLiteral("appointment-new")),
diff --git a/korganizer/kontactplugin/korganizer/todoplugin.cpp b/korganizer/kontactplugin/korganizer/todoplugin.cpp
index 4827d67..98b2cb9 100644
--- a/korganizer/kontactplugin/korganizer/todoplugin.cpp
+++ b/korganizer/kontactplugin/korganizer/todoplugin.cpp
@@ -56,7 +56,6 @@ TodoPlugin::TodoPlugin(KontactInterface::Core *core, const QVariantList &)
{
setComponentName(QStringLiteral("korganizer"), QStringLiteral("korganizer"));
KIconLoader::global()->addAppDir(QStringLiteral("korganizer"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
QAction *action =
new QAction(QIcon::fromTheme(QStringLiteral("task-new")),
diff --git a/korganizer/kontactplugin/specialdates/specialdates_plugin.cpp b/korganizer/kontactplugin/specialdates/specialdates_plugin.cpp
index 1566c23..bd42eab 100644
--- a/korganizer/kontactplugin/specialdates/specialdates_plugin.cpp
+++ b/korganizer/kontactplugin/specialdates/specialdates_plugin.cpp
@@ -38,7 +38,6 @@ SpecialdatesPlugin::SpecialdatesPlugin(KontactInterface::Core *core, const QVari
: KontactInterface::Plugin(core, core, Q_NULLPTR)
{
setComponentName(QStringLiteral("korganizer"), QStringLiteral("korganizer"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
}
SpecialdatesPlugin::~SpecialdatesPlugin()
diff --git a/libkleo/tests/test_keyselectiondialog.cpp b/libkleo/tests/test_keyselectiondialog.cpp
index 5cc1115..a954f69 100644
--- a/libkleo/tests/test_keyselectiondialog.cpp
+++ b/libkleo/tests/test_keyselectiondialog.cpp
@@ -54,7 +54,6 @@ int main(int argc, char **argv)
aboutData.processCommandLine(&parser);
KIconLoader::global()->addAppDir("libkleopatra");
- KIconLoader::global()->addAppDir("kdepim");
Kleo::KeySelectionDialog dlg("Kleo::KeySelectionDialog Test",
"Please select a key:",
diff --git a/plugins/kaddressbook/editorpages/cryptopageplugin.cpp b/plugins/kaddressbook/editorpages/cryptopageplugin.cpp
index 7b8969e..5e38403 100644
--- a/plugins/kaddressbook/editorpages/cryptopageplugin.cpp
+++ b/plugins/kaddressbook/editorpages/cryptopageplugin.cpp
@@ -50,7 +50,6 @@ CryptoPagePlugin::CryptoPagePlugin()
: mReadOnly(false)
{
KIconLoader::global()->addAppDir(QStringLiteral("libkleopatra"));
- KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
QGridLayout *topLayout = new QGridLayout(this);
topLayout->setColumnStretch(1, 1);