From e58f4c0bdf0f10c8b7d5f94f353ce8fd1dbafaa3 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (qlassez)" Date: Wed, 9 Aug 2017 20:49:59 +0300 Subject: [PATCH] Remove legacy RSS settings after converting Closes #7226. --- src/base/rss/rss_session.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp index d9a1329da..16aaa87c0 100644 --- a/src/base/rss/rss_session.cpp +++ b/src/base/rss/rss_session.cpp @@ -295,6 +295,20 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder) void Session::loadLegacy() { + struct LegacySettingsDeleter + { + ~LegacySettingsDeleter() + { + auto settingsStorage = SettingsStorage::instance(); + settingsStorage->removeValue("Rss/streamList"); + settingsStorage->removeValue("Rss/streamAlias"); + settingsStorage->removeValue("Rss/open_folders"); + settingsStorage->removeValue("Rss/qt5/splitter_h"); + settingsStorage->removeValue("Rss/qt5/splitterMain"); + settingsStorage->removeValue("Rss/hosts_cookies"); + } + } legacySettingsDeleter; + const QStringList legacyFeedPaths = SettingsStorage::instance()->loadValue("Rss/streamList").toStringList(); const QStringList feedAliases = SettingsStorage::instance()->loadValue("Rss/streamAlias").toStringList(); if (legacyFeedPaths.size() != feedAliases.size()) {