Merge the TCP and RTU read/write implementations.

This allows us to get rid of several public pure virtual
functions and to have the implementation in a single place
instead of duplicating it in several classes.

Change-Id: I88fb28a5d507c7b64d20bba73765534e2925165e
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h
index c8917d7..5cee130 100644
--- a/src/serialbus/qmodbusrtuserialmaster_p.h
+++ b/src/serialbus/qmodbusrtuserialmaster_p.h
@@ -213,7 +213,7 @@ public:
     }
 
     QModbusReply *enqueueRequest(const QModbusRequest &request, int slaveAddress,
-                                       const QModbusDataUnit unit)
+                                       const QModbusDataUnit &unit) Q_DECL_OVERRIDE
     {
         Q_Q(QModbusRtuSerialMaster);
 
@@ -244,7 +244,7 @@ public:
         return true;
     }
 
-    void handleResponseTimeout()
+    void handleResponseTimeout() Q_DECL_OVERRIDE
     {
         qCDebug(QT_MODBUS) << "Timeout of last request";
 
@@ -262,6 +262,14 @@ public:
                              QModbusClient::tr("Request timeout."));
     }
 
+    // TODO: Review once we have a transport layer in place.
+    bool isOpen() const Q_DECL_OVERRIDE
+    {
+        if (m_serialPort)
+            return m_serialPort->isOpen();
+        return false;
+    }
+
     QSerialPort *m_serialPort;
     QByteArray responseBuffer;
     QQueue<QueueElement> m_queue;