Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 23:30:20 +01:00
Code Issues Projects Releases Wiki Activity

2020-02-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed Q3Socket dependency from the vGuest switcher driver.
This commit is contained in:
Fred Gleason
2020-02-17 10:21:01 -05:00
parent ca949a8001
commit 15cd9954a0
5 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/rdsocket.cpp
View File

@@ -1,8 +1,8 @@
// rdsocket.cpp
//
// A QSocket object with connection-ID.
// A QTcpSocket object with connection-ID.
//
// (C) Copyright 2002,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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 Library General Public License
@@ -21,22 +21,22 @@
#include <stdlib.h>
#include <stdio.h>
#include <qwidget.h>
#include <q3socket.h>
#include <rdsocket.h>
#include "rdsocket.h"
RDSocket::RDSocket(int id,QObject *parent)
: Q3Socket(parent)
: QTcpSocket(parent)
{
id_num=id;
connect(this,SIGNAL(hostFound()),this,SLOT(hostFoundData()));
connect(this,SIGNAL(connected()),this,SLOT(connectedData()));
connect(this,SIGNAL(connectionClosed()),this,SLOT(connectionClosedData()));
connect(this,SIGNAL(disconnected()),this,SLOT(connectionClosedData()));
connect(this,SIGNAL(delayedCloseFinished()),
this,SLOT(delayedCloseFinishedData()));
connect(this,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(this,SIGNAL(bytesWritten(int)),this,SLOT(bytesWrittenData(int)));
connect(this,SIGNAL(error(int)),this,SLOT(errorData(int)));
connect(this,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
}
@@ -76,7 +76,7 @@ void RDSocket::bytesWrittenData(int nbytes)
}
void RDSocket::errorData(int error)
void RDSocket::errorData(QAbstractSocket::SocketError error)
{
emit errorID(error,id_num);
}

10
lib/rdsocket.h
View File

@@ -2,7 +2,7 @@
//
// A QSocket object with connection-ID.
//
// (C) Copyright 2002,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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 Library General Public License
@@ -22,9 +22,9 @@
#define RDSOCKET_H
#include <qobject.h>
#include <q3socket.h>
#include <qtcpsocket.h>
class RDSocket : public Q3Socket
class RDSocket : public QTcpSocket
{
Q_OBJECT
public:
@@ -37,7 +37,7 @@ class RDSocket : public Q3Socket
void delayedCloseFinishedID(int id);
void readyReadID(int id);
void bytesWrittenID(int nbytes,int id);
void errorID(int error,int id);
void errorID(QAbstractSocket::SocketError error,int id);
private slots:
void hostFoundData();
@@ -46,7 +46,7 @@ class RDSocket : public Q3Socket
void delayedCloseFinishedData();
void readyReadData();
void bytesWrittenData(int nbytes);
void errorData(int error);
void errorData(QAbstractSocket::SocketError error);
private:
int id_num;