Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-remoteobjects for openSUSE:Factory checked in at 2023-01-11 14:34:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-remoteobjects (Old) and /work/SRC/openSUSE:Factory/.qt6-remoteobjects.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-remoteobjects" Wed Jan 11 14:34:08 2023 rev:11 rq:1057274 version:6.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-remoteobjects/qt6-remoteobjects.changes 2022-11-21 15:29:21.944578284 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-remoteobjects.new.32243/qt6-remoteobjects.changes 2023-01-11 14:35:09.457265895 +0100 @@ -1,0 +2,6 @@ +Fri Jan 6 16:46:48 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.4.2: + * https://www.qt.io/blog/qt-6.4.2-released + +------------------------------------------------------------------- Old: ---- qtremoteobjects-everywhere-src-6.4.1.tar.xz New: ---- qtremoteobjects-everywhere-src-6.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-remoteobjects.spec ++++++ --- /var/tmp/diff_new_pack.7RHo2m/_old 2023-01-11 14:35:11.157275506 +0100 +++ /var/tmp/diff_new_pack.7RHo2m/_new 2023-01-11 14:35:11.157275506 +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 qtremoteobjects-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-remoteobjects%{?pkg_suffix} -Version: 6.4.1 +Version: 6.4.2 Release: 0 Summary: Qt6 RemoteObjects Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtremoteobjects-everywhere-src-6.4.1.tar.xz -> qtremoteobjects-everywhere-src-6.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/.cmake.conf new/qtremoteobjects-everywhere-src-6.4.2/.cmake.conf --- old/qtremoteobjects-everywhere-src-6.4.1/.cmake.conf 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/.cmake.conf 2022-12-12 18:12:07.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/qtremoteobjects-everywhere-src-6.4.1/.tag new/qtremoteobjects-everywhere-src-6.4.2/.tag --- old/qtremoteobjects-everywhere-src-6.4.1/.tag 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/.tag 2022-12-12 18:12:07.000000000 +0100 @@ -1 +1 @@ -e23459bd385bffa8095d44482cb32e1c073ee269 +5af075e26e243bc155882720e0736bdae01f6da9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/dependencies.yaml new/qtremoteobjects-everywhere-src-6.4.2/dependencies.yaml --- old/qtremoteobjects-everywhere-src-6.4.1/dependencies.yaml 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 18:12:07.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 905755304a474c942346774d930b92e3665c1bab + ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f required: true ../qtdeclarative: - ref: a514640b2a38391fceaaac3ca01b390ad3d62f31 + ref: 1b58f30087eedf42f16572d8ae1d6a5b18f3d698 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_local_backend_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_local_backend_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_local_backend_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_local_backend_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_local_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_global_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_global_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_global_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_global_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_global_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_qiodevices_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_server_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_server_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_server_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_qnx_server_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_server_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_tcpip_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnectionfactories_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnectionfactories_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnectionfactories_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qconnectionfactories_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnectionfactories_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectcontainers_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectnode_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectnode_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectnode_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpacket_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpacket_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpacket_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpacket_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectpacket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectpendingcall_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectregistrysource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectreplica_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectreplica_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectreplica_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectreplica_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsource_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsource_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsource_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsource_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectsource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectsourceio_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_local_backend_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_local_backend_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_local_backend_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_local_backend_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_local_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_global_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_global_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_global_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_global_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_global_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_qiodevices_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_server_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_server_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_server_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_qnx_server_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_server_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_tcpip_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnectionfactories_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnectionfactories_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnectionfactories_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qconnectionfactories_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnectionfactories_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectcontainers_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectnode_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectnode_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectnode_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpacket_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpacket_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpacket_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpacket_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectpacket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectpendingcall_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectregistrysource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectreplica_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectreplica_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectreplica_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectreplica_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsource_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsource_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsource_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsource_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectsource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/6.4.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectsourceio_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/qtremoteobjectsversion.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/qtremoteobjectsversion.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjects/qtremoteobjectsversion.h 2022-11-10 12:06:05.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjects/qtremoteobjectsversion.h 2022-12-13 08:05:08.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTREMOTEOBJECTS_VERSION_H #define QT_QTREMOTEOBJECTS_VERSION_H -#define QTREMOTEOBJECTS_VERSION_STR "6.4.1" +#define QTREMOTEOBJECTS_VERSION_STR "6.4.2" -#define QTREMOTEOBJECTS_VERSION 0x060401 +#define QTREMOTEOBJECTS_VERSION 0x060402 #endif // QT_QTREMOTEOBJECTS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjectsQml/6.4.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjectsQml/6.4.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjectsQml/6.4.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjectsQml/6.4.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjectsqml/qremoteobjectsqml_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjectsQml/6.4.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjectsQml/6.4.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjectsQml/6.4.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjectsQml/6.4.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjectsqml/qremoteobjectsqml_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h 2022-11-10 12:06:05.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h 2022-12-13 08:05:08.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTREMOTEOBJECTSQML_VERSION_H #define QT_QTREMOTEOBJECTSQML_VERSION_H -#define QTREMOTEOBJECTSQML_VERSION_STR "6.4.1" +#define QTREMOTEOBJECTSQML_VERSION_STR "6.4.2" -#define QTREMOTEOBJECTSQML_VERSION 0x060401 +#define QTREMOTEOBJECTSQML_VERSION 0x060402 #endif // QT_QTREMOTEOBJECTSQML_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/include/QtRepParser/qtrepparserversion.h new/qtremoteobjects-everywhere-src-6.4.2/include/QtRepParser/qtrepparserversion.h --- old/qtremoteobjects-everywhere-src-6.4.1/include/QtRepParser/qtrepparserversion.h 2022-11-10 12:06:05.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/include/QtRepParser/qtrepparserversion.h 2022-12-13 08:05:08.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTREPPARSER_VERSION_H #define QT_QTREPPARSER_VERSION_H -#define QTREPPARSER_VERSION_STR "6.4.1" +#define QTREPPARSER_VERSION_STR "6.4.2" -#define QTREPPARSER_VERSION 0x060401 +#define QTREPPARSER_VERSION 0x060402 #endif // QT_QTREPPARSER_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -657,7 +657,7 @@ QList<int> roles; QList<int> sections; QList<Qt::Orientation> orientations; - for (const RequestedHeaderData &data : qAsConst(m_requestedHeaderData)) { + for (const RequestedHeaderData &data : std::as_const(m_requestedHeaderData)) { roles.push_back(data.role); sections.push_back(data.section); orientations.push_back(data.orientation); @@ -673,7 +673,7 @@ QAbstractItemModel::LayoutChangeHint hint) { QList<QPersistentModelIndex> indexes; - for (const QtPrivate::ModelIndex &parent : qAsConst(parents)) { + for (const QtPrivate::ModelIndex &parent : std::as_const(parents)) { const QModelIndex parentIndex = toQModelIndex(QtPrivate::IndexList{parent}, q); indexes << QPersistentModelIndex(parentIndex); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h 2022-12-12 18:12:07.000000000 +0100 @@ -186,7 +186,7 @@ if (ok) *ok = true; QModelIndex result; - for (int i = 0; i < list.count(); ++i) { + for (int i = 0; i < list.size(); ++i) { const ModelIndex &index = list[i]; if (ensureItem) const_cast<QAbstractItemModel *>(model)->setData(result, index.row, Qt::UserRole - 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectcontainers.cpp new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectcontainers.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectcontainers.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectcontainers.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -32,7 +32,7 @@ { ds << p.m_valueTypeName; auto pos = ds.device()->pos(); - quint32 count = p.count(); + quint32 count = p.size(); ds << count; for (quint32 i = 0; i < count; i++) { if (!p.m_valueType.save(ds, p.at(i).data())) { @@ -105,7 +105,7 @@ ds << p.m_keyTypeName; ds << p.m_valueTypeName; auto pos = ds.device()->pos(); - quint32 count = p.count(); + quint32 count = p.size(); ds << count; QAssociativeIterable map(&p); QAssociativeIterable::const_iterator iter = map.begin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectnode.cpp new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectnode.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectnode.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectnode.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -869,7 +869,7 @@ dynamicProperty.setReadable(true); } QList<TypeInfo *> enumsToBeAssignedMetaObject; - enumsToBeAssignedMetaObject.reserve(gadget.enums.length()); + enumsToBeAssignedMetaObject.reserve(gadget.enums.size()); for (const auto &enumData: gadget.enums) { auto enumBuilder = gadgetBuilder.addEnumerator(enumData.name); enumBuilder.setIsFlag(enumData.isFlag); @@ -1422,7 +1422,7 @@ // We need to make sure all of the source objects are in connectedSources before we add connections, // otherwise nested QObjects could fail (we want to acquire children before parents, and the object // list is unordered) - for (const auto &remoteObject : qAsConst(rxObjects)) { + for (const auto &remoteObject : std::as_const(rxObjects)) { qROPrivDebug() << " connectedSources.contains(" << remoteObject << ")" << connectedSources.contains(remoteObject.name) << replicas.contains(remoteObject.name); if (!connectedSources.contains(remoteObject.name)) { connectedSources[remoteObject.name] = SourceInfo{connection, remoteObject.typeName, remoteObject.signature}; @@ -1432,7 +1432,7 @@ handleReplicaConnection(remoteObject.name); } } - for (const auto &remoteObject : qAsConst(rxObjects)) { + for (const auto &remoteObject : std::as_const(rxObjects)) { if (replicas.contains(remoteObject.name)) //We have a replica waiting on this remoteObject handleReplicaConnection(remoteObject.name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectreplica.cpp new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectreplica.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectreplica.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectreplica.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -455,7 +455,7 @@ void QConnectedReplicaImplementation::setProperties(QVariantList &&properties) { Q_ASSERT(m_propertyStorage.isEmpty()); - m_propertyStorage.reserve(properties.length()); + m_propertyStorage.reserve(properties.size()); m_propertyStorage = std::move(properties); } @@ -566,7 +566,7 @@ // we are initializing an nth replica of the same type if (!firstReplicaInstance) { const int offset = m_propertyOffset; - const int nParam = int(m_propertyStorage.count()); + const int nParam = int(m_propertyStorage.size()); void *args[] = {nullptr, nullptr}; for (int i = 0; i < nParam; ++i) { const int notifyIndex = m_metaObject->property(i+offset).notifySignalIndex(); @@ -911,7 +911,7 @@ void QStubReplicaImplementation::setProperties(QVariantList &&properties) { Q_ASSERT(m_propertyStorage.isEmpty()); - m_propertyStorage.reserve(properties.length()); + m_propertyStorage.reserve(properties.size()); m_propertyStorage = std::move(properties); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectsource.cpp new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectsource.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectsource.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectsource.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -170,7 +170,7 @@ setConnections(); - const auto nChildren = api->m_models.count() + api->m_subclasses.count(); + const auto nChildren = api->m_models.size() + api->m_subclasses.size(); if (nChildren > 0) { QList<int> roles; const int numProperties = api->propertyCount(); @@ -315,7 +315,7 @@ if (newObject) setConnections(); - const auto nChildren = m_api->m_models.count() + m_api->m_subclasses.count(); + const auto nChildren = m_api->m_models.size() + m_api->m_subclasses.size(); if (nChildren == 0) return; @@ -466,7 +466,7 @@ propertyIndex = internalIndex; } - qCDebug(QT_REMOTEOBJECT) << "# Listeners" << d->m_listeners.length(); + qCDebug(QT_REMOTEOBJECT) << "# Listeners" << d->m_listeners.size(); qCDebug(QT_REMOTEOBJECT) << "Invoke args:" << m_object << (call == 0 ? QLatin1String("InvokeMetaMethod") : QStringLiteral("Non-invoked call: %d").arg(call)) << m_api->signalSignature(index) << *marshalArgs(index, a); @@ -499,7 +499,7 @@ d->codec->serializeRemoveObjectPacket(m_api->name()); d->codec->send(io); } - return int(d->m_listeners.length()); + return int(d->m_listeners.size()); } int QRemoteObjectSourceBase::qt_metacall(QMetaObject::Call call, int methodId, void **a) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectsourceio.cpp new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectsourceio.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/src/remoteobjects/qremoteobjectsourceio.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/remoteobjects/qremoteobjectsourceio.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -124,7 +124,7 @@ qRODebug(this) << "OnServerDisconnect"; - for (QRemoteObjectRootSource *root : qAsConst(m_sourceRoots)) + for (QRemoteObjectRootSource *root : std::as_const(m_sourceRoots)) root->removeListener(connection); const QUrl location = m_registryMapping.value(connection); @@ -277,7 +277,7 @@ QRemoteObjectPackets::ObjectInfoList infos; infos.reserve(m_sourceRoots.size()); - for (auto remoteObject : qAsConst(m_sourceRoots)) { + for (auto remoteObject : std::as_const(m_sourceRoots)) { infos << QRemoteObjectPackets::ObjectInfo{remoteObject->m_api->name(), remoteObject->m_api->typeName(), remoteObject->m_api->objectSignature()}; } m_codec->serializeObjectListPacket(infos); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/repparser/parser.g new/qtremoteobjects-everywhere-src-6.4.2/src/repparser/parser.g --- old/qtremoteobjects-everywhere-src-6.4.1/src/repparser/parser.g 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/repparser/parser.g 2022-12-12 18:12:07.000000000 +0100 @@ -817,13 +817,13 @@ void RepParser::TypeParser::appendParams(ASTFunction &slot) { - for (const ASTDeclaration &arg : qAsConst(arguments)) + for (const ASTDeclaration &arg : std::as_const(arguments)) slot.params << arg; } void RepParser::TypeParser::appendPods(POD &pods) { - for (const ASTDeclaration &arg : qAsConst(arguments)) { + for (const ASTDeclaration &arg : std::as_const(arguments)) { PODAttribute attr; attr.type = arg.type; attr.name = arg.name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/src/repparser/qregexparser.h new/qtremoteobjects-everywhere-src-6.4.2/src/repparser/qregexparser.h --- old/qtremoteobjects-everywhere-src-6.4.1/src/repparser/qregexparser.h 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/src/repparser/qregexparser.h 2022-12-12 18:12:07.000000000 +0100 @@ -186,7 +186,7 @@ QRegularExpressionMatch match = re.match(text, 0, QRegularExpression::NormalMatch, QRegularExpression::DontCheckSubjectStringMatchOption); if (match.hasMatch()) { const QString token = match.captured(1); - const bool multiline = match.captured(2).length() > 0; + const bool multiline = match.captured(2).size() > 0; const QString pattern = match.captured(3); m_tokenNames.append(token); int index = i; @@ -303,7 +303,7 @@ const QStringView tmp = buffer.mid(m_loc,1); int i = 0; regexCandidates[nextChar] = QList<int>(); - for (const QRegularExpression &re : qAsConst(m_regexes)) + for (const QRegularExpression &re : std::as_const(m_regexes)) { QRegularExpressionMatch match = re.match(tmp, 0, QRegularExpression::PartialPreferFirstMatch, QRegularExpression::DontCheckSubjectStringMatchOption); //qDebug() << nextChar << tmp << match.hasMatch() << match.hasPartialMatch() << re.pattern(); @@ -340,7 +340,7 @@ m_captured.insert(iter.value(), bestRegex.captured(iter.key())); if (m_debug) { qDebug() << "Match candidates:"; - for (const MatchCandidate &m : qAsConst(candidates)) { + for (const MatchCandidate &m : std::as_const(candidates)) { QLatin1String result = m.index == best ? QLatin1String(" * ") : QLatin1String(" "); qDebug() << qPrintable(result) << qPrintable(m.name) << qPrintable(escapeString(m.matchText)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/integration/tst_integration.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/integration/tst_integration.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/integration/tst_integration.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/integration/tst_integration.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -328,7 +328,7 @@ QSignalSpy spy(tc_rep.data(), &TestClassReplica::classEnumChanged); QVERIFY(spy.isValid()); tc_rep->pushClassEnum(TestClassReplica::Two); - QVERIFY(spy.count() || spy.wait()); + QVERIFY(spy.size() || spy.wait()); QCOMPARE(qint32(tc.classEnum()), qint32(tc_rep->classEnum())); } @@ -456,7 +456,7 @@ QSignalSpy spy(engine_r.data(), &QRemoteObjectReplica::stateChanged); host->disableRemoting(&e); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); instances = client->instances<EngineReplica>(); QCOMPARE(instances, QStringList({"Engine2"})); @@ -509,8 +509,8 @@ QSignalSpy clientSpy(client->registry(), &QRemoteObjectRegistry::remoteObjectAdded); host->enableRemoting(&e1, engine1); - QTRY_COMPARE(hostSpy.count(), 1); - QTRY_COMPARE(clientSpy.count(), 1); + QTRY_COMPARE(hostSpy.size(), 1); + QTRY_COMPARE(clientSpy.size(), 1); QCOMPARE(hostObserver.value(), host->registry()->sourceLocations()); QCOMPARE(clientObserver.value(), client->registry()->sourceLocations()); QCOMPARE(hostObserver.value(), clientObserver.value()); @@ -520,8 +520,8 @@ expectedSourceLocations[engine2] = { QStringLiteral("Engine"), hostUrl }; host->enableRemoting(&e2, engine2); - QTRY_COMPARE(hostSpy.count(), 2); - QTRY_COMPARE(clientSpy.count(), 2); + QTRY_COMPARE(hostSpy.size(), 2); + QTRY_COMPARE(clientSpy.size(), 2); QCOMPARE(hostObserver.value(), host->registry()->sourceLocations()); QCOMPARE(clientObserver.value(), client->registry()->sourceLocations()); QCOMPARE(hostObserver.value(), clientObserver.value()); @@ -536,8 +536,8 @@ QSignalSpy srcRemovedClientSpy(client->registry(), &QRemoteObjectRegistry::remoteObjectRemoved); - QTRY_COMPARE(srcRemovedHostSpy.count(), 1); - QTRY_COMPARE(srcRemovedClientSpy.count(), 1); + QTRY_COMPARE(srcRemovedHostSpy.size(), 1); + QTRY_COMPARE(srcRemovedClientSpy.size(), 1); QCOMPARE(hostObserver.value(), host->registry()->sourceLocations()); QCOMPARE(clientObserver.value(), client->registry()->sourceLocations()); QCOMPARE(hostObserver.value(), clientObserver.value()); @@ -728,7 +728,7 @@ QSignalSpy addedSpy(host->registry(), &QRemoteObjectRegistry::remoteObjectAdded); setupRegistry(); bool added = addedSpy.wait(); - QVERIFY(spy.count() > 0); + QVERIFY(spy.size() > 0); QCOMPARE(added, true); QCOMPARE(host->registry()->sourceLocations().keys().isEmpty(), false); QCOMPARE(host->registry()->sourceLocations().keys().at(0), QStringLiteral("Engine")); @@ -769,7 +769,7 @@ e.setRpm(2345); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); const QVariantList &arguments = spy.first(); bool ok; int res = arguments.at(0).toInt(&ok); @@ -798,7 +798,7 @@ }); e.setRpm(3456); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); const QVariantList &arguments = spy.first(); bool ok; int res = arguments.at(0).toInt(&ok); @@ -856,7 +856,7 @@ QRemoteObjectPendingCallWatcher watcher(reply); QSignalSpy spy(&watcher, &QRemoteObjectPendingCallWatcher::finished); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QVERIFY(reply.isFinished()); QCOMPARE(reply.returnValue(), true); @@ -1011,7 +1011,7 @@ QSignalSpy spy(engine_r.data(), &EngineReplica::rpmChanged); engine_r->setRpm(42); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(engine_r->rpm(), 42); } @@ -1029,7 +1029,7 @@ QSignalSpy spy(engine_r.data(), &EngineReplica::startedChanged); engine_r->pushStarted(true); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(engine_r->started(), true); } @@ -1052,7 +1052,7 @@ QSignalSpy spy(engine_dr.data(), QByteArray(QByteArrayLiteral("2")+mp.notifySignal().methodSignature().constData())); mp.write(engine_dr.data(), 44); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(mp.read(engine_dr.data()).toInt(), 44); } @@ -1072,7 +1072,7 @@ QSignalSpy spy(engine_r.data(), &EngineReplica::rpmChanged); engine_r->increaseRpm(1000); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(engine_r->rpm(), 1000); } @@ -1145,7 +1145,7 @@ QSignalSpy spy_r1(engine_r1.data(), &EngineReplica::rpmChanged); engine_r1->waitForSource(); QCOMPARE(engine_r1->rpm(), e.rpm()); - QCOMPARE(spy_r1.count(), 1); + QCOMPARE(spy_r1.size(), 1); // NOTE: A second replica will have initialized and notify signals emitted as part of acquire, // which leads to different semantics for first and second replicas. Specifically, there is no @@ -1200,7 +1200,7 @@ // replica gets source change source.setValue(1); - QTRY_COMPARE(spy.count(), 1); + QTRY_COMPARE(spy.size(), 1); QCOMPARE(replica->property("value"), QVariant(1)); // source gets replica change @@ -1216,7 +1216,7 @@ // replica gets source change source.setOtherValue(1); - QTRY_COMPARE(otherSpy.count(), 1); + QTRY_COMPARE(otherSpy.size(), 1); QCOMPARE(replica->property("otherValue"), QVariant(1)); // source gets replica change @@ -1314,7 +1314,7 @@ Q_SET_OBJECT_NAME(_client); QSignalSpy errorSpy(&_client, &QRemoteObjectNode::error); QVERIFY(!_client.connectToNode(QUrl(QLatin1String("invalid:invalid")))); - QCOMPARE(errorSpy.count(), 1); + QCOMPARE(errorSpy.size(), 1); auto emittedErrorCode = errorSpy.first().at(0).value<QRemoteObjectNode::ErrorCode>(); QCOMPARE(emittedErrorCode, QRemoteObjectNode::RegistryNotAcquired); QCOMPARE(_client.lastError(), QRemoteObjectNode::RegistryNotAcquired); @@ -1331,7 +1331,7 @@ e.setRpm(50); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(engine_d->rpm(), e.rpm()); } @@ -1354,7 +1354,7 @@ const QByteArray data(16384,'y'); emit t.send(data); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); const QVariantList &arguments = spy.first(); QVERIFY(arguments.at(0).toByteArray() == data); QVERIFY(host->disableRemoting(&t)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/integration_external/client/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/integration_external/client/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/integration_external/client/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/integration_external/client/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -49,7 +49,7 @@ QSignalSpy spy(m_rep.data(), &MyInterfaceReplica::enum1Changed); QVERIFY(advanceSpy.wait()); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); // END: Testing reply = m_rep->stop(); @@ -152,10 +152,10 @@ QSignalSpy stateSpy(m_rep.data(), &MyInterfaceReplica::stateChanged); QVERIFY(reply.waitForFinished()); - QTRY_COMPARE(stateSpy.count(), 1); + QTRY_COMPARE(stateSpy.size(), 1); QCOMPARE(m_rep->state(), QRemoteObjectReplica::Suspect); - QTRY_COMPARE(stateSpy.count(), 2); + QTRY_COMPARE(stateSpy.size(), 2); QCOMPARE(m_rep->state(), QRemoteObjectReplica::Valid); // Make sure we updated to the correct enum1 value QCOMPARE(m_rep->enum1(), MyInterfaceReplica::First); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/integration_multiprocess/client/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/integration_multiprocess/client/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/integration_multiprocess/client/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/integration_multiprocess/client/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -38,7 +38,7 @@ QSignalSpy spy(m_rep.data(), &MyInterfaceReplica::enum1Changed); QVERIFY(advanceSpy.wait()); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); // END: Testing reply = m_rep->stop(); @@ -147,7 +147,7 @@ QSignalSpy spy(rep.data(), &MyInterfaceReplica::testExtPODListSignal); connect(rep.data(), &MyInterfaceReplica::testExtPODListSignal, [list](const QList<ExtPOD> &l) { QCOMPARE(l, list); }); - QTRY_COMPARE(spy.count(), 1); + QTRY_COMPARE(spy.size(), 1); } void testPod() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/modelreplica/tst_modelreplicatest.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/modelreplica/tst_modelreplicatest.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/modelreplica/tst_modelreplicatest.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/modelreplica/tst_modelreplicatest.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -77,7 +77,7 @@ QSignalSpy otherTracksSpy(otherReplica->tracks(), &QAbstractItemModelReplica::initialized); QVERIFY(otherReplica->waitForSource(300)); QVERIFY(otherTracksSpy.wait()); - QCOMPARE(otherReplica->tracks()->availableRoles().count(), 2); + QCOMPARE(otherReplica->tracks()->availableRoles().size(), 2); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/modelview/tst_modelview.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/modelview/tst_modelview.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/modelview/tst_modelview.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/modelview/tst_modelview.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -231,7 +231,7 @@ { public: explicit RolenamesListModel(QObject *parent = nullptr) : QAbstractListModel(parent) { } - int rowCount(const QModelIndex &) const override { return int(m_list.length()); } + int rowCount(const QModelIndex &) const override { return int(m_list.size()); } QVariant data(const QModelIndex &index, int role) const override { if (role == Qt::UserRole) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/proxy/tst_proxy.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/proxy/tst_proxy.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/proxy/tst_proxy.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/proxy/tst_proxy.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -123,12 +123,12 @@ QSignalSpy replicaSpy(rep, &EngineReplica::rpmChanged); rep->pushRpm(42); sourceSpy.wait(); - QCOMPARE(sourceSpy.count(), 1); + QCOMPARE(sourceSpy.size(), 1); QCOMPARE(engine.rpm(), 42); // ... and the change makes it back to the replica replicaSpy.wait(); - QCOMPARE(replicaSpy.count(), 1); + QCOMPARE(replicaSpy.size(), 1); QCOMPARE(rep->rpm(), 42); } else { replica.reset(client.acquireDynamic(QStringLiteral("Engine"))); @@ -156,12 +156,12 @@ QVERIFY(pushMethod.invoke(replica.data(), Q_ARG(int, 42))); sourceSpy.wait(); - QCOMPARE(sourceSpy.count(), 1); + QCOMPARE(sourceSpy.size(), 1); QCOMPARE(engine.rpm(), 42); // ... and the change makes it back to the replica replicaSpy.wait(); - QCOMPARE(replicaSpy.count(), 1); + QCOMPARE(replicaSpy.size(), 1); QCOMPARE(rpmMeta.read(replica.data()).value<int>(), engine.rpm()); } @@ -170,7 +170,7 @@ Q_ASSERT(res); QSignalSpy stateSpy(replica.data(), &QRemoteObjectReplica::stateChanged); stateSpy.wait(); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(replica->state(), QRemoteObjectReplica::Suspect); // Now test subclass Source @@ -198,7 +198,7 @@ QVERIFY(rep->subClass() != nullptr); QCOMPARE(rep->subClass()->myPOD(), parent.subClass()->myPOD()); QVERIFY(rep->tracks() != nullptr); - QVERIFY(tracksSpy.count() || tracksSpy.wait()); + QVERIFY(tracksSpy.size() || tracksSpy.wait()); // Rep file only uses display role, but proxy doesn't forward that yet if (!useProxy) QCOMPARE(rep->tracks()->availableRoles(), QList<int> { Qt::DisplayRole }); @@ -240,7 +240,7 @@ QSignalSpy replicaSpy(rep, &ParentClassReplica::subClassChanged); parent.setSubClass(&updatedSubclass); replicaSpy.wait(); - QCOMPARE(replicaSpy.count(), 1); + QCOMPARE(replicaSpy.size(), 1); QCOMPARE(rep->subClass()->myPOD(), parent.subClass()->myPOD()); QCOMPARE(rep->subClass()->myPOD(), updatedValue); } else { @@ -316,7 +316,7 @@ QSignalSpy replicaSpy(replica.data(), QByteArray(QByteArrayLiteral("2")+subclassMeta.notifySignal().methodSignature().constData())); parent.setSubClass(&updatedSubclass); replicaSpy.wait(); - QCOMPARE(replicaSpy.count(), 1); + QCOMPARE(replicaSpy.size(), 1); subclassQObjectPtr = subclassMeta.read(replica.data()).value<QObject *>(); QVERIFY(subclassQObjectPtr != nullptr); subclassReplica = qobject_cast<QRemoteObjectDynamicReplica *>(subclassQObjectPtr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/proxy_multiprocess/client/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/proxy_multiprocess/client/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/proxy_multiprocess/client/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/proxy_multiprocess/client/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -44,7 +44,7 @@ QCOMPARE(m_rep->subClass()->myPOD(), initialValue); QCOMPARE(m_rep->subClass()->i(), initialI); QVERIFY(m_rep->tracks() != nullptr); - QVERIFY(tracksSpy.count() || tracksSpy.wait()); + QVERIFY(tracksSpy.size() || tracksSpy.wait()); QCOMPARE(m_rep->myEnum(), ParentClassReplica::bar); QCOMPARE(m_rep->date(), Qt::RFC2822Date); QCOMPARE(m_rep->nsEnum(), NS::Bravo); @@ -79,12 +79,12 @@ QVERIFY(reply.error() == QRemoteObjectPendingCall::NoError); QCOMPARE(reply.returnValue(), QVariant::fromValue(true)); QVERIFY(enumSpy.wait()); - QCOMPARE(enumSpy.count(), 1); + QCOMPARE(enumSpy.size(), 1); const auto arguments = enumSpy.takeFirst(); QCOMPARE(arguments.at(0), QVariant::fromValue(ParentClassReplica::foo)); QCOMPARE(arguments.at(1), QVariant::fromValue(ParentClassReplica::bar)); - QVERIFY(advanceSpy.count() || advanceSpy.wait()); + QVERIFY(advanceSpy.size() || advanceSpy.wait()); QVERIFY(m_rep->subClass() != nullptr); QCOMPARE(m_rep->subClass()->myPOD(), updatedValue); QCOMPARE(m_rep->subClass()->i(), updatedI); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/qml/usertypes/tst_usertypes.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/qml/usertypes/tst_usertypes.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/qml/usertypes/tst_usertypes.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/qml/usertypes/tst_usertypes.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -252,7 +252,7 @@ QSignalSpy spy(replica, &SimpleClockReplica::timeUpdated); spy.wait(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_usertypes::twoReplicas() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/repc/signature/matchAndQuit/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/repc/signature/matchAndQuit/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/repc/signature/matchAndQuit/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/repc/signature/matchAndQuit/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -24,17 +24,17 @@ QVERIFY(rep->quit().waitForFinished()); QTRY_COMPARE(rep->state(), QRemoteObjectReplica::Suspect); - QCOMPARE(stateChangedSpy.count(), 2); + QCOMPARE(stateChangedSpy.size(), 2); // Test Default to Valid transition auto args = stateChangedSpy.takeFirst(); - QCOMPARE(args.count(), 2); + QCOMPARE(args.size(), 2); QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::Valid)); QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Default)); // Test Valid to Suspect transition args = stateChangedSpy.takeFirst(); - QCOMPARE(args.count(), 2); + QCOMPARE(args.size(), 2); QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::Suspect)); QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Valid)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/repc/signature/state/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/repc/signature/state/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/repc/signature/state/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/repc/signature/state/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -19,9 +19,9 @@ QSharedPointer<TestClassReplica> rep{repNode.acquire<TestClassReplica>()}; QSignalSpy stateChangedSpy(rep.data(), &QRemoteObjectReplica::stateChanged); QTRY_COMPARE(rep->state(), QRemoteObjectReplica::SignatureMismatch); - QCOMPARE(stateChangedSpy.count(), 1); + QCOMPARE(stateChangedSpy.size(), 1); auto args = stateChangedSpy.takeFirst(); - QCOMPARE(args.count(), 2); + QCOMPARE(args.size(), 2); QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::SignatureMismatch)); QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Default)); } @@ -33,9 +33,9 @@ QSharedPointer<QRemoteObjectDynamicReplica> rep{repNode.acquireDynamic("TestClass")}; QSignalSpy stateChangedSpy(rep.data(), &QRemoteObjectReplica::stateChanged); QTRY_COMPARE(rep->state(), QRemoteObjectReplica::Valid); - QCOMPARE(stateChangedSpy.count(), 1); + QCOMPARE(stateChangedSpy.size(), 1); auto args = stateChangedSpy.takeFirst(); - QCOMPARE(args.count(), 2); + QCOMPARE(args.size(), 2); QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::Valid)); QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Uninitialized)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/repparser/tst_parser.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/repparser/tst_parser.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/repparser/tst_parser.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/repparser/tst_parser.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -142,11 +142,11 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); const ASTClass astClass = ast.classes.first(); const QList<ASTProperty> properties = astClass.properties; - QCOMPARE(properties.count(), 1); + QCOMPARE(properties.size(), 1); const ASTProperty property = properties.first(); QCOMPARE(property.type, expectedType); @@ -197,11 +197,11 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); const ASTClass astClass = ast.classes.first(); const QList<ASTFunction> slotsList = astClass.slotsList; - QCOMPARE(slotsList.count(), 1); + QCOMPARE(slotsList.size(), 1); ASTFunction slot = slotsList.first(); QCOMPARE(QString("%1 %2(%3)").arg(slot.returnType).arg(slot.name).arg(slot.paramsAsString()), expectedSlot); } @@ -237,7 +237,7 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); const ASTClass astClass = ast.classes.first(); const QList<ASTFunction> signalsList = astClass.signalsList; @@ -283,16 +283,16 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); - QCOMPARE(ast.pods.count(), 1); + QCOMPARE(ast.pods.size(), 1); const POD pods = ast.pods.first(); const QList<PODAttribute> podsList = pods.attributes; const QStringList typeList = expectedtypes.split(QLatin1Char(';')); const QStringList variableList = expectedvariables.split(QLatin1Char(';')); - QVERIFY(typeList.count() == variableList.count()); - QVERIFY(podsList.count() == variableList.count()); - for (int i=0; i < podsList.count(); ++i) { + QVERIFY(typeList.size() == variableList.size()); + QVERIFY(podsList.size() == variableList.size()); + for (int i=0; i < podsList.size(); ++i) { QCOMPARE(podsList.at(i).name, variableList.at(i)); QCOMPARE(podsList.at(i).type, typeList.at(i)); } @@ -338,16 +338,16 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); - QCOMPARE(ast.pods.count(), 1); + QCOMPARE(ast.pods.size(), 1); const POD pods = ast.pods.first(); const QVector<PODAttribute> podsList = pods.attributes; const QStringList typeList = expectedtypes.split(QLatin1Char(';')); const QStringList variableList = expectedvariables.split(QLatin1Char(';')); - QVERIFY(typeList.count() == variableList.count()); - QVERIFY(podsList.count() == variableList.count()); - for (int i=0; i < podsList.count(); ++i) { + QVERIFY(typeList.size() == variableList.size()); + QVERIFY(podsList.size() == variableList.size()); + for (int i=0; i < podsList.size(); ++i) { QCOMPARE(podsList.at(i).name, variableList.at(i)); QCOMPARE(podsList.at(i).type, typeList.at(i)); } @@ -404,23 +404,23 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); ASTEnum enums; if (inclass) { const ASTClass astClass = ast.classes.first(); - QCOMPARE(astClass.enums.count(), 1); + QCOMPARE(astClass.enums.size(), 1); enums = astClass.enums.first(); } else { - QCOMPARE(ast.enums.count(), 1); + QCOMPARE(ast.enums.size(), 1); enums = ast.enums.first(); } QVERIFY(enums.isScoped == false); QVERIFY(enums.type.isEmpty()); const QList<ASTEnumParam> paramList = enums.params; const QStringList nameList = expectednames.split(QLatin1Char(';')); - QVERIFY(nameList.count() == expectedvalues.count()); - QVERIFY(paramList.count() == expectedvalues.count()); - for (int i=0; i < paramList.count(); ++i) { + QVERIFY(nameList.size() == expectedvalues.size()); + QVERIFY(paramList.size() == expectedvalues.size()); + for (int i=0; i < paramList.size(); ++i) { QCOMPARE(paramList.at(i).name, nameList.at(i)); QCOMPARE(paramList.at(i).value, expectedvalues.at(i)); } @@ -480,17 +480,17 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); ASTEnum enums; ASTFlag flags; if (inclass) { const ASTClass astClass = ast.classes.first(); - QCOMPARE(astClass.enums.count(), 1); + QCOMPARE(astClass.enums.size(), 1); enums = astClass.enums.first(); if (isflag) flags = astClass.flags.first(); } else { - QCOMPARE(ast.enums.count(), 1); + QCOMPARE(ast.enums.size(), 1); enums = ast.enums.first(); if (isflag) flags = ast.flags.first(); @@ -501,8 +501,8 @@ QVERIFY(flags._enum == (isflag ? "preset" : QString{})); QCOMPARE(enums.type, expectedtype); const QList<ASTEnumParam> paramList = enums.params; - QVERIFY(paramList.count() == 1); - for (int i=0; i < paramList.count(); ++i) { + QVERIFY(paramList.size() == 1); + for (int i=0; i < paramList.size(); ++i) { QCOMPARE(paramList.at(i).name, "presetNumber"); QCOMPARE(paramList.at(i).value, 0); } @@ -538,7 +538,7 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 1); + QCOMPARE(ast.classes.size(), 1); const ASTClass astClass = ast.classes.first(); ASTModel model = astClass.modelMetadata.first(); @@ -582,7 +582,7 @@ QVERIFY(parser.parse()); const AST ast = parser.ast(); - QCOMPARE(ast.classes.count(), 2); + QCOMPARE(ast.classes.size(), 2); const ASTClass astSub = ast.classes.value(0); const ASTClass astObj = ast.classes.value(1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/restart/client/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/restart/client/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tests/auto/restart/client/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tests/auto/restart/client/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -44,7 +44,7 @@ QVERIFY(m_rep->subClass() != nullptr); QCOMPARE(m_rep->subClass()->myPOD(), initialValue); QVERIFY(m_rep->tracks() != nullptr); - QVERIFY(tracksSpy.count() || tracksSpy.wait()); + QVERIFY(tracksSpy.size() || tracksSpy.wait()); } else { QVERIFY(m_rep->subClass() == nullptr); QVERIFY(m_rep->tracks() == nullptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tools/repc/main.cpp new/qtremoteobjects-everywhere-src-6.4.2/tools/repc/main.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tools/repc/main.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tools/repc/main.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -88,7 +88,7 @@ const QStringList files = parser.positionalArguments(); - if (files.count() > 2) { + if (files.size() > 2) { fprintf(stderr, "%s", qPrintable(QLatin1String(PROGRAM_NAME ": Too many input, output files specified: '") + files.join(QStringLiteral("' '")) + QStringLiteral("\'.\n"))); parser.showHelp(1); } @@ -121,7 +121,7 @@ } } - switch (files.count()) { + switch (files.size()) { case 2: outputFile = files.last(); if (!(mode & (OutRep | OutSource | OutReplica))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.4.1/tools/repc/repcodegenerator.cpp new/qtremoteobjects-everywhere-src-6.4.2/tools/repc/repcodegenerator.cpp --- old/qtremoteobjects-everywhere-src-6.4.1/tools/repc/repcodegenerator.cpp 2022-11-08 13:25:47.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.4.2/tools/repc/repcodegenerator.cpp 2022-12-12 18:12:07.000000000 +0100 @@ -79,7 +79,7 @@ for (const QRegularExpressionMatch &match : re.globalMatch(typeName)) { if (isClassEnum(classContext, match.captured(1))) { copy.insert(match.capturedStart(1) + offset, className + QStringLiteral("::")); - offset += className.length() + 2; + offset += className.size() + 2; } } return copy; @@ -241,7 +241,7 @@ bool hasModel = false; for (auto c : m_ast.classes) { - if (c.modelMetadata.count() > 0) + if (c.modelMetadata.size() > 0) { hasModel = true; break; @@ -583,7 +583,7 @@ << "\")" << Qt::endl; m_stream << " Q_CLASSINFO(QCLASSINFO_REMOTEOBJECT_SIGNATURE, \"" << QLatin1String(classSignature(astClass)) << "\")" << Qt::endl; - for (int i = 0; i < astClass.modelMetadata.count(); i++) { + for (int i = 0; i < astClass.modelMetadata.size(); i++) { const auto model = astClass.modelMetadata.at(i); const auto modelName = astClass.properties.at(model.propertyIndex).name; if (!model.roles.isEmpty()) { @@ -656,7 +656,7 @@ m_stream << " void setNode(QRemoteObjectNode *node) override" << Qt::endl; m_stream << " {" << Qt::endl; m_stream << " QRemoteObjectReplica::setNode(node);" << Qt::endl; - for (int index = 0; index < astClass.properties.count(); ++index) { + for (int index = 0; index < astClass.properties.size(); ++index) { const ASTProperty &property = astClass.properties.at(index); if (!property.isPointer) continue; @@ -685,7 +685,7 @@ m_stream << " : QRemoteObjectReplica(ConstructWithNode)" << Qt::endl; m_stream << " {" << Qt::endl; m_stream << " initializeNode(node, name);" << Qt::endl; - for (int index = 0; index < astClass.properties.count(); ++index) { + for (int index = 0; index < astClass.properties.size(); ++index) { const ASTProperty &property = astClass.properties.at(index); if (!property.isPointer) continue; @@ -747,7 +747,7 @@ m_stream << " }" << Qt::endl; } else { QList<int> constIndices; - for (int index = 0; index < astClass.properties.count(); ++index) { + for (int index = 0; index < astClass.properties.size(); ++index) { const ASTProperty &property = astClass.properties.at(index); if (property.modifier == ASTProperty::Constant) constIndices.append(index); @@ -1030,8 +1030,8 @@ if (!astClass.hasPointerObjects()) m_stream << QStringLiteral(" Q_UNUSED(object)") << Qt::endl; - const auto enumCount = astClass.enums.count(); - const auto totalCount = enumCount + astClass.flags.count(); + const auto enumCount = astClass.enums.size(); + const auto totalCount = enumCount + astClass.flags.size(); for (int i : astClass.subClassPropertyIndices) { const ASTProperty &child = astClass.properties.at(i); m_stream << QString::fromLatin1(" using %1_type_t = typename std::remove_pointer<" @@ -1051,7 +1051,7 @@ "indexOfEnumerator(\"%2\");") .arg(i+1).arg(flag.name) << Qt::endl; } - const auto propCount = astClass.properties.count(); + const auto propCount = astClass.properties.size(); m_stream << QString::fromLatin1(" m_properties[0] = %1;").arg(propCount) << Qt::endl; QList<ASTProperty> onChangeProperties; QList<qsizetype> propertyChangeIndex; @@ -1080,7 +1080,7 @@ propertyChangeIndex << i + 1; //m_properties[0] is the count, so index is one higher } } - const auto signalCount = astClass.signalsList.count(); + const auto signalCount = astClass.signalsList.size(); const auto changedCount = onChangeProperties.size(); m_stream << QString::fromLatin1(" m_signals[0] = %1;") .arg(signalCount+onChangeProperties.size()) << Qt::endl; @@ -1111,13 +1111,13 @@ QString::number(changedCount+i)) << Qt::endl; } - const auto slotCount = astClass.slotsList.count(); + const auto slotCount = astClass.slotsList.size(); QList<ASTProperty> pushProps; for (const ASTProperty &property : astClass.properties) { if (property.modifier == ASTProperty::ReadPush) pushProps << property; } - const auto pushCount = pushProps.count(); + const auto pushCount = pushProps.size(); const auto methodCount = slotCount + pushCount; m_stream << QString::fromLatin1(" m_methods[0] = %1;").arg(methodCount) << Qt::endl; const QString objType = QStringLiteral("typename ObjectType::"); @@ -1337,7 +1337,7 @@ const auto paramsAsList = paramsAsString.split(QLatin1String(",")); int enumCount = 0; QString enumString; - for (int j = 0; j < paramsAsList.count(); j++) { + for (int j = 0; j < paramsAsList.size(); j++) { auto const p = paramsAsList.at(j); if (isClassEnum(astClass, p)) { paramsAsString.replace(paramsAsString.indexOf(p), p.size(), @@ -1402,7 +1402,7 @@ const auto paramsAsList = paramsAsString.split(QLatin1String(",")); int enumCount = 0; QString enumString; - for (int j = 0; j < paramsAsList.count(); j++) { + for (int j = 0; j < paramsAsList.size(); j++) { auto const p = paramsAsList.at(j); if (isClassEnum(astClass, p)) { paramsAsString.replace(paramsAsString.indexOf(p), p.size(),
