From 1e85c26961e5ae07619e9b0608f19953ea59e621 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 26 Sep 2017 09:18:11 +0200 Subject: [PATCH] Cleanups. --- src/services/abstract/recyclebin.cpp | 4 +++- src/services/standard/standardserviceroot.cpp | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/services/abstract/recyclebin.cpp b/src/services/abstract/recyclebin.cpp index 191e2e31e..5a5fb1fab 100755 --- a/src/services/abstract/recyclebin.cpp +++ b/src/services/abstract/recyclebin.cpp @@ -27,7 +27,8 @@ #include -RecycleBin::RecycleBin(RootItem* parent_item) : RootItem(parent_item), m_totalCount(0), m_unreadCount(0), 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("user-trash"))); @@ -80,6 +81,7 @@ QList RecycleBin::contextMenu() { connect(restore_action, &QAction::triggered, this, &RecycleBin::restore); connect(empty_action, &QAction::triggered, this, &RecycleBin::empty); + m_contextMenu.append(restore_action); m_contextMenu.append(empty_action); } diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index c54fb1346..bd1cd5b1f 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -27,7 +27,6 @@ #include "miscellaneous/iconfactory.h" #include "miscellaneous/mutex.h" #include "miscellaneous/settings.h" -#include "services/abstract/labelsrootitem.h" #include "services/abstract/recyclebin.h" #include "services/standard/gui/formstandardcategorydetails.h" #include "services/standard/gui/formstandardfeeddetails.h" @@ -172,8 +171,6 @@ void StandardServiceRoot::loadFromDatabase() { // As the last item, add recycle bin, which is needed. appendChild(recycleBin()); - - //appendChild(new LabelsRootItem(this)); updateCounts(true); }