Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-16 09:31:16 +01:00
Code Issues Projects Releases Wiki Activity

2019-11-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed 'Q3Socket' dependencies from 'RDCatchConnect'.
This commit is contained in:
Fred Gleason
2019-11-26 14:51:06 -08:00
parent 5b36f066b4
commit 6964405e0e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -19263,3 +19263,5 @@
* Fixed a regression in rdimport(1) that caused null characters to * Fixed a regression in rdimport(1) that caused null characters to
be written to cart metadata fields when importing files containing be written to cart metadata fields when importing files containing
an 'AIR1' RIFF chunk. an 'AIR1' RIFF chunk.
2019-11-26 Fred Gleason <fredg@paravelsystems.com>
* Removed 'Q3Socket' dependencies from 'RDCatchConnect'.

4
lib/rdcatch_connect.cpp
View File

@@ -40,14 +40,14 @@ RDCatchConnect::RDCatchConnect(int serial,QObject *parent)
// //
// TCP Connection // 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(connected()),this,SLOT(connectedData()));
connect(cc_socket,SIGNAL(readyRead()),this,SLOT(readyData())); connect(cc_socket,SIGNAL(readyRead()),this,SLOT(readyData()));
// //
// Start the heartbeat timer // 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()), connect(cc_heartbeat_timer,SIGNAL(timeout()),
this,SLOT(heartbeatTimeoutData())); this,SLOT(heartbeatTimeoutData()));
cc_heartbeat_timer->start(CC_HEARTBEAT_INTERVAL,true); cc_heartbeat_timer->start(CC_HEARTBEAT_INTERVAL,true);

11
lib/rdcatch_connect.h
View File

@@ -18,11 +18,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <qsqldatabase.h>
#include <qstring.h>
#include <qobject.h>
#include <q3socket.h>
#include <qlabel.h> #include <qlabel.h>
#include <qobject.h>
#include <qstring.h>
#include <qtcpsocket.h>
#include <rd.h> #include <rd.h>
#include <rddeck.h> #include <rddeck.h>
@@ -77,7 +76,7 @@ class RDCatchConnect : public QObject
private: private:
void SendCommand(QString cmd); void SendCommand(QString cmd);
void DispatchCommand(); void DispatchCommand();
Q3Socket *cc_socket; QTcpSocket *cc_socket;
QString cc_password; QString cc_password;
bool debug; bool debug;
char args[CC_MAX_ARGS][CC_MAX_LENGTH]; char args[CC_MAX_ARGS][CC_MAX_LENGTH];
@@ -95,4 +94,4 @@ class RDCatchConnect : public QObject
}; };
#endif #endif // RDCATCH_CONNECT_H