From cc8a5c282288f1d840fcefba9753152f56e6ce4c Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 19 Jan 2016 13:39:09 +0100 Subject: [PATCH] Refactoring, removed some unused methods also. --- src/core/feedsmodel.cpp | 12 +-- src/core/feedsmodel.h | 6 -- src/services/abstract/serviceroot.cpp | 79 +++++++++++++++++ src/services/abstract/serviceroot.h | 16 ++-- src/services/standard/standardserviceroot.cpp | 84 ------------------- src/services/standard/standardserviceroot.h | 16 ---- src/services/tt-rss/ttrssserviceroot.cpp | 59 +------------ src/services/tt-rss/ttrssserviceroot.h | 10 --- 8 files changed, 90 insertions(+), 192 deletions(-) diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 845c632b5..59361c98a 100755 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -521,7 +521,7 @@ StandardServiceRoot *FeedsModel::standardServiceRoot() const { QList FeedsModel::feedsForScheduledUpdate(bool auto_update_now) { QList feeds_for_update; - foreach (Feed *feed, allFeeds()) { + foreach (Feed *feed, m_rootItem->getSubTreeFeeds()) { switch (feed->autoUpdateType()) { case Feed::DontAutoUpdate: // Do not auto-update this feed ever. @@ -602,7 +602,7 @@ QModelIndex FeedsModel::indexForItem(const RootItem *item) const { } bool FeedsModel::hasAnyFeedNewMessages() const { - foreach (const Feed *feed, allFeeds()) { + foreach (const Feed *feed, m_rootItem->getSubTreeFeeds()) { if (feed->status() == Feed::NewMessages) { return true; } @@ -733,11 +733,3 @@ bool FeedsModel::markItemRead(RootItem *item, RootItem::ReadStatus read) { bool FeedsModel::markItemCleared(RootItem *item, bool clean_read_only) { return item->cleanMessages(clean_read_only); } - -QList FeedsModel::allFeeds() const { - return m_rootItem->getSubTreeFeeds(); -} - -QList FeedsModel::allCategories() const { - return m_rootItem->getSubTreeCategories(); -} diff --git a/src/core/feedsmodel.h b/src/core/feedsmodel.h index a82be8e1f..50ec6235c 100755 --- a/src/core/feedsmodel.h +++ b/src/core/feedsmodel.h @@ -104,12 +104,6 @@ class FeedsModel : public QAbstractItemModel { // in "newspaper" mode. QList messagesForItem(RootItem *item) const; - // Returns list of all categories contained in the model. - QList allCategories() const; - - // Returns list of all feeds contained in the model. - QList allFeeds() const; - // Returns ALL RECURSIVE CHILD feeds contained within single index. QList feedsForIndex(const QModelIndex &index) const; diff --git a/src/services/abstract/serviceroot.cpp b/src/services/abstract/serviceroot.cpp index 58612d52e..90a42bbeb 100755 --- a/src/services/abstract/serviceroot.cpp +++ b/src/services/abstract/serviceroot.cpp @@ -21,6 +21,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/textfactory.h" #include "services/abstract/category.h" +#include "services/abstract/recyclebin.h" #include #include @@ -142,6 +143,84 @@ void ServiceRoot::setAccountId(int account_id) { m_accountId = account_id; } +bool ServiceRoot::onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { + Q_UNUSED(messages) + Q_UNUSED(read) + Q_UNUSED(selected_item) + + return true; +} + +bool ServiceRoot::onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { + Q_UNUSED(messages) + Q_UNUSED(read) + + selected_item->updateCounts(false); + itemChanged(QList() << selected_item); + return true; +} + +bool ServiceRoot::onBeforeSwitchMessageImportance(RootItem *selected_item, const QList > &changes) { + Q_UNUSED(selected_item) + Q_UNUSED(changes) + + return true; +} + +bool ServiceRoot::onAfterSwitchMessageImportance(RootItem *selected_item, const QList > &changes) { + Q_UNUSED(selected_item) + Q_UNUSED(changes) + + return true; +} + +bool ServiceRoot::onBeforeMessagesDelete(RootItem *selected_item, const QList &messages) { + Q_UNUSED(selected_item) + Q_UNUSED(messages) + + return true; +} + +bool ServiceRoot::onAfterMessagesDelete(RootItem *selected_item, const QList &messages) { + Q_UNUSED(messages) + + // User deleted some messages he selected in message list. + selected_item->updateCounts(true); + + RecycleBin *bin = recycleBin(); + + if (selected_item->kind() == RootItemKind::Bin) { + itemChanged(QList() << bin); + } + else { + if (bin != NULL) { + bin->updateCounts(true); + itemChanged(QList() << selected_item << bin); + } + else { + itemChanged(QList() << selected_item); + } + } + + return true; +} + +bool ServiceRoot::onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { + Q_UNUSED(selected_item) + Q_UNUSED(messages) + + return true; +} + +bool ServiceRoot::onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { + Q_UNUSED(selected_item) + Q_UNUSED(messages) + + updateCounts(true); + itemChanged(getSubTree()); + return true; +} + void ServiceRoot::assembleFeeds(Assignment feeds) { QHash categories = getHashedSubTreeCategories(); diff --git a/src/services/abstract/serviceroot.h b/src/services/abstract/serviceroot.h index a474897f5..ce32ab2a0 100755 --- a/src/services/abstract/serviceroot.h +++ b/src/services/abstract/serviceroot.h @@ -103,7 +103,7 @@ class ServiceRoot : public RootItem { // some ONLINE service or something. // // "read" is status which is ABOUT TO BE SET. - virtual bool onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read) = 0; + virtual bool onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); // Called AFTER this read status update (triggered by user in message list) is stored in DB, // when false is returned, change is aborted. @@ -111,7 +111,7 @@ class ServiceRoot : public RootItem { // which items are actually changed. // // "read" is status which is ABOUT TO BE SET. - virtual bool onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read) = 0; + virtual bool onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); // Called BEFORE this importance switch update is stored in DB, // when false is returned, change is aborted. @@ -119,7 +119,7 @@ class ServiceRoot : public RootItem { // some ONLINE service or something. // // "changes" - list of pairs - - virtual bool onBeforeSwitchMessageImportance(RootItem *selected_item, const QList > &changes) = 0; + virtual bool onBeforeSwitchMessageImportance(RootItem *selected_item, const QList > &changes); // Called AFTER this importance switch update is stored in DB, // when false is returned, change is aborted. @@ -127,25 +127,25 @@ class ServiceRoot : public RootItem { // which items are actually changed. // // "changes" - list of pairs - - virtual bool onAfterSwitchMessageImportance(RootItem *selected_item, const QList > &changes) = 0; + virtual bool onAfterSwitchMessageImportance(RootItem *selected_item, const QList > &changes); // Called BEFORE the list of messages is about to be deleted // by the user from message list. - virtual bool onBeforeMessagesDelete(RootItem *selected_item, const QList &messages) = 0; + virtual bool onBeforeMessagesDelete(RootItem *selected_item, const QList &messages); // Called AFTER the list of messages was deleted // by the user from message list. - virtual bool onAfterMessagesDelete(RootItem *selected_item, const QList &messages) = 0; + virtual bool onAfterMessagesDelete(RootItem *selected_item, const QList &messages); // Called BEFORE the list of messages is about to be restored from recycle bin // by the user from message list. // Selected item is naturally recycle bin. - virtual bool onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) = 0; + virtual bool onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages); // Called AFTER the list of messages was restored from recycle bin // by the user from message list. // Selected item is naturally recycle bin. - virtual bool onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) = 0; + virtual bool onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages); ///////////////////////////////////////// // Members to override. */ diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index 351abf8be..9357a730c 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -310,17 +310,6 @@ void StandardServiceRoot::checkArgumentForFeedAdding(const QString &argument) { } } -QList StandardServiceRoot::allCategories() { - QList cats = getSubTreeCategories(); - QList std_cats; - - foreach (Category *category, cats) { - std_cats.append(qobject_cast(category)); - } - - return std_cats; -} - QList StandardServiceRoot::getContextMenuForFeed(StandardFeed *feed) { if (m_feedContextMenu.isEmpty()) { // Initialize. @@ -484,76 +473,3 @@ bool StandardServiceRoot::loadMessagesForItem(RootItem *item, QSqlTableModel *mo return true; } - -bool StandardServiceRoot::onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { - Q_UNUSED(messages) - Q_UNUSED(read) - Q_UNUSED(selected_item) - - return true; -} - -bool StandardServiceRoot::onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { - Q_UNUSED(messages) - Q_UNUSED(read) - - selected_item->updateCounts(false); - itemChanged(QList() << selected_item); - return true; -} - -bool StandardServiceRoot::onBeforeSwitchMessageImportance(RootItem *selected_item, - const QList > &changes) { - Q_UNUSED(selected_item) - Q_UNUSED(changes) - - return true; -} - -bool StandardServiceRoot::onAfterSwitchMessageImportance(RootItem *selected_item, - const QList > &changes) { - Q_UNUSED(selected_item) - Q_UNUSED(changes) - - return true; -} - -bool StandardServiceRoot::onBeforeMessagesDelete(RootItem *selected_item, const QList &messages) { - Q_UNUSED(selected_item) - Q_UNUSED(messages) - - return true; -} - -bool StandardServiceRoot::onAfterMessagesDelete(RootItem *selected_item, const QList &messages) { - Q_UNUSED(messages) - - // User deleted some messages he selected in message list. - selected_item->updateCounts(true); - - if (selected_item->kind() == RootItemKind::Bin) { - itemChanged(QList() << m_recycleBin); - } - else { - m_recycleBin->updateCounts(true); - itemChanged(QList() << selected_item << m_recycleBin); - } - - return true; -} - -bool StandardServiceRoot::onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { - Q_UNUSED(selected_item) - Q_UNUSED(messages) - - return true; -} - -bool StandardServiceRoot::onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { - Q_UNUSED(selected_item) - Q_UNUSED(messages) - - updateCounts(true); - itemChanged(getSubTree()); - return true; -} diff --git a/src/services/standard/standardserviceroot.h b/src/services/standard/standardserviceroot.h index 632a8f82c..f1f6ac27e 100755 --- a/src/services/standard/standardserviceroot.h +++ b/src/services/standard/standardserviceroot.h @@ -70,22 +70,6 @@ class StandardServiceRoot : public ServiceRoot { // Message stuff. bool loadMessagesForItem(RootItem *item, QSqlTableModel *model); - bool onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); - bool onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); - - bool onBeforeSwitchMessageImportance(RootItem *selected_item, const QList > &changes); - bool onAfterSwitchMessageImportance(RootItem *selected_item, const QList > &changes); - - bool onBeforeMessagesDelete(RootItem *selected_item, const QList &messages); - bool onAfterMessagesDelete(RootItem *selected_item, const QList &messages); - - bool onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages); - bool onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages); - - // Returns all categories from this root, each pair - // consists of ID of parent item and pointer to category. - QList allCategories(); - // Returns context specific menu actions for given feed. QList getContextMenuForFeed(StandardFeed *feed); diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index 9fd29a815..20a09469e 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -198,8 +198,7 @@ QList TtRssServiceRoot::contextMenu() { return serviceMenu(); } -bool TtRssServiceRoot::onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, - RootItem::ReadStatus read) { +bool TtRssServiceRoot::onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { Q_UNUSED(selected_item) TtRssUpdateArticleResponse response = m_network->updateArticles(customIDsOfMessages(messages), @@ -216,15 +215,6 @@ bool TtRssServiceRoot::onBeforeSetMessagesRead(RootItem *selected_item, const QL } } -bool TtRssServiceRoot::onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, RootItem::ReadStatus read) { - Q_UNUSED(messages) - Q_UNUSED(read) - - selected_item->updateCounts(false); - itemChanged(QList() << selected_item); - return true; -} - bool TtRssServiceRoot::onBeforeSwitchMessageImportance(RootItem *selected_item, const QList > &changes) { Q_UNUSED(selected_item) @@ -243,53 +233,6 @@ bool TtRssServiceRoot::onBeforeSwitchMessageImportance(RootItem *selected_item, } } -bool TtRssServiceRoot::onAfterSwitchMessageImportance(RootItem *selected_item, const QList > &changes) { - Q_UNUSED(selected_item) - Q_UNUSED(changes) - - return true; -} - -bool TtRssServiceRoot::onBeforeMessagesDelete(RootItem *selected_item, const QList &messages) { - Q_UNUSED(selected_item) - Q_UNUSED(messages) - - return true; -} - -bool TtRssServiceRoot::onAfterMessagesDelete(RootItem *selected_item, const QList &messages) { - Q_UNUSED(messages) - - // User deleted some messages he selected in message list. - selected_item->updateCounts(true); - - if (selected_item->kind() == RootItemKind::Bin) { - itemChanged(QList() << m_recycleBin); - } - else { - m_recycleBin->updateCounts(true); - itemChanged(QList() << selected_item << m_recycleBin); - } - - return true; -} - -bool TtRssServiceRoot::onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { - Q_UNUSED(selected_item) - Q_UNUSED(messages) - - return true; -} - -bool TtRssServiceRoot::onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages) { - Q_UNUSED(selected_item) - Q_UNUSED(messages) - - updateCounts(true); - itemChanged(getSubTree()); - return true; -} - TtRssNetworkFactory *TtRssServiceRoot::network() const { return m_network; } diff --git a/src/services/tt-rss/ttrssserviceroot.h b/src/services/tt-rss/ttrssserviceroot.h index 68e394f70..7a2b9e2af 100755 --- a/src/services/tt-rss/ttrssserviceroot.h +++ b/src/services/tt-rss/ttrssserviceroot.h @@ -59,18 +59,8 @@ class TtRssServiceRoot : public ServiceRoot { RecycleBin *recycleBin() const; bool loadMessagesForItem(RootItem *item, QSqlTableModel *model); - bool onBeforeSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); - bool onAfterSetMessagesRead(RootItem *selected_item, const QList &messages, ReadStatus read); - bool onBeforeSwitchMessageImportance(RootItem *selected_item, const QList > &changes); - bool onAfterSwitchMessageImportance(RootItem *selected_item, const QList > &changes); - - bool onBeforeMessagesDelete(RootItem *selected_item, const QList &messages); - bool onAfterMessagesDelete(RootItem *selected_item, const QList &messages); - - bool onBeforeMessagesRestoredFromBin(RootItem *selected_item, const QList &messages); - bool onAfterMessagesRestoredFromBin(RootItem *selected_item, const QList &messages); // Access to network. TtRssNetworkFactory *network() const;