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

Cleanups.

Browse Source
This commit is contained in:
Martin Rotter 2017-09-26 09:18:11 +02:00
parent 6fff5c883a
commit 1e85c26961
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/abstract/recyclebin.cpp
View File

@ -27,7 +27,8 @@
#include <QThread> #include <QThread>
RecycleBin::RecycleBin(RootItem* parent_item) : RootItem(parent_item), m_totalCount(0), m_unreadCount(0), m_contextMenu(QList<QAction*>()) { RecycleBin::RecycleBin(RootItem* parent_item) : RootItem(parent_item), m_totalCount(0),
m_unreadCount(0), m_contextMenu(QList<QAction*>()) {
setKind(RootItemKind::Bin); setKind(RootItemKind::Bin);
setId(ID_RECYCLE_BIN); setId(ID_RECYCLE_BIN);
setIcon(qApp->icons()->fromTheme(QSL("user-trash"))); setIcon(qApp->icons()->fromTheme(QSL("user-trash")));
@ -80,6 +81,7 @@ QList<QAction*> RecycleBin::contextMenu() {
connect(restore_action, &QAction::triggered, this, &RecycleBin::restore); connect(restore_action, &QAction::triggered, this, &RecycleBin::restore);
connect(empty_action, &QAction::triggered, this, &RecycleBin::empty); connect(empty_action, &QAction::triggered, this, &RecycleBin::empty);
m_contextMenu.append(restore_action); m_contextMenu.append(restore_action);
m_contextMenu.append(empty_action); m_contextMenu.append(empty_action);
} }

3
src/services/standard/standardserviceroot.cpp
View File

@ -27,7 +27,6 @@
#include "miscellaneous/iconfactory.h" #include "miscellaneous/iconfactory.h"
#include "miscellaneous/mutex.h" #include "miscellaneous/mutex.h"
#include "miscellaneous/settings.h" #include "miscellaneous/settings.h"
#include "services/abstract/labelsrootitem.h"
#include "services/abstract/recyclebin.h" #include "services/abstract/recyclebin.h"
#include "services/standard/gui/formstandardcategorydetails.h" #include "services/standard/gui/formstandardcategorydetails.h"
#include "services/standard/gui/formstandardfeeddetails.h" #include "services/standard/gui/formstandardfeeddetails.h"
@ -172,8 +171,6 @@ void StandardServiceRoot::loadFromDatabase() {
// As the last item, add recycle bin, which is needed. // As the last item, add recycle bin, which is needed.
appendChild(recycleBin()); appendChild(recycleBin());
//appendChild(new LabelsRootItem(this));
updateCounts(true); updateCounts(true);
} }