summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2022-03-21 11:50:01 +0100
committerSona Kurazyan <sona.kurazyan@qt.io>2022-04-11 08:54:51 +0100
commit61eec651e168358dc9ba73ab34539d2d99bc982e (patch)
tree6def5e4e6ae0149704550f01e14a6405c72ff2a4 /src
parent6eadc50ec6697b60c20511c82cfd8304a02732a4 (diff)
Replace uses of deprecated _qs with _s
Task-number: QTBUG-101408 Change-Id: If9526893c6fa99da9983cb8bfd3fb2cb9d9521e2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src')
-rw-r--r--src/serialbus/qcanbusframe.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/serialbus/qcanbusframe.cpp b/src/serialbus/qcanbusframe.cpp
index f2dbc75..8963b06 100644
--- a/src/serialbus/qcanbusframe.cpp
+++ b/src/serialbus/qcanbusframe.cpp
@@ -43,6 +43,8 @@
QT_BEGIN_NAMESPACE
+using namespace Qt::StringLiterals;
+
/*!
\class QCanBusFrame
\inmodule QtSerialBus
@@ -425,21 +427,21 @@ QString QCanBusFrame::toString() const
}
QString result;
- result.append(hasExtendedFrameFormat() ? u""_qs : u" "_qs);
- result.append(u"%1"_qs.arg(static_cast<uint>(frameId()),
+ result.append(hasExtendedFrameFormat() ? u""_s : u" "_s);
+ result.append(u"%1"_s.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(),
+ result.append(hasFlexibleDataRateFormat() ? u" "_s : u" "_s);
+ result.append(u"[%1]"_s.arg(payload().size(),
hasFlexibleDataRateFormat() ? 2 : 0,
10, QLatin1Char('0')));
if (type == RemoteRequestFrame) {
- result.append(u" Remote Request"_qs);
+ result.append(u" Remote Request"_s);
} else if (!payload().isEmpty()) {
const QByteArray data = payload().toHex(' ').toUpper();
- result.append(u" "_qs);
+ result.append(u" "_s);
result.append(QLatin1String(data));
}