X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;fp=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=fd6048566d3faec09b0108440e7b4f008a985a33;hp=edc6a12a0d48e2bd433e467a084b7c4ff689cdc6;hb=507fa60f32bd3f64840a2cdd1be5d68478432b55;hpb=cea95778acfd6e172639cafd7ad249cc13ceb2a6

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index edc6a12..fd60485 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -87,7 +87,7 @@ Display::Display(const string &disp_name):
 	priv(new Private)
 {
 	if(disp_name.empty())
-		priv->display = XOpenDisplay(0);
+		priv->display = XOpenDisplay(nullptr);
 	else
 		priv->display = XOpenDisplay(disp_name.c_str());
 	if(!priv->display)
@@ -119,7 +119,7 @@ Display::Display(const string &disp_name):
 			for(int i=0; i<res->noutput; ++i)
 			{
 				XRROutputInfo *output = XRRGetOutputInfo(priv->display, res, res->outputs[i]);
-				XRRCrtcInfo *crtc = (output->crtc ? XRRGetCrtcInfo(priv->display, res, output->crtc) : 0);
+				XRRCrtcInfo *crtc = (output->crtc ? XRRGetCrtcInfo(priv->display, res, output->crtc) : nullptr);
 
 				monitors.push_back(Monitor());
 				Monitor &monitor = monitors.back();
@@ -133,7 +133,7 @@ Display::Display(const string &disp_name):
 					int prop_format;
 					unsigned long length;
 					unsigned long overflow;
-					unsigned char *edid = 0;
+					unsigned char *edid = nullptr;
 					XRRGetOutputProperty(priv->display, res->outputs[i], edid_prop, 0, 32, false, false, XA_INTEGER, &prop_type, &prop_format, &length, &overflow, &edid);
 					if(prop_type==XA_INTEGER && prop_format==8)
 					{
@@ -194,7 +194,7 @@ Display::Display(const string &disp_name):
 			XRRFreeScreenResources(res);
 
 			monitors.sort(monitor_x_compare);
-			Monitor *prev_enabled = 0;
+			Monitor *prev_enabled = nullptr;
 			for(Monitor &m: monitors)
 				if(m.desktop_settings.mode)
 				{
@@ -248,7 +248,7 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 
 	// Check if the output already has a CRTC and find a free one if it doesn't
 	RRCrtc crtc = output_info->crtc;
-	XRRCrtcInfo *crtc_info = 0;
+	XRRCrtcInfo *crtc_info = nullptr;
 	if(crtc)
 		crtc_info = XRRGetCrtcInfo(priv->display, res, crtc);
 	else
@@ -288,10 +288,10 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 			{
 				XRROutputInfo *o = XRRGetOutputInfo(priv->display, res, priv->monitors[m.index]);
 				if(o->crtc)
-					XRRSetCrtcConfig(priv->display, res, o->crtc, CurrentTime, 0, 0, 0, RR_Rotate_0, 0, 0);
+					XRRSetCrtcConfig(priv->display, res, o->crtc, CurrentTime, 0, 0, 0, RR_Rotate_0, nullptr, 0);
 				XRRFreeOutputInfo(o);
 
-				m.current_settings.mode = 0;
+				m.current_settings.mode = nullptr;
 				m.current_settings.rotation = ROTATE_NORMAL;
 				m.current_settings.x = 0;
 				m.current_settings.y = 0;