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/serverapp/serverapp.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server/serverapp/serverapp.cpp')

diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp
index 7ee06e0..f680f89 100644
--- a/src/server/serverapp/serverapp.cpp
+++ b/src/server/serverapp/serverapp.cpp
@@ -7,7 +7,7 @@ static QSize minimalGridSize(const QMap<QString, QPoint>& clientPositions, QSize
 
 ServerApp::ServerApp(int& argc, char** argv)
 	: QApplication(argc, argv),
-		_mainWindow(NULL),
+		_mainWindow(nullptr),
 		_managerOnly(false),
 		_isExam(false)
 {
@@ -132,8 +132,8 @@ const Room* ServerApp::getCurrentRoom()
 	if (_rooms.contains(_currentRoom)) {
 		return _rooms[_currentRoom];
 	} else {
-		static Room* defaultRoom = NULL;
-		if (defaultRoom == NULL) {
+		static Room* defaultRoom = nullptr;
+		if (defaultRoom == nullptr) {
 			defaultRoom = new Room(QMap<QString,
 			                       QPoint>(), QSize(8, 6), QSize(1, 1), "", "");
 		}
-- 
cgit v1.2.3-55-g7522