Use std::unique_ptr for managing memory

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

diff --git a/source/layout.h b/source/layout.h
index a13a0934a5761a962ca4eddd553d48c76476872f..274660c6464b5da55e3506bd370e77c3377a8f4c 100644 (file)
--- a/source/layout.h
+++ b/source/layout.h
@@ -1,11 +1,12 @@
 #ifndef MSP_GLTK_LAYOUT_H_
 #define MSP_GLTK_LAYOUT_H_
 
-#include <list>
-#include <set>
+#include <memory>
+#include <vector>
 #include <sigc++/trackable.h>
 #include <msp/strings/lexicalcast.h>
 #include "geometry.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -50,7 +51,7 @@ Since specifiyng constraints manually can be quite tedious, an Arrangement
 interface is provided to automatically arrange widgets.  See classes Row,
 Column and Grid for some commonly used arrangements.
 */
-class Layout
+class MSPGLTK_API Layout
 {
 private:
        enum
@@ -131,32 +132,30 @@ private:
        struct Constraint
        {
                ConstraintType type;
-               Slot &target;
-               int spacing;
+               Slot *target = nullptr;
+               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;
+               std::vector<Constraint> constraints;
                Packing horiz_pack;
                Packing vert_pack;
-               bool ghost;
-               bool floating;
+               bool ghost = false;
+               bool floating = false;
 
                Slot(Layout &, Widget &);
 
@@ -173,22 +172,19 @@ private:
        class LinearProgram;
        struct Pointers;
 
-       Container *container;
-       std::list<Slot *> slots;
-       unsigned n_active_slots;
-       unsigned n_slack_vars[2];
-       Sides margin;
-       unsigned row_spacing;
-       unsigned col_spacing;
+       Container *container = nullptr;
+       std::vector<std::unique_ptr<Slot>> slots;
+       std::size_t n_active_slots = 0;
+       std::size_t 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];
 
 public:
-       Layout();
-       ~Layout();
-
        void set_container(Container &);
        void set_margin(const Sides &);
        const Sides &get_margin() const { return margin; }
@@ -242,7 +238,7 @@ private:
        void solve_constraints(int, SolveMode);
 };
 
-void operator>>(const LexicalConverter &, Layout::ConstraintType &);
+MSPGLTK_API void operator>>(const LexicalConverter &, Layout::ConstraintType &);
 
 } // namespace GLtk
 } // namespace Msp