squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-20 07:27:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make use of std algorithms

Browse Source
This commit is contained in:
Chocobo1
2019-01-11 16:05:57 +08:00
parent 40eb8a1f4a
commit 6d29a3af60
10 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/base/rss/rss_autodownloadrule.cpp
View File

@@ -29,6 +29,8 @@
#include "rss_autodownloadrule.h"
#include <algorithm>
#include <QDebug>
#include <QDir>
#include <QHash>
@@ -237,13 +239,11 @@ bool AutoDownloadRule::matchesMustContainExpression(const QString &articleTitle)
// Each expression is either a regex, or a set of wildcards separated by whitespace.
// Accept if any complete expression matches.
for (const QString &expression : asConst(m_dataPtr->mustContain)) {
return std::any_of(m_dataPtr->mustContain.cbegin(), m_dataPtr->mustContain.cend(), [this, &articleTitle](const QString &expression)
{
// A regex of the form "expr|" will always match, so do the same for wildcards
if (matchesExpression(articleTitle, expression))
return true;
}
return false;
return matchesExpression(articleTitle, expression);
});
}
bool AutoDownloadRule::matchesMustNotContainExpression(const QString &articleTitle) const
@@ -253,13 +253,11 @@ bool AutoDownloadRule::matchesMustNotContainExpression(const QString &articleTit
// Each expression is either a regex, or a set of wildcards separated by whitespace.
// Reject if any complete expression matches.
for (const QString &expression : asConst(m_dataPtr->mustNotContain)) {
return std::none_of(m_dataPtr->mustNotContain.cbegin(), m_dataPtr->mustNotContain.cend(), [this, &articleTitle](const QString &expression)
{
// A regex of the form "expr|" will always match, so do the same for wildcards
if (matchesExpression(articleTitle, expression))
return false;
}
return true;
return matchesExpression(articleTitle, expression);
});
}
bool AutoDownloadRule::matchesEpisodeFilterExpression(const QString &articleTitle) const

11
src/base/rss/rss_folder.cpp
View File

@@ -30,6 +30,8 @@
#include "rss_folder.h"
#include <algorithm>
#include <QJsonObject>
#include <QJsonValue>
@@ -69,10 +71,11 @@ QList<Article *> Folder::articles() const
int Folder::unreadCount() const
{
int count = 0;
for (Item *item : asConst(items()))
count += item->unreadCount();
return count;
const auto itemList = items();
return std::accumulate(itemList.cbegin(), itemList.cend(), 0, [](const int acc, const Item *item)
{
return (acc + item->unreadCount());
});
}
void Folder::markAsRead()