Convert all list containers to vectors

[libs/gltk.git] / source / layout.h

diff --git a/source/layout.h b/source/layout.h
index aa11e965bf19cbc042b968c65d38506686625f27..14def25e718bc83e00f28d975ad4b08ba7945c29 100644 (file)
--- a/source/layout.h
+++ b/source/layout.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GLTK_LAYOUT_H_
 #define MSP_GLTK_LAYOUT_H_
 
-#include <list>
 #include <set>
+#include <vector>
 #include <sigc++/trackable.h>
 #include <msp/strings/lexicalcast.h>
 #include "geometry.h"
@@ -132,7 +132,7 @@ private:
        struct Constraint
        {
                ConstraintType type;
-               Slot &target;
+               Slot *target = nullptr;
                int spacing = -1;
 
                Constraint(ConstraintType, Slot &);
@@ -151,7 +151,7 @@ private:
                Widget &widget;
                Geometry autosize_geom;
                Geometry geom;
-               std::list<Constraint> constraints;
+               std::vector<Constraint> constraints;
                Packing horiz_pack;
                Packing vert_pack;
                bool ghost = false;
@@ -173,14 +173,14 @@ private:
        struct Pointers;
 
        Container *container = nullptr;
-       std::list<Slot *> slots;
+       std::vector<Slot *> slots;
        unsigned n_active_slots = 0;
        unsigned n_slack_vars[2] = { 0, 0 };
        Sides margin{ 8 };
        unsigned row_spacing = 5;
        unsigned col_spacing = 4;
        Geometry autosize_geom;
-       std::list<Arrangement *> arrangement_stack;
+       std::vector<Arrangement *> arrangement_stack;
 
        static Pointers pointers[2];