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/client/clientapp/clientapp.cpp | 8 ++++----
 src/client/clientapp/clientapp.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/client/clientapp')

diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 2f65bd1..962ec42 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -5,7 +5,7 @@
 #include "../net/serverconnection.h"
 
 ClientApp::ClientApp(int& argc, char** argv)
-	: QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _connection(NULL), _isManagerPc(false)
+	: QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _connection(nullptr), _isManagerPc(false)
 {
 	/* some values */
 	setOrganizationName("openslx");
@@ -31,7 +31,7 @@ ClientApp::ClientApp(int& argc, char** argv)
 
 	readIsManagerPc();
 
-	_connectWindow = new ConnectWindow(NULL);
+	_connectWindow = new ConnectWindow(nullptr);
 	connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(connected(ServerConnection*)));
 	if (_connectionMode == ConnectionMode::Auto) {
 		_toolbar = new Toolbar(true); // auto connect client without session ID.
@@ -114,10 +114,10 @@ void ClientApp::connected(ServerConnection* connection)
 
 void ClientApp::disconnected(ServerConnection* connection)
 {
-	if (connection != NULL)
+	if (connection != nullptr)
 		connection->blockSignals(true);
 	if (_connection == connection) {
-		_connection = NULL;
+		_connection = nullptr;
 	}
 }
 
diff --git a/src/client/clientapp/clientapp.h b/src/client/clientapp/clientapp.h
index 0f7cb5b..91dccf3 100644
--- a/src/client/clientapp/clientapp.h
+++ b/src/client/clientapp/clientapp.h
@@ -58,7 +58,7 @@ public:
 
 	bool isConfiguredAsManager() { return _isManagerPc; }
 
-	bool isConnectedToLocalManager() { return _connection != NULL && _connection->isLocalConnection(); }
+	bool isConnectedToLocalManager() { return _connection != nullptr && _connection->isLocalConnection(); }
 
 private slots:
 
-- 
cgit v1.2.3-55-g7522