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

Code cleanups.

Browse Source
This commit is contained in:
Martin Rotter 2014-10-28 18:14:17 +01:00
parent a539c9aacd
commit 0bf6a2436d
6 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/feedsimportexportmodel.cpp
View File

@ -110,7 +110,7 @@ bool FeedsImportExportModel::exportToOMPL20(QByteArray &result) {
}
case FeedsModelRootItem::Feed: {
FeedsModelFeed *child_feed = static_cast<FeedsModelFeed*>(child_item);
FeedsModelFeed *child_feed = child_item->toFeed();
QDomElement outline_feed = opml_document.createElement("outline");
outline_feed.setAttribute("text", child_feed->title());
outline_feed.setAttribute("xmlUrl", child_feed->url());

22
src/core/feedsmodel.cpp
View File

@ -129,7 +129,7 @@ bool FeedsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int
if (dragged_item->kind() == FeedsModelRootItem::Feed) {
qDebug("Drag-drop action for feed '%s' detected, editing the feed.", qPrintable(dragged_item->title()));
FeedsModelFeed *actual_feed = static_cast<FeedsModelFeed*>(dragged_item);
FeedsModelFeed *actual_feed = dragged_item->toFeed();
FeedsModelFeed *feed_new = new FeedsModelFeed(*actual_feed);
feed_new->setParent(target_item);
@ -138,7 +138,7 @@ bool FeedsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int
else if (dragged_item->kind() == FeedsModelRootItem::Category) {
qDebug("Drag-drop action for category '%s' detected, editing the feed.", qPrintable(dragged_item->title()));
FeedsModelCategory *actual_category = static_cast<FeedsModelCategory*>(dragged_item);
FeedsModelCategory *actual_category = dragged_item->toCategory();
FeedsModelCategory *category_new = new FeedsModelCategory(*actual_category);
category_new->clearChildren();
@ -581,7 +581,7 @@ FeedsModelCategory *FeedsModel::categoryForIndex(const QModelIndex &index) const
FeedsModelRootItem *item = itemForIndex(index);
if (item->kind() == FeedsModelRootItem::Category) {
return static_cast<FeedsModelCategory*>(item);
return item->toCategory();
}
else {
return NULL;
@ -592,7 +592,7 @@ FeedsModelRecycleBin *FeedsModel::recycleBinForIndex(const QModelIndex &index) c
FeedsModelRootItem *item = itemForIndex(index);
if (item->kind() == FeedsModelRootItem::RecycleBin) {
return static_cast<FeedsModelRecycleBin*>(item);
return item->toRecycleBin();
}
else {
return NULL;
@ -697,7 +697,7 @@ bool FeedsModel::mergeModel(FeedsImportExportModel *model, QString &output_messa
}
if (source_item->kind() == FeedsModelRootItem::Category) {
FeedsModelCategory *source_category = static_cast<FeedsModelCategory*>(source_item);
FeedsModelCategory *source_category = source_item->toCategory();
FeedsModelCategory *new_category = new FeedsModelCategory(*source_category);
// Add category to model.
@ -724,7 +724,7 @@ bool FeedsModel::mergeModel(FeedsImportExportModel *model, QString &output_messa
}
}
else if (source_item->kind() == FeedsModelRootItem::Feed) {
FeedsModelFeed *source_feed = static_cast<FeedsModelFeed*>(source_item);
FeedsModelFeed *source_feed = source_item->toFeed();
FeedsModelFeed *new_feed = new FeedsModelFeed(*source_feed);
// Append this feed and end this iteration.
@ -848,7 +848,7 @@ FeedsModelFeed *FeedsModel::feedForIndex(const QModelIndex &index) {
FeedsModelRootItem *item = itemForIndex(index);
if (item->kind() == FeedsModelRootItem::Feed) {
return static_cast<FeedsModelFeed*>(item);
return item->toFeed();
}
else {
return NULL;
@ -973,7 +973,7 @@ QHash<int, FeedsModelCategory*> FeedsModel::categoriesForItem(FeedsModelRootItem
// This item is category, add it to the output list and
// scan its children.
int category_id = item->id();
FeedsModelCategory *category = static_cast<FeedsModelCategory*>(item);
FeedsModelCategory *category = item->toCategory();
if (!categories.contains(category_id)) {
categories.insert(category_id, category);
@ -995,7 +995,7 @@ QList<FeedsModelFeed*> FeedsModel::feedsForItem(FeedsModelRootItem *root) {
if (root->kind() == FeedsModelRootItem::Feed) {
// Root itself is a FEED.
feeds.append(static_cast<FeedsModelFeed*>(root));
feeds.append(root->toFeed());
}
else {
// Root itself is a CATEGORY or ROOT item.
@ -1010,11 +1010,11 @@ QList<FeedsModelFeed*> FeedsModel::feedsForItem(FeedsModelRootItem *root) {
foreach (FeedsModelRootItem *child, active_category->childItems()) {
if (child->kind() == FeedsModelRootItem::Feed) {
// This child is feed.
feeds.append(static_cast<FeedsModelFeed*>(child));
feeds.append(child->toFeed());
}
else if (child->kind() == FeedsModelRootItem::Category) {
// This child is category, add its child feeds too.
traversable_items.append(static_cast<FeedsModelCategory*>(child));
traversable_items.append(child->toCategory());
}
}
}

19
src/core/feedsmodelrootitem.cpp
View File

@ -17,9 +17,10 @@
#include "core/feedsmodelrootitem.h"
#include "miscellaneous/application.h"
#include "core/feedsmodelcategory.h"
#include "core/feedsmodelfeed.h"
#include "core/feedsmodelrecyclebin.h"
#include "miscellaneous/application.h"
#include <QVariant>
@ -80,11 +81,23 @@ bool FeedsModelRootItem::removeChild(FeedsModelRootItem *child) {
return m_childItems.removeOne(child);
}
FeedsModelRecycleBin* FeedsModelRootItem::toRecycleBin() {
return static_cast<FeedsModelRecycleBin*>(this);
}
FeedsModelCategory* FeedsModelRootItem::toCategory() {
return static_cast<FeedsModelCategory*>(this);
}
FeedsModelFeed* FeedsModelRootItem::toFeed() {
return static_cast<FeedsModelFeed*>(this);
}
FeedsModelRootItem *FeedsModelRootItem::child(FeedsModelRootItem::Kind kind_of_child, const QString &identifier) {
foreach (FeedsModelRootItem *child, childItems()) {
if (child->kind() == kind_of_child) {
if ((kind_of_child == Category && static_cast<FeedsModelCategory*>(child)->title() == identifier) ||
(kind_of_child == Feed && static_cast<FeedsModelFeed*>(child)->url() == identifier)) {
if ((kind_of_child == Category && child->title() == identifier) ||
(kind_of_child == Feed && child->toFeed()->url() == identifier)) {
return child;
}
}

8
src/core/feedsmodelrootitem.h
View File

@ -23,6 +23,9 @@
#include <QDateTime>
#include <QFont>
class FeedsModelRecycleBin;
class FeedsModelCategory;
class FeedsModelFeed;
// Represents ROOT item of FeedsModel.
// NOTE: This class is derived to add functionality for
@ -163,6 +166,11 @@ class FeedsModelRootItem {
m_description = description;
}
// Converters
FeedsModelRecycleBin* toRecycleBin();
FeedsModelCategory* toCategory();
FeedsModelFeed* toFeed();
// Compares two model items.
static bool isEqual(FeedsModelRootItem *lhs, FeedsModelRootItem *rhs);
static bool lessThan(FeedsModelRootItem *lhs, FeedsModelRootItem *rhs);

4
src/gui/feedsview.cpp
View File

@ -356,10 +356,10 @@ void FeedsView::editSelectedItem() {
FeedsModelFeed *feed;
if ((category = selectedCategory()) != NULL) {
editCategory(static_cast<FeedsModelCategory*>(category));
editCategory(category);
}
else if ((feed = selectedFeed()) != NULL) {
editFeed(static_cast<FeedsModelFeed*>(feed));
editFeed(feed);
}
// Changes are done, unlock the update master lock.

4
src/network-web/basenetworkaccessmanager.cpp
View File

@ -38,8 +38,8 @@ BaseNetworkAccessManager::~BaseNetworkAccessManager() {
void BaseNetworkAccessManager::loadSettings() {
QNetworkProxy new_proxy;
QNetworkProxy::ProxyType selected_proxy_type = static_cast<QNetworkProxy::ProxyType>(qApp->settings()->value(APP_CFG_PROXY,
"proxy_type",
QNetworkProxy::NoProxy).toInt());
"proxy_type",
QNetworkProxy::NoProxy).toInt());
if (selected_proxy_type == QNetworkProxy::NoProxy) {
// No extra setting is needed, set new proxy and exit this method.