Merge branch 'master' into frameworks

[dolphin.git] / src / dolphintabpage.h

diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index 278524792cac13f7df95adea962a74aa47380630..b46daf350c115df7c30b3978c3eeebf8501fa033 100644 (file)
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -22,7 +22,7 @@
 
 #include <QWidget>
 #include <QPointer>
-#include <KUrl>
+#include <QUrl>
 
 class QSplitter;
 class DolphinViewContainer;
@@ -33,7 +33,7 @@ class DolphinTabPage : public QWidget
     Q_OBJECT
 
 public:
-    explicit DolphinTabPage(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl(), QWidget* parent = 0);
+    explicit DolphinTabPage(const QUrl& primaryUrl, const QUrl& secondaryUrl = QUrl(), QWidget* parent = 0);
 
     /**
      * @return True if primary view is the active view in this tab.
@@ -85,13 +85,13 @@ public:
      * gets selected if no loading of a directory has been triggered
      * by DolphinView::setUrl() or DolphinView::reload().
      */
-    void markUrlsAsSelected(const QList<KUrl>& urls);
+    void markUrlsAsSelected(const QList<QUrl> &urls);
 
     /**
      * Marks the item indicated by \p url to be scrolled to and as the
      * current item after directory DolphinView::url() has been loaded.
      */
-    void markUrlAsCurrent(const KUrl& url);
+    void markUrlAsCurrent(const QUrl& url);
 
     /**
      * Sets the places selector visible, if \a visible is true.
@@ -120,9 +120,18 @@ 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(DolphinViewContainer* viewContainer);
-    void activeViewUrlChanged(const KUrl& url);
+    void activeViewUrlChanged(const QUrl& url);
 
 private slots:
     /**
@@ -133,11 +142,18 @@ private slots:
      */
     void slotViewActivated();
 
+    /**
+     * Handles the view url redirection event.
+     *
+     * It emits the activeViewUrlChanged signal with the url \a newUrl.
+     */
+    void slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl);
+
 private:
     /**
      * Creates a new view container and does the default initialization.
      */
-    DolphinViewContainer* createViewContainer(const KUrl& url) const;
+    DolphinViewContainer* createViewContainer(const QUrl& url) const;
 
 private:
     QSplitter* m_splitter;