move the QT3_SUPPORT definition only where it's needed

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 1b7bd9d590aa152dc4735dfad875c791a08cf5fa..0db0ad2048e6af9f5faa9f56b178e81156ab22ea 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -20,22 +20,16 @@
 
 #include "dolphinsettings.h"
 
-#include <assert.h>
-#include <qdir.h>
-
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kcomponentdata.h>
-#include <kicontheme.h>
-#include <kinstance.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()
 {
@@ -48,18 +42,7 @@ 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
@@ -76,6 +59,7 @@ void DolphinSettings::save()
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
+    m_columnModeSettings->writeConfig();
 
     QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");
@@ -90,6 +74,7 @@ DolphinSettings::DolphinSettings()
     m_generalSettings = new GeneralSettings();
     m_iconsModeSettings = new IconsModeSettings();
     m_detailsModeSettings = new DetailsModeSettings();
+    m_columnModeSettings = new ColumnModeSettings();
 }
 
 DolphinSettings::~DolphinSettings()
@@ -102,4 +87,7 @@ DolphinSettings::~DolphinSettings()
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
+
+    delete m_columnModeSettings;
+    m_columnModeSettings = 0;
 }