diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2016-12-20 13:50:18 +0100 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2017-01-13 19:41:34 +0000 |
commit | a0cc6c88fd990b89848a78606e8547f814213a46 (patch) | |
tree | 4c920bb3038826516d915bbb50f39310aba094e9 | |
parent | 8595d3a1758b65b2e30770c5491e144ecfcb610c (diff) |
QCanBusFrame::toString: Make use of new QByteArray::toHex overload
QByteArray::toHex now allows to insert separator characters
(e.g. spaces), so we don't need to do this here anymore.
Change-Id: I3942d3dc3e1650e075d4b667706681dab9d977ed
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | src/serialbus/qcanbusframe.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/serialbus/qcanbusframe.cpp b/src/serialbus/qcanbusframe.cpp index db17e1d..6bde751 100644 --- a/src/serialbus/qcanbusframe.cpp +++ b/src/serialbus/qcanbusframe.cpp @@ -334,19 +334,10 @@ QString QCanBusFrame::toString() const if (type == RemoteRequestFrame) { result.append(QLatin1String(" Remote Request")); - } else { - const QByteArray data = payload().toHex().toUpper(); - const int length = data.size(); - if (length) { - const QLatin1String l1(data.data(), length); - - result.append(QLatin1Char(' ')); - - for (int i = 0; i < length; i += 2) { - result.append(QLatin1Char(' ')); - result.append(l1.mid(i, 2)); - } - } + } else if (!payload().isEmpty()) { + const QByteArray data = payload().toHex(' ').toUpper(); + result.append(QLatin1String(" ")); + result.append(QLatin1String(data)); } return result; |