use global IconLoader

svn path=/trunk/KDE/kdebase/apps/; revision=710266

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index f6a7fda4f2c4d5a95dc3b0feed353ef9b2836acf..0ebd9aef20b9473cf3ee9beadbd3b19c5cd184ae 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -25,6 +25,7 @@
 #include "dolphin_iconsmodesettings.h"
 
 #include <kcolorscheme.h>
+#include <kiconloader.h>
 #include <klocale.h>
 #include <kvbox.h>
 
@@ -40,8 +41,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     m_iconSizeSlider(0),
     m_iconSizeViewer(0),
     m_previewSizeSlider(0),
-    m_previewSizeViewer(0),
-    m_iconLoader()
+    m_previewSizeViewer(0)
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
@@ -132,7 +132,7 @@ void IconSizeDialog::slotButtonClicked(int button)
 
 void IconSizeDialog::updateIconSize(int value)
 {
-    m_iconSizeViewer->setPixmap(m_iconLoader.loadIcon("folder", K3Icon::Desktop, iconSize(value)));
+    m_iconSizeViewer->setPixmap(KIconLoader::global()->loadIcon("folder", K3Icon::Desktop, iconSize(value)));
     if (m_previewSizeSlider != 0) {
         updatePreviewSize(m_previewSizeSlider->value());
     }
@@ -145,7 +145,7 @@ void IconSizeDialog::updatePreviewSize(int value)
         // assure that the preview size is never smaller than the icon size
         value = iconSizeValue;
     }
-    m_previewSizeViewer->setPixmap(m_iconLoader.loadIcon("preview", K3Icon::Desktop, iconSize(value)));
+    m_previewSizeViewer->setPixmap(KIconLoader::global()->loadIcon("preview", K3Icon::Desktop, iconSize(value)));
 }
 
 int IconSizeDialog::iconSize(int sliderValue) const

diff --git a/src/iconsizedialog.h b/src/iconsizedialog.h
index ed270baec1e8fbefb763061d96ff06cd148fc72d..33cd83725ac54cc114c63f963d90aeb485f747f2 100644 (file)
--- a/src/iconsizedialog.h
+++ b/src/iconsizedialog.h
@@ -21,7 +21,6 @@
 #define ICONSIZEDIALOG_H
 
 #include <kdialog.h>
-#include <kiconloader.h>
 
 class QSlider;
 class PixmapViewer;
@@ -78,7 +77,6 @@ private:
     PixmapViewer* m_iconSizeViewer;
     QSlider* m_previewSizeSlider;
     PixmapViewer* m_previewSizeViewer;
-    KIconLoader m_iconLoader;
 };
 
 #endif