SVN_SILENT: minor coding style fixes

[dolphin.git] / src / dolphinsettings.h

diff --git a/src/dolphinsettings.h b/src/dolphinsettings.h
index 296f943fc7a4b45f289324f1f5c7b5ca947379c9..dc1b0a8401d57c572c723f8917e1e22ffce59004 100644 (file)
--- a/src/dolphinsettings.h
+++ b/src/dolphinsettings.h
@@ -23,37 +23,47 @@
 
 #include <libdolphin_export.h>
 
-class KBookmark;
-class KBookmarkManager;
+class ColumnModeSettings;
+class DetailsModeSettings;
 class GeneralSettings;
 class IconsModeSettings;
-class DetailsModeSettings;
+class KFilePlacesModel;
 
 /**
  * @brief Manages and stores all settings from Dolphin.
  *
  * The following properties are stored:
- * - home Url
+ * - home URL
  * - default view mode
- * - Url navigator state (editable or not)
+ * - URL navigator state (editable or not)
  * - split view
- * - bookmarks
- * - properties for icons and details view
+ * - properties for views
  */
-class LIBDOLPHIN_EXPORT DolphinSettings {
+class LIBDOLPHINPRIVATE_EXPORT DolphinSettings
+{
 public:
     static DolphinSettings& instance();
 
-    GeneralSettings* generalSettings() const { return m_generalSettings; }
-    IconsModeSettings* iconsModeSettings() const { return m_iconsModeSettings; }
-    DetailsModeSettings* detailsModeSettings() const { return m_detailsModeSettings; }
-
-    KBookmarkManager* bookmarkManager() const;
-
-    // TODO: should this really belong here or get moved to a derived KBookmarkManager?
-    // Dolphin uses some lists where an index is given and the corresponding bookmark
-    // should get retrieved...
-    KBookmark bookmark(int index) const;
+    GeneralSettings* generalSettings() const
+    {
+        return m_generalSettings;
+    }
+    IconsModeSettings* iconsModeSettings() const
+    {
+        return m_iconsModeSettings;
+    }
+    DetailsModeSettings* detailsModeSettings() const
+    {
+        return m_detailsModeSettings;
+    }
+    ColumnModeSettings* columnModeSettings() const
+    {
+        return m_columnModeSettings;
+    }
+    KFilePlacesModel* placesModel() const
+    {
+        return m_placesModel;
+    }
 
     /** @see DolphinSettingsBase::save */
     virtual void save();
@@ -66,6 +76,8 @@ private:
     GeneralSettings* m_generalSettings;
     IconsModeSettings* m_iconsModeSettings;
     DetailsModeSettings* m_detailsModeSettings;
+    ColumnModeSettings* m_columnModeSettings;
+    KFilePlacesModel* m_placesModel;
 };
 
 #endif