Streamline iterators and loop constructs

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

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 972cc8236f25024eec7fee0167811a4aeb76814b..949509ff52ac62b5a3e3c3a5df20b4c2e19fc1fb 100644 (file)
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -165,7 +165,7 @@ Display::Display(const string &disp_name):
 
                                for(int j=0; j<output->nmode; ++j)
                                {
-                                       map<RRMode, XRRModeInfo *>::iterator k = modes_by_id.find(output->modes[j]);
+                                       auto k = modes_by_id.find(output->modes[j]);
                                        if(k==modes_by_id.end())
                                                continue;
 
@@ -197,27 +197,27 @@ Display::Display(const string &disp_name):
 
                        monitors.sort(monitor_x_compare);
                        Monitor *prev_enabled = 0;
-                       for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
-                               if(i->desktop_settings.mode)
+                       for(Monitor &m: monitors)
+                               if(m.desktop_settings.mode)
                                {
-                                       i->next_left = prev_enabled;
+                                       m.next_left = prev_enabled;
                                        if(prev_enabled)
-                                               prev_enabled->next_right = &*i;
-                                       prev_enabled = &*i;
+                                               prev_enabled->next_right = &m;
+                                       prev_enabled = &m;
                                }
 
                        if(!primary_monitor || !primary_monitor->desktop_settings.mode)
                        {
                                // XRandR didn't give a sensible primary monitor.  Try to guess one.
                                unsigned largest = 0;
-                               for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
-                                       if(const VideoMode *desktop_mode = i->desktop_settings.mode)
+                               for(Monitor &m: monitors)
+                                       if(const VideoMode *desktop_mode = m.desktop_settings.mode)
                                        {
                                                unsigned size = desktop_mode->width*desktop_mode->height;
                                                if(size>largest)
                                                {
                                                        largest = size;
-                                                       primary_monitor = &*i;
+                                                       primary_monitor = &m;
                                                }
                                        }
                        }
@@ -285,18 +285,18 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
                monitor->current_settings.y = 0;
 
                // Disable other outputs for exclusive mode
-               for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
-                       if(&*i!=mode->monitor)
+               for(Monitor &m: monitors)
+                       if(&m!=mode->monitor)
                        {
-                               XRROutputInfo *o = XRRGetOutputInfo(priv->display, res, priv->monitors[i->index]);
+                               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);
                                XRRFreeOutputInfo(o);
 
-                               i->current_settings.mode = 0;
-                               i->current_settings.rotation = ROTATE_NORMAL;
-                               i->current_settings.x = 0;
-                               i->current_settings.y = 0;
+                               m.current_settings.mode = 0;
+                               m.current_settings.rotation = ROTATE_NORMAL;
+                               m.current_settings.x = 0;
+                               m.current_settings.y = 0;
                        }
        }
        else
@@ -334,7 +334,7 @@ bool Display::process_events()
 
                check_error();
 
-               map<WindowHandle, Window *>::iterator j = priv->windows.find(event.xevent.xany.window);
+               auto j = priv->windows.find(event.xevent.xany.window);
                if(j!=priv->windows.end())
                {
                        /* Filter keyboard autorepeat.  If this packet is a KeyRelease and