diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-06-03 14:21:54 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-06-14 11:10:28 +0200 |
| commit | ca1a8d80f162d26bd280a7c05f0553946a06117e (patch) | |
| tree | 9ca811768441fbf31de6a979dda7e0860d2ca062 | |
| parent | cae4f72585f06023efc28e00d4341c87864e5961 (diff) | |
Fix warnings
- qcoapprotocol.cpp:387: implicit conversion changes signedness: 'int' to 'uint' (aka 'unsigned int')
- tst_qcoapclient.cpp:365: implicit conversion loses integer precision: 'int' to 'quint16' (aka 'unsigned short')
- tst_qcoapclient.cpp:502: implicit conversion changes signedness: 'int' to 'uint' (aka 'unsigned int')
- tst_qcoapclient.cpp:504: implicit conversion changes signedness: 'int' to 'uint' (aka 'unsigned int')
Change-Id: I5bec42fc69925f04641285c6473d9ddc3ba6ec56
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | src/coap/qcoapprotocol.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qcoapclient/tst_qcoapclient.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/coap/qcoapprotocol.cpp b/src/coap/qcoapprotocol.cpp index e5b7895..30ee188 100644 --- a/src/coap/qcoapprotocol.cpp +++ b/src/coap/qcoapprotocol.cpp @@ -383,8 +383,8 @@ void QCoapProtocolPrivate::onFrameReceived(const QByteArray &data, const QHostAd } // Send next block, ask for next block, or process the final reply - if (reply->hasMoreBlocksToSend()) { - request->setToSendBlock(reply->nextBlockToSend(), blockSize); + if (reply->hasMoreBlocksToSend() && reply->nextBlockToSend() >= 0) { + request->setToSendBlock(static_cast<uint>(reply->nextBlockToSend()), blockSize); request->setMessageId(generateUniqueMessageId()); sendRequest(request); } else if (reply->hasMoreBlocksToReceive()) { diff --git a/tests/auto/qcoapclient/tst_qcoapclient.cpp b/tests/auto/qcoapclient/tst_qcoapclient.cpp index 20f1cab..523c3ae 100644 --- a/tests/auto/qcoapclient/tst_qcoapclient.cpp +++ b/tests/auto/qcoapclient/tst_qcoapclient.cpp @@ -362,7 +362,7 @@ void tst_QCoapClient::setBlockSize() QFETCH(int, blockSizeExpected); QCoapClientForTests client; - client.setBlockSize(blockSizeSet); + client.setBlockSize(static_cast<quint16>(blockSizeSet)); QEventLoop eventLoop; QTimer::singleShot(1000, &eventLoop, &QEventLoop::quit); @@ -483,19 +483,19 @@ void tst_QCoapClient::socketError() } void tst_QCoapClient::timeout_data() { - QTest::addColumn<int>("timeout"); - QTest::addColumn<int>("maximumRetransmitCount"); + QTest::addColumn<uint>("timeout"); + QTest::addColumn<uint>("maximumRetransmitCount"); - QTest::newRow("2000/0") << 2000 << 0; - QTest::newRow("2000/2") << 2000 << 2; - QTest::newRow("4000/0") << 4000 << 0; + QTest::newRow("2000/0") << 2000u << 0u; + QTest::newRow("2000/2") << 2000u << 2u; + QTest::newRow("4000/0") << 4000u << 0u; } void tst_QCoapClient::timeout() { #ifdef QT_BUILD_INTERNAL - QFETCH(int, timeout); - QFETCH(int, maximumRetransmitCount); + QFETCH(uint, timeout); + QFETCH(uint, maximumRetransmitCount); QCoapClientForTests client; // Trigger a network timeout @@ -514,7 +514,7 @@ void tst_QCoapClient::timeout() QSignalSpy spyReplyFinished(reply.data(), &QCoapReply::finished); // Check timeout upper limit - int transmissions = maximumRetransmitCount + 1; + uint transmissions = maximumRetransmitCount + 1; // 10% Precision expected at least, plus timer precision QTRY_COMPARE_WITH_TIMEOUT(spyReplyError.count(), 1, static_cast<int>( |