diff --git a/ChangeLog b/ChangeLog index 2da7bc9a..ac85f4af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19263,3 +19263,5 @@ * Fixed a regression in rdimport(1) that caused null characters to be written to cart metadata fields when importing files containing an 'AIR1' RIFF chunk. +2019-11-26 Fred Gleason + * Removed 'Q3Socket' dependencies from 'RDCatchConnect'. diff --git a/lib/rdcatch_connect.cpp b/lib/rdcatch_connect.cpp index f7b3587a..927bb7ef 100644 --- a/lib/rdcatch_connect.cpp +++ b/lib/rdcatch_connect.cpp @@ -40,14 +40,14 @@ RDCatchConnect::RDCatchConnect(int serial,QObject *parent) // // TCP Connection // - cc_socket=new Q3Socket(this,"cc_socket"); + cc_socket=new QTcpSocket(this); connect(cc_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(cc_socket,SIGNAL(readyRead()),this,SLOT(readyData())); // // Start the heartbeat timer // - cc_heartbeat_timer=new QTimer(this,"cc_heartbeat_timer"); + cc_heartbeat_timer=new QTimer(this); connect(cc_heartbeat_timer,SIGNAL(timeout()), this,SLOT(heartbeatTimeoutData())); cc_heartbeat_timer->start(CC_HEARTBEAT_INTERVAL,true); diff --git a/lib/rdcatch_connect.h b/lib/rdcatch_connect.h index 156bf0f3..684af84f 100644 --- a/lib/rdcatch_connect.h +++ b/lib/rdcatch_connect.h @@ -18,11 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include -#include #include +#include +#include +#include #include #include @@ -77,7 +76,7 @@ class RDCatchConnect : public QObject private: void SendCommand(QString cmd); void DispatchCommand(); - Q3Socket *cc_socket; + QTcpSocket *cc_socket; QString cc_password; bool debug; char args[CC_MAX_ARGS][CC_MAX_LENGTH]; @@ -95,4 +94,4 @@ class RDCatchConnect : public QObject }; -#endif +#endif // RDCATCH_CONNECT_H