Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinmainwindow.h
	dolphin/src/dolphinrecenttabsmenu.cpp
	dolphin/src/dolphinviewcontainer.cpp
	kfind/CMakeLists.txt

1 files changed, 17 insertions, 1 deletions

diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index 95c02ed0a..2a406f4a9 100644
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -120,8 +120,17 @@ public:
      */
     void restoreState(const QByteArray& state);
 
+    /**
+     * Restores all tab related properties (urls, splitter layout, ...) from
+     * the given \a state.
+     *
+     * @deprecated The first tab state version has no version number, we keep
+     *             this method to restore old states (<= Dolphin 4.14.x).
+     */
+    void restoreStateV1(const QByteArray& state);
+
 signals:
-    void activeViewChanged();
+    void activeViewChanged(DolphinViewContainer* viewContainer);
     void activeViewUrlChanged(const KUrl& url);
 
 private slots:
@@ -133,6 +142,13 @@ private slots:
      */
     void slotViewActivated();
 
+    /**
+     * Handles the view url redirection event.
+     *
+     * It emits the activeViewUrlChanged signal with the url \a newUrl.
+     */
+    void slotViewUrlRedirection(const KUrl& oldUrl, const KUrl& newUrl);
+
 private:
     /**
      * Creates a new view container and does the default initialization.