From 55739979a8e1ba2828345b57e97a65e364a4a461 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 17 Sep 2010 11:24:06 +0000 Subject: KDirModel takes ownership of the directory lister, so don't delete the directory lister manually. BUG: 196681 svn path=/trunk/KDE/kdebase/apps/; revision=1176325 --- src/dolphinviewcontainer.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/dolphinviewcontainer.cpp') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 380c27692..45490e363 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -109,7 +109,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_dirLister->setDelayedMimeTypes(true); m_dolphinModel = new DolphinModel(this); - m_dolphinModel->setDirLister(m_dirLister); + m_dolphinModel->setDirLister(m_dirLister); // m_dolphinModel takes ownership of m_dirLister m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); m_proxyModel = new DolphinSortFilterProxyModel(this); @@ -191,13 +191,6 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : DolphinViewContainer::~DolphinViewContainer() { - m_dirLister->disconnect(); - - delete m_proxyModel; - m_proxyModel = 0; - delete m_dolphinModel; - m_dolphinModel = 0; - m_dirLister = 0; // deleted by m_dolphinModel } KUrl DolphinViewContainer::url() const -- cgit v1.3