]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
libvaladoc: Clean up Api.Signal constructor
authorRico Tzschichholz <ricotz@ubuntu.com>
Sun, 25 Nov 2018 12:46:13 +0000 (13:46 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sun, 25 Nov 2018 12:46:13 +0000 (13:46 +0100)
libvaladoc/api/signal.vala
valadoc/treebuilder.vala

index 511be05bc0759ae6aba85faec340228322675e3a..7e92f0e113ca7e9ddabdcb45c640b8cc2194f3c9 100644 (file)
@@ -42,17 +42,17 @@ public class Valadoc.Api.Signal : Symbol, Callable {
 
 
        public Signal (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
-                                  SourceComment? comment, string? cname, string? default_impl_cname, string? dbus_name, bool is_dbus_visible,
-                                  bool is_virtual, Vala.Signal data)
+                                  SourceComment? comment,
+                                  Vala.Signal data)
        {
                base (parent, file, name, accessibility, comment, data);
 
-               this.default_impl_cname = default_impl_cname;
-               this.dbus_name = dbus_name;
-               this.cname = cname;
+               this.default_impl_cname = (data.default_handler != null ? Vala.get_ccode_name (data.default_handler) : null);
+               this.dbus_name = Vala.GDBusModule.get_dbus_name_for_member (data);
+               this.cname = Vala.get_ccode_name (data);
 
-               this.is_dbus_visible = is_dbus_visible;
-               this.is_virtual = is_virtual;
+               this.is_dbus_visible = Vala.GDBusModule.is_dbus_visible (data);
+               this.is_virtual = data.is_virtual;
        }
 
        /**
index 9c6243ea83bfc00309576d0360621d0083cda06d..12ab908133b0b34109887331005ffacece43131f 100644 (file)
@@ -802,11 +802,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                                                                                  element.name,
                                                                                  element.access,
                                                                                  comment,
-                                                                                 Vala.get_ccode_name (element),
-                                                                                 (element.default_handler != null)? Vala.get_ccode_name (element.default_handler) : null,
-                                                                                 Vala.GDBusModule.get_dbus_name_for_member (element),
-                                                                                 Vala.GDBusModule.is_dbus_visible (element),
-                                                                                 element.is_virtual,
                                                                                  element);
                node.return_type = create_type_reference (element.return_type, node, node);
                symbol_map.set (element, node);