Move code for initializing and handling view extensions to the new class ViewExtensionsFactory. Beside making DolphinView less complex this will allow the column view to share the view extension code instead of (partly) duplicating it as it has been done before.

Currently only the tooltips- and filepreview-handling have been moved into ViewExtensionsFactory, a further cleanup will be done later.

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

1 files changed, 2 insertions, 5 deletions

diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp
index 80c4ff7a0..ca9cfe0f1 100644
--- a/src/dolphincolumnviewcontainer.cpp
+++ b/src/dolphincolumnviewcontainer.cpp
@@ -26,13 +26,12 @@
 
 #include "dolphin_columnmodesettings.h"
 
-#include <kfilepreviewgenerator.h>
-
 #include <QPoint>
 #include <QScrollBar>
 #include <QTimeLine>
 
-DolphinColumnViewContainer::DolphinColumnViewContainer(QWidget* parent, DolphinController* controller) :
+DolphinColumnViewContainer::DolphinColumnViewContainer(QWidget* parent,
+                                                       DolphinController* controller) :
     QScrollArea(parent),
     m_controller(controller),
     m_active(false),
@@ -358,8 +357,6 @@ void DolphinColumnViewContainer::deleteColumn(DolphinColumnView* column)
         }
         // deleteWhenNotDragSource(column) does not necessarily delete column,
         // and we want its preview generator destroyed immediately.
-        column->m_previewGenerator->deleteLater();
-        column->m_previewGenerator = 0;
         column->hide();
         // Prevent automatic destruction of column when this DolphinColumnViewContainer
         // is destroyed.