diff --git a/CMakeLists.txt b/CMakeLists.txt index eb31fb9de..0223439cf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -435,7 +435,6 @@ set(APP_SOURCES src/services/standard/standardcategory.cpp src/services/standard/standardfeed.cpp src/services/standard/standardserviceroot.cpp - src/services/standard/standardrecyclebin.cpp # TT-RSS feed service sources. src/services/tt-rss/ttrssserviceentrypoint.cpp @@ -559,7 +558,6 @@ set(APP_HEADERS src/services/standard/standardcategory.h src/services/standard/standardfeed.h src/services/standard/standardserviceroot.h - src/services/standard/standardrecyclebin.h # TT-RSS service headers. src/services/tt-rss/ttrssserviceroot.h diff --git a/src/services/abstract/recyclebin.cpp b/src/services/abstract/recyclebin.cpp index 604b21ba2..820687305 100755 --- a/src/services/abstract/recyclebin.cpp +++ b/src/services/abstract/recyclebin.cpp @@ -27,6 +27,7 @@ RecycleBin::RecycleBin(RootItem *parent_item) : RootItem(parent_item) { setKind(RootItemKind::Bin); + setId(ID_RECYCLE_BIN); setIcon(qApp->icons()->fromTheme(QSL("folder-recycle-bin"))); setTitle(tr("Recycle bin")); setDescription(tr("Recycle bin contains all deleted messages from all feeds.")); diff --git a/src/services/standard/standardrecyclebin.cpp b/src/services/standard/standardrecyclebin.cpp deleted file mode 100755 index 7e341dda1..000000000 --- a/src/services/standard/standardrecyclebin.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// This file is part of RSS Guard. -// -// Copyright (C) 2011-2016 by Martin Rotter -// -// RSS Guard is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// RSS Guard is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with RSS Guard. If not, see . - -#include "services/standard/standardrecyclebin.h" - -#include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "services/standard/standardserviceroot.h" - - -StandardRecycleBin::StandardRecycleBin(RootItem *parent) - : RecycleBin(parent) { - setId(ID_RECYCLE_BIN); -} - -StandardRecycleBin::~StandardRecycleBin() { - qDebug("Destroying RecycleBin instance."); -} diff --git a/src/services/standard/standardrecyclebin.h b/src/services/standard/standardrecyclebin.h deleted file mode 100755 index 11179c73b..000000000 --- a/src/services/standard/standardrecyclebin.h +++ /dev/null @@ -1,32 +0,0 @@ -// This file is part of RSS Guard. -// -// Copyright (C) 2011-2016 by Martin Rotter -// -// RSS Guard is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// RSS Guard is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with RSS Guard. If not, see . - -#ifndef STANDARDRECYCLEBIN_H -#define STANDARDRECYCLEBIN_H - -#include "services/abstract/recyclebin.h" - - -class StandardRecycleBin : public RecycleBin { - Q_OBJECT - - public: - explicit StandardRecycleBin(RootItem *parent = NULL); - virtual ~StandardRecycleBin(); -}; - -#endif // STANDARDRECYCLEBIN_H diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index 9357a730c..7baaee798 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -26,8 +26,8 @@ #include "gui/messagebox.h" #include "gui/dialogs/formmain.h" #include "exceptions/applicationexception.h" +#include "services/abstract/recyclebin.h" #include "services/standard/standardserviceentrypoint.h" -#include "services/standard/standardrecyclebin.h" #include "services/standard/standardfeed.h" #include "services/standard/standardcategory.h" #include "services/standard/standardfeedsimportexportmodel.h" @@ -45,7 +45,7 @@ StandardServiceRoot::StandardServiceRoot(RootItem *parent) - : ServiceRoot(parent), m_recycleBin(new StandardRecycleBin(this)), + : ServiceRoot(parent), m_recycleBin(new RecycleBin(this)), m_actionExportFeeds(NULL), m_actionImportFeeds(NULL), m_serviceMenu(QList()), m_feedContextMenu(QList()), m_actionFeedFetchMetadata(NULL) { diff --git a/src/services/standard/standardserviceroot.h b/src/services/standard/standardserviceroot.h index 8e2d87c2f..437ec29cb 100755 --- a/src/services/standard/standardserviceroot.h +++ b/src/services/standard/standardserviceroot.h @@ -24,7 +24,7 @@ #include -class StandardRecycleBin; +class RecycleBin; class StandardCategory; class StandardFeed; class FeedsImportExportModel; @@ -97,7 +97,7 @@ class StandardServiceRoot : public ServiceRoot { // which are suitable as IN clause for SQL queries. QStringList textualFeedIds(const QList &feeds); - StandardRecycleBin *m_recycleBin; + RecycleBin *m_recycleBin; QAction *m_actionExportFeeds; QAction *m_actionImportFeeds; QList m_serviceMenu; diff --git a/src/services/tt-rss/ttrssrecyclebin.cpp b/src/services/tt-rss/ttrssrecyclebin.cpp index 7491f1476..55af8803c 100755 --- a/src/services/tt-rss/ttrssrecyclebin.cpp +++ b/src/services/tt-rss/ttrssrecyclebin.cpp @@ -23,7 +23,6 @@ TtRssRecycleBin::TtRssRecycleBin(RootItem *parent) : RecycleBin(parent) { - } TtRssRecycleBin::~TtRssRecycleBin() {