diff --git a/ChangeLog b/ChangeLog index 70f2a30d..6ff5c936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19633,3 +19633,6 @@ * Removed Q3Socket dependency from the Quartz 1 switcher driver. 2020-02-17 Fred Gleason * Removed Q3Socket dependency from the Harlond switcher driver. +2020-02-17 Fred Gleason + * Removed Q3Socket dependency from the Broadcast Tools Sentinel4Web + switcher driver. diff --git a/ripcd/btsentinel4web.cpp b/ripcd/btsentinel4web.cpp index 806e817a..d15d853e 100644 --- a/ripcd/btsentinel4web.cpp +++ b/ripcd/btsentinel4web.cpp @@ -2,7 +2,7 @@ // // Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-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 @@ -36,9 +36,10 @@ BtSentinel4Web::BtSentinel4Web(RDMatrix *matrix,QObject *parent) // // Socket // - bt_socket=new Q3Socket(this); + bt_socket=new QTcpSocket(this); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); - connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); + connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)), + this,SLOT(errorData(QAbstractSocket::SocketError))); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); // @@ -139,7 +140,7 @@ void BtSentinel4Web::connectedData() } -void BtSentinel4Web::errorData(int err) +void BtSentinel4Web::errorData(QAbstractSocket::SocketError err) { watchdogData(); } @@ -167,9 +168,10 @@ void BtSentinel4Web::watchdogData() void BtSentinel4Web::watchdogResetData() { delete bt_socket; - bt_socket=new Q3Socket(this); + bt_socket=new QTcpSocket(this); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); - connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); + connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)), + this,SLOT(errorData(QAbstractSocket::SocketError))); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); bt_socket->connectToHost(bt_address.toString(),bt_port); diff --git a/ripcd/btsentinel4web.h b/ripcd/btsentinel4web.h index 2b30030c..cf6db4d5 100644 --- a/ripcd/btsentinel4web.h +++ b/ripcd/btsentinel4web.h @@ -2,7 +2,7 @@ // // Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher // -// (C) Copyright 2002-2013,2016 Fred Gleason +// (C) Copyright 2002-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 @@ -25,8 +25,8 @@ #include -#include #include +#include #include #include @@ -56,13 +56,13 @@ class BtSentinel4Web : public Switcher private slots: void connectedData(); - void errorData(int err); + void errorData(QAbstractSocket::SocketError err); void readyReadData(); void watchdogData(); void watchdogResetData(); private: - Q3Socket *bt_socket; + QTcpSocket *bt_socket; QHostAddress bt_address; uint16_t bt_port; QTimer *bt_watchdog_timer;