From 9ba63d1460db41c219b638212b42476164fcfdff Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 24 Jul 2018 13:08:25 +0200
Subject: Update code style, fix compiler warnings

- Use nullptr instead of NULL for better warnings in case of mistakes
- Get rid of VLAs which are not in C++11 actually
- Fix implicit signed <-> unsigned mismatches by adding checks and casts
---
 src/server/net/certmanager.cpp  |  2 +-
 src/server/net/client.cpp       |  2 +-
 src/server/net/listenserver.cpp |  2 +-
 src/server/net/sslserver.cpp    | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/server/net')

diff --git a/src/server/net/certmanager.cpp b/src/server/net/certmanager.cpp
index a7df6cc..a503088 100644
--- a/src/server/net/certmanager.cpp
+++ b/src/server/net/certmanager.cpp
@@ -66,7 +66,7 @@ bool getPrivateKeyAndCert(const QString &name, QSslKey &key, QSslCertificate &ce
 
 void fatal()
 {
-	QMessageBox::critical(NULL, QCoreApplication::trUtf8("OpenSSL error", "CertManager"),
+	QMessageBox::critical(nullptr, QCoreApplication::trUtf8("OpenSSL error", "CertManager"),
 			QCoreApplication::trUtf8("Could not generate certificates for secure connections.\n"
 			"PVS will not work.\n\n"
 			"Press OK to quit.", "CertManager"));
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index c11cb63..9e96dec 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -19,7 +19,7 @@ int Client::_clientIdCounter = 0;
 /******************************************************************************/
 Client::Client(QTcpSocket* socket) : _socket(socket)
 {
-	assert(socket != NULL);
+	assert(socket != nullptr);
 	_authed = 0;
 	_projectionSource = 0;
 	_desiredSource = 0;
diff --git a/src/server/net/listenserver.cpp b/src/server/net/listenserver.cpp
index 0a585c7..628b62d 100644
--- a/src/server/net/listenserver.cpp
+++ b/src/server/net/listenserver.cpp
@@ -31,7 +31,7 @@ ListenServer::~ListenServer()
 void ListenServer::newClientConnection()
 {
 	QTcpSocket* sock;
-	while ((sock = _server.nextPendingConnection()) != NULL) {
+	while ((sock = _server.nextPendingConnection()) != nullptr) {
 		Client* client = new Client(sock); // TODO: what happens with disconnected clients
 		emit newClient(client);
 	}
diff --git a/src/server/net/sslserver.cpp b/src/server/net/sslserver.cpp
index 0e0639e..c11f0ae 100644
--- a/src/server/net/sslserver.cpp
+++ b/src/server/net/sslserver.cpp
@@ -20,7 +20,7 @@
 #include "certmanager.h"
 #include <unistd.h>
 
-SslServer::SslServer() : QTcpServer(NULL)
+SslServer::SslServer() : QTcpServer(nullptr)
 {
 	_tmr = startTimer(5123);
 }
@@ -43,10 +43,10 @@ void SslServer::incomingConnection(qintptr socketDescriptor)
 		if (++certFails > 5) {
 			CertManager::fatal();
 		}
-		::close(socketDescriptor);
+		::close((int)socketDescriptor);
 		return;
 	}
-	QSslSocket *serverSocket = new QSslSocket(NULL);
+	QSslSocket *serverSocket = new QSslSocket(nullptr);
 	connect(serverSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
 	connect(serverSocket, SIGNAL(disconnected()), this, SLOT(sock_closed()));
 	connect(serverSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError)));
@@ -70,7 +70,7 @@ void SslServer::incomingConnection(qintptr socketDescriptor)
 	}
 }
 
-void SslServer::sslErrors(const QList<QSslError> &errors)
+void SslServer::sslErrors(const QList<QSslError>& /* errors */)
 {
 	/*
 	qDebug() << "Client caused sslErrors before connection:";
@@ -134,6 +134,6 @@ QTcpSocket* SslServer::nextPendingConnection()
 			return sock;
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
-- 
cgit v1.2.3-55-g7522