From 7f4a50336c682c79e4ff28edda660d352b042c5b Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 14 Apr 2016 08:23:19 +0200 Subject: [PATCH] Initialize recycle bin's count to 0. --- src/services/abstract/category.cpp | 4 ++-- src/services/abstract/recyclebin.cpp | 3 ++- src/services/standard/standardserviceroot.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/services/abstract/category.cpp b/src/services/abstract/category.cpp index 30421b415..c895e6802 100755 --- a/src/services/abstract/category.cpp +++ b/src/services/abstract/category.cpp @@ -51,7 +51,7 @@ void Category::updateCounts(bool including_total_count) { if (including_total_count) { QMap counts = DatabaseQueries::getMessageCountsForCategory(database, customId(), getParentServiceRoot()->accountId(), - including_total_count, &ok); + including_total_count, &ok); if (ok) { foreach (Feed *feed, feeds) { @@ -61,7 +61,7 @@ void Category::updateCounts(bool including_total_count) { } QMap counts = DatabaseQueries::getMessageCountsForCategory(database, customId(), getParentServiceRoot()->accountId(), - false, &ok); + false, &ok); if (ok) { foreach (Feed *feed, feeds) { diff --git a/src/services/abstract/recyclebin.cpp b/src/services/abstract/recyclebin.cpp index 51683d2b4..81a1378c6 100755 --- a/src/services/abstract/recyclebin.cpp +++ b/src/services/abstract/recyclebin.cpp @@ -24,7 +24,8 @@ #include "services/abstract/serviceroot.h" -RecycleBin::RecycleBin(RootItem *parent_item) : RootItem(parent_item), m_contextMenu(QList()) { +RecycleBin::RecycleBin(RootItem *parent_item) : RootItem(parent_item), m_totalCount(0), + m_unreadCount(0), m_contextMenu(QList()) { setKind(RootItemKind::Bin); setId(ID_RECYCLE_BIN); setIcon(qApp->icons()->fromTheme(QSL("folder-recycle-bin"))); diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index 9f3e00509..762fcadd1 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -181,7 +181,7 @@ void StandardServiceRoot::loadFromDatabase(){ // As the last item, add recycle bin, which is needed. appendChild(m_recycleBin); - updateCounts(true); + //updateCounts(true); } void StandardServiceRoot::checkArgumentsForFeedAdding() {