diff options
author | Manuel Schneider | 2014-04-25 14:01:48 +0200 |
---|---|---|
committer | Manuel Schneider | 2014-04-25 14:01:48 +0200 |
commit | acfb87df32849ab82823bdb6ef7bc7b9d411b1ed (patch) | |
tree | e39b282a077ae36e10b1259a9bf41903179960e9 /src/server/net/client.cpp | |
parent | More meaningful name (diff) | |
download | pvs2-acfb87df32849ab82823bdb6ef7bc7b9d411b1ed.tar.gz pvs2-acfb87df32849ab82823bdb6ef7bc7b9d411b1ed.tar.xz pvs2-acfb87df32849ab82823bdb6ef7bc7b9d411b1ed.zip |
Thrown out redundant slots.
Diffstat (limited to 'src/server/net/client.cpp')
-rw-r--r-- | src/server/net/client.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 047bd05..5283246 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -27,10 +27,14 @@ Client::Client(QSslSocket* socket) : _ip = _socket->peerAddress().toString(); qDebug("*** Client %s created.", qPrintable(_ip)); // Connect important signals - connect(_socket, SIGNAL(disconnected()), this, SLOT(onClosed())); - connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(onError(QAbstractSocket::SocketError))); - connect(_socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(onSslErrors(const QList<QSslError> &))); - connect(_socket, SIGNAL(readyRead()), this, SLOT(onDataArrival())); + connect(_socket, SIGNAL(disconnected()), + this, SLOT(disconnect())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(disconnect())); + connect(_socket, SIGNAL(sslErrors(const QList<QSslError> &)), + this, SLOT(disconnect())); + connect(_socket, SIGNAL(readyRead()), + this, SLOT(onDataArrival())); // Send challenge _challenge.resize(CHALLENGE_LEN); for (int i = 0; i < CHALLENGE_LEN; ++i) @@ -145,21 +149,6 @@ void Client::onDataArrival() } } -void Client::onSslErrors(const QList<QSslError> & errors) -{ - this->disconnect(); -} - -void Client::onClosed() -{ - this->disconnect(); -} - -void Client::onError(QAbstractSocket::SocketError errcode) -{ - this->disconnect(); -} - void Client::handleMsg() { _pingTimeout = QDateTime::currentMSecsSinceEpoch() + PING_TIMEOUT_MS; @@ -337,13 +326,10 @@ void Client::disconnect() { if (_timerDelete == 0) { - // Order of the follwing 3 is important - emit disconnected(); - emit vncClientStateChange(this, _currentProjectionSource); - emit vncServerStateChange(this); _timerDelete = startTimer(500); qDebug("*** Client %s disconnected.", qPrintable(_ip)); _socket->blockSignals(true); _socket->abort(); + emit disconnected(); } } |