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

Some refactorings.

Browse Source
This commit is contained in:
Martin Rotter 2015-07-17 08:45:07 +02:00
parent 28676a4abd
commit 95445368bc
3 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/feedsproxymodel.cpp
View File

@ -217,16 +217,16 @@ FeedsModelRootItem *FeedsProxyModel::selectedItem() const {
return m_selectedItem;
}
void FeedsProxyModel::setSelectedItem(FeedsModelRootItem *selectedItem) {
m_selectedItem = selectedItem;
void FeedsProxyModel::setSelectedItem(FeedsModelRootItem *selected_item) {
m_selectedItem = selected_item;
}
bool FeedsProxyModel::showUnreadOnly() const {
return m_showUnreadOnly;
}
void FeedsProxyModel::setShowUnreadOnly(bool showUnreadOnly) {
m_showUnreadOnly = showUnreadOnly;
void FeedsProxyModel::setShowUnreadOnly(bool show_unread_only) {
m_showUnreadOnly = show_unread_only;
}
QModelIndexList FeedsProxyModel::mapListToSource(const QModelIndexList &indexes) {

4
src/core/feedsproxymodel.h
View File

@ -44,10 +44,10 @@ class FeedsProxyModel : public QSortFilterProxyModel {
QModelIndexList mapListToSource(const QModelIndexList &indexes);
bool showUnreadOnly() const;
void setShowUnreadOnly(bool showUnreadOnly);
void setShowUnreadOnly(bool show_unread_only);
FeedsModelRootItem *selectedItem() const;
void setSelectedItem(FeedsModelRootItem *selectedItem);
void setSelectedItem(FeedsModelRootItem *selected_item);
public slots:
void invalidateFilter();

46
src/network-web/adblock/adblocksubscription.cpp
View File

@ -211,24 +211,24 @@ bool AdBlockSubscription::saveDownloadedData(const QByteArray &data) {
file.write(part1);
file.write(part2);
file.flush();
file.close();
}
else {
file.write(data);
}
file.flush();
file.close();
}
return true;
}
const AdBlockRule *AdBlockSubscription::rule(int offset) const{
if (!(offset >= 0 && m_rules.size() > offset)) {
return NULL;
if (offset >= 0 && m_rules.size() > offset) {
return m_rules[offset];
}
else {
return m_rules[offset];
return NULL;
}
}
@ -237,10 +237,7 @@ QVector<AdBlockRule*> AdBlockSubscription::allRules() const {
}
const AdBlockRule *AdBlockSubscription::enableRule(int offset) {
if (!(offset >= 0 && m_rules.size() > offset)) {
return NULL;
}
if (offset >= 0 && m_rules.size() > offset) {
AdBlockRule *rule = m_rules[offset];
rule->setEnabled(true);
AdBlockManager::instance()->removeDisabledRule(rule->filter());
@ -249,12 +246,13 @@ const AdBlockRule *AdBlockSubscription::enableRule(int offset) {
return rule;
}
const AdBlockRule *AdBlockSubscription::disableRule(int offset) {
if (!(offset >= 0 && m_rules.size() > offset)) {
else {
return NULL;
}
}
const AdBlockRule *AdBlockSubscription::disableRule(int offset) {
if (offset >= 0 && m_rules.size() > offset) {
AdBlockRule *rule = m_rules[offset];
rule->setEnabled(false);
AdBlockManager::instance()->addDisabledRule(rule->filter());
@ -263,6 +261,10 @@ const AdBlockRule *AdBlockSubscription::disableRule(int offset) {
return rule;
}
else {
return NULL;
}
}
bool AdBlockSubscription::canEditRules() const {
return false;
@ -360,10 +362,7 @@ int AdBlockCustomList::addRule(AdBlockRule *rule) {
}
bool AdBlockCustomList::removeRule(int offset) {
if (!(offset >= 0 && m_rules.size() > offset)) {
return false;
}
if (offset >= 0 && m_rules.size() > offset) {
AdBlockRule *rule = m_rules.at(offset);
const QString filter = rule->filter();
@ -374,12 +373,13 @@ bool AdBlockCustomList::removeRule(int offset) {
delete rule;
return true;
}
const AdBlockRule *AdBlockCustomList::replaceRule(AdBlockRule *rule, int offset) {
if (!(offset >= 0 && m_rules.size() > offset)) {
return NULL;
else {
return false;
}
}
const AdBlockRule *AdBlockCustomList::replaceRule(AdBlockRule *rule, int offset) {
if (offset >= 0 && m_rules.size() > offset) {
AdBlockRule *oldRule = m_rules.at(offset);
m_rules[offset] = rule;
emit subscriptionChanged();
@ -387,3 +387,7 @@ const AdBlockRule *AdBlockCustomList::replaceRule(AdBlockRule *rule, int offset)
delete oldRule;
return m_rules[offset];
}
else {
return NULL;
}
}