I wanted to this for KDE 4.1 already, but well...

Columview refactoring: Get rid of "isColumnView()" special cases in DolphinView and the interface code duplications due to delegating non-QAbstractItemView interfaces to the column view. This reduces the code size + complexity a lot and will make future maintainance of the columnview and DolphinView a lot easier.

Currently there are some regressions in the column view, but this will be fixed during the next 14 days.

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

1 files changed, 10 insertions, 13 deletions

diff --git a/src/dolphincolumnwidget.h b/src/dolphincolumnwidget.h
index 3568d4cf7..92b2a8f54 100644
--- a/src/dolphincolumnwidget.h
+++ b/src/dolphincolumnwidget.h
@@ -1,3 +1,5 @@
+Don't compile
+
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <[email protected]>                  *
  *                                                                         *
@@ -54,9 +56,6 @@ public:
                         const KUrl& url);
     virtual ~DolphinColumnWidget();
 
-    /** Sets the size of the icons. */
-    void setDecorationSize(const QSize& size);
-
     /**
      * An active column is defined as column, which shows the same URL
      * as indicated by the URL navigator. The active column is usually
@@ -80,13 +79,13 @@ public:
     const KUrl& url() const;
 
     /** Reloads the directory DolphinColumnWidget::url(). */
-    void reload();
+    //void reload();
 
-    void setSorting(DolphinView::Sorting sorting);
+    /*void setSorting(DolphinView::Sorting sorting);
     void setSortOrder(Qt::SortOrder order);
     void setSortFoldersFirst(bool foldersFirst);
     void setShowHiddenFiles(bool show);
-    void setShowPreview(bool show);
+    void setShowPreview(bool show);*/
 
     /**
      * Updates the background color dependent from the activation state
@@ -95,12 +94,6 @@ public:
     void updateBackground();
 
     /**
-     * Filters the currently shown items by \a nameFilter. All items
-     * which contain the given filter string will be shown.
-     */
-    void setNameFilter(const QString& nameFilter);
-
-    /**
      * Does an inline editing for the item \a item.
      */
     void editItem(const KFileItem& item);
@@ -139,6 +132,8 @@ private slots:
     void requestActivation();
     void updateFont();
 
+    void slotShowPreviewChanged();
+
 private:
     /** Used by DolphinColumnWidget::setActive(). */
     void activate();
@@ -146,6 +141,8 @@ private:
     /** Used by DolphinColumnWidget::setActive(). */
     void deactivate();
 
+    void updateDecorationSize(bool showPreview);
+
 private:
     bool m_active;
     DolphinColumnView* m_view;
@@ -189,7 +186,7 @@ inline void DolphinColumnWidget::setUrl(const KUrl& url)
 {
     if (url != m_url) {
         m_url = url;
-        reload();
+        //reload();
     }
 }