fixed most regressions due to the previous column-view refactoring

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

1 files changed, 14 insertions, 5 deletions

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index b473e790e..6837815a0 100644
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -20,6 +20,8 @@
 #ifndef DOLPHINCOLUMNVIEW_H
 #define DOLPHINCOLUMNVIEW_H
 
+#include <kurl.h>
+
 #include <QAbstractItemView>
 #include <QList>
 #include <QStyleOption>
@@ -27,7 +29,6 @@
 class DolphinColumnWidget;
 class DolphinController;
 class DolphinModel;
-class KUrl;
 class QAbstractProxyModel;
 class QTimeLine;
 
@@ -48,7 +49,6 @@ public:
     virtual QModelIndex indexAt(const QPoint& point) const;
     virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible);
     virtual QRect visualRect(const QModelIndex& index) const;
-    virtual void setModel(QAbstractItemModel* model);
 
     /** Inverts the selection of the currently active column. */
     void invertSelection();
@@ -60,6 +60,15 @@ public:
      */
     void reload();
 
+    /**
+     * Adjusts the root URL of the first column and removes all
+     * other columns.
+     */
+    void setRootUrl(const KUrl& url);
+
+    /** Returns the URL of the first column. */
+    KUrl rootUrl() const;
+
 public slots:
     /**
      * Shows the column which represents the URL \a url. If the column
@@ -132,6 +141,9 @@ private:
      */
     void requestActivation(DolphinColumnWidget* column);
 
+    /** Removes all columns except of the root column. */
+    void removeAllColumns();
+
 private:
     DolphinController* m_controller;
     bool m_restoreActiveColumnFocus;
@@ -140,9 +152,6 @@ private:
     QList<DolphinColumnWidget*> m_columns;
     QTimeLine* m_animation;
 
-    DolphinModel* m_dolphinModel;
-    QAbstractProxyModel* m_proxyModel;
-
     friend class DolphinColumnWidget;
 };