diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 13:55:05 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 13:55:05 +0100 |
| commit | a3298c07befd2ba6ef1e7c088787559f00a79a48 (patch) | |
| tree | cb052b0fdecb57dd84c79d1308b094dc87b4dd2c | |
| parent | 86a5bfc686f6930c02b9f69c5fdde70f851b338e (diff) | |
| download | vala-a3298c07befd2ba6ef1e7c088787559f00a79a48.tar.gz | |
libvaladoc: Drop cname parameter from Api.* constructors
| -rw-r--r-- | libvaladoc/api/constant.vala | 4 | ||||
| -rw-r--r-- | libvaladoc/api/enum.vala | 5 | ||||
| -rw-r--r-- | libvaladoc/api/enumvalue.vala | 4 | ||||
| -rw-r--r-- | valadoc/treebuilder.vala | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/libvaladoc/api/constant.vala b/libvaladoc/api/constant.vala index c6c1613fe..f4f186bbc 100644 --- a/libvaladoc/api/constant.vala +++ b/libvaladoc/api/constant.vala @@ -38,11 +38,11 @@ public class Valadoc.Api.Constant : Symbol { } public Constant (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility, - SourceComment? comment, string? cname, Vala.Constant data) + SourceComment? comment, Vala.Constant data) { base (parent, file, name, accessibility, comment, data); - this.cname = cname; + this.cname = Vala.get_ccode_name (data); } /** diff --git a/libvaladoc/api/enum.vala b/libvaladoc/api/enum.vala index 1f72872c6..f4ea43b20 100644 --- a/libvaladoc/api/enum.vala +++ b/libvaladoc/api/enum.vala @@ -31,11 +31,12 @@ public class Valadoc.Api.Enum : TypeSymbol { private string? type_id; public Enum (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility, - SourceComment? comment, string? cname, + SourceComment? comment, Vala.Enum data) { base (parent, file, name, accessibility, comment, false, data); - this.cname = cname; + + this.cname = Vala.get_ccode_name (data); this.type_id = Vala.get_ccode_type_id (data); } diff --git a/libvaladoc/api/enumvalue.vala b/libvaladoc/api/enumvalue.vala index c38582329..0bda1c32a 100644 --- a/libvaladoc/api/enumvalue.vala +++ b/libvaladoc/api/enumvalue.vala @@ -43,10 +43,10 @@ public class Valadoc.Api.EnumValue: Symbol { } } - public EnumValue (Enum parent, SourceFile file, string name, SourceComment? comment, string? cname, Vala.EnumValue data) { + public EnumValue (Enum parent, SourceFile file, string name, SourceComment? comment, Vala.EnumValue data) { base (parent, file, name, parent.accessibility, comment, data); - this.cname = cname; + this.cname = Vala.get_ccode_name (data); } /** diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala index dd0e2d650..921a72d33 100644 --- a/valadoc/treebuilder.vala +++ b/valadoc/treebuilder.vala @@ -843,7 +843,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { element.name, element.access, comment, - Vala.get_ccode_name (element), element); symbol_map.set (element, node); parent.add_child (node); @@ -864,7 +863,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { file, element.name, comment, - Vala.get_ccode_name (element), element); symbol_map.set (element, node); parent.add_child (node); @@ -886,7 +884,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { element.name, element.access, comment, - Vala.get_ccode_name (element), element); node.constant_type = create_type_reference (element.type_reference, node, node); symbol_map.set (element, node); |