From 37da7a853a7d59305041dd2a562ab1054be5e9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 23 Oct 2018 23:00:45 -0300 Subject: [PATCH] ui: Use QString::arg with multiple QString parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/ui/MAVLinkDecoder.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui/MAVLinkDecoder.cc b/src/ui/MAVLinkDecoder.cc index c7cc4a0d1..53381f8dd 100644 --- a/src/ui/MAVLinkDecoder.cc +++ b/src/ui/MAVLinkDecoder.cc @@ -236,7 +236,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 char buf[11]; strncpy(buf, debug.name, 10); buf[10] = '\0'; - name = QString("%1.%2").arg(buf).arg(fieldName); + name = QString("%1.%2").arg(buf, fieldName); time = getUnixTimeFromMs(msg->sysid, (debug.time_usec+500)/1000); // Scale to milliseconds, round up/down correctly } else if (msgid == MAVLINK_MSG_ID_DEBUG_FLOAT_ARRAY) @@ -246,7 +246,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 char buf[11]; strncpy(buf, debug.name, 10); buf[10] = '\0'; - name = QString("%1.%2").arg(buf).arg(fieldName); + name = QString("%1.%2").arg(buf, fieldName); time = getUnixTimeFromMs(msg->sysid, (debug.time_usec+500)/1000); // Scale to milliseconds, round up/down correctly } else if (msgid == MAVLINK_MSG_ID_DEBUG) @@ -281,7 +281,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 // XXX this is really ugly, but we do not know a better way to do this mavlink_rc_channels_raw_t raw; mavlink_msg_rc_channels_raw_decode(msg, &raw); - name = name.arg(msgInfo->name).arg(fieldName); + name = name.arg(msgInfo->name, fieldName); name.prepend(QString("port%1_").arg(raw.port)); } else if (msgid == MAVLINK_MSG_ID_RC_CHANNELS_SCALED) @@ -289,7 +289,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 // XXX this is really ugly, but we do not know a better way to do this mavlink_rc_channels_scaled_t scaled; mavlink_msg_rc_channels_scaled_decode(msg, &scaled); - name = name.arg(msgInfo->name).arg(fieldName); + name = name.arg(msgInfo->name, fieldName); name.prepend(QString("port%1_").arg(scaled.port)); } else if (msgid == MAVLINK_MSG_ID_SERVO_OUTPUT_RAW) @@ -297,12 +297,12 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 // XXX this is really ugly, but we do not know a better way to do this mavlink_servo_output_raw_t servo; mavlink_msg_servo_output_raw_decode(msg, &servo); - name = name.arg(msgInfo->name).arg(fieldName); + name = name.arg(msgInfo->name, fieldName); name.prepend(QString("port%1_").arg(servo.port)); } else { - name = name.arg(msgInfo->name).arg(fieldName); + name = name.arg(msgInfo->name, fieldName); } if (multiComponentSourceDetected) -- 2.22.0