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

Replace QPair with std::pair

Browse Source
This commit is contained in:
Chocobo1
2021-12-27 17:20:26 +08:00
parent 781d7fbf1a
commit 3ea4c66d41
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/rss/automatedrssdownloader.cpp
View File

@@ -33,7 +33,6 @@
#include <QFileDialog>
#include <QMenu>
#include <QMessageBox>
#include <QPair>
#include <QRegularExpression>
#include <QShortcut>
#include <QSignalBlocker>
@@ -664,7 +663,7 @@ void AutomatedRssDownloader::addFeedArticlesToTree(RSS::Feed *feed, const QStrin
// Insert the articles
for (const QString &article : articles)
{
QPair<QString, QString> key(feed->name(), article);
const std::pair<QString, QString> key(feed->name(), article);
if (!m_treeListEntries.contains(key))
{

5
src/gui/rss/automatedrssdownloader.h
View File

@@ -29,9 +29,10 @@
#pragma once
#include <utility>
#include <QDialog>
#include <QHash>
#include <QPair>
#include <QSet>
#include "base/rss/rss_autodownloadrule.h"
@@ -101,7 +102,7 @@ private:
Ui::AutomatedRssDownloader *m_ui;
QListWidgetItem *m_currentRuleItem;
QSet<QPair<QString, QString>> m_treeListEntries;
QSet<std::pair<QString, QString>> m_treeListEntries;
RSS::AutoDownloadRule m_currentRule;
QHash<QString, QListWidgetItem *> m_itemsByRuleName;
QRegularExpression *m_episodeRegex;

10
src/gui/search/searchwidget.cpp
View File

@@ -32,6 +32,8 @@
#include <QtGlobal>
#include <utility>
#ifdef Q_OS_WIN
#include <cstdlib>
#endif
@@ -182,10 +184,10 @@ void SearchWidget::fillCatCombobox()
m_ui->comboCategory->clear();
m_ui->comboCategory->addItem(SearchPluginManager::categoryFullName("all"), "all");
using QStrPair = QPair<QString, QString>;
using QStrPair = std::pair<QString, QString>;
QVector<QStrPair> 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<QString, QString>;
using QStrPair = std::pair<QString, QString>;
QVector<QStrPair> 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))