fixed compile issues resulted by kdelibs cleanup

svn path=/trunk/playground/utils/dolphin/; revision=619596

diff --git a/src/detailsmodesettings.kcfg b/src/detailsmodesettings.kcfg
index c7ab10d15e323a83b12cff597119747b7aa916cc..ce4a533250ecf3c4a9a71d37aa25dbd7cf0fcdd4 100644 (file)
--- a/src/detailsmodesettings.kcfg
+++ b/src/detailsmodesettings.kcfg
@@ -3,6 +3,7 @@
 <kcfg>
     <kcfgfile name="dolphinrc"/>
     <include>kiconloader.h</include>
+    <include>kglobalsettings.h</include>
     <group name="DetailsMode">
         <entry name="FontFamily" type="String">
             <label>Font family</label>

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7cf7f6b096bfa15b65e64fb9ed1a80ab26677822..14ec8dcd4a27cb636edc9b385bd87ab9317b5e75 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -297,8 +297,8 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
                 // will be skipped here.
                 const QString appName((*it)->name());
                 if (!containsEntry(openWithMenu, appName)) {
-                    QAction *action = openWithMenu->addAction((*it)->pixmap(K3Icon::Small),
-                                                              appName);
+                    const KIcon icon((*it)->icon());
+                    QAction *action = openWithMenu->addAction(icon, appName);
                     openWithVector.append(*it);
                     openWithActions << action;
                 }

diff --git a/src/iconsmodesettings.kcfg b/src/iconsmodesettings.kcfg
index 0d024d8a2ed0018ba05c4abec3cfcb1dd5386786..23ee5ec9320e846e4045e32382b87e4a7bb317e8 100644 (file)
--- a/src/iconsmodesettings.kcfg
+++ b/src/iconsmodesettings.kcfg
@@ -3,6 +3,7 @@
 <kcfg>
     <kcfgfile name="dolphinrc"/>
     <include>kiconloader.h</include>
+    <include>kglobalsettings.h</include>
     <group name="IconsMode">
         <entry name="Arrangement" type="String">
             <label>Arrangement</label>

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index ab2befd938da2ac96344b2181dbe03431b8dd136..7e63cf0f5700ebdfe642d65c49a6e05f13d8250f 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -19,23 +19,25 @@
  ***************************************************************************/
 
 #include "iconsviewsettingspage.h"
+#include "iconsmodesettings.h"
+#include "dolphinsettings.h"
+#include "pixmapviewer.h"
+
+#include <assert.h>
 
 #include <qlabel.h>
 #include <qslider.h>
 #include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
-#include <kiconloader.h>
 #include <qfontcombobox.h>
+
+#include <kiconloader.h>
 #include <kdialog.h>
+#include <kglobalsettings.h>
 #include <klocale.h>
-#include <assert.h>
 #include <kvbox.h>
 
-#include "iconsmodesettings.h"
-#include "dolphinsettings.h"
-#include "pixmapviewer.h"
-
 #define GRID_SPACING_BASE 8
 #define GRID_SPACING_INC 12