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/util/platform/blankscreen.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/client/util/platform/blankscreen.cpp')

diff --git a/src/client/util/platform/blankscreen.cpp b/src/client/util/platform/blankscreen.cpp
index ee644ca..bf34614 100644
--- a/src/client/util/platform/blankscreen.cpp
+++ b/src/client/util/platform/blankscreen.cpp
@@ -16,11 +16,11 @@ struct BlankScreen_Sysdep {
 	Display *dpy;
 };
 
-BlankScreen::BlankScreen() : QDialog(NULL)
+BlankScreen::BlankScreen() : QDialog(nullptr)
 {
 	_sysdep = new BlankScreen_Sysdep;
-	_sysdep->dpy = XOpenDisplay(NULL);
-	if (_sysdep->dpy == NULL)
+	_sysdep->dpy = XOpenDisplay(nullptr);
+	if (_sysdep->dpy == nullptr)
 		return;
 
 	setWindowFlags(Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint);
@@ -35,7 +35,7 @@ BlankScreen::BlankScreen() : QDialog(NULL)
 BlankScreen::~BlankScreen()
 {
 	unlock();
-	if (_sysdep->dpy != NULL) {
+	if (_sysdep->dpy != nullptr) {
 		XCloseDisplay(_sysdep->dpy);
 	}
 	delete _sysdep;
@@ -45,7 +45,7 @@ bool BlankScreen::lock(const QString& message)
 {
 	if (_locked)
 		return true;
-	if (_sysdep->dpy == NULL)
+	if (_sysdep->dpy == nullptr)
 		return false;
 
 	_message = message;
@@ -73,7 +73,7 @@ bool BlankScreen::unlock()
 	this->hide();
 	if (!_locked)
 		return true;
-	if (_sysdep->dpy == NULL)
+	if (_sysdep->dpy == nullptr)
 		return false;
 
 	// ungrabbing of keyboard and mouse
-- 
cgit v1.2.3-55-g7522