Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-coap for openSUSE:Factory checked in at 2023-01-11 14:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-coap (Old) and /work/SRC/openSUSE:Factory/.qt6-coap.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-coap" Wed Jan 11 14:33:51 2023 rev:18 rq:1057257 version:6.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-coap/qt6-coap.changes 2022-11-21 15:29:50.616723845 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-coap.new.32243/qt6-coap.changes 2023-01-11 14:34:44.757126269 +0100 @@ -1,0 +2,6 @@ +Fri Jan 6 16:46:37 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.4.2: + * https://www.qt.io/blog/qt-6.4.2-released + +------------------------------------------------------------------- Old: ---- qtcoap-everywhere-src-6.4.1.tar.xz New: ---- qtcoap-everywhere-src-6.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-coap.spec ++++++ --- /var/tmp/diff_new_pack.7ttGaI/_old 2023-01-11 14:34:45.465130271 +0100 +++ /var/tmp/diff_new_pack.7ttGaI/_new 2023-01-11 14:34:45.477130339 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.1 +%define real_version 6.4.2 %define short_version 6.4 %define tar_name qtcoap-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-coap%{?pkg_suffix} -Version: 6.4.1 +Version: 6.4.2 Release: 0 Summary: Qt 6 CoAP client module License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.7ttGaI/_old 2023-01-11 14:34:45.521130589 +0100 +++ /var/tmp/diff_new_pack.7ttGaI/_new 2023-01-11 14:34:45.525130611 +0100 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.4.1</param> + <param name="version">6.4.2</param> <param name="url">git://code.qt.io/qt/qtcoap.git</param> - <param name="revision">v6.4.1</param> + <param name="revision">v6.4.2</param> <param name="scm">git</param> <param name="filename">qtcoap-everywhere-src</param> </service> ++++++ qtcoap-everywhere-src-6.4.1.tar.xz -> qtcoap-everywhere-src-6.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/.cmake.conf new/qtcoap-everywhere-src-6.4.2/.cmake.conf --- old/qtcoap-everywhere-src-6.4.1/.cmake.conf 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/.cmake.conf 2022-12-12 15:02:26.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.4.1") +set(QT_REPO_MODULE_VERSION "6.4.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/dependencies.yaml new/qtcoap-everywhere-src-6.4.2/dependencies.yaml --- old/qtcoap-everywhere-src-6.4.1/dependencies.yaml 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 15:02:26.000000000 +0100 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 905755304a474c942346774d930b92e3665c1bab + ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/examples/coap/consolecoapclient/coaphandler.cpp new/qtcoap-everywhere-src-6.4.2/examples/coap/consolecoapclient/coaphandler.cpp --- old/qtcoap-everywhere-src-6.4.1/examples/coap/consolecoapclient/coaphandler.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/examples/coap/consolecoapclient/coaphandler.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -83,7 +83,7 @@ { Q_UNUSED(reply) - for (const QCoapResource &res : qAsConst(resources)) + for (const QCoapResource &res : std::as_const(resources)) qCInfo(lcCoapClient) << "Discovered resource:" << res.path() << res.title(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/examples/coap/quickmulticastclient/main.qml new/qtcoap-everywhere-src-6.4.2/examples/coap/quickmulticastclient/main.qml --- old/qtcoap-everywhere-src-6.4.1/examples/coap/quickmulticastclient/main.qml 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/examples/coap/quickmulticastclient/main.qml 2022-12-12 15:02:26.000000000 +0100 @@ -1,12 +1,12 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.13 -import CoapMulticastClient 1.0 -import qtcoap.example.namespace 1.0 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts +import CoapMulticastClient +import qtcoap.example.namespace Window { visible: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/examples/coap/quicksecureclient/FilePicker.qml new/qtcoap-everywhere-src-6.4.2/examples/coap/quicksecureclient/FilePicker.qml --- old/qtcoap-everywhere-src-6.4.1/examples/coap/quicksecureclient/FilePicker.qml 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/examples/coap/quicksecureclient/FilePicker.qml 2022-12-12 15:02:26.000000000 +0100 @@ -1,10 +1,10 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.13 -import QtQuick.Controls 2.13 -import QtQuick.Layouts 1.13 -import Qt.labs.platform 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Qt.labs.platform Item { id: filePicker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/examples/coap/quicksecureclient/main.qml new/qtcoap-everywhere-src-6.4.2/examples/coap/quicksecureclient/main.qml --- old/qtcoap-everywhere-src-6.4.1/examples/coap/quicksecureclient/main.qml 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/examples/coap/quicksecureclient/main.qml 2022-12-12 15:02:26.000000000 +0100 @@ -1,12 +1,12 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.13 -import QtQuick.Layouts 1.13 -import QtQuick.Controls 2.13 -import QtQuick.Window 2.13 -import CoapSecureClient 1.0 -import qtcoap.example.namespace 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window +import CoapSecureClient +import qtcoap.example.namespace Window { visible: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapinternalreply.cpp new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapinternalreply.cpp --- old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapinternalreply.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapinternalreply.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -67,7 +67,7 @@ // Parse Options int i = 4 + tokenLength; quint16 lastOptionNumber = 0; - while (i != reply.length() && pduData[i] != 0xFF) { + while (i != reply.size() && pduData[i] != 0xFF) { quint16 optionDelta = ((pduData[i] >> 4) & 0x0F); quint16 optionLength = (pduData[i] & 0x0F); @@ -97,7 +97,7 @@ } // Parse Payload - if (i < reply.length() && pduData[i] == 0xFF) { + if (i < reply.size() && pduData[i] == 0xFF) { // -1 because of 0xFF at the beginning QByteArray currentPayload = reply.mid(i + 1); d->message.setPayload(d->message.payload().append(currentPayload)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapinternalrequest.cpp new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapinternalrequest.cpp --- old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapinternalrequest.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapinternalrequest.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -131,7 +131,7 @@ // Insert header appendByte(&pdu, (d->message.version() << 6) // CoAP version | (static_cast<quint8>(d->message.type()) << 4) // Message type - | d->message.token().length()); // Token Length + | d->message.token().size()); // Token Length appendByte(&pdu, static_cast<quint8>(d->method) & 0xFF); // Method code appendByte(&pdu, (d->message.messageId() >> 8) & 0xFF); // Message ID appendByte(&pdu, d->message.messageId() & 0xFF); @@ -150,7 +150,7 @@ })); quint8 lastOptionNumber = 0; - for (const QCoapOption &option : qAsConst(options)) { + for (const QCoapOption &option : std::as_const(options)) { quint16 optionDelta = static_cast<quint16>(option.name()) - lastOptionNumber; bool isOptionDeltaExtended = false; @@ -290,7 +290,7 @@ // M field: whether more blocks are following // 1 bit if (name == QCoapOption::Block1 - && static_cast<int>((blockNumber + 1) * blockSize) < d->fullPayload.length()) { + && static_cast<int>((blockNumber + 1) * blockSize) < d->fullPayload.size()) { optionData |= 8; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapmessage.cpp new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapmessage.cpp --- old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapmessage.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapmessage.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -198,7 +198,7 @@ quint8 QCoapMessage::tokenLength() const { Q_D(const QCoapMessage); - return static_cast<quint8>(d->token.length()); + return static_cast<quint8>(d->token.size()); } /*! @@ -299,7 +299,7 @@ int QCoapMessage::optionCount() const { Q_D(const QCoapMessage); - return d->options.length(); + return d->options.size(); } /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapoption.cpp new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapoption.cpp --- old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapoption.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapoption.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -177,7 +177,7 @@ Q_D(const QCoapOption); quint32 intValue = 0; - for (int i = 0; i < d->value.length(); i++) + for (int i = 0; i < d->value.size(); i++) intValue |= static_cast<quint8>(d->value.at(i)) << (8 * i); return intValue; @@ -198,7 +198,7 @@ int QCoapOption::length() const { Q_D(const QCoapOption); - return d->value.length(); + return d->value.size(); } /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapprotocol.cpp new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapprotocol.cpp --- old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapprotocol.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapprotocol.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -150,7 +150,7 @@ // Set block size for blockwise request/replies, if specified if (d->blockSize > 0) { internalRequest->setToRequestBlock(0, d->blockSize); - if (requestMessage->payload().length() > d->blockSize) + if (requestMessage->payload().size() > d->blockSize) internalRequest->setToSendBlock(0, d->blockSize); } @@ -523,7 +523,7 @@ QByteArray finalPayload; int lastBlockNumber = -1; - for (auto reply : qAsConst(replies)) { + for (auto reply : std::as_const(replies)) { int currentBlock = static_cast<int>(reply->currentBlockNumber()); QByteArray replyPayload = reply->message()->payload(); if (replyPayload.isEmpty() || currentBlock <= lastBlockNumber) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapresourcediscoveryreply.cpp new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapresourcediscoveryreply.cpp --- old/qtcoap-everywhere-src-6.4.1/src/coap/qcoapresourcediscoveryreply.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/src/coap/qcoapresourcediscoveryreply.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -115,7 +115,7 @@ const QList<QByteArray> parameterList = link.split(';'); for (QByteArray parameter : parameterList) { QString parameterString = QString::fromUtf8(parameter); - int length = parameterString.length(); + int length = parameterString.size(); if (parameter.startsWith('<')) resource.setPath(parameterString.mid(1, length - 2)); else if (parameter.startsWith("title=")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/tests/auto/coapnetworksettings.h new/qtcoap-everywhere-src-6.4.2/tests/auto/coapnetworksettings.h --- old/qtcoap-everywhere-src-6.4.1/tests/auto/coapnetworksettings.h 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/tests/auto/coapnetworksettings.h 2022-12-12 15:02:26.000000000 +0100 @@ -156,7 +156,7 @@ spyClientFinished.wait(1000); - if (spyClientFinished.count() == 1) + if (spyClientFinished.size() == 1) return true; } return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapclient/tst_qcoapclient.cpp new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapclient/tst_qcoapclient.cpp --- old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapclient/tst_qcoapclient.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapclient/tst_qcoapclient.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -360,8 +360,8 @@ QCoapRequestPrivate::adjustedUrl(url, client.isSecure())); #endif QSignalSpy spyReplyFinished(reply.data(), &QCoapReply::finished); - QTRY_COMPARE(spyReplyFinished.count(), 1); - QTRY_COMPARE(spyClientFinished.count(), 1); + QTRY_COMPARE(spyReplyFinished.size(), 1); + QTRY_COMPARE(spyClientFinished.size(), 1); QByteArray replyData; if (!reply.isNull()) { @@ -397,7 +397,7 @@ QVERIFY2(!reply.isNull(), "Request failed unexpectedly"); QSignalSpy spyReplyFinished(reply.data(), &QCoapReply::finished); - QTRY_COMPARE(spyReplyFinished.count(), 1); + QTRY_COMPARE(spyReplyFinished.size(), 1); QByteArray replyData = reply->readAll(); @@ -484,7 +484,7 @@ QVERIFY2(!reply.isNull(), "Request failed unexpectedly"); QSignalSpy spyReplyFinished(reply.data(), &QCoapReply::finished); - QTRY_COMPARE(spyReplyFinished.count(), 1); + QTRY_COMPARE(spyReplyFinished.size(), 1); QByteArray replyData = reply->readAll(); @@ -538,8 +538,8 @@ } for (const auto &signalSpy : signalSpies) - QTRY_COMPARE(signalSpy->count(), 1); - QTRY_COMPARE(spyClientFinished.count(), 4); + QTRY_COMPARE(signalSpy->size(), 1); + QTRY_COMPARE(spyClientFinished.size(), 4); for (uint8_t i = 0; i < requestCount; ++i) { QCOMPARE(replies[i]->responseCode(), QtCoap::ResponseCode::Content); @@ -565,8 +565,8 @@ QScopedPointer<QCoapReply> reply(client.get(url)); QSignalSpy spyClientError(&client, &QCoapClient::error); - QTRY_COMPARE_WITH_TIMEOUT(spySocketError.count(), 1, 10000); - QTRY_COMPARE_WITH_TIMEOUT(spyClientError.count(), 1, 1000); + QTRY_COMPARE_WITH_TIMEOUT(spySocketError.size(), 1, 10000); + QTRY_COMPARE_WITH_TIMEOUT(spyClientError.size(), 1, 1000); QCOMPARE(qvariant_cast<QtCoap::Error>(spyClientError.first().at(1)), QtCoap::Error::AddressInUse); #else @@ -611,7 +611,7 @@ uint transmissions = maximumRetransmitCount + 1; // 10% Precision expected at least, plus timer precision - QTRY_COMPARE_WITH_TIMEOUT(spyReplyError.count(), 1, static_cast<int>( + QTRY_COMPARE_WITH_TIMEOUT(spyReplyError.size(), 1, static_cast<int>( 1.1 * client.protocol()->maximumTransmitWait() + 20 * transmissions)); // Check timeout lower limit @@ -626,9 +626,9 @@ QCOMPARE(qvariant_cast<QtCoap::Error>(spyReplyError.first().at(1)), QtCoap::Error::TimeOut); - QCOMPARE(spyReplyFinished.count(), 1); - QCOMPARE(spyReplyAborted.count(), 0); - QCOMPARE(spyClientError.count(), 1); + QCOMPARE(spyReplyFinished.size(), 1); + QCOMPARE(spyReplyAborted.size(), 0); + QCOMPARE(spyClientError.size(), 1); #else QSKIP("Not an internal build, skipping this test"); #endif @@ -653,9 +653,9 @@ QTimer::singleShot(1000, &eventLoop, &QEventLoop::quit); eventLoop.exec(); - QCOMPARE(spyReplyAborted.count(), 1); - QCOMPARE(spyReplyFinished.count(), 1); - QCOMPARE(spyReplyError.count(), 0); + QCOMPARE(spyReplyAborted.size(), 1); + QCOMPARE(spyReplyFinished.size(), 1); + QCOMPARE(spyReplyError.size(), 0); } void tst_QCoapClient::blockwiseReply_data() @@ -755,8 +755,8 @@ Helper helper; connect(reply.data(), &QCoapReply::error, &helper, &Helper::onError); - QCOMPARE(spyReplyError.count(), 0); - QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.count(), 1, 30000); + QCOMPARE(spyReplyError.size(), 0); + QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.size(), 1, 30000); QCOMPARE(reply->readAll(), replyData); } @@ -822,7 +822,7 @@ QVERIFY(!reply.isNull()); QSignalSpy spyReplyFinished(reply.data(), &QCoapReply::finished); - QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.count(), 1, 30000); + QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.size(), 1, 30000); QByteArray dataReply = reply->readAll(); QCOMPARE(dataReply, replyData); @@ -862,14 +862,14 @@ QVERIFY(!resourcesReply.isNull()); QSignalSpy spyReplyFinished(resourcesReply.data(), &QCoapReply::finished); - QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.count(), 1, 30000); + QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.size(), 1, 30000); const auto discoverUrl = QUrl(url.toString() + "/.well-known/core"); #ifdef QT_BUILD_INTERNAL QCOMPARE(resourcesReply->url(), QCoapRequestPrivate::adjustedUrl(discoverUrl, client.isSecure())); #endif - QCOMPARE(resourcesReply->resources().length(), resourceNumber); + QCOMPARE(resourcesReply->resources().size(), resourceNumber); QCOMPARE(resourcesReply->request().method(), QtCoap::Method::Get); //! TODO Test discovery content too @@ -959,7 +959,7 @@ QSignalSpy spyReplyNotified(reply.data(), &QCoapReply::notified); QSignalSpy spyReplyFinished(reply.data(), &QCoapReply::finished); - QTRY_COMPARE_WITH_TIMEOUT(spyReplyNotified.count(), 3, 30000); + QTRY_COMPARE_WITH_TIMEOUT(spyReplyNotified.size(), 3, 30000); client.cancelObserve(reply.data()); #ifdef QT_BUILD_INTERNAL QCOMPARE(reply->url(), @@ -968,9 +968,9 @@ QCOMPARE(reply->request().method(), QtCoap::Method::Get); QVERIFY2(!spyReplyNotified.wait(7000), "'Notify' signal received after cancelling observe"); - QCOMPARE(spyReplyFinished.count(), 1); + QCOMPARE(spyReplyFinished.size(), 1); - for (QList<QVariant> receivedSignals : qAsConst(spyReplyNotified)) { + for (QList<QVariant> receivedSignals : std::as_const(spyReplyNotified)) { QRegularExpression regexp(QStringLiteral("..:..:..")); QByteArray payload = receivedSignals.at(1).value<QCoapMessage>().payload(); QString error = QString("Invalid payload for 'notified' signal: %1").arg(QString(payload)); @@ -1002,7 +1002,7 @@ emit client.connection()->readyRead("SE\xAD/abc\xC0\xFFReply1", host1); QSignalSpy spyMulticastResponse(&client, &QCoapClient::responseToMulticastReceived); - QTRY_COMPARE(spyMulticastResponse.count(), 2); + QTRY_COMPARE(spyMulticastResponse.size(), 2); QCoapMessage message0 = qvariant_cast<QCoapMessage>(spyMulticastResponse.at(0).at(1)); QCOMPARE(message0.payload(), "Reply0"); @@ -1037,7 +1037,7 @@ emit client.connection()->readyRead("SE#~abc\xC0\xB1%\xFFReply4", host1); QSignalSpy spyMulticastResponse(&client, &QCoapClient::responseToMulticastReceived); - QTRY_COMPARE(spyMulticastResponse.count(), 2); + QTRY_COMPARE(spyMulticastResponse.size(), 2); QCoapMessage message0 = qvariant_cast<QCoapMessage>(spyMulticastResponse.at(0).at(1)); QCOMPARE(message0.payload(), "Reply1Reply2"); @@ -1087,7 +1087,7 @@ QScopedPointer<QCoapReply> reply; reply.reset(client.get(QCoapRequest("127.0.0.1"))); - QTRY_COMPARE_WITH_TIMEOUT(spyClientError.count(), 1, 300); + QTRY_COMPARE_WITH_TIMEOUT(spyClientError.size(), 1, 300); QVERIFY(reply->request().tokenLength() >= expectedMinSize); QVERIFY(reply->request().tokenLength() <= maxSize); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp --- old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -127,7 +127,7 @@ QCOMPARE(reply->responseCode(), responseCode); QCOMPARE(reply->message()->messageId(), messageId); QCOMPARE(reply->message()->token().toHex(), token); - QCOMPARE(reply->message()->optionCount(), optionsNames.count()); + QCOMPARE(reply->message()->optionCount(), optionsNames.size()); for (int i = 0; i < reply->message()->optionCount(); ++i) { QCoapOption option = reply->message()->optionAt(i); QCOMPARE(option.name(), optionsNames.at(i)); @@ -159,7 +159,7 @@ Q_ARG(QtCoap::ResponseCode, internalReply.responseCode())); QMetaObject::invokeMethod(reply.data(), "_q_setFinished", Q_ARG(QtCoap::Error, QtCoap::Error::Ok)); - QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.count(), 1, 1000); + QTRY_COMPARE_WITH_TIMEOUT(spyReplyFinished.size(), 1, 1000); QCOMPARE(reply->readAll(), data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp --- old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -197,7 +197,7 @@ for (QCoapOption opt : options) QVERIFY2(internalRequest.message()->options().contains(opt), "Missing option"); - QCOMPARE(options.count(), internalRequest.message()->optionCount()); + QCOMPARE(options.size(), internalRequest.message()->optionCount()); } void tst_QCoapInternalRequest::urlOptions_data() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapqudpconnection/tst_qcoapqudpconnection.cpp new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapqudpconnection/tst_qcoapqudpconnection.cpp --- old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapqudpconnection/tst_qcoapqudpconnection.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapqudpconnection/tst_qcoapqudpconnection.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -73,8 +73,8 @@ // This will trigger connection.bind() connection.sendRequest(QByteArray(), QString(), 0); - QTRY_COMPARE(spySocketStateChanged.count(), 1); - QTRY_COMPARE(spyConnectionBound.count(), 1); + QTRY_COMPARE(spySocketStateChanged.size(), 1); + QTRY_COMPARE(spyConnectionBound.size(), 1); QCOMPARE(connection.state(), QCoapQUdpConnection::ConnectionState::Bound); } @@ -85,7 +85,7 @@ // This will trigger connection.bind() QSignalSpy connectionBoundSpy(&connection, SIGNAL(bound())); connection.sendRequest(QByteArray(), QString(), 0); - QTRY_COMPARE(connectionBoundSpy.count(), 1); + QTRY_COMPARE(connectionBoundSpy.size(), 1); QCOMPARE(connection.state(), QCoapQUdpConnection::ConnectionState::Bound); connection.disconnect(); @@ -93,7 +93,7 @@ // Make sure that we are able to connect again connection.sendRequest(QByteArray(), QString(), 0); - QTRY_COMPARE(connectionBoundSpy.count(), 2); + QTRY_COMPARE(connectionBoundSpy.size(), 2); QCOMPARE(connection.state(), QCoapQUdpConnection::ConnectionState::Bound); } @@ -171,8 +171,8 @@ QCoapInternalRequest internalRequest(request); connection.sendRequest(internalRequest.toQByteArray(), host, port); - QTRY_COMPARE(spySocketReadyRead.count(), 1); - QTRY_COMPARE(spyConnectionReadyRead.count(), 1); + QTRY_COMPARE(spySocketReadyRead.size(), 1); + QTRY_COMPARE(spyConnectionReadyRead.size(), 1); QByteArray data = spyConnectionReadyRead.first().first().value<QByteArray>(); QVERIFY(QString(data.toHex()).startsWith(dataHexaHeader)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapreply/tst_qcoapreply.cpp new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapreply/tst_qcoapreply.cpp --- old/qtcoap-everywhere-src-6.4.1/tests/auto/qcoapreply/tst_qcoapreply.cpp 2022-11-08 16:10:31.000000000 +0100 +++ new/qtcoap-everywhere-src-6.4.2/tests/auto/qcoapreply/tst_qcoapreply.cpp 2022-12-12 15:02:26.000000000 +0100 @@ -71,14 +71,14 @@ QMetaObject::invokeMethod(reply.data(), "_q_setFinished", Q_ARG(QtCoap::Error, error)); - QCOMPARE(spyReplyFinished.count(), 1); - QCOMPARE(spyReplyNotified.count(), 0); - QCOMPARE(spyReplyAborted.count(), 0); + QCOMPARE(spyReplyFinished.size(), 1); + QCOMPARE(spyReplyNotified.size(), 0); + QCOMPARE(spyReplyAborted.size(), 0); if (error != QtCoap::Error::Ok || QtCoap::isError(responseCode)) { - QVERIFY(spyReplyError.count() > 0); + QVERIFY(spyReplyError.size() > 0); QCOMPARE(reply->isSuccessful(), false); } else { - QCOMPARE(spyReplyError.count(), 0); + QCOMPARE(spyReplyError.size(), 0); QCOMPARE(reply->isSuccessful(), true); } @@ -111,9 +111,9 @@ QSignalSpy spyFinished(reply.data(), &QCoapReply::finished); reply->abortRequest(); - QTRY_COMPARE_WITH_TIMEOUT(spyAborted.count(), 1, 1000); + QTRY_COMPARE_WITH_TIMEOUT(spyAborted.size(), 1, 1000); QList<QVariant> arguments = spyAborted.takeFirst(); - QTRY_COMPARE_WITH_TIMEOUT(spyFinished.count(), 1, 1000); + QTRY_COMPARE_WITH_TIMEOUT(spyFinished.size(), 1, 1000); QVERIFY(arguments.at(0).toByteArray() == "token"); }
