X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.h;h=c49b167a844945d3a55cab385e9bbb5fa7c2f502;hb=HEAD;hp=708380ab60f68734e126485f166bbb5ad0b93058;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git

diff --git a/source/text.h b/source/text.h
index 708380a..3387f36 100644
--- a/source/text.h
+++ b/source/text.h
@@ -22,16 +22,16 @@ class MSPGLTK_API Text
 private:
 	struct Line
 	{
-		unsigned start;
-		unsigned bytes;
-		unsigned length;
-		unsigned width;
+		std::size_t start = 0;
+		std::size_t bytes = 0;
+		std::size_t length = 0;
+		unsigned width = 0;
 	};
 
 	struct RenderData;
 	struct CoordsToGeomData;
 
-	const Style *style;
+	const Style *style = nullptr;
 	std::string text;
 	std::vector<Line> lines;
 
@@ -46,32 +46,32 @@ public:
 	void autosize(const Part &, Geometry &) const;
 
 	void set(const std::string &);
-	void erase(unsigned, unsigned);
-	void insert(unsigned, const std::string &);
+	void erase(std::size_t, std::size_t);
+	void insert(std::size_t, const std::string &);
 	const std::string &get() const { return text; }
-	unsigned size() const { return text.size(); }
-	unsigned get_n_lines() const { return lines.size(); }
-	unsigned get_visible_lines(const Part &, const Geometry &, unsigned *) const;
-	unsigned get_line_length(unsigned) const;
-	unsigned move_offset(unsigned, int) const;
-	void offset_to_coords(unsigned, unsigned &, unsigned &) const;
-	unsigned coords_to_offset(unsigned, unsigned) const;
-	Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
+	std::size_t size() const { return text.size(); }
+	std::size_t get_n_lines() const { return lines.size(); }
+	std::size_t get_visible_lines(const Part &, const Geometry &, unsigned *) const;
+	std::size_t get_line_length(std::size_t) const;
+	std::size_t move_offset(std::size_t, std::ptrdiff_t) const;
+	void offset_to_coords(std::size_t, std::size_t &, std::size_t &) const;
+	std::size_t coords_to_offset(std::size_t, std::size_t) const;
+	Geometry coords_to_geometry(const Part &, const Geometry &, std::size_t, std::size_t, std::size_t) const;
 
 	void build(const Part &, State, const Geometry &, PartCache &) const;
-	void build(const Part &, State, const Geometry &, unsigned, PartCache &) const;
+	void build(const Part &, State, const Geometry &, std::size_t, PartCache &) const;
 
 	Text &operator=(const std::string &);
 private:
 	void find_lines();
-	unsigned count_characters(unsigned, unsigned) const;
-	void check_alignment(unsigned) const;
+	std::size_t count_characters(std::size_t, std::size_t) const;
+	void check_alignment(std::size_t) const;
 
 	template<typename T>
-	void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const;
+	void process_lines(const Part &, const Geometry &, std::size_t, void (Text::*)(std::size_t, const Geometry &, T &) const, T &) const;
 
-	void build_line(unsigned, const Geometry &, RenderData &) const;
-	void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;
+	void build_line(std::size_t, const Geometry &, RenderData &) const;
+	void coords_to_geom_line(std::size_t, const Geometry &, CoordsToGeomData &) const;
 };
 
 } // namespace GLtk