From: Peter Penz <peter.penz19@gmail.com>
Date: Sat, 8 Dec 2007 16:16:45 +0000 (+0000)
Subject: fixed memory leaks (thanks to David for fixing this in KDirOperator)
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/54dfdc930a5511eae2b15f3e87e5d1cd425bdbe4

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 bc692ee1b..a559e3098 100644
--- 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 26b4920e9..99c76bee2 100644
--- 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 8894f8a88..accfc5988 100644
--- 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