From 41b0e4297313b6549f9178c77c30101a42b0525f Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sat, 18 Feb 2017 20:34:02 +0100 Subject: Restore the view state after the URL of the DolphinView has been changed, as stated in the documentation of KUrlNavigator::saveLocationState. The historyChanged signal of the KUrlNavigator is emitted before the urlChanged signal and so the view state restoring happens before the view URL has been changed. This makes it impossible to save and restore the selected URLs, because DolphinView::setUrl clears the list of selected items (which has been restored right before). This changes removes the history changed slot and restores the view state after the setUrl call. --- src/views/dolphinview.cpp | 1 - src/views/dolphinview.h | 7 ------- 2 files changed, 8 deletions(-) (limited to 'src/views') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 9728e58c3..c7267cee0 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -585,7 +585,6 @@ void DolphinView::setUrl(const QUrl& url) clearSelection(); - emit urlAboutToBeChanged(url); m_url = url; hideToolTip(); diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index fbe3a6376..5e69fd37b 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -378,13 +378,6 @@ signals: */ void activated(); - /** - * Is emitted if the URL of the view will be changed to \a url. - * After the URL has been changed the signal urlChanged() will - * be emitted. - */ - void urlAboutToBeChanged(const QUrl& url); - /** Is emitted if the URL of the view has been changed to \a url. */ void urlChanged(const QUrl& url); -- cgit v1.3