FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some code cleanup.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-02 14:15:18 +01:00
parent 0102721ec2
commit 161dd2fcab
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/feedsmodel.cpp
View File

@ -655,8 +655,8 @@ bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
QSqlQuery query_read_msg(db_handle); QSqlQuery query_read_msg(db_handle);
query_read_msg.setForwardOnly(true); query_read_msg.setForwardOnly(true);
if (!query_read_msg.prepare(QString("UPDATE messages SET read = :read " if (!query_read_msg.prepare(QString("UPDATE Messages SET read = :read "
"WHERE feed IN (%1) AND deleted = 0").arg(textualFeedIds(feeds).join(", ")))) { "WHERE feed IN (%1) AND deleted = 0;").arg(textualFeedIds(feeds).join(", ")))) {
qWarning("Query preparation failed for feeds read change."); qWarning("Query preparation failed for feeds read change.");
db_handle.rollback(); db_handle.rollback();
@ -692,8 +692,8 @@ bool FeedsModel::markFeedsDeleted(const QList<FeedsModelFeed *> &feeds,
QSqlQuery query_delete_msg(db_handle); QSqlQuery query_delete_msg(db_handle);
query_delete_msg.setForwardOnly(true); query_delete_msg.setForwardOnly(true);
if (!query_delete_msg.prepare(QString("UPDATE messages SET deleted = :deleted " if (!query_delete_msg.prepare(QString("UPDATE Messages SET deleted = :deleted "
"WHERE feed IN (%1) AND deleted = 0").arg(textualFeedIds(feeds).join(", ")))) { "WHERE feed IN (%1) AND deleted = 0;").arg(textualFeedIds(feeds).join(", ")))) {
qWarning("Query preparation failed for feeds clearing."); qWarning("Query preparation failed for feeds clearing.");
db_handle.rollback(); db_handle.rollback();

13
src/gui/feedmessageviewer.cpp
View File

@ -97,7 +97,7 @@ void FeedMessageViewer::quitDownloader() {
m_feedDownloader->deleteLater(); m_feedDownloader->deleteLater();
} }
void FeedMessageViewer::updateCountsOfMessages(int unread_messages, void FeedMessageViewer::updateTrayIconStatus(int unread_messages,
int total_messages) { int total_messages) {
Q_UNUSED(total_messages) Q_UNUSED(total_messages)
@ -134,15 +134,22 @@ void FeedMessageViewer::createConnections() {
connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)),
m_messagesBrowser, SLOT(navigateToMessages(QList<Message>))); m_messagesBrowser, SLOT(navigateToMessages(QList<Message>)));
// Feed changers. // If user selects feeds, load their messages.
connect(m_feedsView, SIGNAL(feedsSelected(QList<int>)), connect(m_feedsView, SIGNAL(feedsSelected(QList<int>)),
m_messagesView, SLOT(loadFeeds(QList<int>))); m_messagesView, SLOT(loadFeeds(QList<int>)));
// If user changes status of some messages, recalculate message counts.
connect(m_messagesView, SIGNAL(feedCountsChanged()), connect(m_messagesView, SIGNAL(feedCountsChanged()),
m_feedsView, SLOT(updateCountsOfSelectedFeeds())); m_feedsView, SLOT(updateCountsOfSelectedFeeds()));
// State of many messages is changed, then we need
// to reload selections.
connect(m_feedsView, SIGNAL(feedsNeedToBeReloaded(int)), connect(m_feedsView, SIGNAL(feedsNeedToBeReloaded(int)),
m_messagesView, SLOT(reloadSelections(int))); m_messagesView, SLOT(reloadSelections(int)));
// If counts of unread/all messages change, update the tray icon.
connect(m_feedsView, SIGNAL(feedCountsChanged(int,int)), connect(m_feedsView, SIGNAL(feedCountsChanged(int,int)),
this, SLOT(updateCountsOfMessages(int,int))); this, SLOT(updateTrayIconStatus(int,int)));
// Message openers. // Message openers.
connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)), connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),

2
src/gui/feedmessageviewer.h
View File

@ -44,7 +44,7 @@ class FeedMessageViewer : public TabContent {
protected slots: protected slots:
// Updates counts of messages for example in tray icon. // 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. // Reacts on feed updates.
void onFeedUpdatesStarted(); void onFeedUpdatesStarted();