aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/pathtool
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-07-31 13:27:56 +0200
committerhjk <hjk@qt.io>2019-08-01 12:08:53 +0000
commitb7366f3cce03b48fee3a0f3db03ed09a81d5a2c1 (patch)
treec82af6d7aaf62cf763f850689eab41a080b8c334 /src/plugins/qmldesigner/components/pathtool
parent6cb17fcae9edec716eb11fd43685728267c5b4ba (diff)
QmlDesigner: Compile fix: More Java-style iterator removal
We use QT_NO_JAVA_STYLE_ITERATORS, and Qt dev has wrapped more iterators with that, so without this patch (or undefining QT_NO_JAVA_STYLE_ITERATORS) creator does not compile. Change-Id: I7d3ef0ed11db72e07333e21311725cd13136696a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/pathtool')
-rw-r--r--src/plugins/qmldesigner/components/pathtool/pathitem.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/pathtool/pathitem.cpp b/src/plugins/qmldesigner/components/pathtool/pathitem.cpp
index f8e3b5549c3..602666e8951 100644
--- a/src/plugins/qmldesigner/components/pathtool/pathitem.cpp
+++ b/src/plugins/qmldesigner/components/pathtool/pathitem.cpp
@@ -104,9 +104,9 @@ void PathItem::writeCubicPath(const ModelNode &pathNode, const CubicSegment &cub
void PathItem::writePathAttributes(const ModelNode &pathNode, const QMap<QString, QVariant> &attributes)
{
- QMapIterator<QString, QVariant> attributesIterator(attributes);
- while (attributesIterator.hasNext()) {
- attributesIterator.next();
+ for (auto attributesIterator = attributes.cbegin(), end = attributes.cend();
+ attributesIterator != end;
+ ++attributesIterator) {
QList<QPair<PropertyName, QVariant> > propertyList;
propertyList.append(PropertyPair("name", attributesIterator.key()));
propertyList.append(PropertyPair("value", attributesIterator.value()));