Use std::swap instead of temporary values

[geeqie.git] / src / layout.cc

diff --git a/src/layout.cc b/src/layout.cc
index 0451c23..f955399 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include <cstring>
+#include <utility>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
@@ -1847,6 +1848,7 @@ static void layout_grid_setup(LayoutWindow *lw)
        GtkWidget *files;
 
        layout_actions_setup(lw);
+       create_toolbars(lw);
 
        lw->group_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(lw->group_box);
@@ -1914,11 +1916,7 @@ static void layout_grid_setup(LayoutWindow *lw)
 
        if (!layout_location_vertical(static_cast<LayoutLocation>(priority_location)))
                {
-               GtkWidget *tmp;
-
-               tmp = v;
-               v = h;
-               h = tmp;
+               std::swap(v, h);
                }
 
        gq_gtk_box_pack_start(GTK_BOX(lw->group_box), v, TRUE, TRUE, 0);