From 7f0c8dde2411cafa78cbd74bed88e5a99f1db56a Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sat, 29 Jan 2011 14:18:45 +0000
Subject: [PATCH] Rss code clean up

---
 src/rss/rssfeed.cpp   | 5 ++---
 src/rss/rssfeed.h     | 7 ++-----
 src/rss/rssfile.h     | 4 ++--
 src/rss/rssfolder.cpp | 4 ++--
 src/rss/rssfolder.h   | 4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/rss/rssfeed.cpp b/src/rss/rssfeed.cpp
index 18f2f5eb9..42f9bed58 100644
--- a/src/rss/rssfeed.cpp
+++ b/src/rss/rssfeed.cpp
@@ -183,11 +183,11 @@ uint RssFeed::unreadCount() const{
   return nbUnread;
 }
 
-QList<RssArticle> RssFeed::articleList() const{
+const QList<RssArticle> RssFeed::articleList() const{
   return m_articles.values();
 }
 
-QList<RssArticle> RssFeed::unreadArticleList() const {
+const QList<RssArticle> RssFeed::unreadArticleList() const {
   QList<RssArticle> unread_news;
   foreach(const RssArticle &item, m_articles.values()) {
     if(!item.isRead())
@@ -344,7 +344,6 @@ void RssFeed::handleFinishedDownload(const QString& url, const QString &file_pat
     m_icon = file_path;
     qDebug() << "icon path:" << m_icon;
     RssManager::instance()->forwardFeedIconChanged(m_url, m_icon); // XXX: Ugly
-    emit iconUpdated(m_icon);
   }
 }
 
diff --git a/src/rss/rssfeed.h b/src/rss/rssfeed.h
index 23b0dfebe..00a03af23 100644
--- a/src/rss/rssfeed.h
+++ b/src/rss/rssfeed.h
@@ -63,12 +63,9 @@ public:
   uint count() const;
   void markAsRead();
   uint unreadCount() const;
-  QList<RssArticle> articleList() const;
+  const QList<RssArticle> articleList() const;
   const QHash<QString, RssArticle>& articleListNoCopy() const { return m_articles; }
-  QList<RssArticle> unreadArticleList() const;
-
-signals:
-  void iconUpdated(const QString &icon);
+  const QList<RssArticle> unreadArticleList() const;
 
 private slots:
   void handleFinishedDownload(const QString& url, const QString &file_path);
diff --git a/src/rss/rssfile.h b/src/rss/rssfile.h
index 1844afd1a..e9da8b047 100644
--- a/src/rss/rssfile.h
+++ b/src/rss/rssfile.h
@@ -54,8 +54,8 @@ public:
   virtual void setParent(RssFolder* parent) = 0;
   virtual void refresh() = 0;
   virtual void removeAllSettings() = 0;
-  virtual QList<RssArticle> articleList() const = 0;
-  virtual QList<RssArticle> unreadArticleList() const = 0;
+  virtual const QList<RssArticle> articleList() const = 0;
+  virtual const QList<RssArticle> unreadArticleList() const = 0;
   QStringList pathHierarchy() const;
 };
 
diff --git a/src/rss/rssfolder.cpp b/src/rss/rssfolder.cpp
index 77a70a544..e45c6ab2d 100644
--- a/src/rss/rssfolder.cpp
+++ b/src/rss/rssfolder.cpp
@@ -90,7 +90,7 @@ void RssFolder::refresh() {
   }
 }
 
-QList<RssArticle> RssFolder::articleList() const {
+const QList<RssArticle> RssFolder::articleList() const {
   QList<RssArticle> news;
   foreach(const IRssFile *child, m_children.values()) {
     news << child->articleList();
@@ -98,7 +98,7 @@ QList<RssArticle> RssFolder::articleList() const {
   return news;
 }
 
-QList<RssArticle> RssFolder::unreadArticleList() const {
+const QList<RssArticle> RssFolder::unreadArticleList() const {
   QList<RssArticle> unread_news;
   foreach(const IRssFile *child, m_children.values()) {
     unread_news << child->unreadArticleList();
diff --git a/src/rss/rssfolder.h b/src/rss/rssfolder.h
index 9769246c9..9aebafc3d 100644
--- a/src/rss/rssfolder.h
+++ b/src/rss/rssfolder.h
@@ -57,8 +57,8 @@ public:
   QString displayName() const;
   QString id() const;
   bool hasChild(const QString &childId);
-  QList<RssArticle> articleList() const;
-  QList<RssArticle> unreadArticleList() const;
+  const QList<RssArticle> articleList() const;
+  const QList<RssArticle> unreadArticleList() const;
   void removeAllSettings();
   void removeAllItems();
   void renameChildFolder(const QString &old_name, const QString &new_name);