Split the class DolphinController into the two classes DolphinViewController and ViewModeController.

The ViewModeController offers a defined interface to control view mode implementations like icons view, details view and column view. The DolphinViewController allows those view mode implementations to control the parent DolphinView in a limited way.

svn path=/trunk/KDE/kdebase/apps/; revision=1109228

1 files changed, 15 insertions, 3 deletions

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index d49c5d75f..21e37ba02 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -31,10 +31,11 @@
 
 #include <libdolphin_export.h>
 
-class DolphinController;
+class DolphinViewController;
 class DolphinCategoryDrawer;
 class DolphinSortFilterProxyModel;
 class ViewExtensionsFactory;
+class ViewModeController;
 
 /**
  * @brief Represents the view, where each item is shown as an icon.
@@ -47,8 +48,18 @@ class LIBDOLPHINPRIVATE_EXPORT DolphinIconsView : public KCategorizedView
     Q_OBJECT
 
 public:
+    /**
+     * @param parent                Parent widget.
+     * @param dolphinViewController Allows the DolphinIconsView to control the
+     *                              DolphinView in a limited way.
+     * @param viewModeController    Controller that is used by the DolphinView
+     *                              to control the DolphinIconsView. The DolphinIconsView
+     *                              only has read access to the controller.
+     * @param model                 Directory that is shown.
+     */
     explicit DolphinIconsView(QWidget* parent,
-                              DolphinController* controller,
+                              DolphinViewController* dolphinViewController,
+                              const ViewModeController* viewModeController,
                               DolphinSortFilterProxyModel* proxyModel);
     virtual ~DolphinIconsView();
 
@@ -94,7 +105,8 @@ private:
     int additionalInfoCount() const;
 
 private:
-    DolphinController* m_controller;
+    DolphinViewController* m_dolphinViewController;
+    const ViewModeController* m_viewModeController;
     DolphinCategoryDrawer* m_categoryDrawer;
     ViewExtensionsFactory* m_extensionsFactory;