aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <[email protected]>2015-03-10 20:28:41 +0100
committerChristoph Cullmann <[email protected]>2015-03-10 20:28:41 +0100
commitd44a5d890ab2166319f5397257851d10f7734f30 (patch)
tree7b72475c50844e119165ec3a9794c978637762c1
parent8ff63b61cb0bebfa64c6b0f91e996952d48de255 (diff)
more to QIcon::fromTheme conversion
-rw-r--r--addons/filetemplates/plugin/filetemplates.cpp1
-rw-r--r--addons/sessionapplet/engine/katesessionsmodel.cpp1
-rw-r--r--kate/src/kateconfigdialog.cpp1
-rw-r--r--kate/src/katedocmanager.cpp1
-rw-r--r--kate/src/katesavemodifieddialog.cpp6
5 files changed, 2 insertions, 8 deletions
diff --git a/addons/filetemplates/plugin/filetemplates.cpp b/addons/filetemplates/plugin/filetemplates.cpp
index 4be946b..ce543ef 100644
--- a/addons/filetemplates/plugin/filetemplates.cpp
+++ b/addons/filetemplates/plugin/filetemplates.cpp
@@ -32,7 +32,6 @@
#include <kdirwatch.h>
#include <kfiledialog.h>
#include <kicondialog.h>
-#include <kiconloader.h>
#include <kio/netaccess.h>
#include <klineedit.h>
#include <klocalizedstring.h>
diff --git a/addons/sessionapplet/engine/katesessionsmodel.cpp b/addons/sessionapplet/engine/katesessionsmodel.cpp
index 3eeb3d5..6dd2795 100644
--- a/addons/sessionapplet/engine/katesessionsmodel.cpp
+++ b/addons/sessionapplet/engine/katesessionsmodel.cpp
@@ -23,7 +23,6 @@
#include <QTreeView>
#include <QVBoxLayout>
#include <QGraphicsGridLayout>
-#include <KIconLoader>
#include <QGraphicsProxyWidget>
#include <QListWidgetItem>
#include <QStandardItemModel>
diff --git a/kate/src/kateconfigdialog.cpp b/kate/src/kateconfigdialog.cpp
index d548548..12b713d 100644
--- a/kate/src/kateconfigdialog.cpp
+++ b/kate/src/kateconfigdialog.cpp
@@ -33,7 +33,6 @@
#include <KTextEditor/ConfigPage>
-#include <KIconLoader>
#include <KStandardAction>
#include <KLocalizedString>
#include <KConfigGroup>
diff --git a/kate/src/katedocmanager.cpp b/kate/src/katedocmanager.cpp
index e1972c2..a24f284 100644
--- a/kate/src/katedocmanager.cpp
+++ b/kate/src/katedocmanager.cpp
@@ -32,7 +32,6 @@
#include <KCodecs>
#include <KMessageBox>
#include <KIO/DeleteJob>
-#include <KIconLoader>
#include <KColorScheme>
#include <KLocalizedString>
#include <KConfigGroup>
diff --git a/kate/src/katesavemodifieddialog.cpp b/kate/src/katesavemodifieddialog.cpp
index 6a1fd15..1e02034 100644
--- a/kate/src/katesavemodifieddialog.cpp
+++ b/kate/src/katesavemodifieddialog.cpp
@@ -22,7 +22,6 @@
#include <KGuiItem>
#include <KStandardGuiItem>
-#include <KIconLoader>
#include <KMessageBox>
#include <KLocalizedString>
@@ -51,17 +50,16 @@ public:
}
void setState(enum STATE state) {
m_state = state;
- KIconLoader *loader = KIconLoader::global();
switch (state) {
case InitialState:
setIcon(0, QIcon());
break;
case SaveOKState:
- setIcon(0, loader->loadIcon(QStringLiteral("dialog-ok"), KIconLoader::NoGroup,/*height()*/16));
+ setIcon(0, QIcon::fromTheme(QStringLiteral("dialog-ok")));
// QStringLiteral("ok") icon should probably be QStringLiteral("dialog-success"), but we don't have that icon in KDE 4.0
break;
case SaveFailedState:
- setIcon(0, loader->loadIcon(QStringLiteral("dialog-error"), KIconLoader::NoGroup,/*height()*/16));
+ setIcon(0, QIcon::fromTheme(QStringLiteral("dialog-error")));
break;
}
}