Use nullptr in place of 0 or NULL

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

diff --git a/source/graphics/display.cpp b/source/graphics/display.cpp
index 7f0b25af22f77d177ef244daa3997bc809b7951f..8c3813d16cd8d19321fddcd6609a9dfc5748da3c 100644 (file)
--- a/source/graphics/display.cpp
+++ b/source/graphics/display.cpp
@@ -1,6 +1,6 @@
+#include "display.h"
 #include <cmath>
 #include <sigc++/bind.h>
-#include "display.h"
 #include "display_private.h"
 #include "window.h"
 
@@ -20,7 +20,7 @@ void Display::remove_window(Window &wnd)
 {
        priv->windows.erase(wnd.get_private().window);
        if(&wnd==focus_window)
-               focus_window = 0;
+               focus_window = nullptr;
 }
 
 const VideoMode &Display::get_desktop_mode() const
@@ -32,14 +32,14 @@ const VideoMode &Display::get_desktop_mode() const
 
 void Display::restore_mode()
 {
-       for(list<Monitor>::const_iterator i=monitors.begin(); i!=monitors.end(); ++i)
-               if(i->desktop_settings.mode)
-                       set_mode(*i->desktop_settings.mode, false);
+       for(const Monitor &m: monitors)
+               if(m.desktop_settings.mode)
+                       set_mode(*m.desktop_settings.mode, false);
 }
 
 const VideoMode *Display::find_mode(const VideoMode &mode, float rate_tolerance) const
 {
-       const VideoMode *closest = 0;
+       const VideoMode *closest = nullptr;
        float rate_diff = 0.0f;
 
        float target_rate = mode.rate;
@@ -47,25 +47,25 @@ const VideoMode *Display::find_mode(const VideoMode &mode, float rate_tolerance)
                if(const VideoMode *current_mode = mode.monitor->current_settings.mode)
                        target_rate = current_mode->rate;
 
-       for(list<VideoMode>::const_iterator i=modes.begin(); i!=modes.end(); ++i)
+       for(const VideoMode &m: modes)
        {
-               if(mode.monitor && i->monitor!=mode.monitor)
+               if(mode.monitor && m.monitor!=mode.monitor)
                        continue;
                // Only check rate tolerance against an explicitly requested rate
-               if(mode.rate && (i->rate<mode.rate-rate_tolerance || i->rate>mode.rate+rate_tolerance))
+               if(mode.rate && (m.rate<mode.rate-rate_tolerance || m.rate>mode.rate+rate_tolerance))
                        continue;
-               if(i->width!=mode.width || i->height!=mode.height)
+               if(m.width!=mode.width || m.height!=mode.height)
                        continue;
 
                float ref_rate = target_rate;
                if(!ref_rate)
-                       if(const VideoMode *current_mode = i->monitor->current_settings.mode)
+                       if(const VideoMode *current_mode = m.monitor->current_settings.mode)
                                ref_rate = current_mode->rate;
 
-               float d = abs(i->rate-ref_rate);
+               float d = abs(m.rate-ref_rate);
                if(!closest || d<rate_diff)
                {
-                       closest = &*i;
+                       closest = &m;
                        rate_diff = d;
                }
        }
@@ -85,7 +85,7 @@ void Display::window_got_focus(Window &w)
 
 void Display::window_lost_focus()
 {
-       focus_window = 0;
+       focus_window = nullptr;
 }
 
 void Display::tick()