From 161dd2fcabd737682e9305f1b06883ddc7046d20 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 2 Feb 2014 14:15:18 +0100
Subject: [PATCH] Some code cleanup.

---
 src/core/feedsmodel.cpp       |  8 ++++----
 src/gui/feedmessageviewer.cpp | 13 ++++++++++---
 src/gui/feedmessageviewer.h   |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp
index 055972245..30169e075 100644
--- a/src/core/feedsmodel.cpp
+++ b/src/core/feedsmodel.cpp
@@ -655,8 +655,8 @@ bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
   QSqlQuery query_read_msg(db_handle);
   query_read_msg.setForwardOnly(true);
 
-  if (!query_read_msg.prepare(QString("UPDATE messages SET read = :read "
-                                      "WHERE feed IN (%1) AND deleted = 0").arg(textualFeedIds(feeds).join(", ")))) {
+  if (!query_read_msg.prepare(QString("UPDATE Messages SET read = :read "
+                                      "WHERE feed IN (%1) AND deleted = 0;").arg(textualFeedIds(feeds).join(", ")))) {
     qWarning("Query preparation failed for feeds read change.");
 
     db_handle.rollback();
@@ -692,8 +692,8 @@ bool FeedsModel::markFeedsDeleted(const QList<FeedsModelFeed *> &feeds,
   QSqlQuery query_delete_msg(db_handle);
   query_delete_msg.setForwardOnly(true);
 
-  if (!query_delete_msg.prepare(QString("UPDATE messages SET deleted = :deleted "
-                                        "WHERE feed IN (%1) AND deleted = 0").arg(textualFeedIds(feeds).join(", ")))) {
+  if (!query_delete_msg.prepare(QString("UPDATE Messages SET deleted = :deleted "
+                                        "WHERE feed IN (%1) AND deleted = 0;").arg(textualFeedIds(feeds).join(", ")))) {
     qWarning("Query preparation failed for feeds clearing.");
 
     db_handle.rollback();
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index cf9ea99b0..5a2c5cf5c 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -97,7 +97,7 @@ void FeedMessageViewer::quitDownloader() {
   m_feedDownloader->deleteLater();
 }
 
-void FeedMessageViewer::updateCountsOfMessages(int unread_messages,
+void FeedMessageViewer::updateTrayIconStatus(int unread_messages,
                                                int total_messages) {
   Q_UNUSED(total_messages)
 
@@ -134,15 +134,22 @@ void FeedMessageViewer::createConnections() {
   connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)),
           m_messagesBrowser, SLOT(navigateToMessages(QList<Message>)));
 
-  // Feed changers.
+  // If user selects feeds, load their messages.
   connect(m_feedsView, SIGNAL(feedsSelected(QList<int>)),
           m_messagesView, SLOT(loadFeeds(QList<int>)));
+
+  // If user changes status of some messages, recalculate message counts.
   connect(m_messagesView, SIGNAL(feedCountsChanged()),
           m_feedsView, SLOT(updateCountsOfSelectedFeeds()));
+
+  // State of many messages is changed, then we need
+  // to reload selections.
   connect(m_feedsView, SIGNAL(feedsNeedToBeReloaded(int)),
           m_messagesView, SLOT(reloadSelections(int)));
+
+  // If counts of unread/all messages change, update the tray icon.
   connect(m_feedsView, SIGNAL(feedCountsChanged(int,int)),
-          this, SLOT(updateCountsOfMessages(int,int)));
+          this, SLOT(updateTrayIconStatus(int,int)));
 
   // Message openers.
   connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index 45b4d510e..7d24c27f3 100644
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -44,7 +44,7 @@ class FeedMessageViewer : public TabContent {
 
   protected slots:
     // Updates counts of messages for example in tray icon.
-    void updateCountsOfMessages(int unread_messages, int total_messages);
+    void updateTrayIconStatus(int unread_messages, int total_messages);
 
     // Reacts on feed updates.
     void onFeedUpdatesStarted();