diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-17 21:50:28 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 13:38:45 +0100 |
| commit | 5c6fe7ffec3ddb47a6ee0aeebb56a2ceb63b5f08 (patch) | |
| tree | 2cdf74cd1faaf4e2badcad04f283ea28ba7df11a /libvaladoc | |
| parent | 9cc8cba59d146a034ea823dbf45a0018646e434d (diff) | |
| download | vala-5c6fe7ffec3ddb47a6ee0aeebb56a2ceb63b5f08.tar.gz | |
libvaladoc: Clean up Api.ErrorDomain/ErrorCode constructor
Diffstat (limited to 'libvaladoc')
| -rw-r--r-- | libvaladoc/api/errorcode.vala | 6 | ||||
| -rw-r--r-- | libvaladoc/api/errordomain.vala | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/libvaladoc/api/errorcode.vala b/libvaladoc/api/errorcode.vala index 6994f87a7..496af1f55 100644 --- a/libvaladoc/api/errorcode.vala +++ b/libvaladoc/api/errorcode.vala @@ -31,12 +31,12 @@ public class Valadoc.Api.ErrorCode : Symbol { private string? cname; public ErrorCode (ErrorDomain parent, SourceFile file, string name, SourceComment? comment, - string? cname, string? dbus_name, Vala.ErrorCode data) + Vala.ErrorCode data) { base (parent, file, name, parent.accessibility, comment, data); - this.dbus_name = dbus_name; - this.cname = cname; + this.dbus_name = Vala.GDBusModule.get_dbus_name_for_member (data); + this.cname = Vala.get_ccode_name (data); } /** diff --git a/libvaladoc/api/errordomain.vala b/libvaladoc/api/errordomain.vala index 8e4eb480d..905c2317e 100644 --- a/libvaladoc/api/errordomain.vala +++ b/libvaladoc/api/errordomain.vala @@ -33,15 +33,22 @@ public class Valadoc.Api.ErrorDomain : TypeSymbol { private string? cname; public ErrorDomain (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility, - SourceComment? comment, string? cname, string? quark_macro_name, - string? quark_function_name, string? dbus_name, Vala.ErrorDomain data) + SourceComment? comment, Vala.ErrorDomain data) { base (parent, file, name, accessibility, comment, null, null, null, null, false, data); - this.quark_function_name = quark_function_name; - this.quark_macro_name = quark_macro_name; - this.dbus_name = dbus_name; - this.cname = cname; + this.quark_function_name = _get_quark_function_name (data); + this.quark_macro_name = _get_quark_macro_name (data); + this.dbus_name = Vala.GDBusModule.get_dbus_name (data); + this.cname = Vala.get_ccode_name (data); + } + + string _get_quark_function_name (Vala.ErrorDomain element) { + return Vala.get_ccode_lower_case_prefix (element) + "quark"; + } + + string? _get_quark_macro_name (Vala.ErrorDomain element) { + return Vala.get_ccode_upper_case_name (element, null); } /** |