don't forget to delete the proxy model

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index a559e3098b0b9d8b5ef6dcd7271b9b9043b0e7fe..2e94f8341d5cc1ba508344f85bdfbe74a94d8af7 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -127,7 +127,9 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
 
 DolphinColumnWidget::~DolphinColumnWidget()
 {
-    delete m_dolphinModel;
+    m_proxyModel->deleteLater();
+    m_proxyModel = 0;
+    m_dolphinModel->deleteLater();
     m_dolphinModel = 0;
     m_dirLister = 0; // deleted by m_dolphinModel
 }

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 99c76bee261327f64f047d0d005415406d59612a..9fc089e190e817566dec24cc38d21c1708805cb7 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -158,7 +158,9 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 
 DolphinViewContainer::~DolphinViewContainer()
 {
-    delete m_dolphinModel;
+    m_proxyModel->deleteLater();
+    m_proxyModel = 0;
+    m_dolphinModel->deleteLater();
     m_dolphinModel = 0;
     m_dirLister = 0; // deleted by m_dolphinModel
 }

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index accfc598860b0e8618e65ee30caa13a77cbd7da6..3e21d6baa20247b2fe037e8af68b69a504f65814 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -48,7 +48,9 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
-    delete m_dolphinModel;
+    m_proxyModel->deleteLater();
+    m_proxyModel = 0;
+    m_dolphinModel->deleteLater();
     m_dolphinModel = 0;
     m_dirLister = 0; // deleted by m_dolphinModel
 }