1 files changed, 11 insertions, 10 deletions

diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index 58575a3d94..b2ed2586fb 100644
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -28,7 +28,7 @@ QDBusMarshaller::~QDBusMarshaller()
 void QDBusMarshaller::unregisteredTypeError(QMetaType id)
 {
     const char *name = id.name();
-    qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. "
+    qWarning("QDBusMarshaller: type '%s' (%d) is not registered with D-Bus. "
              "Use qDBusRegisterMetaType to register it",
              name ? name : "", id.id());
     error("Unregistered type %1 passed in arguments"_L1
@@ -152,7 +152,7 @@ inline void QDBusMarshaller::append(const QByteArray &arg)
     DBusMessageIter subiterator;
     q_dbus_message_iter_open_container(&iterator, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE_AS_STRING,
                                      &subiterator);
-    q_dbus_message_iter_append_fixed_array(&subiterator, DBUS_TYPE_BYTE, &cdata, arg.length());
+    q_dbus_message_iter_append_fixed_array(&subiterator, DBUS_TYPE_BYTE, &cdata, arg.size());
     q_dbus_message_iter_close_container(&iterator, &subiterator);
 }
 
@@ -206,10 +206,8 @@ inline void QDBusMarshaller::append(const QStringList &arg)
 
     QDBusMarshaller sub(capabilities);
     open(sub, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING);
-    QStringList::ConstIterator it = arg.constBegin();
-    QStringList::ConstIterator end = arg.constEnd();
-    for ( ; it != end; ++it)
-        sub.append(*it);
+    for (const QString &s : arg)
+        sub.append(s);
     // don't call sub.close(): it auto-closes
 }
 
@@ -237,8 +235,11 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(QMetaType kid, QMetaType vid)
         return this;
     }
     if (ksignature[1] != 0 || !QDBusUtil::isValidBasicType(*ksignature)) {
-        qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-BUS map.",
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wformat-overflow")
+        qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-Bus map.",
                  kid.name(), kid.id());
+QT_WARNING_POP
         error("Type %1 passed in arguments cannot be used as a key in a map"_L1
               .arg(QLatin1StringView(kid.name())));
         return this;
@@ -359,7 +360,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
         QDBusDemarshaller demarshaller(capabilities);
         demarshaller.message = q_dbus_message_ref(d->message);
 
-        if (d->direction == Demarshalling) {
+        if (d->direction == Direction::Demarshalling) {
             // it's demarshalling; just copy
             demarshaller.iterator = static_cast<QDBusDemarshaller *>(d)->iterator;
         } else {
@@ -471,7 +472,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
         Q_FALLTHROUGH();
 
     default:
-        qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-BUS type '%s'",
+        qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-Bus type '%s'",
                  signature);
         return false;
     }
@@ -491,7 +492,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller)
     int code = q_dbus_message_iter_get_arg_type(&demarshaller->iterator);
     if (QDBusUtil::isValidBasicType(code)) {
         // easy: just append
-        // do exactly like the D-BUS docs suggest
+        // do exactly like the D-Bus docs suggest
         // (see apidocs for q_dbus_message_iter_get_basic)
 
         qlonglong value;