Use lambdas for comparison functions

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

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 60c2182b9f5f09093f4fb89317b9174d1a5cbb1e..482e1c34383a073dc9571a5eb957a6c0a93a582d 100644 (file)
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -61,15 +61,6 @@ inline Rotation rotation_to_sys(Msp::Graphics::VideoRotation r)
        default: return RR_Rotate_0;
        }
 }
-
-inline bool monitor_x_compare(const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2)
-{
-       if(m1.desktop_settings.mode && !m2.desktop_settings.mode)
-               return true;
-       if(!m1.desktop_settings.mode && m2.desktop_settings.mode)
-               return false;
-       return m1.desktop_settings.x<m2.desktop_settings.x;
-}
 #endif
 
 inline unsigned mode_width(const Msp::Graphics::VideoMode &m, Msp::Graphics::VideoRotation r)
@@ -211,7 +202,13 @@ Display::Display(const string &disp_name):
                                monitors[i].current_settings = monitors[i].desktop_settings;
                        }
 
-                       sort(monitors, monitor_x_compare);
+                       sort(monitors, [](const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2){
+                               if(m1.desktop_settings.mode && !m2.desktop_settings.mode)
+                                       return true;
+                               if(!m1.desktop_settings.mode && m2.desktop_settings.mode)
+                                       return false;
+                               return m1.desktop_settings.x<m2.desktop_settings.x;
+                       });
 
                        for(unsigned i=0; i<modes.size(); ++i)
                        {