diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 11:40:35 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 18:20:31 +0200 |
commit | 35ab16d5e881f8f4507d2f3e0a8a04214fff7bdc (patch) | |
tree | 8983c14648c4768fef39f8e815c6648d970886b3 /src | |
parent | a2f9cae04e4fadbc2147a7678dee1b5b09e5a5ec (diff) |
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
Task-number: QTBUG-99313
Change-Id: I805f044a494f0ed3066c9c132767d541108c0e2d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/virtualcan/virtualcanbackend.cpp | 2 | ||||
-rw-r--r-- | src/serialbus/qmodbusserver.cpp | 2 | ||||
-rw-r--r-- | src/serialbus/qmodbustcpclient_p.h | 2 | ||||
-rw-r--r-- | src/serialbus/qmodbustcpserver.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 06564ea..9feb4b7 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -89,7 +89,7 @@ static void DRV_CALLBACK_TYPE canRxEventCallback(quint32 index, TCanMsg *frame, Q_UNUSED(count); QMutexLocker lock(&gTinyCan->mutex); - for (TinyCanBackendPrivate *p : qAsConst(gTinyCan->channels)) { + for (TinyCanBackendPrivate *p : std::as_const(gTinyCan->channels)) { if (p->channelIndex == int(index)) { p->startRead(); return; diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp index e69b5cf..4ca00a6 100644 --- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp +++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp @@ -112,7 +112,7 @@ void VirtualCanServer::readyRead() const QByteArrayList commandList = command.split(':'); Q_ASSERT(commandList.size() == 2); - for (QTcpSocket *writeSocket : qAsConst(m_serverSockets)) { + for (QTcpSocket *writeSocket : std::as_const(m_serverSockets)) { // Don't send the frame back to its origin if (writeSocket == readSocket) continue; diff --git a/src/serialbus/qmodbusserver.cpp b/src/serialbus/qmodbusserver.cpp index a80ec2c..70be415 100644 --- a/src/serialbus/qmodbusserver.cpp +++ b/src/serialbus/qmodbusserver.cpp @@ -959,7 +959,7 @@ QModbusResponse QModbusServerPrivate::processWriteMultipleCoilsRequest(const QMo // range is numberOfCoils and therefore index too. quint16 coil = numberOfCoils; qint32 currentBit = 8 - ((byteCount * 8) - numberOfCoils); - for (quint8 currentByte : qAsConst(bytes)) { + for (quint8 currentByte : std::as_const(bytes)) { for (currentBit -= 1; currentBit >= 0; --currentBit) coils.setValue(--coil, currentByte & (1U << currentBit) ? 1 : 0); currentBit = 8; diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h index 8ffed66..9492a66 100644 --- a/src/serialbus/qmodbustcpclient_p.h +++ b/src/serialbus/qmodbustcpclient_p.h @@ -207,7 +207,7 @@ public: qCDebug(QT_MODBUS) << "(TCP client) Cleanup of pending requests"; - for (const auto &elem : qAsConst(m_transactionStore)) { + for (const auto &elem : std::as_const(m_transactionStore)) { if (elem.reply.isNull()) continue; elem.reply->setError(QModbusDevice::ReplyAbortedError, diff --git a/src/serialbus/qmodbustcpserver.cpp b/src/serialbus/qmodbustcpserver.cpp index 24e5dc9..715c55c 100644 --- a/src/serialbus/qmodbustcpserver.cpp +++ b/src/serialbus/qmodbustcpserver.cpp @@ -98,7 +98,7 @@ void QModbusTcpServer::close() if (d->m_tcpServer->isListening()) d->m_tcpServer->close(); - for (auto socket : qAsConst(d->connections)) + for (auto socket : std::as_const(d->connections)) socket->disconnectFromHost(); setState(QModbusDevice::UnconnectedState); |