Do not chain QString::arg(const QString&) calls

Chaining arg() calls with QString parameters is known to provide
incorrect results when the strings contain %0, %1, etc...
In our case both message and signal names can contain such
combinations, so use multi-arg version of QString::arg() instead.

Pick-to: 6.5
Change-Id: I10efe4e02a74e12bab98586f12b9a495ad4145dd
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/serialbus/qcanframeprocessor.cpp b/src/serialbus/qcanframeprocessor.cpp
index 2d0e99c..3742064 100644
--- a/src/serialbus/qcanframeprocessor.cpp
+++ b/src/serialbus/qcanframeprocessor.cpp
@@ -250,7 +250,7 @@ QCanBusFrame QCanFrameProcessor::prepareFrame(QtCanBus::UniqueId uniqueId,
         if (!descriptionsHash.contains(signalName)) {
             d->addWarning(QObject::tr("Skipping signal %1. It is not found in "
                                       "message description for unique id %2.").
-                          arg(signalName).arg(uniqueId));
+                          arg(signalName, QString::number(uniqueId)));
             continue;
         }
 
@@ -512,7 +512,7 @@ QCanFrameProcessor::ParseResult QCanFrameProcessor::parseFrame(const QCanBusFram
                 if (!desc.isValid()) {
                     d->addWarning(QObject::tr("Skipping signal %1 in message with unique id %2"
                                               " because its description is invalid.").
-                                  arg(desc.name()).arg(uniqueId));
+                                  arg(desc.name(), QString::number(uniqueId)));
                     continue;
                 }
                 const QVariant value = d->decodeSignal(frame, desc);
@@ -569,7 +569,7 @@ QVariant QCanFrameProcessorPrivate::decodeSignal(const QCanBusFrame &frame,
     if (signalDataEnd >= maxDataLength) {
         addWarning(QObject::tr("Skipping signal %1 in message with unique id %2. "
                                "Its expected length exceeds the data length.").
-                   arg(signalDesc.name()).arg(frame.frameId()));
+                   arg(signalDesc.name(), QString::number(frame.frameId())));
         return QVariant();
     }