Create a SidebarTreeView which will include support for drag & drop in later releases...

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index c3dc5fbeebd34f19979639f3d9ee0a4ac854b78f..7e3388524878ceb175deae3698954bd856bceafb 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -23,16 +23,16 @@
 #include <assert.h>
 #include <qdir.h>
 
-#include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
+#include <kcomponentdata.h>
 #include <kicontheme.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include "generalsettings.h"
-#include "iconsmodesettings.h"
-#include "detailsmodesettings.h"
+#include "dolphin_generalsettings.h"
+#include "dolphin_iconsmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
 
 #include <Q3IconView>
 
@@ -63,7 +63,7 @@ KBookmark DolphinSettings::bookmark(int index) const
 
 KBookmarkManager* DolphinSettings::bookmarkManager() const
 {
-    QString basePath = KGlobal::instance()->instanceName();
+    QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");
     const QString file = KStandardDirs::locateLocal("data", basePath);
 
@@ -76,7 +76,7 @@ void DolphinSettings::save()
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
 
-    QString basePath = KGlobal::instance()->instanceName();
+    QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");
     const QString file = KStandardDirs::locateLocal( "data", basePath);