X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=72b5b8890668fdb0c31946c9e17632f7569a6528;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=37d4d7a33201bdf80894508bd8ab8dd58a962fa2;hpb=83f553a382ce554951594de85e4fd7b854305463;p=libs%2Fgltk.git

diff --git a/source/list.h b/source/list.h
index 37d4d7a..72b5b88 100644
--- a/source/list.h
+++ b/source/list.h
@@ -36,10 +36,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 +57,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:
@@ -67,14 +70,14 @@ public:
 		Item();
 
 	public:
-		virtual const char *get_class() const { return "listitem"; }
+		const char *get_class() const override { return "listitem"; }
 
 	protected:
-		virtual void autosize_special(const Part &, Geometry &) const;
+		void autosize_special(const Part &, Geometry &) const override;
 	public:
 		void set_active(bool);
 
-		virtual void render_special(const Part &, GL::Renderer &) const;
+		void render_special(const Part &, GL::Renderer &) const override;
 	};
 
 	class SimpleItem: public Item
@@ -82,7 +85,7 @@ public:
 	protected:
 		SimpleItem() = default;
 
-		virtual void on_style_change();
+		void on_style_change() override;
 	};
 
 	class MultiColumnItem: public Item
@@ -93,7 +96,7 @@ public:
 		virtual void check_widths(std::vector<unsigned> &) const;
 		virtual void set_widths(const std::vector<unsigned> &);
 
-		virtual void on_style_change();
+		void on_style_change() override;
 	};
 
 private:
@@ -114,7 +117,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>
@@ -126,10 +129,9 @@ private:
 		const ListDataStore<ValueType> *data;
 
 	public:
-		TypedItemFactory(const ListData &d)
-		{ set_data(d); }
+		TypedItemFactory(const ListData &d) { set_data(d); }
 
-		virtual void set_data(const ListData &d)
+		void set_data(const ListData &d) override
 		{
 			if(const ListDataStore<ValueType> *ds = dynamic_cast<const ListDataStore<ValueType> *>(&d))
 				data = ds;
@@ -137,7 +139,7 @@ private:
 				throw incompatible_data(typeid(ValueType));
 		}
 
-		virtual Item *create_item(unsigned i) const
+		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;
@@ -182,10 +184,10 @@ public:
 	List(ListData &);
 	virtual ~List();
 
-	virtual const char *get_class() const { return "list"; }
+	const char *get_class() const override { return "list"; }
 
 private:
-	virtual void autosize_special(const Part &, Geometry &) const;
+	void autosize_special(const Part &, Geometry &) const override;
 
 public:
 	void set_data(ListData &);
@@ -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,36 +213,36 @@ 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 *);
 
-	virtual void rebuild_special(const Part &);
-	virtual void render_special(const Part &, GL::Renderer &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual bool key_press(unsigned, unsigned);
-	virtual void button_press(int, int, unsigned);
-	virtual void touch_press(int, int, unsigned);
-	virtual void touch_release(int, int, unsigned);
-	virtual void touch_motion(int, int, unsigned);
-	virtual void focus_in();
-	virtual bool navigate(Navigation);
+	bool key_press(unsigned, unsigned) override;
+	void button_press(int, int, unsigned) override;
+	void touch_press(int, int, unsigned) override;
+	void touch_release(int, int, unsigned) override;
+	void touch_motion(int, int, unsigned) override;
+	void focus_in() override;
+	bool navigate(Navigation) override;
 private:
-	virtual void on_style_change();
+	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 &);