From 3a2a6011e89d484c583fa4b1c2dd1d78a9bb0d7a Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 8 Dec 2007 22:42:13 +0000 Subject: [PATCH] don't forget to delete the proxy model svn path=/trunk/KDE/kdebase/apps/; revision=746418 --- src/dolphincolumnwidget.cpp | 4 +++- src/dolphinviewcontainer.cpp | 4 +++- src/treeviewsidebarpage.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) 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 } -- 2.47.3