Ported to KBookmarkManager::closestBookmark - which even solves another TODO about...

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index c3dc5fbeebd34f19979639f3d9ee0a4ac854b78f..3d187d40d3d64c0da0837cd830fbbc5539bee8f0 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -20,21 +20,15 @@
 
 #include "dolphinsettings.h"
 
-#include <assert.h>
-#include <qdir.h>
-
-#include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
-#include <kicontheme.h>
+#include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include "generalsettings.h"
-#include "iconsmodesettings.h"
-#include "detailsmodesettings.h"
-
-#include <Q3IconView>
+#include "dolphin_generalsettings.h"
+#include "dolphin_iconsmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
 
 DolphinSettings& DolphinSettings::instance()
 {
@@ -47,23 +41,12 @@ DolphinSettings& DolphinSettings::instance()
 
 KBookmark DolphinSettings::bookmark(int index) const
 {
-    int i = 0;
-    KBookmarkGroup root = bookmarkManager()->root();
-    KBookmark bookmark = root.first();
-    while (!bookmark.isNull()) {
-        if (i == index) {
-            return bookmark;
-        }
-        ++i;
-        bookmark = root.next(bookmark);
-    }
-
-    return KBookmark();
+    return bookmarkManager()->findByAddress( QString('/')+QString::number(index) );
 }
 
 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 +59,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);