Follow David's advice and use 'delete' instead of 'deleteLater()'. Disconnecting...

CCMAIL: faure@kde.org

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 2e94f8341d5cc1ba508344f85bdfbe74a94d8af7..ad18f03bb8ac0b4f5b03f673a4501bbec58beacb 100644 (file)
--- 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 9fc089e190e817566dec24cc38d21c1708805cb7..764bc3ca1833f8c96bd8e1d11207e254338210aa 100644 (file)
--- 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 3e21d6baa20247b2fe037e8af68b69a504f65814..37b8c5246e95d86482310d54eaa060c68ac004e3 100644 (file)
--- 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
 }