diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-06-19 20:53:25 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-07-06 21:31:14 +0200 |
commit | df853fed66d891077ae2d04ecfa171d7e2cd5202 (patch) | |
tree | bf29d3718eeee1e17d1640841595de0ba8cda4cf /examples/network/torrent | |
parent | 3711bf85ae85c9398642ae276cbd90b5bfaa6688 (diff) |
Use qsizetype in QList
The change creates a slight source incompatibility. The main
things to take care of are
* code using printf statements on list.size(). Using qsizetype in
printf statements will always require a cast to work on both 32
and 64 bit.
* A few places where overloads now get ambiguous. One example is
QRandomGenerator::bounded() that has overloads for int, uint and
double, but not int64.
* Streaming list.size() to a QDataStream will change the format
depending on the architecture.
[ChangeLog][QtCore][QList] QList now uses qsizetype to index into
elements.
Change-Id: Iaff562a4d072b97f458417b670f95971bd47cbc6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'examples/network/torrent')
-rw-r--r-- | examples/network/torrent/torrentclient.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index 035cf665bb..6ae5339d28 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -700,7 +700,7 @@ void TorrentClient::connectToPeers() d->connections << client; // Pick a random peer from the list of weighed peers. - TorrentPeer *peer = weighedPeers.takeAt(QRandomGenerator::global()->bounded(weighedPeers.size())); + TorrentPeer *peer = weighedPeers.takeAt(QRandomGenerator::global()->bounded(int(weighedPeers.size()))); weighedPeers.removeAll(peer); peer->connectStart = QDateTime::currentSecsSinceEpoch(); peer->lastVisited = peer->connectStart; @@ -1130,7 +1130,7 @@ void TorrentClient::scheduleUploads() // random peer to allow it to compete for a position among the // downloaders. (This is known as an "optimistic unchoke".) if (!allClients.isEmpty()) { - PeerWireClient *client = allClients[QRandomGenerator::global()->bounded(allClients.size())]; + PeerWireClient *client = allClients[QRandomGenerator::global()->bounded(int(allClients.size()))]; if (client->peerWireState() & PeerWireClient::ChokingPeer) client->unchokePeer(); } @@ -1191,7 +1191,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client) piece = d->payloads.value(client); if (!piece) { QList<TorrentPiece *> values = d->pendingPieces.values(); - piece = values.value(QRandomGenerator::global()->bounded(values.size())); + piece = values.value(QRandomGenerator::global()->bounded(int(values.size()))); piece->inProgress = true; d->payloads.insert(client, piece); } @@ -1248,7 +1248,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client) ++it; } if (!partialPieces.isEmpty()) - piece = partialPieces.value(QRandomGenerator::global()->bounded(partialPieces.size())); + piece = partialPieces.value(QRandomGenerator::global()->bounded(int(partialPieces.size()))); if (!piece) { // Pick a random piece 3 out of 4 times; otherwise, pick either @@ -1295,7 +1295,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client) } // Select one piece randomly - pieceIndex = piecesReadyForDownload.at(QRandomGenerator::global()->bounded(piecesReadyForDownload.size())); + pieceIndex = piecesReadyForDownload.at(QRandomGenerator::global()->bounded(int(piecesReadyForDownload.size()))); delete [] occurrences; } else { // Make up a list of available piece indices, and pick @@ -1306,7 +1306,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client) if (incompletePiecesAvailableToClient.testBit(i)) values << i; } - pieceIndex = values.at(QRandomGenerator::global()->bounded(values.size())); + pieceIndex = values.at(QRandomGenerator::global()->bounded(int(values.size()))); } // Create a new TorrentPiece and fill in all initial @@ -1398,8 +1398,8 @@ int TorrentClient::requestBlocks(PeerWireClient *client, TorrentPiece *piece, in // speedup comes from an increased chance of receiving // different blocks from the different peers. for (int i = 0; i < bits.size(); ++i) { - int a = QRandomGenerator::global()->bounded(bits.size()); - int b = QRandomGenerator::global()->bounded(bits.size()); + int a = QRandomGenerator::global()->bounded(int(bits.size())); + int b = QRandomGenerator::global()->bounded(int(bits.size())); int tmp = bits[a]; bits[a] = bits[b]; bits[b] = tmp; |