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

[dolphin.git] / src / dolphintabpage.h

diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index 45c540775fe127c73dc3d2c61b90862367d9901f..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
 
 #ifndef DOLPHIN_TAB_PAGE_H
 #define DOLPHIN_TAB_PAGE_H
 

-#include <QWidget>

 #include <QPointer>
 #include <QUrl>
 #include <QPointer>
 #include <QUrl>

+#include <QWidget>

 
 class QSplitter;
 class DolphinViewContainer;
 
 class QSplitter;
 class DolphinViewContainer;


@@ -33,7 +33,7 @@ class DolphinTabPage : public QWidget
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    explicit DolphinTabPage(const QUrl& primaryUrl, const QUrl& secondaryUrl = QUrl(), 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.
 
     /**
      * @return True if primary view is the active view in this tab.


@@ -53,12 +53,12 @@ public:
     void setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl = QUrl());
 
     /**
     void setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl = QUrl());
 
     /**

-     * @return The primary view containter.
+     * @return The primary view container.

      */
     DolphinViewContainer* primaryViewContainer() const;
 
     /**
      */
     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;
 
      */
     DolphinViewContainer* secondaryViewContainer() const;
 


@@ -127,7 +127,7 @@ public:
      * @deprecated The first tab state version has no version number, we keep
      *             this method to restore old states (<= Dolphin 4.14.x).
      */
      * @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
 
     /**
      * Set whether the tab page is active