From a2d9cce18100dfab09a0a5c9c6f15fc8122f384e Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 20 Feb 2012 21:46:02 +0200
Subject: [PATCH] Code clean up

---
 src/dnsupdater.cpp              |  2 +-
 src/preferences/options_imp.cpp |  2 +-
 src/qtlibtorrent/qbtsession.cpp |  2 +-
 src/rss/rssarticle.cpp          |  6 +++---
 src/rss/rssfeed.cpp             | 16 ++++++++--------
 src/rss/rssfeed.h               |  1 -
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/dnsupdater.cpp b/src/dnsupdater.cpp
index f1d945ea5..35f0da777 100644
--- a/src/dnsupdater.cpp
+++ b/src/dnsupdater.cpp
@@ -175,7 +175,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
   QString code = reply.split(" ").first();
   qDebug() << Q_FUNC_INFO << "Code:" << code;
   if (code == "good" || code == "nochg") {
-    QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfuly updated."), "green");
+    QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfully updated."), "green");
     return;
   }
   if (code == "911" || code == "dnserr") {
diff --git a/src/preferences/options_imp.cpp b/src/preferences/options_imp.cpp
index 65623ae20..716098339 100644
--- a/src/preferences/options_imp.cpp
+++ b/src/preferences/options_imp.cpp
@@ -1221,7 +1221,7 @@ void options_imp::handleIPFilterParsed(bool error, int ruleCount)
   if (error) {
     QMessageBox::warning(this, tr("Parsing error"), tr("Failed to parse the provided IP filter"));
   } else {
-    QMessageBox::information(this, tr("Successfully refreshed"), tr("Successfuly parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
+    QMessageBox::information(this, tr("Successfully refreshed"), tr("Successfully parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
   }
   m_refreshingIpFilter = false;
   disconnect(QBtSession::instance(), SIGNAL(ipFilterParsed(bool, int)), this, SLOT(handleIPFilterParsed(bool, int)));
diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp
index 032bff139..ddd7293f2 100644
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -2775,7 +2775,7 @@ qlonglong QBtSession::getETA(const QString &hash) const
 
 void QBtSession::handleIPFilterParsed(int ruleCount)
 {
-  addConsoleMessage(tr("Successfuly parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
+  addConsoleMessage(tr("Successfully parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
   emit ipFilterParsed(false, ruleCount);
 }
 
diff --git a/src/rss/rssarticle.cpp b/src/rss/rssarticle.cpp
index badef9f95..6105d1bec 100644
--- a/src/rss/rssarticle.cpp
+++ b/src/rss/rssarticle.cpp
@@ -284,7 +284,7 @@ QString RssArticle::author() const {
   return m_author;
 }
 
-QString RssArticle::torrentUrl() const{
+QString RssArticle::torrentUrl() const {
   return m_torrentUrl;
 }
 
@@ -292,7 +292,7 @@ QString RssArticle::link() const {
   return m_link;
 }
 
-QString RssArticle::description() const{
+QString RssArticle::description() const {
   if (m_description.isNull())
     return "";
   return m_description;
@@ -302,7 +302,7 @@ QDateTime RssArticle::date() const {
   return m_date;
 }
 
-bool RssArticle::isRead() const{
+bool RssArticle::isRead() const {
   return m_read;
 }
 
diff --git a/src/rss/rssfeed.cpp b/src/rss/rssfeed.cpp
index f40ca6a46..44e893461 100644
--- a/src/rss/rssfeed.cpp
+++ b/src/rss/rssfeed.cpp
@@ -120,10 +120,6 @@ void RssFeed::removeAllSettings() {
   }
 }
 
-bool RssFeed::itemAlreadyExists(const QString &guid) const {
-  return m_articles.contains(guid);
-}
-
 void RssFeed::setLoading(bool val) {
   m_loading = val;
 }
@@ -231,8 +227,12 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml)
     }
     else if (xml.name() == "item") {
       RssArticlePtr article = xmlToRssArticle(this, xml);
-      if (article && !itemAlreadyExists(article->guid()))
-        m_articles.insert(article->guid(), article);
+      if (article) {
+        QString guid = article->guid();
+        if (m_articles.contains(guid) && m_articles[guid]->isRead())
+          article->markAsRead();
+        m_articles[guid] = article;
+      }
     } else
       xml.skipCurrentElement();
   }
@@ -335,14 +335,14 @@ bool RssFeed::parseXmlFile(const QString &file_path) {
 // read and store the downloaded rss' informations
 void RssFeed::handleFinishedDownload(const QString& url, const QString &file_path) {
   if (url == m_url) {
-    qDebug() << Q_FUNC_INFO << "Successfuly downloaded RSS feed at" << url;
+    qDebug() << Q_FUNC_INFO << "Successfully downloaded RSS feed at" << url;
     m_downloadFailure = false;
     m_loading = false;
     // Parse the download RSS
     if (parseXmlFile(file_path)) {
       m_refreshed = true;
       m_manager->forwardFeedInfosChanged(m_url, displayName(), unreadCount()); // XXX: Ugly
-      qDebug() << Q_FUNC_INFO << "Feed parsed successfuly";
+      qDebug() << Q_FUNC_INFO << "Feed parsed successfully";
     }
   }
   else if (url == m_iconUrl) {
diff --git a/src/rss/rssfeed.h b/src/rss/rssfeed.h
index 55c12239e..5a96cb2bd 100644
--- a/src/rss/rssfeed.h
+++ b/src/rss/rssfeed.h
@@ -55,7 +55,6 @@ public:
   void refresh();
   virtual QString id() const { return m_url; }
   virtual void removeAllSettings();
-  bool itemAlreadyExists(const QString &guid) const;
   virtual void saveItemsToDisk();
   void setLoading(bool val);
   bool isLoading() const;