diff --git a/src/base/bittorrent/sessionimpl.cpp b/src/base/bittorrent/sessionimpl.cpp index b5801244c..09df5d1e7 100644 --- a/src/base/bittorrent/sessionimpl.cpp +++ b/src/base/bittorrent/sessionimpl.cpp @@ -2461,12 +2461,12 @@ bool SessionImpl::removeTorrent(const TorrentID &id, const TorrentRemoveOption d m_removingTorrents[torrentID] = {torrentName, torrent->actualStorageLocation(), {}, deleteOption}; const lt::torrent_handle nativeHandle {torrent->nativeHandle()}; - const auto iter = std::find_if(m_moveStorageQueue.begin(), m_moveStorageQueue.end() + const auto iter = std::find_if(m_moveStorageQueue.cbegin(), m_moveStorageQueue.cend() , [&nativeHandle](const MoveStorageJob &job) { return job.torrentHandle == nativeHandle; }); - if (iter != m_moveStorageQueue.end()) + if (iter != m_moveStorageQueue.cend()) { // We shouldn't actually remove torrent until existing "move storage jobs" are done torrentQueuePositionBottom(nativeHandle); @@ -2486,12 +2486,12 @@ bool SessionImpl::removeTorrent(const TorrentID &id, const TorrentRemoveOption d { // Delete "move storage job" for the deleted torrent // (note: we shouldn't delete active job) - const auto iter = std::find_if((m_moveStorageQueue.begin() + 1), m_moveStorageQueue.end() + const auto iter = std::find_if((m_moveStorageQueue.cbegin() + 1), m_moveStorageQueue.cend() , [torrent](const MoveStorageJob &job) { return job.torrentHandle == torrent->nativeHandle(); }); - if (iter != m_moveStorageQueue.end()) + if (iter != m_moveStorageQueue.cend()) m_moveStorageQueue.erase(iter); } @@ -2508,8 +2508,8 @@ bool SessionImpl::removeTorrent(const TorrentID &id, const TorrentRemoveOption d bool SessionImpl::cancelDownloadMetadata(const TorrentID &id) { - const auto downloadedMetadataIter = m_downloadedMetadata.find(id); - if (downloadedMetadataIter == m_downloadedMetadata.end()) + const auto downloadedMetadataIter = m_downloadedMetadata.constFind(id); + if (downloadedMetadataIter == m_downloadedMetadata.cend()) return false; const lt::torrent_handle nativeHandle = downloadedMetadataIter.value(); @@ -5268,8 +5268,8 @@ void SessionImpl::handleTorrentFinished(TorrentImpl *const torrent) void SessionImpl::handleTorrentResumeDataReady(TorrentImpl *const torrent, const LoadTorrentParams &data) { m_resumeDataStorage->store(torrent->id(), data); - const auto iter = m_changedTorrentIDs.find(torrent->id()); - if (iter != m_changedTorrentIDs.end()) + const auto iter = m_changedTorrentIDs.constFind(torrent->id()); + if (iter != m_changedTorrentIDs.cend()) { m_resumeDataStorage->remove(iter.value()); m_changedTorrentIDs.erase(iter); @@ -5302,11 +5302,11 @@ bool SessionImpl::addMoveTorrentStorageJob(TorrentImpl *torrent, const Path &new const lt::torrent_handle torrentHandle = torrent->nativeHandle(); const Path currentLocation = torrent->actualStorageLocation(); - const bool torrentHasActiveJob = !m_moveStorageQueue.isEmpty() && (m_moveStorageQueue.first().torrentHandle == torrentHandle); + const bool torrentHasActiveJob = !m_moveStorageQueue.isEmpty() && (m_moveStorageQueue.constFirst().torrentHandle == torrentHandle); if (m_moveStorageQueue.size() > 1) { - auto iter = std::find_if((m_moveStorageQueue.begin() + 1), m_moveStorageQueue.end() + auto iter = std::find_if((m_moveStorageQueue.cbegin() + 1), m_moveStorageQueue.cend() , [&torrentHandle](const MoveStorageJob &job) { return job.torrentHandle == torrentHandle; @@ -5325,7 +5325,7 @@ bool SessionImpl::addMoveTorrentStorageJob(TorrentImpl *torrent, const Path &new { // if there is active job for this torrent prevent creating meaningless // job that will move torrent to the same location as current one - if (m_moveStorageQueue.first().path == newPath) + if (m_moveStorageQueue.constFirst().path == newPath) { LogMsg(tr("Failed to enqueue torrent move. Torrent: \"%1\". Source: \"%2\". Destination: \"%3\". Reason: torrent is currently moving to the destination") .arg(torrent->name(), currentLocation.toString(), newPath.toString())); @@ -5370,7 +5370,7 @@ void SessionImpl::handleMoveTorrentStorageJobFinished(const Path &newPath) { const MoveStorageJob finishedJob = m_moveStorageQueue.takeFirst(); if (!m_moveStorageQueue.isEmpty()) - moveTorrentStorage(m_moveStorageQueue.first()); + moveTorrentStorage(m_moveStorageQueue.constFirst()); const auto iter = std::find_if(m_moveStorageQueue.cbegin(), m_moveStorageQueue.cend() , [&finishedJob](const MoveStorageJob &job) @@ -5696,14 +5696,14 @@ void SessionImpl::handleAddTorrentAlert(const lt::add_torrent_alert *alert) #else const InfoHash infoHash {(hasMetadata ? params.ti->info_hash() : params.info_hash)}; #endif - if (const auto loadingTorrentsIter = m_loadingTorrents.find(TorrentID::fromInfoHash(infoHash)) - ; loadingTorrentsIter != m_loadingTorrents.end()) + if (const auto loadingTorrentsIter = m_loadingTorrents.constFind(TorrentID::fromInfoHash(infoHash)) + ; loadingTorrentsIter != m_loadingTorrents.cend()) { emit addTorrentFailed(infoHash, msg); m_loadingTorrents.erase(loadingTorrentsIter); } - else if (const auto downloadedMetadataIter = m_downloadedMetadata.find(TorrentID::fromInfoHash(infoHash)) - ; downloadedMetadataIter != m_downloadedMetadata.end()) + else if (const auto downloadedMetadataIter = m_downloadedMetadata.constFind(TorrentID::fromInfoHash(infoHash)) + ; downloadedMetadataIter != m_downloadedMetadata.cend()) { m_downloadedMetadata.erase(downloadedMetadataIter); if (infoHash.isHybrid()) @@ -5724,8 +5724,8 @@ void SessionImpl::handleAddTorrentAlert(const lt::add_torrent_alert *alert) #endif const auto torrentID = TorrentID::fromInfoHash(infoHash); - if (const auto loadingTorrentsIter = m_loadingTorrents.find(torrentID) - ; loadingTorrentsIter != m_loadingTorrents.end()) + if (const auto loadingTorrentsIter = m_loadingTorrents.constFind(torrentID) + ; loadingTorrentsIter != m_loadingTorrents.cend()) { const LoadTorrentParams params = loadingTorrentsIter.value(); m_loadingTorrents.erase(loadingTorrentsIter); @@ -5988,7 +5988,7 @@ void SessionImpl::handleMetadataReceivedAlert(const lt::metadata_received_alert const TorrentID torrentID {alert->handle.info_hash()}; bool found = false; - if (const auto iter = m_downloadedMetadata.find(torrentID); iter != m_downloadedMetadata.end()) + if (const auto iter = m_downloadedMetadata.constFind(torrentID); iter != m_downloadedMetadata.cend()) { found = true; m_downloadedMetadata.erase(iter); @@ -5998,7 +5998,7 @@ void SessionImpl::handleMetadataReceivedAlert(const lt::metadata_received_alert if (infoHash.isHybrid()) { const auto altID = TorrentID::fromSHA1Hash(infoHash.v1()); - if (const auto iter = m_downloadedMetadata.find(altID); iter != m_downloadedMetadata.end()) + if (const auto iter = m_downloadedMetadata.constFind(altID); iter != m_downloadedMetadata.cend()) { found = true; m_downloadedMetadata.erase(iter); @@ -6260,7 +6260,7 @@ void SessionImpl::handleStorageMovedAlert(const lt::storage_moved_alert *alert) { Q_ASSERT(!m_moveStorageQueue.isEmpty()); - const MoveStorageJob ¤tJob = m_moveStorageQueue.first(); + const MoveStorageJob ¤tJob = m_moveStorageQueue.constFirst(); Q_ASSERT(currentJob.torrentHandle == alert->handle); const Path newPath {QString::fromUtf8(alert->storage_path())}; @@ -6283,7 +6283,7 @@ void SessionImpl::handleStorageMovedFailedAlert(const lt::storage_moved_failed_a { Q_ASSERT(!m_moveStorageQueue.isEmpty()); - const MoveStorageJob ¤tJob = m_moveStorageQueue.first(); + const MoveStorageJob ¤tJob = m_moveStorageQueue.constFirst(); Q_ASSERT(currentJob.torrentHandle == alert->handle); #ifdef QBT_USES_LIBTORRENT2 @@ -6497,8 +6497,8 @@ void SessionImpl::updateTrackerEntryStatuses(lt::torrent_handle torrentHandle) void SessionImpl::handleRemovedTorrent(const TorrentID &torrentID, const QString &partfileRemoveError) { - const auto removingTorrentDataIter = m_removingTorrents.find(torrentID); - if (removingTorrentDataIter == m_removingTorrents.end()) + const auto removingTorrentDataIter = m_removingTorrents.constFind(torrentID); + if (removingTorrentDataIter == m_removingTorrents.cend()) return; if (!partfileRemoveError.isEmpty()) diff --git a/src/base/bittorrent/tracker.cpp b/src/base/bittorrent/tracker.cpp index 6da1321cd..a86d50310 100644 --- a/src/base/bittorrent/tracker.cpp +++ b/src/base/bittorrent/tracker.cpp @@ -380,7 +380,7 @@ void Tracker::registerPeer(const TrackerAnnounceRequest &announceReq) { // Reached max size, remove a random torrent if (m_torrents.size() >= MAX_TORRENTS) - m_torrents.erase(m_torrents.begin()); + m_torrents.erase(m_torrents.cbegin()); } m_torrents[announceReq.torrentID].setPeer(announceReq.peer); diff --git a/src/base/rss/rss_feed.cpp b/src/base/rss/rss_feed.cpp index 111658e01..7b8d4e3fa 100644 --- a/src/base/rss/rss_feed.cpp +++ b/src/base/rss/rss_feed.cpp @@ -327,9 +327,9 @@ bool Feed::addArticle(const QVariantHash &articleData) // Insertion sort const int maxArticles = m_session->maxArticlesPerFeed(); - const auto lowerBound = std::lower_bound(m_articlesByDate.begin(), m_articlesByDate.end() - , articleData.value(Article::KeyDate).toDateTime(), Article::articleDateRecentThan); - if ((lowerBound - m_articlesByDate.begin()) >= maxArticles) + const auto lowerBound = std::lower_bound(m_articlesByDate.cbegin(), m_articlesByDate.cend() + , articleData.value(Article::KeyDate).toDateTime(), Article::articleDateRecentThan); + if ((lowerBound - m_articlesByDate.cbegin()) >= maxArticles) return false; // we reach max articles auto *article = new Article(this, articleData); diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp index 9f19f0891..c6006beb7 100644 --- a/src/base/settingsstorage.cpp +++ b/src/base/settingsstorage.cpp @@ -170,7 +170,7 @@ bool SettingsStorage::writeNativeSettings() const // between deleting the file and recreating it. This is a safety measure. // Write everything to qBittorrent_new.ini/qBittorrent_new.conf and if it succeeds // replace qBittorrent.ini/qBittorrent.conf with it. - for (auto i = m_data.begin(); i != m_data.end(); ++i) + for (auto i = m_data.cbegin(); i != m_data.cend(); ++i) nativeSettings->setValue(i.key(), i.value()); nativeSettings->sync(); // Important to get error status diff --git a/src/gui/torrentcontentmodelfolder.cpp b/src/gui/torrentcontentmodelfolder.cpp index 57d3b43cf..baaa098aa 100644 --- a/src/gui/torrentcontentmodelfolder.cpp +++ b/src/gui/torrentcontentmodelfolder.cpp @@ -97,7 +97,7 @@ void TorrentContentModelFolder::updatePriority() // If all children have the same priority // then the folder should have the same // priority - const BitTorrent::DownloadPriority prio = m_childItems.first()->priority(); + const BitTorrent::DownloadPriority prio = m_childItems.constFirst()->priority(); for (int i = 1; i < m_childItems.size(); ++i) { if (m_childItems.at(i)->priority() != prio) diff --git a/src/gui/uithememanager.cpp b/src/gui/uithememanager.cpp index 61f2276fc..b8cd31fb9 100644 --- a/src/gui/uithememanager.cpp +++ b/src/gui/uithememanager.cpp @@ -199,8 +199,8 @@ QIcon UIThemeManager::getFlagIcon(const QString &countryIsoCode) const return {}; const QString key = countryIsoCode.toLower(); - const auto iter = m_flags.find(key); - if (iter != m_flags.end()) + const auto iter = m_flags.constFind(key); + if (iter != m_flags.cend()) return *iter; const QIcon icon {u":/icons/flags/" + key + u".svg"}; diff --git a/src/gui/uithemesource.cpp b/src/gui/uithemesource.cpp index be0138ee0..c3908b0b8 100644 --- a/src/gui/uithemesource.cpp +++ b/src/gui/uithemesource.cpp @@ -175,7 +175,7 @@ void DefaultThemeSource::loadColors() const QHash lightModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_LIGHT).toObject()); for (auto overridesIt = lightModeColorOverrides.cbegin(); overridesIt != lightModeColorOverrides.cend(); ++overridesIt) { - auto it = m_colors.find(overridesIt.key()); + const auto it = m_colors.find(overridesIt.key()); if (it != m_colors.end()) it.value().light = overridesIt.value(); } @@ -183,7 +183,7 @@ void DefaultThemeSource::loadColors() const QHash darkModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_DARK).toObject()); for (auto overridesIt = darkModeColorOverrides.cbegin(); overridesIt != darkModeColorOverrides.cend(); ++overridesIt) { - auto it = m_colors.find(overridesIt.key()); + const auto it = m_colors.find(overridesIt.key()); if (it != m_colors.end()) it.value().dark = overridesIt.value(); } diff --git a/src/webui/api/authcontroller.cpp b/src/webui/api/authcontroller.cpp index eb1d1baf2..5c308a62e 100644 --- a/src/webui/api/authcontroller.cpp +++ b/src/webui/api/authcontroller.cpp @@ -103,8 +103,8 @@ void AuthController::logoutAction() const bool AuthController::isBanned() const { - const auto failedLoginIter = m_clientFailedLogins.find(m_sessionManager->clientId()); - if (failedLoginIter == m_clientFailedLogins.end()) + const auto failedLoginIter = m_clientFailedLogins.constFind(m_sessionManager->clientId()); + if (failedLoginIter == m_clientFailedLogins.cend()) return false; bool isBanned = (failedLoginIter->banTimer.remainingTime() >= 0); diff --git a/src/webui/api/searchcontroller.cpp b/src/webui/api/searchcontroller.cpp index b954da119..d7b0c9786 100644 --- a/src/webui/api/searchcontroller.cpp +++ b/src/webui/api/searchcontroller.cpp @@ -131,8 +131,8 @@ void SearchController::stopAction() const int id = params()[u"id"_s].toInt(); - const auto iter = m_searchHandlers.find(id); - if (iter == m_searchHandlers.end()) + const auto iter = m_searchHandlers.constFind(id); + if (iter == m_searchHandlers.cend()) throw APIError(APIErrorType::NotFound); const std::shared_ptr &searchHandler = iter.value(); @@ -176,8 +176,8 @@ void SearchController::resultsAction() int limit = params()[u"limit"_s].toInt(); int offset = params()[u"offset"_s].toInt(); - const auto iter = m_searchHandlers.find(id); - if (iter == m_searchHandlers.end()) + const auto iter = m_searchHandlers.constFind(id); + if (iter == m_searchHandlers.cend()) throw APIError(APIErrorType::NotFound); const std::shared_ptr &searchHandler = iter.value(); @@ -207,8 +207,8 @@ void SearchController::deleteAction() const int id = params()[u"id"_s].toInt(); - const auto iter = m_searchHandlers.find(id); - if (iter == m_searchHandlers.end()) + const auto iter = m_searchHandlers.constFind(id); + if (iter == m_searchHandlers.cend()) throw APIError(APIErrorType::NotFound); const std::shared_ptr &searchHandler = iter.value(); diff --git a/src/webui/api/synccontroller.cpp b/src/webui/api/synccontroller.cpp index 96ef9dd28..222b066aa 100644 --- a/src/webui/api/synccontroller.cpp +++ b/src/webui/api/synccontroller.cpp @@ -864,7 +864,7 @@ void SyncController::onTorrentAboutToBeRemoved(BitTorrent::Torrent *torrent) for (const BitTorrent::TrackerEntryStatus &status : asConst(torrent->trackers())) { - auto iter = m_knownTrackers.find(status.url); + const auto iter = m_knownTrackers.find(status.url); Q_ASSERT(iter != m_knownTrackers.end()); if (iter == m_knownTrackers.end()) [[unlikely]] continue; diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index 168fd16c2..0f556f3f3 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -339,8 +339,8 @@ void WebApplication::doProcessRequest() } // Filter HTTP methods - const auto allowedMethodIter = m_allowedMethod.find({scope, action}); - if (allowedMethodIter == m_allowedMethod.end()) + const auto allowedMethodIter = m_allowedMethod.constFind({scope, action}); + if (allowedMethodIter == m_allowedMethod.cend()) { // by default allow both GET, POST methods if ((m_request.method != Http::METHOD_GET) && (m_request.method != Http::METHOD_POST))