changes saveState() and restoreState() to restore renamed tabs (if any)

[dolphin.git] / src / dolphintabpage.cpp

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index a01e1e1a84ee5ef183a523acd86f45a1efbae2aa..7199bcbf3f9b96d3be236d02943ab6b09872466d 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -13,7 +13,6 @@
 #include <QGridLayout>
 #include <QStyle>
 #include <QVariantAnimation>
-
 DolphinTabPage::DolphinTabPage(const QUrl &primaryUrl, const QUrl &secondaryUrl, QWidget *parent)
     : QWidget(parent)
     , m_expandingContainer{nullptr}
@@ -275,6 +274,10 @@ QByteArray DolphinTabPage::saveState() const
     stream << m_primaryViewActive;
     stream << m_splitter->saveState();
 
+    if (!m_title.isEmpty()) {
+        stream << m_title;
+    }
+
     return state;
 }
 
@@ -328,6 +331,12 @@ void DolphinTabPage::restoreState(const QByteArray &state)
     QByteArray splitterState;
     stream >> splitterState;
     m_splitter->restoreState(splitterState);
+
+    if (!stream.atEnd()) {
+        QString tabTitle;
+        stream >> tabTitle;
+        setTitle(tabTitle);
+    }
 }
 
 void DolphinTabPage::setActive(bool active)
@@ -344,10 +353,10 @@ void DolphinTabPage::setActive(bool active)
 
 void DolphinTabPage::setTitle(const QString &name)
 {
-    m_title = QString(name);
+    m_title = name;
 }
 
-QString DolphinTabPage::title()
+QString DolphinTabPage::title() const
 {
     return m_title;
 }