From ce2ba5d59d3c4641245e51f94215c0b4bac1f792 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 18 Jul 2022 09:05:18 +0200 Subject: [PATCH] Port QByteDataBuffer to qsizetype Less impedance mismatch with the other Qt containers. As a drive-by, fix code style in the touched lines, and remove superfluous inline keywords. Pick-to: 6.4 6.3 Change-Id: I2c9444a8f956e58c361104a19f55fcc783cd1a1d Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne --- src/corelib/text/qbytedata_p.h | 6 +++--- src/network/access/qnetworkreplyimpl.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/text/qbytedata_p.h b/src/corelib/text/qbytedata_p.h index 9851cd17e0..67a39eb742 100644 --- a/src/corelib/text/qbytedata_p.h +++ b/src/corelib/text/qbytedata_p.h @@ -229,7 +229,7 @@ public: } // the number of QByteArrays - inline int bufferCount() const + qsizetype bufferCount() const { return buffers.length(); } @@ -247,7 +247,7 @@ public: return buffers.first().size() - firstPos; } - inline QByteArray& operator[](int i) + QByteArray &operator[](qsizetype i) { if (i == 0) squeezeFirst(); @@ -256,7 +256,7 @@ public: } inline bool canReadLine() const { - int i = 0; + qsizetype i = 0; if (i < buffers.length()) { if (buffers.at(i).indexOf('\n', firstPos) != -1) return true; diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 055afb8b3f..a1fedb4cd3 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -458,7 +458,7 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data) } qint64 bytesWritten = 0; - for (int i = 0; i < data.bufferCount(); i++) { + for (qsizetype i = 0; i < data.bufferCount(); ++i) { QByteArray const &item = data[i]; if (cacheSaveDevice)