[vala/staging: 21/22] libvaladoc: Clean up Api.Field constructor



commit 86a5bfc686f6930c02b9f69c5fdde70f851b338e
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Nov 25 13:50:42 2018 +0100

    libvaladoc: Clean up Api.Field constructor

 libvaladoc/api/field.vala | 8 ++++----
 valadoc/treebuilder.vala  | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/libvaladoc/api/field.vala b/libvaladoc/api/field.vala
index f2f086d8d..21948f035 100644
--- a/libvaladoc/api/field.vala
+++ b/libvaladoc/api/field.vala
@@ -30,15 +30,15 @@ public class Valadoc.Api.Field : Symbol {
        private string? cname;
 
        public Field (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
-                                 SourceComment? comment, string? cname, bool is_static, bool is_volatile,
+                                 SourceComment? comment,
                                  Vala.Field data)
        {
                base (parent, file, name, accessibility, comment, data);
 
-               this.is_static = !(parent is Namespace) && is_static;
-               this.is_volatile = is_volatile;
+               this.is_static = !(parent is Namespace) && data.binding == Vala.MemberBinding.STATIC;
+               this.is_volatile = data.is_volatile;
 
-               this.cname = cname;
+               this.cname = Vala.get_ccode_name (data);
        }
 
        /**
diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index 12ab90813..dd0e2d650 100644
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -692,9 +692,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                                                                element.name,
                                                                element.access,
                                                                comment,
-                                                               Vala.get_ccode_name (element),
-                                                               element.binding == Vala.MemberBinding.STATIC,
-                                                               element.is_volatile,
                                                                element);
                node.field_type = create_type_reference (element.variable_type, node, node);
                symbol_map.set (element, node);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]