Use nullptr in place of 0 or NULL

[libs/gui.git] / source / graphics / x11 / display.cpp

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 949509ff52ac62b5a3e3c3a5df20b4c2e19fc1fb..fd6048566d3faec09b0108440e7b4f008a985a33 100644 (file)
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -1,3 +1,5 @@
+#include "display.h"
+#include "display_private.h"
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #ifdef WITH_XRANDR
@@ -6,15 +8,13 @@
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "display.h"
-#include "display_private.h"
 
 using namespace std;
 
 namespace {
 
 bool error_flag = false;
-std::string error_msg;
+string error_msg;
 
 int x_error_handler(Display *display, XErrorEvent *event)
 {
@@ -84,12 +84,10 @@ namespace Msp {
 namespace Graphics {
 
 Display::Display(const string &disp_name):
-       primary_monitor(0),
-       priv(new Private),
-       focus_window(0)
+       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)
@@ -121,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();
@@ -135,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)
                                        {
@@ -196,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)
                                {
@@ -250,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
@@ -290,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;