Use std::unique_ptr for managing memory

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

diff --git a/source/panel.h b/source/panel.h
index 43c0f41b64d91a0241d9211f761e5702f9d5a47e..3abfee1cadb072c74f9f0b4229fda6acfb98b6cd 100644 (file)
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
+#include <memory>
 #include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
@@ -66,14 +67,13 @@ private:
 
 protected:
        std::vector<Widget *> nav_order;
-       Layout *layout = nullptr;
+       std::unique_ptr<Layout> layout;
 
        static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
        static bool widget_registry_init_done;
 
 public:
        Panel();
-       virtual ~Panel();
 
        template<typename T>
        static void register_child_type(const std::string &);
@@ -115,7 +115,7 @@ void Panel::Loader::child(const std::string &n)
 template<typename T>
 void Panel::Loader::unnamed_child()
 {
-       RefPtr<T> chl = new T();
+       std::unique_ptr<T> chl = std::make_unique<T>();
        load_sub(*chl);
        obj.add(*chl.get());
        last_widget = chl.release();