Use std::unique_ptr for managing memory

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

diff --git a/source/list.h b/source/list.h
index 060fb813f405cc9b29fb762c8a5ac93e7feedc61..5fa687ddbc8ec0ff9712b4fa48baa465373fc897 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GLTK_LIST_H_
 #define MSP_GLTK_LIST_H_
 
+#include <memory>
 #include <stdexcept>
 #include <typeinfo>
 #include <sigc++/signal.h>
@@ -36,10 +37,13 @@ public:
                GRID
        };
 
+       static constexpr size_t INVALID_INDEX = std::numeric_limits<size_t>::max();
+
        class Loader: public DataFile::DerivedObjectLoader<List, Widget::Loader>
        {
        public:
                Loader(List &);
+
        private:
                void item(const std::string &);
        };
@@ -54,10 +58,10 @@ private:
        public:
                DataObserver(List &);
 
-               void item_added(unsigned);
-               void item_removed(unsigned);
+               void item_added(std::size_t);
+               void item_removed(std::size_t);
                void cleared();
-               void refresh_item(unsigned);
+               void refresh_item(std::size_t);
        };
 
 public:
@@ -114,7 +118,7 @@ private:
                virtual ~ItemFactory() = default;
 
                virtual void set_data(const ListData &) = 0;
-               virtual Item *create_item(unsigned) const = 0;
+               virtual std::unique_ptr<Item> create_item(std::size_t) const = 0;
        };
 
        template<typename I>
@@ -126,8 +130,7 @@ private:
                const ListDataStore<ValueType> *data;
 
        public:
-               TypedItemFactory(const ListData &d)
-               { set_data(d); }
+               TypedItemFactory(const ListData &d) { set_data(d); }
 
                void set_data(const ListData &d) override
                {
@@ -137,34 +140,34 @@ private:
                                throw incompatible_data(typeid(ValueType));
                }
 
-               Item *create_item(unsigned i) const override
+               std::unique_ptr<Item> create_item(std::size_t i) const override
                {
-                       return new I(data->get(i));
+                       return std::make_unique<I>(data->get(i));
                }
        };
 
        struct Row
        {
-               unsigned first;
+               std::size_t first;
                unsigned height;
 
-               Row(unsigned f): first(f), height(0) { }
+               Row(std::size_t f): first(f), height(0) { }
        };
 
 public:
-       sigc::signal<void, unsigned> signal_item_selected;
+       sigc::signal<void, std::size_t> signal_item_selected;
        sigc::signal<void> signal_selection_cleared;
 
 private:
+       std::unique_ptr<ListData> own_data;
        ListData *data = nullptr;
-       bool own_data = false;
-       DataObserver *observer = nullptr;
-       ItemFactory *item_factory = nullptr;
+       std::unique_ptr<DataObserver> observer = nullptr;
+       std::unique_ptr<ItemFactory> item_factory = nullptr;
        ViewMode view_mode = LIST;
-       int sel_index = -1;
-       int focus_index = -1;
-       unsigned first_row = 0;
-       unsigned max_scroll = 0;
+       std::size_t sel_index = INVALID_INDEX;
+       std::size_t focus_index = INVALID_INDEX;
+       std::size_t first_row = 0;
+       std::size_t max_scroll = 0;
        unsigned view_rows = 5;
        unsigned view_columns = 5;
        const Part *items_part = nullptr;
@@ -174,13 +177,13 @@ private:
        int drag_start_y = 0;
 
        VSlider slider;
-       std::vector<Item *> items;
+       std::vector<std::unique_ptr<Item>> items;
        std::vector<Row> rows;
 
+       List(std::unique_ptr<ListData>);
 public:
        List();
        List(ListData &);
-       virtual ~List();
 
        const char *get_class() const override { return "list"; }
 
@@ -196,14 +199,9 @@ private:
 
 public:
        template<typename I>
-       void set_item_type()
-       {
-               ItemFactory *f = new TypedItemFactory<I>(*data);
-               delete item_factory;
-               item_factory = f;
-       }
+       void set_item_type() { item_factory = std::make_unique<TypedItemFactory<I>>(*data); }
 private:
-       Item *create_item(unsigned);
+       std::unique_ptr<Item> create_item(std::size_t);
 
 public:
        void set_view_mode(ViewMode);
@@ -211,7 +209,7 @@ public:
        void set_view_size(unsigned, unsigned);
        void set_view_all();
 
-       void set_selected_index(int);
+       void set_selected_index(std::size_t);
        int get_selected_index() const { return sel_index; }
 private:
        void set_selected_item(Widget *);
@@ -231,16 +229,16 @@ private:
        void on_style_change() override;
 
        void move_focus(Navigation, bool);
-       void set_focus_index(int);
+       void set_focus_index(std::size_t);
 
        void item_autosize_changed(Item *);
        void reposition_items(bool);
-       unsigned last_to_first_row(unsigned) const;
-       unsigned item_index_to_row(unsigned) const;
+       std::size_t last_to_first_row(std::size_t) const;
+       std::size_t item_index_to_row(std::size_t) const;
        void check_view_range();
        void scroll_to_focus();
        void slider_value_changed(double);
-       static void adjust_index(int &, int, int);
+       static void adjust_index(std::size_t &, std::size_t, std::ptrdiff_t);
 };
 
 MSPGLTK_API void operator>>(const LexicalConverter &, List::ViewMode &);