diff --git a/rssguard.pro b/rssguard.pro index dec16c6ca..1262a3a1a 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -329,8 +329,6 @@ HEADERS += src/core/feeddownloader.h \ src/core/messagesmodelcache.h \ src/core/messagesmodelsqllayer.h \ src/gui/treeviewcolumnsmenu.h \ - src/services/abstract/labelsrootitem.h \ - src/services/abstract/label.h \ src/miscellaneous/externaltool.h SOURCES += src/core/feeddownloader.cpp \ @@ -451,8 +449,6 @@ SOURCES += src/core/feeddownloader.cpp \ src/core/messagesmodelcache.cpp \ src/core/messagesmodelsqllayer.cpp \ src/gui/treeviewcolumnsmenu.cpp \ - src/services/abstract/labelsrootitem.cpp \ - src/services/abstract/label.cpp \ src/miscellaneous/externaltool.cpp OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h index 25da22181..890d02daa 100755 --- a/src/definitions/definitions.h +++ b/src/definitions/definitions.h @@ -82,7 +82,6 @@ #define ACCEPT_HEADER_FOR_FEED_DOWNLOADER "application/atom+xml,application/xml;q=0.9,text/xml;q=0.8,*/*;q=0.7" #define MIME_TYPE_ITEM_POINTER "rssguard/itempointer" #define DOWNLOADER_ICON_SIZE 48 -#define NOTIFICATION_ICON_SIZE 32 #define GOOGLE_SEARCH_URL "https://www.google.com/search?q=%1&ie=utf-8&oe=utf-8" #define GOOGLE_SUGGEST_URL "http://suggestqueries.google.com/complete/search?output=toolbar&hl=en&q=%1" #define ENCRYPTION_FILE_NAME "key.private" diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp index 564223cfe..e1e1869c8 100755 --- a/src/miscellaneous/databasequeries.cpp +++ b/src/miscellaneous/databasequeries.cpp @@ -716,9 +716,11 @@ bool DatabaseQueries::deleteAccountData(QSqlDatabase db, int account_id, bool de q.prepare(QSL("DELETE FROM Feeds WHERE account_id = :account_id;")); q.bindValue(QSL(":account_id"), account_id); result &= q.exec(); + q.prepare(QSL("DELETE FROM Categories WHERE account_id = :account_id;")); q.bindValue(QSL(":account_id"), account_id); result &= q.exec(); + return result; } diff --git a/src/services/abstract/label.cpp b/src/services/abstract/label.cpp deleted file mode 100755 index e915d3fd6..000000000 --- a/src/services/abstract/label.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// This file is part of RSS Guard. - -// -// Copyright (C) 2011-2017 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/abstract/label.h" - -Label::Label(RootItem* parent_item) : RootItem(parent_item) {} diff --git a/src/services/abstract/label.h b/src/services/abstract/label.h deleted file mode 100755 index 534ab4834..000000000 --- a/src/services/abstract/label.h +++ /dev/null @@ -1,29 +0,0 @@ -// This file is part of RSS Guard. - -// -// Copyright (C) 2011-2017 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 LABEL_H -#define LABEL_H - -#include "services/abstract/rootitem.h" - -class Label : public RootItem { - public: - explicit Label(RootItem* parent_item = nullptr); -}; - -#endif // LABEL_H diff --git a/src/services/abstract/labelsrootitem.cpp b/src/services/abstract/labelsrootitem.cpp deleted file mode 100755 index bb5185efa..000000000 --- a/src/services/abstract/labelsrootitem.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// This file is part of RSS Guard. - -// -// Copyright (C) 2011-2017 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/abstract/labelsrootitem.h" - -#include "miscellaneous/iconfactory.h" - -LabelsRootItem::LabelsRootItem(RootItem* parent_item) : RootItem(parent_item) { - setTitle(tr("Labels")); - setIcon(qApp->icons()->fromTheme(QSL("stock_bookmark"))); - setKind(RootItemKind::LabelsRoot); -} diff --git a/src/services/abstract/labelsrootitem.h b/src/services/abstract/labelsrootitem.h deleted file mode 100755 index c96377081..000000000 --- a/src/services/abstract/labelsrootitem.h +++ /dev/null @@ -1,31 +0,0 @@ -// This file is part of RSS Guard. - -// -// Copyright (C) 2011-2017 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 LABELSROOTITEM_H -#define LABELSROOTITEM_H - -#include "services/abstract/rootitem.h" - -class LabelsRootItem : public RootItem { - Q_OBJECT - - public: - explicit LabelsRootItem(RootItem* parent_item = nullptr); -}; - -#endif // LABELSROOTITEM_H