From b5ad09d92c7e8fe757c80a83d64710732a8eaad8 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paraelsystems.com>
Date: Mon, 17 Feb 2020 09:38:45 -0500
Subject: [PATCH] 2020-02-17 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed Q3Socket dependency from the Modbus switcher 	driver.

---
 ChangeLog        | 3 +++
 ripcd/modbus.cpp | 9 +++++----
 ripcd/modbus.h   | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1224e6d9..b8c51e53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19626,3 +19626,6 @@
 2020-02-17 Fred Gleason <fredg@paravelsystems.com>
 	* Removed Q3Socket dependency from the Software Authority switcher
 	driver.
+2020-02-17 Fred Gleason <fredg@paravelsystems.com>
+	* Removed Q3Socket dependency from the Modbus switcher
+	driver.
diff --git a/ripcd/modbus.cpp b/ripcd/modbus.cpp
index c5797404..9d5e4617 100644
--- a/ripcd/modbus.cpp
+++ b/ripcd/modbus.cpp
@@ -2,7 +2,7 @@
 //
 // A Rivendell switcher driver for Modbus TCP
 //
-//   (C) Copyright 2017-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -41,10 +41,11 @@ Modbus::Modbus(RDMatrix *matrix,QObject *parent)
   modbus_ip_address=matrix->ipAddress(RDMatrix::Primary);
   modbus_ip_port=matrix->ipPort(RDMatrix::Primary);
 
-  modbus_socket=new Q3Socket(this);
+  modbus_socket=new QTcpSocket(this);
   connect(modbus_socket,SIGNAL(connected()),this,SLOT(connectedData()));
   connect(modbus_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
-  connect(modbus_socket,SIGNAL(error(int)),this,SLOT(errorData(int)));
+  connect(modbus_socket,SIGNAL(error(QAbstractSocket::SocketError)),
+	  this,SLOT(errorData(QAbstractSocket::SocketError)));
   modbus_socket->connectToHost(modbus_ip_address.toString(),modbus_ip_port);
 
   modbus_poll_timer=new QTimer(this);
@@ -301,7 +302,7 @@ void Modbus::readyReadData()
 }
 
 
-void Modbus::errorData(int err)
+void Modbus::errorData(QAbstractSocket::SocketError err)
 {
   watchdogData();
 }
diff --git a/ripcd/modbus.h b/ripcd/modbus.h
index 2a28d611..8b966f14 100644
--- a/ripcd/modbus.h
+++ b/ripcd/modbus.h
@@ -2,7 +2,7 @@
 //
 // A Rivendell switcher driver for Modbus TCP
 //
-//   (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -25,7 +25,7 @@
 #include <vector>
 
 #include <qsignalmapper.h>
-#include <q3socket.h>
+#include <qtcpsocket.h>
 #include <qtimer.h>
 
 #include <rd.h>
@@ -53,7 +53,7 @@ class Modbus : public Switcher
  private slots:
   void connectedData();
   void readyReadData();
-  void errorData(int err);
+  void errorData(QAbstractSocket::SocketError err);
   void pollInputs();
   void resetStateData(int line);
   void watchdogData();
@@ -65,7 +65,7 @@ class Modbus : public Switcher
   int modbus_istate;
   int modbus_input_bytes;
   std::vector<char> modbus_input_states;
-  Q3Socket *modbus_socket;
+  QTcpSocket *modbus_socket;
   QTimer *modbus_poll_timer;
   QTimer *modbus_watchdog_timer;
   bool modbus_watchdog_active;