[vala/staging: 17/22] libvaladoc: Clean up Api.Method constructor
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging: 17/22] libvaladoc: Clean up Api.Method constructor
- Date: Sun, 25 Nov 2018 13:09:31 +0000 (UTC)
commit 9cc8cba59d146a034ea823dbf45a0018646e434d
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Wed Nov 14 15:54:46 2018 +0100
libvaladoc: Clean up Api.Method constructor
libvaladoc/api/method.vala | 18 ++++++++----------
valadoc/treebuilder.vala | 14 --------------
2 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/libvaladoc/api/method.vala b/libvaladoc/api/method.vala
index 11d2372b5..21ac9befd 100644
--- a/libvaladoc/api/method.vala
+++ b/libvaladoc/api/method.vala
@@ -42,20 +42,18 @@ public class Valadoc.Api.Method : Symbol, Callable {
public Method (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
- SourceComment? comment, string? cname, string? dbus_name, string?
dbus_result_name,
- string? finish_function_cname, bool is_yields,
- bool is_dbus_visible, bool is_constructor, Vala.Method data)
+ SourceComment? comment, Vala.Method data)
{
base (parent, file, name, accessibility, comment, data);
- this.finish_function_cname = finish_function_cname;
- this.dbus_result_name = dbus_result_name;
- this.dbus_name = dbus_name;
- this.cname = cname;
+ this.finish_function_cname = (data.coroutine ? Vala.get_ccode_finish_name (data) : null);
+ this.dbus_result_name = Vala.GDBusModule.dbus_result_name (data);
+ 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_constructor = is_constructor;
- this.is_yields = is_yields;
+ this.is_dbus_visible = Vala.GDBusModule.is_dbus_visible (data);
+ this.is_constructor = data is Vala.CreationMethod;
+ this.is_yields = data.coroutine;
}
/**
diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index 99ca31ffa..018174351 100644
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -816,13 +816,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
get_method_name (element),
element.access,
comment,
- Vala.get_ccode_name (element),
- Vala.GDBusModule.get_dbus_name_for_member
(element),
- Vala.GDBusModule.dbus_result_name (element),
- (element.coroutine)?
Vala.get_ccode_finish_name (element) : null,
- element.coroutine,
- Vala.GDBusModule.is_dbus_visible (element),
- element is Vala.CreationMethod,
element);
node.return_type = create_type_reference (element.return_type, node, node);
symbol_map.set (element, node);
@@ -845,13 +838,6 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
get_method_name (element),
element.access,
comment,
- Vala.get_ccode_name (element),
- Vala.GDBusModule.get_dbus_name_for_member
(element),
- Vala.GDBusModule.dbus_result_name (element),
- (element.coroutine)?
Vala.get_ccode_finish_name (element) : null,
- element.coroutine,
- Vala.GDBusModule.is_dbus_visible (element),
- element is Vala.CreationMethod,
element);
node.return_type = create_type_reference (element.return_type, node, node);
symbol_map.set (element, node);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]