Clone in a terminal:
Commit 8f4b6b9
Johan Mattsson - 2012-10-12T14:30:40+00:00
8f4b6b99fb0996ed9978e79441d1ee67f56bed05johan.mattsson.m@gmail.com

fix some compiler warnings

Changed files (8)

Diff

diff --git a/src/Font.vala b/src/Font.valaindex cb530fe..f279e44 100644--- a/src/Font.vala+++ b/src/Font.vala@@ -91,14 +91,6 @@ class Font : GLib.Object { 		return svg_export; 	} -	public void set_ttf_export (bool d) {-		ttf_export = d;-	}--	public void set_svg_export (bool d) {-		svg_export = d;-	}- 	public File get_backgrounds_folder () { 		string fn = @"$(get_name ()) backgrounds"; 		File f = Supplement.get_settings_directory ().get_child (fn);diff --git a/src/GlyphTable.vala b/src/GlyphTable.valaindex 91efb16..ffe69a7 100644--- a/src/GlyphTable.vala+++ b/src/GlyphTable.vala@@ -178,8 +178,6 @@ class GlyphTable : GLib.Object { 			 			return (ac < bc) ? 1 : -1; 		}-		-		return (ac < bc) ? 1 : -1; 	} 	 	public void build_index () {@@ -356,9 +354,7 @@ class GlyphTable : GLib.Object { 			} else {  				i = i.prev; 			}-		}-		-		return null;				+		}			 	}  	public bool validate_index () {diff --git a/src/GtkInterface.vala b/src/GtkInterface.valaindex 4d8e03f..5ae9fc9 100644--- a/src/GtkInterface.vala+++ b/src/GtkInterface.vala@@ -24,13 +24,10 @@ using WebKit; namespace Supplement {  public class GtkWindow : Gtk.Window, NativeWindow {-	-	MainWindow window;  	HBox list_box; 	HBox canvas_box; 	-	TabbarCanvas tabbar; 	WebView html_canvas; 	ScrolledWindow html_box; @@ -198,9 +195,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		int w = Preferences.get_window_width (); 		int h = Preferences.get_window_height (); 		-		print ("window_width $w\n");-		-		set_default_size (1000, h);+		set_default_size (w, h); 		// move (10, 240); 	} 	diff --git a/src/Line.vala b/src/Line.valaindex dfd5034..9b23057 100644--- a/src/Line.vala+++ b/src/Line.vala@@ -136,7 +136,7 @@ class Line : GLib.Object { 	} 	 	public void event_move_to (double x, double y, double ax, double ay, Allocation allocation) {-		double p, c, mx, my;+		double p, c; 		bool a = false; 		Glyph g = MainWindow.get_current_glyph (); 		double ivz = 1/g.view_zoom;diff --git a/src/OverView.vala b/src/OverView.valaindex 6427d89..3fc23fc 100644--- a/src/OverView.vala+++ b/src/OverView.vala@@ -386,15 +386,13 @@ class OverView : FontDisplay { 		double gx, gy; 		double x1, x2, y1, y2; 		double scale = nail_zoom_width / 150.0;-		double w, h, m;+		double w, h;  		w = nail_width  - 19; 		h = nail_height - 22; 		 		scale = nail_zoom_height / (210.0 - 15.0); 		-		Font f = Supplement.get_current_font ();- 		if (gl == null) { 			return false; 		}diff --git a/src/PenTool.vala b/src/PenTool.valaindex 99a953c..5adbcee 100644--- a/src/PenTool.vala+++ b/src/PenTool.vala@@ -26,8 +26,7 @@ class PenTool : Tool { 	public static bool move_point_on_path = false;  	public static bool edit_active_corner = false;-	public static EditPoint active_corner = new EditPoint ();-	public static Path active_path = new Path ();+	 	public static List<EditPoint> selected_points = new List<EditPoint> ();   	public static EditPointHandle active_handle = new EditPointHandle.empty ();@@ -127,7 +126,6 @@ class PenTool : Tool { 	 	public void move (double x, double y) { 		Glyph glyph = MainWindow.get_current_glyph ();-		EditPoint ep; 		 		control_point_event (x, y); 		curve_active_corner_event (x, y);@@ -374,8 +372,7 @@ class PenTool : Tool { 		Path? p; 		EditPoint e; 		EditPoint? ep = get_closest_point (event_x, event_y, out p);-		Glyph g = MainWindow.get_current_glyph ();-		+ 		double x = Glyph.path_coordinate_x (event_x); 		double y = Glyph.path_coordinate_y (event_y); 		@@ -531,7 +528,7 @@ class PenTool : Tool { 		Glyph g = MainWindow.get_current_glyph ();  		double d_point = g.view_zoom * get_distance_to_closest_edit_point (event_x, event_y); 		-		double dp, dl, dr;+		double dl, dr; 	 		foreach (EditPoint selected_corner in selected_points) { 			dl = g.view_zoom * selected_corner.get_left_handle ().get_point ().get_distance (x, y);diff --git a/src/TabBar.vala b/src/TabBar.valaindex 0b51742..055509a 100644--- a/src/TabBar.vala+++ b/src/TabBar.vala@@ -418,10 +418,6 @@ class TabBar : GLib.Object { 	} 	 	public void add_tab (FontDisplay display_item, double tab_width = -1, bool always_open = false) {-		ImageSurface im = new ImageSurface (Format.RGB24, 0, 0);-		Context cr = new Context (im);-		TextExtents	te;-		 		int s = (tabs.length () == 0) ? 0 : selected + 1; 		 		if (tab_width < 0) {diff --git a/src/Toolbox.vala b/src/Toolbox.valaindex ecf914c..8d90ecf 100644--- a/src/Toolbox.vala+++ b/src/Toolbox.vala@@ -830,10 +830,6 @@ class Toolbox : GLib.Object  { 		 		cr.restore (); 	}-				-	public bool is_expanded () {-		return expanded;-	} }  class ToolboxExpander : Expander {

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112