diff --git a/src/base/rss/rss_feed.cpp b/src/base/rss/rss_feed.cpp index 0de21e5d7..7563c7b02 100644 --- a/src/base/rss/rss_feed.cpp +++ b/src/base/rss/rss_feed.cpp @@ -31,6 +31,7 @@ #include "rss_feed.h" #include +#include #include #include @@ -461,19 +462,19 @@ int Feed::updateArticles(const QList &loadedArticles) if (newArticles.empty()) return 0; - using ArticleSortAdaptor = QPair; + using ArticleSortAdaptor = std::pair; std::vector sortData; const QList
existingArticles = articles(); sortData.reserve(existingArticles.size() + newArticles.size()); std::transform(existingArticles.begin(), existingArticles.end(), std::back_inserter(sortData) , [](const Article *article) { - return qMakePair(article->date(), nullptr); + return std::make_pair(article->date(), nullptr); }); std::transform(newArticles.begin(), newArticles.end(), std::back_inserter(sortData) , [](const QVariantHash &article) { - return qMakePair(article[Article::KeyDate].toDateTime(), &article); + return std::make_pair(article[Article::KeyDate].toDateTime(), &article); }); // Sort article list in reverse chronological order diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index c8e1f2125..86a12c18c 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/src/gui/rss/automatedrssdownloader.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -664,7 +663,7 @@ void AutomatedRssDownloader::addFeedArticlesToTree(RSS::Feed *feed, const QStrin // Insert the articles for (const QString &article : articles) { - QPair key(feed->name(), article); + const std::pair key(feed->name(), article); if (!m_treeListEntries.contains(key)) { diff --git a/src/gui/rss/automatedrssdownloader.h b/src/gui/rss/automatedrssdownloader.h index 8b40e9c61..3a5eadce0 100644 --- a/src/gui/rss/automatedrssdownloader.h +++ b/src/gui/rss/automatedrssdownloader.h @@ -29,9 +29,10 @@ #pragma once +#include + #include #include -#include #include #include "base/rss/rss_autodownloadrule.h" @@ -101,7 +102,7 @@ private: Ui::AutomatedRssDownloader *m_ui; QListWidgetItem *m_currentRuleItem; - QSet> m_treeListEntries; + QSet> m_treeListEntries; RSS::AutoDownloadRule m_currentRule; QHash m_itemsByRuleName; QRegularExpression *m_episodeRegex; diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index 5c0dcc5a1..6e4b84ef9 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -32,6 +32,8 @@ #include +#include + #ifdef Q_OS_WIN #include #endif @@ -182,10 +184,10 @@ void SearchWidget::fillCatCombobox() m_ui->comboCategory->clear(); m_ui->comboCategory->addItem(SearchPluginManager::categoryFullName("all"), "all"); - using QStrPair = QPair; + using QStrPair = std::pair; QVector tmpList; for (const QString &cat : asConst(SearchPluginManager::instance()->getPluginCategories(selectedPlugin()))) - tmpList << qMakePair(SearchPluginManager::categoryFullName(cat), cat); + tmpList << std::make_pair(SearchPluginManager::categoryFullName(cat), cat); std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (QString::localeAwareCompare(l.first, r.first) < 0); }); for (const QStrPair &p : asConst(tmpList)) @@ -205,10 +207,10 @@ void SearchWidget::fillPluginComboBox() m_ui->selectPlugin->addItem(tr("All plugins"), "all"); m_ui->selectPlugin->addItem(tr("Select..."), "multi"); - using QStrPair = QPair; + using QStrPair = std::pair; QVector tmpList; for (const QString &name : asConst(SearchPluginManager::instance()->enabledPlugins())) - tmpList << qMakePair(SearchPluginManager::instance()->pluginFullName(name), name); + tmpList << std::make_pair(SearchPluginManager::instance()->pluginFullName(name), name); std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (l.first < r.first); } ); for (const QStrPair &p : asConst(tmpList))