- The view implementations don't need to keep the Extensions Factory as member.

- Created basic documentation for Extensions Factory.

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 92566356809dd249dc1b96491269c14733b1b0ec..c3cf10f383f719b124d005c311e9b354ccad7433 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -58,7 +58,6 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
     m_container(container),
     m_selectionManager(0),
     m_autoScroller(0),
-    m_extensionsFactory(0),
     m_url(url),
     m_childUrl(),
     m_font(),
@@ -173,7 +172,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
 
     updateDecorationSize(dolphinView->showPreview());
 
-    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
+    new ViewExtensionsFactory(this, controller);
 }
 
 DolphinColumnView::~DolphinColumnView()

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 97f498c97f4bb678744660dba81c9b504bc43e60..1dc154358369872ccad3f73a0483edd438abb9c4 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -37,7 +37,6 @@ class DolphinViewAutoScroller;
 class KFileItem;
 class KFileItemList;
 class SelectionManager;
-class ViewExtensionsFactory;
 
 /**
  * Represents one column inside the DolphinColumnViewContainer.
@@ -126,7 +125,6 @@ private:
     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
 

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 2769064e441f9751ca157180f3fd465cdf24cb37..83bc7cdd348036bd07edb590b514b0c8766fb030 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -58,7 +58,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
     m_controller(controller),
     m_selectionManager(0),
     m_autoScroller(0),
-    m_extensionsFactory(0),
     m_expandableFoldersAction(0),
     m_font(),
     m_decorationSize(),
@@ -166,7 +165,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
     connect(m_expandableFoldersAction, SIGNAL(toggled(bool)),
             this, SLOT(setFoldersExpandable(bool)));
 
-    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
+    new ViewExtensionsFactory(this, controller);
 }
 
 DolphinDetailsView::~DolphinDetailsView()

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index 93c27ac502fb5f506aacde9f7ea0a2772a1331ad..562b6d264c22273a7d25318e79452a7cda6e6e57 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -29,7 +29,6 @@ class DolphinController;
 class SelectionManager;
 class DolphinSortFilterProxyModel;
 class DolphinViewAutoScroller;
-class ViewExtensionsFactory;
 
 /**
  * @brief Represents the details view which shows the name, size,
@@ -206,7 +205,6 @@ private:
     DolphinController* m_controller;
     SelectionManager* m_selectionManager;
     DolphinViewAutoScroller* m_autoScroller;
-    ViewExtensionsFactory* m_extensionsFactory;
     QAction* m_expandableFoldersAction;
 
     QFont m_font;

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index b07ce5a0460db60f37a96c630d013fd6e5cfcd70..2670aab822cc3d524fdf900e528f24573e10c993 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -48,7 +48,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
     m_selectionManager(0),
     m_autoScroller(0),
     m_categoryDrawer(0),
-    m_extensionsFactory(0),
     m_font(),
     m_decorationSize(),
     m_decorationPosition(QStyleOptionViewItem::Top),
@@ -136,7 +135,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
     connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
             this, SLOT(slotGlobalSettingsChanged(int)));
 
-    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
+    new ViewExtensionsFactory(this, controller);
 }
 
 DolphinIconsView::~DolphinIconsView()

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 7a6dda3d44c88989d94d7013049b9338b79e5f3a..d94a00e7164df871b5d168aa9446107886d8d6fb 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -36,7 +36,6 @@ class SelectionManager;
 class DolphinCategoryDrawer;
 class DolphinSortFilterProxyModel;
 class DolphinViewAutoScroller;
-class ViewExtensionsFactory;
 
 /**
  * @brief Represents the view, where each item is shown as an icon.
@@ -100,7 +99,6 @@ private:
     SelectionManager* m_selectionManager;
     DolphinViewAutoScroller* m_autoScroller;
     DolphinCategoryDrawer* m_categoryDrawer;
-    ViewExtensionsFactory* m_extensionsFactory;
 
     QFont m_font;
     QSize m_decorationSize;

diff --git a/src/viewextensionsfactory.h b/src/viewextensionsfactory.h
index dd819249b1260db6ab3a46b9a2292ba6ef277abf..e89a7ce368af8b6ff2536d11722f3f78032d435a 100644 (file)
--- a/src/viewextensionsfactory.h
+++ b/src/viewextensionsfactory.h
@@ -27,6 +27,15 @@ class KFilePreviewGenerator;
 class ToolTipManager;
 class QAbstractItemView;
 
+/**
+ * @brief Responsible for creating extensions like tooltips and previews
+ *        that are available in all view implementations.
+ *
+ * Each view implementation (iconsview, detailsview, columnview) must
+ * instantiate an instance of this class to assure having
+ * a common behavior that is independent from the custom functionality of
+ * a view implementation.
+ */
 class ViewExtensionsFactory : public QObject
 {
     Q_OBJECT