Get ride of the sidebar and use dockwidgets instead.

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 8e040d76713049fe13a95497590d810fab027807..11c18914ff24a71d8cf1eb6ea855f8de9a78c7fe 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -30,12 +30,12 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include "dolphin.h"
 #include "generalsettings.h"
 #include "iconsmodesettings.h"
 #include "previewsmodesettings.h"
 #include "detailsmodesettings.h"
-#include "sidebarsettings.h"
+
+#include <Q3IconView>
 
 DolphinSettings& DolphinSettings::instance()
 {
@@ -66,9 +66,9 @@ KBookmarkManager* DolphinSettings::bookmarkManager() const
 {
     QString basePath = KGlobal::instance()->instanceName();
     basePath.append("/bookmarks.xml");
-    const QString file = locateLocal("data", basePath);
+    const QString file = KStandardDirs::locateLocal("data", basePath);
 
-    return KBookmarkManager::managerForFile(file, false);
+    return KBookmarkManager::managerForFile(file, "dolphin", false);
 }
 
 void DolphinSettings::save()
@@ -77,13 +77,12 @@ void DolphinSettings::save()
     m_iconsModeSettings->writeConfig();
     m_previewsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
-    m_sidebarSettings->writeConfig();
 
     QString basePath = KGlobal::instance()->instanceName();
     basePath.append("/bookmarks.xml");
-    const QString file = locateLocal( "data", basePath);
+    const QString file = KStandardDirs::locateLocal( "data", basePath);
 
-    KBookmarkManager* manager = KBookmarkManager::managerForFile(file, false);
+    KBookmarkManager* manager = KBookmarkManager::managerForFile(file, "dolphin", false);
     manager->save(false);
 }
 
@@ -100,14 +99,14 @@ void DolphinSettings::calculateGridSize(int hint)
     int gridHeight = 0;
     if (arrangement == Q3IconView::LeftToRight) {
         int widthUnit = maxSize + (maxSize / 2);
-        if (widthUnit < KIcon::SizeLarge) {
-            widthUnit = KIcon::SizeLarge;
+        if (widthUnit < K3Icon::SizeLarge) {
+            widthUnit = K3Icon::SizeLarge;
         }
 
-        gridWidth = widthUnit + hint * KIcon::SizeLarge;
+        gridWidth = widthUnit + hint * K3Icon::SizeLarge;
 
         gridHeight = iconSize;
-        if (gridHeight <= KIcon::SizeMedium) {
+        if (gridHeight <= K3Icon::SizeMedium) {
             gridHeight = gridHeight * 2;
         }
         else {
@@ -141,10 +140,10 @@ int DolphinSettings::textWidthHint() const
     int hint = 0;
     if (arrangement == Q3IconView::LeftToRight) {
         int widthUnit = maxSize + (maxSize / 2);
-        if (widthUnit < KIcon::SizeLarge) {
-            widthUnit = KIcon::SizeLarge;
+        if (widthUnit < K3Icon::SizeLarge) {
+            widthUnit = K3Icon::SizeLarge;
         }
-        hint = (gridWidth - widthUnit) / KIcon::SizeLarge;
+        hint = (gridWidth - widthUnit) / K3Icon::SizeLarge;
     }
     else {
         assert(arrangement == Q3IconView::TopToBottom);
@@ -162,7 +161,6 @@ DolphinSettings::DolphinSettings()
     m_iconsModeSettings = new IconsModeSettings();
     m_previewsModeSettings = new PreviewsModeSettings();
     m_detailsModeSettings = new DetailsModeSettings();
-    m_sidebarSettings = new SidebarSettings();
 }
 
 DolphinSettings::~DolphinSettings()
@@ -178,7 +176,4 @@ DolphinSettings::~DolphinSettings()
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
-
-    delete m_sidebarSettings;
-    m_sidebarSettings = 0;
 }