From e28a32728b40ac22dd36ea4db136adc2d6f1026d Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 15 Jan 2007 18:18:09 +0000
Subject: [PATCH] The KMimeTypeResolver instance is owned by the item view and
 may not be deleted manually.

svn path=/trunk/playground/utils/dolphin/; revision=623875
---
 src/dolphinview.cpp | 8 ++------
 src/dolphinview.h   | 3 ---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 69ba35d50..cc22c1fd9 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -70,8 +70,7 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_statusBar(0),
     m_dirModel(0),
     m_dirLister(0),
-    m_proxyModel(0),
-    m_mimeTypeResolver(0)
+    m_proxyModel(0)
 {
     hide();
     setFocusPolicy(Qt::StrongFocus);
@@ -987,9 +986,6 @@ void DolphinView::createView()
     assert(m_iconsView == 0);
     assert(m_detailsView == 0);
 
-    delete m_mimeTypeResolver;
-    m_mimeTypeResolver = 0;
-
     // ... and recreate it representing the current mode
     switch (m_mode) {
         case IconsView:
@@ -1015,7 +1011,7 @@ void DolphinView::createView()
     delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
     view->setItemDelegate(delegate);
 
-    m_mimeTypeResolver = new KMimeTypeResolver(view, m_dirModel);
+    new KMimeTypeResolver(view, m_dirModel);
 
     connect(view, SIGNAL(clicked(const QModelIndex&)),
             this, SLOT(triggerItem(const QModelIndex&)));
diff --git a/src/dolphinview.h b/src/dolphinview.h
index c28a47e6e..396892c21 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -55,7 +55,6 @@ class DolphinSortFilterProxyModel;
 class ViewProperties;
 class KProgress;
 class KDirModel;
-class KMimeTypeResolver;
 class FilterBar;
 
 class QModelIndex;
@@ -502,8 +501,6 @@ private:
     KDirModel* m_dirModel;
     DolphinDirLister* m_dirLister;
     DolphinSortFilterProxyModel* m_proxyModel;
-    KMimeTypeResolver* m_mimeTypeResolver;
-
 };
 
 #endif // _DOLPHINVIEW_H_
-- 
2.47.3