From: Peter Penz <peter.penz19@gmail.com>
Date: Sat, 8 Dec 2007 22:42:13 +0000 (+0000)
Subject: don't forget to delete the proxy model
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/3a2a6011e89d484c583fa4b1c2dd1d78a9bb0d7a?ds=inline

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 a559e3098..2e94f8341 100644
--- 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 99c76bee2..9fc089e19 100644
--- 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 accfc5988..3e21d6baa 100644
--- 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
 }