Simplify constructors with C++11

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

diff --git a/source/layout.h b/source/layout.h
index 7986686c86e440757cbe6d2172526fa8844b275e..8b1c527640e4e29e69bd61c3f9fab4a4188044be 100644 (file)
--- a/source/layout.h
+++ b/source/layout.h
@@ -133,31 +133,29 @@ private:
        {
                ConstraintType type;
                Slot ⌖
-               int spacing;
+               int spacing = -1;
 
                Constraint(ConstraintType, Slot &);
        };
 
        struct Packing
        {
-               int gravity;
-               bool expand;
-
-               Packing();
+               int gravity = -1;
+               bool expand = false;
        };
 
        struct Slot: public sigc::trackable
        {
                Layout &layout;
-               int index;
+               int index = 0;
                Widget &widget;
                Geometry autosize_geom;
                Geometry geom;
                std::list<Constraint> constraints;
                Packing horiz_pack;
                Packing vert_pack;
-               bool ghost;
-               bool floating;
+               bool ghost = false;
+               bool floating = false;
 
                Slot(Layout &, Widget &);
 
@@ -174,20 +172,19 @@ private:
        class LinearProgram;
        struct Pointers;
 
-       Container *container;
+       Container *container = 0;
        std::list<Slot *> slots;
-       unsigned n_active_slots;
-       unsigned n_slack_vars[2];
-       Sides margin;
-       unsigned row_spacing;
-       unsigned col_spacing;
+       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;
 
        static Pointers pointers[2];
 
 public:
-       Layout();
        ~Layout();
 
        void set_container(Container &);