Use size_t to represent counts and indices

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

diff --git a/source/list.h b/source/list.h
index 060fb813f405cc9b29fb762c8a5ac93e7feedc61..0938eaf05ee162a59c8407a3d38b9e0765237177 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -36,6 +36,8 @@ public:
                GRID
        };
 
+       static constexpr size_t INVALID_INDEX = std::numeric_limits<size_t>::max();
+
        class Loader: public DataFile::DerivedObjectLoader<List, Widget::Loader>
        {
        public:
@@ -54,10 +56,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 +116,7 @@ private:
                virtual ~ItemFactory() = default;
 
                virtual void set_data(const ListData &) = 0;
-               virtual Item *create_item(unsigned) const = 0;
+               virtual Item *create_item(std::size_t) const = 0;
        };
 
        template<typename I>
@@ -137,7 +139,7 @@ private:
                                throw incompatible_data(typeid(ValueType));
                }
 
-               Item *create_item(unsigned i) const override
+               Item *create_item(std::size_t i) const override
                {
                        return new I(data->get(i));
                }
@@ -145,14 +147,14 @@ private:
 
        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:
@@ -161,10 +163,10 @@ private:
        DataObserver *observer = nullptr;
        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;
@@ -203,7 +205,7 @@ public:
                item_factory = f;
        }
 private:
-       Item *create_item(unsigned);
+       Item *create_item(std::size_t);
 
 public:
        void set_view_mode(ViewMode);
@@ -211,7 +213,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 +233,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 &);