Refactor ambigious projectionsSoure to BroadcastSource

3 files changed, 6 insertions, 6 deletions

diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 67b25b2..70a1783 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -21,7 +21,7 @@ Client::Client(QSslSocket* socket) : _socket(socket)
 	assert(socket != NULL);
 	_authed = 0;
 	_desiredProjectionSource = 0;
-	_isProjectionSource = false;
+	_isBroadcastSource = false;
 	_currentProjectionSource = 0;
 	_vncPort = 0;
 	_activeVncClient = false;
diff --git a/src/server/net/client.h b/src/server/net/client.h
index c148e76..198b213 100644
--- a/src/server/net/client.h
+++ b/src/server/net/client.h
@@ -49,10 +49,10 @@ public:
 	// To be replaced by states
 	inline const bool isActiveVncClient() const { return _activeVncClient; }
 	inline const bool isActiveVncServer() const { return _vncPort > 0; }
-	inline const bool isProjectionSource() const { return _isProjectionSource; }
+	inline const bool isBroadcastSource() const { return _isBroadcastSource; }
 
 	// Setters
-	inline void setProjectionSource(bool enable) { _isProjectionSource = enable; }
+	inline void setBroadcastSource(bool enable) { _isBroadcastSource = enable; }
 	inline void setDesiredProjectionSource(int source) { _desiredProjectionSource = source; }
 	inline void setTutor(bool enable){ _isTutor = enable; }
 
@@ -83,7 +83,7 @@ private:
 	int            _timerIdAuthTimeout, _timerPingTimeout;
 	int            _id; // this client's unique id
 	int            _desiredProjectionSource;
-	bool           _isProjectionSource; // Tells whether this client is currently the VNC broadcast source.
+	bool           _isBroadcastSource; // Tells whether this client is currently the VNC broadcast source.
 	int            _currentProjectionSource;
 	QString        _vncRwPass, _vncRoPass;
 	int            _vncPort; // VNCserver state. Greater 0 -> active on this port. Equals 0 -> no server.
diff --git a/src/server/net/listenserver.cpp b/src/server/net/listenserver.cpp
index c8392df..8eb3750 100644
--- a/src/server/net/listenserver.cpp
+++ b/src/server/net/listenserver.cpp
@@ -19,7 +19,7 @@ ListenServer::~ListenServer()
 {
 	_server.close();
 	for (int i = 0; i < _clients.size(); ++i)
-		_clients[i]->deleteLater();
+		_clients[i]->deleteLater(); // TODO are there nullptrs?
 }
 
 /*
@@ -41,7 +41,7 @@ void ListenServer::newClientConnection()
 			sock->deleteLater();
 			continue;
 		}
-		Client* client = new Client(sock);
+		Client* client = new Client(sock); // TODO: what happens with disconnected clients
 		_clients.append(client); // create new client class and add to list
 		emit newClient(client);
 	}