summaryrefslogtreecommitdiffstats
path: root/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'examples/serialbus/modbus/adueditor/modbustcpclient_p.h')
-rw-r--r--examples/serialbus/modbus/adueditor/modbustcpclient_p.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index 9d091d8..a563b6f 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
@@ -73,7 +73,7 @@ public:
QDataStream output(&buffer, QIODevice::WriteOnly);
output << m_tId << m_pId << m_length << m_uId << request;
- int writtenBytes = m_socket->write(buffer);
+ qint64 writtenBytes = m_socket->write(buffer);
if (writtenBytes == -1 || writtenBytes < buffer.size()) {
Q_Q(ModbusTcpClient);
qDebug() << "Cannot write request to socket.";
@@ -91,14 +91,13 @@ public:
Q_Q(ModbusTcpClient);
auto reply = new QModbusReply(type, m_uId, q);
- const auto element = QueueElement{ reply, request, unit, m_numberOfRetries,
- m_responseTimeoutDuration };
+ const auto element = QueueElement{reply, request, unit, m_numberOfRetries,
+ m_responseTimeoutDuration};
m_transactionStore.insert(m_tId, element);
- using TypeId = void (QTimer::*)(int);
q->connect(q, &QModbusClient::timeoutChanged,
- element.timer.data(), static_cast<TypeId>(&QTimer::setInterval));
- QObject::connect(element.timer.data(), &QTimer::timeout, [this, writeToSocket]() {
+ element.timer.data(), QOverload<int>::of(&QTimer::setInterval));
+ q->connect(element.timer.data(), &QTimer::timeout, [this, writeToSocket]() {
if (!m_transactionStore.contains(m_tId))
return;
@@ -120,13 +119,13 @@ public:
}
});
element.timer->start();
- return reply;
+ return reply;
}
- quint16 m_tId;
- quint16 m_pId;
- quint16 m_length;
- quint8 m_uId;
+ quint16 m_tId = 0;
+ quint16 m_pId = 0;
+ quint16 m_length = 0;
+ quint8 m_uId = 0;
};
#endif // MODBUSTCPCLIENT_P_H