libvaladoc: Drop cname parameter from Api.* constructors

diff --git a/libvaladoc/api/constant.vala b/libvaladoc/api/constant.vala
index c6c1613fe88d34dc4c9e2a752026a68be5207bc9..f4f186bbc5b0223c61d884abe8ba1a3730b4a880 100644 (file)
--- 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 1f72872c63a952bc2dd6a227e97ed4afaf3cdc5a..f4ea43b20028cf96da5f39e37bdd0217ed6772e5 100644 (file)
--- 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 c3858232985d54ca94f75dc8278eda7aa772a0dc..0bda1c32a9be223662bf2096024ae041d292cc8c 100644 (file)
--- 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 dd0e2d65039ba59be192b38c46865b3f53150d15..921a72d3376521d76f3ea9433a88d1b84823af96 100644 (file)
--- 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);