d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 18:04:32 +00:00
Code Issues Projects Releases Wiki Activity

Convert all foreach() to range-based for()

Browse Source
This commit is contained in:
thalieht 2018-11-18 20:40:37 +02:00
parent d668a4fe6d
commit 6b1d26d555
64 changed files with 326 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/application.cpp
View File

@ -428,7 +428,7 @@ void Application::processParams(const QStringList &params)
BitTorrent::AddTorrentParams torrentParams; BitTorrent::AddTorrentParams torrentParams;
TriStateBool skipTorrentDialog; TriStateBool skipTorrentDialog;
foreach (QString param, params) { for (QString param : params) {
param = param.trimmed(); param = param.trimmed();
// Process strings indicating options specified by the user. // Process strings indicating options specified by the user.

3
src/app/cmdoptions.cpp
View File

@ -41,6 +41,7 @@
#include <QMessageBox> #include <QMessageBox>
#endif #endif
#include "base/global.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "base/utils/string.h" #include "base/utils/string.h"
@ -497,7 +498,7 @@ QString wrapText(const QString &text, int initialIndentation = USAGE_TEXT_COLUMN
QStringList lines = {words.first()}; QStringList lines = {words.first()};
int currentLineMaxLength = wrapAtColumn - initialIndentation; int currentLineMaxLength = wrapAtColumn - initialIndentation;
foreach (const QString &word, words.mid(1)) { for (const QString &word : copyAsConst(words.mid(1))) {
if (lines.last().length() + word.length() + 1 < currentLineMaxLength) { if (lines.last().length() + word.length() + 1 < currentLineMaxLength) {
lines.last().append(' ' + word); lines.last().append(' ' + word);
} }

5
src/app/filelogger.cpp
View File

@ -33,6 +33,7 @@
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include "base/global.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
@ -50,7 +51,7 @@ FileLogger::FileLogger(const QString &path, const bool backup, const int maxSize
this->deleteOld(age, ageType); this->deleteOld(age, ageType);
const Logger *const logger = Logger::instance(); const Logger *const logger = Logger::instance();
foreach (const Log::Msg &msg, logger->getMessages()) for (const Log::Msg &msg : copyAsConst(logger->getMessages()))
addLogMessage(msg); addLogMessage(msg);
connect(logger, &Logger::newLogMessage, this, &FileLogger::addLogMessage); connect(logger, &Logger::newLogMessage, this, &FileLogger::addLogMessage);
@ -87,7 +88,7 @@ void FileLogger::deleteOld(const int age, const FileLogAgeType ageType)
QDateTime date = QDateTime::currentDateTime(); QDateTime date = QDateTime::currentDateTime();
QDir dir(Utils::Fs::branchPath(m_path)); QDir dir(Utils::Fs::branchPath(m_path));
foreach (const QFileInfo file, dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed)) { for (const QFileInfo &file : copyAsConst(dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed))) {
QDateTime modificationDate = file.lastModified(); QDateTime modificationDate = file.lastModified();
switch (ageType) { switch (ageType) {
case DAYS: case DAYS:

10
src/app/upgrade.h
View File

@ -179,9 +179,9 @@ bool upgrade(bool ask = true)
// **************************************************************************************** // ****************************************************************************************
// Silently converts old v3.3.x .fastresume files // Silently converts old v3.3.x .fastresume files
QStringList backupFiles_3_3 = backupFolderDir.entryList( const QStringList backupFiles_3_3 = backupFolderDir.entryList(
QStringList(QLatin1String("*.fastresume.*")), QDir::Files, QDir::Unsorted); QStringList(QLatin1String("*.fastresume.*")), QDir::Files, QDir::Unsorted);
foreach (const QString &backupFile, backupFiles_3_3) for (const QString &backupFile : backupFiles_3_3)
upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile)); upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile));
// **************************************************************************************** // ****************************************************************************************
@ -197,10 +197,10 @@ bool upgrade(bool ask = true)
if (ask && !userAcceptsUpgrade()) return false; if (ask && !userAcceptsUpgrade()) return false;
QStringList backupFiles = backupFolderDir.entryList( const QStringList backupFiles = backupFolderDir.entryList(
QStringList(QLatin1String("*.fastresume")), QDir::Files, QDir::Unsorted); QStringList(QLatin1String("*.fastresume")), QDir::Files, QDir::Unsorted);
const QRegularExpression rx(QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$")); const QRegularExpression rx(QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$"));
foreach (QString backupFile, backupFiles) { for (const QString &backupFile : backupFiles) {
const QRegularExpressionMatch rxMatch = rx.match(backupFile); const QRegularExpressionMatch rxMatch = rx.match(backupFile);
if (rxMatch.hasMatch()) { if (rxMatch.hasMatch()) {
const QString hashStr = rxMatch.captured(1); const QString hashStr = rxMatch.captured(1);
@ -265,7 +265,7 @@ void migratePlistToIni(const QString &application)
plistFile->setFallbacksEnabled(false); plistFile->setFallbacksEnabled(false);
const QStringList plist = plistFile->allKeys(); const QStringList plist = plistFile->allKeys();
if (!plist.isEmpty()) { if (!plist.isEmpty()) {
foreach (const QString &key, plist) for (const QString &key : plist)
iniFile.setValue(key, plistFile->value(key)); iniFile.setValue(key, plistFile->value(key));
plistFile->clear(); plistFile->clear();
} }

4
src/base/bittorrent/magneturi.cpp
View File

@ -83,10 +83,10 @@ MagnetUri::MagnetUri(const QString &source)
m_hash = m_addTorrentParams.info_hash; m_hash = m_addTorrentParams.info_hash;
m_name = QString::fromStdString(m_addTorrentParams.name); m_name = QString::fromStdString(m_addTorrentParams.name);
foreach (const std::string &tracker, m_addTorrentParams.trackers) for (const std::string &tracker : m_addTorrentParams.trackers)
m_trackers.append(QString::fromStdString(tracker)); m_trackers.append(QString::fromStdString(tracker));
foreach (const std::string &urlSeed, m_addTorrentParams.url_seeds) for (const std::string &urlSeed : m_addTorrentParams.url_seeds)
m_urlSeeds.append(QUrl(urlSeed.c_str())); m_urlSeeds.append(QUrl(urlSeed.c_str()));
} }

60
src/base/bittorrent/session.cpp
View File

@ -199,7 +199,7 @@ namespace
for (auto i = categories.cbegin(); i != categories.cend(); ++i) { for (auto i = categories.cbegin(); i != categories.cend(); ++i) {
const QString &category = i.key(); const QString &category = i.key();
foreach (const QString &subcat, Session::expandCategory(category)) { for (const QString &subcat : copyAsConst(Session::expandCategory(category))) {
if (!expanded.contains(subcat)) if (!expanded.contains(subcat))
expanded[subcat] = ""; expanded[subcat] = "";
} }
@ -610,7 +610,7 @@ void Session::setTempPathEnabled(bool enabled)
{ {
if (enabled != isTempPathEnabled()) { if (enabled != isTempPathEnabled()) {
m_isTempPathEnabled = enabled; m_isTempPathEnabled = enabled;
foreach (TorrentHandle *const torrent, m_torrents) for (TorrentHandle *const torrent : qAsConst(m_torrents))
torrent->handleTempPathChanged(); torrent->handleTempPathChanged();
} }
} }
@ -624,7 +624,7 @@ void Session::setAppendExtensionEnabled(bool enabled)
{ {
if (isAppendExtensionEnabled() != enabled) { if (isAppendExtensionEnabled() != enabled) {
// append or remove .!qB extension for incomplete files // append or remove .!qB extension for incomplete files
foreach (TorrentHandle *const torrent, m_torrents) for (TorrentHandle *const torrent : qAsConst(m_torrents))
torrent->handleAppendExtensionToggled(); torrent->handleAppendExtensionToggled();
m_isAppendExtensionEnabled = enabled; m_isAppendExtensionEnabled = enabled;
@ -752,7 +752,7 @@ bool Session::addCategory(const QString &name, const QString &savePath)
return false; return false;
if (isSubcategoriesEnabled()) { if (isSubcategoriesEnabled()) {
foreach (const QString &parent, expandCategory(name)) { for (const QString &parent : copyAsConst(expandCategory(name))) {
if ((parent != name) && !m_categories.contains(parent)) { if ((parent != name) && !m_categories.contains(parent)) {
m_categories[parent] = ""; m_categories[parent] = "";
emit categoryAdded(parent); emit categoryAdded(parent);
@ -775,12 +775,12 @@ bool Session::editCategory(const QString &name, const QString &savePath)
m_categories[name] = savePath; m_categories[name] = savePath;
m_storedCategories = map_cast(m_categories); m_storedCategories = map_cast(m_categories);
if (isDisableAutoTMMWhenCategorySavePathChanged()) { if (isDisableAutoTMMWhenCategorySavePathChanged()) {
foreach (TorrentHandle *const torrent, torrents()) for (TorrentHandle *const torrent : copyAsConst(torrents()))
if (torrent->category() == name) if (torrent->category() == name)
torrent->setAutoTMMEnabled(false); torrent->setAutoTMMEnabled(false);
} }
else { else {
foreach (TorrentHandle *const torrent, torrents()) for (TorrentHandle *const torrent : copyAsConst(torrents()))
if (torrent->category() == name) if (torrent->category() == name)
torrent->handleCategorySavePathChanged(); torrent->handleCategorySavePathChanged();
} }
@ -790,7 +790,7 @@ bool Session::editCategory(const QString &name, const QString &savePath)
bool Session::removeCategory(const QString &name) bool Session::removeCategory(const QString &name)
{ {
foreach (TorrentHandle *const torrent, torrents()) for (TorrentHandle *const torrent : copyAsConst(torrents()))
if (torrent->belongsToCategory(name)) if (torrent->belongsToCategory(name))
torrent->setCategory(""); torrent->setCategory("");
@ -877,7 +877,7 @@ bool Session::addTag(const QString &tag)
bool Session::removeTag(const QString &tag) bool Session::removeTag(const QString &tag)
{ {
if (m_tags.remove(tag)) { if (m_tags.remove(tag)) {
foreach (TorrentHandle *const torrent, torrents()) for (TorrentHandle *const torrent : copyAsConst(torrents()))
torrent->removeTag(tag); torrent->removeTag(tag);
m_storedTags = m_tags.toList(); m_storedTags = m_tags.toList();
emit tagRemoved(tag); emit tagRemoved(tag);
@ -1085,7 +1085,7 @@ void Session::configure()
void Session::processBannedIPs(libt::ip_filter &filter) void Session::processBannedIPs(libt::ip_filter &filter)
{ {
// First, import current filter // First, import current filter
foreach (const QString &ip, m_bannedIPs.value()) { for (const QString &ip : copyAsConst(m_bannedIPs.value())) {
boost::system::error_code ec; boost::system::error_code ec;
libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec); libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec);
Q_ASSERT(!ec); Q_ASSERT(!ec);
@ -1204,7 +1204,7 @@ void Session::configure(libtorrent::settings_pack &settingsPack)
const ushort port = this->port(); const ushort port = this->port();
std::pair<int, int> ports(port, port); std::pair<int, int> ports(port, port);
settingsPack.set_int(libt::settings_pack::max_retry_port_bind, ports.second - ports.first); settingsPack.set_int(libt::settings_pack::max_retry_port_bind, ports.second - ports.first);
foreach (QString ip, getListeningIPs()) { for (QString ip : getListeningIPs()) {
libt::error_code ec; libt::error_code ec;
std::string interfacesStr; std::string interfacesStr;
@ -1770,7 +1770,7 @@ void Session::enableBandwidthScheduler()
void Session::populateAdditionalTrackers() void Session::populateAdditionalTrackers()
{ {
m_additionalTrackerList.clear(); m_additionalTrackerList.clear();
foreach (QString tracker, additionalTrackers().split('\n')) { for (QString tracker : copyAsConst(additionalTrackers().split('\n'))) {
tracker = tracker.trimmed(); tracker = tracker.trimmed();
if (!tracker.isEmpty()) if (!tracker.isEmpty())
m_additionalTrackerList << tracker; m_additionalTrackerList << tracker;
@ -1781,7 +1781,7 @@ void Session::processShareLimits()
{ {
qDebug("Processing share limits..."); qDebug("Processing share limits...");
foreach (TorrentHandle *const torrent, m_torrents) { for (TorrentHandle *const torrent : copyAsConst(torrents())) {
if (torrent->isSeed() && !torrent->isForced()) { if (torrent->isSeed() && !torrent->isForced()) {
if (torrent->ratioLimit() != TorrentHandle::NO_RATIO_LIMIT) { if (torrent->ratioLimit() != TorrentHandle::NO_RATIO_LIMIT) {
const qreal ratio = torrent->realRatio(); const qreal ratio = torrent->realRatio();
@ -1934,7 +1934,7 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
m_nativeSession->remove_torrent(torrent->nativeHandle(), libt::session::delete_partfile); m_nativeSession->remove_torrent(torrent->nativeHandle(), libt::session::delete_partfile);
#endif #endif
// Remove unwanted and incomplete files // Remove unwanted and incomplete files
foreach (const QString &unwantedFile, unwantedFiles) { for (const QString &unwantedFile : qAsConst(unwantedFiles)) {
qDebug("Removing unwanted file: %s", qUtf8Printable(unwantedFile)); qDebug("Removing unwanted file: %s", qUtf8Printable(unwantedFile));
Utils::Fs::forceRemove(unwantedFile); Utils::Fs::forceRemove(unwantedFile);
const QString parentFolder = Utils::Fs::branchPath(unwantedFile); const QString parentFolder = Utils::Fs::branchPath(unwantedFile);
@ -1948,7 +1948,7 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
QStringList filters; QStringList filters;
filters << QString("%1.*").arg(torrent->hash()); filters << QString("%1.*").arg(torrent->hash());
const QStringList files = resumeDataDir.entryList(filters, QDir::Files, QDir::Unsorted); const QStringList files = resumeDataDir.entryList(filters, QDir::Files, QDir::Unsorted);
foreach (const QString &file, files) for (const QString &file : files)
Utils::Fs::forceRemove(resumeDataDir.absoluteFilePath(file)); Utils::Fs::forceRemove(resumeDataDir.absoluteFilePath(file));
delete torrent; delete torrent;
@ -1983,7 +1983,7 @@ void Session::increaseTorrentsPriority(const QStringList &hashes)
std::greater<QPair<int, TorrentHandle *>>> torrentQueue; std::greater<QPair<int, TorrentHandle *>>> torrentQueue;
// Sort torrents by priority // Sort torrents by priority
foreach (const InfoHash &infoHash, hashes) { for (const InfoHash infoHash : hashes) {
TorrentHandle *const torrent = m_torrents.value(infoHash); TorrentHandle *const torrent = m_torrents.value(infoHash);
if (torrent && !torrent->isSeed()) if (torrent && !torrent->isSeed())
torrentQueue.push(qMakePair(torrent->queuePosition(), torrent)); torrentQueue.push(qMakePair(torrent->queuePosition(), torrent));
@ -2006,7 +2006,7 @@ void Session::decreaseTorrentsPriority(const QStringList &hashes)
std::less<QPair<int, TorrentHandle *>>> torrentQueue; std::less<QPair<int, TorrentHandle *>>> torrentQueue;
// Sort torrents by priority // Sort torrents by priority
foreach (const InfoHash &infoHash, hashes) { for (const InfoHash infoHash : hashes) {
TorrentHandle *const torrent = m_torrents.value(infoHash); TorrentHandle *const torrent = m_torrents.value(infoHash);
if (torrent && !torrent->isSeed()) if (torrent && !torrent->isSeed())
torrentQueue.push(qMakePair(torrent->queuePosition(), torrent)); torrentQueue.push(qMakePair(torrent->queuePosition(), torrent));
@ -2032,7 +2032,7 @@ void Session::topTorrentsPriority(const QStringList &hashes)
std::greater<QPair<int, TorrentHandle *>>> torrentQueue; std::greater<QPair<int, TorrentHandle *>>> torrentQueue;
// Sort torrents by priority // Sort torrents by priority
foreach (const InfoHash &infoHash, hashes) { for (const InfoHash infoHash : hashes) {
TorrentHandle *const torrent = m_torrents.value(infoHash); TorrentHandle *const torrent = m_torrents.value(infoHash);
if (torrent && !torrent->isSeed()) if (torrent && !torrent->isSeed())
torrentQueue.push(qMakePair(torrent->queuePosition(), torrent)); torrentQueue.push(qMakePair(torrent->queuePosition(), torrent));
@ -2055,7 +2055,7 @@ void Session::bottomTorrentsPriority(const QStringList &hashes)
std::less<QPair<int, TorrentHandle *>>> torrentQueue; std::less<QPair<int, TorrentHandle *>>> torrentQueue;
// Sort torrents by priority // Sort torrents by priority
foreach (const InfoHash &infoHash, hashes) { for (const InfoHash infoHash : hashes) {
TorrentHandle *const torrent = m_torrents.value(infoHash); TorrentHandle *const torrent = m_torrents.value(infoHash);
if (torrent && !torrent->isSeed()) if (torrent && !torrent->isSeed())
torrentQueue.push(qMakePair(torrent->queuePosition(), torrent)); torrentQueue.push(qMakePair(torrent->queuePosition(), torrent));
@ -2367,7 +2367,7 @@ void Session::exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolde
void Session::generateResumeData(bool final) void Session::generateResumeData(bool final)
{ {
foreach (TorrentHandle *const torrent, m_torrents) { for (TorrentHandle *const torrent : qAsConst(m_torrents)) {
if (!torrent->isValid()) continue; if (!torrent->isValid()) continue;
if (torrent->isChecking() || torrent->isPaused()) continue; if (torrent->isChecking() || torrent->isPaused()) continue;
if (!final && !torrent->needSaveResumeData()) continue; if (!final && !torrent->needSaveResumeData()) continue;
@ -2444,10 +2444,10 @@ void Session::setDefaultSavePath(QString path)
m_defaultSavePath = path; m_defaultSavePath = path;
if (isDisableAutoTMMWhenDefaultSavePathChanged()) if (isDisableAutoTMMWhenDefaultSavePathChanged())
foreach (TorrentHandle *const torrent, torrents()) for (TorrentHandle *const torrent : copyAsConst(torrents()))
torrent->setAutoTMMEnabled(false); torrent->setAutoTMMEnabled(false);
else else
foreach (TorrentHandle *const torrent, torrents()) for (TorrentHandle *const torrent : copyAsConst(torrents()))
torrent->handleCategorySavePathChanged(); torrent->handleCategorySavePathChanged();
} }
@ -2458,7 +2458,7 @@ void Session::setTempPath(QString path)
m_tempPath = path; m_tempPath = path;
foreach (TorrentHandle *const torrent, m_torrents) for (TorrentHandle *const torrent : qAsConst(m_torrents))
torrent->handleTempPathChanged(); torrent->handleTempPathChanged();
} }
@ -2532,7 +2532,7 @@ const QStringList Session::getListeningIPs()
QHostAddress ip; QHostAddress ip;
QString ipString; QString ipString;
QAbstractSocket::NetworkLayerProtocol protocol; QAbstractSocket::NetworkLayerProtocol protocol;
foreach (const QNetworkAddressEntry &entry, addresses) { for (const QNetworkAddressEntry &entry : addresses) {
ip = entry.ip(); ip = entry.ip();
ipString = ip.toString(); ipString = ip.toString();
protocol = ip.protocol(); protocol = ip.protocol();
@ -2578,7 +2578,7 @@ void Session::configureListeningInterface()
libt::error_code ec; libt::error_code ec;
const QStringList IPs = getListeningIPs(); const QStringList IPs = getListeningIPs();
foreach (const QString ip, IPs) { for (const QString ip : IPs) {
if (ip.isEmpty()) { if (ip.isEmpty()) {
logger->addMessage(tr("qBittorrent is trying to listen on any interface port: %1", "e.g: qBittorrent is trying to listen on any interface port: TCP/6881").arg(QString::number(port)), Log::INFO); logger->addMessage(tr("qBittorrent is trying to listen on any interface port: %1", "e.g: qBittorrent is trying to listen on any interface port: TCP/6881").arg(QString::number(port)), Log::INFO);
m_nativeSession->listen_on(ports, ec, 0, libt::session::listen_no_system_port); m_nativeSession->listen_on(ports, ec, 0, libt::session::listen_no_system_port);
@ -3776,7 +3776,7 @@ void Session::handleTorrentTrackerWarning(TorrentHandle *const torrent, const QS
bool Session::hasPerTorrentRatioLimit() const bool Session::hasPerTorrentRatioLimit() const
{ {
foreach (TorrentHandle *const torrent, m_torrents) for (TorrentHandle *const torrent : qAsConst(m_torrents))
if (torrent->ratioLimit() >= 0) return true; if (torrent->ratioLimit() >= 0) return true;
return false; return false;
@ -3784,7 +3784,7 @@ bool Session::hasPerTorrentRatioLimit() const
bool Session::hasPerTorrentSeedingTimeLimit() const bool Session::hasPerTorrentSeedingTimeLimit() const
{ {
foreach (TorrentHandle *const torrent, m_torrents) for (TorrentHandle *const torrent : qAsConst(m_torrents))
if (torrent->seedingTimeLimit() >= 0) return true; if (torrent->seedingTimeLimit() >= 0) return true;
return false; return false;
@ -3928,7 +3928,7 @@ void Session::startUpTorrents()
QMap<int, TorrentResumeData> queuedResumeData; QMap<int, TorrentResumeData> queuedResumeData;
int nextQueuePosition = 1; int nextQueuePosition = 1;
int numOfRemappedFiles = 0; int numOfRemappedFiles = 0;
foreach (const QString &fastresumeName, fastresumes) { for (const QString &fastresumeName : qAsConst(fastresumes)) {
const QRegularExpressionMatch rxMatch = rx.match(fastresumeName); const QRegularExpressionMatch rxMatch = rx.match(fastresumeName);
if (!rxMatch.hasMatch()) continue; if (!rxMatch.hasMatch()) continue;
@ -3967,7 +3967,7 @@ void Session::startUpTorrents()
} }
// starting up downloading torrents (queue position > 0) // starting up downloading torrents (queue position > 0)
foreach (const TorrentResumeData &torrentResumeData, queuedResumeData) for (const TorrentResumeData &torrentResumeData : qAsConst(queuedResumeData))
startupTorrent(torrentResumeData); startupTorrent(torrentResumeData);
return; return;
@ -4547,14 +4547,14 @@ void Session::handleStateUpdateAlert(libt::state_update_alert *p)
updateStats(); updateStats();
#endif #endif
foreach (const libt::torrent_status &status, p->status) { for (const libt::torrent_status &status : p->status) {
TorrentHandle *const torrent = m_torrents.value(status.info_hash); TorrentHandle *const torrent = m_torrents.value(status.info_hash);
if (torrent) if (torrent)
torrent->handleStateUpdate(status); torrent->handleStateUpdate(status);
} }
m_torrentStatusReport = TorrentStatusReport(); m_torrentStatusReport = TorrentStatusReport();
foreach (TorrentHandle *const torrent, m_torrents) { for (TorrentHandle *const torrent : qAsConst(m_torrents)) {
if (torrent->isDownloading()) if (torrent->isDownloading())
++m_torrentStatusReport.nbDownloading; ++m_torrentStatusReport.nbDownloading;
if (torrent->isUploading()) if (torrent->isUploading())

4
src/base/bittorrent/torrentcreatorthread.cpp
View File

@ -141,14 +141,14 @@ void TorrentCreatorThread::run()
#endif #endif
// Add url seeds // Add url seeds
foreach (QString seed, m_params.urlSeeds) { for (QString seed : qAsConst(m_params.urlSeeds)) {
seed = seed.trimmed(); seed = seed.trimmed();
if (!seed.isEmpty()) if (!seed.isEmpty())
newTorrent.add_url_seed(seed.toStdString()); newTorrent.add_url_seed(seed.toStdString());
} }
int tier = 0; int tier = 0;
foreach (const QString &tracker, m_params.trackers) { for (const QString &tracker : qAsConst(m_params.trackers)) {
if (tracker.isEmpty()) if (tracker.isEmpty())
++tier; ++tier;
else else

31
src/base/bittorrent/torrenthandle.cpp
View File

@ -55,6 +55,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "base/global.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/profile.h" #include "base/profile.h"
@ -77,7 +78,7 @@ namespace
ListType setToEntryList(const QSet<QString> &input) ListType setToEntryList(const QSet<QString> &input)
{ {
ListType entryList; ListType entryList;
foreach (const QString &setValue, input) for (const QString &setValue : input)
entryList.emplace_back(setValue.toStdString()); entryList.emplace_back(setValue.toStdString());
return entryList; return entryList;
} }
@ -374,10 +375,9 @@ QString TorrentHandle::nativeActualSavePath() const
QList<TrackerEntry> TorrentHandle::trackers() const QList<TrackerEntry> TorrentHandle::trackers() const
{ {
QList<TrackerEntry> entries; QList<TrackerEntry> entries;
std::vector<libt::announce_entry> announces; const std::vector<libt::announce_entry> announces = m_nativeHandle.trackers();
announces = m_nativeHandle.trackers(); for (const libt::announce_entry &tracker : announces)
foreach (const libt::announce_entry &tracker, announces)
entries << tracker; entries << tracker;
return entries; return entries;
@ -391,7 +391,7 @@ QHash<QString, TrackerInfo> TorrentHandle::trackerInfos() const
void TorrentHandle::addTrackers(const QList<TrackerEntry> &trackers) void TorrentHandle::addTrackers(const QList<TrackerEntry> &trackers)
{ {
QList<TrackerEntry> addedTrackers; QList<TrackerEntry> addedTrackers;
foreach (const TrackerEntry &tracker, trackers) { for (const TrackerEntry &tracker : trackers) {
if (addTracker(tracker)) if (addTracker(tracker))
addedTrackers << tracker; addedTrackers << tracker;
} }
@ -400,13 +400,13 @@ void TorrentHandle::addTrackers(const QList<TrackerEntry> &trackers)
m_session->handleTorrentTrackersAdded(this, addedTrackers); m_session->handleTorrentTrackersAdded(this, addedTrackers);
} }
void TorrentHandle::replaceTrackers(QList<TrackerEntry> trackers) void TorrentHandle::replaceTrackers(const QList<TrackerEntry> &trackers)
{ {
QList<TrackerEntry> existingTrackers = this->trackers(); QList<TrackerEntry> existingTrackers = this->trackers();
QList<TrackerEntry> addedTrackers; QList<TrackerEntry> addedTrackers;
std::vector<libt::announce_entry> announces; std::vector<libt::announce_entry> announces;
foreach (const TrackerEntry &tracker, trackers) { for (const TrackerEntry &tracker : trackers) {
announces.push_back(tracker.nativeEntry()); announces.push_back(tracker.nativeEntry());
if (!existingTrackers.contains(tracker)) if (!existingTrackers.contains(tracker))
addedTrackers << tracker; addedTrackers << tracker;
@ -438,9 +438,9 @@ bool TorrentHandle::addTracker(const TrackerEntry &tracker)
QList<QUrl> TorrentHandle::urlSeeds() const QList<QUrl> TorrentHandle::urlSeeds() const
{ {
QList<QUrl> urlSeeds; QList<QUrl> urlSeeds;
std::set<std::string> seeds = m_nativeHandle.url_seeds(); const std::set<std::string> seeds = m_nativeHandle.url_seeds();
foreach (const std::string &urlSeed, seeds) for (const std::string &urlSeed : seeds)
urlSeeds.append(QUrl(urlSeed.c_str())); urlSeeds.append(QUrl(urlSeed.c_str()));
return urlSeeds; return urlSeeds;
@ -449,7 +449,7 @@ QList<QUrl> TorrentHandle::urlSeeds() const
void TorrentHandle::addUrlSeeds(const QList<QUrl> &urlSeeds) void TorrentHandle::addUrlSeeds(const QList<QUrl> &urlSeeds)
{ {
QList<QUrl> addedUrlSeeds; QList<QUrl> addedUrlSeeds;
foreach (const QUrl &urlSeed, urlSeeds) { for (const QUrl &urlSeed : urlSeeds) {
if (addUrlSeed(urlSeed)) if (addUrlSeed(urlSeed))
addedUrlSeeds << urlSeed; addedUrlSeeds << urlSeed;
} }
@ -461,7 +461,7 @@ void TorrentHandle::addUrlSeeds(const QList<QUrl> &urlSeeds)
void TorrentHandle::removeUrlSeeds(const QList<QUrl> &urlSeeds) void TorrentHandle::removeUrlSeeds(const QList<QUrl> &urlSeeds)
{ {
QList<QUrl> removedUrlSeeds; QList<QUrl> removedUrlSeeds;
foreach (const QUrl &urlSeed, urlSeeds) { for (const QUrl &urlSeed : urlSeeds) {
if (removeUrlSeed(urlSeed)) if (removeUrlSeed(urlSeed))
removedUrlSeeds << urlSeed; removedUrlSeeds << urlSeed;
} }
@ -596,8 +596,7 @@ bool TorrentHandle::removeTag(const QString &tag)
void TorrentHandle::removeAllTags() void TorrentHandle::removeAllTags()
{ {
// QT automatically copies the container in foreach, so it's safe to mutate it. for (const QString &tag : copyAsConst(tags()))
foreach (const QString &tag, m_tags)
removeTag(tag); removeTag(tag);
} }
@ -883,9 +882,9 @@ bool TorrentHandle::hasError() const
bool TorrentHandle::hasFilteredPieces() const bool TorrentHandle::hasFilteredPieces() const
{ {
std::vector<int> pp = m_nativeHandle.piece_priorities(); const std::vector<int> pp = m_nativeHandle.piece_priorities();
foreach (const int priority, pp) for (const int priority : pp)
if (priority == 0) return true; if (priority == 0) return true;
return false; return false;
@ -1087,7 +1086,7 @@ QList<PeerInfo> TorrentHandle::peers() const
m_nativeHandle.get_peer_info(nativePeers); m_nativeHandle.get_peer_info(nativePeers);
foreach (const libt::peer_info &peer, nativePeers) for (const libt::peer_info &peer : nativePeers)
peers << PeerInfo(this, peer); peers << PeerInfo(this, peer);
return peers; return peers;

2
src/base/bittorrent/torrenthandle.h
View File

@ -356,7 +356,7 @@ namespace BitTorrent
void setSuperSeeding(bool enable); void setSuperSeeding(bool enable);
void flushCache(); void flushCache();
void addTrackers(const QList<TrackerEntry> &trackers); void addTrackers(const QList<TrackerEntry> &trackers);
void replaceTrackers(QList<TrackerEntry> trackers); void replaceTrackers(const QList<TrackerEntry> &trackers);
void addUrlSeeds(const QList<QUrl> &urlSeeds); void addUrlSeeds(const QList<QUrl> &urlSeeds);
void removeUrlSeeds(const QList<QUrl> &urlSeeds); void removeUrlSeeds(const QList<QUrl> &urlSeeds);
bool connectPeer(const PeerAddress &peerAddress); bool connectPeer(const PeerAddress &peerAddress);

4
src/base/bittorrent/torrentinfo.cpp
View File

@ -247,7 +247,7 @@ QList<TrackerEntry> TorrentInfo::trackers() const
if (!isValid()) return QList<TrackerEntry>(); if (!isValid()) return QList<TrackerEntry>();
QList<TrackerEntry> trackers; QList<TrackerEntry> trackers;
foreach (const libt::announce_entry &tracker, m_nativeInfo->trackers()) for (const libt::announce_entry &tracker : m_nativeInfo->trackers())
trackers.append(tracker); trackers.append(tracker);
return trackers; return trackers;
@ -258,7 +258,7 @@ QList<QUrl> TorrentInfo::urlSeeds() const
if (!isValid()) return QList<QUrl>(); if (!isValid()) return QList<QUrl>();
QList<QUrl> urlSeeds; QList<QUrl> urlSeeds;
foreach (const libt::web_seed_entry &webSeed, m_nativeInfo->web_seeds()) for (const libt::web_seed_entry &webSeed : m_nativeInfo->web_seeds())
if (webSeed.type == libt::web_seed_entry::url_seed) if (webSeed.type == libt::web_seed_entry::url_seed)
urlSeeds.append(QUrl(webSeed.url.c_str())); urlSeeds.append(QUrl(webSeed.url.c_str()));

2
src/base/http/connection.cpp
View File

@ -133,7 +133,7 @@ bool Connection::acceptsGzipEncoding(QString codings)
const auto isCodingAvailable = [](const QStringList &list, const QString &encoding) -> bool const auto isCodingAvailable = [](const QStringList &list, const QString &encoding) -> bool
{ {
foreach (const QString &str, list) { for (const QString &str : list) {
if (!str.startsWith(encoding)) if (!str.startsWith(encoding))
continue; continue;

4
src/base/http/server.cpp
View File

@ -146,9 +146,9 @@ QList<QSslCipher> Server::safeCipherList() const
const QStringList badCiphers = {"idea", "rc4"}; const QStringList badCiphers = {"idea", "rc4"};
const QList<QSslCipher> allCiphers = QSslSocket::supportedCiphers(); const QList<QSslCipher> allCiphers = QSslSocket::supportedCiphers();
QList<QSslCipher> safeCiphers; QList<QSslCipher> safeCiphers;
foreach (const QSslCipher &cipher, allCiphers) { for (const QSslCipher &cipher : allCiphers) {
bool isSafe = true; bool isSafe = true;
foreach (const QString &badCipher, badCiphers) { for (const QString &badCipher : badCiphers) {
if (cipher.name().contains(badCipher, Qt::CaseInsensitive)) { if (cipher.name().contains(badCipher, Qt::CaseInsensitive)) {
isSafe = false; isSafe = false;
break; break;

9
src/base/net/downloadmanager.cpp
View File

@ -39,6 +39,7 @@
#include <QSslError> #include <QSslError>
#include <QUrl> #include <QUrl>
#include "base/global.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "downloadhandler.h" #include "downloadhandler.h"
#include "proxyconfigurationmanager.h" #include "proxyconfigurationmanager.h"
@ -56,7 +57,7 @@ namespace
{ {
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
QList<QNetworkCookie> cookies = Preferences::instance()->getNetworkCookies(); QList<QNetworkCookie> cookies = Preferences::instance()->getNetworkCookies();
foreach (const QNetworkCookie &cookie, Preferences::instance()->getNetworkCookies()) { for (const QNetworkCookie &cookie : copyAsConst(Preferences::instance()->getNetworkCookies())) {
if (cookie.isSessionCookie() || (cookie.expirationDate() <= now)) if (cookie.isSessionCookie() || (cookie.expirationDate() <= now))
cookies.removeAll(cookie); cookies.removeAll(cookie);
} }
@ -68,7 +69,7 @@ namespace
{ {
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
QList<QNetworkCookie> cookies = allCookies(); QList<QNetworkCookie> cookies = allCookies();
foreach (const QNetworkCookie &cookie, allCookies()) { for (const QNetworkCookie &cookie : copyAsConst(allCookies())) {
if (cookie.isSessionCookie() || (cookie.expirationDate() <= now)) if (cookie.isSessionCookie() || (cookie.expirationDate() <= now))
cookies.removeAll(cookie); cookies.removeAll(cookie);
} }
@ -83,7 +84,7 @@ namespace
{ {
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
QList<QNetworkCookie> cookies = QNetworkCookieJar::cookiesForUrl(url); QList<QNetworkCookie> cookies = QNetworkCookieJar::cookiesForUrl(url);
foreach (const QNetworkCookie &cookie, QNetworkCookieJar::cookiesForUrl(url)) { for (const QNetworkCookie &cookie : copyAsConst(QNetworkCookieJar::cookiesForUrl(url))) {
if (!cookie.isSessionCookie() && (cookie.expirationDate() <= now)) if (!cookie.isSessionCookie() && (cookie.expirationDate() <= now))
cookies.removeAll(cookie); cookies.removeAll(cookie);
} }
@ -95,7 +96,7 @@ namespace
{ {
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
QList<QNetworkCookie> cookies = cookieList; QList<QNetworkCookie> cookies = cookieList;
foreach (const QNetworkCookie &cookie, cookieList) { for (const QNetworkCookie &cookie : cookieList) {
if (!cookie.isSessionCookie() && (cookie.expirationDate() <= now)) if (!cookie.isSessionCookie() && (cookie.expirationDate() <= now))
cookies.removeAll(cookie); cookies.removeAll(cookie);
} }

3
src/base/net/smtp.cpp
View File

@ -43,6 +43,7 @@
#include <QTcpSocket> #include <QTcpSocket>
#endif #endif
#include "base/global.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/preferences.h" #include "base/preferences.h"
@ -291,7 +292,7 @@ QByteArray Smtp::encodeMimeHeader(const QString &key, const QString &value, QTex
if (!prefix.isEmpty()) line += prefix; if (!prefix.isEmpty()) line += prefix;
if (!value.contains("=?") && latin1->canEncode(value)) { if (!value.contains("=?") && latin1->canEncode(value)) {
bool firstWord = true; bool firstWord = true;
foreach (const QByteArray &word, value.toLatin1().split(' ')) { for (const QByteArray &word : copyAsConst(value.toLatin1().split(' '))) {
if (line.size() > 78) { if (line.size() > 78) {
rv = rv + line + "\r\n"; rv = rv + line + "\r\n";
line.clear(); line.clear();

13
src/base/preferences.cpp
View File

@ -50,6 +50,7 @@
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#endif #endif
#include "global.h"
#include "logger.h" #include "logger.h"
#include "settingsstorage.h" #include "settingsstorage.h"
#include "utils/fs.h" #include "utils/fs.h"
@ -505,7 +506,7 @@ void Preferences::setWebUiAuthSubnetWhitelistEnabled(bool enabled)
QList<Utils::Net::Subnet> Preferences::getWebUiAuthSubnetWhitelist() const QList<Utils::Net::Subnet> Preferences::getWebUiAuthSubnetWhitelist() const
{ {
QList<Utils::Net::Subnet> subnets; QList<Utils::Net::Subnet> subnets;
foreach (const QString &rawSubnet, value("Preferences/WebUI/AuthSubnetWhitelist").toStringList()) { for (const QString &rawSubnet : copyAsConst(value("Preferences/WebUI/AuthSubnetWhitelist").toStringList())) {
bool ok = false; bool ok = false;
const Utils::Net::Subnet subnet = Utils::Net::parseSubnet(rawSubnet.trimmed(), &ok); const Utils::Net::Subnet subnet = Utils::Net::parseSubnet(rawSubnet.trimmed(), &ok);
if (ok) if (ok)
@ -1426,8 +1427,8 @@ void Preferences::setToolbarTextPosition(const int position)
QList<QNetworkCookie> Preferences::getNetworkCookies() const QList<QNetworkCookie> Preferences::getNetworkCookies() const
{ {
QList<QNetworkCookie> cookies; QList<QNetworkCookie> cookies;
QStringList rawCookies = value("Network/Cookies").toStringList(); const QStringList rawCookies = value("Network/Cookies").toStringList();
foreach (const QString &rawCookie, rawCookies) for (const QString &rawCookie : rawCookies)
cookies << QNetworkCookie::parseCookies(rawCookie.toUtf8()); cookies << QNetworkCookie::parseCookies(rawCookie.toUtf8());
return cookies; return cookies;
@ -1436,7 +1437,7 @@ QList<QNetworkCookie> Preferences::getNetworkCookies() const
void Preferences::setNetworkCookies(const QList<QNetworkCookie> &cookies) void Preferences::setNetworkCookies(const QList<QNetworkCookie> &cookies)
{ {
QStringList rawCookies; QStringList rawCookies;
foreach (const QNetworkCookie &cookie, cookies) for (const QNetworkCookie &cookie : cookies)
rawCookies << cookie.toRawForm(); rawCookies << cookie.toRawForm();
setValue("Network/Cookies", rawCookies); setValue("Network/Cookies", rawCookies);
@ -1477,10 +1478,10 @@ void Preferences::upgrade()
{ {
SettingsStorage *settingsStorage = SettingsStorage::instance(); SettingsStorage *settingsStorage = SettingsStorage::instance();
QStringList labels = value("TransferListFilters/customLabels").toStringList(); const QStringList labels = value("TransferListFilters/customLabels").toStringList();
if (!labels.isEmpty()) { if (!labels.isEmpty()) {
QVariantMap categories = value("BitTorrent/Session/Categories").toMap(); QVariantMap categories = value("BitTorrent/Session/Categories").toMap();
foreach (const QString &label, labels) { for (const QString &label : labels) {
if (!categories.contains(label)) if (!categories.contains(label))
categories[label] = ""; categories[label] = "";
} }

8
src/base/rss/rss_autodownloader.cpp
View File

@ -435,8 +435,8 @@ void AutoDownloader::loadRules(const QByteArray &data)
void AutoDownloader::loadRulesLegacy() void AutoDownloader::loadRulesLegacy()
{ {
SettingsPtr settings = Profile::instance().applicationSettings(QStringLiteral("qBittorrent-rss")); SettingsPtr settings = Profile::instance().applicationSettings(QStringLiteral("qBittorrent-rss"));
QVariantHash rules = settings->value(QStringLiteral("download_rules")).toHash(); const QVariantHash rules = settings->value(QStringLiteral("download_rules")).toHash();
foreach (const QVariant &ruleVar, rules) { for (const QVariant &ruleVar : rules) {
auto rule = AutoDownloadRule::fromLegacyDict(ruleVar.toHash()); auto rule = AutoDownloadRule::fromLegacyDict(ruleVar.toHash());
if (!rule.name().isEmpty()) if (!rule.name().isEmpty())
insertRule(rule); insertRule(rule);
@ -451,7 +451,7 @@ void AutoDownloader::store()
m_savingTimer.stop(); m_savingTimer.stop();
QJsonObject jsonObj; QJsonObject jsonObj;
foreach (auto rule, m_rules) for (const auto &rule : qAsConst(m_rules))
jsonObj.insert(rule.name(), rule.toJsonObject()); jsonObj.insert(rule.name(), rule.toJsonObject());
m_fileStorage->store(RulesFileName, QJsonDocument(jsonObj).toJson()); m_fileStorage->store(RulesFileName, QJsonDocument(jsonObj).toJson());
@ -473,7 +473,7 @@ void AutoDownloader::resetProcessingQueue()
m_processingQueue.clear(); m_processingQueue.clear();
if (!m_processingEnabled) return; if (!m_processingEnabled) return;
foreach (Article *article, Session::instance()->rootFolder()->articles()) { for (Article *article : copyAsConst(Session::instance()->rootFolder()->articles())) {
if (!article->isRead() && !article->torrentUrl().isEmpty()) if (!article->isRead() && !article->torrentUrl().isEmpty())
addJobForArticle(article); addJobForArticle(article);
} }

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

@ -442,7 +442,7 @@ AutoDownloadRule AutoDownloadRule::fromJsonObject(const QJsonObject &jsonObj, co
QStringList feedURLs; QStringList feedURLs;
if (feedsVal.isString()) if (feedsVal.isString())
feedURLs << feedsVal.toString(); feedURLs << feedsVal.toString();
else foreach (const QJsonValue &urlVal, feedsVal.toArray()) else for (const QJsonValue &urlVal : copyAsConst(feedsVal.toArray()))
feedURLs << urlVal.toString(); feedURLs << urlVal.toString();
rule.setFeedURLs(feedURLs); rule.setFeedURLs(feedURLs);
@ -452,7 +452,7 @@ AutoDownloadRule AutoDownloadRule::fromJsonObject(const QJsonObject &jsonObj, co
previouslyMatched << previouslyMatchedVal.toString(); previouslyMatched << previouslyMatchedVal.toString();
} }
else { else {
foreach (const QJsonValue &val, previouslyMatchedVal.toArray()) for (const QJsonValue &val : copyAsConst(previouslyMatchedVal.toArray()))
previouslyMatched << val.toString(); previouslyMatched << val.toString();
} }
rule.setPreviouslyMatchedEpisodes(previouslyMatched); rule.setPreviouslyMatchedEpisodes(previouslyMatched);

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

@ -109,7 +109,7 @@ QList<Article *> Feed::articles() const
void Feed::markAsRead() void Feed::markAsRead()
{ {
auto oldUnreadCount = m_unreadCount; auto oldUnreadCount = m_unreadCount;
foreach (Article *article, m_articles) { for (Article *article : qAsConst(m_articles)) {
if (!article->isRead()) { if (!article->isRead()) {
article->disconnect(this); article->disconnect(this);
article->markAsRead(); article->markAsRead();
@ -282,9 +282,9 @@ void Feed::loadArticles(const QByteArray &data)
return; return;
} }
QJsonArray jsonArr = jsonDoc.array(); const QJsonArray jsonArr = jsonDoc.array();
int i = -1; int i = -1;
foreach (const QJsonValue &jsonVal, jsonArr) { for (const QJsonValue &jsonVal : jsonArr) {
++i; ++i;
if (!jsonVal.isObject()) { if (!jsonVal.isObject()) {
LogMsg(tr("Couldn't load RSS article '%1#%2'. Invalid data format.").arg(m_url).arg(i) LogMsg(tr("Couldn't load RSS article '%1#%2'. Invalid data format.").arg(m_url).arg(i)
@ -304,9 +304,9 @@ void Feed::loadArticles(const QByteArray &data)
void Feed::loadArticlesLegacy() void Feed::loadArticlesLegacy()
{ {
SettingsPtr qBTRSSFeeds = Profile::instance().applicationSettings(QStringLiteral("qBittorrent-rss-feeds")); SettingsPtr qBTRSSFeeds = Profile::instance().applicationSettings(QStringLiteral("qBittorrent-rss-feeds"));
QVariantHash allOldItems = qBTRSSFeeds->value("old_items").toHash(); const QVariantHash allOldItems = qBTRSSFeeds->value("old_items").toHash();
foreach (const QVariant &var, allOldItems.value(m_url).toList()) { for (const QVariant &var : copyAsConst(allOldItems.value(m_url).toList())) {
auto hash = var.toHash(); auto hash = var.toHash();
// update legacy keys // update legacy keys
hash[Article::KeyLink] = hash.take(QLatin1String("news_link")); hash[Article::KeyLink] = hash.take(QLatin1String("news_link"));
@ -329,7 +329,7 @@ void Feed::store()
m_savingTimer.stop(); m_savingTimer.stop();
QJsonArray jsonArr; QJsonArray jsonArr;
foreach (Article *article, m_articles) for (Article *article :qAsConst(m_articles))
jsonArr << article->toJsonObject(); jsonArr << article->toJsonObject();
m_session->dataFileStorage()->store(m_dataFileName, QJsonDocument(jsonArr).toJson()); m_session->dataFileStorage()->store(m_dataFileName, QJsonDocument(jsonArr).toJson());

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

@ -47,7 +47,7 @@ Folder::~Folder()
{ {
emit aboutToBeDestroyed(this); emit aboutToBeDestroyed(this);
foreach (auto item, items()) for (auto item : copyAsConst(items()))
delete item; delete item;
} }
@ -55,7 +55,7 @@ QList<Article *> Folder::articles() const
{ {
QList<Article *> news; QList<Article *> news;
foreach (Item *item, items()) { for (Item *item : copyAsConst(items())) {
int n = news.size(); int n = news.size();
news << item->articles(); news << item->articles();
std::inplace_merge(news.begin(), news.begin() + n, news.end() std::inplace_merge(news.begin(), news.begin() + n, news.end()
@ -70,20 +70,20 @@ QList<Article *> Folder::articles() const
int Folder::unreadCount() const int Folder::unreadCount() const
{ {
int count = 0; int count = 0;
foreach (Item *item, items()) for (Item *item : copyAsConst(items()))
count += item->unreadCount(); count += item->unreadCount();
return count; return count;
} }
void Folder::markAsRead() void Folder::markAsRead()
{ {
foreach (Item *item, items()) for (Item *item : copyAsConst(items()))
item->markAsRead(); item->markAsRead();
} }
void Folder::refresh() void Folder::refresh()
{ {
foreach (Item *item, items()) for (Item *item : copyAsConst(items()))
item->refresh(); item->refresh();
} }
@ -95,7 +95,7 @@ QList<Item *> Folder::items() const
QJsonValue Folder::toJsonValue(bool withData) const QJsonValue Folder::toJsonValue(bool withData) const
{ {
QJsonObject jsonObj; QJsonObject jsonObj;
foreach (Item *item, items()) for (Item *item : copyAsConst(items()))
jsonObj.insert(item->name(), item->toJsonValue(withData)); jsonObj.insert(item->name(), item->toJsonValue(withData));
return jsonObj; return jsonObj;
@ -108,7 +108,7 @@ void Folder::handleItemUnreadCountChanged()
void Folder::cleanup() void Folder::cleanup()
{ {
foreach (Item *item, items()) for (Item *item : copyAsConst(items()))
item->cleanup(); item->cleanup();
} }

5
src/base/rss/rss_session.cpp
View File

@ -41,6 +41,7 @@
#include <QVariantHash> #include <QVariantHash>
#include "../asyncfilestorage.h" #include "../asyncfilestorage.h"
#include "../global.h"
#include "../logger.h" #include "../logger.h"
#include "../profile.h" #include "../profile.h"
#include "../settingsstorage.h" #include "../settingsstorage.h"
@ -283,7 +284,7 @@ void Session::load()
void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder) void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
{ {
bool updated = false; bool updated = false;
foreach (const QString &key, jsonObj.keys()) { for (const QString &key : copyAsConst(jsonObj.keys())) {
const QJsonValue val {jsonObj[key]}; const QJsonValue val {jsonObj[key]};
if (val.isString()) { if (val.isString()) {
// previous format (reduced form) doesn't contain UID // previous format (reduced form) doesn't contain UID
@ -355,7 +356,7 @@ void Session::loadLegacy()
const QString parentFolderPath = Item::parentPath(legacyPath); const QString parentFolderPath = Item::parentPath(legacyPath);
const QString feedUrl = Item::relativeName(legacyPath); const QString feedUrl = Item::relativeName(legacyPath);
foreach (const QString &folderPath, Item::expandPath(parentFolderPath)) for (const QString &folderPath : copyAsConst(Item::expandPath(parentFolderPath)))
addFolder(folderPath); addFolder(folderPath);
const QString feedPath = feedAliases[i].isEmpty() const QString feedPath = feedAliases[i].isEmpty()

9
src/base/scanfoldersmodel.cpp
View File

@ -35,6 +35,7 @@
#include "bittorrent/session.h" #include "bittorrent/session.h"
#include "filesystemwatcher.h" #include "filesystemwatcher.h"
#include "global.h"
#include "preferences.h" #include "preferences.h"
#include "utils/fs.h" #include "utils/fs.h"
@ -254,7 +255,7 @@ void ScanFoldersModel::addToFSWatcher(const QStringList &watchPaths)
if (!m_fsWatcher) if (!m_fsWatcher)
return; // addPath() wasn't called before this return; // addPath() wasn't called before this
foreach (const QString &path, watchPaths) { for (const QString &path : watchPaths) {
QDir watchDir(path); QDir watchDir(path);
const QString canonicalWatchPath = watchDir.canonicalPath(); const QString canonicalWatchPath = watchDir.canonicalPath();
m_fsWatcher->addPath(canonicalWatchPath); m_fsWatcher->addPath(canonicalWatchPath);
@ -282,7 +283,7 @@ bool ScanFoldersModel::removePath(const QString &path, bool removeFromFSWatcher)
void ScanFoldersModel::removeFromFSWatcher(const QStringList &watchPaths) void ScanFoldersModel::removeFromFSWatcher(const QStringList &watchPaths)
{ {
foreach (const QString &path, watchPaths) for (const QString &path : watchPaths)
m_fsWatcher->removePath(path); m_fsWatcher->removePath(path);
} }
@ -326,7 +327,7 @@ void ScanFoldersModel::makePersistent()
{ {
QVariantHash dirs; QVariantHash dirs;
foreach (const PathData *pathData, m_pathList) { for (const PathData *pathData : qAsConst(m_pathList)) {
if (pathData->downloadType == CUSTOM_LOCATION) if (pathData->downloadType == CUSTOM_LOCATION)
dirs.insert(Utils::Fs::fromNativePath(pathData->watchPath), Utils::Fs::fromNativePath(pathData->downloadPath)); dirs.insert(Utils::Fs::fromNativePath(pathData->watchPath), Utils::Fs::fromNativePath(pathData->downloadPath));
else else
@ -350,7 +351,7 @@ void ScanFoldersModel::configure()
void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList) void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList)
{ {
foreach (const QString &file, pathList) { for (const QString &file : pathList) {
qDebug("File %s added", qUtf8Printable(file)); qDebug("File %s added", qUtf8Printable(file));
BitTorrent::AddTorrentParams params; BitTorrent::AddTorrentParams params;

3
src/base/search/searchhandler.cpp
View File

@ -32,6 +32,7 @@
#include <QProcess> #include <QProcess>
#include <QTimer> #include <QTimer>
#include "../global.h"
#include "../utils/foreignapps.h" #include "../utils/foreignapps.h"
#include "../utils/fs.h" #include "../utils/fs.h"
#include "searchpluginmanager.h" #include "searchpluginmanager.h"
@ -138,7 +139,7 @@ void SearchHandler::readSearchOutput()
m_searchResultLineTruncated = lines.takeLast().trimmed(); m_searchResultLineTruncated = lines.takeLast().trimmed();
QList<SearchResult> searchResultList; QList<SearchResult> searchResultList;
foreach (const QByteArray &line, lines) { for (const QByteArray &line : qAsConst(lines)) {
SearchResult searchResult; SearchResult searchResult;
if (parseSearchResult(QString::fromUtf8(line), searchResult)) if (parseSearchResult(QString::fromUtf8(line), searchResult))
searchResultList << searchResult; searchResultList << searchResult;

7
src/base/search/searchpluginmanager.cpp
View File

@ -133,7 +133,7 @@ QStringList SearchPluginManager::supportedCategories() const
QStringList result; QStringList result;
for (const PluginInfo *plugin : qAsConst(m_plugins)) { for (const PluginInfo *plugin : qAsConst(m_plugins)) {
if (plugin->enabled) { if (plugin->enabled) {
foreach (QString cat, plugin->supportedCategories) { for (const QString &cat : plugin->supportedCategories) {
if (!result.contains(cat)) if (!result.contains(cat))
result << cat; result << cat;
} }
@ -277,9 +277,8 @@ bool SearchPluginManager::uninstallPlugin(const QString &name)
QDir pluginsFolder(pluginsLocation()); QDir pluginsFolder(pluginsLocation());
QStringList filters; QStringList filters;
filters << name + ".*"; filters << name + ".*";
QStringList files = pluginsFolder.entryList(filters, QDir::Files, QDir::Unsorted); const QStringList files = pluginsFolder.entryList(filters, QDir::Files, QDir::Unsorted);
QString file; for (const QString &file : files)
foreach (file, files)
Utils::Fs::forceRemove(pluginsFolder.absoluteFilePath(file)); Utils::Fs::forceRemove(pluginsFolder.absoluteFilePath(file));
// Remove it from supported engines // Remove it from supported engines
delete m_plugins.take(name); delete m_plugins.take(name);

3
src/base/settingsstorage.cpp
View File

@ -33,6 +33,7 @@
#include <QFile> #include <QFile>
#include <QHash> #include <QHash>
#include "global.h"
#include "logger.h" #include "logger.h"
#include "profile.h" #include "profile.h"
#include "utils/fs.h" #include "utils/fs.h"
@ -286,7 +287,7 @@ QString TransactionalSettings::deserialize(const QString &name, QVariantHash &da
// Copy everything into memory. This means even keys inserted in the file manually // Copy everything into memory. This means even keys inserted in the file manually
// or that we don't touch directly in this code (eg disabled by ifdef). This ensures // or that we don't touch directly in this code (eg disabled by ifdef). This ensures
// that they will be copied over when save our settings to disk. // that they will be copied over when save our settings to disk.
foreach (const QString &key, settings->allKeys()) for (const QString &key : copyAsConst(settings->allKeys()))
data.insert(key, settings->value(key)); data.insert(key, settings->value(key));
return settings->fileName(); return settings->fileName();

2
src/base/utils/fs.cpp
View File

@ -141,7 +141,7 @@ bool Utils::Fs::smartRemoveEmptyFolderTree(const QString &path)
// remove temp files on linux (file ends with '~'), e.g. `filename~` // remove temp files on linux (file ends with '~'), e.g. `filename~`
QDir dir(p); QDir dir(p);
QStringList tmpFileList = dir.entryList(QDir::Files); const QStringList tmpFileList = dir.entryList(QDir::Files);
for (const QString &f : tmpFileList) { for (const QString &f : tmpFileList) {
if (f.endsWith('~')) if (f.endsWith('~'))
forceRemove(p + f); forceRemove(p + f);

6
src/base/utils/misc.cpp
View File

@ -391,7 +391,7 @@ QString Utils::Misc::getUserIDString()
QStringList Utils::Misc::toStringList(const QList<bool> &l) QStringList Utils::Misc::toStringList(const QList<bool> &l)
{ {
QStringList ret; QStringList ret;
foreach (const bool &b, l) for (const bool b : l)
ret << (b ? "1" : "0"); ret << (b ? "1" : "0");
return ret; return ret;
} }
@ -399,7 +399,7 @@ QStringList Utils::Misc::toStringList(const QList<bool> &l)
QList<int> Utils::Misc::intListfromStringList(const QStringList &l) QList<int> Utils::Misc::intListfromStringList(const QStringList &l)
{ {
QList<int> ret; QList<int> ret;
foreach (const QString &s, l) for (const QString &s : l)
ret << s.toInt(); ret << s.toInt();
return ret; return ret;
} }
@ -407,7 +407,7 @@ QList<int> Utils::Misc::intListfromStringList(const QStringList &l)
QList<bool> Utils::Misc::boolListfromStringList(const QStringList &l) QList<bool> Utils::Misc::boolListfromStringList(const QStringList &l)
{ {
QList<bool> ret; QList<bool> ret;
foreach (const QString &s, l) for (const QString &s : l)
ret << (s == "1"); ret << (s == "1");
return ret; return ret;
} }

2
src/base/utils/string.h
View File

@ -60,7 +60,7 @@ namespace Utils
{ {
if (str.length() < 2) return str; if (str.length() < 2) return str;
for (auto const quote : quotes) { for (const auto &quote : quotes) {
if (str.startsWith(quote) && str.endsWith(quote)) if (str.startsWith(quote) && str.endsWith(quote))
return str.mid(1, str.length() - 2); return str.mid(1, str.length() - 2);
} }

4
src/gui/addnewtorrentdialog.cpp
View File

@ -143,7 +143,7 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inP
m_ui->categoryComboBox->addItem(defaultCategory); m_ui->categoryComboBox->addItem(defaultCategory);
m_ui->categoryComboBox->addItem(""); m_ui->categoryComboBox->addItem("");
foreach (const QString &category, categories) for (const QString &category : qAsConst(categories))
if (category != defaultCategory && category != m_torrentParams.category) if (category != defaultCategory && category != m_torrentParams.category)
m_ui->categoryComboBox->addItem(category); m_ui->categoryComboBox->addItem(category);
@ -631,7 +631,7 @@ void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &)
prio = prio::IGNORED; prio = prio::IGNORED;
qDebug("Setting files priority"); qDebug("Setting files priority");
foreach (const QModelIndex &index, selectedRows) { for (const QModelIndex &index : selectedRows) {
qDebug("Setting priority(%d) for file at row %d", prio, index.row()); qDebug("Setting priority(%d) for file at row %d", prio, index.row());
m_contentModel->setData(m_contentModel->index(index.row(), PRIORITY, index.parent()), prio); m_contentModel->setData(m_contentModel->index(index.row(), PRIORITY, index.parent()), prio);
} }

7
src/gui/advancedsettings.cpp
View File

@ -36,6 +36,7 @@
#include <QNetworkInterface> #include <QNetworkInterface>
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/global.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/unicodestrings.h" #include "base/unicodestrings.h"
#include "app/application.h" #include "app/application.h"
@ -286,13 +287,13 @@ void AdvancedSettings::updateInterfaceAddressCombo()
}; };
if (ifaceName.isEmpty()) { if (ifaceName.isEmpty()) {
foreach (const QHostAddress &ip, QNetworkInterface::allAddresses()) for (const QHostAddress &ip : copyAsConst(QNetworkInterface::allAddresses()))
populateCombo(ip.toString(), ip.protocol()); populateCombo(ip.toString(), ip.protocol());
} }
else { else {
const QNetworkInterface iface = QNetworkInterface::interfaceFromName(ifaceName); const QNetworkInterface iface = QNetworkInterface::interfaceFromName(ifaceName);
const QList<QNetworkAddressEntry> addresses = iface.addressEntries(); const QList<QNetworkAddressEntry> addresses = iface.addressEntries();
foreach (const QNetworkAddressEntry &entry, addresses) { for (const QNetworkAddressEntry &entry : addresses) {
const QHostAddress ip = entry.ip(); const QHostAddress ip = entry.ip();
populateCombo(ip.toString(), ip.protocol()); populateCombo(ip.toString(), ip.protocol());
} }
@ -425,7 +426,7 @@ void AdvancedSettings::loadAdvancedSettings()
const QString currentInterface = session->networkInterface(); const QString currentInterface = session->networkInterface();
bool interfaceExists = currentInterface.isEmpty(); bool interfaceExists = currentInterface.isEmpty();
int i = 1; int i = 1;
foreach (const QNetworkInterface &iface, QNetworkInterface::allInterfaces()) { for (const QNetworkInterface &iface : copyAsConst(QNetworkInterface::allInterfaces())) {
// This line fixes a Qt bug => https://bugreports.qt.io/browse/QTBUG-52633 // This line fixes a Qt bug => https://bugreports.qt.io/browse/QTBUG-52633
// Tested in Qt 5.6.0. For more info see: // Tested in Qt 5.6.0. For more info see:
// https://github.com/qbittorrent/qBittorrent/issues/5131 // https://github.com/qbittorrent/qBittorrent/issues/5131

4
src/gui/banlistoptionsdialog.cpp
View File

@ -107,8 +107,8 @@ void BanListOptionsDialog::on_buttonBanIP_clicked()
void BanListOptionsDialog::on_buttonDeleteIP_clicked() void BanListOptionsDialog::on_buttonDeleteIP_clicked()
{ {
QModelIndexList selection = m_ui->bannedIPList->selectionModel()->selectedIndexes(); const QModelIndexList selection = m_ui->bannedIPList->selectionModel()->selectedIndexes();
for (auto &i : selection) for (const auto &i : selection)
m_sortFilter->removeRow(i.row()); m_sortFilter->removeRow(i.row());
m_modified = true; m_modified = true;

5
src/gui/categoryfiltermodel.cpp
View File

@ -33,6 +33,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
class CategoryModelItem class CategoryModelItem
@ -407,7 +408,7 @@ void CategoryFilterModel::populate()
const QString &category = i.key(); const QString &category = i.key();
if (m_isSubcategoriesEnabled) { if (m_isSubcategoriesEnabled) {
CategoryModelItem *parent = m_rootItem; CategoryModelItem *parent = m_rootItem;
foreach (const QString &subcat, session->expandCategory(category)) { for (const QString &subcat : copyAsConst(session->expandCategory(category))) {
const QString subcatName = shortName(subcat); const QString subcatName = shortName(subcat);
if (!parent->hasChild(subcatName)) { if (!parent->hasChild(subcatName)) {
new CategoryModelItem( new CategoryModelItem(
@ -436,7 +437,7 @@ CategoryModelItem *CategoryFilterModel::findItem(const QString &fullName) const
return m_rootItem->child(fullName); return m_rootItem->child(fullName);
CategoryModelItem *item = m_rootItem; CategoryModelItem *item = m_rootItem;
foreach (const QString &subcat, BitTorrent::Session::expandCategory(fullName)) { for (const QString &subcat : copyAsConst(BitTorrent::Session::expandCategory(fullName))) {
const QString subcatName = shortName(subcat); const QString subcatName = shortName(subcat);
if (!item->hasChild(subcatName)) return nullptr; if (!item->hasChild(subcatName)) return nullptr;
item = item->child(subcatName); item = item->child(subcatName);

3
src/gui/cookiesdialog.cpp
View File

@ -30,6 +30,7 @@
#include <algorithm> #include <algorithm>
#include "base/global.h"
#include "base/net/downloadmanager.h" #include "base/net/downloadmanager.h"
#include "base/settingsstorage.h" #include "base/settingsstorage.h"
#include "cookiesmodel.h" #include "cookiesmodel.h"
@ -100,6 +101,6 @@ void CookiesDialog::onButtonDeleteClicked()
} }
); );
for (const QModelIndex &idx : idxs) for (const QModelIndex &idx : qAsConst(idxs))
m_cookiesModel->removeRow(idx.row()); m_cookiesModel->removeRow(idx.row());
} }

5
src/gui/executionlogwidget.cpp
View File

@ -32,6 +32,7 @@
#include <QDateTime> #include <QDateTime>
#include <QPalette> #include <QPalette>
#include "base/global.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "loglistwidget.h" #include "loglistwidget.h"
#include "ui_executionlogwidget.h" #include "ui_executionlogwidget.h"
@ -52,9 +53,9 @@ ExecutionLogWidget::ExecutionLogWidget(QWidget *parent, const Log::MsgTypes &typ
m_ui->tabBan->layout()->addWidget(m_peerList); m_ui->tabBan->layout()->addWidget(m_peerList);
const Logger *const logger = Logger::instance(); const Logger *const logger = Logger::instance();
foreach (const Log::Msg &msg, logger->getMessages()) for (const Log::Msg &msg : copyAsConst(logger->getMessages()))
addLogMessage(msg); addLogMessage(msg);
foreach (const Log::Peer &peer, logger->getPeers()) for (const Log::Peer &peer : copyAsConst(logger->getPeers()))
addPeerMessage(peer); addPeerMessage(peer);
connect(logger, &Logger::newLogMessage, this, &ExecutionLogWidget::addLogMessage); connect(logger, &Logger::newLogMessage, this, &ExecutionLogWidget::addLogMessage);
connect(logger, &Logger::newLogPeer, this, &ExecutionLogWidget::addPeerMessage); connect(logger, &Logger::newLogPeer, this, &ExecutionLogWidget::addPeerMessage);

3
src/gui/loglistwidget.cpp
View File

@ -36,6 +36,7 @@
#include <QListWidgetItem> #include <QListWidgetItem>
#include <QRegularExpression> #include <QRegularExpression>
#include "base/global.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
LogListWidget::LogListWidget(int maxLines, const Log::MsgTypes &types, QWidget *parent) LogListWidget::LogListWidget(int maxLines, const Log::MsgTypes &types, QWidget *parent)
@ -97,7 +98,7 @@ void LogListWidget::copySelection()
{ {
static const QRegularExpression htmlTag("<[^>]+>"); static const QRegularExpression htmlTag("<[^>]+>");
QStringList strings; QStringList strings;
foreach (QListWidgetItem* it, selectedItems()) for (QListWidgetItem* it : copyAsConst(selectedItems()))
strings << static_cast<QLabel*>(itemWidget(it))->text().remove(htmlTag); strings << static_cast<QLabel*>(itemWidget(it))->text().remove(htmlTag);
QApplication::clipboard()->setText(strings.join('\n')); QApplication::clipboard()->setText(strings.join('\n'));

18
src/gui/mainwindow.cpp
View File

@ -284,7 +284,7 @@ MainWindow::MainWindow(QWidget *parent)
m_prioSeparatorMenu = m_ui->menuEdit->insertSeparator(m_ui->actionTopPriority); m_prioSeparatorMenu = m_ui->menuEdit->insertSeparator(m_ui->actionTopPriority);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
foreach (QAction *action, m_ui->toolBar->actions()) { for (QAction *action : copyAsConst(m_ui->toolBar->actions())) {
if (action->isSeparator()) { if (action->isSeparator()) {
QWidget *spacer = new QWidget(this); QWidget *spacer = new QWidget(this);
spacer->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); spacer->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@ -1239,7 +1239,7 @@ bool MainWindow::event(QEvent *e)
qDebug() << "Has active window:" << (qApp->activeWindow() != nullptr); qDebug() << "Has active window:" << (qApp->activeWindow() != nullptr);
// Check if there is a modal window // Check if there is a modal window
bool hasModalWindow = false; bool hasModalWindow = false;
foreach (QWidget *widget, QApplication::allWidgets()) { for (QWidget *widget : copyAsConst(QApplication::allWidgets())) {
if (widget->isModal()) { if (widget->isModal()) {
hasModalWindow = true; hasModalWindow = true;
break; break;
@ -1285,7 +1285,7 @@ void MainWindow::dropEvent(QDropEvent *event)
// remove scheme // remove scheme
QStringList files; QStringList files;
if (event->mimeData()->hasUrls()) { if (event->mimeData()->hasUrls()) {
foreach (const QUrl &url, event->mimeData()->urls()) { for (const QUrl &url : copyAsConst(event->mimeData()->urls())) {
if (url.isEmpty()) if (url.isEmpty())
continue; continue;
@ -1300,7 +1300,7 @@ void MainWindow::dropEvent(QDropEvent *event)
// differentiate ".torrent" files/links & magnet links from others // differentiate ".torrent" files/links & magnet links from others
QStringList torrentFiles, otherFiles; QStringList torrentFiles, otherFiles;
foreach (const QString &file, files) { for (const QString &file : qAsConst(files)) {
const bool isTorrentLink = (file.startsWith("magnet:", Qt::CaseInsensitive) const bool isTorrentLink = (file.startsWith("magnet:", Qt::CaseInsensitive)
|| file.endsWith(C_TORRENT_FILE_EXTENSION, Qt::CaseInsensitive) || file.endsWith(C_TORRENT_FILE_EXTENSION, Qt::CaseInsensitive)
|| Utils::Misc::isUrl(file)); || Utils::Misc::isUrl(file));
@ -1312,7 +1312,7 @@ void MainWindow::dropEvent(QDropEvent *event)
// Download torrents // Download torrents
const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled(); const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled();
foreach (const QString &file, torrentFiles) { for (const QString &file : qAsConst(torrentFiles)) {
if (useTorrentAdditionDialog) if (useTorrentAdditionDialog)
AddNewTorrentDialog::show(file, this); AddNewTorrentDialog::show(file, this);
else else
@ -1321,7 +1321,7 @@ void MainWindow::dropEvent(QDropEvent *event)
if (!torrentFiles.isEmpty()) return; if (!torrentFiles.isEmpty()) return;
// Create torrent // Create torrent
foreach (const QString &file, otherFiles) { for (const QString &file : qAsConst(otherFiles)) {
createTorrentTriggered(file); createTorrentTriggered(file);
// currently only hande the first entry // currently only hande the first entry
@ -1333,7 +1333,7 @@ void MainWindow::dropEvent(QDropEvent *event)
// Decode if we accept drag 'n drop or not // Decode if we accept drag 'n drop or not
void MainWindow::dragEnterEvent(QDragEnterEvent *event) void MainWindow::dragEnterEvent(QDragEnterEvent *event)
{ {
foreach (const QString &mime, event->mimeData()->formats()) for (const QString &mime : copyAsConst(event->mimeData()->formats()))
qDebug("mimeData: %s", mime.toLocal8Bit().data()); qDebug("mimeData: %s", mime.toLocal8Bit().data());
if (event->mimeData()->hasFormat("text/plain") || event->mimeData()->hasFormat("text/uri-list")) if (event->mimeData()->hasFormat("text/plain") || event->mimeData()->hasFormat("text/uri-list"))
event->acceptProposedAction(); event->acceptProposedAction();
@ -1382,7 +1382,7 @@ void MainWindow::on_actionOpen_triggered()
const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled(); const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled();
if (!pathsList.isEmpty()) { if (!pathsList.isEmpty()) {
foreach (QString file, pathsList) { for (const QString &file : pathsList) {
qDebug("Dropped file %s on download list", qUtf8Printable(file)); qDebug("Dropped file %s on download list", qUtf8Printable(file));
if (useTorrentAdditionDialog) if (useTorrentAdditionDialog)
AddNewTorrentDialog::show(file, this); AddNewTorrentDialog::show(file, this);
@ -1635,7 +1635,7 @@ void MainWindow::showNotificationBaloon(QString title, QString msg) const
void MainWindow::downloadFromURLList(const QStringList &urlList) void MainWindow::downloadFromURLList(const QStringList &urlList)
{ {
const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled(); const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled();
foreach (QString url, urlList) { for (QString url : urlList) {
if (((url.size() == 40) && !url.contains(QRegularExpression("[^0-9A-Fa-f]"))) if (((url.size() == 40) && !url.contains(QRegularExpression("[^0-9A-Fa-f]")))
|| ((url.size() == 32) && !url.contains(QRegularExpression("[^2-7A-Za-z]")))) || ((url.size() == 32) && !url.contains(QRegularExpression("[^2-7A-Za-z]"))))
url = "magnet:?xt=urn:btih:" + url; url = "magnet:?xt=urn:btih:" + url;

10
src/gui/optionsdialog.cpp
View File

@ -145,8 +145,8 @@ OptionsDialog::OptionsDialog(QWidget *parent)
m_ui->hsplitter->setCollapsible(0, false); m_ui->hsplitter->setCollapsible(0, false);
m_ui->hsplitter->setCollapsible(1, false); m_ui->hsplitter->setCollapsible(1, false);
// Get apply button in button box // Get apply button in button box
QList<QAbstractButton *> buttons = m_ui->buttonBox->buttons(); const QList<QAbstractButton *> buttons = m_ui->buttonBox->buttons();
foreach (QAbstractButton *button, buttons) { for (QAbstractButton *button : buttons) {
if (m_ui->buttonBox->buttonRole(button) == QDialogButtonBox::ApplyRole) { if (m_ui->buttonBox->buttonRole(button) == QDialogButtonBox::ApplyRole) {
m_applyButton = button; m_applyButton = button;
break; break;
@ -455,7 +455,7 @@ void OptionsDialog::initializeLanguageCombo()
// List language files // List language files
const QDir langDir(":/lang"); const QDir langDir(":/lang");
const QStringList langFiles = langDir.entryList(QStringList("qbittorrent_*.qm"), QDir::Files); const QStringList langFiles = langDir.entryList(QStringList("qbittorrent_*.qm"), QDir::Files);
foreach (const QString langFile, langFiles) { for (const QString &langFile : langFiles) {
QString localeStr = langFile.mid(12); // remove "qbittorrent_" QString localeStr = langFile.mid(12); // remove "qbittorrent_"
localeStr.chop(3); // Remove ".qm" localeStr.chop(3); // Remove ".qm"
QString languageName; QString languageName;
@ -479,7 +479,7 @@ OptionsDialog::~OptionsDialog()
saveWindowState(); saveWindowState();
foreach (const QString &path, m_addedScanDirs) for (const QString &path : qAsConst(m_addedScanDirs))
ScanFoldersModel::instance()->removePath(path); ScanFoldersModel::instance()->removePath(path);
ScanFoldersModel::instance()->configure(); // reloads "removed" paths ScanFoldersModel::instance()->configure(); // reloads "removed" paths
delete m_ui; delete m_ui;
@ -1490,7 +1490,7 @@ void OptionsDialog::on_removeScanFolderButton_clicked()
if (selected.isEmpty()) if (selected.isEmpty())
return; return;
Q_ASSERT(selected.count() == ScanFoldersModel::instance()->columnCount()); Q_ASSERT(selected.count() == ScanFoldersModel::instance()->columnCount());
foreach (const QModelIndex &index, selected) { for (const QModelIndex &index : selected) {
if (index.column() == ScanFoldersModel::WATCH) if (index.column() == ScanFoldersModel::WATCH)
m_removedScanDirs << index.data().toString(); m_removedScanDirs << index.data().toString();
} }

16
src/gui/properties/peerlistwidget.cpp
View File

@ -248,9 +248,9 @@ void PeerListWidget::showPeerListMenu(const QPoint &)
if (!act) return; if (!act) return;
if (act == addPeerAct) { if (act == addPeerAct) {
QList<BitTorrent::PeerAddress> peersList = PeersAdditionDialog::askForPeers(this); const QList<BitTorrent::PeerAddress> peersList = PeersAdditionDialog::askForPeers(this);
int peerCount = 0; int peerCount = 0;
foreach (const BitTorrent::PeerAddress &addr, peersList) { for (const BitTorrent::PeerAddress &addr : peersList) {
if (torrent->connectPeer(addr)) { if (torrent->connectPeer(addr)) {
qDebug("Adding peer %s...", qUtf8Printable(addr.ip.toString())); qDebug("Adding peer %s...", qUtf8Printable(addr.ip.toString()));
Logger::instance()->addMessage(tr("Manually adding peer '%1'...").arg(addr.ip.toString())); Logger::instance()->addMessage(tr("Manually adding peer '%1'...").arg(addr.ip.toString()));
@ -284,8 +284,8 @@ void PeerListWidget::banSelectedPeers()
QString(), 0, 1); QString(), 0, 1);
if (ret) return; if (ret) return;
QModelIndexList selectedIndexes = selectionModel()->selectedRows(); const QModelIndexList selectedIndexes = selectionModel()->selectedRows();
foreach (const QModelIndex &index, selectedIndexes) { for (const QModelIndex &index : selectedIndexes) {
int row = m_proxyModel->mapToSource(index).row(); int row = m_proxyModel->mapToSource(index).row();
QString ip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString(); QString ip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString();
qDebug("Banning peer %s...", ip.toLocal8Bit().data()); qDebug("Banning peer %s...", ip.toLocal8Bit().data());
@ -298,9 +298,9 @@ void PeerListWidget::banSelectedPeers()
void PeerListWidget::copySelectedPeers() void PeerListWidget::copySelectedPeers()
{ {
QModelIndexList selectedIndexes = selectionModel()->selectedRows(); const QModelIndexList selectedIndexes = selectionModel()->selectedRows();
QStringList selectedPeers; QStringList selectedPeers;
foreach (const QModelIndex &index, selectedIndexes) { for (const QModelIndex &index : selectedIndexes) {
int row = m_proxyModel->mapToSource(index).row(); int row = m_proxyModel->mapToSource(index).row();
QString ip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString(); QString ip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString();
QString myport = m_listModel->data(m_listModel->index(row, PeerListDelegate::PORT)).toString(); QString myport = m_listModel->data(m_listModel->index(row, PeerListDelegate::PORT)).toString();
@ -339,10 +339,10 @@ void PeerListWidget::loadPeers(BitTorrent::TorrentHandle *const torrent, bool fo
{ {
if (!torrent) return; if (!torrent) return;
QList<BitTorrent::PeerInfo> peers = torrent->peers(); const QList<BitTorrent::PeerInfo> peers = torrent->peers();
QSet<QString> oldPeersSet = m_peerItems.keys().toSet(); QSet<QString> oldPeersSet = m_peerItems.keys().toSet();
foreach (const BitTorrent::PeerInfo &peer, peers) { for (const BitTorrent::PeerInfo &peer : peers) {
BitTorrent::PeerAddress addr = peer.address(); BitTorrent::PeerAddress addr = peer.address();
if (addr.ip.isNull()) continue; if (addr.ip.isNull()) continue;

3
src/gui/properties/peersadditiondialog.cpp
View File

@ -31,6 +31,7 @@
#include <QHostAddress> #include <QHostAddress>
#include <QMessageBox> #include <QMessageBox>
#include "base/global.h"
#include "ui_peersadditiondialog.h" #include "ui_peersadditiondialog.h"
PeersAdditionDialog::PeersAdditionDialog(QWidget *parent) PeersAdditionDialog::PeersAdditionDialog(QWidget *parent)
@ -61,7 +62,7 @@ void PeersAdditionDialog::validateInput()
QMessageBox::Ok); QMessageBox::Ok);
return; return;
} }
foreach (const QString &peer, m_ui->textEditPeers->toPlainText().trimmed().split('\n')) { for (const QString &peer : copyAsConst(m_ui->textEditPeers->toPlainText().trimmed().split('\n'))) {
BitTorrent::PeerAddress addr = parsePeer(peer); BitTorrent::PeerAddress addr = parsePeer(peer);
if (!addr.ip.isNull()) { if (!addr.ip.isNull()) {
m_peersList.append(addr); m_peersList.append(addr);

2
src/gui/properties/piecesbar.cpp
View File

@ -259,7 +259,7 @@ void PiecesBar::showToolTip(const QHelpEvent *e)
stream << "<html><body>"; stream << "<html><body>";
PieceIndexToImagePos transform {m_torrent->info(), m_image}; PieceIndexToImagePos transform {m_torrent->info(), m_image};
int pieceIndex = transform.pieceIndex(imagePos); int pieceIndex = transform.pieceIndex(imagePos);
QVector<int> files {m_torrent->info().fileIndicesForPiece(pieceIndex)}; const QVector<int> files {m_torrent->info().fileIndicesForPiece(pieceIndex)};
QString tooltipTitle; QString tooltipTitle;
if (files.count() > 1) { if (files.count() > 1) {

10
src/gui/properties/propertieswidget.cpp
View File

@ -511,7 +511,7 @@ void PropertiesWidget::loadUrlSeeds()
qDebug("Loading URL seeds"); qDebug("Loading URL seeds");
const QList<QUrl> hcSeeds = m_torrent->urlSeeds(); const QList<QUrl> hcSeeds = m_torrent->urlSeeds();
// Add url seeds // Add url seeds
foreach (const QUrl &hcSeed, hcSeeds) { for (const QUrl &hcSeed : hcSeeds) {
qDebug("Loading URL seed: %s", qUtf8Printable(hcSeed.toString())); qDebug("Loading URL seed: %s", qUtf8Printable(hcSeed.toString()));
new QListWidgetItem(hcSeed.toString(), m_ui->listWebSeeds); new QListWidgetItem(hcSeed.toString(), m_ui->listWebSeeds);
} }
@ -582,7 +582,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
{ {
if (!m_torrent) return; if (!m_torrent) return;
QModelIndexList selectedRows = m_ui->filesList->selectionModel()->selectedRows(0); const QModelIndexList selectedRows = m_ui->filesList->selectionModel()->selectedRows(0);
if (selectedRows.empty()) return; if (selectedRows.empty()) return;
QMenu myFilesLlistMenu; QMenu myFilesLlistMenu;
@ -630,7 +630,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
prio = prio::IGNORED; prio = prio::IGNORED;
qDebug("Setting files priority"); qDebug("Setting files priority");
foreach (QModelIndex index, selectedRows) { for (const QModelIndex &index : selectedRows) {
qDebug("Setting priority(%d) for file at row %d", prio, index.row()); qDebug("Setting priority(%d) for file at row %d", prio, index.row());
m_propListModel->setData(m_propListModel->index(index.row(), PRIORITY, index.parent()), prio); m_propListModel->setData(m_propListModel->index(index.row(), PRIORITY, index.parent()), prio);
} }
@ -847,7 +847,7 @@ void PropertiesWidget::deleteSelectedUrlSeeds()
if (selectedItems.isEmpty()) return; if (selectedItems.isEmpty()) return;
QList<QUrl> urlSeeds; QList<QUrl> urlSeeds;
foreach (const QListWidgetItem *item, selectedItems) for (const QListWidgetItem *item : selectedItems)
urlSeeds << item->text(); urlSeeds << item->text();
m_torrent->removeUrlSeeds(urlSeeds); m_torrent->removeUrlSeeds(urlSeeds);
@ -861,7 +861,7 @@ void PropertiesWidget::copySelectedWebSeedsToClipboard() const
if (selectedItems.isEmpty()) return; if (selectedItems.isEmpty()) return;
QStringList urlsToCopy; QStringList urlsToCopy;
foreach (QListWidgetItem *item, selectedItems) for (const QListWidgetItem *item : selectedItems)
urlsToCopy << item->text(); urlsToCopy << item->text();
QApplication::clipboard()->setText(urlsToCopy.join('\n')); QApplication::clipboard()->setText(urlsToCopy.join('\n'));

3
src/gui/properties/proptabbar.cpp
View File

@ -33,6 +33,7 @@
#include <QPushButton> #include <QPushButton>
#include <QSpacerItem> #include <QSpacerItem>
#include "base/global.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
PropTabBar::PropTabBar(QWidget *parent) PropTabBar::PropTabBar(QWidget *parent)
@ -102,7 +103,7 @@ PropTabBar::PropTabBar(QWidget *parent)
connect(m_btnGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked) connect(m_btnGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked)
, this, &PropTabBar::setCurrentIndex); , this, &PropTabBar::setCurrentIndex);
// Disable buttons focus // Disable buttons focus
foreach (QAbstractButton *btn, m_btnGroup->buttons()) for (QAbstractButton *btn : copyAsConst(m_btnGroup->buttons()))
btn->setFocusPolicy(Qt::NoFocus); btn->setFocusPolicy(Qt::NoFocus);
} }

2
src/gui/properties/speedplotview.cpp
View File

@ -274,7 +274,7 @@ void SpeedPlotView::paintEvent(QPaintEvent *)
rect.adjust(0, fontMetrics.height(), 0, 0); // Add top padding for top speed text rect.adjust(0, fontMetrics.height(), 0, 0); // Add top padding for top speed text
// draw Y axis speed labels // draw Y axis speed labels
QVector<QString> speedLabels = { const QVector<QString> speedLabels = {
formatLabel(niceScale.arg, niceScale.unit), formatLabel(niceScale.arg, niceScale.unit),
formatLabel((0.75 * niceScale.arg), niceScale.unit), formatLabel((0.75 * niceScale.arg), niceScale.unit),
formatLabel((0.50 * niceScale.arg), niceScale.unit), formatLabel((0.50 * niceScale.arg), niceScale.unit),

37
src/gui/properties/trackerlistwidget.cpp
View File

@ -45,6 +45,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/bittorrent/trackerentry.h" #include "base/bittorrent/trackerentry.h"
#include "base/global.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "autoexpandabledialog.h" #include "autoexpandabledialog.h"
@ -140,7 +141,7 @@ QList<QTreeWidgetItem*> TrackerListWidget::getSelectedTrackerItems() const
{ {
const QList<QTreeWidgetItem *> selectedTrackerItems = selectedItems(); const QList<QTreeWidgetItem *> selectedTrackerItems = selectedItems();
QList<QTreeWidgetItem *> selectedTrackers; QList<QTreeWidgetItem *> selectedTrackers;
foreach (QTreeWidgetItem *item, selectedTrackerItems) { for (QTreeWidgetItem *item : selectedTrackerItems) {
if (indexOfTopLevelItem(item) >= NB_STICKY_ITEM) // Ignore STICKY ITEMS if (indexOfTopLevelItem(item) >= NB_STICKY_ITEM) // Ignore STICKY ITEMS
selectedTrackers << item; selectedTrackers << item;
} }
@ -163,11 +164,11 @@ void TrackerListWidget::moveSelectionUp()
clear(); clear();
return; return;
} }
QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems(); const QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selectedTrackerItems.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
bool change = false; bool change = false;
foreach (QTreeWidgetItem *item, selectedTrackerItems) { for (QTreeWidgetItem *item : selectedTrackerItems) {
int index = indexOfTopLevelItem(item); int index = indexOfTopLevelItem(item);
if (index > NB_STICKY_ITEM) { if (index > NB_STICKY_ITEM) {
insertTopLevelItem(index - 1, takeTopLevelItem(index)); insertTopLevelItem(index - 1, takeTopLevelItem(index));
@ -178,7 +179,7 @@ void TrackerListWidget::moveSelectionUp()
// Restore selection // Restore selection
QItemSelectionModel *selection = selectionModel(); QItemSelectionModel *selection = selectionModel();
foreach (QTreeWidgetItem *item, selectedTrackerItems) for (QTreeWidgetItem *item : selectedTrackerItems)
selection->select(indexFromItem(item), (QItemSelectionModel::Rows | QItemSelectionModel::Select)); selection->select(indexFromItem(item), (QItemSelectionModel::Rows | QItemSelectionModel::Select));
setSelectionModel(selection); setSelectionModel(selection);
@ -204,7 +205,7 @@ void TrackerListWidget::moveSelectionDown()
clear(); clear();
return; return;
} }
QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems(); const QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selectedTrackerItems.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
bool change = false; bool change = false;
@ -219,7 +220,7 @@ void TrackerListWidget::moveSelectionDown()
// Restore selection // Restore selection
QItemSelectionModel *selection = selectionModel(); QItemSelectionModel *selection = selectionModel();
foreach (QTreeWidgetItem *item, selectedTrackerItems) for (QTreeWidgetItem *item : selectedTrackerItems)
selection->select(indexFromItem(item), (QItemSelectionModel::Rows | QItemSelectionModel::Select)); selection->select(indexFromItem(item), (QItemSelectionModel::Rows | QItemSelectionModel::Select));
setSelectionModel(selection); setSelectionModel(selection);
@ -289,7 +290,7 @@ void TrackerListWidget::loadStickyItems(BitTorrent::TorrentHandle *const torrent
// XXX: libtorrent should provide this info... // XXX: libtorrent should provide this info...
// Count peers from DHT, PeX, LSD // Count peers from DHT, PeX, LSD
uint seedsDHT = 0, seedsPeX = 0, seedsLSD = 0, peersDHT = 0, peersPeX = 0, peersLSD = 0; uint seedsDHT = 0, seedsPeX = 0, seedsLSD = 0, peersDHT = 0, peersPeX = 0, peersLSD = 0;
foreach (const BitTorrent::PeerInfo &peer, torrent->peers()) { for (const BitTorrent::PeerInfo &peer : copyAsConst(torrent->peers())) {
if (peer.isConnecting()) continue; if (peer.isConnecting()) continue;
if (peer.fromDHT()) { if (peer.fromDHT()) {
@ -331,7 +332,7 @@ void TrackerListWidget::loadTrackers()
// Load actual trackers information // Load actual trackers information
QHash<QString, BitTorrent::TrackerInfo> trackerData = torrent->trackerInfos(); QHash<QString, BitTorrent::TrackerInfo> trackerData = torrent->trackerInfos();
QStringList oldTrackerURLs = m_trackerItems.keys(); QStringList oldTrackerURLs = m_trackerItems.keys();
foreach (const BitTorrent::TrackerEntry &entry, torrent->trackers()) { for (const BitTorrent::TrackerEntry &entry : copyAsConst(torrent->trackers())) {
QString trackerURL = entry.url(); QString trackerURL = entry.url();
QTreeWidgetItem *item = m_trackerItems.value(trackerURL, nullptr); QTreeWidgetItem *item = m_trackerItems.value(trackerURL, nullptr);
if (!item) { if (!item) {
@ -383,7 +384,7 @@ void TrackerListWidget::loadTrackers()
item->setTextAlignment(COL_DOWNLOADED, (Qt::AlignRight | Qt::AlignVCenter)); item->setTextAlignment(COL_DOWNLOADED, (Qt::AlignRight | Qt::AlignVCenter));
} }
// Remove old trackers // Remove old trackers
foreach (const QString &tracker, oldTrackerURLs) for (const QString &tracker : qAsConst(oldTrackerURLs))
delete m_trackerItems.take(tracker); delete m_trackerItems.take(tracker);
} }
@ -394,7 +395,7 @@ void TrackerListWidget::askForTrackers()
if (!torrent) return; if (!torrent) return;
QList<BitTorrent::TrackerEntry> trackers; QList<BitTorrent::TrackerEntry> trackers;
foreach (const QString &tracker, TrackersAdditionDialog::askForTrackers(this, torrent)) for (const QString &tracker : copyAsConst(TrackersAdditionDialog::askForTrackers(this, torrent)))
trackers << tracker; trackers << tracker;
torrent->addTrackers(trackers); torrent->addTrackers(trackers);
@ -402,11 +403,11 @@ void TrackerListWidget::askForTrackers()
void TrackerListWidget::copyTrackerUrl() void TrackerListWidget::copyTrackerUrl()
{ {
QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems(); const QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selectedTrackerItems.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
QStringList urlsToCopy; QStringList urlsToCopy;
foreach (QTreeWidgetItem *item, selectedTrackerItems) { for (const QTreeWidgetItem *item : selectedTrackerItems) {
QString trackerURL = item->data(COL_URL, Qt::DisplayRole).toString(); QString trackerURL = item->data(COL_URL, Qt::DisplayRole).toString();
qDebug() << QString("Copy: ") + trackerURL; qDebug() << QString("Copy: ") + trackerURL;
urlsToCopy << trackerURL; urlsToCopy << trackerURL;
@ -423,11 +424,11 @@ void TrackerListWidget::deleteSelectedTrackers()
return; return;
} }
QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems(); const QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selectedTrackerItems.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
QStringList urlsToRemove; QStringList urlsToRemove;
foreach (QTreeWidgetItem *item, selectedTrackerItems) { for (const QTreeWidgetItem *item : selectedTrackerItems) {
QString trackerURL = item->data(COL_URL, Qt::DisplayRole).toString(); QString trackerURL = item->data(COL_URL, Qt::DisplayRole).toString();
urlsToRemove << trackerURL; urlsToRemove << trackerURL;
m_trackerItems.remove(trackerURL); m_trackerItems.remove(trackerURL);
@ -436,8 +437,8 @@ void TrackerListWidget::deleteSelectedTrackers()
// Iterate over the trackers and remove the selected ones // Iterate over the trackers and remove the selected ones
QList<BitTorrent::TrackerEntry> remainingTrackers; QList<BitTorrent::TrackerEntry> remainingTrackers;
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); const QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
foreach (const BitTorrent::TrackerEntry &entry, trackers) { for (const BitTorrent::TrackerEntry &entry : trackers) {
if (!urlsToRemove.contains(entry.url())) if (!urlsToRemove.contains(entry.url()))
remainingTrackers.push_back(entry); remainingTrackers.push_back(entry);
} }
@ -493,7 +494,7 @@ void TrackerListWidget::editSelectedTracker()
void TrackerListWidget::reannounceSelected() void TrackerListWidget::reannounceSelected()
{ {
QList<QTreeWidgetItem *> selItems = selectedItems(); const QList<QTreeWidgetItem *> selItems = selectedItems();
if (selItems.isEmpty()) return; if (selItems.isEmpty()) return;
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
@ -501,7 +502,7 @@ void TrackerListWidget::reannounceSelected()
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
foreach (QTreeWidgetItem* item, selItems) { for (const QTreeWidgetItem *item : selItems) {
// DHT case // DHT case
if (item == m_DHTItem) { if (item == m_DHTItem) {
torrent->forceDHTAnnounce(); torrent->forceDHTAnnounce();

7
src/gui/properties/trackersadditiondialog.cpp
View File

@ -34,6 +34,7 @@
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/bittorrent/trackerentry.h" #include "base/bittorrent/trackerentry.h"
#include "base/global.h"
#include "base/net/downloadhandler.h" #include "base/net/downloadhandler.h"
#include "base/net/downloadmanager.h" #include "base/net/downloadmanager.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
@ -59,7 +60,7 @@ TrackersAdditionDialog::~TrackersAdditionDialog()
QStringList TrackersAdditionDialog::newTrackers() const QStringList TrackersAdditionDialog::newTrackers() const
{ {
QStringList cleanTrackers; QStringList cleanTrackers;
foreach (QString url, m_ui->textEditTrackersList->toPlainText().split('\n')) { for (QString url : copyAsConst(m_ui->textEditTrackersList->toPlainText().split('\n'))) {
url = url.trimmed(); url = url.trimmed();
if (!url.isEmpty()) if (!url.isEmpty())
cleanTrackers << url; cleanTrackers << url;
@ -83,8 +84,8 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
// Load from torrent handle // Load from torrent handle
QList<BitTorrent::TrackerEntry> existingTrackers = m_torrent->trackers(); QList<BitTorrent::TrackerEntry> existingTrackers = m_torrent->trackers();
// Load from current user list // Load from current user list
QStringList tmp = m_ui->textEditTrackersList->toPlainText().split('\n'); const QStringList tmp = m_ui->textEditTrackersList->toPlainText().split('\n');
foreach (const QString &userURL, tmp) { for (const QString &userURL : tmp) {
BitTorrent::TrackerEntry userTracker(userURL); BitTorrent::TrackerEntry userTracker(userURL);
if (!existingTrackers.contains(userTracker)) if (!existingTrackers.contains(userTracker))
existingTrackers << userTracker; existingTrackers << userTracker;

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

@ -30,6 +30,7 @@
#include <QListWidgetItem> #include <QListWidgetItem>
#include "base/global.h"
#include "base/rss/rss_article.h" #include "base/rss/rss_article.h"
#include "base/rss/rss_item.h" #include "base/rss/rss_item.h"
@ -68,7 +69,7 @@ void ArticleListWidget::setRSSItem(RSS::Item *rssItem, bool unreadOnly)
connect(m_rssItem, &RSS::Item::articleRead, this, &ArticleListWidget::handleArticleRead); connect(m_rssItem, &RSS::Item::articleRead, this, &ArticleListWidget::handleArticleRead);
connect(m_rssItem, &RSS::Item::articleAboutToBeRemoved, this, &ArticleListWidget::handleArticleAboutToBeRemoved); connect(m_rssItem, &RSS::Item::articleAboutToBeRemoved, this, &ArticleListWidget::handleArticleAboutToBeRemoved);
foreach (auto article, rssItem->articles()) { for (const auto article : copyAsConst(rssItem->articles())) {
if (!(m_unreadOnly && article->isRead())) { if (!(m_unreadOnly && article->isRead())) {
auto item = createItem(article); auto item = createItem(article);
addItem(item); addItem(item);

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

@ -41,6 +41,7 @@
#include <QString> #include <QString>
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/global.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/rss/rss_article.h" #include "base/rss/rss_article.h"
#include "base/rss/rss_autodownloader.h" #include "base/rss/rss_autodownloader.h"
@ -131,7 +132,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(QWidget *parent)
loadFeedList(); loadFeedList();
m_ui->listRules->blockSignals(true); m_ui->listRules->blockSignals(true);
foreach (const RSS::AutoDownloadRule &rule, RSS::AutoDownloader::instance()->rules()) for (const RSS::AutoDownloadRule &rule : copyAsConst(RSS::AutoDownloader::instance()->rules()))
createRuleItem(rule); createRuleItem(rule);
m_ui->listRules->blockSignals(false); m_ui->listRules->blockSignals(false);
@ -181,7 +182,7 @@ void AutomatedRssDownloader::loadFeedList()
{ {
const QSignalBlocker feedListSignalBlocker(m_ui->listFeeds); const QSignalBlocker feedListSignalBlocker(m_ui->listFeeds);
foreach (auto feed, RSS::Session::instance()->feeds()) { for (const auto feed : copyAsConst(RSS::Session::instance()->feeds())) {
QListWidgetItem *item = new QListWidgetItem(feed->name(), m_ui->listFeeds); QListWidgetItem *item = new QListWidgetItem(feed->name(), m_ui->listFeeds);
item->setData(Qt::UserRole, feed->url()); item->setData(Qt::UserRole, feed->url());
item->setFlags(item->flags() | Qt::ItemIsUserCheckable | Qt::ItemIsTristate); item->setFlags(item->flags() | Qt::ItemIsUserCheckable | Qt::ItemIsTristate);
@ -211,7 +212,7 @@ void AutomatedRssDownloader::updateFeedList()
bool allEnabled = true; bool allEnabled = true;
bool anyEnabled = false; bool anyEnabled = false;
foreach (const QListWidgetItem *ruleItem, selection) { for (const QListWidgetItem *ruleItem : qAsConst(selection)) {
auto rule = RSS::AutoDownloader::instance()->ruleByName(ruleItem->text()); auto rule = RSS::AutoDownloader::instance()->ruleByName(ruleItem->text());
if (rule.feedURLs().contains(feedURL)) if (rule.feedURLs().contains(feedURL))
anyEnabled = true; anyEnabled = true;
@ -384,7 +385,7 @@ void AutomatedRssDownloader::on_removeRuleBtn_clicked()
if (QMessageBox::question(this, tr("Rule deletion confirmation"), confirmText, QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes) if (QMessageBox::question(this, tr("Rule deletion confirmation"), confirmText, QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes)
return; return;
foreach (QListWidgetItem *item, selection) for (const QListWidgetItem *item : selection)
RSS::AutoDownloader::instance()->removeRule(item->text()); RSS::AutoDownloader::instance()->removeRule(item->text());
} }
@ -548,7 +549,7 @@ void AutomatedRssDownloader::clearSelectedRuleDownloadedEpisodeList()
void AutomatedRssDownloader::handleFeedCheckStateChange(QListWidgetItem *feedItem) void AutomatedRssDownloader::handleFeedCheckStateChange(QListWidgetItem *feedItem)
{ {
const QString feedURL = feedItem->data(Qt::UserRole).toString(); const QString feedURL = feedItem->data(Qt::UserRole).toString();
foreach (QListWidgetItem *ruleItem, m_ui->listRules->selectedItems()) { for (QListWidgetItem *ruleItem : copyAsConst(m_ui->listRules->selectedItems())) {
RSS::AutoDownloadRule rule = (ruleItem == m_currentRuleItem RSS::AutoDownloadRule rule = (ruleItem == m_currentRuleItem
? m_currentRule ? m_currentRule
: RSS::AutoDownloader::instance()->ruleByName(ruleItem->text())); : RSS::AutoDownloader::instance()->ruleByName(ruleItem->text()));
@ -572,16 +573,16 @@ void AutomatedRssDownloader::updateMatchingArticles()
{ {
m_ui->treeMatchingArticles->clear(); m_ui->treeMatchingArticles->clear();
foreach (const QListWidgetItem *ruleItem, m_ui->listRules->selectedItems()) { for (const QListWidgetItem *ruleItem : copyAsConst(m_ui->listRules->selectedItems())) {
RSS::AutoDownloadRule rule = (ruleItem == m_currentRuleItem RSS::AutoDownloadRule rule = (ruleItem == m_currentRuleItem
? m_currentRule ? m_currentRule
: RSS::AutoDownloader::instance()->ruleByName(ruleItem->text())); : RSS::AutoDownloader::instance()->ruleByName(ruleItem->text()));
foreach (const QString &feedURL, rule.feedURLs()) { for (const QString &feedURL : copyAsConst(rule.feedURLs())) {
auto feed = RSS::Session::instance()->feedByURL(feedURL); auto feed = RSS::Session::instance()->feedByURL(feedURL);
if (!feed) continue; // feed doesn't exist if (!feed) continue; // feed doesn't exist
QStringList matchingArticles; QStringList matchingArticles;
foreach (auto article, feed->articles()) for (const auto article : copyAsConst(feed->articles()))
if (rule.matches(article->data())) if (rule.matches(article->data()))
matchingArticles << article->title(); matchingArticles << article->title();
if (!matchingArticles.isEmpty()) if (!matchingArticles.isEmpty())
@ -620,7 +621,7 @@ void AutomatedRssDownloader::addFeedArticlesToTree(RSS::Feed *feed, const QStrin
} }
// Insert the articles // Insert the articles
foreach (const QString &article, articles) { for (const QString &article : articles) {
QPair<QString, QString> key(feed->name(), article); QPair<QString, QString> key(feed->name(), article);
if (!m_treeListEntries.contains(key)) { if (!m_treeListEntries.contains(key)) {
@ -675,10 +676,10 @@ void AutomatedRssDownloader::updateMustLineValidity()
if (isRegex) if (isRegex)
tokens << text; tokens << text;
else else
foreach (const QString &token, text.split('|')) for (const QString &token : copyAsConst(text.split('|')))
tokens << Utils::String::wildcardToRegex(token); tokens << Utils::String::wildcardToRegex(token);
foreach (const QString &token, tokens) { for (const QString &token : qAsConst(tokens)) {
QRegularExpression reg(token, QRegularExpression::CaseInsensitiveOption); QRegularExpression reg(token, QRegularExpression::CaseInsensitiveOption);
if (!reg.isValid()) { if (!reg.isValid()) {
if (isRegex) if (isRegex)
@ -713,10 +714,10 @@ void AutomatedRssDownloader::updateMustNotLineValidity()
if (isRegex) if (isRegex)
tokens << text; tokens << text;
else else
foreach (const QString &token, text.split('|')) for (const QString &token : copyAsConst(text.split('|')))
tokens << Utils::String::wildcardToRegex(token); tokens << Utils::String::wildcardToRegex(token);
foreach (const QString &token, tokens) { for (const QString &token : qAsConst(tokens)) {
QRegularExpression reg(token, QRegularExpression::CaseInsensitiveOption); QRegularExpression reg(token, QRegularExpression::CaseInsensitiveOption);
if (!reg.isValid()) { if (!reg.isValid()) {
if (isRegex) if (isRegex)

5
src/gui/rss/feedlistwidget.cpp
View File

@ -33,6 +33,7 @@
#include <QDropEvent> #include <QDropEvent>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include "base/global.h"
#include "base/rss/rss_article.h" #include "base/rss/rss_article.h"
#include "base/rss/rss_feed.h" #include "base/rss/rss_feed.h"
#include "base/rss/rss_folder.h" #include "base/rss/rss_folder.h"
@ -219,7 +220,7 @@ void FeedListWidget::dropEvent(QDropEvent *event)
: RSS::Session::instance()->rootFolder()); : RSS::Session::instance()->rootFolder());
// move as much items as possible // move as much items as possible
foreach (QTreeWidgetItem *srcItem, selectedItems()) { for (QTreeWidgetItem *srcItem : copyAsConst(selectedItems())) {
auto rssItem = getRSSItem(srcItem); auto rssItem = getRSSItem(srcItem);
RSS::Session::instance()->moveItem(rssItem, RSS::Item::joinPath(destFolder->path(), rssItem->name())); RSS::Session::instance()->moveItem(rssItem, RSS::Item::joinPath(destFolder->path(), rssItem->name()));
} }
@ -264,7 +265,7 @@ QTreeWidgetItem *FeedListWidget::createItem(RSS::Item *rssItem, QTreeWidgetItem
void FeedListWidget::fill(QTreeWidgetItem *parent, RSS::Folder *rssParent) void FeedListWidget::fill(QTreeWidgetItem *parent, RSS::Folder *rssParent)
{ {
foreach (auto rssItem, rssParent->items()) { for (const auto rssItem : copyAsConst(rssParent->items())) {
QTreeWidgetItem *item = createItem(rssItem, parent); QTreeWidgetItem *item = createItem(rssItem, parent);
// Recursive call if this is a folder. // Recursive call if this is a folder.
if (auto folder = qobject_cast<RSS::Folder *>(rssItem)) if (auto folder = qobject_cast<RSS::Folder *>(rssItem))

23
src/gui/rss/rsswidget.cpp
View File

@ -41,6 +41,7 @@
#include <QString> #include <QString>
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/global.h"
#include "base/net/downloadmanager.h" #include "base/net/downloadmanager.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/rss/rss_article.h" #include "base/rss/rss_article.h"
@ -186,7 +187,7 @@ void RSSWidget::displayItemsListMenu(const QPoint &)
{ {
bool hasTorrent = false; bool hasTorrent = false;
bool hasLink = false; bool hasLink = false;
foreach (const QListWidgetItem *item, m_articleListWidget->selectedItems()) { for (const QListWidgetItem *item : copyAsConst(m_articleListWidget->selectedItems())) {
auto article = reinterpret_cast<RSS::Article *>(item->data(Qt::UserRole).value<quintptr>()); auto article = reinterpret_cast<RSS::Article *>(item->data(Qt::UserRole).value<quintptr>());
Q_ASSERT(article); Q_ASSERT(article);
@ -286,7 +287,7 @@ void RSSWidget::on_newFeedButton_clicked()
void RSSWidget::deleteSelectedItems() void RSSWidget::deleteSelectedItems()
{ {
QList<QTreeWidgetItem *> selectedItems = m_feedListWidget->selectedItems(); const QList<QTreeWidgetItem *> selectedItems = m_feedListWidget->selectedItems();
if (selectedItems.isEmpty()) if (selectedItems.isEmpty())
return; return;
if ((selectedItems.size() == 1) && (selectedItems.first() == m_feedListWidget->stickyUnreadItem())) if ((selectedItems.size() == 1) && (selectedItems.first() == m_feedListWidget->stickyUnreadItem()))
@ -298,7 +299,7 @@ void RSSWidget::deleteSelectedItems()
if (answer == QMessageBox::No) if (answer == QMessageBox::No)
return; return;
foreach (QTreeWidgetItem *item, selectedItems) for (QTreeWidgetItem *item : selectedItems)
if (item != m_feedListWidget->stickyUnreadItem()) if (item != m_feedListWidget->stickyUnreadItem())
RSS::Session::instance()->removeItem(m_feedListWidget->itemPath(item)); RSS::Session::instance()->removeItem(m_feedListWidget->itemPath(item));
} }
@ -306,9 +307,9 @@ void RSSWidget::deleteSelectedItems()
void RSSWidget::loadFoldersOpenState() void RSSWidget::loadFoldersOpenState()
{ {
const QStringList openedFolders = Preferences::instance()->getRssOpenFolders(); const QStringList openedFolders = Preferences::instance()->getRssOpenFolders();
foreach (const QString &varPath, openedFolders) { for (const QString &varPath : openedFolders) {
QTreeWidgetItem *parent = nullptr; QTreeWidgetItem *parent = nullptr;
foreach (const QString &name, varPath.split('\\')) { for (const QString &name : copyAsConst(varPath.split('\\'))) {
int nbChildren = (parent ? parent->childCount() : m_feedListWidget->topLevelItemCount()); int nbChildren = (parent ? parent->childCount() : m_feedListWidget->topLevelItemCount());
for (int i = 0; i < nbChildren; ++i) { for (int i = 0; i < nbChildren; ++i) {
QTreeWidgetItem *child = (parent ? parent->child(i) : m_feedListWidget->topLevelItem(i)); QTreeWidgetItem *child = (parent ? parent->child(i) : m_feedListWidget->topLevelItem(i));
@ -325,7 +326,7 @@ void RSSWidget::loadFoldersOpenState()
void RSSWidget::saveFoldersOpenState() void RSSWidget::saveFoldersOpenState()
{ {
QStringList openedFolders; QStringList openedFolders;
foreach (QTreeWidgetItem *item, m_feedListWidget->getAllOpenedFolders()) for (QTreeWidgetItem *item : copyAsConst(m_feedListWidget->getAllOpenedFolders()))
openedFolders << m_feedListWidget->itemPath(item); openedFolders << m_feedListWidget->itemPath(item);
Preferences::instance()->setRssOpenFolders(openedFolders); Preferences::instance()->setRssOpenFolders(openedFolders);
} }
@ -337,7 +338,7 @@ void RSSWidget::refreshAllFeeds()
void RSSWidget::downloadSelectedTorrents() void RSSWidget::downloadSelectedTorrents()
{ {
foreach (QListWidgetItem *item, m_articleListWidget->selectedItems()) { for (QListWidgetItem *item : copyAsConst(m_articleListWidget->selectedItems())) {
auto article = reinterpret_cast<RSS::Article *>(item->data(Qt::UserRole).value<quintptr>()); auto article = reinterpret_cast<RSS::Article *>(item->data(Qt::UserRole).value<quintptr>());
Q_ASSERT(article); Q_ASSERT(article);
@ -356,7 +357,7 @@ void RSSWidget::downloadSelectedTorrents()
// open the url of the selected RSS articles in the Web browser // open the url of the selected RSS articles in the Web browser
void RSSWidget::openSelectedArticlesUrls() void RSSWidget::openSelectedArticlesUrls()
{ {
foreach (QListWidgetItem *item, m_articleListWidget->selectedItems()) { for (QListWidgetItem *item : copyAsConst(m_articleListWidget->selectedItems())) {
auto article = reinterpret_cast<RSS::Article *>(item->data(Qt::UserRole).value<quintptr>()); auto article = reinterpret_cast<RSS::Article *>(item->data(Qt::UserRole).value<quintptr>());
Q_ASSERT(article); Q_ASSERT(article);
@ -397,7 +398,7 @@ void RSSWidget::renameSelectedRSSItem()
void RSSWidget::refreshSelectedItems() void RSSWidget::refreshSelectedItems()
{ {
foreach (QTreeWidgetItem *item, m_feedListWidget->selectedItems()) { for (QTreeWidgetItem *item : copyAsConst(m_feedListWidget->selectedItems())) {
if (item == m_feedListWidget->stickyUnreadItem()) { if (item == m_feedListWidget->stickyUnreadItem()) {
refreshAllFeeds(); refreshAllFeeds();
return; return;
@ -410,7 +411,7 @@ void RSSWidget::refreshSelectedItems()
void RSSWidget::copySelectedFeedsURL() void RSSWidget::copySelectedFeedsURL()
{ {
QStringList URLs; QStringList URLs;
foreach (QTreeWidgetItem *item, m_feedListWidget->selectedItems()) { for (QTreeWidgetItem *item : copyAsConst(m_feedListWidget->selectedItems())) {
if (auto feed = qobject_cast<RSS::Feed *>(m_feedListWidget->getRSSItem(item))) if (auto feed = qobject_cast<RSS::Feed *>(m_feedListWidget->getRSSItem(item)))
URLs << feed->url(); URLs << feed->url();
} }
@ -425,7 +426,7 @@ void RSSWidget::handleCurrentFeedItemChanged(QTreeWidgetItem *currentItem)
void RSSWidget::on_markReadButton_clicked() void RSSWidget::on_markReadButton_clicked()
{ {
foreach (QTreeWidgetItem *item, m_feedListWidget->selectedItems()) { for (QTreeWidgetItem *item : copyAsConst(m_feedListWidget->selectedItems())) {
m_feedListWidget->getRSSItem(item)->markAsRead(); m_feedListWidget->getRSSItem(item)->markAsRead();
if (item == m_feedListWidget->stickyUnreadItem()) if (item == m_feedListWidget->stickyUnreadItem())
break; // all items was read break; // all items was read

20
src/gui/search/pluginselectdialog.cpp
View File

@ -39,6 +39,7 @@
#include <QMimeData> #include <QMimeData>
#include <QTableView> #include <QTableView>
#include "base/global.h"
#include "base/net/downloadhandler.h" #include "base/net/downloadhandler.h"
#include "base/net/downloadmanager.h" #include "base/net/downloadmanager.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
@ -110,7 +111,7 @@ void PluginSelectDialog::dropEvent(QDropEvent *event)
QStringList files; QStringList files;
if (event->mimeData()->hasUrls()) { if (event->mimeData()->hasUrls()) {
foreach (const QUrl &url, event->mimeData()->urls()) { for (const QUrl &url : copyAsConst(event->mimeData()->urls())) {
if (!url.isEmpty()) { if (!url.isEmpty()) {
if (url.scheme().compare("file", Qt::CaseInsensitive) == 0) if (url.scheme().compare("file", Qt::CaseInsensitive) == 0)
files << url.toLocalFile(); files << url.toLocalFile();
@ -125,7 +126,7 @@ void PluginSelectDialog::dropEvent(QDropEvent *event)
if (files.isEmpty()) return; if (files.isEmpty()) return;
foreach (QString file, files) { for (const QString &file : qAsConst(files)) {
qDebug("dropped %s", qUtf8Printable(file)); qDebug("dropped %s", qUtf8Printable(file));
startAsyncOp(); startAsyncOp();
m_pluginManager->installPlugin(file); m_pluginManager->installPlugin(file);
@ -135,8 +136,7 @@ void PluginSelectDialog::dropEvent(QDropEvent *event)
// Decode if we accept drag 'n drop or not // Decode if we accept drag 'n drop or not
void PluginSelectDialog::dragEnterEvent(QDragEnterEvent *event) void PluginSelectDialog::dragEnterEvent(QDragEnterEvent *event)
{ {
QString mime; for (const QString &mime : copyAsConst(event->mimeData()->formats())) {
foreach (mime, event->mimeData()->formats()) {
qDebug("mimeData: %s", qUtf8Printable(mime)); qDebug("mimeData: %s", qUtf8Printable(mime));
} }
@ -188,7 +188,7 @@ void PluginSelectDialog::on_closeButton_clicked()
void PluginSelectDialog::on_actionUninstall_triggered() void PluginSelectDialog::on_actionUninstall_triggered()
{ {
bool error = false; bool error = false;
foreach (QTreeWidgetItem *item, m_ui->pluginsTree->selectedItems()) { for (QTreeWidgetItem *item : copyAsConst(m_ui->pluginsTree->selectedItems())) {
int index = m_ui->pluginsTree->indexOfTopLevelItem(item); int index = m_ui->pluginsTree->indexOfTopLevelItem(item);
Q_ASSERT(index != -1); Q_ASSERT(index != -1);
QString id = item->text(PLUGIN_ID); QString id = item->text(PLUGIN_ID);
@ -212,7 +212,7 @@ void PluginSelectDialog::on_actionUninstall_triggered()
void PluginSelectDialog::enableSelection(bool enable) void PluginSelectDialog::enableSelection(bool enable)
{ {
foreach (QTreeWidgetItem *item, m_ui->pluginsTree->selectedItems()) { for (QTreeWidgetItem *item : copyAsConst(m_ui->pluginsTree->selectedItems())) {
int index = m_ui->pluginsTree->indexOfTopLevelItem(item); int index = m_ui->pluginsTree->indexOfTopLevelItem(item);
Q_ASSERT(index != -1); Q_ASSERT(index != -1);
QString id = item->text(PLUGIN_ID); QString id = item->text(PLUGIN_ID);
@ -265,7 +265,7 @@ void PluginSelectDialog::loadSupportedSearchPlugins()
{ {
// Some clean up first // Some clean up first
m_ui->pluginsTree->clear(); m_ui->pluginsTree->clear();
foreach (QString name, m_pluginManager->allPlugins()) for (const QString &name : copyAsConst(m_pluginManager->allPlugins()))
addNewPlugin(name); addNewPlugin(name);
} }
@ -360,11 +360,11 @@ void PluginSelectDialog::askForPluginUrl()
void PluginSelectDialog::askForLocalPlugin() void PluginSelectDialog::askForLocalPlugin()
{ {
QStringList pathsList = QFileDialog::getOpenFileNames( const QStringList pathsList = QFileDialog::getOpenFileNames(
nullptr, tr("Select search plugins"), QDir::homePath(), nullptr, tr("Select search plugins"), QDir::homePath(),
tr("qBittorrent search plugin") + QLatin1String(" (*.py)") tr("qBittorrent search plugin") + QLatin1String(" (*.py)")
); );
foreach (QString path, pathsList) { for (const QString &path : pathsList) {
startAsyncOp(); startAsyncOp();
m_pluginManager->installPlugin(path); m_pluginManager->installPlugin(path);
} }
@ -380,7 +380,7 @@ void PluginSelectDialog::iconDownloaded(const QString &url, QString filePath)
QList<QSize> sizes = icon.availableSizes(); QList<QSize> sizes = icon.availableSizes();
bool invalid = (sizes.isEmpty() || icon.pixmap(sizes.first()).isNull()); bool invalid = (sizes.isEmpty() || icon.pixmap(sizes.first()).isNull());
if (!invalid) { if (!invalid) {
foreach (QTreeWidgetItem *item, findItemsWithUrl(url)) { for (QTreeWidgetItem *item : copyAsConst(findItemsWithUrl(url))) {
QString id = item->text(PLUGIN_ID); QString id = item->text(PLUGIN_ID);
PluginInfo *plugin = m_pluginManager->pluginInfo(id); PluginInfo *plugin = m_pluginManager->pluginInfo(id);
if (!plugin) continue; if (!plugin) continue;

4
src/gui/search/searchsortmodel.cpp
View File

@ -28,6 +28,8 @@
#include "searchsortmodel.h" #include "searchsortmodel.h"
#include "base/global.h"
SearchSortModel::SearchSortModel(QObject *parent) SearchSortModel::SearchSortModel(QObject *parent)
: base(parent) : base(parent)
, m_isNameFilterEnabled(false) , m_isNameFilterEnabled(false)
@ -126,7 +128,7 @@ bool SearchSortModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceP
const QAbstractItemModel *const sourceModel = this->sourceModel(); const QAbstractItemModel *const sourceModel = this->sourceModel();
if (m_isNameFilterEnabled && !m_searchTerm.isEmpty()) { if (m_isNameFilterEnabled && !m_searchTerm.isEmpty()) {
QString name = sourceModel->data(sourceModel->index(sourceRow, NAME, sourceParent)).toString(); QString name = sourceModel->data(sourceModel->index(sourceRow, NAME, sourceParent)).toString();
for (const QString &word : m_searchTermWords) { for (const QString &word : qAsConst(m_searchTermWords)) {
int i = name.indexOf(word, 0, Qt::CaseInsensitive); int i = name.indexOf(word, 0, Qt::CaseInsensitive);
if (i == -1) { if (i == -1) {
return false; return false;

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

@ -49,6 +49,7 @@
#include <QTreeView> #include <QTreeView>
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/global.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/search/searchpluginmanager.h" #include "base/search/searchpluginmanager.h"
#include "base/search/searchhandler.h" #include "base/search/searchhandler.h"
@ -166,11 +167,11 @@ void SearchWidget::fillCatCombobox()
using QStrPair = QPair<QString, QString>; using QStrPair = QPair<QString, QString>;
QList<QStrPair> tmpList; QList<QStrPair> tmpList;
foreach (const QString &cat, SearchPluginManager::instance()->getPluginCategories(selectedPlugin())) for (const QString &cat : copyAsConst(SearchPluginManager::instance()->getPluginCategories(selectedPlugin())))
tmpList << qMakePair(SearchPluginManager::categoryFullName(cat), cat); tmpList << qMakePair(SearchPluginManager::categoryFullName(cat), cat);
std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (QString::localeAwareCompare(l.first, r.first) < 0); }); std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (QString::localeAwareCompare(l.first, r.first) < 0); });
foreach (const QStrPair &p, tmpList) { for (const QStrPair &p : qAsConst(tmpList)) {
qDebug("Supported category: %s", qUtf8Printable(p.second)); qDebug("Supported category: %s", qUtf8Printable(p.second));
m_ui->comboCategory->addItem(p.first, QVariant(p.second)); m_ui->comboCategory->addItem(p.first, QVariant(p.second));
} }
@ -188,11 +189,11 @@ void SearchWidget::fillPluginComboBox()
using QStrPair = QPair<QString, QString>; using QStrPair = QPair<QString, QString>;
QList<QStrPair> tmpList; QList<QStrPair> tmpList;
foreach (const QString &name, SearchPluginManager::instance()->enabledPlugins()) for (const QString &name : copyAsConst(SearchPluginManager::instance()->enabledPlugins()))
tmpList << qMakePair(SearchPluginManager::instance()->pluginFullName(name), name); tmpList << qMakePair(SearchPluginManager::instance()->pluginFullName(name), name);
std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (l.first < r.first); } ); std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (l.first < r.first); } );
foreach (const QStrPair &p, tmpList) for (const QStrPair &p : qAsConst(tmpList))
m_ui->selectPlugin->addItem(p.first, QVariant(p.second)); m_ui->selectPlugin->addItem(p.first, QVariant(p.second));
if (m_ui->selectPlugin->count() > 3) if (m_ui->selectPlugin->count() > 3)

3
src/gui/statsdialog.cpp
View File

@ -32,6 +32,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/sessionstatus.h" #include "base/bittorrent/sessionstatus.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "base/utils/string.h" #include "base/utils/string.h"
#include "ui_statsdialog.h" #include "ui_statsdialog.h"
@ -89,7 +90,7 @@ void StatsDialog::update()
// num_peers is not reliable (adds up peers, which didn't even overcome tcp handshake) // num_peers is not reliable (adds up peers, which didn't even overcome tcp handshake)
quint32 peers = 0; quint32 peers = 0;
foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(BitTorrent::Session::instance()->torrents()))
peers += torrent->peersCount(); peers += torrent->peersCount();
m_ui->labelWriteStarve->setText(QString("%1%") m_ui->labelWriteStarve->setText(QString("%1%")

9
src/gui/tagfiltermodel.cpp
View File

@ -33,6 +33,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
namespace namespace
@ -236,7 +237,7 @@ void TagFilterModel::torrentAdded(BitTorrent::TorrentHandle *const torrent)
if (items.isEmpty()) if (items.isEmpty())
untaggedItem()->increaseTorrentsCount(); untaggedItem()->increaseTorrentsCount();
foreach (TagModelItem *item, items) for (TagModelItem *item : items)
item->increaseTorrentsCount(); item->increaseTorrentsCount();
} }
@ -247,7 +248,7 @@ void TagFilterModel::torrentAboutToBeRemoved(BitTorrent::TorrentHandle *const to
if (torrent->tags().isEmpty()) if (torrent->tags().isEmpty())
untaggedItem()->decreaseTorrentsCount(); untaggedItem()->decreaseTorrentsCount();
foreach (TagModelItem *item, findItems(torrent->tags())) for (TagModelItem *item : copyAsConst(findItems(torrent->tags())))
item->decreaseTorrentsCount(); item->decreaseTorrentsCount();
} }
@ -274,7 +275,7 @@ void TagFilterModel::populate()
[](Torrent *torrent) { return torrent->tags().isEmpty(); }); [](Torrent *torrent) { return torrent->tags().isEmpty(); });
addToModel(getSpecialUntaggedTag(), untaggedCount); addToModel(getSpecialUntaggedTag(), untaggedCount);
foreach (const QString &tag, session->tags()) { for (const QString &tag : copyAsConst(session->tags())) {
const int count = std::count_if(torrents.begin(), torrents.end(), const int count = std::count_if(torrents.begin(), torrents.end(),
[tag](Torrent *torrent) { return torrent->hasTag(tag); }); [tag](Torrent *torrent) { return torrent->hasTag(tag); });
addToModel(tag, count); addToModel(tag, count);
@ -313,7 +314,7 @@ QVector<TagModelItem *> TagFilterModel::findItems(const QSet<QString> &tags)
{ {
QVector<TagModelItem *> items; QVector<TagModelItem *> items;
items.reserve(tags.size()); items.reserve(tags.size());
foreach (const QString &tag, tags) { for (const QString &tag : tags) {
TagModelItem *item = findItem(tag); TagModelItem *item = findItem(tag);
if (item) if (item)
items.push_back(item); items.push_back(item);

3
src/gui/tagfilterwidget.cpp
View File

@ -35,6 +35,7 @@
#include <QMessageBox> #include <QMessageBox>
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/global.h"
#include "autoexpandabledialog.h" #include "autoexpandabledialog.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "tagfiltermodel.h" #include "tagfiltermodel.h"
@ -222,7 +223,7 @@ void TagFilterWidget::removeTag()
void TagFilterWidget::removeUnusedTags() void TagFilterWidget::removeUnusedTags()
{ {
auto session = BitTorrent::Session::instance(); auto session = BitTorrent::Session::instance();
foreach (const QString &tag, session->tags()) for (const QString &tag : copyAsConst(session->tags()))
if (model()->data(static_cast<TagFilterProxyModel *>(model())->index(tag), Qt::UserRole) == 0) if (model()->data(static_cast<TagFilterProxyModel *>(model())->index(tag), Qt::UserRole) == 0)
session->removeTag(tag); session->removeTag(tag);
updateGeometry(); updateGeometry();

7
src/gui/torrentcontentmodel.cpp
View File

@ -48,6 +48,7 @@
#include <QPixmapCache> #include <QPixmapCache>
#endif #endif
#include "base/global.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
@ -266,14 +267,14 @@ QVector<int> TorrentContentModel::getFilePriorities() const
{ {
QVector<int> prio; QVector<int> prio;
prio.reserve(m_filesIndex.size()); prio.reserve(m_filesIndex.size());
foreach (const TorrentContentModelFile *file, m_filesIndex) for (const TorrentContentModelFile *file : qAsConst(m_filesIndex))
prio.push_back(file->priority()); prio.push_back(file->priority());
return prio; return prio;
} }
bool TorrentContentModel::allFiltered() const bool TorrentContentModel::allFiltered() const
{ {
foreach (const TorrentContentModelFile *fileItem, m_filesIndex) for (const TorrentContentModelFile *fileItem : qAsConst(m_filesIndex))
if (fileItem->priority() != prio::IGNORED) if (fileItem->priority() != prio::IGNORED)
return false; return false;
return true; return true;
@ -476,7 +477,7 @@ void TorrentContentModel::setupModelData(const BitTorrent::TorrentInfo &info)
// Iterate of parts of the path to create necessary folders // Iterate of parts of the path to create necessary folders
QStringList pathFolders = path.split('/', QString::SkipEmptyParts); QStringList pathFolders = path.split('/', QString::SkipEmptyParts);
pathFolders.removeLast(); pathFolders.removeLast();
foreach (const QString &pathPart, pathFolders) { for (const QString &pathPart : qAsConst(pathFolders)) {
if (pathPart == ".unwanted") if (pathPart == ".unwanted")
continue; continue;
TorrentContentModelFolder* newParent = currentParent->childFolderWithName(pathPart); TorrentContentModelFolder* newParent = currentParent->childFolderWithName(pathPart);

9
src/gui/torrentcontentmodelfolder.cpp
View File

@ -29,6 +29,7 @@
#include "torrentcontentmodelfolder.h" #include "torrentcontentmodelfolder.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent) TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent)
: TorrentContentModelItem(parent) : TorrentContentModelItem(parent)
@ -85,7 +86,7 @@ TorrentContentModelItem *TorrentContentModelFolder::child(int row) const
TorrentContentModelFolder *TorrentContentModelFolder::childFolderWithName(const QString &name) const TorrentContentModelFolder *TorrentContentModelFolder::childFolderWithName(const QString &name) const
{ {
foreach (TorrentContentModelItem *child, m_childItems) for (TorrentContentModelItem *child : qAsConst(m_childItems))
if ((child->itemType() == FolderType) && (child->name() == name)) if ((child->itemType() == FolderType) && (child->name() == name))
return static_cast<TorrentContentModelFolder *>(child); return static_cast<TorrentContentModelFolder *>(child);
return nullptr; return nullptr;
@ -132,7 +133,7 @@ void TorrentContentModelFolder::setPriority(int newPriority, bool updateParent)
// Update children // Update children
if (m_priority != prio::MIXED) if (m_priority != prio::MIXED)
foreach (TorrentContentModelItem *child, m_childItems) for (TorrentContentModelItem *child : qAsConst(m_childItems))
child->setPriority(m_priority, false); child->setPriority(m_priority, false);
} }
@ -141,7 +142,7 @@ void TorrentContentModelFolder::recalculateProgress()
qreal tProgress = 0; qreal tProgress = 0;
qulonglong tSize = 0; qulonglong tSize = 0;
qulonglong tRemaining = 0; qulonglong tRemaining = 0;
foreach (TorrentContentModelItem *child, m_childItems) { for (TorrentContentModelItem *child : qAsConst(m_childItems)) {
if (child->priority() == prio::IGNORED) if (child->priority() == prio::IGNORED)
continue; continue;
@ -164,7 +165,7 @@ void TorrentContentModelFolder::recalculateAvailability()
qreal tAvailability = 0; qreal tAvailability = 0;
qulonglong tSize = 0; qulonglong tSize = 0;
bool foundAnyData = false; bool foundAnyData = false;
foreach (TorrentContentModelItem *child, m_childItems) { for (TorrentContentModelItem *child : qAsConst(m_childItems)) {
if (child->priority() == prio::IGNORED) if (child->priority() == prio::IGNORED)
continue; continue;

15
src/gui/transferlistfilterswidget.cpp
View File

@ -40,6 +40,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/bittorrent/trackerentry.h" #include "base/bittorrent/trackerentry.h"
#include "base/global.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/net/downloadhandler.h" #include "base/net/downloadhandler.h"
#include "base/net/downloadmanager.h" #include "base/net/downloadmanager.h"
@ -219,7 +220,7 @@ TrackerFiltersList::TrackerFiltersList(QWidget *parent, TransferListWidget *tran
TrackerFiltersList::~TrackerFiltersList() TrackerFiltersList::~TrackerFiltersList()
{ {
foreach (const QString &iconPath, m_iconPaths) for (const QString &iconPath : qAsConst(m_iconPaths))
Utils::Fs::forceRemove(iconPath); Utils::Fs::forceRemove(iconPath);
} }
@ -487,8 +488,8 @@ void TrackerFiltersList::applyFilter(int row)
void TrackerFiltersList::handleNewTorrent(BitTorrent::TorrentHandle *const torrent) void TrackerFiltersList::handleNewTorrent(BitTorrent::TorrentHandle *const torrent)
{ {
QString hash = torrent->hash(); QString hash = torrent->hash();
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); const QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
foreach (const BitTorrent::TrackerEntry &tracker, trackers) for (const BitTorrent::TrackerEntry &tracker : trackers)
addItem(tracker.url(), hash); addItem(tracker.url(), hash);
//Check for trackerless torrent //Check for trackerless torrent
@ -501,8 +502,8 @@ void TrackerFiltersList::handleNewTorrent(BitTorrent::TorrentHandle *const torre
void TrackerFiltersList::torrentAboutToBeDeleted(BitTorrent::TorrentHandle *const torrent) void TrackerFiltersList::torrentAboutToBeDeleted(BitTorrent::TorrentHandle *const torrent)
{ {
QString hash = torrent->hash(); QString hash = torrent->hash();
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); const QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
foreach (const BitTorrent::TrackerEntry &tracker, trackers) for (const BitTorrent::TrackerEntry &tracker : trackers)
removeItem(tracker.url(), hash); removeItem(tracker.url(), hash);
//Check for trackerless torrent //Check for trackerless torrent
@ -662,13 +663,13 @@ void TransferListFiltersWidget::setDownloadTrackerFavicon(bool value)
void TransferListFiltersWidget::addTrackers(BitTorrent::TorrentHandle *const torrent, const QList<BitTorrent::TrackerEntry> &trackers) void TransferListFiltersWidget::addTrackers(BitTorrent::TorrentHandle *const torrent, const QList<BitTorrent::TrackerEntry> &trackers)
{ {
foreach (const BitTorrent::TrackerEntry &tracker, trackers) for (const BitTorrent::TrackerEntry &tracker : trackers)
m_trackerFilters->addItem(tracker.url(), torrent->hash()); m_trackerFilters->addItem(tracker.url(), torrent->hash());
} }
void TransferListFiltersWidget::removeTrackers(BitTorrent::TorrentHandle *const torrent, const QList<BitTorrent::TrackerEntry> &trackers) void TransferListFiltersWidget::removeTrackers(BitTorrent::TorrentHandle *const torrent, const QList<BitTorrent::TrackerEntry> &trackers)
{ {
foreach (const BitTorrent::TrackerEntry &tracker, trackers) for (const BitTorrent::TrackerEntry &tracker : trackers)
m_trackerFilters->removeItem(tracker.url(), torrent->hash()); m_trackerFilters->removeItem(tracker.url(), torrent->hash());
} }

3
src/gui/transferlistmodel.cpp
View File

@ -36,6 +36,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "base/torrentfilter.h" #include "base/torrentfilter.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
@ -61,7 +62,7 @@ TransferListModel::TransferListModel(QObject *parent)
{ {
// Load the torrents // Load the torrents
using namespace BitTorrent; using namespace BitTorrent;
foreach (TorrentHandle *const torrent, Session::instance()->torrents()) for (TorrentHandle *const torrent : copyAsConst(Session::instance()->torrents()))
addTorrent(torrent); addTorrent(torrent);
// Listen for torrent changes // Listen for torrent changes

71
src/gui/transferlistwidget.cpp
View File

@ -43,6 +43,7 @@
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/torrentfilter.h" #include "base/torrentfilter.h"
@ -72,7 +73,7 @@ namespace
QStringList extractHashes(const QList<BitTorrent::TorrentHandle *> &torrents) QStringList extractHashes(const QList<BitTorrent::TorrentHandle *> &torrents)
{ {
QStringList hashes; QStringList hashes;
foreach (BitTorrent::TorrentHandle *const torrent, torrents) for (BitTorrent::TorrentHandle *const torrent : torrents)
hashes << torrent->hash(); hashes << torrent->hash();
return hashes; return hashes;
@ -381,7 +382,7 @@ void TransferListWidget::torrentDoubleClicked()
QList<BitTorrent::TorrentHandle *> TransferListWidget::getSelectedTorrents() const QList<BitTorrent::TorrentHandle *> TransferListWidget::getSelectedTorrents() const
{ {
QList<BitTorrent::TorrentHandle *> torrents; QList<BitTorrent::TorrentHandle *> torrents;
foreach (const QModelIndex &index, selectionModel()->selectedRows()) for (const QModelIndex &index : copyAsConst(selectionModel()->selectedRows()))
torrents << m_listModel->torrentHandle(mapToSource(index)); torrents << m_listModel->torrentHandle(mapToSource(index));
return torrents; return torrents;
@ -401,7 +402,7 @@ void TransferListWidget::setSelectedTorrentsLocation()
qDebug("New location is %s", qUtf8Printable(newLocation)); qDebug("New location is %s", qUtf8Printable(newLocation));
// Actually move storage // Actually move storage
foreach (BitTorrent::TorrentHandle *const torrent, torrents) { for (BitTorrent::TorrentHandle *const torrent : torrents) {
Logger::instance()->addMessage(tr("Set location: moving \"%1\", from \"%2\" to \"%3\"" Logger::instance()->addMessage(tr("Set location: moving \"%1\", from \"%2\" to \"%3\""
, "Set location: moving \"ubuntu_16_04.iso\", from \"/home/dir1\" to \"/home/dir2\"") , "Set location: moving \"ubuntu_16_04.iso\", from \"/home/dir1\" to \"/home/dir2\"")
.arg(torrent->name(), Utils::Fs::toNativePath(torrent->savePath()) .arg(torrent->name(), Utils::Fs::toNativePath(torrent->savePath())
@ -412,25 +413,25 @@ void TransferListWidget::setSelectedTorrentsLocation()
void TransferListWidget::pauseAllTorrents() void TransferListWidget::pauseAllTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(BitTorrent::Session::instance()->torrents()))
torrent->pause(); torrent->pause();
} }
void TransferListWidget::resumeAllTorrents() void TransferListWidget::resumeAllTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(BitTorrent::Session::instance()->torrents()))
torrent->resume(); torrent->resume();
} }
void TransferListWidget::startSelectedTorrents() void TransferListWidget::startSelectedTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->resume(); torrent->resume();
} }
void TransferListWidget::forceStartSelectedTorrents() void TransferListWidget::forceStartSelectedTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->resume(true); torrent->resume(true);
} }
@ -445,7 +446,7 @@ void TransferListWidget::startVisibleTorrents()
void TransferListWidget::pauseSelectedTorrents() void TransferListWidget::pauseSelectedTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->pause(); torrent->pause();
} }
@ -478,7 +479,7 @@ void TransferListWidget::deleteSelectedTorrents(bool deleteLocalFiles)
if (Preferences::instance()->confirmTorrentDeletion() if (Preferences::instance()->confirmTorrentDeletion()
&& !DeletionConfirmationDialog::askForDeletionConfirmation(this, deleteLocalFiles, torrents.size(), torrents[0]->name())) && !DeletionConfirmationDialog::askForDeletionConfirmation(this, deleteLocalFiles, torrents.size(), torrents[0]->name()))
return; return;
foreach (BitTorrent::TorrentHandle *const torrent, torrents) for (BitTorrent::TorrentHandle *const torrent : torrents)
BitTorrent::Session::instance()->deleteTorrent(torrent->hash(), deleteLocalFiles); BitTorrent::Session::instance()->deleteTorrent(torrent->hash(), deleteLocalFiles);
} }
@ -495,7 +496,7 @@ void TransferListWidget::deleteVisibleTorrents()
&& !DeletionConfirmationDialog::askForDeletionConfirmation(this, deleteLocalFiles, torrents.size(), torrents[0]->name())) && !DeletionConfirmationDialog::askForDeletionConfirmation(this, deleteLocalFiles, torrents.size(), torrents[0]->name()))
return; return;
foreach (BitTorrent::TorrentHandle *const torrent, torrents) for (BitTorrent::TorrentHandle *const torrent : qAsConst(torrents))
BitTorrent::Session::instance()->deleteTorrent(torrent->hash(), deleteLocalFiles); BitTorrent::Session::instance()->deleteTorrent(torrent->hash(), deleteLocalFiles);
} }
@ -528,7 +529,7 @@ void TransferListWidget::bottomPrioSelectedTorrents()
void TransferListWidget::copySelectedMagnetURIs() const void TransferListWidget::copySelectedMagnetURIs() const
{ {
QStringList magnetUris; QStringList magnetUris;
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
magnetUris << torrent->toMagnetUri(); magnetUris << torrent->toMagnetUri();
qApp->clipboard()->setText(magnetUris.join('\n')); qApp->clipboard()->setText(magnetUris.join('\n'));
@ -537,7 +538,7 @@ void TransferListWidget::copySelectedMagnetURIs() const
void TransferListWidget::copySelectedNames() const void TransferListWidget::copySelectedNames() const
{ {
QStringList torrentNames; QStringList torrentNames;
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrentNames << torrent->name(); torrentNames << torrent->name();
qApp->clipboard()->setText(torrentNames.join('\n')); qApp->clipboard()->setText(torrentNames.join('\n'));
@ -546,7 +547,7 @@ void TransferListWidget::copySelectedNames() const
void TransferListWidget::copySelectedHashes() const void TransferListWidget::copySelectedHashes() const
{ {
QStringList torrentHashes; QStringList torrentHashes;
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrentHashes << torrent->hash(); torrentHashes << torrent->hash();
qApp->clipboard()->setText(torrentHashes.join('\n')); qApp->clipboard()->setText(torrentHashes.join('\n'));
@ -566,13 +567,13 @@ void TransferListWidget::openSelectedTorrentsFolder() const
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// On macOS you expect both the files and folders to be opened in their parent // On macOS you expect both the files and folders to be opened in their parent
// folders prehilighted for opening, so we use a custom method. // folders prehilighted for opening, so we use a custom method.
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents())) {
QString path = torrent->contentPath(true); QString path = torrent->contentPath(true);
pathsList.insert(path); pathsList.insert(path);
} }
MacUtils::openFiles(pathsList); MacUtils::openFiles(pathsList);
#else #else
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents())) {
QString path = torrent->contentPath(true); QString path = torrent->contentPath(true);
if (!pathsList.contains(path)) { if (!pathsList.contains(path)) {
if (torrent->filesCount() == 1) if (torrent->filesCount() == 1)
@ -587,7 +588,7 @@ void TransferListWidget::openSelectedTorrentsFolder() const
void TransferListWidget::previewSelectedTorrents() void TransferListWidget::previewSelectedTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents())) {
if (torrent->hasMetadata()) if (torrent->hasMetadata())
new PreviewSelectDialog(this, torrent); new PreviewSelectDialog(this, torrent);
} }
@ -596,7 +597,7 @@ void TransferListWidget::previewSelectedTorrents()
void TransferListWidget::setDlLimitSelectedTorrents() void TransferListWidget::setDlLimitSelectedTorrents()
{ {
QList<BitTorrent::TorrentHandle *> torrentsList; QList<BitTorrent::TorrentHandle *> torrentsList;
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents())) {
if (torrent->isSeed()) if (torrent->isSeed())
continue; continue;
torrentsList += torrent; torrentsList += torrent;
@ -604,7 +605,7 @@ void TransferListWidget::setDlLimitSelectedTorrents()
if (torrentsList.empty()) return; if (torrentsList.empty()) return;
int oldLimit = torrentsList.first()->downloadLimit(); int oldLimit = torrentsList.first()->downloadLimit();
foreach (BitTorrent::TorrentHandle *const torrent, torrentsList) { for (BitTorrent::TorrentHandle *const torrent : qAsConst(torrentsList)) {
if (torrent->downloadLimit() != oldLimit) { if (torrent->downloadLimit() != oldLimit) {
oldLimit = -1; oldLimit = -1;
break; break;
@ -617,7 +618,7 @@ void TransferListWidget::setDlLimitSelectedTorrents()
, BitTorrent::Session::instance()->globalDownloadSpeedLimit()); , BitTorrent::Session::instance()->globalDownloadSpeedLimit());
if (!ok) return; if (!ok) return;
foreach (BitTorrent::TorrentHandle *const torrent, torrentsList) { for (BitTorrent::TorrentHandle *const torrent : qAsConst(torrentsList)) {
qDebug("Applying download speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qUtf8Printable(torrent->hash())); qDebug("Applying download speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qUtf8Printable(torrent->hash()));
torrent->setDownloadLimit(newLimit); torrent->setDownloadLimit(newLimit);
} }
@ -629,7 +630,7 @@ void TransferListWidget::setUpLimitSelectedTorrents()
if (torrentsList.empty()) return; if (torrentsList.empty()) return;
int oldLimit = torrentsList.first()->uploadLimit(); int oldLimit = torrentsList.first()->uploadLimit();
foreach (BitTorrent::TorrentHandle *const torrent, torrentsList) { for (BitTorrent::TorrentHandle *const torrent : qAsConst(torrentsList)) {
if (torrent->uploadLimit() != oldLimit) { if (torrent->uploadLimit() != oldLimit) {
oldLimit = -1; oldLimit = -1;
break; break;
@ -642,7 +643,7 @@ void TransferListWidget::setUpLimitSelectedTorrents()
, BitTorrent::Session::instance()->globalUploadSpeedLimit()); , BitTorrent::Session::instance()->globalUploadSpeedLimit());
if (!ok) return; if (!ok) return;
foreach (BitTorrent::TorrentHandle *const torrent, torrentsList) { for (BitTorrent::TorrentHandle *const torrent : qAsConst(torrentsList)) {
qDebug("Applying upload speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qUtf8Printable(torrent->hash())); qDebug("Applying upload speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qUtf8Printable(torrent->hash()));
torrent->setUploadLimit(newLimit); torrent->setUploadLimit(newLimit);
} }
@ -670,7 +671,7 @@ void TransferListWidget::setMaxRatioSelectedTorrents()
currentMaxSeedingTime, BitTorrent::TorrentHandle::MAX_SEEDING_TIME, this); currentMaxSeedingTime, BitTorrent::TorrentHandle::MAX_SEEDING_TIME, this);
if (dlg.exec() != QDialog::Accepted) return; if (dlg.exec() != QDialog::Accepted) return;
foreach (BitTorrent::TorrentHandle *const torrent, torrents) { for (BitTorrent::TorrentHandle *const torrent : torrents) {
qreal ratio = (dlg.useDefault() ? BitTorrent::TorrentHandle::USE_GLOBAL_RATIO : dlg.ratio()); qreal ratio = (dlg.useDefault() ? BitTorrent::TorrentHandle::USE_GLOBAL_RATIO : dlg.ratio());
torrent->setRatioLimit(ratio); torrent->setRatioLimit(ratio);
@ -686,13 +687,13 @@ void TransferListWidget::recheckSelectedTorrents()
if (ret != QMessageBox::Yes) return; if (ret != QMessageBox::Yes) return;
} }
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->forceRecheck(); torrent->forceRecheck();
} }
void TransferListWidget::reannounceSelectedTorrents() void TransferListWidget::reannounceSelectedTorrents()
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->forceReannounce(); torrent->forceReannounce();
} }
@ -738,7 +739,7 @@ void TransferListWidget::displayDLHoSMenu(const QPoint&)
void TransferListWidget::toggleSelectedTorrentsSuperSeeding() const void TransferListWidget::toggleSelectedTorrentsSuperSeeding() const
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents())) {
if (torrent->hasMetadata()) if (torrent->hasMetadata())
torrent->setSuperSeeding(!torrent->superSeeding()); torrent->setSuperSeeding(!torrent->superSeeding());
} }
@ -746,19 +747,19 @@ void TransferListWidget::toggleSelectedTorrentsSuperSeeding() const
void TransferListWidget::toggleSelectedTorrentsSequentialDownload() const void TransferListWidget::toggleSelectedTorrentsSequentialDownload() const
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->toggleSequentialDownload(); torrent->toggleSequentialDownload();
} }
void TransferListWidget::toggleSelectedFirstLastPiecePrio() const void TransferListWidget::toggleSelectedFirstLastPiecePrio() const
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->toggleFirstLastPiecePriority(); torrent->toggleFirstLastPiecePriority();
} }
void TransferListWidget::setSelectedAutoTMMEnabled(bool enabled) const void TransferListWidget::setSelectedAutoTMMEnabled(bool enabled) const
{ {
foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(getSelectedTorrents()))
torrent->setAutoTMMEnabled(enabled); torrent->setAutoTMMEnabled(enabled);
} }
@ -772,7 +773,7 @@ void TransferListWidget::askNewCategoryForSelection()
void TransferListWidget::askAddTagsForSelection() void TransferListWidget::askAddTagsForSelection()
{ {
const QStringList tags = askTagsForSelection(tr("Add Tags")); const QStringList tags = askTagsForSelection(tr("Add Tags"));
foreach (const QString &tag, tags) for (const QString &tag : tags)
addSelectionTag(tag); addSelectionTag(tag);
} }
@ -811,7 +812,7 @@ QStringList TransferListWidget::askTagsForSelection(const QString &dialogTitle)
void TransferListWidget::applyToSelectedTorrents(const std::function<void (BitTorrent::TorrentHandle *const)> &fn) void TransferListWidget::applyToSelectedTorrents(const std::function<void (BitTorrent::TorrentHandle *const)> &fn)
{ {
foreach (const QModelIndex &index, selectionModel()->selectedRows()) { for (const QModelIndex &index : copyAsConst(selectionModel()->selectedRows())) {
BitTorrent::TorrentHandle *const torrent = m_listModel->torrentHandle(mapToSource(index)); BitTorrent::TorrentHandle *const torrent = m_listModel->torrentHandle(mapToSource(index));
Q_ASSERT(torrent); Q_ASSERT(torrent);
fn(torrent); fn(torrent);
@ -839,7 +840,7 @@ void TransferListWidget::renameSelectedTorrent()
void TransferListWidget::setSelectionCategory(QString category) void TransferListWidget::setSelectionCategory(QString category)
{ {
foreach (const QModelIndex &index, selectionModel()->selectedRows()) for (const QModelIndex &index : copyAsConst(selectionModel()->selectedRows()))
m_listModel->setData(m_listModel->index(mapToSource(index).row(), TransferListModel::TR_CATEGORY), category, Qt::DisplayRole); m_listModel->setData(m_listModel->index(mapToSource(index).row(), TransferListModel::TR_CATEGORY), category, Qt::DisplayRole);
} }
@ -860,7 +861,7 @@ void TransferListWidget::clearSelectionTags()
void TransferListWidget::displayListMenu(const QPoint&) void TransferListWidget::displayListMenu(const QPoint&)
{ {
QModelIndexList selectedIndexes = selectionModel()->selectedRows(); const QModelIndexList selectedIndexes = selectionModel()->selectedRows();
if (selectedIndexes.size() == 0) return; if (selectedIndexes.size() == 0) return;
// Create actions // Create actions
@ -936,7 +937,7 @@ void TransferListWidget::displayListMenu(const QPoint&)
BitTorrent::TorrentHandle *torrent; BitTorrent::TorrentHandle *torrent;
qDebug("Displaying menu"); qDebug("Displaying menu");
foreach (const QModelIndex &index, selectedIndexes) { for (const QModelIndex &index : selectedIndexes) {
// Get the file name // Get the file name
// Get handle and pause the torrent // Get handle and pause the torrent
torrent = m_listModel->torrentHandle(mapToSource(index)); torrent = m_listModel->torrentHandle(mapToSource(index));
@ -1022,7 +1023,7 @@ void TransferListWidget::displayListMenu(const QPoint&)
categoryActions << categoryMenu->addAction(GuiIconProvider::instance()->getIcon("list-add"), tr("New...", "New category...")); categoryActions << categoryMenu->addAction(GuiIconProvider::instance()->getIcon("list-add"), tr("New...", "New category..."));
categoryActions << categoryMenu->addAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Reset", "Reset category")); categoryActions << categoryMenu->addAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Reset", "Reset category"));
categoryMenu->addSeparator(); categoryMenu->addSeparator();
foreach (QString category, categories) { for (QString category : qAsConst(categories)) {
category.replace('&', "&&"); // avoid '&' becomes accelerator key category.replace('&', "&&"); // avoid '&' becomes accelerator key
QAction *cat = new QAction(GuiIconProvider::instance()->getIcon("inode-directory"), category, categoryMenu); QAction *cat = new QAction(GuiIconProvider::instance()->getIcon("inode-directory"), category, categoryMenu);
if (allSameCategory && (category == firstCategory)) { if (allSameCategory && (category == firstCategory)) {
@ -1041,7 +1042,7 @@ void TransferListWidget::displayListMenu(const QPoint&)
tagsActions << tagsMenu->addAction(GuiIconProvider::instance()->getIcon("list-add"), tr("Add...", "Add / assign multiple tags...")); tagsActions << tagsMenu->addAction(GuiIconProvider::instance()->getIcon("list-add"), tr("Add...", "Add / assign multiple tags..."));
tagsActions << tagsMenu->addAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Remove All", "Remove all tags")); tagsActions << tagsMenu->addAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Remove All", "Remove all tags"));
tagsMenu->addSeparator(); tagsMenu->addSeparator();
foreach (QString tag, tags) { for (const QString &tag : qAsConst(tags)) {
const Qt::CheckState initialState = tagsInAll.contains(tag) ? Qt::Checked const Qt::CheckState initialState = tagsInAll.contains(tag) ? Qt::Checked
: tagsInAny.contains(tag) ? Qt::PartiallyChecked : tagsInAny.contains(tag) ? Qt::PartiallyChecked
: Qt::Unchecked; : Qt::Unchecked;

5
src/webui/api/logcontroller.cpp
View File

@ -30,6 +30,7 @@
#include <QJsonArray> #include <QJsonArray>
#include "base/global.h"
#include "base/logger.h" #include "base/logger.h"
#include "base/utils/string.h" #include "base/utils/string.h"
@ -71,7 +72,7 @@ void LogController::mainAction()
Logger *const logger = Logger::instance(); Logger *const logger = Logger::instance();
QVariantList msgList; QVariantList msgList;
foreach (const Log::Msg &msg, logger->getMessages(lastKnownId)) { for (const Log::Msg &msg : copyAsConst(logger->getMessages(lastKnownId))) {
if (!((msg.type == Log::NORMAL && isNormal) if (!((msg.type == Log::NORMAL && isNormal)
|| (msg.type == Log::INFO && isInfo) || (msg.type == Log::INFO && isInfo)
|| (msg.type == Log::WARNING && isWarning) || (msg.type == Log::WARNING && isWarning)
@ -110,7 +111,7 @@ void LogController::peersAction()
Logger *const logger = Logger::instance(); Logger *const logger = Logger::instance();
QVariantList peerList; QVariantList peerList;
foreach (const Log::Peer &peer, logger->getPeers(lastKnownId)) { for (const Log::Peer &peer : copyAsConst(logger->getPeers(lastKnownId))) {
QVariantMap map; QVariantMap map;
map[KEY_LOG_ID] = peer.id; map[KEY_LOG_ID] = peer.id;
map[KEY_LOG_TIMESTAMP] = peer.timestamp; map[KEY_LOG_TIMESTAMP] = peer.timestamp;

2
src/webui/api/searchcontroller.cpp
View File

@ -263,7 +263,7 @@ void SearchController::checkForUpdatesFinished(const QHash<QString, PluginVersio
LogMsg(tr("Updating %1 plugins").arg(updateInfo.size()), Log::INFO); LogMsg(tr("Updating %1 plugins").arg(updateInfo.size()), Log::INFO);
SearchPluginManager *const pluginManager = SearchPluginManager::instance(); SearchPluginManager *const pluginManager = SearchPluginManager::instance();
for (const QString &pluginName : updateInfo.keys()) { for (const QString &pluginName : copyAsConst(updateInfo.keys())) {
LogMsg(tr("Updating plugin %1").arg(pluginName), Log::INFO); LogMsg(tr("Updating plugin %1").arg(pluginName), Log::INFO);
pluginManager->updatePlugin(pluginName); pluginManager->updatePlugin(pluginName);
} }

11
src/webui/api/synccontroller.cpp
View File

@ -35,6 +35,7 @@
#include "base/bittorrent/peerinfo.h" #include "base/bittorrent/peerinfo.h"
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "base/net/geoipmanager.h" #include "base/net/geoipmanager.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
@ -133,7 +134,7 @@ namespace
// num_peers is not reliable (adds up peers, which didn't even overcome tcp handshake) // num_peers is not reliable (adds up peers, which didn't even overcome tcp handshake)
quint32 peers = 0; quint32 peers = 0;
foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) for (BitTorrent::TorrentHandle *const torrent : copyAsConst(BitTorrent::Session::instance()->torrents()))
peers += torrent->peersCount(); peers += torrent->peersCount();
map[KEY_TRANSFER_WRITE_CACHE_OVERLOAD] = ((sessionStatus.diskWriteQueue > 0) && (peers > 0)) ? Utils::String::fromDouble((100. * sessionStatus.diskWriteQueue) / peers, 2) : "0"; map[KEY_TRANSFER_WRITE_CACHE_OVERLOAD] = ((sessionStatus.diskWriteQueue > 0) && (peers > 0)) ? Utils::String::fromDouble((100. * sessionStatus.diskWriteQueue) / peers, 2) : "0";
map[KEY_TRANSFER_READ_CACHE_OVERLOAD] = ((sessionStatus.diskReadQueue > 0) && (peers > 0)) ? Utils::String::fromDouble((100. * sessionStatus.diskReadQueue) / peers, 2) : "0"; map[KEY_TRANSFER_READ_CACHE_OVERLOAD] = ((sessionStatus.diskReadQueue > 0) && (peers > 0)) ? Utils::String::fromDouble((100. * sessionStatus.diskReadQueue) / peers, 2) : "0";
@ -268,7 +269,7 @@ namespace
syncData = data; syncData = data;
} }
else { else {
foreach (QVariant item, data) { for (const QVariant &item : data) {
if (!prevData.contains(item)) if (!prevData.contains(item))
// new list item found - append it to syncData // new list item found - append it to syncData
syncData.append(item); syncData.append(item);
@ -409,7 +410,7 @@ void SyncController::maindataAction()
BitTorrent::Session *const session = BitTorrent::Session::instance(); BitTorrent::Session *const session = BitTorrent::Session::instance();
foreach (BitTorrent::TorrentHandle *const torrent, session->torrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(session->torrents())) {
QVariantMap map = serialize(*torrent); QVariantMap map = serialize(*torrent);
map.remove(KEY_TORRENT_HASH); map.remove(KEY_TORRENT_HASH);
@ -468,7 +469,7 @@ void SyncController::torrentPeersAction()
QVariantMap data; QVariantMap data;
QVariantHash peers; QVariantHash peers;
QList<BitTorrent::PeerInfo> peersList = torrent->peers(); const QList<BitTorrent::PeerInfo> peersList = torrent->peers();
#ifndef DISABLE_COUNTRIES_RESOLUTION #ifndef DISABLE_COUNTRIES_RESOLUTION
bool resolvePeerCountries = Preferences::instance()->resolvePeerCountries(); bool resolvePeerCountries = Preferences::instance()->resolvePeerCountries();
#else #else
@ -477,7 +478,7 @@ void SyncController::torrentPeersAction()
data[KEY_SYNC_TORRENT_PEERS_SHOW_FLAGS] = resolvePeerCountries; data[KEY_SYNC_TORRENT_PEERS_SHOW_FLAGS] = resolvePeerCountries;
foreach (const BitTorrent::PeerInfo &pi, peersList) { for (const BitTorrent::PeerInfo &pi : peersList) {
if (pi.address().ip.isNull()) continue; if (pi.address().ip.isNull()) continue;
QVariantMap peer; QVariantMap peer;
#ifndef DISABLE_COUNTRIES_RESOLUTION #ifndef DISABLE_COUNTRIES_RESOLUTION

16
src/webui/api/torrentscontroller.cpp
View File

@ -113,7 +113,7 @@ namespace
void applyToTorrents(const QStringList &hashes, const std::function<void (BitTorrent::TorrentHandle *torrent)> &func) void applyToTorrents(const QStringList &hashes, const std::function<void (BitTorrent::TorrentHandle *torrent)> &func)
{ {
if ((hashes.size() == 1) && (hashes[0] == QLatin1String("all"))) { if ((hashes.size() == 1) && (hashes[0] == QLatin1String("all"))) {
foreach (BitTorrent::TorrentHandle *torrent, BitTorrent::Session::instance()->torrents()) for (BitTorrent::TorrentHandle *torrent : copyAsConst(BitTorrent::Session::instance()->torrents()))
func(torrent); func(torrent);
} }
else { else {
@ -167,7 +167,7 @@ void TorrentsController::infoAction()
QVariantList torrentList; QVariantList torrentList;
TorrentFilter torrentFilter(filter, (hashSet.isEmpty() ? TorrentFilter::AnyHash : hashSet), category); TorrentFilter torrentFilter(filter, (hashSet.isEmpty() ? TorrentFilter::AnyHash : hashSet), category);
foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) { for (BitTorrent::TorrentHandle *const torrent : copyAsConst(BitTorrent::Session::instance()->torrents())) {
if (torrentFilter.match(torrent)) if (torrentFilter.match(torrent))
torrentList.append(serialize(*torrent)); torrentList.append(serialize(*torrent));
} }
@ -307,7 +307,7 @@ void TorrentsController::trackersAction()
throw APIError(APIErrorType::NotFound); throw APIError(APIErrorType::NotFound);
QHash<QString, BitTorrent::TrackerInfo> trackersData = torrent->trackerInfos(); QHash<QString, BitTorrent::TrackerInfo> trackersData = torrent->trackerInfos();
foreach (const BitTorrent::TrackerEntry &tracker, torrent->trackers()) { for (const BitTorrent::TrackerEntry &tracker : copyAsConst(torrent->trackers())) {
QVariantMap trackerDict; QVariantMap trackerDict;
trackerDict[KEY_TRACKER_URL] = tracker.url(); trackerDict[KEY_TRACKER_URL] = tracker.url();
const BitTorrent::TrackerInfo data = trackersData.value(tracker.url()); const BitTorrent::TrackerInfo data = trackersData.value(tracker.url());
@ -346,7 +346,7 @@ void TorrentsController::webseedsAction()
if (!torrent) if (!torrent)
throw APIError(APIErrorType::NotFound); throw APIError(APIErrorType::NotFound);
foreach (const QUrl &webseed, torrent->urlSeeds()) { for (const QUrl &webseed : copyAsConst(torrent->urlSeeds())) {
QVariantMap webSeedDict; QVariantMap webSeedDict;
webSeedDict[KEY_WEBSEED_URL] = webseed.toString(); webSeedDict[KEY_WEBSEED_URL] = webseed.toString();
webSeedList.append(webSeedDict); webSeedList.append(webSeedDict);
@ -419,7 +419,7 @@ void TorrentsController::pieceHashesAction()
const QVector<QByteArray> hashes = torrent->info().pieceHashes(); const QVector<QByteArray> hashes = torrent->info().pieceHashes();
pieceHashes.reserve(hashes.size()); pieceHashes.reserve(hashes.size());
foreach (const QByteArray &hash, hashes) for (const QByteArray &hash : hashes)
pieceHashes.append(hash.toHex()); pieceHashes.append(hash.toHex());
setResult(QJsonArray::fromVariantList(pieceHashes)); setResult(QJsonArray::fromVariantList(pieceHashes));
@ -531,7 +531,7 @@ void TorrentsController::addTrackersAction()
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
if (torrent) { if (torrent) {
QList<BitTorrent::TrackerEntry> trackers; QList<BitTorrent::TrackerEntry> trackers;
foreach (QString url, params()["urls"].split('\n')) { for (QString url : copyAsConst(params()["urls"].split('\n'))) {
url = url.trimmed(); url = url.trimmed();
if (!url.isEmpty()) if (!url.isEmpty())
trackers << url; trackers << url;
@ -575,7 +575,7 @@ void TorrentsController::uploadLimitAction()
const QStringList hashes {params()["hashes"].split('|')}; const QStringList hashes {params()["hashes"].split('|')};
QVariantMap map; QVariantMap map;
foreach (const QString &hash, hashes) { for (const QString &hash : hashes) {
int limit = -1; int limit = -1;
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
if (torrent) if (torrent)
@ -592,7 +592,7 @@ void TorrentsController::downloadLimitAction()
const QStringList hashes {params()["hashes"].split('|')}; const QStringList hashes {params()["hashes"].split('|')};
QVariantMap map; QVariantMap map;
foreach (const QString &hash, hashes) { for (const QString &hash : hashes) {
int limit = -1; int limit = -1;
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
if (torrent) if (torrent)

3
src/webui/webapplication.cpp
View File

@ -649,7 +649,8 @@ void WebApplication::sessionStart()
// remove outdated sessions // remove outdated sessions
const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000; const qint64 now = QDateTime::currentMSecsSinceEpoch() / 1000;
foreach (const auto session, m_sessions) { const QMap<QString, WebSession *> sessionsCopy {m_sessions};
for (const auto session : sessionsCopy) {
if ((now - session->timestamp()) > INACTIVE_TIME) if ((now - session->timestamp()) > INACTIVE_TIME)
delete m_sessions.take(session->id()); delete m_sessions.take(session->id());
} }