Indicate the shown directory of a column by QStyle::PE_FrameFocusRect instead of...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 2fb7565f16dcada44d33e29f6399b299fc96e818..45490e363bc06322333cc2c578778e5413b5faec 100644 (file)
--- 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
@@ -245,10 +238,12 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         const KUrl url = m_searchBox->searchPath();
-        if (url.isValid() && !url.isEmpty() && !isSearchUrl(url)) {
-            m_urlNavigator->setLocationUrl(url);
-        } else {
-            m_urlNavigator->goHome();
+        if (url.isValid() && !url.isEmpty()) {
+            if (isSearchUrl(url)) {
+                m_urlNavigator->goHome();
+            } else {
+                m_urlNavigator->setLocationUrl(url);
+            }
         }
     }
 }