From e9b4cb4721b7c7f02728e22f92f5ad7a94828521 Mon Sep 17 00:00:00 2001
From: sr
Date: Tue, 5 Feb 2013 19:48:39 +0100
Subject: [SERVER] Go back from ClientId to int, so queued signal/slot
 connections work

---
 src/server/net/client.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 26c1dd2..d6002a6 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -16,7 +16,7 @@
 
 #define CHALLENGE_LEN 20
 
-ClientId Client::_clientIdCounter = 0;
+int Client::_clientIdCounter = 0;
 
 Client::Client(QSslSocket* socket) :
 	_socket(socket), _authed(0), _timerDelete(0), _desiredProjectionSource(0), _isProjectionSource(false),
@@ -198,12 +198,12 @@ void Client::handleMsg()
 		{
 			// Client tells us that it started or stopped displaying a remote screen via VNC
 			_activeVncClient = (_fromClient.getFieldString("ENABLED").toInt() != 0);
-			const ClientId other = (ClientId)_fromClient.getFieldString("CLIENTID").toInt();
+			const int other = (int)_fromClient.getFieldString("CLIENTID").toInt();
 
 			if (!_activeVncClient && other == 0)
 				_desiredProjectionSource = 0;
 
-			ClientId last = _currentProjectionSource;
+			int last = _currentProjectionSource;
 			if (!_activeVncClient)
 				_currentProjectionSource = 0;
 			else
-- 
cgit v1.2.3-55-g7522