Merge pull request #3734 from ngosang/rss_sidebar

Fix RSS panel position not saved. Closes #3732

src/core/preferences.cpp

@@ -2208,36 +2208,36 @@ void Preferences::setRssOpenFolders(const QStringList &folders)
 QByteArray Preferences::getRssHSplitterState() const
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    return value("rss/qt5/splitter_h").toByteArray();
+    return value("Rss/qt5/splitter_h").toByteArray();
 #else
-    return value("rss/splitter_h").toByteArray();
+    return value("Rss/splitter_h").toByteArray();
 #endif
 }
 
 void Preferences::setRssHSplitterState(const QByteArray &state)
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    setValue("rss/qt5/splitter_h", state);
+    setValue("Rss/qt5/splitter_h", state);
 #else
-    setValue("rss/splitter_h", state);
+    setValue("Rss/splitter_h", state);
 #endif
 }
 
 QByteArray Preferences::getRssVSplitterState() const
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    return value("rss/qt5/splitter_v").toByteArray();
+    return value("Rss/qt5/splitter_v").toByteArray();
 #else
-    return value("rss/splitter_v").toByteArray();
+    return value("Rss/splitter_v").toByteArray();
 #endif
 }
 
 void Preferences::setRssVSplitterState(const QByteArray &state)
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    setValue("rss/qt5/splitter_v", state);
+    setValue("Rss/qt5/splitter_v", state);
 #else
-    setValue("rss/splitter_v", state);
+    setValue("Rss/splitter_v", state);
 #endif
 }
 

src/gui/rss/rss_imp.cpp

@@ -635,11 +635,11 @@ void RSSImp::saveSlidersPosition()
 void RSSImp::restoreSlidersPosition()
 {
     const Preferences* const pref = Preferences::instance();
-    QByteArray pos_h = pref->getRssHSplitterState();
-    if (!pos_h.isNull())
+    const QByteArray pos_h = pref->getRssHSplitterState();
+    if (!pos_h.isEmpty())
         splitter_h->restoreState(pos_h);
-    QByteArray pos_v = pref->getRssVSplitterState();
-    if (!pos_v.isNull())
+    const QByteArray pos_v = pref->getRssVSplitterState();
+    if (!pos_v.isEmpty())
         splitter_v->restoreState(pos_v);
 }