1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary int() casting in QRandomGenerator::bounded

Browse Source 
Commit 21d39168170c6833512c4a5f53985272741bd7e7 added the 64-bit
version, so qsizetype now works cross-platform. The casts were added to
make qtbase compile on commit df853fed66d891077ae2d04ecfa171d7e2cd5202.

Change-Id: I26b8286f61534f88b649fffd166c409c5c232230
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2021-03-14 08:56:46 -07:00
parent d6367aca86
commit ae9e433753
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/embedded/flickable/main.cpp
View File

@ -72,7 +72,7 @@ static QStringList colorPairs(int max)
// randomize it // randomize it
colors.clear(); colors.clear();
while (combinedColors.count()) { while (combinedColors.count()) {
int i = QRandomGenerator::global()->bounded(int(combinedColors.count())); int i = QRandomGenerator::global()->bounded(combinedColors.count());
colors << combinedColors[i]; colors << combinedColors[i];
combinedColors.removeAt(i); combinedColors.removeAt(i);
if (colors.count() == max) if (colors.count() == max)

2
examples/network/fortuneserver/server.cpp
View File

@ -145,7 +145,7 @@ void Server::sendFortune()
QDataStream out(&block, QIODevice::WriteOnly); QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_5_10); out.setVersion(QDataStream::Qt_5_10);
out << fortunes[QRandomGenerator::global()->bounded(int(fortunes.size()))]; out << fortunes[QRandomGenerator::global()->bounded(fortunes.size())];
//! [4] //! [7] //! [4] //! [7]
QTcpSocket *clientConnection = tcpServer->nextPendingConnection(); QTcpSocket *clientConnection = tcpServer->nextPendingConnection();

2
examples/network/threadedfortuneserver/fortuneserver.cpp
View File

@ -72,7 +72,7 @@ FortuneServer::FortuneServer(QObject *parent)
//! [1] //! [1]
void FortuneServer::incomingConnection(qintptr socketDescriptor) void FortuneServer::incomingConnection(qintptr socketDescriptor)
{ {
QString fortune = fortunes.at(QRandomGenerator::global()->bounded(int(fortunes.size()))); QString fortune = fortunes.at(QRandomGenerator::global()->bounded(fortunes.size()));
FortuneThread *thread = new FortuneThread(socketDescriptor, fortune, this); FortuneThread *thread = new FortuneThread(socketDescriptor, fortune, this);
connect(thread, &FortuneThread::finished, thread, &FortuneThread::deleteLater); connect(thread, &FortuneThread::finished, thread, &FortuneThread::deleteLater);
thread->start(); thread->start();

16
examples/network/torrent/torrentclient.cpp
View File

@ -700,7 +700,7 @@ void TorrentClient::connectToPeers()
d->connections << client; d->connections << client;
// Pick a random peer from the list of weighed peers. // Pick a random peer from the list of weighed peers.
TorrentPeer *peer = weighedPeers.takeAt(QRandomGenerator::global()->bounded(int(weighedPeers.size()))); TorrentPeer *peer = weighedPeers.takeAt(QRandomGenerator::global()->bounded(weighedPeers.size()));
weighedPeers.removeAll(peer); weighedPeers.removeAll(peer);
peer->connectStart = QDateTime::currentSecsSinceEpoch(); peer->connectStart = QDateTime::currentSecsSinceEpoch();
peer->lastVisited = peer->connectStart; peer->lastVisited = peer->connectStart;
@ -1130,7 +1130,7 @@ void TorrentClient::scheduleUploads()
// random peer to allow it to compete for a position among the // random peer to allow it to compete for a position among the
// downloaders. (This is known as an "optimistic unchoke".) // downloaders. (This is known as an "optimistic unchoke".)
if (!allClients.isEmpty()) { if (!allClients.isEmpty()) {
PeerWireClient *client = allClients[QRandomGenerator::global()->bounded(int(allClients.size()))]; PeerWireClient *client = allClients[QRandomGenerator::global()->bounded(allClients.size())];
if (client->peerWireState() & PeerWireClient::ChokingPeer) if (client->peerWireState() & PeerWireClient::ChokingPeer)
client->unchokePeer(); client->unchokePeer();
} }
@ -1191,7 +1191,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client)
piece = d->payloads.value(client); piece = d->payloads.value(client);
if (!piece) { if (!piece) {
QList<TorrentPiece *> values = d->pendingPieces.values(); QList<TorrentPiece *> values = d->pendingPieces.values();
piece = values.value(QRandomGenerator::global()->bounded(int(values.size()))); piece = values.value(QRandomGenerator::global()->bounded(values.size()));
piece->inProgress = true; piece->inProgress = true;
d->payloads.insert(client, piece); d->payloads.insert(client, piece);
} }
@ -1248,7 +1248,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client)
++it; ++it;
} }
if (!partialPieces.isEmpty()) if (!partialPieces.isEmpty())
piece = partialPieces.value(QRandomGenerator::global()->bounded(int(partialPieces.size()))); piece = partialPieces.value(QRandomGenerator::global()->bounded(partialPieces.size()));
if (!piece) { if (!piece) {
// Pick a random piece 3 out of 4 times; otherwise, pick either // 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 // Select one piece randomly
pieceIndex = piecesReadyForDownload.at(QRandomGenerator::global()->bounded(int(piecesReadyForDownload.size()))); pieceIndex = piecesReadyForDownload.at(QRandomGenerator::global()->bounded(piecesReadyForDownload.size()));
delete [] occurrences; delete [] occurrences;
} else { } else {
// Make up a list of available piece indices, and pick // Make up a list of available piece indices, and pick
@ -1306,7 +1306,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client)
if (incompletePiecesAvailableToClient.testBit(i)) if (incompletePiecesAvailableToClient.testBit(i))
values << i; values << i;
} }
pieceIndex = values.at(QRandomGenerator::global()->bounded(int(values.size()))); pieceIndex = values.at(QRandomGenerator::global()->bounded(values.size()));
} }
// Create a new TorrentPiece and fill in all initial // 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 // speedup comes from an increased chance of receiving
// different blocks from the different peers. // different blocks from the different peers.
for (int i = 0; i < bits.size(); ++i) { for (int i = 0; i < bits.size(); ++i) {
int a = QRandomGenerator::global()->bounded(int(bits.size())); int a = QRandomGenerator::global()->bounded(bits.size());
int b = QRandomGenerator::global()->bounded(int(bits.size())); int b = QRandomGenerator::global()->bounded(bits.size());
int tmp = bits[a]; int tmp = bits[a];
bits[a] = bits[b]; bits[a] = bits[b];
bits[b] = tmp; bits[b] = tmp;

2
examples/widgets/mainwindows/mainwindow/toolbar.cpp
View File

@ -264,7 +264,7 @@ void ToolBar::randomize()
QList<QAction *> randomized; QList<QAction *> randomized;
QList<QAction *> actions = this->actions(); QList<QAction *> actions = this->actions();
while (!actions.isEmpty()) { while (!actions.isEmpty()) {
QAction *action = actions.takeAt(QRandomGenerator::global()->bounded(int(actions.size()))); QAction *action = actions.takeAt(QRandomGenerator::global()->bounded(actions.size()));
randomized.append(action); randomized.append(action);
} }
clear(); clear();

2
src/network/kernel/qdnslookup.cpp
View File

@ -86,7 +86,7 @@ static void qt_qdnsmailexchangerecord_sort(QList<QDnsMailExchangeRecord> &record
// Randomize the slice of records. // Randomize the slice of records.
while (!slice.isEmpty()) { while (!slice.isEmpty()) {
const unsigned int pos = QRandomGenerator::global()->bounded(int(slice.size())); const unsigned int pos = QRandomGenerator::global()->bounded(slice.size());
records[i++] = slice.takeAt(pos); records[i++] = slice.takeAt(pos);
} }
} }