From 29c99bddbf48f97b054a34354f55b36a3f84a62c Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 10:12:38 +0200 Subject: Use QList instead of QVector in examples Task-number: QTBUG-84469 Change-Id: Id14119168bb1bf11f99bda7ef6ee9cf51bcfab2e Reviewed-by: Sona Kurazyan --- examples/network/download/main.cpp | 2 +- examples/network/fortuneserver/server.h | 4 ++-- examples/network/googlesuggest/googlesuggest.cpp | 4 ++-- examples/network/googlesuggest/googlesuggest.h | 2 +- examples/network/multistreamclient/client.h | 4 ++-- examples/network/multistreamserver/server.h | 4 ++-- examples/network/secureudpclient/mainwindow.h | 4 ++-- examples/network/secureudpserver/nicselector.h | 4 ++-- examples/network/torrent/torrentclient.cpp | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'examples/network') diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp index 076dfdfd0b..74a1ad0161 100644 --- a/examples/network/download/main.cpp +++ b/examples/network/download/main.cpp @@ -63,7 +63,7 @@ class DownloadManager: public QObject { Q_OBJECT QNetworkAccessManager manager; - QVector currentDownloads; + QList currentDownloads; public: DownloadManager(); diff --git a/examples/network/fortuneserver/server.h b/examples/network/fortuneserver/server.h index 96d7145148..bf0bcbc9b5 100644 --- a/examples/network/fortuneserver/server.h +++ b/examples/network/fortuneserver/server.h @@ -53,7 +53,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE class QLabel; @@ -76,7 +76,7 @@ private: QLabel *statusLabel = nullptr; QTcpServer *tcpServer = nullptr; - QVector fortunes; + QList fortunes; }; //! [0] diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp index 2cba43178e..04a60103b2 100644 --- a/examples/network/googlesuggest/googlesuggest.cpp +++ b/examples/network/googlesuggest/googlesuggest.cpp @@ -148,7 +148,7 @@ bool GSuggestCompletion::eventFilter(QObject *obj, QEvent *ev) //! [4] //! [5] -void GSuggestCompletion::showCompletion(const QVector &choices) +void GSuggestCompletion::showCompletion(const QList &choices) { if (choices.isEmpty()) return; @@ -210,7 +210,7 @@ void GSuggestCompletion::handleNetworkData(QNetworkReply *networkReply) { QUrl url = networkReply->url(); if (networkReply->error() == QNetworkReply::NoError) { - QVector choices; + QList choices; QByteArray response(networkReply->readAll()); QXmlStreamReader xml(response); diff --git a/examples/network/googlesuggest/googlesuggest.h b/examples/network/googlesuggest/googlesuggest.h index a0b0ac069c..909386569b 100644 --- a/examples/network/googlesuggest/googlesuggest.h +++ b/examples/network/googlesuggest/googlesuggest.h @@ -64,7 +64,7 @@ public: explicit GSuggestCompletion(QLineEdit *parent = nullptr); ~GSuggestCompletion(); bool eventFilter(QObject *obj, QEvent *ev) override; - void showCompletion(const QVector &choices); + void showCompletion(const QList &choices); public slots: diff --git a/examples/network/multistreamclient/client.h b/examples/network/multistreamclient/client.h index c22a245eba..220be08776 100644 --- a/examples/network/multistreamclient/client.h +++ b/examples/network/multistreamclient/client.h @@ -52,7 +52,7 @@ #define CLIENT_H #include -#include +#include #include QT_BEGIN_NAMESPACE @@ -81,7 +81,7 @@ private slots: void writeDatagram(const QByteArray &ba); private: - QVector consumers; + QList consumers; QSctpSocket *sctpSocket; QComboBox *hostCombo; diff --git a/examples/network/multistreamserver/server.h b/examples/network/multistreamserver/server.h index 2380d6ffd6..bbfc653ee1 100644 --- a/examples/network/multistreamserver/server.h +++ b/examples/network/multistreamserver/server.h @@ -52,7 +52,7 @@ #define SERVER_H #include -#include +#include #include QT_BEGIN_NAMESPACE @@ -81,7 +81,7 @@ private slots: void writeDatagram(QSctpSocket *to, const QByteArray &ba); private: - QVector providers; + QList providers; QSctpServer *sctpServer; QList connections; diff --git a/examples/network/secureudpclient/mainwindow.h b/examples/network/secureudpclient/mainwindow.h index 0d443fd376..6f207cecd9 100644 --- a/examples/network/secureudpclient/mainwindow.h +++ b/examples/network/secureudpclient/mainwindow.h @@ -52,7 +52,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -99,7 +99,7 @@ private: Ui::MainWindow *ui = nullptr; using AssocPtr = QSharedPointer; - QVector connections; + QList connections; QString nameTemplate; unsigned nextId = 0; diff --git a/examples/network/secureudpserver/nicselector.h b/examples/network/secureudpserver/nicselector.h index 7962a78318..e3c9d37639 100644 --- a/examples/network/secureudpserver/nicselector.h +++ b/examples/network/secureudpserver/nicselector.h @@ -53,7 +53,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -78,7 +78,7 @@ public: private: Ui::NicSelector *ui = nullptr; - QVector availableAddresses; + QList availableAddresses; }; #endif // NICSELECTOR_H diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index 2ba4476861..035cf665bb 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -1086,7 +1086,7 @@ void TorrentClient::scheduleUploads() // seeding, we sort by upload speed. Seeds are left out; there's // no use in unchoking them. QList allClients = d->connections; - QVector> transferSpeeds; + QList> transferSpeeds; for (PeerWireClient *client : qAsConst(allClients)) { if (client->state() == QAbstractSocket::ConnectedState && client->availablePieces().count(true) != d->pieceCount) { @@ -1373,7 +1373,7 @@ void TorrentClient::requestMore(PeerWireClient *client) int TorrentClient::requestBlocks(PeerWireClient *client, TorrentPiece *piece, int maxBlocks) { // Generate the list of incomplete blocks for this piece. - QVector bits; + QList bits; int completedBlocksSize = piece->completedBlocks.size(); for (int i = 0; i < completedBlocksSize; ++i) { if (!piece->completedBlocks.testBit(i) && !piece->requestedBlocks.testBit(i)) -- cgit v1.2.3