Revert my last commit, it's not quite working

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index d6bd08a422f027059753d8aa42ccf53fba3149fd..a6fda66d0ed4c94218fcae9e160f11b4443a9bd1 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -554,19 +554,4 @@ void DolphinColumnView::removeAllColumns()
     assureVisibleActiveColumn();
 }
 
-void DolphinColumnView::setModel ( QAbstractItemModel * model )
-{
-    QAbstractItemView::setModel(model);
-    if(m_columns[0]) {
-       m_columns[0]->setModel(model);
-        m_columns[0]->setSelectionModel(selectionModel());
-    }
-}
-void DolphinColumnView::setSelectionModel ( QItemSelectionModel * selectionModel )
-{
-    if(m_columns[0])
-        m_columns[0]->setSelectionModel(selectionModel);
-    QAbstractItemView::setSelectionModel(selectionModel);
-}
-
 #include "dolphincolumnview.moc"

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 0030c69ce01ba4c6ed8436de7dd785cf60d38c6a..30ac7ae710d8fda6b40514d04fea8764971ad594 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -103,8 +103,6 @@ protected:
 
     virtual void mousePressEvent(QMouseEvent* event);
     virtual void resizeEvent(QResizeEvent* event);
-    virtual void setSelectionModel ( QItemSelectionModel * selectionModel );
-    virtual void setModel ( QAbstractItemModel * model );
 
 private slots:
     void zoomIn();

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index abd236c7ddb59edc3478c4d6eb417adbc66055d5..677215972d2b35aa027a6810c538a5e6edbdb72b 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -115,16 +115,18 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     m_dirLister->setShowingDotFiles(showHiddenFiles);
     connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
             this, SLOT(generatePreviews(const KFileItemList&)));
-}
 
-void DolphinColumnWidget::setModel ( QAbstractItemModel * model )
-{
-    m_proxyModel = dynamic_cast<DolphinSortFilterProxyModel *>(model);
-    if(m_proxyModel)
-        m_dolphinModel = dynamic_cast<DolphinModel *>(m_proxyModel->sourceModel());
+    m_dolphinModel = new DolphinModel(this);
+    m_dolphinModel->setDirLister(m_dirLister);
+    m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
+
+    m_proxyModel = new DolphinSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_dolphinModel);
+
+    setModel(m_proxyModel);
     new KMimeTypeResolver(this, m_dolphinModel);
-    m_dirLister->openUrl(m_url, KDirLister::NoFlags);
-    QListView::setModel(m_proxyModel);
+
+    m_dirLister->openUrl(url, KDirLister::NoFlags);
 }
 
 DolphinColumnWidget::~DolphinColumnWidget()

diff --git a/src/dolphincolumnwidget.h b/src/dolphincolumnwidget.h
index 14b4c875179812d40fa532b6b406a338951fcca4..e8fea3bf595afb1f1587eb878e3b423e50fd094b 100644 (file)
--- a/src/dolphincolumnwidget.h
+++ b/src/dolphincolumnwidget.h
@@ -89,7 +89,6 @@ public:
      * which contain the given filter string will be shown.
      */
     void setNameFilter(const QString& nameFilter);
-    virtual void setModel ( QAbstractItemModel * model );
 
 protected:
     virtual QStyleOptionViewItem viewOptions() const;