Use std::unique_ptr for managing memory

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

diff --git a/source/layout.h b/source/layout.h
index 14def25e718bc83e00f28d975ad4b08ba7945c29..274660c6464b5da55e3506bd370e77c3377a8f4c 100644 (file)
--- a/source/layout.h
+++ b/source/layout.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GLTK_LAYOUT_H_
 #define MSP_GLTK_LAYOUT_H_
 
-#include <set>
+#include <memory>
 #include <vector>
 #include <sigc++/trackable.h>
 #include <msp/strings/lexicalcast.h>
@@ -173,9 +173,9 @@ private:
        struct Pointers;
 
        Container *container = nullptr;
-       std::vector<Slot *> slots;
-       unsigned n_active_slots = 0;
-       unsigned n_slack_vars[2] = { 0, 0 };
+       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;
@@ -185,8 +185,6 @@ private:
        static Pointers pointers[2];
 
 public:
-       ~Layout();
-
        void set_container(Container &);
        void set_margin(const Sides &);
        const Sides &get_margin() const { return margin; }