Commit 859990d · birdfont

Clone in a terminal:
Commit 859990d
Johan Mattsson - 2014-12-02T14:07:37+00:00
859990de1c416035fbf2646249af3331eae08ee9johan.mattsson.m@gmail.com
Fix compiler warnings

Changed files (9)

Diff

diff --git a/libbirdfont/BackgroundSelectionTool.vala b/libbirdfont/BackgroundSelectionTool.valaindex da9e3e6..69fd4eb 100644--- a/libbirdfont/BackgroundSelectionTool.vala+++ b/libbirdfont/BackgroundSelectionTool.vala@@ -35,7 +35,7 @@ public class BackgroundSelectionTool : CutBackgroundTool { 			double x, y, w, h; 			BackgroundImage bg; 			Text label = new Text ();-			double tx, ty, font_height, glyph_height;+			double tx, ty, font_height; 			 			if (glyph.get_background_image () == null) { 				warning ("No image");diff --git a/libbirdfont/GlyphCanvas.vala b/libbirdfont/GlyphCanvas.valaindex 9cffe81..075f486 100644--- a/libbirdfont/GlyphCanvas.vala+++ b/libbirdfont/GlyphCanvas.vala@@ -56,7 +56,7 @@ public class GlyphCanvas : GLib.Object { 		
 		if (signal_selected) {
 			current_display.selected_canvas ();
-			current_display.dirty_scrollbar = true;
+			FontDisplay.dirty_scrollbar = true;
 		}
 		
 		current_display.redraw_area.connect ((x, y, w, h) => {
diff --git a/libbirdfont/KerningDisplay.vala b/libbirdfont/KerningDisplay.valaindex 21831d9..2b95cb5 100644--- a/libbirdfont/KerningDisplay.vala+++ b/libbirdfont/KerningDisplay.vala@@ -239,7 +239,6 @@ public class KerningDisplay : FontDisplay {  	private void display_kerning_value (double k) { 		string kerning = round (k);-		double item_size = 1.0 / KerningTools.font_size; 		kerning_label = new Text (@"$(kerning)", 17 * MainWindow.units); 	} 	diff --git a/libbirdfont/MessageDialog.vala b/libbirdfont/MessageDialog.valaindex 82d90c4..12c6273 100644--- a/libbirdfont/MessageDialog.vala+++ b/libbirdfont/MessageDialog.vala@@ -39,7 +39,6 @@ public class MessageDialog : Dialog { 	}  	public override void draw (Context cr) {	-		Text headline; 		double cx, cy; 		double width, height; diff --git a/libbirdfont/OverviewTools.vala b/libbirdfont/OverviewTools.valaindex 54661d0..6a680c6 100644--- a/libbirdfont/OverviewTools.vala+++ b/libbirdfont/OverviewTools.vala@@ -50,7 +50,7 @@ public class OverviewTools : ToolCollection  { 			OverView overview = get_overview (); 			overview.display_all_available_glyphs (); 			update_overview_characterset ();-			overview.dirty_scrollbar = true;+			FontDisplay.dirty_scrollbar = true; 		}); 		character_sets.add_tool (all_glyphs); @@ -62,7 +62,7 @@ public class OverviewTools : ToolCollection  { 			DefaultCharacterSet.use_default_range (gr); 			overview.set_glyph_range (gr); 			update_overview_characterset ();-			overview.dirty_scrollbar = true;+			FontDisplay.dirty_scrollbar = true; 		}); 		character_sets.add_tool (default_glyphs); @@ -74,7 +74,7 @@ public class OverviewTools : ToolCollection  { 			DefaultCharacterSet.use_full_unicode_range (gr); 			overview.set_glyph_range (gr); 			update_overview_characterset ();-			overview.dirty_scrollbar = true;+			FontDisplay.dirty_scrollbar = true; 		}); 		character_sets.add_tool (unicode); 		diff --git a/libbirdfont/Renderer/TextArea.vala b/libbirdfont/Renderer/TextArea.valaindex 469d532..f3ecf32 100644--- a/libbirdfont/Renderer/TextArea.vala+++ b/libbirdfont/Renderer/TextArea.vala@@ -242,9 +242,7 @@ public class TextArea : Widget { 	private void add_character (uint keyval) { 		unichar c = (unichar) keyval; 		string s;-		TextArea focus;-		TextUndoItem ui;-		+ 		if (!is_modifier_key (keyval)  			&& !KeyBindings.has_ctrl () 			&& !KeyBindings.has_alt ()) {@@ -824,7 +822,6 @@ public class TextArea : Widget { 		double xmax = 0; 		int i = 0; 		double dd;-		bool on_screen; 		 		tx = 0; 		ty = font_size;@@ -973,7 +970,6 @@ public class TextArea : Widget { 	 	public override void draw (Context cr) { 		Text word;-		double p; 		double tx, ty; 		string w; 		double scale;@@ -1125,7 +1121,6 @@ public class TextArea : Widget { 		} 		 		Context cc; // cached context-		double cc_x, cc_y; 		Paragraph paragraph; 		paragraph = paragraphs.get (0); 		@@ -1207,7 +1202,6 @@ public class TextArea : Widget { 		 		foreach (Text next_word in paragraph.words) { 			string w = next_word.text;-			double p = next_word.get_sidebearing_extent (); 			wl = w.length;  			if (carret.character_index == ch_index) {diff --git a/libbirdfont/SaveDialog.vala b/libbirdfont/SaveDialog.valaindex f692b09..120d68d 100644--- a/libbirdfont/SaveDialog.vala+++ b/libbirdfont/SaveDialog.vala@@ -80,7 +80,6 @@ public class SaveDialog : Dialog { 	}  	public override void draw (Context cr) {	-		Text headline; 		double cx, cy; 		 		layout ();diff --git a/libbirdfont/TabContent.vala b/libbirdfont/TabContent.valaindex b893421..2f18cbb 100644--- a/libbirdfont/TabContent.vala+++ b/libbirdfont/TabContent.vala@@ -85,9 +85,9 @@ public class TabContent : GLib.Object { 				menu.draw (allocation, cr); 			} 			-			if (GlyphCanvas.current_display.dirty_scrollbar) {+			if (FontDisplay.dirty_scrollbar) { 				GlyphCanvas.current_display.update_scrollbar ();-				GlyphCanvas.current_display.dirty_scrollbar = false;+				FontDisplay.dirty_scrollbar = false; 			} 		} 	}diff --git a/libbirdfont/ZoomBar.vala b/libbirdfont/ZoomBar.valaindex be9a83f..cae847c 100644--- a/libbirdfont/ZoomBar.vala+++ b/libbirdfont/ZoomBar.vala@@ -77,7 +77,7 @@ public class ZoomBar : Tool { 			new_zoom (zoom_level); 		} 		-		GlyphCanvas.current_display.dirty_scrollbar = true;+		FontDisplay.dirty_scrollbar = true; 	} 	 	public override void draw (Context cr) {
Fix compiler warnings

Changed files (9)

Diff

Contact
