1 files changed, 12 insertions, 13 deletions

diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index c1b37a8..a9170f9 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.";
@@ -82,7 +82,7 @@ public:
                 return false;
             }
             qDebug() << "Sent TCP ADU:" << buffer.toHex();
-            qDebug() << "Sent TCP PDU:" << request << "with tId:" << hex << m_tId;
+            qDebug() << "Sent TCP PDU:" << request << "with tId:" << Qt::hex << m_tId;
             return true;
         };
 
@@ -91,13 +91,12 @@ 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));
+                   element.timer.data(), QOverload<int>::of(&QTimer::setInterval));
         QObject::connect(element.timer.data(), &QTimer::timeout, q, [this, writeToSocket]() {
             if (!m_transactionStore.contains(m_tId))
                 return;
@@ -112,21 +111,21 @@ public:
                     return;
                 m_transactionStore.insert(m_tId, elem);
                 elem.timer->start();
-                qDebug() << "Resend request with tId:" << hex << m_tId;
+                qDebug() << "Resend request with tId:" << Qt::hex << m_tId;
             } else {
-                qDebug() << "Timeout of request with tId:" << hex << m_tId;
+                qDebug() << "Timeout of request with tId:" << Qt::hex << m_tId;
                 elem.reply->setError(QModbusDevice::TimeoutError,
                     QModbusClient::tr("Request timeout."));
             }
         });
         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