From 9dc0bd1bc90f4f95d53190eae77a25281a203a89 Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Sun, 25 Aug 2013 15:22:54 +0200 Subject: [PATCH] Added extra signal reemission Cleaned up unused signals --- src/qwebsocket_p.cpp | 2 +- src/qwebsocket_p.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/qwebsocket_p.cpp b/src/qwebsocket_p.cpp index 660c1f3..cad84fd 100644 --- a/src/qwebsocket_p.cpp +++ b/src/qwebsocket_p.cpp @@ -322,7 +322,7 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) connect(pTcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), q_ptr, SIGNAL(error(QAbstractSocket::SocketError))); connect(pTcpSocket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), q_ptr, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *))); connect(pTcpSocket, SIGNAL(readChannelFinished()), q_ptr, SIGNAL(readChannelFinished())); - //connect(pTcpSocket, SIGNAL(aboutToClose()), q_ptr, SIGNAL(aboutToClose())); + connect(pTcpSocket, SIGNAL(aboutToClose()), q_ptr, SIGNAL(aboutToClose())); //connect(pTcpSocket, SIGNAL(bytesWritten(qint64)), q_ptr, SIGNAL(bytesWritten(qint64))); //catch signals diff --git a/src/qwebsocket_p.h b/src/qwebsocket_p.h index a921827..d49788d 100644 --- a/src/qwebsocket_p.h +++ b/src/qwebsocket_p.h @@ -93,20 +93,6 @@ public Q_SLOTS: virtual void open(const QUrl &url, bool mask = true); void ping(); -Q_SIGNALS: - void aboutToClose(); - void connected(); - void disconnected(); - void stateChanged(QAbstractSocket::SocketState state); - void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *pAuthenticator); - void readChannelFinished(); - void textFrameReceived(QString frame, bool isLastFrame); - void binaryFrameReceived(QByteArray frame, bool isLastFrame); - void textMessageReceived(QString message); - void binaryMessageReceived(QByteArray message); - void error(QAbstractSocket::SocketError error); - void pong(quint64 elapsedTime); - private Q_SLOTS: void processData(); void processControlFrame(QWebSocketProtocol::OpCode opCode, QByteArray frame); -- 2.7.4