summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2020-06-02 13:11:37 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2020-06-10 14:02:07 +0200
commitc09d9ab07931c21f4bce39f52bd640160158d0c5 (patch)
tree30638fc2b7bfd0278273249fadf28065411fbd84
parentef9372904e7e1e2e42a99e189589236106b78d54 (diff)
Qt6: Port QtSerialBus module to QStringView
Task-number: QTBUG-84319 Change-Id: I4194980e3d5be1b6009d320d9b47809bac412504 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r--src/plugins/canbus/passthrucan/passthrucanbackend.cpp2
-rw-r--r--src/plugins/canbus/vectorcan/vectorcanbackend.cpp2
-rw-r--r--src/tools/canbusutil/canbusutil.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/canbus/passthrucan/passthrucanbackend.cpp b/src/plugins/canbus/passthrucan/passthrucanbackend.cpp
index 2c18160..380f6ea 100644
--- a/src/plugins/canbus/passthrucan/passthrucanbackend.cpp
+++ b/src/plugins/canbus/passthrucan/passthrucanbackend.cpp
@@ -200,7 +200,7 @@ bool PassThruCanBackend::open()
QByteArray subDev;
if (splitPos >= 0)
- subDev = m_deviceName.midRef(splitPos + 1).toLatin1();
+ subDev = QStringView{m_deviceName}.mid(splitPos + 1).toLatin1();
const QString library = libraryForAdapter(adapter);
if (library.isEmpty()) {
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
index 550f744..5d719d8 100644
--- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
+++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
@@ -299,7 +299,7 @@ void VectorCanBackendPrivate::setupChannel(const QString &interfaceName)
{
Q_Q(VectorCanBackend);
if (Q_LIKELY(interfaceName.startsWith(QStringLiteral("can")))) {
- const QStringRef ref = interfaceName.midRef(3);
+ const QStringView ref = QStringView{interfaceName}.mid(3);
bool ok = false;
channelIndex = ref.toInt(&ok);
if (ok && (channelIndex >= 0 && channelIndex < XL_CONFIG_MAX_CHANNELS)) {
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index b07d97c..9b34fac 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.cpp
@@ -133,7 +133,7 @@ bool CanBusUtil::parseDataField(quint32 &id, QString &payload)
return false;
}
- id = m_data.leftRef(hashMarkPos).toUInt(nullptr, 16);
+ id = QStringView{m_data}.left(hashMarkPos).toUInt(nullptr, 16);
payload = m_data.right(m_data.size() - hashMarkPos - 1);
return true;
@@ -148,7 +148,7 @@ bool CanBusUtil::setFrameFromPayload(QString payload, QCanBusFrame *frame)
return true;
bool ok = false;
- int rtrFrameLength = payload.midRef(1).toInt(&ok);
+ int rtrFrameLength = QStringView{payload}.mid(1).toInt(&ok);
if (ok && rtrFrameLength >= 0 && rtrFrameLength <= 8) { // payload = "R8"
frame->setPayload(QByteArray(rtrFrameLength, 0));
return true;
@@ -172,7 +172,7 @@ bool CanBusUtil::setFrameFromPayload(QString payload, QCanBusFrame *frame)
if (payload.size() % 2 != 0) {
if (frame->hasFlexibleDataRateFormat()) {
enum { BitrateSwitchFlag = 1, ErrorStateIndicatorFlag = 2 };
- const int flags = payload.leftRef(1).toInt(nullptr, 16);
+ const int flags = QStringView{payload}.left(1).toInt(nullptr, 16);
frame->setBitrateSwitch(flags & BitrateSwitchFlag);
frame->setErrorStateIndicator(flags & ErrorStateIndicatorFlag);
payload.remove(0, 1);