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

(limited to 'src/server/mainwindow/mainwindow.h')

diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 4e99747..43804a7 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -44,8 +44,8 @@ private:
 	Qt::ToolBarArea   _tbArea;
 	int  _tilesX;
 	int  _tilesY;
-	QImage* _backgroundImage = NULL;
-	QLabel* _examModeLabel = NULL;
+	QImage* _backgroundImage = nullptr;
+	QLabel* _examModeLabel = nullptr;
 
 
 	/* virtual columns to preserve the aspect ratio of the loaded room */
@@ -79,7 +79,7 @@ private:
 
 	QPoint closestFreeSlot(QPoint preferredPixels, ConnectionFrame* toIgnore);
 	void placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferred = QPoint(-1, -1));
-	ConnectionFrame* createFrame(const QString &computerId = QString(), const QPoint *gridPosition = NULL, bool fromRoomplan = false);
+	ConnectionFrame* createFrame(const QString &computerId = QString(), const QPoint *gridPosition = nullptr, bool fromRoomplan = false);
 	void savePosition(ConnectionFrame *cf);
 	void startVncServerIfNecessary(int from);
 	void tellClientCurrentSituation(Client* client);
-- 
cgit v1.2.3-55-g7522