Restore the "Edit->Selection" menu from Konqueror 3 for file

[dolphin.git] / src / dolphincolumnview.h

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 0a601b7fae4e400f1d12fd60c39afe63e777d3f1..c742b46cf65eadccd4a9791e8817a36fe4851af5 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -33,12 +33,10 @@ class DolphinColumnViewContainer;
 class DolphinModel;
 class DolphinSortFilterProxyModel;
 class DolphinDirLister;
-class DolphinViewAutoScroller;
-class KFilePreviewGenerator;
 class KFileItem;
 class KFileItemList;
 class SelectionManager;
-class ToolTipManager;
+class ViewExtensionsFactory;
 
 /**
  * Represents one column inside the DolphinColumnViewContainer.
@@ -67,13 +65,13 @@ public:
      * of the shown directory, it does not trigger a loading of the model.
      */
     void setChildUrl(const KUrl& url);
-    const KUrl& childUrl() const;
+    KUrl childUrl() const;
 
     /** Sets the directory URL that is shown inside the column widget. */
     void setUrl(const KUrl& url);
 
     /** Returns the directory URL that is shown inside the column widget. */
-    const KUrl& url() const;
+    KUrl url() const;
 
     /**
      * Updates the background color dependent from the activation state
@@ -104,7 +102,6 @@ protected:
     virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
 
 private slots:
-    void setNameFilter(const QString& nameFilter);
     void setZoomLevel(int level);
 
     void slotEntered(const QModelIndex& index);
@@ -126,7 +123,7 @@ private:
     bool m_active;
     DolphinColumnViewContainer* m_container;
     SelectionManager* m_selectionManager;
-    DolphinViewAutoScroller* m_autoScroller;
+    ViewExtensionsFactory* m_extensionsFactory;
     KUrl m_url;      // URL of the directory that is shown
     KUrl m_childUrl; // URL of the next column that is shown
 
@@ -137,10 +134,6 @@ private:
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
 
-    KFilePreviewGenerator* m_previewGenerator;
-
-    ToolTipManager* m_toolTipManager;
-
     QRect m_dropRect;
 
     friend class DolphinColumnViewContainer;
@@ -156,7 +149,7 @@ inline void DolphinColumnView::setChildUrl(const KUrl& url)
     m_childUrl = url;
 }
 
-inline const KUrl& DolphinColumnView::childUrl() const
+inline KUrl DolphinColumnView::childUrl() const
 {
     return m_childUrl;
 }
@@ -169,7 +162,7 @@ inline void DolphinColumnView::setUrl(const KUrl& url)
     }
 }
 
-inline const KUrl& DolphinColumnView::url() const
+inline KUrl DolphinColumnView::url() const
 {
     return m_url;
 }