fixed memory leaks (thanks to David for fixing this in KDirOperator)

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index bc692ee1b007f3480d482c57bdde8c23fa44e320..a559e3098b0b9d8b5ef6dcd7271b9b9043b0e7fe 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -127,8 +127,9 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
 
 DolphinColumnWidget::~DolphinColumnWidget()
 {
-    delete m_dirLister;
-    m_dirLister = 0;
+    delete m_dolphinModel;
+    m_dolphinModel = 0;
+    m_dirLister = 0; // deleted by m_dolphinModel
 }
 
 void DolphinColumnWidget::setDecorationSize(const QSize& size)

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 26b4920e9b1b9919cf85e2daae045675a7b33fb3..99c76bee261327f64f047d0d005415406d59612a 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -158,8 +158,9 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 
 DolphinViewContainer::~DolphinViewContainer()
 {
-    delete m_dirLister;
-    m_dirLister = 0;
+    delete m_dolphinModel;
+    m_dolphinModel = 0;
+    m_dirLister = 0; // deleted by m_dolphinModel
 }
 
 void DolphinViewContainer::setUrl(const KUrl& url)

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 8894f8a88005fe22dcb2b02168787e4f0203b12a..accfc598860b0e8618e65ee30caa13a77cbd7da6 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -48,8 +48,9 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
-    delete m_dirLister;
-    m_dirLister = 0;
+    delete m_dolphinModel;
+    m_dolphinModel = 0;
+    m_dirLister = 0; // deleted by m_dolphinModel
 }
 
 QSize TreeViewSidebarPage::sizeHint() const