diff --git a/ChangeLog b/ChangeLog index 2979b1f8..34d75ae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19618,3 +19618,8 @@ 2020-02-17 Fred Gleason * Cleaned up the tty device access mode in the vGuest switcher driver. +2020-02-17 Fred Gleason + * Removed Q3Socket dependency from the WheatNet SLIO switcher + driver. + * Removed Q3Socket dependency from the WheatNet LIO switcher + driver. diff --git a/ripcd/wheatnet_lio.cpp b/ripcd/wheatnet_lio.cpp index aa00c44a..6af6c595 100644 --- a/ripcd/wheatnet_lio.cpp +++ b/ripcd/wheatnet_lio.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for WheatNet LIO // -// (C) Copyright 2017-2019 Fred Gleason +// (C) Copyright 2017-2020 Fred Gleason // // 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 @@ -34,10 +34,11 @@ WheatnetLio::WheatnetLio(RDMatrix *matrix,QObject *parent) lio_ip_port=matrix->ipPort(RDMatrix::Primary); lio_card=matrix->card(); - lio_socket=new Q3Socket(this); + lio_socket=new QTcpSocket(this); connect(lio_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(lio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); - connect(lio_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); + connect(lio_socket,SIGNAL(error(QAbstractSocket::SocketError)), + this,SLOT(errorData(QAbstractSocket::SocketError))); lio_socket->connectToHost(lio_ip_address.toString(),lio_ip_port); lio_poll_timer=new QTimer(this); @@ -204,7 +205,7 @@ void WheatnetLio::readyReadData() } -void WheatnetLio::errorData(int err) +void WheatnetLio::errorData(QAbstractSocket::SocketError err) { watchdogData(); } diff --git a/ripcd/wheatnet_lio.h b/ripcd/wheatnet_lio.h index f71531d6..bb17ee5a 100644 --- a/ripcd/wheatnet_lio.h +++ b/ripcd/wheatnet_lio.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for Wheatnet LIO devices // -// (C) Copyright 2017 Fred Gleason +// (C) Copyright 2017-2020 Fred Gleason // // 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 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ class WheatnetLio : public Switcher private slots: void connectedData(); void readyReadData(); - void errorData(int err); + void errorData(QAbstractSocket::SocketError err); void resetStateData(int line); void pollData(); void watchdogData(); @@ -63,7 +63,7 @@ class WheatnetLio : public Switcher void ProcessLioevent(int chan,QString &cmd); void ProcessCommand(const QString &cmd); void SendCommand(const QString &cmd); - Q3Socket *lio_socket; + QTcpSocket *lio_socket; QTimer *lio_watchdog_timer; bool lio_watchdog_active; QHostAddress lio_ip_address; diff --git a/ripcd/wheatnet_slio.cpp b/ripcd/wheatnet_slio.cpp index 87589a57..c779e207 100644 --- a/ripcd/wheatnet_slio.cpp +++ b/ripcd/wheatnet_slio.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for WheatNet SLIO // -// (C) Copyright 2017-2019 Fred Gleason +// (C) Copyright 2017-2020 Fred Gleason // // 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 @@ -33,10 +33,11 @@ WheatnetSlio::WheatnetSlio(RDMatrix *matrix,QObject *parent) slio_ip_address=matrix->ipAddress(RDMatrix::Primary); slio_ip_port=matrix->ipPort(RDMatrix::Primary); - slio_socket=new Q3Socket(this); + slio_socket=new QTcpSocket(this); connect(slio_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(slio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); - connect(slio_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); + connect(slio_socket,SIGNAL(error(QAbstractSocket::SocketError)), + this,SLOT(errorData(QAbstractSocket::SocketError))); slio_socket->connectToHost(slio_ip_address.toString(),slio_ip_port); slio_poll_timer=new QTimer(this); @@ -201,7 +202,7 @@ void WheatnetSlio::readyReadData() } -void WheatnetSlio::errorData(int err) +void WheatnetSlio::errorData(QAbstractSocket::SocketError err) { watchdogData(); } diff --git a/ripcd/wheatnet_slio.h b/ripcd/wheatnet_slio.h index 6dfa6807..97a5e2a9 100644 --- a/ripcd/wheatnet_slio.h +++ b/ripcd/wheatnet_slio.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for Wheatnet SLIO devices // -// (C) Copyright 2017 Fred Gleason +// (C) Copyright 2017-2020 Fred Gleason // // 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 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ class WheatnetSlio : public Switcher private slots: void connectedData(); void readyReadData(); - void errorData(int err); + void errorData(QAbstractSocket::SocketError err); void resetStateData(int line); void pollData(); void watchdogData(); @@ -63,7 +63,7 @@ class WheatnetSlio : public Switcher void ProcessSlioevent(int chan,QString &cmd); void ProcessCommand(const QString &cmd); void SendCommand(const QString &cmd); - Q3Socket *slio_socket; + QTcpSocket *slio_socket; QTimer *slio_watchdog_timer; bool slio_watchdog_active; QHostAddress slio_ip_address;