Prepare view-engine for non-KFileItem usecase

Up to now the view-engine only provided a model-implementation that
supports file-items. The view-engine always had been designed to be able
to work with any kind of model, so now a KStandardItemModel is available.
The plan is to convert the places panel to the new view-engine. It should
be no problem to fix this until the feature freeze - in the worst case
the places-panel code could be reverted while still keeping the
KStandardItemModel changes.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index a9cf0ade4..bfac88502 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -39,10 +39,11 @@
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
-class DolphinItemListContainer;
+class DolphinItemListView;
 class KAction;
 class KActionCollection;
 class KFileItemModel;
+class KItemListContainer;
 class KItemModelBase;
 class KUrl;
 class ToolTipManager;
@@ -659,8 +660,6 @@ private slots:
     void calculateItemCount(int& fileCount, int& folderCount, KIO::filesize_t& totalFileSize) const;
 
 private:
-    KFileItemModel* fileItemModel() const;
-
     void loadDirectory(const KUrl& url, bool reload = false);
 
     /**
@@ -670,6 +669,12 @@ private:
     void applyViewProperties();
 
     /**
+     * Applies the m_mode property to the corresponding
+     * itemlayout-property of the KItemListView.
+     */
+    void applyModeToView();
+
+    /**
      * Helper method for DolphinView::paste() and DolphinView::pasteIntoFolder().
      * Pastes the clipboard data into the URL \a url.
      */
@@ -716,7 +721,9 @@ private:
 
     QVBoxLayout* m_topLayout;
 
-    DolphinItemListContainer* m_container;
+    KFileItemModel* m_model;
+    DolphinItemListView* m_view;
+    KItemListContainer* m_container;
 
     ToolTipManager* m_toolTipManager;