aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <[email protected]>2015-03-10 20:23:48 +0100
committerChristoph Cullmann <[email protected]>2015-03-10 20:23:48 +0100
commit8ff63b61cb0bebfa64c6b0f91e996952d48de255 (patch)
tree1af88a5afdc5695c4746980007b0ef2093c59651
parent11563425d82b2008b12dd738dad6eed9d6d30223 (diff)
more to QIcon::fromTheme conversion
-rw-r--r--addons/symbolviewer/plugin_katesymbolviewer.cpp1
-rw-r--r--addons/symbolviewer/plugin_katesymbolviewer.h3
-rw-r--r--addons/tabswitcher/tabswitcher.cpp4
3 files changed, 1 insertions, 7 deletions
diff --git a/addons/symbolviewer/plugin_katesymbolviewer.cpp b/addons/symbolviewer/plugin_katesymbolviewer.cpp
index 9c4ee7e..f59dbad 100644
--- a/addons/symbolviewer/plugin_katesymbolviewer.cpp
+++ b/addons/symbolviewer/plugin_katesymbolviewer.cpp
@@ -49,7 +49,6 @@
#include <kaboutdata.h>
#include <ktoggleaction.h>
#include <KActionCollection>
-#include <kiconloader.h>
#include <KXMLGUIFactory>
#include <KConfigGroup>
#include <KSharedConfig>
diff --git a/addons/symbolviewer/plugin_katesymbolviewer.h b/addons/symbolviewer/plugin_katesymbolviewer.h
index 002f541..d8c8680 100644
--- a/addons/symbolviewer/plugin_katesymbolviewer.h
+++ b/addons/symbolviewer/plugin_katesymbolviewer.h
@@ -37,9 +37,6 @@
#include <klocalizedstring.h>
-//#include <kiconloader.h>
-//#include <kconfig.h>
-
/**
* Plugin's config page
*/
diff --git a/addons/tabswitcher/tabswitcher.cpp b/addons/tabswitcher/tabswitcher.cpp
index f631371..e7a2f94 100644
--- a/addons/tabswitcher/tabswitcher.cpp
+++ b/addons/tabswitcher/tabswitcher.cpp
@@ -27,7 +27,6 @@
#include <KTextEditor/View>
#include <KActionCollection>
-#include <KIconLoader>
#include <KLocalizedString>
#include <KPluginFactory>
#include <KXMLGUIFactory>
@@ -129,8 +128,7 @@ void TabSwitcherPluginView::setupActions()
static QIcon iconForDocument(KTextEditor::Document * doc)
{
- const QString iconName = QMimeDatabase().mimeTypeForUrl(doc->url()).iconName();
- return QIcon(KIconLoader::global()->loadMimeTypeIcon(iconName, KIconLoader::Small));
+ return QIcon::fromTheme(QMimeDatabase().mimeTypeForUrl(doc->url()).iconName());
}
void TabSwitcherPluginView::setupModel()