squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 23:17:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Utilize algorithms from std::ranges

Browse Source 
The result is shorter code and improves readability.
Note that `asConst()` is still required for non-const containers, otherwise the container will
detach.

PR #23342.
This commit is contained in:
Chocobo1
2025-10-07 01:56:08 +08:00
committed by GitHub
parent 4181a10542
commit d5d690cace
37 changed files with 95 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
#include "rss_feed.h"
#include <algorithm>
#include <ranges>
#include <utility>
#include <vector>
@@ -426,20 +427,13 @@ int Feed::updateArticles(const QList<QVariantHash> &loadedArticles)
std::vector<ArticleSortAdaptor> sortData;
const QList<Article *> existingArticles = articles();
sortData.reserve(existingArticles.size() + newArticles.size());
std::transform(existingArticles.begin(), existingArticles.end(), std::back_inserter(sortData)
, [](const Article *article)
{
return std::make_pair(article->date(), nullptr);
});
std::transform(newArticles.begin(), newArticles.end(), std::back_inserter(sortData)
, [](const QVariantHash &article)
{
return std::make_pair(article[Article::KeyDate].toDateTime(), &article);
});
for (const Article *article : existingArticles)
sortData.push_back(std::make_pair(article->date(), nullptr));
for (const QVariantHash &article : asConst(newArticles))
sortData.push_back(std::make_pair(article[Article::KeyDate].toDateTime(), &article));
// Sort article list in reverse chronological order
std::sort(sortData.begin(), sortData.end()
, [](const ArticleSortAdaptor &a1, const ArticleSortAdaptor &a2)
std::ranges::sort(sortData, [](const ArticleSortAdaptor &a1, const ArticleSortAdaptor &a2)
{
return (a1.first > a2.first);
});
@@ -448,14 +442,14 @@ int Feed::updateArticles(const QList<QVariantHash> &loadedArticles)
sortData.resize(m_session->maxArticlesPerFeed());
int newArticlesCount = 0;
std::for_each(sortData.crbegin(), sortData.crend(), [this, &newArticlesCount](const ArticleSortAdaptor &a)
for (const ArticleSortAdaptor &a : std::views::reverse(sortData))
{
if (a.second)
{
addArticle(*a.second);
++newArticlesCount;
}
});
}
return newArticlesCount;
}