Fix memory leaks

Changed files (18)

• modified libbirdfont/BirdFontFile.vala
• modified libbirdfont/ClipTool.vala
• modified libbirdfont/EditPoint.vala
• modified libbirdfont/EditPointHandle.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/GlyphBackgroundImage.vala
• modified libbirdfont/IntersectionList.vala
• modified libbirdfont/MoveTool.vala
• modified libbirdfont/OpenFontFormat/GlyfData.vala
• modified libbirdfont/Path.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/PointSelection.vala
• modified libbirdfont/ResizeTool.vala
• modified libbirdfont/StrokeTool.vala
• modified libbirdfont/Svg.vala
• modified libbirdfont/SvgParser.vala
• modified libbirdfont/TestCases.vala
• modified libbirdfont/TrackTool.vala

Diff

diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex e4c5179..f6365f4 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -366,14 +366,14 @@ class BirdFontFile : GLib.Object { 		EditPoint m; 		int i = 0; 		-		if (pl.points.length () == 0) {+		if (pl.points.size == 0) { 			return data.str; 		} 		-		if (pl.points.length () == 1) {-			add_start_point (pl.points.first ().data, data);+		if (pl.points.size == 1) {+			add_start_point (pl.points.get (0), data); 			data.append (" ");-			add_next_point (pl.points.first ().data, pl.points.first ().data, data);+			add_next_point (pl.points.get (0), pl.points.get (0), data);  			if (pl.is_open ()) { 				data.append (" O");@@ -382,12 +382,12 @@ class BirdFontFile : GLib.Object { 			return data.str; 		} 		-		if (pl.points.length () == 2) {-			add_start_point (pl.points.first ().data, data);+		if (pl.points.size == 2) {+			add_start_point (pl.points.get (0), data); 			data.append (" ");-			add_next_point (pl.points.first ().data, pl.points.last ().data, data);+			add_next_point (pl.points.get (0), pl.points.get (pl.points.size - 1), data); 			data.append (" ");-			add_next_point (pl.points.last ().data, pl.points.first ().data, data);+			add_next_point (pl.points.get (pl.points.size - 1), pl.points.get (0), data); 			 			if (pl.is_open ()) { 				data.append (" O");@@ -415,7 +415,7 @@ class BirdFontFile : GLib.Object { 		}  		data.append (" ");-		m = pl.points.first ().data;	+		m = pl.points.get (0);	 		add_next_point ((!) n, m, data); 		 		if (pl.is_open ()) {@@ -1068,7 +1068,7 @@ class BirdFontFile : GLib.Object { 				path.set_stroke (double.parse (attr_content)); 			} 		}		-		if (path.points.length () == 0) {+		if (path.points.size == 0) { 			warning ("Empty path"); 		} 		@@ -1079,7 +1079,7 @@ class BirdFontFile : GLib.Object { 		EditPoint ep; 		 		path.add (parse_double (px), parse_double (py));-		ep = path.points.last ().data;+		ep = path.points.get (path.points.size - 1); 		ep.get_right_handle ().type = PointType.LINE_DOUBLE_CURVE; 		ep.get_left_handle ().type = PointType.LINE_DOUBLE_CURVE; 		ep.type = PointType.LINE_DOUBLE_CURVE;@@ -1090,7 +1090,7 @@ class BirdFontFile : GLib.Object { 		EditPoint ep;  		path.add (parse_double (px), parse_double (py));-		ep = path.points.last ().data;+		ep = path.points.get (path.points.size - 1); 		ep.get_right_handle ().type = PointType.LINE_CUBIC; 		ep.type = PointType.LINE_CUBIC; 		ep.recalculate_linear_handles ();@@ -1104,12 +1104,12 @@ class BirdFontFile : GLib.Object { 		double x1 = parse_double (px1); 		double y1 = parse_double (py1); -		if (is_null (path.points.last ().data)) {+		if (path.points.size == 0) { 			warning ("No point."); 			return; 		} 		-		ep1 = path.points.last ().data;+		ep1 = path.points.get (path.points.size - 1); 		ep1.recalculate_linear_handles (); 		ep1.get_right_handle ().type = PointType.QUADRATIC; 		ep1.get_right_handle ().move_to_coordinate (x0, y0);	@@ -1117,7 +1117,7 @@ class BirdFontFile : GLib.Object {  		path.add (x1, y1); -		ep2 = path.points.last ().data;+		ep2 = path.points.get (path.points.size - 1); 		ep2.recalculate_linear_handles (); 		ep2.get_left_handle ().type = PointType.QUADRATIC; 		ep2.get_left_handle ().move_to_coordinate (x0, y0);@@ -1136,13 +1136,13 @@ class BirdFontFile : GLib.Object { 		 		double lx, ly; 				-		if (is_null (path.points.last ().data)) {+		if (path.points.size == 0) { 			warning ("No point"); 			return; 		}  		// start with line handles-		ep1 = path.points.last ().data;+		ep1 = path.points.get (path.points.size - 1); 		ep1.get_right_handle ().type = PointType.LINE_CUBIC; 		 		lx = ep1.x + ((x2 - ep1.x) / 3);@@ -1152,7 +1152,7 @@ class BirdFontFile : GLib.Object { 		ep1.recalculate_linear_handles (); 		 		// set curve handles-		ep1 = path.points.last ().data;+		ep1 = path.points.get (path.points.size - 1); 		ep1.recalculate_linear_handles (); 		ep1.get_right_handle ().type = PointType.CUBIC; 		ep1.get_right_handle ().move_to_coordinate (x0, y0);				@@ -1160,7 +1160,7 @@ class BirdFontFile : GLib.Object { 	 		path.add (x2, y2); 						-		ep2 = path.points.last ().data;+		ep2 = path.points.get (path.points.size - 1); 		ep2.recalculate_linear_handles (); 		ep2.get_left_handle ().type = PointType.CUBIC; 		ep2.get_left_handle ().move_to_coordinate (x1, y1);@@ -1182,13 +1182,13 @@ class BirdFontFile : GLib.Object { 		 		double lx, ly; 				-		if (is_null (path.points.last ().data)) {+		if (path.points.size == 0) { 			warning ("No point"); 			return; 		}  		// start with line handles-		ep1 = path.points.last ().data;+		ep1 = path.points.get (path.points.size - 1); 		ep1.get_right_handle ().type = PointType.LINE_DOUBLE_CURVE; 		 		lx = ep1.x + ((x2 - ep1.x) / 4);@@ -1198,7 +1198,7 @@ class BirdFontFile : GLib.Object { 		ep1.recalculate_linear_handles (); 		 		// set curve handles-		ep1 = path.points.last ().data;+		ep1 = path.points.get (path.points.size - 1); 		ep1.recalculate_linear_handles (); 		ep1.get_right_handle ().type = PointType.DOUBLE_CURVE; 		ep1.get_right_handle ().move_to_coordinate (x0, y0);				@@ -1206,7 +1206,7 @@ class BirdFontFile : GLib.Object { 		 		path.add (x2, y2); 						-		ep2 = path.points.last ().data;+		ep2 = path.points.get (path.points.size - 1); 		ep2.recalculate_linear_handles (); 		ep2.get_left_handle ().type = PointType.DOUBLE_CURVE; 		ep2.get_left_handle ().move_to_coordinate (x1, y1);@@ -1218,16 +1218,16 @@ class BirdFontFile : GLib.Object { 	public static void close (Path path) { 		EditPoint ep1, ep2; 		-		if (path.points.length () < 2) {+		if (path.points.size < 2) { 			warning ("Less  than two points in path."); 			return; 		} 		 		// last point is first-		ep1 = path.points.last ().data;-		ep2 = path.points.first ().data;+		ep1 = path.points.get (path.points.size - 1);+		ep2 = path.points.get (0); 		-		path.points.remove_link (path.points.last ());+		path.points.remove_at (path.points.size - 1); 		 		ep2.tie_handles = ep1.tie_handles; 		ep2.left_handle.angle = ep1.left_handle.angle;@@ -1323,7 +1323,7 @@ class BirdFontFile : GLib.Object { 				 				cubic (path, p[0], p[1], p1[0], p1[1], p2[0], p2[1]); 			} else if (instruction == "T") {-				path.points.last ().data.tie_handles = true;+				path.points.get (path.points.size - 1).tie_handles = true; 			} else if (instruction == "O") { 				open = true; 			} else {@@ -1335,7 +1335,7 @@ class BirdFontFile : GLib.Object { 		if (!open) { 			close (path); 		} else {-			path.points.remove_link (path.points.last ());+			path.points.remove_at (path.points.size - 1); 			 			if (!path.is_open ()) { 				warning ("Closed path.");diff --git a/libbirdfont/ClipTool.vala b/libbirdfont/ClipTool.valaindex 4f12dca..1fa9978 100644--- a/libbirdfont/ClipTool.vala+++ b/libbirdfont/ClipTool.vala@@ -117,9 +117,9 @@ public class ClipTool : Tool { 			 			new_path = new Path (); 			foreach (Path path in glyph.path_list) {-				if (path.points.length () > 0-					&& path.points.first ().data.is_selected ()-					&& path.points.last ().data.is_selected ()) {+				if (path.points.size > 0+					&& path.points.get (0).is_selected ()+					&& path.points.get (path.points.size - 1).is_selected ()) { 					 					foreach (EditPoint ep in path.points) { 						if (!ep.is_selected ()) {@@ -131,7 +131,7 @@ public class ClipTool : Tool { 				 				foreach (EditPoint ep in path.points) { 					if (!ep.is_selected ()) {-						if (path.points.length () > 0) {+						if (path.points.size > 0) { 							paths.append (new_path); 							new_path = new Path (); 						}@@ -148,7 +148,7 @@ public class ClipTool : Tool { 			paths.append (new_path); 			 			foreach (Path path in paths) {-				if (path.points.length () > 0) {+				if (path.points.size > 0) { 					s.append ("BF path: "); 					s.append (BirdFontFile.get_point_data (path)); 					s.append ("\n");@@ -191,7 +191,7 @@ public class ClipTool : Tool { 		Glyph glyph = MainWindow.get_current_glyph (); 		Path path = BirdFontFile.parse_path_data (data); -		if (path.points.length () > 0) {+		if (path.points.size > 0) { 			glyph.add_path (path); 			glyph.active_paths.add (path); 			path.update_region_boundaries ();diff --git a/libbirdfont/EditPoint.vala b/libbirdfont/EditPoint.valaindex 49da6c3..5f175ed 100644--- a/libbirdfont/EditPoint.vala+++ b/libbirdfont/EditPoint.vala@@ -35,8 +35,8 @@ public class EditPoint { 	public double y; 	public PointType type; 	-	public unowned List<EditPoint>? prev = null;-	public unowned List<EditPoint>? next = null;+	public unowned EditPoint? prev = null;+	public unowned EditPoint? next = null;  	public bool active = false; 	public bool selected = false;@@ -111,12 +111,12 @@ public class EditPoint { 		double dr, dl; 		EditPointHandle t; 		-		if (next == null || ((!)next).length () < 2) {+		if (next == null || get_next ().next != null) { 				return; 		} 		-		px = get_next ().nth (1).data.x;-		py = get_next ().nth (1).data.y;+		px = get_next ().get_next ().x;+		py = get_next ().get_next ().y; 		 		dr = Math.sqrt (Math.pow (px - right_handle.x (), 2) + Math.pow (py - right_handle.y (), 2)); 		dl = Math.sqrt (Math.pow (px - left_handle.x (), 2) + Math.pow (py - left_handle.y (), 2));@@ -136,12 +136,12 @@ public class EditPoint { 		double nx, ny;  		if (prev == null && next != null) {-			prev = get_next ().last ();+			// FIXME: prev = get_next ().last (); 		}  		// left handle 		if (prev != null) {-			n = get_prev ().data;+			n = get_prev (); 			h = get_left_handle (); 			 			if (h.type == PointType.LINE_CUBIC) {@@ -186,7 +186,7 @@ public class EditPoint {  		// right handle 		if (next != null) {-			n = get_next ().data;+			n = get_next (); 			h = get_right_handle (); 			 			if (h.type == PointType.LINE_CUBIC) {@@ -240,11 +240,12 @@ public class EditPoint { 	} 	 	public double get_direction () {-		if (is_null (prev) || is_null (((!) prev).data)) {+		if (prev == null) { 			return 0; 		} 		-		return (x - ((!) prev).data.x) * (y + ((!) prev).data.y);+		// FIXME:+		return (x - get_prev ().x) * (y + get_prev ().y); 	} 	 	public void set_tie_handle (bool tie) {@@ -298,8 +299,8 @@ public class EditPoint { 			angle = -acos (a / length) + PI; 		} 		-		prev_rh = get_prev ().data.get_right_handle ();-		next_lh = get_next ().data.get_left_handle ();	+		prev_rh = get_prev ().get_right_handle ();+		next_lh = get_next ().get_left_handle ();	 		 		convert_from_line_to_curve (next_lh); 		convert_from_line_to_curve (prev_rh);@@ -348,11 +349,7 @@ public class EditPoint { 		return right_handle; 	} 	-	public unowned List<EditPoint> get_prev () {-		if (prev == null && next != null && get_next ().prev == get_next ().first ()) {-			prev = get_next ().last ();-		}-		+	public unowned EditPoint get_prev () { 		if (unlikely (prev == null)) { 			warning ("EditPoint.prev is null"); 		}@@ -360,7 +357,7 @@ public class EditPoint { 		return (!) prev; 	} -	public unowned List<EditPoint> get_next () {+	public unowned EditPoint get_next () { 		if (unlikely (next == null)) { 			warning ("EditPoint.next is null"); 		}@@ -368,28 +365,13 @@ public class EditPoint { 		return (!) next; 	} 	-	public unowned List<EditPoint>? get_link_item () {-		-		if (unlikely (prev == null && next == null)) {-			warning ("Need prev or next, create a list first.");-		}-		-		if (prev != null) {-			return ((!) prev).data.get_next ();-		}-		-		if (next != null) {-			return ((!) next).data.get_prev ();-		}-		-		return null;	-	}-	-	public unowned List<EditPoint> get_list () {-		return get_next ().first ();+	public unowned EditPoint get_link_item () {+		return this; 	} 		 	public void set_position (double tx, double ty) {+		EditPoint p, n;+		 		x = tx; 		y = ty; 		@@ -402,17 +384,19 @@ public class EditPoint { 		// move connected quadratic handle 		if (right_handle.type == PointType.QUADRATIC) { 			if (next != null) {-				((!)next).data.set_tie_handle (false);-				((!)next).data.set_reflective_handles (false);-				((!)next).data.left_handle.move_to_coordinate_internal (right_handle.x (), right_handle.y ());+				n = get_next ();+				n.set_tie_handle (false);+				n.set_reflective_handles (false);+				n.left_handle.move_to_coordinate_internal (right_handle.x (), right_handle.y ()); 			} 		} 		 		if (left_handle.type == PointType.QUADRATIC) {-			if (prev != null && !((!)prev).data.is_selected ()) {-				((!)prev).data.set_tie_handle (false);-				((!)prev).data.set_reflective_handles (false);-				((!)prev).data.right_handle.move_to_coordinate (left_handle.x (), left_handle.y ());+			if (prev != null && !get_prev ().is_selected ()) {+				p = get_prev ();+				p.set_tie_handle (false);+				p.set_reflective_handles (false);+				p.right_handle.move_to_coordinate (left_handle.x (), left_handle.y ()); 			} 		} 	}@@ -454,6 +438,8 @@ public class EditPoint { 		return update; 	} 	+	/*+	// FIXME: DELETE 	public int get_index () { 		int i = -1; 		@@ -469,6 +455,7 @@ public class EditPoint { 		 		return i; 	}+	*/ }  }diff --git a/libbirdfont/EditPointHandle.vala b/libbirdfont/EditPointHandle.valaindex f261b83..b92e577 100644--- a/libbirdfont/EditPointHandle.vala+++ b/libbirdfont/EditPointHandle.vala@@ -112,7 +112,6 @@ public class EditPointHandle  { 	internal void print_position () { 			warning (@"\nEdit point handle at position $(px ()),$(py ()) is not valid.\n" 				+ @"Type: $(parent.type), "-				+ @"Index: $(parent.get_index ()) of $(parent.get_list ().length ())\n" 				+ @"Angle: $angle, Length: $length.");	 	} 	@@ -183,14 +182,14 @@ public class EditPointHandle  { 		if (type == PointType.QUADRATIC) { 			if (!is_left_handle ()) { 				if (parent.next != null) {-					h = ((!)parent.next).data.get_left_handle ();+					h = parent.get_next ().get_left_handle (); 					h.type = PointType.QUADRATIC; 					h.move_to_coordinate_internal (px (), py ()); 					h.parent.set_tie_handle (false); 				} 			} else { 				if (parent.prev != null) {-					h = ((!)parent.prev).data.get_right_handle ();+					h = parent.get_prev ().get_right_handle (); 					h.type = PointType.QUADRATIC; 					h.move_to_coordinate_internal (px (), py ()); 					h.parent.set_tie_handle (false);diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 1acb61b..1a7bbed 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -154,7 +154,7 @@ public class Glyph : FontDisplay { 		clear_active_paths (); 		 		foreach (Path p in path_list) {-			if (p.points.length () > 0) {+			if (p.points.size > 0) { 				add_active_path (p); 			} 		}@@ -204,14 +204,30 @@ public class Glyph : FontDisplay { 			y2 = 0; 			return; 		}-				++		x1 = double.MAX;+		x2 = double.MIN;+		y1 = double.MAX;+		y2 = double.MIN;+	 		foreach (Path p in path_list) { 			p.update_region_boundaries (); 						-			if (p.xmin < x1) x1 = p.xmin;-			if (p.xmax > x2) x2 = p.xmax;-			if (p.ymin < y1) y1 = p.ymin;-			if (p.ymax > y2) y2 = p.ymax;+			if (p.xmin < x1) {+				x1 = p.xmin;+			}+			+			if (p.xmax > x2) {+				x2 = p.xmax;+			}+			+			if (p.ymin < y1) {+				y1 = p.ymin;+			}+			+			if (p.ymax > y2) {+				y2 = p.ymax;+			} 		} 	} 	@@ -461,16 +477,12 @@ public class Glyph : FontDisplay { 	 	public void remove_empty_paths () { 		foreach (Path p in path_list) {-			if (p.points.length () < 2) {+			if (p.points.size < 2) { 				delete_path (p); 				remove_empty_paths (); 				return; 			} 		}--		foreach (Path p in path_list) {-			assert (p.points.length () > 0);-		} 	} 	 	public void delete_path (Path p) requires (path_list.size > 0) {@@ -578,7 +590,7 @@ public class Glyph : FontDisplay { 	public bool process_deleted () { 		Gee.ArrayList<Path> deleted_paths = new Gee.ArrayList<Path> (); 		foreach (Path p in path_list) {-			if (p.points.length () > 0) {+			if (p.points.size > 0) { 				if (process_deleted_points_in_path (p)) { 					return true; 				}@@ -921,7 +933,7 @@ public class Glyph : FontDisplay { 		}  		foreach (Path p in path_list) {-			if (p.points.length () == 0) continue;+			if (p.points.size == 0) continue; 			 			p.get_closest_point_on_path (ep, xt, yt); 			d = Math.pow (ep.x - xt, 2) + Math.pow (ep.y - yt, 2);@@ -976,7 +988,7 @@ public class Glyph : FontDisplay { 		clear_active_paths (); 		add_active_path (np); 		-		inserted = np.points.last ().data;+		inserted = np.points.get (np.points.size - 1); 		 		return new PointSelection (inserted, np); 	}@@ -1046,7 +1058,7 @@ public class Glyph : FontDisplay { 			EditPoint pl = path.get_last_point (); 			 			if (pl.prev != null) {-				p = pl.get_prev ().data;+				p = pl.get_prev (); 				 				px = p.x + xc; 				py = p.y - xc;@@ -1176,7 +1188,7 @@ public class Glyph : FontDisplay { 		foreach (var p in path_list) { 			p.update_region_boundaries (); 			-			if (p.points.length () > 2) {+			if (p.points.size > 2) { 				if (p.xmin < ax) ax = p.xmin; 				if (p.ymin < ay) ay = p.ymin;			 				if (p.xmax > bx) bx = p.xmax;@@ -1302,7 +1314,7 @@ public class Glyph : FontDisplay { 	 	public bool is_empty () { 		foreach (Path p in path_list) {-			if (p.points.length () > 0) {+			if (p.points.size > 0) { 				return false; 			} 		}diff --git a/libbirdfont/GlyphBackgroundImage.vala b/libbirdfont/GlyphBackgroundImage.valaindex 2d48d5a..825270c 100644--- a/libbirdfont/GlyphBackgroundImage.vala+++ b/libbirdfont/GlyphBackgroundImage.vala@@ -806,7 +806,7 @@ public class GlyphBackgroundImage { 				 				p.add (x, y); 				-				if (p.points.length () > 10) {+				if (p.points.size > 10) { 					return p; 				} 			}diff --git a/libbirdfont/IntersectionList.vala b/libbirdfont/IntersectionList.valaindex d668a49..e892b89 100644--- a/libbirdfont/IntersectionList.vala+++ b/libbirdfont/IntersectionList.vala@@ -103,33 +103,33 @@ class IntersectionList { 	public static IntersectionList create_intersection_list (Path p1, Path p2) { 		IntersectionList il = new IntersectionList (); 		-		unowned List<EditPoint> a_start, a_stop;-		unowned List<EditPoint> b_start, b_stop;+		unowned EditPoint a_start, a_stop;+		unowned EditPoint b_start, b_stop; 		 		if (p1 == p2) { 			return il; 		} 		 		// find crossing paths-		a_start = p1.points.first ();-		for (int i = 0; i < p1.points.length (); i++) {+		a_start = p1.points.get (0).get_link_item ();+		for (int i = 0; i < p1.points.size; i++) { 			-			if (a_start.data.next == null) {-				a_stop = p1.points.first ();+			if (a_start.next == null) {+				a_stop = p1.points.get (0).get_link_item (); 			} else {-				a_stop = a_start.data.get_next ();+				a_stop = a_start.get_next (); 			} 			-			b_start = p2.points.first ();-			for (int j = 0; j < p2.points.length (); j++) {+			b_start = p2.points.get (0).get_link_item ();+			for (int j = 0; j < p2.points.size; j++) { 				-				if (b_start.data.next == null) {-					b_stop = p2.points.first ();+				if (b_start.next == null) {+					b_stop = p2.points.get (0).get_link_item (); 				} else {-					b_stop = b_start.data.get_next ();+					b_stop = b_start.get_next (); 				} -				il.append (find_intersections (a_start.data, a_stop.data, b_start.data, b_stop.data));+				il.append (find_intersections (a_start, a_stop, b_start, b_stop));  				b_start = b_stop; 			}diff --git a/libbirdfont/MoveTool.vala b/libbirdfont/MoveTool.valaindex 195da54..61be43b 100644--- a/libbirdfont/MoveTool.vala+++ b/libbirdfont/MoveTool.vala@@ -172,7 +172,7 @@ class MoveTool : Tool { 		 		foreach (Path p in glyph.path_list) { 			if (p.xmin > x1 && p.xmax < x2 && p.ymin < y1 && p.ymax > y2) {-				if (p.points.length () > 0) {+				if (p.points.size > 0) { 					glyph.add_active_path (p); 				} 			}diff --git a/libbirdfont/OpenFontFormat/GlyfData.vala b/libbirdfont/OpenFontFormat/GlyfData.valaindex 99a9d48..418e1a5 100644--- a/libbirdfont/OpenFontFormat/GlyfData.vala+++ b/libbirdfont/OpenFontFormat/GlyfData.vala@@ -61,7 +61,7 @@ class GlyfData : GLib.Object { 		glyph = g; 						 		foreach (Path p in g.path_list) {-			if (p.points.length () > 0) {+			if (p.points.size > 0) { 				q = p.get_quadratic_points ();  				if (!is_empty (q)) {@@ -84,7 +84,7 @@ class GlyfData : GLib.Object { 	bool is_empty (Path p) { 		EditPoint? last = null; 		-		if (unlikely (p.points.length () < 2)) {+		if (unlikely (p.points.size < 2)) { 			warning (@"A path in $(glyph.get_name ()) has less than three points, it will not be exported."); 			return true; 		}@@ -96,7 +96,7 @@ class GlyfData : GLib.Object { 			last = ep; 		} 		-		warning (@"A path in $(glyph.get_name ()) ($(glyph.get_hex ())) has no area but $(p.points.length ()) points at $(p.get_first_point ().x),$(p.get_first_point ().y).");+		warning (@"A path in $(glyph.get_name ()) ($(glyph.get_hex ())) has no area but $(p.points.size) points at $(p.get_first_point ().x),$(p.get_first_point ().y)."); 		return true; 	} @@ -119,12 +119,12 @@ class GlyfData : GLib.Object { 		end_point = 0; 		 		foreach (Path quadratic in paths) {-			if (unlikely (quadratic.points.length () == 0)) {-				warning (@"No points in path (before conversion $(quadratic.points.length ()))");+			if (unlikely (quadratic.points.size == 0)) {+				warning (@"No points in path (before conversion $(quadratic.points.size))"); 				continue; 			} 			-			if (unlikely (quadratic.points.length () < 2)) {+			if (unlikely (quadratic.points.size < 2)) { 				warning ("A path contains less than three points, it will not be exported."); 				continue; 			}diff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex 060298a..99a5379 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -24,7 +24,7 @@ public enum Direction {  public class Path { 	-	public List<EditPoint> points;+	public Gee.ArrayList<EditPoint> points;  	EditPoint? last_point = null; 	@@ -69,7 +69,7 @@ public class Path { 	private static ImageSurface? cubic_active_selected_edit_point_image = null; 	 	Path quadratic_path; // quadratic points for TrueType export-	List<EditPoint> new_quadratic_points;+	Gee.ArrayList<EditPoint> new_quadratic_points; 	 	public static double line_color_r = 0; 	public static double line_color_g = 0;@@ -93,8 +93,8 @@ public class Path { 	 	public Path () { 		string width;-		points = new List<EditPoint> ();-		new_quadratic_points = new List<EditPoint> ();+		points = new Gee.ArrayList<EditPoint> ();+		new_quadratic_points = new Gee.ArrayList<EditPoint> (); 		 		if (edit_point_image == null) { 			edit_point_image = Icons.get_icon ("edit_point.png");@@ -140,21 +140,21 @@ public class Path { 	}  	public EditPoint get_first_point () {-		if (unlikely (points.length () == 0)) {+		if (unlikely (points.size == 0)) { 			warning ("No point"); 			return new EditPoint (); 		} 		-		return points.first ().data;+		return points.get (0); 	}  	public EditPoint get_last_point () {-		if (unlikely (points.length () == 0)) {+		if (unlikely (points.size == 0)) { 			warning ("No point"); 			return new EditPoint (); 		} 		-		return points.last ().data;+		return points.get (points.size - 1); 	}  	public bool has_direction () {@@ -162,7 +162,7 @@ public class Path { 	}  	public bool empty () {-		return points.length () == 0;+		return points.size == 0; 	}  	public void set_stroke (double width) {@@ -186,20 +186,18 @@ public class Path { 	}  	public void draw_outline (Context cr) {-		unowned List<EditPoint> ep = points;-		 		unowned EditPoint? n = null; 		unowned EditPoint en; 		unowned EditPoint em; 		-		if (ep.length () < 2) {+		if (points.size < 2) { 			return; 		} 		 		cr.new_path (); 		 		// draw lines-		foreach (EditPoint e in ep) {+		foreach (EditPoint e in points) { 			if (n != null) { 				en = (!) n; 				draw_next (en, e, cr);@@ -211,26 +209,24 @@ public class Path { 		// close path 		if (!is_open () && n != null) { 			en = (!) n;-			em = ep.first ().data;+			em = points.get (0).get_link_item (); 			draw_next (en, em, cr); 		}  		cr.stroke (); 	} 	-	public void draw_edit_points (Context cr) {-		unowned List<EditPoint> ep = points;-		+	public void draw_edit_points (Context cr) {		 		if (is_editable ()) { 			// control points for curvature-			foreach (EditPoint e in ep) {+			foreach (EditPoint e in points) { 				if (show_all_line_handles || e.selected || e.selected_handle > 0) { 					draw_edit_point_handles (e, cr); 				} 			} 						 			// control points-			foreach (EditPoint e in ep) {+			foreach (EditPoint e in points) { 				draw_edit_point (e, cr); 			} 		}@@ -241,7 +237,6 @@ public class Path { 	 * to show the path. 	 */ 	public void draw_path (Context cr, Color? color = null) {-		unowned List<EditPoint> ep = points; 		unowned EditPoint? n = null; 		unowned EditPoint en; 		unowned EditPoint em;@@ -250,7 +245,7 @@ public class Path { 		double center_x, center_y; 		double ex, ey; -		if (points.length () == 0){+		if (points.size == 0){ 			return; 		} @@ -259,13 +254,13 @@ public class Path { 		center_x = g.allocation.width / 2.0; 		center_y = g.allocation.height / 2.0; -		ex = center_x + points.first ().data.x;-		ey = center_y - points.first ().data.y;+		ex = center_x + points.get (0).x;+		ey = center_y - points.get (0).y; 		 		cr.move_to (ex, ey); 		 		// draw lines-		foreach (EditPoint e in ep) {+		foreach (EditPoint e in points) { 			if (n != null) { 				en = (!) n; 				draw_next (en, e, cr);@@ -275,9 +270,9 @@ public class Path { 		} 		 		// close path-		if (!is_open () && ep.length () >= 2 && n != null) {+		if (!is_open () && points.size >= 2 && n != null) { 			en = (!) n;-			em = ep.first ().data;+			em = points.get (0).get_link_item (); 			draw_next (en, em, cr); 		} @@ -439,12 +434,12 @@ public class Path { 				img_left = (!) edit_point_handle_image; 			} -			if (!(is_open () && e == points.last ().data)) {+			if (!(is_open () && e == points.get (points.size - 1))) { 				draw_line (handle_right, e, cr, 0.15); 				draw_image (cr, img_right, e.get_right_handle ().x (), e.get_right_handle ().y ()); 			} 			-			if (!(is_open () && e == points.first ().data)) {+			if (!(is_open () && e == points.get (0))) { 				draw_line (handle_left, e, cr, 0.15); 				draw_image (cr, img_left, e.get_left_handle ().x (), e.get_left_handle ().y ()); 			}@@ -507,19 +502,6 @@ public class Path { 		return false; 	} 	-	/** Replace edit points in this path with @param new_path.points. */-	public void replace_path (Path new_path) {-		while (points.length () > 0) {-			points.remove_link (points.first ());-		}-		-		foreach (var np in new_path.points) {-			add (np.x, np.y);-		}-		-		close ();-	}-	 	/** Set direction for this path to clockwise for outline and  	 * counter clockwise for inline paths. 	 */@@ -551,44 +533,37 @@ public class Path { 		 		if (unlikely (direction == is_clockwise ())) { 			stderr.printf ("Error: Direction did not change after reversing path.\n");-			stderr.printf (@"Length: $(points.length ())\n");+			stderr.printf (@"Length: $(points.size)\n"); 			stderr.printf (@"No particular direction can be derived: $no_derived_direction \n"); 			warning ("Path.reverse () failed.\n"); 		} 	} -	private void reverse_points () {+	private void reverse_points () requires (points.size > 0) { 		EditPointHandle t; 		Path p = copy ();-		unowned List<EditPoint> e;+		EditPoint e; 		 		create_list ();	 		-		while (points.length () > 0) {-			points.remove_link (points.first ());-		}+		points.clear (); 		-		e = p.points.last ();-		while (!is_null (e) && !is_null (e.data)) {-			t = e.data.right_handle;-			e.data.right_handle = e.data.left_handle;-			e.data.left_handle = t;+		for (int i = p.points.size - 1; i >= 0 ; i--) {+			e = p.points.get (i); 			-			add_point (e.data);+			t = e.right_handle;+			e.right_handle = e.left_handle;+			e.left_handle = t; 			-			if (is_null (e.prev)) {-				break;-			} else {-				e = e.prev;-			}+			add_point (e); 		}-+		 		create_list (); 	}  	public void print_all_points () { 		int i = 0;-		foreach (var p in points) {+		foreach (EditPoint p in points) { 			++i; 			string t = (p.type == PointType.END) ? " endpoint" : ""; 			stdout.printf (@"Point $i at ($(p.x), $(p.y)) $t \n");@@ -598,7 +573,7 @@ public class Path { 	private double clockwise_sum () { 		double sum = 0; 		-		return_val_if_fail (points.length () >= 3, 0);+		return_val_if_fail (points.size >= 3, 0); 		 		foreach (EditPoint e in points) { 			sum += e.get_direction ();@@ -610,7 +585,7 @@ public class Path { 	public bool is_clockwise () { 		double s; 		-		if (unlikely (points.length () <= 2)) {+		if (unlikely (points.size <= 2)) { 			no_derived_direction = true; 			return clockwise_direction; 		}@@ -637,7 +612,9 @@ public class Path { 	public bool is_open () { 		return open; 	}-	++	/*+	// FIXME:DELETE		 	private bool direction_x (EditPoint start, EditPoint stop) { 		return (start.x < stop.x); 	}@@ -714,10 +691,11 @@ public class Path { 			i = i.next; 		} 	}+	*/  	/** Resize path relative to bottom left coordinates. */ 	public void resize (double ratio) {	-		foreach (var p in points) {+		foreach (EditPoint p in points) { 			p.x *= ratio; 			p.y *= ratio; 			p.right_handle.length *= ratio;@@ -734,7 +712,7 @@ public class Path { 		Path new_path = new Path (); 		EditPoint p; 		-		foreach (var ep in points) {+		foreach (EditPoint ep in points) { 			p = ep.copy (); 			new_path.add_point (p); 		}@@ -799,7 +777,7 @@ public class Path { 		PathList pathlist; 		EditPoint next_e, last_e; 		-		if (points.length () < 2) {+		if (points.size < 2) { 			return false; 		} 		@@ -909,25 +887,23 @@ public class Path { 	} 	 	public EditPoint delete_last_point () {-		unowned List<EditPoint> p; 		EditPoint r;-		uint len;+		int len; 		-		len = points.length ();+		len = points.size; 		if (unlikely (len == 0)) { 			warning ("No points in path."); 			return new EditPoint (); 		} 		-		p = points.last ();-		r = p.data;-		points.remove_link (p);+		r = points.get (len - 1);+		points.remove_at (len - 1); 		 		if (len > 1) {-			r.get_prev ().data.next = null;+			r.get_prev ().next = null; 			 			if (r.next != null) {-				r.get_next ().data.prev = null;+				r.get_next ().prev = null; 			} 		} 		@@ -935,56 +911,58 @@ public class Path { 	} 	 	public EditPoint add (double x, double y) {-		return add_after (x, y, points.last ()).data;+		if (points.size > 0) {+			return add_after (x, y, points.get (points.size - 1));+		}+		+		return add_after (x, y, null); 	}  	public EditPoint add_point (EditPoint p) {-		return add_point_after (p, points.last ()).data;+		if (points.size > 0) {+			return add_point_after (p, points.get (points.size - 1));+		}+		+		return add_point_after (p, null); 	}  	/** Insert a new point after @param previous_point and return a reference  	 * to the new item in list. 	 */-	public unowned List<EditPoint> add_after (double x, double y, List<EditPoint>? previous_point) {+	public EditPoint add_after (double x, double y, EditPoint? previous_point) { 		EditPoint p = new EditPoint (x, y, PointType.NONE);	 		return add_point_after (p, previous_point); 	} 	 	/** @return a list item pointing to the new point */-	public unowned List<EditPoint> add_point_after (EditPoint p, List<EditPoint>? previous_point) {-		unowned List<EditPoint> np;+	public EditPoint add_point_after (EditPoint p, EditPoint? previous_point) { 		int prev_index; -		if (points.length () > 0 && previous_point != null && ((!)previous_point).data.type == PointType.END) {-			points.delete_link ((!) previous_point);-		}--		if (unlikely (previous_point == null && points.length () != 0)) {+		if (unlikely (previous_point == null && points.size != 0)) { 			warning ("previous_point == null");+			previous_point = points.get (points.size - 1).get_link_item (); 		} -		if (points.length () == 0) {-			points.append (p);-			np = points.last ();-			p.prev = points.last ();-			p.next = points.last ();+		if (points.size == 0) {+			points.add (p);+			p.prev = points.get (0).get_link_item ();+			p.next = points.get (0).get_link_item (); 		} else { 			p.prev = (!) previous_point; 			p.next = ((!) previous_point).next;--			points.insert_before (((!) previous_point).next, p); 			-			prev_index = points.position ((!) previous_point);-			np = points.nth (prev_index + 1);+			prev_index = points.index_of ((!) previous_point); 			-			if (unlikely (p.prev == null)) {-				warning ("Prev point is null");+			if (unlikely (!(0 <= prev_index < points.size))) {+				warning ("no previous point"); 			}+			+			points.insert (prev_index + 1, p);			 		} 		 		last_point = p; 		-		return np;+		return p; 	}  	public void recalculate_linear_handles () {@@ -999,9 +977,9 @@ public class Path {  		create_list (); 		-		if (points.length () > 2) {-			points.first ().data.recalculate_linear_handles ();-			points.last ().data.recalculate_linear_handles ();+		if (points.size > 2) {+			points.get (0).recalculate_linear_handles ();+			points.get (points.size - 1).recalculate_linear_handles (); 		} 	} 	@@ -1073,7 +1051,7 @@ public class Path { 		ymax = -10000; 		ymin = 10000; 		-		if (points.length () == 0) {+		if (points.size == 0) { 			xmax = 0; 			xmin = 0; 			ymax = 0;@@ -1101,11 +1079,11 @@ public class Path { 	} 	 	private bool test_is_outline_of_path (Path outline)-		requires (outline.points.length () >= 2 || points.length () >= 2)+		requires (outline.points.size >= 2 || points.size >= 2) 	{	 		// rather slow use it for testing, only-		unowned List<EditPoint> i = outline.points.first ();-		unowned List<EditPoint> prev = i.last ();+		unowned EditPoint i = outline.points.get (0).get_link_item ();+		unowned EditPoint prev = outline.points.get (outline.points.size - 1).get_link_item ();  		double tolerance = 1; 		bool g = false;@@ -1116,7 +1094,7 @@ public class Path { 		while (true) { 			min = 10000; 			 -			all_of (prev.data, i.data, (cx, cy) => {+			all_of (prev, i, (cx, cy) => { 					get_closest_point_on_path (ep, cx, cy);  					double n = pow (ep.x - cx, 2) + pow (cy - ep.y, 2);@@ -1137,46 +1115,49 @@ public class Path { 			 			g = false; 			-			if (i == i.last ()) {+			if (i == outline.points.get (outline.points.size - 1)) { 				break; 			} 				-			i = i.next;+			i = i.get_next (); 		} 		 		return true; 	}  	/** Add the extra point between line handles for double curve. */-	public void add_hidden_double_points () requires (points.length () > 1) {+	public void add_hidden_double_points () requires (points.size > 1) { 		EditPoint hidden;-		unowned List<EditPoint> first = points.last ();+		EditPoint first = points.get (points.size - 1); 		PointType left; 		PointType right; 		double x, y;--		for (unowned List<EditPoint> next = points.first (); !is_null (next); next = next.next) {-			left = first.data.get_right_handle ().type;-			right = next.data.get_left_handle ().type;+		unowned EditPoint next = points.get (0).get_link_item ();+		unowned EditPoint? next_item;+		+		for (next_item = points.get (0).get_link_item (); next_item != null; next_item = next.next) {+			next = (!) next_item;+			left = first.get_right_handle ().type;+			right = next.get_left_handle ().type; 			if (right == PointType.DOUBLE_CURVE || left == PointType.DOUBLE_CURVE) {-				first.data.get_right_handle ().type = PointType.QUADRATIC;+				first.get_right_handle ().type = PointType.QUADRATIC;  				// half the way between handles-				x = first.data.get_right_handle ().x () + (next.data.get_left_handle ().x () - first.data.get_right_handle ().x ()) / 2;-				y = first.data.get_right_handle ().y () + (next.data.get_left_handle ().y () - first.data.get_right_handle ().y ()) / 2;+				x = first.get_right_handle ().x () + (next.get_left_handle ().x () - first.get_right_handle ().x ()) / 2;+				y = first.get_right_handle ().y () + (next.get_left_handle ().y () - first.get_right_handle ().y ()) / 2; 				 				hidden = new EditPoint (x, y, PointType.QUADRATIC);-				hidden.right_handle.move_to_coordinate_internal (next.data.get_left_handle ().x(), next.data.get_left_handle ().y());+				hidden.right_handle.move_to_coordinate_internal (next.get_left_handle ().x(), next.get_left_handle ().y()); 				hidden.get_right_handle ().type = PointType.QUADRATIC; 				 				hidden.get_left_handle ().type = PointType.QUADRATIC; 				hidden.type = PointType.QUADRATIC; 				-				first.data.get_right_handle ().type = PointType.QUADRATIC;-				first.data.type = PointType.QUADRATIC;+				first.get_right_handle ().type = PointType.QUADRATIC;+				first.type = PointType.QUADRATIC; 				-				next.data.get_left_handle ().type = PointType.QUADRATIC;-				next.data.type = PointType.QUADRATIC;+				next.get_left_handle ().type = PointType.QUADRATIC;+				next.type = PointType.QUADRATIC; 				 				add_point_after (hidden, first); 			}@@ -1188,42 +1169,40 @@ public class Path { 	 * for ttf-export. 	 */  	public Path get_quadratic_points () {-		unowned List<EditPoint> i, next;+		EditPoint i, next; 		 		quadratic_path = new Path (); 		-		while (new_quadratic_points.length () > 0) {-			new_quadratic_points.remove_link (new_quadratic_points.first ());-		}--		if (points.length () < 2) {+		new_quadratic_points.clear ();+		+		if (points.size < 2) { 			warning ("Less than 2 points in path."); 			return quadratic_path; 		} 		-		i = points.first ();-		next = i.next;+		i = points.get (0);+		next = i.get_next (); -		while (i != points.last ()) {-			if (i.data.get_right_handle ().type == PointType.CUBIC -				|| next.data.get_left_handle ().type == PointType.CUBIC) {-				add_quadratic_points (i.data, next.data);+		while (i != points.get (points.size - 1)) {+			if (i.get_right_handle ().type == PointType.CUBIC +				|| next.get_left_handle ().type == PointType.CUBIC) {+				add_quadratic_points (i, next); 			} else {-				quadratic_path.add_point (i.data.copy ());+				quadratic_path.add_point (i.copy ()); 			} 			-			i = i.next;-			next = i.next;+			i = i.get_next ();+			next = i.get_next (); 		} 		-		if (!is_open () && (points.last ().data.get_right_handle ().type == PointType.CUBIC -			||  points.first ().data.get_left_handle ().type == PointType.CUBIC)) {-			add_quadratic_points (points.last ().data, points.first ().data);+		if (!is_open () && (points.get (points.size - 1).get_right_handle ().type == PointType.CUBIC +			||  points.get (0).get_left_handle ().type == PointType.CUBIC)) {+			add_quadratic_points (points.get (points.size - 1), points.get (0)); 		} else {-			quadratic_path.add_point (points.last ().data.copy ());+			quadratic_path.add_point (points.get (points.size - 1).copy ()); 		} -		if (quadratic_path.points.length () < 2) {+		if (quadratic_path.points.size < 2) { 			warning ("Less than 2 points in quadratic path."); 			return new Path (); 		}@@ -1238,7 +1217,7 @@ public class Path {  		foreach (EditPoint ep in quadratic_path.points) { 			if (ep.type == PointType.QUADRATIC) {-				ep.get_left_handle ().move_to_coordinate (ep.get_prev ().data.get_right_handle ().x (), ep.get_prev ().data.get_right_handle ().y ());+				ep.get_left_handle ().move_to_coordinate (ep.get_prev ().get_right_handle ().x (), ep.get_prev ().get_right_handle ().y ()); 			} 		} @@ -1256,7 +1235,7 @@ public class Path { 		EditPoint prev =  new EditPoint (); 		int added_points = 0; 		-		if (points.length () < 2) {+		if (points.size < 2) { 			return; 		} @@ -1280,11 +1259,11 @@ public class Path { 			prev = e;  			e = quadratic_path.add_point (e);-			prev = quadratic_path.points.last ().data;+			prev = quadratic_path.points.get (quadratic_path.points.size - 1); 			 			prev.recalculate_linear_handles (); 			-			new_quadratic_points.append (prev);+			new_quadratic_points.add (prev); 			return true; 		}, steps); 		@@ -1292,9 +1271,9 @@ public class Path { 	}  	void process_cubic_handles () -		requires (quadratic_path.points.length () > 0) {	+		requires (quadratic_path.points.size > 0) {	 		-		EditPoint prev = quadratic_path.points.last ().data;+		EditPoint prev = quadratic_path.points.get (quadratic_path.points.size - 1); 		quadratic_path.close (); 		foreach (EditPoint ep in quadratic_path.points) { 			if (ep.type == PointType.CUBIC) {@@ -1315,7 +1294,7 @@ public class Path { 		ep.set_tie_handle (true); 		 		if (ep.next != null) {-			((!) ep.next).data.set_tie_handle (false);+			((!) ep.next).set_tie_handle (false); 		}  		prev.get_left_handle ().type = PointType.QUADRATIC;@@ -1333,12 +1312,12 @@ public class Path { 	void process_quadratic_handles () {	 		for (int t = 0; t < 2; t++) { 			foreach (EditPoint ep in new_quadratic_points) {	-				if (!is_null (ep.next) && !is_null (ep.next) -					&& ((!)ep.next).data.type != PointType.CUBIC-					&& ((!)ep.next).data.type != PointType.LINE_CUBIC-					&& !is_null (ep.prev) -					&& ((!)ep.prev).data.type != PointType.CUBIC-					&& ((!)ep.prev).data.type != PointType.LINE_CUBIC) {+				if (ep.next != null+					&& ((!)ep.next).type != PointType.CUBIC+					&& ((!)ep.next).type != PointType.LINE_CUBIC+					&& ep.prev != null +					&& ((!)ep.prev).type != PointType.CUBIC+					&& ((!)ep.prev).type != PointType.LINE_CUBIC) { 						 					ep.set_tie_handle (true); 					ep.process_tied_handle ();@@ -1358,8 +1337,8 @@ public class Path { 			return; 		} -		start = ep.get_prev ().data;-		stop = ep.get_next ().data;+		start = ep.get_prev ();+		stop = ep.get_next ();  		right = start.get_right_handle ().type; 		left = stop.get_left_handle ().type;@@ -1442,8 +1421,8 @@ public class Path { 		if (right == PointType.QUADRATIC) { // update connected handle 			if (ep.prev != null) { 				ep.get_left_handle ().move_to_coordinate_internal (-					ep.get_prev ().data.right_handle.x (), -					ep.get_prev ().data.right_handle.y ());+					ep.get_prev ().right_handle.x (), +					ep.get_prev ().right_handle.y ());  			} else { 				warning ("ep.prev is null for quadratic point");@@ -1458,7 +1437,7 @@ public class Path { 			 	/** Get a point on the this path closest to x and y coordinates. */ 	public void get_closest_point_on_path (EditPoint edit_point, double x, double y) {-		return_if_fail (points.length () != 0);+		return_if_fail (points.size != 0); 		 		double min = double.MAX; 		double n = 0;@@ -1470,27 +1449,27 @@ public class Path { 		double handle_x0, handle_x1; 		double handle_y0, handle_y1; 		-		unowned List<EditPoint> i = points.first ();-		unowned List<EditPoint> prev = i.next;+		unowned EditPoint prev = points.get (0).get_link_item ();+		unowned EditPoint i = prev.get_next ();  		bool done = false; 		bool exit = false; 		-		unowned List<EditPoint>? previous_point = null;-		unowned List<EditPoint>? next_point = null;+		unowned EditPoint? previous_point = null;+		unowned EditPoint? next_point = null;  		EditPoint previous; 		EditPoint next; 		double step = 0; -		if (points.length () == 0) {+		if (points.size == 0) { 			warning ("Empty path."); 			return; 		} -		if (points.length () == 1) {-			edit_point.x = i.data.x;-			edit_point.y = i.data.y;+		if (points.size == 1) {+			edit_point.x = i.x;+			edit_point.y = i.y; 			 			edit_point.prev = i; 			edit_point.next = i;@@ -1499,29 +1478,29 @@ public class Path { 			return; 		} 		-		if (points.length () != 1) {-			edit_point.x = i.data.x;-			edit_point.y = i.data.y;+		if (points.size != 1) {+			edit_point.x = i.x;+			edit_point.y = i.y; 		} 		 		while (!exit) { 			-			if (i == points.last ()) {+			if (i == points.get (points.size - 1)) { 				done = true; 			} 			 			if (!done) {-				i = i.next;-				prev = i.prev;+				i = i.get_next ();+				prev = i.get_prev (); 			}	else if (done && !is_open ()) {-				i = points.first ();-				prev = points.last ();+				i = points.get (0).get_link_item ();+				prev = points.get (points.size - 1).get_link_item (); 				exit = true; 			} else { 				break; 			} 			-			all_of (prev.data, i.data, (cx, cy, t) => {+			all_of (prev, i, (cx, cy, t) => { 				n = pow (x - cx, 2) + pow (y - cy, 2); 				 				if (n < min) {@@ -1530,7 +1509,7 @@ public class Path { 					ox = cx; 					oy = cy; 				-					previous_point = prev;+					previous_point = i.prev; 					next_point = i; 					 					step = t;@@ -1543,11 +1522,11 @@ public class Path { 		}  		if (previous_point == null && is_open ()) {-			previous_point = points.last ();+			previous_point = points.get (points.size - 1).get_link_item (); 		} 		 		if (previous_point == null) {-			warning (@"previous_point == null, points.length (): $(points.length ())");+			warning (@"previous_point == null, points.size: $(points.size)"); 			return; 		} 		@@ -1556,8 +1535,8 @@ public class Path { 			return; 		} -		previous = ((!) previous_point).data;-		next = ((!) next_point).data;+		previous = (!) previous_point;+		next = (!) next_point;  		// FIXME: delete 		bezier_vector (step, previous.x, previous.get_right_handle ().x (), next.get_left_handle ().x (), next.x, out handle_x0, out handle_x1);@@ -1674,23 +1653,20 @@ public class Path { 	}  	public void all_segments (SegmentIterator iter) {-		unowned List<EditPoint> i, next;+		unowned EditPoint i, next; 		-		if (points.length () < 2) {+		if (points.size < 2) { 			return; 		} -		i = points.first ();-		next = i.next;--		while (i != points.last ()) {-			iter (i.data, next.data);-			i = i.next;-			next = i.next;+		for (int j = 0; j < points.size - 1; j++) {+			i = points.get (j).get_link_item ();+			next = i.get_next ();+			iter (i, next); 		} 		 		if (!is_open ()) {-			iter (points.last ().data, points.first ().data);+			iter (points.get (points.size - 1), points.get (0)); 		}		 	} @@ -1771,20 +1747,6 @@ public class Path { 		d0 = b0 + (b0 - c0) * 25000 * (step); 		d1 = b1 + (b1 - c1) * 25000 * (1 - step); 	-	// FIXME: DELETE		-	/*-		// set angle-		b0 = double_bezier_path (step - 0.00001, p0, p1, p2, p3);-		c0 = double_bezier_path (step - 0.00002, p0, p1, p2, p3);--		b1 = double_bezier_path (step + 0.00001, p0, p1, p2, p3);-		c1 = double_bezier_path (step + 0.00002, p0, p1, p2, p3);-		-		// adjust length-		d0 = b0 + (b0 - c0) * 25000 * (1 - step);-		d1 = b1 + (b1 - c1) * 25000 * step;-	*/	-	 		a0 = d0; 		a1 = d1; 	}@@ -1823,51 +1785,36 @@ public class Path { 	} 	 	public void create_list () {-		unowned List<EditPoint> prev = points.last ();-		unowned List<EditPoint> ep = points.first ();+		EditPoint ep; 		-		if (points.length () == 0) {+		if (points.size == 0) { 			return; 		} 		-		if (points.length () == 1) {-			ep.data.next = null;-			ep.data.prev = null;+		if (points.size == 1) {+			ep = points.get (0);+			ep.next = null;+			ep.prev = null; 			return; 		} 		-		ep.data.next = ep.next;-		ep.data.prev = points.last ();-		prev = ep;-		-		assert (ep.data.next != null);-		assert (ep.data.prev != null);-		-		while (ep != ep.last ()) {-			ep.data.next = ep.next;-			ep.data.prev = prev;-			prev = ep;-			-			assert (ep.data.next != null);-			assert (ep.data.prev != null);-		-			ep = ep.next;+		ep = points.get (0);+		ep.next = points.get (1).get_link_item ();+		ep.prev = points.get (points.size - 1).get_link_item ();++		for (int i = 1; i < points.size - 1; i++) {+			ep = points.get (i);+			ep.prev = points.get (i - 1).get_link_item ();+			ep.next = points.get (i + 1).get_link_item (); 		} 		-		ep.data.next = points.first ();-		ep.data.prev = prev;-		assert (ep.data.prev != null);--		points.first ().data.prev = points.last ();+		ep = points.get (points.size - 1);+		ep.next = points.get (0).get_link_item ();+		ep.prev = points.get (points.size - 2).get_link_item (); 	}  	public bool has_point (EditPoint ep) {-		foreach (EditPoint p in points) {-			if (p == ep) {-				return true;-			}-		}-		return false;+		return points.contains (ep); 	} 	 	public bool has_deleted_point () {@@ -1881,32 +1828,31 @@ public class Path { 	 	/** @return the remaining parts as a new path. */ 	public PathList process_deleted_points () -		requires (points.length () > 0)+		requires (points.size > 0) 	{-		unowned List<EditPoint>? pl = null; 		EditPoint p;-		EditPoint ep = new EditPoint ();+		EditPoint ep; 		Path current_path = new Path (); 		Path remaining_points = new Path (); 		PathList path_list = new PathList ();-		uint i;+		int i;+		int index = 0; 		 		if (!has_deleted_point ()) {  			return path_list; 		} 		-		if (points.length () == 1) {-			points.delete_link (points.first ());+		if (points.size == 1) {+			points.remove_at (0); 			return path_list; 		} 		 		// set start position to the point that will be removed	-		for (i = 0; i < points.length (); i++) {-			pl = points.nth (i);-			return_val_if_fail (pl != null, remaining_points);-			p = ((!)pl).data;-			+		for (i = 0; i < points.size; i++) {+			p = points.get (i);+						 			if (p.deleted) {+				index = i; 				i++; 				ep = p; 				break;@@ -1914,27 +1860,16 @@ public class Path { 		}  		// copy points after the deleted point-		while (i < points.length ()) {-			pl = points.nth (i);-			return_val_if_fail (pl != null, remaining_points);-			p = ((!)pl).data;+		while (i < points.size) {+			p = points.get (i); 			current_path.add_point (p); 			i++; 		}  		// copy points before the deleted point-		i = 0;-		while (i < points.length ()) {-			pl = points.nth (i);-			return_val_if_fail (pl != null, remaining_points);-			p = ((!)pl).data;-			if (p == ep) {-				break;-			} else {-				remaining_points.add_point (p);-			}-			-			i++;+		for (i = 0; i < index; i++) {+			p = points.get (i);+			remaining_points.add_point (p); 		} 		 		// merge if we still only have one path@@ -1943,46 +1878,42 @@ public class Path { 				current_path.add_point (point.copy ()); 			} 			-			if (current_path.points.length () > 0) {-				ep = current_path.points.first ().data;+			if (current_path.points.size > 0) {+				ep = current_path.points.get (0); 				ep.set_tie_handle (false); 				ep.set_reflective_handles (false); 				ep.get_left_handle ().type = PenTool.to_line (ep.type); 				ep.type = PenTool.to_curve (ep.type); 				path_list.add (current_path);-				-				if (!is_null (current_path.points.last ())) {-					ep = current_path.points.last ().data;-					ep.get_right_handle ().type = PenTool.to_line (ep.type);-					ep.type = PenTool.to_curve (ep.get_right_handle ().type);-				}+			+				ep = current_path.points.get (current_path.points.size - 1);+				ep.get_right_handle ().type = PenTool.to_line (ep.type);+				ep.type = PenTool.to_curve (ep.get_right_handle ().type); 			} 		} else {-			if (current_path.points.length () > 0) {-				ep = current_path.points.first ().data;+			if (current_path.points.size > 0) {+				ep = current_path.points.get (0); 				ep.set_tie_handle (false); 				ep.set_reflective_handles (false); 				ep.get_left_handle ().type = PenTool.to_line (ep.type); 				ep.type = PenTool.to_curve (ep.type);-				set_new_start (current_path.points.first ().data);+				set_new_start (current_path.points.get (0)); 				path_list.add (current_path); 				-				if (!is_null (current_path.points.last ())) {-					ep = current_path.points.last ().data;-					ep.get_right_handle ().type = PenTool.to_line (ep.type);-					ep.type = PenTool.to_curve (ep.get_right_handle ().type);-				}+				ep = current_path.points.get (current_path.points.size - 1);+				ep.get_right_handle ().type = PenTool.to_line (ep.type);+				ep.type = PenTool.to_curve (ep.get_right_handle ().type); 			} 			-			if (remaining_points.points.length () > 0) {-				remaining_points.points.first ().data.set_tie_handle (false);-				remaining_points.points.first ().data.set_reflective_handles (false);-				remaining_points.points.first ().data.type = remaining_points.points.first ().data.type;-				set_new_start (remaining_points.points.first ().data);+			if (remaining_points.points.size > 0) {+				remaining_points.points.get (0).set_tie_handle (false);+				remaining_points.points.get (0).set_reflective_handles (false);+				remaining_points.points.get (0).type = remaining_points.points.get (0).type;+				set_new_start (remaining_points.points.get (0)); 				path_list.add (remaining_points); 				-				if (!is_null (current_path.points.last ())) {-					ep = current_path.points.last ().data;+				if (current_path.points.size > 0) {+					ep = current_path.points.get (current_path.points.size - 1); 					ep.get_right_handle ().type = PenTool.to_line (ep.type); 					ep.type = PenTool.to_curve (ep.get_right_handle ().type); 				}@@ -1997,10 +1928,10 @@ public class Path { 	} 		 	public void set_new_start (EditPoint ep) {-		List<EditPoint> list = new List<EditPoint> ();-		uint len = points.length ();-		unowned List<EditPoint> iter = points.first ();-		unowned List<EditPoint>? ni = null;+		Gee.ArrayList<EditPoint> list = new Gee.ArrayList<EditPoint> ();+		uint len = points.size;+		EditPoint iter = points.get (0);+		EditPoint? ni = null; 		bool found = false;  		foreach (EditPoint it in points) {@@ -2009,7 +1940,7 @@ public class Path { 				break; 			} 			-			iter = iter.next;+			iter = iter.get_next (); 			ni = (!) iter; 		} 		@@ -2024,21 +1955,19 @@ public class Path { 		iter = (!) ni; 		 		for (uint i = 0; i < len; i++) {-			list.append (iter.data);+			list.add (iter); 			-			if (iter == iter.last ())-				iter = iter.first ();-			else-				iter = iter.next;-		+			if (iter == points.get (points.size - 1)) {+				iter = points.get (0).get_link_item ();+			} else {+				iter = iter.get_next ();+			}		 		} 		-		while (points.length () > 0) {-			points.remove_link (points.first ());-		}+		points.clear (); 		 		foreach (EditPoint p in list) {-			points.append (p);+			points.add (p); 		} 		 	}@@ -2219,14 +2148,14 @@ public class Path { 		Path np = new Path (); 		Intersection s = new Intersection (0, 0, 1); 		-		ex = p0.points.last ().data;-		ix = p0.points.last ().data;-		len_i = p0.points.length ();+		ex = p0.points.get (p0.points.size - 1);+		ix = p0.points.get (p0.points.size - 1);+		len_i = p0.points.size; 		-		for (i = 0; i < p0.points.length (); i++) {-			ex = p0.points.nth ((i + offset_i) % len_i).data;+		for (i = 0; i < p0.points.size; i++) {+			ex = p0.points.get ((int) ((i + offset_i) % len_i)); -			if (ex == p0.points.first ().data && i != 0) {	+			if (ex == p0.points.get (0) && i != 0) {	 				s = (!) il.get_intersection (ex);	 				break; 			}@@ -2255,8 +2184,8 @@ public class Path { 				en.right_handle.length = s.editpoint_b.right_handle.length; 							 				// read until we find ex-				for (j = 0; j < p1.points.length (); j++) {-					ix = p1.points.nth (j).data;+				for (j = 0; j < p1.points.size; j++) {+					ix = p1.points.get (j); 					 					if (ix == s.editpoint_b) { 						break;@@ -2264,10 +2193,10 @@ public class Path { 				} 				 				offset_j = j + 1;-				len_j = p1.points.length ();-				for (j = 0; j < p1.points.length (); j++) {+				len_j = p1.points.size;+				for (j = 0; j < p1.points.size; j++) { 					-					ix = p1.points.nth ((j + offset_j) % len_j).data;+					ix = p1.points.get ((int) ((j + offset_j) % len_j)); 					 					// add 					if (np.has_edit_point (ix)) {@@ -2294,7 +2223,7 @@ public class Path { 				en.right_handle.angle  = s.editpoint_a.right_handle.angle; 				en.right_handle.length = s.editpoint_a.right_handle.length; 								-				if (j == p0.points.length ()) {+				if (j == p0.points.size) { 					np.close (); 					new_path = np; 					return true;@@ -2302,15 +2231,15 @@ public class Path {  				// skip to next intersection 				int k;-				for (k = 0; k < p0.points.length (); k++) {-					ix = p0.points.nth (k).data; +				for (k = 0; k < p0.points.size; k++) {+					ix = p0.points.get (k);   					if (ix == s.editpoint_a) { 						break; 					} 				} 				-				if (k == p0.points.length ()) {+				if (k == p0.points.size) { 					new_path = np; 					return true; 				}@@ -2326,35 +2255,20 @@ public class Path { 	}  	public void append_path (Path path) {-		if (points.length () == 0 || path.points.length () == 0) {+		if (points.size == 0 || path.points.size == 0) { 			warning ("No points"); 			return; 		} -		// FIXME: DELETE-		/*-		points.last ().data.right_handle.type = path.points.first ().data.type;-		points.last ().data.right_handle.move_to_coordinate (-			path.points.first ().data.right_handle.x (),-			path.points.first ().data.right_handle.y ());-			-		path.points.first ().data.right_handle.type = -			points.last ().data.right_handle.type;-		*/-		path.points.first ().data.recalculate_linear_handles ();-		points.last ().data.recalculate_linear_handles ();+		path.points.get (0).recalculate_linear_handles ();+		points.get (points.size - 1).recalculate_linear_handles (); 		 		// copy remaining points 		foreach (EditPoint p in path.points) { 			add_point (p.copy ()); 		} 		-		// close path-		while (path.points.length () > 0) {-			path.points.remove_link (path.points.first ());-		}-		-		//close ();+		path.points.clear (); 	}  	/** Roatate around coordinate xc, xc. */@@ -2458,7 +2372,7 @@ public class Path { 	} 	 	public void convert_path_ending_to_line () {-		if (points.length () < 2) {+		if (points.size < 2) { 			return; 		} 		@@ -2488,8 +2402,8 @@ public class Path { 		double x0, y0, x1, y1, x2, y2, x3, y3; 		double minx, maxx, miny, maxy; 		-		if (unlikely (points.length () < 2)) {-			warning (@"Missing points, $(points.length ()) points in path.");+		if (unlikely (points.size < 2)) {+			warning (@"Missing points, $(points.size) points in path."); 			return; 		} 		@@ -2547,8 +2461,8 @@ public class Path { 		 		get_closest_point_on_path (ep, x, y); -		exists = ep.get_prev ().data.x == ep.x && ep.get_prev ().data.y == ep.y;-		exists |= ep.get_next ().data.x == ep.x && ep.get_next ().data.y == ep.y;+		exists = ep.get_prev ().x == ep.x && ep.get_prev ().y == ep.y;+		exists |= ep.get_next ().x == ep.x && ep.get_next ().y == ep.y; 		 		if (!exists) { 			insert_new_point_on_path (ep);diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex 2b17de4..b28643e 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -575,9 +575,9 @@ public class PenTool : Tool {  		foreach (Path p in glyph.path_list) { 			-			if (p.is_open () && p.points.length () >= 1 -				&& (active_edit_point == p.points.first ().data -				|| active_edit_point == p.points.last ().data)) {+			if (p.is_open () && p.points.size >= 1 +				&& (active_edit_point == p.points.get (0) +				|| active_edit_point == p.points.get (p.points.size - 1))) { 				active_path = p; 				glyph.set_active_path (p); 				@@ -589,7 +589,7 @@ public class PenTool : Tool { 		} 			 		foreach (Path p in glyph.path_list) {-			if (p.is_open () && p.points.length () > 1 && active_edit_point == p.points.first ().data) {+			if (p.is_open () && p.points.size > 1 && active_edit_point == p.points.get (0)) { 				p.reverse (); 				update_selection (); 				reverse = true;@@ -651,12 +651,12 @@ public class PenTool : Tool { 		EditPoint ep_last, ep_first;  		foreach (Path path in glyph.path_list) {-			if (path.points.length () == 0) {+			if (path.points.size == 0) { 				continue; 			} -			ep_last = path.points.last ().data;-			ep_first = path.points.first ().data;	+			ep_last = path.points.get (path.points.size - 1);+			ep_first = path.points.get (0);	 			 			if (active_edit_point == ep_last) { 				m = path;@@ -695,36 +695,36 @@ public class PenTool : Tool { 			return; 		} 		-		if (active_edit_point == path.points.first ().data) {+		if (active_edit_point == path.points.get (0)) { 			path.reverse (); 			update_selection (); 			path.recalculate_linear_handles (); 			direction_changed = true;-			active_edit_point = path.points.last ().data;+			active_edit_point = path.points.get (path.points.size - 1); 			active_path = path; 		} 		 		// join path with it self-		if (path.points.first ().data != active_edit_point+		if (path.points.get (0) != active_edit_point 			&& is_endpoint ((!) active_edit_point)-			&& is_close_to_point (path.points.first ().data, x, y)) {+			&& is_close_to_point (path.points.get (0), x, y)) { 				 			// TODO: set point type-			path.points.first ().data.left_handle.move_to_coordinate (-				path.points.last ().data.left_handle.x (),-				path.points.last ().data.left_handle.y ());+			path.points.get (0).left_handle.move_to_coordinate (+				path.points.get (path.points.size - 1).left_handle.x (),+				path.points.get (path.points.size - 1).left_handle.y ()); 				-			path.points.first ().data.left_handle.type = -				path.points.last ().data.left_handle.type;+			path.points.get (0).left_handle.type = +				path.points.get (path.points.size - 1).left_handle.type; -			path.points.first ().data.recalculate_linear_handles ();-			path.points.last ().data.recalculate_linear_handles ();+			path.points.get (0).recalculate_linear_handles ();+			path.points.get (path.points.size - 1).recalculate_linear_handles (); 			 			// force the connected handle to move-			path.points.first ().data.set_position (-				path.points.first ().data.x, path.points.first ().data.y);+			path.points.get (0).set_position (+				path.points.get (0).x, path.points.get (0).y); 		-			path.points.remove_link (path.points.last ());+			path.points.remove_at (path.points.size - 1); 			 			path.close (); 			glyph.close_path ();@@ -752,30 +752,30 @@ public class PenTool : Tool { 			}  			// we need both start and end points-			if (merge.points.length () < 1 || path.points.length () < 1) {+			if (merge.points.size < 1 || path.points.size < 1) { 				continue; 			} 			-			if (is_close_to_point (merge.points.last ().data, x, y)) {+			if (is_close_to_point (merge.points.get (merge.points.size - 1), x, y)) { 				merge.reverse (); 				update_selection (); 				direction_changed = !direction_changed; 			} -			return_if_fail (merge.points.length () > 0);+			return_if_fail (merge.points.size > 0); -			if (is_close_to_point (merge.points.first ().data, x, y)) {-				merge.points.first ().data.set_tie_handle (false);-				merge.points.first ().data.set_reflective_handles (false);+			if (is_close_to_point (merge.points.get (0), x, y)) {+				merge.points.get (0).set_tie_handle (false);+				merge.points.get (0).set_reflective_handles (false); 				-				merge.points.last ().data.set_tie_handle (false);-				merge.points.last ().data.set_reflective_handles (false);+				merge.points.get (merge.points.size - 1).set_tie_handle (false);+				merge.points.get (merge.points.size - 1).set_reflective_handles (false); 								-				path.points.last ().data.set_tie_handle (false);-				path.points.last ().data.set_reflective_handles (false);+				path.points.get (path.points.size - 1).set_tie_handle (false);+				path.points.get (path.points.size - 1).set_reflective_handles (false); -				path.points.first ().data.set_tie_handle (false);-				path.points.first ().data.set_reflective_handles (false);+				path.points.get (0).set_tie_handle (false);+				path.points.get (0).set_reflective_handles (false); 				 				second_path = merge.copy (); 				@@ -926,7 +926,7 @@ public class PenTool : Tool { 				continue; 			} 			-			if (path.points.length () == 0) {+			if (path.points.size == 0) { 				continue; 			} 			@@ -950,12 +950,12 @@ public class PenTool : Tool { 		Glyph glyph = MainWindow.get_current_glyph (); 		 		foreach (Path path in glyph.path_list) {-			if (path.points.length () < 1) {+			if (path.points.size < 1) { 				continue; 			} 			-			start = path.points.first ().data;-			end = path.points.last ().data;+			start = path.points.get (0);+			end = path.points.get (path.points.size - 1); 			 			if (ep == start || ep == end) { 				return true;@@ -1116,7 +1116,7 @@ public class PenTool : Tool { 	}  	static void set_point_type (EditPoint p) {-		if (p.prev != null && p.get_prev ().data.right_handle.type == PointType.QUADRATIC) {+		if (p.prev != null && p.get_prev ().right_handle.type == PointType.QUADRATIC) { 			p.left_handle.type = PointType.QUADRATIC; 			p.right_handle.type = PointType.LINE_QUADRATIC; 			p.type = PointType.QUADRATIC;@@ -1182,8 +1182,8 @@ public class PenTool : Tool { 		double y = Glyph.path_coordinate_y (event_y); 		 		if (unlikely (!p.has_region_boundaries ())) {-			if (p.points.length () > 0) {-				warning (@"No bounding box. $(p.points.length ())");+			if (p.points.size > 0) {+				warning (@"No bounding box. $(p.points.size)"); 				p.update_region_boundaries (); 			} 		}@@ -1373,10 +1373,10 @@ public class PenTool : Tool { 		} 		 		if (min_right < min_left) {-			return new PointSelection (e.point.get_next ().data, e.path);+			return new PointSelection (e.point.get_next (), e.path); 		} 		-		return new PointSelection (e.point.get_prev ().data, e.path);+		return new PointSelection (e.point.get_prev (), e.path); 	} 	 	private static PointSelection get_next_point_up () {@@ -1503,11 +1503,11 @@ public class PenTool : Tool { 				ep.get_right_handle ().type = PointType.LINE_CUBIC; 			} 			-			if (ep.next != null && ep.get_next ().data.is_selected ()) {+			if (ep.next != null && ep.get_next ().is_selected ()) { 				ep.get_right_handle ().type = PointType.LINE_CUBIC; 			} -			if (ep.prev != null && ep.get_prev ().data.is_selected ()) {+			if (ep.prev != null && ep.get_prev ().is_selected ()) { 				ep.get_left_handle ().type = PointType.LINE_CUBIC; 			} 						@@ -1520,11 +1520,11 @@ public class PenTool : Tool { 				ep.get_right_handle ().type = PointType.LINE_DOUBLE_CURVE; 			} -			if (ep.next != null && ep.get_next ().data.is_selected ()) {+			if (ep.next != null && ep.get_next ().is_selected ()) { 				ep.get_right_handle ().type = PointType.LINE_DOUBLE_CURVE; 			} -			if (ep.prev != null && ep.get_prev ().data.is_selected ()) {+			if (ep.prev != null && ep.get_prev ().is_selected ()) { 				ep.get_left_handle ().type = PointType.LINE_DOUBLE_CURVE; 			} 		}@@ -1537,22 +1537,22 @@ public class PenTool : Tool { 				ep.get_right_handle ().type = PointType.LINE_QUADRATIC; 				 				if (ep.next != null) {-					ep.get_next ().data.get_left_handle ().type = PointType.LINE_QUADRATIC;		+					ep.get_next ().get_left_handle ().type = PointType.LINE_QUADRATIC;		 				} 				 				if (ep.prev != null) {-					ep.get_prev ().data.get_right_handle ().type = PointType.LINE_QUADRATIC;		+					ep.get_prev ().get_right_handle ().type = PointType.LINE_QUADRATIC;		 				} 			} 			-			if (ep.next != null && ep.get_next ().data.is_selected ()) {+			if (ep.next != null && ep.get_next ().is_selected ()) { 				ep.get_right_handle ().type = PointType.LINE_QUADRATIC;-				ep.get_next ().data.get_left_handle ().type = PointType.LINE_QUADRATIC;+				ep.get_next ().get_left_handle ().type = PointType.LINE_QUADRATIC; 			} -			if (ep.prev != null && ep.get_prev ().data.is_selected ()) {+			if (ep.prev != null && ep.get_prev ().is_selected ()) { 				ep.get_left_handle ().type = PointType.LINE_QUADRATIC;-				ep.get_prev ().data.get_right_handle ().type = PointType.LINE_QUADRATIC;+				ep.get_prev ().get_right_handle ().type = PointType.LINE_QUADRATIC; 			}		 			 		}@@ -1655,13 +1655,13 @@ public class PenTool : Tool { 		if (selected_points.length () == 1) { 			selected = selected_points.first ().data; 			if (selected.point.next != null) {-				selected_points.append (new PointSelection (selected.point.get_next ().data, selected.path));-				selected.point.get_next ().data.set_selected (true);+				selected_points.append (new PointSelection (selected.point.get_next (), selected.path));+				selected.point.get_next ().set_selected (true); 			} 			 			if (selected.point.prev != null) {-				selected_points.append (new PointSelection (selected.point.get_prev ().data, selected.path));-				selected.point.get_next ().data.set_selected (true);+				selected_points.append (new PointSelection (selected.point.get_prev (), selected.path));+				selected.point.get_next ().set_selected (true); 			} 			 			reset_selected = true;@@ -1670,12 +1670,12 @@ public class PenTool : Tool { 		foreach (PointSelection ps in selected_points) { 			e = ps.point; 			// convert segments not control points-			if (e.next == null || !e.get_next ().data.is_selected ()) {+			if (e.next == null || !e.get_next ().is_selected ()) { 				continue; 			}  			set_converted_handle_length (e.get_right_handle ());-			set_converted_handle_length (e.get_next ().data.get_left_handle ());+			set_converted_handle_length (e.get_next ().get_left_handle ()); 														 			if (!is_line (e.type)) { 				e.type = DrawingTools.point_type;@@ -1690,9 +1690,9 @@ public class PenTool : Tool { 			}  			if (!is_line (e.type)) {-				e.get_next ().data.get_left_handle ().type = DrawingTools.point_type;+				e.get_next ().get_left_handle ().type = DrawingTools.point_type; 			} else {-				e.get_next ().data.get_left_handle ().type = to_line (DrawingTools.point_type);+				e.get_next ().get_left_handle ().type = to_line (DrawingTools.point_type); 			} 				 			// process connected handlediff --git a/libbirdfont/PointSelection.vala b/libbirdfont/PointSelection.valaindex d7b663e..592ee8d 100644--- a/libbirdfont/PointSelection.vala+++ b/libbirdfont/PointSelection.vala@@ -44,14 +44,14 @@ public class PointSelection : GLib.Object { 	 	/** @return true if this point is the first point in the path. */ 	public bool is_first () {-		return_val_if_fail (path.points.length () > 0, false);-		return path.points.first ().data == point;+		return_val_if_fail (path.points.size > 0, false);+		return path.points.get (0) == point; 	}  	/** @return true if this point is the last point in the path. */ 	public bool is_last () {-		return_val_if_fail (path.points.length () > 0, false);-		return path.points.last ().data == point;+		return_val_if_fail (path.points.size > 0, false);+		return path.points.get (path.points.size - 1) == point; 	} 	 	public bool is_endpoint () {diff --git a/libbirdfont/ResizeTool.vala b/libbirdfont/ResizeTool.valaindex c9183e6..ae8d163 100644--- a/libbirdfont/ResizeTool.vala+++ b/libbirdfont/ResizeTool.vala@@ -282,7 +282,7 @@ class ResizeTool : Tool { 			h = selected_path.ymax - selected_path.ymin; 			w = selected_path.xmax - selected_path.xmin; 			-			if (selected_path.points.length () == 0) {+			if (selected_path.points.size == 0) { 				continue; 			} 			diff --git a/libbirdfont/StrokeTool.vala b/libbirdfont/StrokeTool.valaindex 16802d4..16ec011 100644--- a/libbirdfont/StrokeTool.vala+++ b/libbirdfont/StrokeTool.vala@@ -116,17 +116,17 @@ public class StrokeTool : Tool { 		EditPoint end; 		double angle; 		-		if (path.points.length () < 2) {+		if (path.points.size < 2) { 			warning ("Missing points."); 			return stroke; 		} 		-		if (stroke.points.length () < 4) {+		if (stroke.points.size < 4) { 			warning ("Missing points."); 			return stroke; 		} -		if (counter.points.length () < 4) {+		if (counter.points.size < 4) { 			warning ("Missing points."); 			return stroke; 		}@@ -163,7 +163,7 @@ public class StrokeTool : Tool { 		// Append the other part of the stroke 		merged = stroke.copy (); 		merged.append_path (counter);-		corner2 = merged.points.last ().data;+		corner2 = merged.points.get (merged.points.size - 1); 		 		merged.close (); 		merged.create_list ();@@ -178,7 +178,7 @@ public class StrokeTool : Tool { 		 		new_path = add_tangent_points (p); 		-		if (new_path.points.length () >= 2) {+		if (new_path.points.size >= 2) { 			stroked = change_stroke_width (new_path, thickness); 			 			if (!p.is_open ()) {@@ -311,7 +311,7 @@ public class StrokeTool : Tool { 		 		end_point = true; 		k = 0;-		npoints = new_path.points.length ();+		npoints = new_path.points.size; 		 		if (npoints < 2) { 			warning ("npoints < 2");@@ -343,8 +343,8 @@ public class StrokeTool : Tool { 			nx = ep.x; 			ny = ep.y; 			-			space_left = get_space_difference (new_path, e, e.get_prev ().data, thickness, clockwise);-			space_right = get_space_difference (new_path, e, e.get_next ().data, thickness, clockwise);+			space_left = get_space_difference (new_path, e, e.get_prev (), thickness, clockwise);+			space_right = get_space_difference (new_path, e, e.get_next (), thickness, clockwise); 		 			distance_to_counter = Path.distance (nx, px + counter_dnx, ny, py + counter_dny); 			distance_to_path = Path.distance (px, nx, py, ny);@@ -377,8 +377,8 @@ public class StrokeTool : Tool { 		} 		 		// FIXME. remove?-		stroked.get_first_point ().set_point_type (stroked.get_first_point ().get_next ().data.type);-		stroked.get_last_point ().set_point_type (stroked.get_last_point ().get_prev ().data.type);+		stroked.get_first_point ().set_point_type (stroked.get_first_point ().get_next ().type);+		stroked.get_last_point ().set_point_type (stroked.get_last_point ().get_prev ().type); 		 		stroked.create_list (); 		foreach (EditPoint e in stroked.points) {@@ -388,7 +388,7 @@ public class StrokeTool : Tool { 		foreach (EditPoint e in stroked.points) { 			if (e.type == PointType.QUADRATIC && e.next != null) { 				h1 = e.get_right_handle ();-				h2 = e.get_next ().data.get_left_handle ();+				h2 = e.get_next ().get_left_handle (); 				Path.find_intersection_handle (h1, h2, out handle_x, out handle_y); 				// FIXME: 				//h1.move_to_coordinate_internal (handle_x, handle_y);						@@ -453,7 +453,7 @@ public class StrokeTool : Tool { 		double px = e.x + (e.x - next_x) / 2; 		double py = e.y + (e.y - next_y) / 2; 		ep = path.add (px, py);-		ep.set_point_type (ep.get_prev ().data.type);+		ep.set_point_type (ep.get_prev ().type); 		ep.get_right_handle ().convert_to_line (); 		ep.get_left_handle ().convert_to_line (); 		ep.recalculate_linear_handles ();diff --git a/libbirdfont/Svg.vala b/libbirdfont/Svg.valaindex d587b86..b7c91cd 100644--- a/libbirdfont/Svg.vala+++ b/libbirdfont/Svg.vala@@ -58,7 +58,7 @@ class Svg { 		EditPoint? n = null; 		EditPoint m; 		-		if (p.points.length () < 2) {+		if (p.points.size < 2) { 			return; 		} @@ -80,7 +80,7 @@ class Svg { 			i++; 		} -		m = p.points.first ().data;	+		m = p.points.get (0);	 		add_abs_next ((!) n, m, svg, g, do_glyph); 		 		close_path (svg);diff --git a/libbirdfont/SvgParser.vala b/libbirdfont/SvgParser.valaindex c2cb423..12eb4b9 100644--- a/libbirdfont/SvgParser.vala+++ b/libbirdfont/SvgParser.vala@@ -935,7 +935,7 @@ public class SvgParser { 			} 		} 		-		if (path.points.length () > 0) {+		if (path.points.size > 0) { 			warning ("Open path."); 			path_list.add (path); 		}@@ -1024,7 +1024,7 @@ public class SvgParser { 			} 		} 		-		if (path.points.length () > 0) {+		if (path.points.size > 0) { 			warning ("Open path."); 			path_list.add (path); 		}diff --git a/libbirdfont/TestCases.vala b/libbirdfont/TestCases.valaindex 705819d..1622a3a 100644--- a/libbirdfont/TestCases.vala+++ b/libbirdfont/TestCases.vala@@ -1020,7 +1020,7 @@ class TestCases { 		 		if (direction == p.is_clockwise ()) { 			critical (@"Direction did not change after reverseing path \"$name\"\n");-			stderr.printf (@"Path length: $(p.points.length ()) \n");+			stderr.printf (@"Path length: $(p.points.size) \n"); 			return false; 		} diff --git a/libbirdfont/TrackTool.vala b/libbirdfont/TrackTool.valaindex 80b9458..13a7dd4 100644--- a/libbirdfont/TrackTool.vala+++ b/libbirdfont/TrackTool.vala@@ -213,7 +213,7 @@ public class TrackTool : Tool { 				add_corner (x, y); 			} -			if (p.points.length () == 0) {+			if (p.points.size == 0) { 				warning ("No point."); 				return; 			}@@ -246,12 +246,12 @@ public class TrackTool : Tool { 		Glyph g; 		Path merged = a.copy (); -		if (a.points.length () < 2) {+		if (a.points.size < 2) { 			warning ("Less than two points in path."); 			return merged; 		} -		if (b.path.points.length () < 2) {+		if (b.path.points.size < 2) { 			warning ("Less than two points in path."); 			return merged; 		}@@ -304,13 +304,13 @@ public class TrackTool : Tool { 		}  		foreach (Path p in glyph.path_list) {-			if (p.is_open () && p.points.length () > 2) {-				e = p.points.first ().data;+			if (p.is_open () && p.points.size > 2) {+				e = p.points.get (0); 				if (PenTool.is_close_to_point (e, x, y)) { 					return new PointSelection (e, p); 				} -				e = p.points.last ().data;+				e = p.points.get (p.points.size - 1); 				if (current_end != e && PenTool.is_close_to_point (e, x, y)) { 					return new PointSelection (e, p);				 				}@@ -343,8 +343,8 @@ public class TrackTool : Tool { 		PenTool.convert_point_to_line (new_point, false); 		new_point.set_point_type (PointType.HIDDEN); 		-		if (p.points.length () > 1) {-			glyph.redraw_segment (new_point, new_point.get_prev ().data);+		if (p.points.size > 1) {+			glyph.redraw_segment (new_point, new_point.get_prev ()); 		} 		 		glyph.update_view ();@@ -429,7 +429,7 @@ public class TrackTool : Tool { 					 		p = get_active_path (); -		if (unlikely (p.points.length () == 0)) {+		if (unlikely (p.points.size == 0)) { 			warning ("Missing point."); 			return; 		}@@ -437,7 +437,7 @@ public class TrackTool : Tool { 		px = Glyph.path_coordinate_x (x); 		py = Glyph.path_coordinate_y (y); -		while (p.points.length () > 0 && is_close (p.points.last ().data, px, py)) {+		while (p.points.size > 0 && is_close (p.points.get (p.points.size - 1), px, py)) { 			p.delete_last_point (); 		} 	}@@ -474,7 +474,7 @@ public class TrackTool : Tool { 			 		p = glyph.path_list.get (glyph.path_list.size - 1); -		if (unlikely (p.points.length () < added_points)) {+		if (unlikely (p.points.size < added_points)) { 			warning ("Missing point."); 			return new EditPoint (); 		}@@ -482,7 +482,7 @@ public class TrackTool : Tool { 		sum_x = 0; 		sum_y = 0; 		-		last_point = p.points.last ().data;+		last_point = p.points.get (p.points.size - 1); 		 		for (int i = 0; i < added_points; i++) { 			ep = p.delete_last_point ();@@ -499,17 +499,17 @@ public class TrackTool : Tool { 		average = PenTool.add_new_edit_point (px, py).point; 		 		// tie handles for all points except for the end points-		average.set_tie_handle (p.points.length () > 1); +		average.set_tie_handle (p.points.size > 1);  		-		if (unlikely (p.points.length () == 0)) {+		if (unlikely (p.points.size == 0)) { 			warning ("No points."); 			return new EditPoint (); 		} 		-		if (average.prev != null && average.get_prev ().data.tie_handles) {-			if (p.points.length () > 2) {-				PenTool.convert_point_to_line (average.get_prev ().data, true);-				average.get_prev ().data.process_tied_handle ();+		if (average.prev != null && average.get_prev ().tie_handles) {+			if (p.points.size > 2) {+				PenTool.convert_point_to_line (average.get_prev (), true);+				average.get_prev ().process_tied_handle (); 			} 		}