From 153d3a85cc797f225ab466ae7d4e9c48b8bbf1bd Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 17 Aug 2019 15:18:07 +0200 Subject: [PATCH] Port away from Java-style iterators Upcoming Qt 5.14 won't have Java-style iterators, so it's time to switch to STL-style iterators. --- src/gsettings/qgvariantutils_p.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gsettings/qgvariantutils_p.cpp b/src/gsettings/qgvariantutils_p.cpp index 3d4abb6..eb2a527 100644 --- a/src/gsettings/qgvariantutils_p.cpp +++ b/src/gsettings/qgvariantutils_p.cpp @@ -149,13 +149,14 @@ GVariant *toGVariant(const GVariantType *type, const QVariant &variant) GVariantBuilder builder; g_variant_builder_init(&builder, G_VARIANT_TYPE("a{ss}")); - QMapIterator it(variant.toMap()); - while (it.hasNext()) { - it.next(); - + QVariantMap map = variant.toMap(); + QVariantMap::const_iterator it = map.constBegin(); + while (it != map.constEnd()) { QByteArray key = it.key().toUtf8(); QByteArray value = it.value().toByteArray(); g_variant_builder_add(&builder, "{ss}", key.constData(), value.constData()); + + ++it; } return g_variant_builder_end(&builder); @@ -163,13 +164,14 @@ GVariant *toGVariant(const GVariantType *type, const QVariant &variant) GVariantBuilder builder; g_variant_builder_init(&builder, G_VARIANT_TYPE("a{si}")); - QMapIterator it(variant.toMap()); - while (it.hasNext()) { - it.next(); - + QVariantMap map = variant.toMap(); + QVariantMap::const_iterator it = map.constBegin(); + while (it != map.constEnd()) { QByteArray key = it.key().toUtf8(); int value = it.value().toInt(); g_variant_builder_add(&builder, "{si}", key.constData(), value); + + ++it; } return g_variant_builder_end(&builder);