Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / dolphintabpage.h

diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index 2a406f4a9a065687eff0d07ff6d15de421d752af..6e3e008accf40af4d4c25dfd615353a9574a83ad 100644 (file)
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -20,9 +20,9 @@
 #ifndef DOLPHIN_TAB_PAGE_H
 #define DOLPHIN_TAB_PAGE_H
 
-#include <QWidget>
 #include <QPointer>
-#include <KUrl>
+#include <QUrl>
+#include <QWidget>
 
 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 = nullptr);
 
     /**
      * @return True if primary view is the active view in this tab.
@@ -50,15 +50,15 @@ public:
      *
      * If \a enabled is true, it creates a secondary view with the url of the primary view.
      */
-    void setSplitViewEnabled(bool enabled);
+    void setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl = QUrl());
 
     /**
-     * @return The primary view containter.
+     * @return The primary view container.
      */
     DolphinViewContainer* primaryViewContainer() const;
 
     /**
-     * @return The secondary view containter, can be 0 if split view is disabled.
+     * @return The secondary view container, can be 0 if split view is disabled.
      */
     DolphinViewContainer* secondaryViewContainer() const;
 
@@ -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.
@@ -127,11 +127,17 @@ public:
      * @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);
+    Q_DECL_DEPRECATED void restoreStateV1(const QByteArray& state);
+
+    /**
+     * Set whether the tab page is active
+     *
+     */
+    void setActive(bool active);
 
 signals:
     void activeViewChanged(DolphinViewContainer* viewContainer);
-    void activeViewUrlChanged(const KUrl& url);
+    void activeViewUrlChanged(const QUrl& url);
 
 private slots:
     /**
@@ -147,13 +153,15 @@ private slots:
      *
      * It emits the activeViewUrlChanged signal with the url \a newUrl.
      */
-    void slotViewUrlRedirection(const KUrl& oldUrl, const KUrl& newUrl);
+    void slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl);
+
+    void switchActiveView();
 
 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;
@@ -163,6 +171,7 @@ private:
 
     bool m_primaryViewActive;
     bool m_splitViewEnabled;
+    bool m_active;
 };
 
 #endif // DOLPHIN_TAB_PAGE_H