Use nullptr in place of 0 or NULL

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

diff --git a/source/graphics/windows/display.cpp b/source/graphics/windows/display.cpp
index d767bebd2e8ea11e67ddfd8a442f22ad1c539522..bea18a64d0f8b05d372e8e900f2e89c4f7d1608f 100644 (file)
--- a/source/graphics/windows/display.cpp
+++ b/source/graphics/windows/display.cpp
@@ -1,6 +1,6 @@
-#include <windows.h>
 #include "display.h"
 #include "display_private.h"
+#include <windows.h>
 
 using namespace std;
 
@@ -8,17 +8,15 @@ namespace Msp {
 namespace Graphics {
 
 Display::Display(const string &):
-       primary_monitor(0),
-       priv(new Private),
-       focus_window(0)
+       priv(new Private)
 {
-       static ErrorDialog err_dlg(0);
+       static ErrorDialog err_dlg(nullptr);
 
        for(unsigned i=0;; ++i)
        {
                DISPLAY_DEVICE adapter_dev;
                adapter_dev.cb = sizeof(adapter_dev);
-               if(!EnumDisplayDevices(0, i, &adapter_dev, 0))
+               if(!EnumDisplayDevices(nullptr, i, &adapter_dev, 0))
                        break;
 
                if(adapter_dev.StateFlags&DISPLAY_DEVICE_MIRRORING_DRIVER)
@@ -53,13 +51,16 @@ Display::Display(const string &):
                        monitor.video_modes.push_back(&modes.back());
 
                        if(have_current && info.dmPelsWidth==current.dmPelsWidth && info.dmPelsHeight==current.dmPelsHeight && info.dmDisplayFrequency==current.dmDisplayFrequency)
-                               monitor.desktop_mode = &modes.back();
+                               monitor.desktop_settings.mode = &modes.back();
                }
+
+               monitor.current_settings = monitor.desktop_settings;
        }
 }
 
 Display::~Display()
 {
+       delete priv;
 }
 
 void Display::set_mode(const VideoMode &requested_mode, bool)
@@ -87,15 +88,15 @@ void Display::set_mode(const VideoMode &requested_mode, bool)
        if(ret!=DISP_CHANGE_SUCCESSFUL)
                throw unsupported_video_mode(requested_mode);
 
-       for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
-               if(&*i==mode->monitor)
-                       i->current_mode = mode;
+       for(Monitor &m: monitors)
+               if(&m==mode->monitor)
+                       m.current_settings.mode = mode;
 }
 
 bool Display::process_events()
 {
        MSG msg;
-       if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+       if(PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE))
        {
                TranslateMessage(&msg);
                DispatchMessage(&msg);