Refactored some common code from categories/feeds classes.

src/services/abstract/category.cpp

@@ -20,6 +20,7 @@
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/databasequeries.h"
+#include "services/abstract/cacheforserviceroot.h"
 #include "services/abstract/feed.h"
 #include "services/abstract/serviceroot.h"
 
@@ -70,3 +71,14 @@ void Category::updateCounts(bool including_total_count) {
 bool Category::cleanMessages(bool clean_read_only) {
   return getParentServiceRoot()->cleanFeeds(getSubTreeFeeds(), clean_read_only);
 }
+
+bool Category::markAsReadUnread(RootItem::ReadStatus status) {
+  ServiceRoot* service = getParentServiceRoot();
+  CacheForServiceRoot* cache = dynamic_cast<CacheForServiceRoot*>(service);
+
+  if (cache != nullptr) {
+    cache->addMessageStatesToCache(service->customIDSOfMessagesForItem(this), status);
+  }
+
+  return service->markFeedsReadUnread(getSubTreeFeeds(), status);
+}

src/services/abstract/category.h

@@ -30,6 +30,7 @@ class Category : public RootItem {
 
     void updateCounts(bool including_total_count);
     bool cleanMessages(bool clean_read_only);
+    bool markAsReadUnread(ReadStatus status);
 };
 
 #endif // CATEGORY_H

src/services/abstract/feed.cpp

@@ -23,6 +23,7 @@
 #include "miscellaneous/databasequeries.h"
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/mutex.h"
+#include "services/abstract/cacheforserviceroot.h"
 #include "services/abstract/recyclebin.h"
 #include "services/abstract/serviceroot.h"
 
@@ -218,6 +219,17 @@ bool Feed::cleanMessages(bool clean_read_only) {
   return getParentServiceRoot()->cleanFeeds(QList<Feed*>() << this, clean_read_only);
 }
 
+bool Feed::markAsReadUnread(RootItem::ReadStatus status) {
+  ServiceRoot* service = getParentServiceRoot();
+  CacheForServiceRoot* cache = dynamic_cast<CacheForServiceRoot*>(service);
+
+  if (cache != nullptr) {
+    cache->addMessageStatesToCache(service->customIDSOfMessagesForItem(this), status);
+  }
+
+  return service->markFeedsReadUnread(QList<Feed*>() << this, status);
+}
+
 int Feed::updateMessages(const QList<Message>& messages, bool error_during_obtaining) {
   QList<RootItem*> items_to_update;
   int updated_messages = 0;

src/services/abstract/feed.h

@@ -82,6 +82,7 @@ class Feed : public RootItem, public QRunnable {
     // Runs update in thread (thread pooled).
     void run();
 
+    bool markAsReadUnread(ReadStatus status);
     bool cleanMessages(bool clean_read_only);
 
   public slots:

src/services/abstract/serviceroot.cpp

@@ -24,6 +24,7 @@
 #include "miscellaneous/databasequeries.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/textfactory.h"
+#include "services/abstract/cacheforserviceroot.h"
 #include "services/abstract/category.h"
 #include "services/abstract/feed.h"
 #include "services/abstract/recyclebin.h"
@@ -49,6 +50,12 @@ bool ServiceRoot::deleteViaGui() {
 }
 
 bool ServiceRoot::markAsReadUnread(RootItem::ReadStatus status) {
+  CacheForServiceRoot* cache = dynamic_cast<CacheForServiceRoot*>(this);
+
+  if (cache != nullptr) {
+    cache->addMessageStatesToCache(customIDSOfMessagesForItem(this), status);
+  }
+
   QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
 
   if (DatabaseQueries::markAccountReadUnread(database, accountId(), status)) {

src/services/owncloud/owncloudcategory.cpp

@@ -38,9 +38,4 @@ OwnCloudServiceRoot* OwnCloudCategory::serviceRoot() const {
   return qobject_cast<OwnCloudServiceRoot*>(getParentServiceRoot());
 }
 
-bool OwnCloudCategory::markAsReadUnread(RootItem::ReadStatus status) {
-  serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
-  return serviceRoot()->markFeedsReadUnread(getSubTreeFeeds(), status);
-}
-
 OwnCloudCategory::~OwnCloudCategory() {}

src/services/owncloud/owncloudcategory.h

@@ -31,8 +31,6 @@ class OwnCloudCategory : public Category {
     explicit OwnCloudCategory(const QSqlRecord& record);
     virtual ~OwnCloudCategory();
 
-    bool markAsReadUnread(ReadStatus status);
-
   private:
     OwnCloudServiceRoot* serviceRoot() const;
 };

src/services/owncloud/owncloudfeed.cpp

@@ -86,11 +86,6 @@ bool OwnCloudFeed::removeItself() {
   return DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId());
 }
 
-bool OwnCloudFeed::markAsReadUnread(RootItem::ReadStatus status) {
-  serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
-  return getParentServiceRoot()->markFeedsReadUnread(QList<Feed*>() << this, status);
-}
-
 OwnCloudServiceRoot* OwnCloudFeed::serviceRoot() const {
   return qobject_cast<OwnCloudServiceRoot*>(getParentServiceRoot());
 }

src/services/owncloud/owncloudfeed.h

@@ -39,8 +39,6 @@ class OwnCloudFeed : public Feed {
     bool editItself(OwnCloudFeed* new_feed_data);
     bool removeItself();
 
-    bool markAsReadUnread(ReadStatus status);
-
     OwnCloudServiceRoot* serviceRoot() const;
 
   private:

src/services/owncloud/owncloudserviceroot.cpp

@@ -103,11 +103,6 @@ QString OwnCloudServiceRoot::code() const {
   return OwnCloudServiceEntryPoint().code();
 }
 
-bool OwnCloudServiceRoot::markAsReadUnread(RootItem::ReadStatus status) {
-  addMessageStatesToCache(customIDSOfMessagesForItem(this), status);
-  return ServiceRoot::markAsReadUnread(status);
-}
-
 OwnCloudNetworkFactory* OwnCloudServiceRoot::network() const {
   return m_network;
 }

src/services/owncloud/owncloudserviceroot.h

@@ -45,8 +45,6 @@ class OwnCloudServiceRoot : public ServiceRoot, public CacheForServiceRoot {
     void start(bool freshly_activated);
     void stop();
     QString code() const;
-    bool markAsReadUnread(ReadStatus status);
-
     OwnCloudNetworkFactory* network() const;
 
     bool onBeforeSetMessagesRead(RootItem* selected_item, const QList<Message>& messages, ReadStatus read);

src/services/standard/standardcategory.cpp

@@ -112,10 +112,6 @@ bool StandardCategory::deleteViaGui() {
   }
 }
 
-bool StandardCategory::markAsReadUnread(ReadStatus status) {
-  return serviceRoot()->markFeedsReadUnread(getSubTreeFeeds(), status);
-}
-
 bool StandardCategory::removeItself() {
   bool children_removed = true;
 

src/services/standard/standardcategory.h

@@ -59,8 +59,6 @@ class StandardCategory : public Category {
     bool editViaGui();
     bool deleteViaGui();
 
-    bool markAsReadUnread(ReadStatus status);
-
     // Removes category and all its children from persistent
     // database.
     bool removeItself();

src/services/standard/standardfeed.cpp

@@ -106,10 +106,6 @@ bool StandardFeed::deleteViaGui() {
   }
 }
 
-bool StandardFeed::markAsReadUnread(ReadStatus status) {
-  return serviceRoot()->markFeedsReadUnread(QList<Feed*>() << this, status);
-}
-
 QVariant StandardFeed::data(int column, int role) const {
   switch (role) {
     case Qt::ToolTipRole:

src/services/standard/standardfeed.h

@@ -69,8 +69,6 @@ class StandardFeed : public Feed {
     bool editViaGui();
     bool deleteViaGui();
 
-    bool markAsReadUnread(ReadStatus status);
-
     QVariant data(int column, int role) const;
 
     // Obtains data related to this feed.

src/services/tt-rss/ttrsscategory.cpp

@@ -43,8 +43,3 @@ TtRssCategory::~TtRssCategory() {}
 TtRssServiceRoot* TtRssCategory::serviceRoot() const {
   return qobject_cast<TtRssServiceRoot*>(getParentServiceRoot());
 }
-
-bool TtRssCategory::markAsReadUnread(RootItem::ReadStatus status) {
-  serviceRoot()->addMessageStatesToCache(serviceRoot()->customIDSOfMessagesForItem(this), status);
-  return true;
-}

src/services/tt-rss/ttrsscategory.h

@@ -34,8 +34,6 @@ class TtRssCategory : public Category {
     virtual ~TtRssCategory();
 
     TtRssServiceRoot* serviceRoot() const;
-
-    bool markAsReadUnread(ReadStatus status);
 };
 
 #endif // TTRSSCATEGORY_H

src/services/tt-rss/ttrssfeed.cpp

@@ -78,11 +78,6 @@ bool TtRssFeed::deleteViaGui() {
   }
 }
 
-bool TtRssFeed::markAsReadUnread(RootItem::ReadStatus status) {
-  serviceRoot()->addMessageStatesToCache(getParentServiceRoot()->customIDSOfMessagesForItem(this), status);
-  return getParentServiceRoot()->markFeedsReadUnread(QList<Feed*>() << this, status);
-}
-
 bool TtRssFeed::editItself(TtRssFeed* new_feed_data) {
   QSqlDatabase database = qApp->database()->connection("aa", DatabaseFactory::FromSettings);
 

src/services/tt-rss/ttrssfeed.h

@@ -40,8 +40,6 @@ class TtRssFeed : public Feed {
     bool canBeDeleted() const;
     bool deleteViaGui();
 
-    bool markAsReadUnread(ReadStatus status);
-
     bool editItself(TtRssFeed* new_feed_data);
     bool removeItself();
 

src/services/tt-rss/ttrssserviceroot.cpp

@@ -88,11 +88,6 @@ bool TtRssServiceRoot::deleteViaGui() {
   }
 }
 
-bool TtRssServiceRoot::markAsReadUnread(RootItem::ReadStatus status) {
-  addMessageStatesToCache(customIDSOfMessagesForItem(this), status);
-  return ServiceRoot::markAsReadUnread(status);
-}
-
 bool TtRssServiceRoot::supportsFeedAdding() const {
   return true;
 }

src/services/tt-rss/ttrssserviceroot.h

@@ -42,7 +42,6 @@ class TtRssServiceRoot : public ServiceRoot, public CacheForServiceRoot {
     bool canBeDeleted() const;
     bool editViaGui();
     bool deleteViaGui();
-    bool markAsReadUnread(ReadStatus status);
     bool supportsFeedAdding() const;
     bool supportsCategoryAdding() const;
     QVariant data(int column, int role) const;