The KMimeTypeResolver instance is owned by the item view and may not be deleted manually.

svn path=/trunk/playground/utils/dolphin/; revision=623875

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 69ba35d5005776a20fa4291d87459fb1c1e678d1..cc22c1fd962619ecb1307743cea670965f7a4ad4 100644 (file)
--- 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_statusBar(0),
     m_dirModel(0),
     m_dirLister(0),

-    m_proxyModel(0),
-    m_mimeTypeResolver(0)
+    m_proxyModel(0)

 {
     hide();
     setFocusPolicy(Qt::StrongFocus);
 {
     hide();
     setFocusPolicy(Qt::StrongFocus);


@@ -987,9 +986,6 @@ void DolphinView::createView()
     assert(m_iconsView == 0);
     assert(m_detailsView == 0);
 
     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:
     // ... 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);
 
     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&)));
 
     connect(view, SIGNAL(clicked(const QModelIndex&)),
             this, SLOT(triggerItem(const QModelIndex&)));

diff --git a/src/dolphinview.h b/src/dolphinview.h
index c28a47e6e4c3f40b4e30a5444771d0a0ee39a868..396892c2129290a350ef3b49316b657762b55958 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -55,7 +55,6 @@ class DolphinSortFilterProxyModel;
 class ViewProperties;
 class KProgress;
 class KDirModel;
 class ViewProperties;
 class KProgress;
 class KDirModel;

-class KMimeTypeResolver;

 class FilterBar;
 
 class QModelIndex;
 class FilterBar;
 
 class QModelIndex;


@@ -502,8 +501,6 @@ private:
     KDirModel* m_dirModel;
     DolphinDirLister* m_dirLister;
     DolphinSortFilterProxyModel* m_proxyModel;
     KDirModel* m_dirModel;
     DolphinDirLister* m_dirLister;
     DolphinSortFilterProxyModel* m_proxyModel;

-    KMimeTypeResolver* m_mimeTypeResolver;
-

 };
 
 #endif // _DOLPHINVIEW_H_
 };
 
 #endif // _DOLPHINVIEW_H_