libvaladoc: Clean up Api.Interface constructor

diff --git a/libvaladoc/api/interface.vala b/libvaladoc/api/interface.vala
index e909d1365f60f30996799b0b135f66d404f43f00..8c6a9ab77b43b5774c5f30880bad7fd0338f0834 100644 (file)
--- a/libvaladoc/api/interface.vala
+++ b/libvaladoc/api/interface.vala
@@ -33,16 +33,16 @@ public class Valadoc.Api.Interface : TypeSymbol {
        private string? type_id;
 
        public Interface (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
-                                         SourceComment? comment, string? cname, string? type_macro_name, string? is_type_macro_name,
-                                         string? type_cast_macro_name, string? type_function_name, string interface_macro_name,
-                                         string? dbus_name, Vala.Interface data)
+                                         SourceComment? comment, string? type_macro_name, string? is_type_macro_name,
+                                         string? type_cast_macro_name, string? type_function_name,
+                                         Vala.Interface data)
        {
                base (parent, file, name, accessibility, comment, type_macro_name, is_type_macro_name,
                          type_cast_macro_name, type_function_name, false, data);
 
-               this.interface_macro_name = interface_macro_name;
-               this.dbus_name = dbus_name;
-               this.cname = cname;
+               this.interface_macro_name = Vala.get_ccode_interface_get_function (data);
+               this.dbus_name = Vala.GDBusModule.get_dbus_name (data);
+               this.cname = Vala.get_ccode_name (data);
                this.type_id = Vala.get_ccode_type_id (data);
        }
 

diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index f4f25db530ac021c41745e9d360c8c671b7a0844..1c1250f745fafd667c2850c907d825127d8ed2d0 100644 (file)
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -318,10 +318,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                }
        }
 
-       private string? get_interface_macro_name (Vala.Interface element) {
-               return "%s_GET_INTERFACE".printf (Vala.get_ccode_upper_case_name (element, null));
-       }
-
        private string get_quark_function_name (Vala.ErrorDomain element) {
                return Vala.get_ccode_lower_case_prefix (element) + "quark";
        }
@@ -690,13 +686,10 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                                                                                element.name,
                                                                                element.access,
                                                                                comment,
-                                                                               Vala.get_ccode_name (element),
                                                                                get_type_macro_name (element),
                                                                                get_is_type_macro_name (element),
                                                                                get_type_cast_macro_name (element),
                                                                                get_type_function_name (element),
-                                                                               get_interface_macro_name (element),
-                                                                               Vala.GDBusModule.get_dbus_name (element),
                                                                                element);
                symbol_map.set (element, node);
                parent.add_child (node);