Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-svg for openSUSE:Factory checked in at 2023-01-11 14:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-svg (Old) and /work/SRC/openSUSE:Factory/.qt6-svg.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-svg" Wed Jan 11 14:34:13 2023 rev:19 rq:1057281 version:6.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-svg/qt6-svg.changes 2022-11-21 15:29:30.972624117 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-svg.new.32243/qt6-svg.changes 2023-01-11 14:35:17.665312294 +0100 @@ -1,0 +2,6 @@ +Fri Jan 6 16:46:52 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.4.2: + * https://www.qt.io/blog/qt-6.4.2-released + +------------------------------------------------------------------- Old: ---- qtsvg-everywhere-src-6.4.1.tar.xz New: ---- qtsvg-everywhere-src-6.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-svg.spec ++++++ --- /var/tmp/diff_new_pack.2Yqx4g/_old 2023-01-11 14:35:18.125314895 +0100 +++ /var/tmp/diff_new_pack.2Yqx4g/_new 2023-01-11 14:35:18.129314918 +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 qtsvg-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-svg%{?pkg_suffix} -Version: 6.4.1 +Version: 6.4.2 Release: 0 Summary: Classes for rendering and displaying SVG drawings License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtsvg-everywhere-src-6.4.1.tar.xz -> qtsvg-everywhere-src-6.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/.cmake.conf new/qtsvg-everywhere-src-6.4.2/.cmake.conf --- old/qtsvg-everywhere-src-6.4.1/.cmake.conf 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/.cmake.conf 2022-12-12 15:01:56.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/qtsvg-everywhere-src-6.4.1/.tag new/qtsvg-everywhere-src-6.4.2/.tag --- old/qtsvg-everywhere-src-6.4.1/.tag 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/.tag 2022-12-12 15:01:56.000000000 +0100 @@ -1 +1 @@ -89400d4429b7955f4e344bdb488d0efb84b7bdef +54066fe644f2c9f7789c61b4fcb4d513eb3f775c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/dependencies.yaml new/qtsvg-everywhere-src-6.4.2/dependencies.yaml --- old/qtsvg-everywhere-src-6.4.1/dependencies.yaml 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 15:01:56.000000000 +0100 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 905755304a474c942346774d930b92e3665c1bab + ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgfont_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvggraphics_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvghandler_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgnode_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgstructure_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgstyle_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qsvgtinydocument_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.1/QtSvg/private/qtsvgglobal_p.h 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.1/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgfont_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgfont_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgfont_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvggraphics_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvggraphics_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvghandler_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvghandler_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvghandler_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgnode_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgnode_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgnode_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgstructure_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgstructure_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgstyle_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgstyle_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qsvgtinydocument_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qtsvgglobal_p.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qtsvgglobal_p.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/6.4.2/QtSvg/private/qtsvgglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/6.4.2/QtSvg/private/qtsvgglobal_p.h 2022-12-12 15:01:56.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qtsvgglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvg/qtsvgversion.h new/qtsvg-everywhere-src-6.4.2/include/QtSvg/qtsvgversion.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvg/qtsvgversion.h 2022-11-10 12:06:03.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvg/qtsvgversion.h 2022-12-13 08:05:05.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "6.4.1" +#define QTSVG_VERSION_STR "6.4.2" -#define QTSVG_VERSION 0x060401 +#define QTSVG_VERSION 0x060402 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/include/QtSvgWidgets/qtsvgwidgetsversion.h new/qtsvg-everywhere-src-6.4.2/include/QtSvgWidgets/qtsvgwidgetsversion.h --- old/qtsvg-everywhere-src-6.4.1/include/QtSvgWidgets/qtsvgwidgetsversion.h 2022-11-10 12:06:03.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/include/QtSvgWidgets/qtsvgwidgetsversion.h 2022-12-13 08:05:05.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSVGWIDGETS_VERSION_H #define QT_QTSVGWIDGETS_VERSION_H -#define QTSVGWIDGETS_VERSION_STR "6.4.1" +#define QTSVGWIDGETS_VERSION_STR "6.4.2" -#define QTSVGWIDGETS_VERSION 0x060401 +#define QTSVGWIDGETS_VERSION 0x060402 #endif // QT_QTSVGWIDGETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/src/svg/qsvggenerator.cpp new/qtsvg-everywhere-src-6.4.2/src/svg/qsvggenerator.cpp --- old/qtsvg-everywhere-src-6.4.1/src/svg/qsvggenerator.cpp 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/src/svg/qsvggenerator.cpp 2022-12-12 15:01:56.000000000 +0100 @@ -287,7 +287,7 @@ } } - for (const QGradientStop &stop : qAsConst(stops)) { + for (const QGradientStop &stop : std::as_const(stops)) { const QString color = stop.second.name(QColor::HexRgb); str << QLatin1String(" <stop offset=\"")<< stop.first << QLatin1String("\" ") << QLatin1String("stop-color=\"") << color << QLatin1String("\" ") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/src/svg/qsvggraphics.cpp new/qtsvg-everywhere-src-6.4.2/src/svg/qsvggraphics.cpp --- old/qtsvg-everywhere-src-6.4.1/src/svg/qsvggraphics.cpp 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/src/svg/qsvggraphics.cpp 2022-12-12 15:01:56.000000000 +0100 @@ -341,8 +341,8 @@ } QTextLayout::FormatRange range; - range.start = paragraphs.back().length(); - range.length = newText.length(); + range.start = paragraphs.back().size(); + range.length = newText.size(); range.format.setFont(font); range.format.setTextOutline(p->pen()); range.format.setForeground(p->brush()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/src/svg/qsvghandler.cpp new/qtsvg-everywhere-src-6.4.2/src/svg/qsvghandler.cpp --- old/qtsvg-everywhere-src-6.4.1/src/svg/qsvghandler.cpp 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/src/svg/qsvghandler.cpp 2022-12-12 15:01:56.000000000 +0100 @@ -195,7 +195,7 @@ QSvgAttributes::QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHandler *handler) { - for (int i = 0; i < xmlAttributes.count(); ++i) { + for (int i = 0; i < xmlAttributes.size(); ++i) { const QXmlStreamAttribute &attribute = xmlAttributes.at(i); QStringView name = attribute.qualifiedName(); if (name.isEmpty()) @@ -252,8 +252,8 @@ break; case 's': - if (name.length() > 5 && name.mid(1, 5) == QLatin1String("troke")) { - QStringView strokeRef = name.mid(6, name.length() - 6); + if (name.size() > 5 && name.mid(1, 5) == QLatin1String("troke")) { + QStringView strokeRef = name.mid(6, name.size() - 6); if (strokeRef.isEmpty()) stroke = value; else if (strokeRef == QLatin1String("-dasharray")) @@ -306,7 +306,7 @@ QStringView style = xmlAttributes.value(QLatin1String("style")); if (!style.isEmpty()) { handler->parseCSStoXMLAttrs(style.toString(), &m_cssAttributes); - for (int j = 0; j < m_cssAttributes.count(); ++j) { + for (int j = 0; j < m_cssAttributes.size(); ++j) { const QSvgCssAttribute &attribute = m_cssAttributes.at(j); QStringView name = attribute.name; QStringView value = attribute.value; @@ -360,8 +360,8 @@ break; case 's': - if (name.length() > 5 && name.mid(1, 5) == QLatin1String("troke")) { - QStringView strokeRef = name.mid(6, name.length() - 6); + if (name.size() > 5 && name.mid(1, 5) == QLatin1String("troke")) { + QStringView strokeRef = name.mid(6, name.size() - 6); if (strokeRef.isEmpty()) stroke = value; else if (strokeRef == QLatin1String("-dasharray")) @@ -657,7 +657,7 @@ const QChar *c = str.constData(); qreal res = (c == nullptr ? qreal{} : toDouble(c)); if (ok) - *ok = (c == (str.constData() + str.length())); + *ok = (c == (str.constData() + str.size())); return res; } @@ -798,7 +798,7 @@ // #rrggbb is very very common, so let's tackle it here // rather than falling back to QColor QRgb rgb; - bool ok = qsvg_get_hex_rgb(colorStrTr.constData(), colorStrTr.length(), &rgb); + bool ok = qsvg_get_hex_rgb(colorStrTr.constData(), colorStrTr.size(), &rgb); if (ok) color.setRgb(rgb); return ok; @@ -808,7 +808,7 @@ case 'r': { // starts with "rgb(", ends with ")" and consists of at least 7 characters "rgb(,,)" - if (colorStrTr.length() >= 7 && colorStrTr.at(colorStrTr.length() - 1) == QLatin1Char(')') + if (colorStrTr.size() >= 7 && colorStrTr.at(colorStrTr.size() - 1) == QLatin1Char(')') && colorStrTr.mid(0, 4) == QLatin1String("rgb(")) { const QChar *s = colorStrTr.constData() + 4; QList<qreal> compo = parseNumbersList(s); @@ -997,8 +997,8 @@ //fill attribute handling if ((!attributes.fill.isEmpty()) && (attributes.fill != QT_INHERIT) ) { - if (attributes.fill.length() > 3 && attributes.fill.mid(0, 3) == QLatin1String("url")) { - QString value = attributes.fill.mid(3, attributes.fill.length() - 3).toString(); + if (attributes.fill.size() > 3 && attributes.fill.mid(0, 3) == QLatin1String("url")) { + QString value = attributes.fill.mid(3, attributes.fill.size() - 3).toString(); QSvgStyleProperty *style = styleFromUrl(node, value); if (style) { if (style->type() == QSvgStyleProperty::SOLID_COLOR || style->type() == QSvgStyleProperty::GRADIENT) @@ -1029,7 +1029,7 @@ QTransform matrix; const QChar *str = value.constData(); - const QChar *end = str + value.length(); + const QChar *end = str + value.size(); while (str < end) { if (str->isSpace() || *str == QLatin1Char(',')) { @@ -1108,22 +1108,22 @@ ++str; if(state == Matrix) { - if(points.count() != 6) + if(points.size() != 6) goto error; matrix = QTransform(points[0], points[1], points[2], points[3], points[4], points[5]) * matrix; } else if (state == Translate) { - if (points.count() == 1) + if (points.size() == 1) matrix.translate(points[0], 0); - else if (points.count() == 2) + else if (points.size() == 2) matrix.translate(points[0], points[1]); else goto error; } else if (state == Rotate) { - if(points.count() == 1) { + if(points.size() == 1) { matrix.rotate(points[0]); - } else if (points.count() == 3) { + } else if (points.size() == 3) { matrix.translate(points[1], points[2]); matrix.rotate(points[0]); matrix.translate(-points[1], -points[2]); @@ -1131,19 +1131,19 @@ goto error; } } else if (state == Scale) { - if (points.count() < 1 || points.count() > 2) + if (points.size() < 1 || points.size() > 2) goto error; qreal sx = points[0]; qreal sy = sx; - if(points.count() == 2) + if(points.size() == 2) sy = points[1]; matrix.scale(sx, sy); } else if (state == SkewX) { - if (points.count() != 1) + if (points.size() != 1) goto error; matrix.shear(qTan(qDegreesToRadians(points[0])), 0); } else if (state == SkewY) { - if (points.count() != 1) + if (points.size() != 1) goto error; matrix.shear(0, qTan(qDegreesToRadians(points[0]))); } @@ -1166,8 +1166,8 @@ //stroke attribute handling if ((!attributes.stroke.isEmpty()) && (attributes.stroke != QT_INHERIT) ) { - if (attributes.stroke.length() > 3 && attributes.stroke.mid(0, 3) == QLatin1String("url")) { - QString value = attributes.stroke.mid(3, attributes.stroke.length() - 3).toString(); + if (attributes.stroke.size() > 3 && attributes.stroke.mid(0, 3) == QLatin1String("url")) { + QString value = attributes.stroke.mid(3, attributes.stroke.size() - 3).toString(); QSvgStyleProperty *style = styleFromUrl(node, value); if (style) { if (style->type() == QSvgStyleProperty::SOLID_COLOR || style->type() == QSvgStyleProperty::GRADIENT) @@ -1314,7 +1314,7 @@ if (!attributes.fontFamily.isEmpty() && attributes.fontFamily != QT_INHERIT) { QString family = attributes.fontFamily.toString().trimmed(); if (family.at(0) == QLatin1Char('\'') || family.at(0) == QLatin1Char('\"')) - family = family.mid(1, family.length() - 2); + family = family.mid(1, family.size() - 2); fontStyle->setFamily(family); } @@ -1584,7 +1584,7 @@ if (pathElem == QLatin1Char('z') || pathElem == QLatin1Char('Z')) arg.append(0);//dummy const qreal *num = arg.constData(); - int count = arg.count(); + int count = arg.size(); while (ok && count > 0) { qreal offsetX = x; // correction offsets qreal offsetY = y; // for relative commands @@ -1898,13 +1898,13 @@ static void parseCSStoXMLAttrs(const QList<QCss::Declaration> &declarations, QXmlStreamAttributes &attributes) { - for (int i = 0; i < declarations.count(); ++i) { + for (int i = 0; i < declarations.size(); ++i) { const QCss::Declaration &decl = declarations.at(i); if (decl.d->property.isEmpty()) continue; QCss::Value val = decl.d->values.first(); QString valueStr; - const int valCount = decl.d->values.count(); + const int valCount = decl.d->values.size(); if (valCount != 1) { for (int i = 0; i < valCount; ++i) { valueStr += decl.d->values[i].toString(); @@ -1921,9 +1921,9 @@ QStringList lst = val.variant.toStringList(); valueStr.append(lst.at(0)); valueStr.append(QLatin1Char('(')); - for (int i = 1; i < lst.count(); ++i) { + for (int i = 1; i < lst.size(); ++i) { valueStr.append(lst.at(i)); - if ((i +1) < lst.count()) + if ((i +1) < lst.size()) valueStr.append(QLatin1Char(',')); } valueStr.append(QLatin1Char(')')); @@ -2044,7 +2044,7 @@ QStringList fonts; QString xmlClassStr; - for (int i = 0; i < attributes.count(); ++i) { + for (int i = 0; i < attributes.size(); ++i) { const QXmlStreamAttribute &attribute = attributes.at(i); QStringView name = attribute.qualifiedName(); if (name.isEmpty()) @@ -2361,7 +2361,7 @@ colors.append(endColor); } else { QStringList str = valuesStr.split(QLatin1Char(';')); - colors.reserve(str.count()); + colors.reserve(str.size()); QStringList::const_iterator itr; for (itr = str.constBegin(); itr != str.constEnd(); ++itr) { QColor color; @@ -2465,7 +2465,7 @@ ++s; } } - if (vals.count() % 3 != 0) + if (vals.size() % 3 != 0) return false; bool ok = true; @@ -2958,7 +2958,7 @@ //same QPolygon parsing is in createPolylineNode const QChar *s = pointsStr.constData(); QList<qreal> points = parseNumbersList(s); - QPolygonF poly(points.count()/2); + QPolygonF poly(points.size()/2); for (int i = 0; i < poly.size(); ++i) poly[i] = QPointF(points.at(2 * i), points.at(2 * i + 1)); QSvgNode *polygon = new QSvgPolygon(parent, poly); @@ -2974,7 +2974,7 @@ //same QPolygon parsing is in createPolygonNode const QChar *s = pointsStr.constData(); QList<qreal> points = parseNumbersList(s); - QPolygonF poly(points.count()/2); + QPolygonF poly(points.size()/2); for (int i = 0; i < poly.size(); ++i) poly[i] = QPointF(points.at(2 * i), points.at(2 * i + 1)); @@ -3140,12 +3140,12 @@ cssNode.ptr = &anim; QList<QCss::Declaration> decls = handler->selector()->declarationsForNode(cssNode); - for (int i = 0; i < decls.count(); ++i) { + for (int i = 0; i < decls.size(); ++i) { const QCss::Declaration &decl = decls.at(i); if (decl.d->property.isEmpty()) continue; - if (decl.d->values.count() != 1) + if (decl.d->values.size() != 1) continue; QCss::Value val = decl.d->values.first(); QString valueStr = val.toString(); @@ -3253,7 +3253,7 @@ viewBoxStr = viewBoxStr.replace(QLatin1Char('\t'), QLatin1Char(',')); viewBoxValues = viewBoxStr.split(QLatin1Char(','), Qt::SkipEmptyParts); } - if (viewBoxValues.count() == 4) { + if (viewBoxValues.size() == 4) { QString xStr = viewBoxValues.at(0).trimmed(); QString yStr = viewBoxValues.at(1).trimmed(); QString widthStr = viewBoxValues.at(2).trimmed(); @@ -3409,7 +3409,7 @@ if (name.isEmpty()) return 0; - QStringView ref = QStringView{name}.mid(1, name.length() - 1); + QStringView ref = QStringView{name}.mid(1, name.size() - 1); switch (name.at(0).unicode()) { case 'd': if (ref == QLatin1String("efs")) return createDefsNode; @@ -3432,7 +3432,7 @@ if (name.isEmpty()) return 0; - QStringView ref = QStringView{name}.mid(1, name.length() - 1); + QStringView ref = QStringView{name}.mid(1, name.size() - 1); switch (name.at(0).unicode()) { case 'a': if (ref == QLatin1String("nimation")) return createAnimationNode; @@ -3481,7 +3481,7 @@ if (name.isEmpty()) return 0; - QStringView ref = QStringView{name}.mid(1, name.length() - 1); + QStringView ref = QStringView{name}.mid(1, name.size() - 1); switch (name.at(0).unicode()) { case 'a': if (ref.isEmpty()) return parseAnchorNode; @@ -3533,7 +3533,7 @@ if (name.isEmpty()) return 0; - QStringView ref = QStringView{name}.mid(1, name.length() - 1); + QStringView ref = QStringView{name}.mid(1, name.size() - 1); switch (name.at(0).unicode()) { case 'f': if (ref == QLatin1String("ont")) return createFontNode; @@ -3562,7 +3562,7 @@ if (name.isEmpty()) return 0; - QStringView ref = QStringView{name}.mid(1, name.length() - 1); + QStringView ref = QStringView{name}.mid(1, name.size() - 1); switch (name.at(0).unicode()) { case 'f': if (ref == QLatin1String("ont-face")) return parseFontFaceNode; @@ -3891,7 +3891,7 @@ void QSvgHandler::resolveNodes() { - for (QSvgUse *useNode : qAsConst(m_toBeResolved)) { + for (QSvgUse *useNode : std::as_const(m_toBeResolved)) { const auto parent = useNode->parent(); if (!parent) continue; @@ -3966,7 +3966,7 @@ void QSvgHandler::pushColorCopy() { - if (m_colorTagCount.count()) + if (m_colorTagCount.size()) ++m_colorTagCount.top(); else pushColor(Qt::black); @@ -3974,7 +3974,7 @@ void QSvgHandler::popColor() { - if (m_colorTagCount.count()) { + if (m_colorTagCount.size()) { if (!--m_colorTagCount.top()) { m_colorStack.pop(); m_colorTagCount.pop(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/src/svg/qsvgstructure.cpp new/qtsvg-everywhere-src-6.4.2/src/svg/qsvgstructure.cpp --- old/qtsvg-everywhere-src-6.4.1/src/svg/qsvgstructure.cpp 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/src/svg/qsvgstructure.cpp 2022-12-12 15:01:56.000000000 +0100 @@ -218,12 +218,12 @@ "http://www.w3.org/Graphics/SVG/feature/1.2/#ExternalResourcesRequiredAttribute"; }; - if (str.length() <= MAX_WORD_LENGTH && str.length() >= MIN_WORD_LENGTH) { + if (str.size() <= MAX_WORD_LENGTH && str.size() >= MIN_WORD_LENGTH) { const char16_t unicode44 = str.at(44).unicode(); const char16_t unicode45 = str.at(45).unicode(); if (unicode44 >= sizeof(asso_values) || unicode45 >= sizeof(asso_values)) return false; - const int key = str.length() + const int key = str.size() + asso_values[unicode45] + asso_values[unicode44]; if (key <= MAX_HASH_VALUE && key >= 0) @@ -328,7 +328,7 @@ QRectF bounds; if (!m_recursing) { QScopedValueRollback<bool> guard(m_recursing, true); - for (QSvgNode *node : qAsConst(m_renderers)) + for (QSvgNode *node : std::as_const(m_renderers)) bounds |= node->transformedBounds(p, states); } return bounds; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-everywhere-src-6.4.1/src/svg/qsvgstyle.cpp new/qtsvg-everywhere-src-6.4.2/src/svg/qsvgstyle.cpp --- old/qtsvg-everywhere-src-6.4.1/src/svg/qsvgstyle.cpp 2022-11-08 16:10:20.000000000 +0100 +++ new/qtsvg-everywhere-src-6.4.2/src/svg/qsvgstyle.cpp 2022-12-12 15:01:56.000000000 +0100 @@ -630,8 +630,8 @@ m_type = type; m_args = args; m_additive = additive; - Q_ASSERT(!(args.count()%3)); - m_count = args.count() / 3; + Q_ASSERT(!(args.size()%3)); + m_count = args.size() / 3; } void QSvgAnimateTransform::apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &) @@ -836,7 +836,7 @@ percentOfAnimation -= ((int)percentOfAnimation); } - qreal currentPosition = percentOfAnimation * (m_colors.count() - 1); + qreal currentPosition = percentOfAnimation * (m_colors.size() - 1); int startElem = qFloor(currentPosition); int endElem = qCeil(currentPosition);
