From 21eccc325173db1cbfc2fbcca34b4abdeb816254 Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Sat, 3 Aug 2013 21:29:29 +0200 Subject: [PATCH] Removed unneeded qDebug statements Connected binaryMessageReceived and textMessageReceived signals to those in DataProcessor (new) --- source/websocket.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/websocket.cpp b/source/websocket.cpp index f467544..2b1c37c 100644 --- a/source/websocket.cpp +++ b/source/websocket.cpp @@ -238,6 +238,8 @@ void WebSocket::makeConnections(const QTcpSocket *pTcpSocket) connect(pTcpSocket, SIGNAL(readyRead()), this, SLOT(processData())); connect(&m_dataProcessor, SIGNAL(frameReceived(WebSocketProtocol::OpCode, QByteArray, bool)), this, SLOT(processFrame(WebSocketProtocol::OpCode, QByteArray, bool))); + connect(&m_dataProcessor, SIGNAL(binaryMessageReceived(QByteArray)), this, SIGNAL(binaryMessageReceived(QByteArray))); + connect(&m_dataProcessor, SIGNAL(textMessageReceived(QString)), this, SIGNAL(textMessageReceived(QString))); connect(&m_dataProcessor, SIGNAL(errorEncountered(WebSocketProtocol::CloseCode,QString)), this, SLOT(close(WebSocketProtocol::CloseCode,QString))); } @@ -664,7 +666,6 @@ void WebSocket::processData() void WebSocket::processFrame(WebSocketProtocol::OpCode opCode, QByteArray frame, bool isLastFrame) { - //qDebug() << "Processing frame:" << frame << "opcode:" << opCode; switch (opCode) { case WebSocketProtocol::OC_BINARY: @@ -674,13 +675,11 @@ void WebSocket::processFrame(WebSocketProtocol::OpCode opCode, QByteArray frame, } case WebSocketProtocol::OC_TEXT: { - //qDebug() << "Processing text frame:" << frame << "opcode:" << opCode; Q_EMIT textFrameReceived(QString::fromLatin1(frame), isLastFrame); break; } case WebSocketProtocol::OC_PING: { - //qDebug() << "Processing ping frame:" << frame; quint32 maskingKey = 0; if (m_mustMask) { @@ -710,7 +709,6 @@ void WebSocket::processFrame(WebSocketProtocol::OpCode opCode, QByteArray frame, { closeCode = qFromBigEndian(reinterpret_cast(frame.constData())); closeReason = QString::fromUtf8(frame.remove(0, 2)); - //qDebug() << "Received closing handshake with code" << closeCode; if (!WebSocketProtocol::isCloseCodeValid(closeCode)) { closeCode = WebSocketProtocol::CC_PROTOCOL_ERROR; -- 2.7.4