From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 25 Nov 2018 12:46:13 +0000 (+0100)
Subject: libvaladoc: Clean up Api.Signal constructor
X-Git-Tag: 0.43.1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d2d3fdefad4c3ef8cae1aefd3b0548ac77431be;p=thirdparty%2Fvala.git

libvaladoc: Clean up Api.Signal constructor
---

diff --git a/libvaladoc/api/signal.vala b/libvaladoc/api/signal.vala
index 511be05bc..7e92f0e11 100644
--- a/libvaladoc/api/signal.vala
+++ b/libvaladoc/api/signal.vala
@@ -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;
 	}
 
 	/**
diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index 9c6243ea8..12ab90813 100644
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -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);