From a71b86f82e7ae63ed550d7878c2ab67bde46643f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Wed, 12 May 2021 10:31:07 +0200
Subject: [PATCH] Fix modbus tcp master code errors from rebase

---
 modbus/modbustcpmaster.cpp | 5 +++++
 modbus/modbustcpmaster.h   | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modbus/modbustcpmaster.cpp b/modbus/modbustcpmaster.cpp
index 880f4c6..c6bced0 100644
--- a/modbus/modbustcpmaster.cpp
+++ b/modbus/modbustcpmaster.cpp
@@ -154,6 +154,11 @@ void ModbusTCPMaster::setTimeout(int timeout)
     m_modbusTcpClient->setTimeout(timeout);
 }
 
+int ModbusTCPMaster::timeout()
+{
+    return m_modbusTcpClient->timeout();
+}
+
 QString ModbusTCPMaster::errorString() const
 {
     return m_modbusTcpClient->errorString();
diff --git a/modbus/modbustcpmaster.h b/modbus/modbustcpmaster.h
index 12f051c..1ecdb51 100644
--- a/modbus/modbustcpmaster.h
+++ b/modbus/modbustcpmaster.h
@@ -108,7 +108,6 @@ signals:
     void readRequestError(const QUuid &requestId, const QString &error);
 
     void readRequestExecuted(const QUuid &requestId, bool success);
-    void readRequestError(const QUuid &requestId, const QString &error);
 
     void receivedCoil(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values);
     void receivedDiscreteInput(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values);