Merged very early alpha-version of Dolphin 2.0

Dolphin 2.0 will get a new view-engine with the
following improvements:
- Better performance
- Animated transitions
- No clipped filenames due to dynamic item-sizes
- Grouping support for all view-modes
- Non-rectangular selection areas
- Simplified code for better maintenance

More details will be provided in a blog-entry during
the next days.

Please note that the code is in a very
early alpha-stage and although the most tricky parts
have been implemented already very basic things like
drag and drop or selections have not been pushed yet.
Those things are rather trivial to implement but this
still will take some time.

1 files changed, 2 insertions, 24 deletions

diff --git a/src/settings/dolphinsettings.h b/src/settings/dolphinsettings.h
index 54141ad3e..88e1d2905 100644
--- a/src/settings/dolphinsettings.h
+++ b/src/settings/dolphinsettings.h
@@ -23,12 +23,11 @@
 
 #include <libdolphin_export.h>
 
-class ColumnModeSettings;
-class DetailsModeSettings;
 class GeneralSettings;
-class IconsModeSettings;
 class KFilePlacesModel;
 
+// TODO: Remove this class completely and just work with the settings directly instead
+
 /**
  * @brief Manages and stores all settings from Dolphin.
  *
@@ -46,9 +45,6 @@ public:
     static DolphinSettings& instance();
 
     GeneralSettings* generalSettings() const;
-    IconsModeSettings* iconsModeSettings() const;
-    DetailsModeSettings* detailsModeSettings() const;
-    ColumnModeSettings* columnModeSettings() const;
     KFilePlacesModel* placesModel() const;
     virtual void save();
 
@@ -59,9 +55,6 @@ protected:
 
 private:
     GeneralSettings* m_generalSettings;
-    IconsModeSettings* m_iconsModeSettings;
-    DetailsModeSettings* m_detailsModeSettings;
-    ColumnModeSettings* m_columnModeSettings;
     KFilePlacesModel* m_placesModel;
 };
 
@@ -70,21 +63,6 @@ inline GeneralSettings* DolphinSettings::generalSettings() const
     return m_generalSettings;
 }
 
-inline IconsModeSettings* DolphinSettings::iconsModeSettings() const
-{
-    return m_iconsModeSettings;
-}
-
-inline DetailsModeSettings* DolphinSettings::detailsModeSettings() const
-{
-    return m_detailsModeSettings;
-}
-
-inline ColumnModeSettings* DolphinSettings::columnModeSettings() const
-{
-    return m_columnModeSettings;
-}
-
 inline KFilePlacesModel* DolphinSettings::placesModel() const
 {
     return m_placesModel;