From acfb87df32849ab82823bdb6ef7bc7b9d411b1ed Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Fri, 25 Apr 2014 14:01:48 +0200
Subject: Thrown out redundant slots.

---
 src/server/net/client.cpp | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'src/server/net/client.cpp')

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();
 	}
 }
-- 
cgit v1.2.3-55-g7522