summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-11-11 16:26:04 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-11-14 07:24:10 +0100
commit0ee7732c2364bf3a45a00cf7474a8e52e71c955d (patch)
tree3f721314d359d24a112996f561bd82e51f21256e
parent11ba1e18854394256f5d917e6295f7998069025f (diff)
downloadqtsvg-0ee7732c2364bf3a45a00cf7474a8e52e71c955d.tar.gz
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I764d628eae9c657787079bf88b0b8a30d97e5fce Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/svg/qsvggenerator.cpp2
-rw-r--r--src/svg/qsvghandler.cpp2
-rw-r--r--src/svg/qsvgstructure.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 1e3f55c..308dbac 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -287,7 +287,7 @@ public:
}
}
- 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 --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 09da1a3..29ca733 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -3891,7 +3891,7 @@ void QSvgHandler::resolveGradients(QSvgNode *node, int nestedDepth)
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;
diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp
index 5ab1978..b4ac368 100644
--- a/src/svg/qsvgstructure.cpp
+++ b/src/svg/qsvgstructure.cpp
@@ -328,7 +328,7 @@ QRectF QSvgStructureNode::bounds(QPainter *p, QSvgExtraStates &states) const
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;