diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp index 03dc658b4..e209f57df 100644 --- a/src/librssguard/services/abstract/serviceroot.cpp +++ b/src/librssguard/services/abstract/serviceroot.cpp @@ -124,20 +124,20 @@ void ServiceRoot::updateCounts(bool including_total_count) { void ServiceRoot::completelyRemoveAllData() { // Purge old data from SQL and clean all model items. - removeOldFeedTree(true); - cleanAllItems(); + removeOldAccountFromDatabase(true); + cleanAllItemsFromModel(); updateCounts(true); itemChanged(QList() << this); requestReloadMessageList(true); } -void ServiceRoot::removeOldFeedTree(bool including_messages) { +void ServiceRoot::removeOldAccountFromDatabase(bool including_messages) { QSqlDatabase database = qApp->database()->connection(metaObject()->className()); DatabaseQueries::deleteAccountData(database, accountId(), including_messages); } -void ServiceRoot::cleanAllItems() { +void ServiceRoot::cleanAllItemsFromModel() { for (RootItem* top_level_item : childItems()) { if (top_level_item->kind() != RootItemKind::Bin && top_level_item->kind() != RootItemKind::Important) { requestItemRemoval(top_level_item); @@ -301,8 +301,8 @@ void ServiceRoot::syncIn() { QMap feed_custom_data = storeCustomFeedsData(); // Remove from feeds model, then from SQL but leave messages intact. - cleanAllItems(); - removeOldFeedTree(false); + cleanAllItemsFromModel(); + removeOldAccountFromDatabase(false); restoreCustomFeedsData(feed_custom_data, new_tree->getHashedSubTreeFeeds()); // Model is clean, now store new tree into DB and diff --git a/src/librssguard/services/abstract/serviceroot.h b/src/librssguard/services/abstract/serviceroot.h index 631254a38..3117cf907 100644 --- a/src/librssguard/services/abstract/serviceroot.h +++ b/src/librssguard/services/abstract/serviceroot.h @@ -164,9 +164,9 @@ class ServiceRoot : public RootItem { // Removes all messages/categories/feeds which are // associated with this account. - void removeOldFeedTree(bool including_messages); + void removeOldAccountFromDatabase(bool including_messages); void storeNewFeedTree(RootItem* root); - void cleanAllItems(); + void cleanAllItemsFromModel(); // Removes messages which do not belong to any // existing feed.