Fix the problem of the palette not being updated... this is a workaround. It should...

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index c3dc5fbeebd34f19979639f3d9ee0a4ac854b78f..04284c22a324367ecb003099eebda6a149ecd6fa 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 <kfileplacesmodel.h>
+#include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include "generalsettings.h"
-#include "iconsmodesettings.h"
-#include "detailsmodesettings.h"
-
-#include <Q3IconView>
+#include "dolphin_columnmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
+#include "dolphin_generalsettings.h"
+#include "dolphin_iconsmodesettings.h"
 
 DolphinSettings& DolphinSettings::instance()
 {
@@ -45,43 +39,12 @@ DolphinSettings& DolphinSettings::instance()
     return *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();
-}
-
-KBookmarkManager* DolphinSettings::bookmarkManager() const
-{
-    QString basePath = KGlobal::instance()->instanceName();
-    basePath.append("/bookmarks.xml");
-    const QString file = KStandardDirs::locateLocal("data", basePath);
-
-    return KBookmarkManager::managerForFile(file, "dolphin", false);
-}
-
 void DolphinSettings::save()
 {
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
-
-    QString basePath = KGlobal::instance()->instanceName();
-    basePath.append("/bookmarks.xml");
-    const QString file = KStandardDirs::locateLocal( "data", basePath);
-
-    KBookmarkManager* manager = KBookmarkManager::managerForFile(file, "dolphin", false);
-    manager->save(false);
+    m_columnModeSettings->writeConfig();
 }
 
 DolphinSettings::DolphinSettings()
@@ -89,6 +52,8 @@ DolphinSettings::DolphinSettings()
     m_generalSettings = new GeneralSettings();
     m_iconsModeSettings = new IconsModeSettings();
     m_detailsModeSettings = new DetailsModeSettings();
+    m_columnModeSettings = new ColumnModeSettings();
+    m_placesModel = new KFilePlacesModel();
 }
 
 DolphinSettings::~DolphinSettings()
@@ -101,4 +66,10 @@ DolphinSettings::~DolphinSettings()
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
+
+    delete m_columnModeSettings;
+    m_columnModeSettings = 0;
+
+    delete m_placesModel;
+    m_placesModel = 0;
 }