Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 95254af3510064bc7c15a3c3cda763063ab0fa3d..0e413bc61e1ca77d7c1a0b09e257f25e70438007 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -106,6 +106,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
     m_view = new DolphinView(url, this);
     connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_urlNavigator, SLOT(setUrl(KUrl)));
+    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_messageWidget, SLOT(hide()));
     connect(m_view, SIGNAL(writeStateChanged(bool)),            this, SIGNAL(writeStateChanged(bool)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),         this, SLOT(showItemInfo(KFileItem)));
     connect(m_view, SIGNAL(itemActivated(KFileItem)),           this, SLOT(slotItemActivated(KFileItem)));
@@ -159,7 +160,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
     connect(m_filterBar, SIGNAL(focusViewRequest()),
-            this, SLOT(focusView()));
+            this, SLOT(requestFocus()));
     connect(m_view, SIGNAL(urlChanged(KUrl)),
             m_filterBar, SLOT(clear()));
 
@@ -386,12 +387,6 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
     }
 }
 
-void DolphinViewContainer::focusView()
-{
-    Q_ASSERT(m_view);
-    m_view->setFocus();
-}
-
 void DolphinViewContainer::delayedStatusBarUpdate()
 {
     if (m_statusBarTimer->isActive() && (m_statusBarTimestamp.elapsed() > 2000)) {