Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

2 files changed, 27 insertions, 31 deletions

diff --git a/examples/network/torrent/ratecontroller.cpp b/examples/network/torrent/ratecontroller.cpp
index 47b49dba30..87c65096b6 100644
--- a/examples/network/torrent/ratecontroller.cpp
+++ b/examples/network/torrent/ratecontroller.cpp
@@ -123,11 +123,11 @@ void RateController::transfer()
         qint64 writeChunk = qMax<qint64>(1, bytesToWrite / pendingSockets.size());
         qint64 readChunk = qMax<qint64>(1, bytesToRead / pendingSockets.size());
 
-        QSetIterator<PeerWireClient *> it(pendingSockets);
-        while (it.hasNext() && (bytesToWrite > 0 || bytesToRead > 0)) {
-            PeerWireClient *socket = it.next();
+        for (auto it = pendingSockets.begin(), end = pendingSockets.end(); it != end && (bytesToWrite > 0 || bytesToRead > 0); /*erasing*/) {
+            auto current = it++;
+            PeerWireClient *socket = *current;
             if (socket->state() != QAbstractSocket::ConnectedState) {
-                pendingSockets.remove(socket);
+                pendingSockets.erase(current);
                 continue;
             }
 
@@ -156,7 +156,7 @@ void RateController::transfer()
             if (dataTransferred && socket->canTransferMore())
                 canTransferMore = true;
             else
-                pendingSockets.remove(socket);
+                pendingSockets.erase(current);
         }
     } while (canTransferMore && (bytesToWrite > 0 || bytesToRead > 0) && !pendingSockets.isEmpty());
 
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp
index d01a5f3d9e..b4cbbb7a45 100644
--- a/examples/network/torrent/torrentclient.cpp
+++ b/examples/network/torrent/torrentclient.cpp
@@ -720,9 +720,9 @@ QList<TorrentPeer *> TorrentClient::weighedFreePeers() const
     qint64 now = QDateTime::currentSecsSinceEpoch();
     QList<TorrentPeer *> freePeers;
     QMap<QString, int> connectionsPerPeer;
-    for (TorrentPeer *peer : d->peers) {
+    for (TorrentPeer *peer : qAsConst(d->peers)) {
         bool busy = false;
-        for (PeerWireClient *client : d->connections) {
+        for (PeerWireClient *client : qAsConst(d->connections)) {
             if (client->state() == PeerWireClient::ConnectedState
                 && client->peerAddress() == peer->address
                 && client->peerPort() == peer->port) {
@@ -1084,25 +1084,25 @@ void TorrentClient::scheduleUploads()
     // seeding, we sort by upload speed. Seeds are left out; there's
     // no use in unchoking them.
     QList<PeerWireClient *> allClients = d->connections;
-    QMultiMap<int, PeerWireClient *> transferSpeeds;
+    QVector<QPair<qint64, PeerWireClient *>> transferSpeeds;
     for (PeerWireClient *client : qAsConst(allClients)) {
         if (client->state() == QAbstractSocket::ConnectedState
             && client->availablePieces().count(true) != d->pieceCount) {
             if (d->state == Seeding) {
-                transferSpeeds.insert(client->uploadSpeed(), client);
+                transferSpeeds.push_back({client->uploadSpeed(), client});
             } else {
-                transferSpeeds.insert(client->downloadSpeed(), client);
+                transferSpeeds.push_back({client->downloadSpeed(), client});
             }
         }
     }
 
+    std::sort(transferSpeeds.begin(), transferSpeeds.end());
+
     // Unchoke the top 'MaxUploads' downloaders (peers that we are
     // uploading to) and choke all others.
     int maxUploaders = MaxUploads;
-    QMapIterator<int, PeerWireClient *> it(transferSpeeds);
-    it.toBack();
-    while (it.hasPrevious()) {
-        PeerWireClient *client = it.previous().value();
+    for (auto rit = transferSpeeds.crbegin(), rend = transferSpeeds.crend(); rit != rend; ++rit) {
+        PeerWireClient *client = rit->second;
         bool interested = (client->peerWireState() & PeerWireClient::PeerIsInterested);
 
         if (maxUploaders) {
@@ -1484,30 +1484,26 @@ void TorrentClient::addToPeerList(const QList<TorrentPeer> &peerList)
     // of the peers that have no (or low) activity.
     int maxPeers = ConnectionManager::instance()->maxConnections() * 3;
     if (d->peers.size() > maxPeers) {
+        auto tooMany = d->peers.size() - maxPeers;
+
         // Find what peers are currently connected & active
-        QSet<TorrentPeer *> activePeers;
-        for (TorrentPeer *peer : qAsConst(d->peers)) {
+        const auto firstNInactivePeers = [&tooMany, this] (TorrentPeer *peer) {
+            if (!tooMany)
+                return false;
             for (const PeerWireClient *client : qAsConst(d->connections)) {
                 if (client->peer() == peer && (client->downloadSpeed() + client->uploadSpeed()) > 1024)
-                    activePeers << peer;
+                    return false;
             }
-        }
-
+            --tooMany;
+            return true;
+        };
         // Remove inactive peers from the peer list until we're below
         // the max connections count.
-        QList<int> toRemove;
-        for (int i = 0; i < d->peers.size() && (d->peers.size() - toRemove.size()) > maxPeers; ++i) {
-            if (!activePeers.contains(d->peers.at(i)))
-                toRemove << i;
-        }
-        QListIterator<int> toRemoveIterator(toRemove);
-        toRemoveIterator.toBack();
-        while (toRemoveIterator.hasPrevious())
-            d->peers.removeAt(toRemoveIterator.previous());
-
+        d->peers.erase(std::remove_if(d->peers.begin(), d->peers.end(),
+                                      firstNInactivePeers),
+                       d->peers.end());
         // If we still have too many peers, remove the oldest ones.
-        while (d->peers.size() > maxPeers)
-            d->peers.takeFirst();
+        d->peers.erase(d->peers.begin(), d->peers.begin() + tooMany);
     }
 
     if (d->state != Paused && d->state != Stopping && d->state != Idle) {