Commit fb3b9d6
Fix compiler warnings
Changed files (7)
modifiedbirdfont/GtkWindow.valamodifiedlibbirdfont/Glyph.valamodifiedlibbirdfont/OpenFontFormat/Cmap.valamodifiedlibbirdfont/OpenFontFormat/GlyfTable.valamodifiedlibbirdfont/PointConverter.valamodifiedlibbirdfont/StrokeTool.valamodifiedlibbirdfont/TestCases.vala
Diff
@@ -27,13 +27,13 @@ namespace BirdFont { public class GtkWindow : Gtk.Window, NativeWindow { - HBox list_box;- HBox canvas_box;+ Box list_box;+ Box canvas_box; WebView html_canvas; ScrolledWindow html_box; - VBox tab_box;+ Box tab_box; GlyphCanvasArea glyph_canvas_area; @@ -41,7 +41,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { string clipboard_svg = ""; string inkscape_clipboard = ""; - VScrollbar scrollbar;+ Scrollbar scrollbar; bool scrollbar_supress_signal = false; DescriptionForm description;@@ -51,7 +51,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { TextListener text_listener = new TextListener ("", "", ""); Label text_input_label; Entry text_entry;- HBox text_box;+ Box text_box; Button submit_text_button; Gtk.Window tooltip_window = new Gtk.Window ();@@ -59,7 +59,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { ToolboxCanvas toolbox; public GtkWindow (string title) {- scrollbar = new VScrollbar (new Adjustment (0, 0, 1, 1, 0.01, 0.1));+ scrollbar = new Scrollbar (Orientation.VERTICAL, new Adjustment (0, 0, 1, 1, 0.01, 0.1)); ((Gtk.Window)this).set_title ("BirdFont"); } @@ -141,7 +141,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { return false; }); - canvas_box = new HBox (false, 0);+ canvas_box = new Box (Orientation.HORIZONTAL, 0); canvas_box.pack_start (glyph_canvas_area, true, true, 0); canvas_box.pack_start (html_box, true, true, 0); canvas_box.pack_start (description.canvas, true, true, 0);@@ -151,7 +151,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { submit_text_button.set_label ("Submit"); text_input_label = new Label (" " + "Text"); text_entry = new Entry ();- text_box = new HBox (false, 6);+ text_box = new Box (Orientation.HORIZONTAL, 6); text_box.pack_start (text_input_label, false, false, 0); text_box.pack_start (text_entry, true, true, 0); text_box.pack_start (submit_text_button, false, false, 0);@@ -165,7 +165,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { text_input_is_active = false; }); - tab_box = new VBox (false, 0);+ tab_box = new Box (Orientation.VERTICAL, 0); tab_box.pack_start (new TabbarCanvas (MainWindow.get_tab_bar ()), false, false, 0); tab_box.pack_start (text_box, false, false, 5); @@ -174,11 +174,11 @@ public class GtkWindow : Gtk.Window, NativeWindow { tab_box.pack_start (new TooltipCanvas (MainWindow.get_tooltip ()), false, false, 0); toolbox = new ToolboxCanvas (MainWindow.get_toolbox ()); - list_box = new HBox (false, 0);+ list_box = new Box (Orientation.HORIZONTAL, 0); list_box.pack_start (tab_box, true, true, 0); list_box.pack_start (toolbox, false, false, 0); - VBox vbox = new VBox (false, 0);+ Box vbox = new Box (Orientation.VERTICAL, 0); vbox.pack_start(create_menu (), false, false, 0); vbox.pack_start(list_box, true, true, 0);@@ -287,12 +287,12 @@ public class GtkWindow : Gtk.Window, NativeWindow { public ColorWindow (ColorTool color_tool) { color_selection.color_changed.connect (() => {- Gdk.Color c;- color_selection.get_current_color (out c);- color_tool.color_r = (double) c.red / uint16.MAX;- color_tool.color_g = (double) c.green / uint16.MAX;- color_tool.color_b = (double) c.blue / uint16.MAX;- color_tool.color_a = (double) color_selection.get_current_alpha () / uint16.MAX; + Gdk.RGBA c = new Gdk.RGBA ();+ color_selection.get_current_rgba (c);+ color_tool.color_r = c.red;+ color_tool.color_g = c.green;+ color_tool.color_b = c.blue;+ color_tool.color_a = c.alpha; color_tool.color_updated (); }); @@ -1247,7 +1247,7 @@ public class TooltipCanvas : DrawingArea { public class DescriptionForm : GLib.Object { public ScrolledWindow canvas;- public VBox box;+ public Box box; Entry postscript_name; Entry font_name;@@ -1263,7 +1263,7 @@ public class DescriptionForm : GLib.Object { TextView copyright; public DescriptionForm () {- box = new VBox (false, 6);+ box = new Box (Orientation.VERTICAL, 6); canvas = new ScrolledWindow (null, null); canvas.set_policy (Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); @@ -1380,15 +1380,15 @@ public class DescriptionForm : GLib.Object { } void add_entry (Entry e, string label) {- VBox vb;- HBox hb;+ Box vb;+ Box hb; Label l;- HBox margin;+ Box margin; - margin = new HBox (false, 6);+ margin = new Box (Orientation.HORIZONTAL, 6); l = new Label (label);- vb = new VBox (false, 2);- hb = new HBox (false, 2);+ vb = new Box (Orientation.VERTICAL, 2);+ hb = new Box (Orientation.HORIZONTAL, 2); hb.pack_start (l, false, false, 0); vb.pack_start (hb, true, true, 5); vb.pack_start (e, true, true, 0);@@ -1397,15 +1397,15 @@ public class DescriptionForm : GLib.Object { } void add_textview (TextView t, string label) {- VBox vb;- HBox hb;+ Box vb;+ Box hb; Label l;- HBox margin;+ Box margin; - margin = new HBox (false, 6);+ margin = new Box (Orientation.HORIZONTAL, 6); l = new Label (label);- vb = new VBox (false, 2);- hb = new HBox (false, 2);+ vb = new Box (Orientation.VERTICAL, 2);+ hb = new Box (Orientation.HORIZONTAL, 2); hb.pack_start (l, false, false, 0); vb.pack_start (hb, true, true, 5); vb.pack_start (t, true, true, 0);@@ -1931,10 +1931,8 @@ public class Glyph : FontDisplay { /** Scroll or zoom from tap events. */ public void change_view_event (int finger, int x, int y) {- double tap_direction; double dx, dy; double last_distance, new_distance;- double z, i; dx = 0; dy = 0;@@ -2013,8 +2011,6 @@ public class Glyph : FontDisplay { } public override void tap_move (int finger, int x, int y) {- double d;- if (!change_view) { motion_notify (x, y); } else {@@ -18,7 +18,6 @@ public class CmapTable : Table { GlyfTable glyf_table; CmapSubtableFormat4 cmap_format4 = new CmapSubtableFormat4 ();- CmapSubtableFormat12 cmap_format12 = new CmapSubtableFormat12 (); public CmapTable(GlyfTable gt) { glyf_table = gt;@@ -178,10 +178,12 @@ public class GlyfTable : Table { } } + // FIXME: ligatures+ /* foreach (Glyph ug in unassigned_glyphs) {- // FIXME: ligatures- // glyphs.append (ug);+ glyphs.append (ug); }+ */ } @@ -28,7 +28,6 @@ public class PointConverter { } public Path get_quadratic_path () {- int i; bool add_more_points = false; quadratic_path = original_path.copy ();@@ -124,12 +123,11 @@ public class PointConverter { int steps = (int) (1.6 * Path.get_length_from (a0, a1)); double x_out, y_out; double step_out;- double step_min; x_out = 0; y_out = 0; step_out = 0;- + step = 0; distance = 0; new_point = new EditPoint ();@@ -649,13 +649,13 @@ public class StrokeTool : Tool { EditPoint p1, p2; double cross_x, cross_y; + ix = 0;+ iy = 0;+ if (path.points.size == 0) { return false; } - ix = 0;- iy = 0;- for (int i = 1; i < path.points.size - 2; i++) { p1 = path.points.get (i - 1); p2 = path.points.get (i);@@ -1275,7 +1275,6 @@ class TestCases { Font f = new Font (); File file; string folder;- string path; f.font_file = "E:\\Typeface.bf"; folder = f.get_folder_path ();