From 26a15eb88e209322ef3910a80c056502400c9bf5 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 8 Dec 2007 23:05:32 +0000 Subject: [PATCH] Follow David's advice and use 'delete' instead of 'deleteLater()'. Disconnecting the signals from KDirLister solves a previous crash. CCMAIL: faure@kde.org svn path=/trunk/KDE/kdebase/apps/; revision=746428 --- src/dolphincolumnwidget.cpp | 4 ++-- src/dolphinviewcontainer.cpp | 6 ++++-- src/treeviewsidebarpage.cpp | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index 2e94f8341..ad18f03bb 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -127,9 +127,9 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, DolphinColumnWidget::~DolphinColumnWidget() { - m_proxyModel->deleteLater(); + delete m_proxyModel; m_proxyModel = 0; - m_dolphinModel->deleteLater(); + delete m_dolphinModel; m_dolphinModel = 0; m_dirLister = 0; // deleted by m_dolphinModel } diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 9fc089e19..764bc3ca1 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -158,9 +158,11 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, DolphinViewContainer::~DolphinViewContainer() { - m_proxyModel->deleteLater(); + m_dirLister->disconnect(); + + delete m_proxyModel; m_proxyModel = 0; - m_dolphinModel->deleteLater(); + delete m_dolphinModel; m_dolphinModel = 0; m_dirLister = 0; // deleted by m_dolphinModel } diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 3e21d6baa..37b8c5246 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -48,9 +48,9 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : TreeViewSidebarPage::~TreeViewSidebarPage() { - m_proxyModel->deleteLater(); + delete m_proxyModel; m_proxyModel = 0; - m_dolphinModel->deleteLater(); + delete m_dolphinModel; m_dolphinModel = 0; m_dirLister = 0; // deleted by m_dolphinModel } -- 2.47.3