Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-serialbus for openSUSE:Factory checked in at 2023-01-11 14:34:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-serialbus (Old) and /work/SRC/openSUSE:Factory/.qt6-serialbus.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-serialbus" Wed Jan 11 14:34:10 2023 rev:11 rq:1057277 version:6.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-serialbus/qt6-serialbus.changes 2022-11-21 15:29:27.088604399 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-serialbus.new.32243/qt6-serialbus.changes 2023-01-11 14:35:14.265293075 +0100 @@ -1,0 +2,6 @@ +Fri Jan 6 16:46:50 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.4.2: + * https://www.qt.io/blog/qt-6.4.2-released + +------------------------------------------------------------------- Old: ---- qtserialbus-everywhere-src-6.4.1.tar.xz New: ---- qtserialbus-everywhere-src-6.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-serialbus.spec ++++++ --- /var/tmp/diff_new_pack.2xiZRE/_old 2023-01-11 14:35:14.761295879 +0100 +++ /var/tmp/diff_new_pack.2xiZRE/_new 2023-01-11 14:35:14.769295924 +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 qtserialbus-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-serialbus -Version: 6.4.1 +Version: 6.4.2 Release: 0 Summary: Qt 6 SerialBus library License: LGPL-3.0-only OR GPL-2.0-or-later ++++++ qtserialbus-everywhere-src-6.4.1.tar.xz -> qtserialbus-everywhere-src-6.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/.cmake.conf new/qtserialbus-everywhere-src-6.4.2/.cmake.conf --- old/qtserialbus-everywhere-src-6.4.1/.cmake.conf 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/.cmake.conf 2022-12-12 15:31:35.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/qtserialbus-everywhere-src-6.4.1/.tag new/qtserialbus-everywhere-src-6.4.2/.tag --- old/qtserialbus-everywhere-src-6.4.1/.tag 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/.tag 2022-12-12 15:31:35.000000000 +0100 @@ -1 +1 @@ -265bd1ef4b473ff72c72ec800a605ebc15f2389e +2b24135d47abb73b1040424a0d8cf5de98393b30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/dependencies.yaml new/qtserialbus-everywhere-src-6.4.2/dependencies.yaml --- old/qtserialbus-everywhere-src-6.4.1/dependencies.yaml 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 15:31:35.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 905755304a474c942346774d930b92e3665c1bab + ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f required: true ../qtserialport: - ref: 03f9b5fab536a11b7f200e4592fe67dd96363570 + ref: a29d4f9bb7f6145a6bfe0a0bb3889412a7032bfb required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/examples/serialbus/can/connectdialog.cpp new/qtserialbus-everywhere-src-6.4.2/examples/serialbus/can/connectdialog.cpp --- old/qtserialbus-everywhere-src-6.4.1/examples/serialbus/can/connectdialog.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/examples/serialbus/can/connectdialog.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -124,7 +124,7 @@ { m_ui->interfaceListBox->clear(); m_interfaces = QCanBus::instance()->availableDevices(plugin); - for (const QCanBusDeviceInfo &info : qAsConst(m_interfaces)) + for (const QCanBusDeviceInfo &info : std::as_const(m_interfaces)) m_ui->interfaceListBox->addItem(info.name()); } @@ -158,7 +158,7 @@ { QVariant result; - for (const ConfigurationItem &item : qAsConst(m_currentSettings.configurations)) { + for (const ConfigurationItem &item : std::as_const(m_currentSettings.configurations)) { if (item.first == key) { result = item.second; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/examples/serialbus/modbus/server/mainwindow.cpp new/qtserialbus-everywhere-src-6.4.2/examples/serialbus/modbus/server/mainwindow.cpp --- old/qtserialbus-everywhere-src-6.4.1/examples/serialbus/modbus/server/mainwindow.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/examples/serialbus/modbus/server/mainwindow.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -258,7 +258,7 @@ } bool ok; - for (QLineEdit *widget : qAsConst(registers)) { + for (QLineEdit *widget : std::as_const(registers)) { if (widget->objectName().startsWith(QStringLiteral("inReg"))) { modbusDevice->setData(QModbusDataUnit::InputRegisters, quint16(widget->property("ID").toUInt()), widget->text().toUShort(&ok, 16)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdevice_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qcanbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdeviceinfo_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qcanbusdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbus_symbols_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbus_symbols_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbus_symbols_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusadu_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusadu_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusadu_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusclient_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusclient_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbuscommevent_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbuscommevent_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbuscommevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusdevice_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialclient_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialclient_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialclient_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusrtuserialclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialserver_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialserver_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialserver_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusrtuserialserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusrtuserialserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusserver_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbusserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpclient_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpclient_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbustcpclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpserver_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.1/QtSerialBus/private/qmodbustcpserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbustcpserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qcanbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbus_symbols_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusadu_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbuscommevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbustcpclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbustcpserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/qtserialbusversion.h new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/qtserialbusversion.h --- old/qtserialbus-everywhere-src-6.4.1/include/QtSerialBus/qtserialbusversion.h 2022-11-10 12:06:03.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/qtserialbusversion.h 2022-12-13 08:05:05.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSERIALBUS_VERSION_H #define QT_QTSERIALBUS_VERSION_H -#define QTSERIALBUS_VERSION_STR "6.4.1" +#define QTSERIALBUS_VERSION_STR "6.4.2" -#define QTSERIALBUS_VERSION 0x060401 +#define QTSERIALBUS_VERSION 0x060402 #endif // QT_QTSERIALBUS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/plugins/canbus/tinycan/tinycanbackend.cpp new/qtserialbus-everywhere-src-6.4.2/src/plugins/canbus/tinycan/tinycanbackend.cpp --- old/qtserialbus-everywhere-src-6.4.1/src/plugins/canbus/tinycan/tinycanbackend.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/plugins/canbus/tinycan/tinycanbackend.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -89,7 +89,7 @@ Q_UNUSED(count); QMutexLocker lock(&gTinyCan->mutex); - for (TinyCanBackendPrivate *p : qAsConst(gTinyCan->channels)) { + for (TinyCanBackendPrivate *p : std::as_const(gTinyCan->channels)) { if (p->channelIndex == int(index)) { p->startRead(); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/plugins/canbus/virtualcan/virtualcanbackend.cpp new/qtserialbus-everywhere-src-6.4.2/src/plugins/canbus/virtualcan/virtualcanbackend.cpp --- old/qtserialbus-everywhere-src-6.4.1/src/plugins/canbus/virtualcan/virtualcanbackend.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/plugins/canbus/virtualcan/virtualcanbackend.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -112,7 +112,7 @@ const QByteArrayList commandList = command.split(':'); Q_ASSERT(commandList.size() == 2); - for (QTcpSocket *writeSocket : qAsConst(m_serverSockets)) { + for (QTcpSocket *writeSocket : std::as_const(m_serverSockets)) { // Don't send the frame back to its origin if (writeSocket == readSocket) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qcanbus.cpp new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbus.cpp --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qcanbus.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbus.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -38,7 +38,7 @@ static void loadPlugins() { const QList<QPluginParsedMetaData> meta = qFactoryLoader()->metaData(); - for (int i = 0; i < meta.count(); i++) { + for (int i = 0; i < meta.size(); i++) { const QCborMap obj = meta.at(i).value(QtPluginMetaDataKeys::MetaData).toMap(); if (obj.isEmpty()) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qcanbusdevice.cpp new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusdevice.cpp --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qcanbusdevice.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusdevice.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -367,8 +367,8 @@ /*! Returns the list of keys used by the CAN bus connection. - The the meaning of the keys is equivalent to \l ConfigurationKey. - If a key is not explicitly mentioned the platform's + The meaning of the keys is equivalent to \l ConfigurationKey. + If a key is not explicitly mentioned, the platform's default setting for the relevant key is used. */ QList<QCanBusDevice::ConfigurationKey> QCanBusDevice::configurationKeys() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qcanbusframe.h new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusframe.h --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qcanbusframe.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusframe.h 2022-12-12 15:31:35.000000000 +0100 @@ -78,7 +78,7 @@ format(DataFrame), isExtendedFrame(0x0), version(Qt_5_10), - isFlexibleDataRate(data.length() > 8 ? 0x1 : 0x0), + isFlexibleDataRate(data.size() > 8 ? 0x1 : 0x0), isBitrateSwitch(0x0), isErrorStateIndicator(0x0), isLocalEcho(0x0), @@ -102,7 +102,7 @@ return false; // maximum permitted payload size in CAN or CAN FD - const int length = load.length(); + const int length = load.size(); if (isFlexibleDataRate) { if (format == RemoteRequestFrame) return false; @@ -170,7 +170,7 @@ void setPayload(const QByteArray &data) { load = data; - if (data.length() > 8) + if (data.size() > 8) isFlexibleDataRate = 0x1; } constexpr void setTimeStamp(TimeStamp ts) noexcept { stamp = ts; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbuspdu.h new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbuspdu.h --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbuspdu.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbuspdu.h 2022-12-12 15:31:35.000000000 +0100 @@ -127,7 +127,7 @@ { static_assert(is_pod<T>::value, "Only POD types supported."); static_assert(IsType<T, quint8, quint16>::value, "Only quint8 and quint16 supported."); - for (int i = 0; i < vector.count(); ++i) + for (int i = 0; i < vector.size(); ++i) (*stream) << vector[i]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbusserver.cpp new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbusserver.cpp --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbusserver.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbusserver.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -959,7 +959,7 @@ // range is numberOfCoils and therefore index too. quint16 coil = numberOfCoils; qint32 currentBit = 8 - ((byteCount * 8) - numberOfCoils); - for (quint8 currentByte : qAsConst(bytes)) { + for (quint8 currentByte : std::as_const(bytes)) { for (currentBit -= 1; currentBit >= 0; --currentBit) coils.setValue(--coil, currentByte & (1U << currentBit) ? 1 : 0); currentBit = 8; @@ -1253,7 +1253,7 @@ header[4] = quint8(0x00); // next object id header[5] = quint8(0x01); // number of objects header[6] = objectId; - header[7] = quint8(object.length()); + header[7] = quint8(object.size()); return QModbusResponse(request.functionCode(), QByteArray(header + object)); } default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbustcpclient_p.h 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpclient_p.h 2022-12-12 15:31:35.000000000 +0100 @@ -207,7 +207,7 @@ qCDebug(QT_MODBUS) << "(TCP client) Cleanup of pending requests"; - for (const auto &elem : qAsConst(m_transactionStore)) { + for (const auto &elem : std::as_const(m_transactionStore)) { if (elem.reply.isNull()) continue; elem.reply->setError(QModbusDevice::ReplyAbortedError, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbustcpserver.cpp new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpserver.cpp --- old/qtserialbus-everywhere-src-6.4.1/src/serialbus/qmodbustcpserver.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpserver.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -98,7 +98,7 @@ if (d->m_tcpServer->isListening()) d->m_tcpServer->close(); - for (auto socket : qAsConst(d->connections)) + for (auto socket : std::as_const(d->connections)) socket->disconnectFromHost(); setState(QModbusDevice::UnconnectedState); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp new/qtserialbus-everywhere-src-6.4.2/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp --- old/qtserialbus-everywhere-src-6.4.1/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -168,7 +168,7 @@ QVERIFY(device->connectDevice()); QCOMPARE(device->error(), QCanBusDevice::NoError); QTRY_VERIFY_WITH_TIMEOUT(device->state() == QCanBusDevice::ConnectedState, 5000); - QCOMPARE(stateSpy.count(), 4); + QCOMPARE(stateSpy.size(), 4); QCOMPARE(stateSpy.at(0).at(0).value<QCanBusDevice::CanBusDeviceState>(), QCanBusDevice::ConnectingState); QCOMPARE(stateSpy.at(1).at(0).value<QCanBusDevice::CanBusDeviceState>(), @@ -220,7 +220,7 @@ device->disconnectDevice(); QTRY_VERIFY_WITH_TIMEOUT(device->state() == QCanBusDevice::UnconnectedState, 5000); - QCOMPARE(stateSpy.count(), 2); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QCanBusDevice::CanBusDeviceState>(), QCanBusDevice::ClosingState); QCOMPARE(stateSpy.at(1).at(0).value<QCanBusDevice::CanBusDeviceState>(), @@ -230,11 +230,11 @@ QVERIFY(!device->writeFrame(frame)); QCOMPARE(device->error(), QCanBusDevice::OperationError); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); device->connectDevice(); QTRY_VERIFY_WITH_TIMEOUT(device->state() == QCanBusDevice::ConnectedState, 5000); - QCOMPARE(stateSpy.count(), 2); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QCanBusDevice::CanBusDeviceState>(), QCanBusDevice::ConnectingState); QCOMPARE(stateSpy.at(1).at(0).value<QCanBusDevice::CanBusDeviceState>(), @@ -242,7 +242,7 @@ QVERIFY(device->writeFrame(frame)); QCOMPARE(device->error(), QCanBusDevice::NoError); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCanBusDevice::read() @@ -258,7 +258,7 @@ QVERIFY(device->connectDevice()); QTRY_VERIFY_WITH_TIMEOUT(device->state() == QCanBusDevice::ConnectedState, 5000); - QCOMPARE(stateSpy.count(), 2); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QCanBusDevice::CanBusDeviceState>(), QCanBusDevice::ConnectingState); QCOMPARE(stateSpy.at(1).at(0).value<QCanBusDevice::CanBusDeviceState>(), @@ -338,7 +338,7 @@ QSignalSpy spy(device.get(), &QCanBusDevice::framesWritten); for (int i = 0; i < 10; ++i) device->writeFrame(QCanBusFrame(0x123, "output")); - QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 10, 5000); + QTRY_VERIFY_WITH_TIMEOUT(spy.size() == 10, 5000); // now test clearing the buffer before the frames are actually written spy.clear(); @@ -347,7 +347,7 @@ device->clear(QCanBusDevice::Output); QCOMPARE(device->error(), QCanBusDevice::NoError); - QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 0, 5000); + QTRY_VERIFY_WITH_TIMEOUT(spy.size() == 0, 5000); } void tst_QCanBusDevice::error() @@ -365,31 +365,31 @@ backend->emulateError(testString + QStringLiteral("a"), QCanBusDevice::ReadError); QCOMPARE(testString + QStringLiteral("a"), device->errorString()); QCOMPARE(device->error(), 1); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WriteError backend->emulateError(testString + QStringLiteral("b"), QCanBusDevice::WriteError); QCOMPARE(testString + QStringLiteral("b"), device->errorString()); QCOMPARE(device->error(), 2); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); // ConnectionError backend->emulateError(testString + QStringLiteral("c"), QCanBusDevice::ConnectionError); QCOMPARE(testString + QStringLiteral("c"), device->errorString()); QCOMPARE(device->error(), 3); - QCOMPARE(spy.count(), 3); + QCOMPARE(spy.size(), 3); // ConfigurationError backend->emulateError(testString + QStringLiteral("d"), QCanBusDevice::ConfigurationError); QCOMPARE(testString + QStringLiteral("d"), device->errorString()); QCOMPARE(device->error(), 4); - QCOMPARE(spy.count(), 4); + QCOMPARE(spy.size(), 4); // UnknownError backend->emulateError(testString + QStringLiteral("e"), QCanBusDevice::UnknownError); QCOMPARE(testString + QStringLiteral("e"), device->errorString()); QCOMPARE(device->error(), 5); - QCOMPARE(spy.count(), 5); + QCOMPARE(spy.size(), 5); } void tst_QCanBusDevice::cleanupTestCase() @@ -424,7 +424,7 @@ const QVariant wrapper = QVariant::fromValue(filters); const auto newFilter = wrapper.value<QList<QCanBusDevice::Filter> >(); - QCOMPARE(newFilter.count(), 2); + QCOMPARE(newFilter.size(), 2); QCOMPARE(newFilter.at(0).type, QCanBusFrame::DataFrame); QCOMPARE(newFilter.at(0).frameId, 0x1u); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusclient/tst_qmodbusclient.cpp new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusclient/tst_qmodbusclient.cpp --- old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusclient/tst_qmodbusclient.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusclient/tst_qmodbusclient.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -530,7 +530,7 @@ QFETCH(QList<quint16>, values); TestClient client; - QModbusDataUnit read(rc, address, values.count()); + QModbusDataUnit read(rc, address, values.size()); QModbusDataUnit write(rc, address, values); QModbusRequest request = client.d_func()->createRWRequest(read, write); QTEST(request.functionCode(), "fc"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp --- old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusdevice/tst_qmodbusdevice.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -85,7 +85,7 @@ device->setState(QModbusDevice::UnconnectedState); QCOMPARE(device->state(), QModbusDevice::UnconnectedState); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QModbusDevice::error() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusreply/tst_qmodbusreply.cpp new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusreply/tst_qmodbusreply.cpp --- old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusreply/tst_qmodbusreply.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusreply/tst_qmodbusreply.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -61,7 +61,7 @@ QVERIFY(errorSpy.isEmpty()); replyTest.setFinished(true); - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(errorSpy.isEmpty()); QCOMPARE(replyTest.serverAddress(), 1); QCOMPARE(replyTest.isFinished(), true); @@ -71,7 +71,7 @@ QCOMPARE(replyTest.error(), QModbusDevice::NoError); replyTest.setFinished(false); - QVERIFY(finishedSpy.count() == 1); // no further signal + QVERIFY(finishedSpy.size() == 1); // no further signal QVERIFY(errorSpy.isEmpty()); QCOMPARE(replyTest.serverAddress(), 1); QCOMPARE(replyTest.isFinished(), false); @@ -107,8 +107,8 @@ QVERIFY(errorSpy.isEmpty()); replyTest.setError(error, errorString); - QCOMPARE(finishedSpy.count(), 1); - QCOMPARE(errorSpy.count(), 1); + QCOMPARE(finishedSpy.size(), 1); + QCOMPARE(errorSpy.size(), 1); QCOMPARE(replyTest.rawResult().isValid(), false); QCOMPARE(replyTest.error(), error); QCOMPARE(replyTest.errorString(), errorString); @@ -116,8 +116,8 @@ replyTest.setError(error, errorString); replyTest.setFinished(true); - QCOMPARE(finishedSpy.count(), 3); //setError() implies call to setFinished() - QCOMPARE(errorSpy.count(), 2); + QCOMPARE(finishedSpy.size(), 3); //setError() implies call to setFinished() + QCOMPARE(errorSpy.size(), 2); } void tst_QModbusReply::tst_setResult() @@ -148,8 +148,8 @@ QModbusResponse response(QModbusResponse::ReadExceptionStatus, quint16(0x0000)); replyTest.setResult(unit); replyTest.setRawResult(response); - QCOMPARE(finishedSpy.count(), 0); - QCOMPARE(errorSpy.count(), 0); + QCOMPARE(finishedSpy.size(), 0); + QCOMPARE(errorSpy.size(), 0); QCOMPARE(replyTest.result().startAddress(), 5); QCOMPARE(replyTest.result().valueCount(), 3); QCOMPARE(replyTest.result().registerType(), QModbusDataUnit::Coils); @@ -178,8 +178,8 @@ replyRawTest.setResult(unit); replyRawTest.setRawResult(response); - QCOMPARE(finishedSpy.count(), 0); - QCOMPARE(errorSpyRaw.count(), 0); + QCOMPARE(finishedSpy.size(), 0); + QCOMPARE(errorSpyRaw.size(), 0); QCOMPARE(replyRawTest.result().isValid(), true); QCOMPARE(replyRawTest.rawResult().isValid(), true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusserver/tst_qmodbusserver.cpp new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusserver/tst_qmodbusserver.cpp --- old/qtserialbus-everywhere-src-6.4.1/tests/auto/qmodbusserver/tst_qmodbusserver.cpp 2022-11-08 16:58:52.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.2/tests/auto/qmodbusserver/tst_qmodbusserver.cpp 2022-12-12 15:31:35.000000000 +0100 @@ -877,9 +877,9 @@ QCOMPARE(server.data(registerType, 1, &data), validDataUnit); if (validDataUnit) { QCOMPARE(data, quint16(444)); - QTRY_COMPARE(writtenSpy.count(), 1); + QTRY_COMPARE(writtenSpy.size(), 1); QList<QVariant> signalData = writtenSpy.at(0); - QCOMPARE(signalData.count(), 3); + QCOMPARE(signalData.size(), 3); QCOMPARE(signalData.at(0).value<QModbusDataUnit::RegisterType>(), registerType); QCOMPARE(signalData.at(1).toInt(), 1); QCOMPARE(signalData.at(2).toInt(), 1); @@ -910,7 +910,7 @@ const QList<quint16> zeroVector = { 0, 0, 0, 0, 0 }; QModbusDataUnit rangeUnit(registerType, 7, valueVector); QCOMPARE(rangeUnit.valueCount(), 5); - QCOMPARE(rangeUnit.values().count(), 5); + QCOMPARE(rangeUnit.values().size(), 5); QCOMPARE(rangeUnit.startAddress(), 7); QVERIFY(rangeUnit.values() == valueVector); QVERIFY(rangeUnit.registerType() == registerType); @@ -925,9 +925,9 @@ QCOMPARE(readData, valueVector.at(i-rangeUnit.startAddress())); } - QTRY_COMPARE(writtenSpy.count(), 1); + QTRY_COMPARE(writtenSpy.size(), 1); QList<QVariant> signalData = writtenSpy.at(0); - QCOMPARE(signalData.count(), 3); + QCOMPARE(signalData.size(), 3); QCOMPARE(signalData.at(0).value<QModbusDataUnit::RegisterType>(), registerType); QCOMPARE(signalData.at(1).toInt(), rangeUnit.startAddress()); QCOMPARE(signalData.at(2).toInt(), rangeUnit.valueCount()); @@ -941,7 +941,7 @@ //never fits anywhere QModbusDataUnit oversizeUnit(registerType, 0, MAP_RANGE*2); QCOMPARE(oversizeUnit.valueCount(), MAP_RANGE*2); - QCOMPARE(oversizeUnit.values().count(), MAP_RANGE*2); + QCOMPARE(oversizeUnit.values().size(), MAP_RANGE*2); QCOMPARE(oversizeUnit.startAddress(), 0); QCOMPARE(oversizeUnit.registerType(), registerType); @@ -971,7 +971,7 @@ //testing server.data(QModbusDataUnit *) QModbusDataUnit requestUnit(registerType, 7, 5); QCOMPARE(requestUnit.valueCount(), 5); - QCOMPARE(requestUnit.values().count(), 5); + QCOMPARE(requestUnit.values().size(), 5); QCOMPARE(requestUnit.startAddress(), 7); QVERIFY(requestUnit.registerType() == registerType); QVERIFY(requestUnit.values() != valueVector); @@ -980,7 +980,7 @@ if (validDataUnit) { QVERIFY(requestUnit.values() == valueVector); QCOMPARE(requestUnit.valueCount(), 5); - QCOMPARE(requestUnit.values().count(), 5); + QCOMPARE(requestUnit.values().size(), 5); QCOMPARE(requestUnit.startAddress(), 7); } @@ -998,7 +998,7 @@ QVERIFY(server.data(&requestUnit) == validDataUnit); if (validDataUnit) { QCOMPARE(requestUnit.valueCount(), MAP_RANGE); - QCOMPARE(requestUnit.values().count(), MAP_RANGE); + QCOMPARE(requestUnit.values().size(), MAP_RANGE); } oversizeUnit.setStartAddress(0); @@ -1012,7 +1012,7 @@ QVERIFY(server.data(&oversizeUnit) == validDataUnit); if (validDataUnit) { QCOMPARE(oversizeUnit.valueCount(), MAP_RANGE); - QCOMPARE(oversizeUnit.values().count(), MAP_RANGE); + QCOMPARE(oversizeUnit.values().size(), MAP_RANGE); } }
