From a969f772e541dd8724bc546c3d9a74432a3a81ea Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 15 Jan 2016 17:35:39 +0300 Subject: Replace foreach with range-based for Change-Id: Ie4d5aac39958b8e1fe946d61679a98fdc21c7b0b Reviewed-by: Friedemann Kleint Reviewed-by: Andy Shaw --- src/svg/qsvggenerator.cpp | 6 +++--- src/svg/qsvgstructure.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index ca99de1..bb9429c 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -65,12 +65,12 @@ static void translate_color(const QColor &color, QString *color_string, *opacity_string = QString::number(color.alphaF()); } -static void translate_dashPattern(QVector pattern, const qreal& width, QString *pattern_string) +static void translate_dashPattern(const QVector &pattern, const qreal& width, QString *pattern_string) { Q_ASSERT(pattern_string); // Note that SVG operates in absolute lengths, whereas Qt uses a length/width ratio. - foreach (qreal entry, pattern) + for (qreal entry : pattern) *pattern_string += QString::fromLatin1("%1,").arg(entry * width); pattern_string->chop(1); @@ -278,7 +278,7 @@ public: } } - foreach(QGradientStop stop, stops) { + for (QGradientStop stop : qAsConst(stops)) { QString color = QString::fromLatin1("#%1%2%3") .arg(stop.second.red(), 2, 16, QLatin1Char('0')) diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index edf7d22..a6a4067 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.cpp @@ -350,7 +350,7 @@ void QSvgSwitch::init() QRectF QSvgStructureNode::bounds(QPainter *p, QSvgExtraStates &states) const { QRectF bounds; - foreach(QSvgNode *node, m_renderers) + for (QSvgNode *node : qAsConst(m_renderers)) bounds |= node->transformedBounds(p, states); return bounds; } -- cgit v1.2.1