summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketserver_p.cpp
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2014-01-12 20:28:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-12 20:28:52 +0100
commit98b3f19b107b3b30323caabc94ace06f4a51d38a (patch)
treefcc1c2c84dcda81a59f225aa35636dd0ad72ab3a /src/websockets/qwebsocketserver_p.cpp
parentd32da4165264b9502a636ee5f9e11d80e25f09d2 (diff)
downloadqtwebsockets-98b3f19b107b3b30323caabc94ace06f4a51d38a.tar.gz
Limit line length to 100 characters.
Change-Id: I9da963570b174b9a5a33e65cf144402677b4bab5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketserver_p.cpp')
-rw-r--r--src/websockets/qwebsocketserver_p.cpp31
1 files changed, 21 insertions, 10 deletions
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index d5d98bd..0eecd15 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -60,8 +60,10 @@ QT_BEGIN_NAMESPACE
/*!
\internal
*/
-QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, QWebSocketServerPrivate::SecureMode secureMode,
- QWebSocketServer * const pWebSocketServer, QObject *parent) :
+QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName,
+ QWebSocketServerPrivate::SecureMode secureMode,
+ QWebSocketServer * const pWebSocketServer,
+ QObject *parent) :
QObject(parent),
q_ptr(pWebSocketServer),
m_pTcpServer(Q_NULLPTR),
@@ -84,14 +86,17 @@ QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, QWeb
m_pTcpServer = pSslServer;
if (Q_LIKELY(m_pTcpServer)) {
connect(pSslServer, SIGNAL(newEncryptedConnection()), this, SLOT(onNewConnection()));
- connect(pSslServer, SIGNAL(peerVerifyError(QSslError)), q_ptr, SIGNAL(peerVerifyError(QSslError)));
- connect(pSslServer, SIGNAL(sslErrors(QList<QSslError>)), q_ptr, SIGNAL(sslErrors(QList<QSslError>)));
+ connect(pSslServer, SIGNAL(peerVerifyError(QSslError)), q_ptr,
+ SIGNAL(peerVerifyError(QSslError)));
+ connect(pSslServer, SIGNAL(sslErrors(QList<QSslError>)), q_ptr,
+ SIGNAL(sslErrors(QList<QSslError>)));
}
#else
qFatal("SSL not supported on this platform.");
#endif
}
- connect(m_pTcpServer, SIGNAL(acceptError(QAbstractSocket::SocketError)), q_ptr, SIGNAL(acceptError(QAbstractSocket::SocketError)));
+ connect(m_pTcpServer, SIGNAL(acceptError(QAbstractSocket::SocketError)), q_ptr,
+ SIGNAL(acceptError(QAbstractSocket::SocketError)));
}
/*!
@@ -379,8 +384,10 @@ void QWebSocketServerPrivate::handshakeReceived()
if (m_pendingConnections.length() >= maxPendingConnections()) {
pTcpSocket->close();
- qWarning() << tr("Too many pending connections: new websocket connection not accepted.");
- setError(QWebSocketProtocol::CC_ABNORMAL_DISCONNECTION, tr("Too many pending connections."));
+ qWarning() <<
+ tr("Too many pending connections: new websocket connection not accepted.");
+ setError(QWebSocketProtocol::CC_ABNORMAL_DISCONNECTION,
+ tr("Too many pending connections."));
return;
}
@@ -405,14 +412,17 @@ void QWebSocketServerPrivate::handshakeReceived()
httpStream.flush();
if (response.canUpgrade()) {
- QWebSocket *pWebSocket = QWebSocketPrivate::upgradeFrom(pTcpSocket, request, response);
+ QWebSocket *pWebSocket = QWebSocketPrivate::upgradeFrom(pTcpSocket,
+ request,
+ response);
if (pWebSocket) {
pWebSocket->setParent(this);
addPendingConnection(pWebSocket);
Q_EMIT q->newConnection();
success = true;
} else {
- setError(QWebSocketProtocol::CC_ABNORMAL_DISCONNECTION, tr("Upgrading to websocket failed."));
+ setError(QWebSocketProtocol::CC_ABNORMAL_DISCONNECTION,
+ tr("Upgrading to websocket failed."));
}
}
else {
@@ -427,7 +437,8 @@ void QWebSocketServerPrivate::handshakeReceived()
pTcpSocket->close();
}
} else {
- qWarning() << tr("Sender socket is NULL. This should not happen, otherwise it is a Qt bug!!!");
+ qWarning() <<
+ tr("Sender socket is NULL. This should not happen, otherwise it is a Qt bug!!!");
}
}