summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2021-09-21 10:39:10 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2021-09-21 14:52:18 +0200
commitcb313a6d5cd723979875240fb5678613fb1b4023 (patch)
treeafb84024929a9835579fd0b7433a8ca67c7280b7
parentcd0ed3ad564675cc823a21032987fbe2c7c5864d (diff)
Fix clang format specifier warning
* Replaces the not recommended use of QString::asprintf too. Change-Id: Ib211754d5fe81f52de87d01e4f92d03e08d57d24 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/serialbus/qcanbusframe.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/serialbus/qcanbusframe.cpp b/src/serialbus/qcanbusframe.cpp
index 206eb90..5e0b6b7 100644
--- a/src/serialbus/qcanbusframe.cpp
+++ b/src/serialbus/qcanbusframe.cpp
@@ -421,17 +421,22 @@ QString QCanBusFrame::toString() const
break;
}
- const char * const idFormat = hasExtendedFrameFormat() ? "%08X" : " %03X";
- const char * const dlcFormat = hasFlexibleDataRateFormat() ? " [%02d]" : " [%d]";
QString result;
- result.append(QString::asprintf(idFormat, static_cast<uint>(frameId())));
- result.append(QString::asprintf(dlcFormat, payload().size()));
+ result.append(hasExtendedFrameFormat() ? u""_qs : u" "_qs);
+ result.append(u"%1"_qs.arg(static_cast<uint>(frameId()),
+ hasExtendedFrameFormat() ? 8 : 3,
+ 16, QLatin1Char('0')).toUpper());
+
+ result.append(hasFlexibleDataRateFormat() ? u" "_qs : u" "_qs);
+ result.append(u"[%1]"_qs.arg(payload().size(),
+ hasFlexibleDataRateFormat() ? 2 : 0,
+ 10, QLatin1Char('0')));
if (type == RemoteRequestFrame) {
- result.append(QLatin1String(" Remote Request"));
+ result.append(u" Remote Request"_qs);
} else if (!payload().isEmpty()) {
const QByteArray data = payload().toHex(' ').toUpper();
- result.append(QLatin1String(" "));
+ result.append(u" "_qs);
result.append(QLatin1String(data));
}