summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/serialbus/can/connectdialog.cpp4
-rw-r--r--examples/serialbus/modbus/server/mainwindow.cpp2
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.cpp2
-rw-r--r--src/plugins/canbus/virtualcan/virtualcanbackend.cpp2
-rw-r--r--src/serialbus/qmodbusserver.cpp2
-rw-r--r--src/serialbus/qmodbustcpclient_p.h2
-rw-r--r--src/serialbus/qmodbustcpserver.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index 7423a28..255728a 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -124,7 +124,7 @@ void ConnectDialog::pluginChanged(const QString &plugin)
{
m_ui->interfaceListBox->clear();
m_interfaces = QCanBus::instance()->availableDevices(plugin);
- for (const QCanBusDeviceInfo &info : qAsConst(m_interfaces))
+ for (const QCanBusDeviceInfo &info : std::as_const(m_interfaces))
m_ui->interfaceListBox->addItem(info.name());
}
@@ -158,7 +158,7 @@ QString ConnectDialog::configurationValue(QCanBusDevice::ConfigurationKey key)
{
QVariant result;
- for (const ConfigurationItem &item : qAsConst(m_currentSettings.configurations)) {
+ for (const ConfigurationItem &item : std::as_const(m_currentSettings.configurations)) {
if (item.first == key) {
result = item.second;
break;
diff --git a/examples/serialbus/modbus/server/mainwindow.cpp b/examples/serialbus/modbus/server/mainwindow.cpp
index 08c316d..df32d4b 100644
--- a/examples/serialbus/modbus/server/mainwindow.cpp
+++ b/examples/serialbus/modbus/server/mainwindow.cpp
@@ -258,7 +258,7 @@ void MainWindow::setupDeviceData()
}
bool ok;
- for (QLineEdit *widget : qAsConst(registers)) {
+ for (QLineEdit *widget : std::as_const(registers)) {
if (widget->objectName().startsWith(QStringLiteral("inReg"))) {
modbusDevice->setData(QModbusDataUnit::InputRegisters, quint16(widget->property("ID").toUInt()),
widget->text().toUShort(&ok, 16));
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);