valide

Merge lp:~monkey-libre/valide/vala-0.11.6 into lp:valide

  1. vala-0.11.6
  2. Merge into trunk
Proposed by Monkey
Status: Merged
Merged at revision: 593
Proposed branch: lp:~monkey-libre/valide/vala-0.11.6
Merge into: lp:valide
Diff against target: 65 lines (+6/-6)
4 files modified
libvalide/executable-manager.vala (+1/-1)
plugins/opened-documents/opened-documents.vala (+1/-1)
plugins/symbol/symbol.vala (+2/-2)
plugins/waf/waf-executable.vala (+2/-2)
To merge this branch: bzr merge lp:~monkey-libre/valide/vala-0.11.6
Reviewer Review Type Date Requested Status
Nicolas Joseph Approve
Review via email: mp+50524@code.launchpad.net

Description of the change

Update some deprecated code according with vala-0.11.6 and remove the duplicate -1, it´s useless.

To post a comment you must log in.
Revision history for this message
Nicolas Joseph (gege2061) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libvalide/executable-manager.vala'
2--- libvalide/executable-manager.vala 2011-02-08 15:11:04 +0000
3+++ libvalide/executable-manager.vala 2011-02-20 19:25:03 +0000
4@@ -237,7 +237,7 @@
5 this.current.get_color_line (ref l, out color);
6
7 this.list_store.append (out iter);
8- this.list_store.set (iter, Col.TEXT, l, Col.COLOR, color, -1);
9+ this.list_store.set (iter, Col.TEXT, l, Col.COLOR, color);
10
11 path = this.list_store.get_path (iter);
12 this.tree_view.scroll_to_cell (path, null, false, 0, 0);
13
14=== modified file 'plugins/opened-documents/opened-documents.vala'
15--- plugins/opened-documents/opened-documents.vala 2010-12-24 13:48:32 +0000
16+++ plugins/opened-documents/opened-documents.vala 2011-02-20 19:25:03 +0000
17@@ -60,7 +60,7 @@
18 {
19 int page_num;
20
21- page_num = tokens[2].to_int ();
22+ page_num = int.parse (tokens[2]);
23 this.window.documents.set_current_page (page_num - 1);
24 }
25 else
26
27=== modified file 'plugins/symbol/symbol.vala'
28--- plugins/symbol/symbol.vala 2011-02-08 10:31:28 +0000
29+++ plugins/symbol/symbol.vala 2011-02-20 19:25:03 +0000
30@@ -366,7 +366,7 @@
31 this.model.set (iter, Col.ICON, pixbuf,
32 Col.NAME, symbol.name,
33 Col.FILE, symbol.file,
34- Col.LINE, symbol.line.to_int (),
35+ Col.LINE, int.parse (symbol.line),
36 Col.LANGUAGE, symbol.language);
37 }
38 else
39@@ -384,7 +384,7 @@
40 this.model.set (iter, Col.ICON, pixbuf,
41 Col.NAME, symbol.name,
42 Col.FILE, symbol.file,
43- Col.LINE, symbol.line.to_int (),
44+ Col.LINE, int.parse (symbol.line),
45 Col.LANGUAGE, symbol.language);
46 this.root_nodes.insert (symbol.full_name, iter);
47 }
48
49=== modified file 'plugins/waf/waf-executable.vala'
50--- plugins/waf/waf-executable.vala 2011-02-08 11:25:01 +0000
51+++ plugins/waf/waf-executable.vala 2011-02-20 19:25:03 +0000
52@@ -65,11 +65,11 @@
53 tmp = item.split (" ");
54 if (tmp[0] == "Total")
55 {
56- this.nb_task = tmp[1].to_int ();
57+ this.nb_task = int.parse (tmp[1]);
58 }
59 else if (tmp[0] == "Current")
60 {
61- this.current_task = tmp[1].to_int ();
62+ this.current_task = int.parse (tmp[1]);
63 }
64 else if (tmp[0] == "Inputs")
65 {

Subscribers

People subscribed via source and target branches

to all changes: