diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-05-05 16:05:35 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-05-15 14:02:47 +0200 |
| commit | 0f37c477135da0a4b91b7da167bf50d2b0bb0540 (patch) | |
| tree | 373af6b6f9aca908cff03b6df72d6caf3c2bd46a /src/dbus/qdbusargument.h | |
| parent | 4768fcf836f1eb0f59ab62a29eb821b433a239c1 (diff) | |
| download | qtbase-0f37c477135da0a4b91b7da167bf50d2b0bb0540.tar.gz | |
QtDBus: Convert some loops to ranged for loops
Convert some loops that are using Java-style iterators into
ranged for loops for better readability.
Change-Id: I14f6339608d201fe06a753be236db52815cbf5c4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusargument.h')
| -rw-r--r-- | src/dbus/qdbusargument.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 475c47f442..f1ecb91f0d 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -222,10 +222,8 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<T> &l inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantList &list) { arg.beginArray(QMetaType::fromType<QDBusVariant>()); - QVariantList::ConstIterator it = list.constBegin(); - QVariantList::ConstIterator end = list.constEnd(); - for ( ; it != end; ++it) - arg << QDBusVariant(*it); + for (const QVariant &value : list) + arg << QDBusVariant(value); arg.endArray(); return arg; } @@ -284,11 +282,9 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<Key, inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantMap &map) { arg.beginMap(QMetaType::fromType<QString>(), QMetaType::fromType<QDBusVariant>()); - QVariantMap::ConstIterator it = map.constBegin(); - QVariantMap::ConstIterator end = map.constEnd(); - for ( ; it != end; ++it) { + for (const auto &[key, value] : map.asKeyValueRange()) { arg.beginMapEntry(); - arg << it.key() << QDBusVariant(it.value()); + arg << key << QDBusVariant(value); arg.endMapEntry(); } arg.endMap(); @@ -298,11 +294,9 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantMap &map) inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map) { arg.beginMap(QMetaType::fromType<QString>(), QMetaType::fromType<QDBusVariant>()); - QVariantHash::ConstIterator it = map.constBegin(); - QVariantHash::ConstIterator end = map.constEnd(); - for ( ; it != end; ++it) { + for (const auto &[key, value] : map.asKeyValueRange()) { arg.beginMapEntry(); - arg << it.key() << QDBusVariant(it.value()); + arg << key << QDBusVariant(value); arg.endMapEntry(); } arg.endMap(); |