diff options
Diffstat (limited to 'src/dbusidl.h')
| -rw-r--r-- | src/dbusidl.h | 57 |
1 files changed, 20 insertions, 37 deletions
diff --git a/src/dbusidl.h b/src/dbusidl.h index 1e95bea..8897510 100644 --- a/src/dbusidl.h +++ b/src/dbusidl.h @@ -44,7 +44,6 @@ typedef enum DI_BASE_TYPE_ENUM, DI_BASE_TYPE_ERROR_MEMBER, DI_BASE_TYPE_ERROR_DOMAIN, - DI_BASE_TYPE_NAMESPACE, DI_BASE_TYPE_COMMENT, } DIBaseType; @@ -83,7 +82,6 @@ typedef struct _DIEnumMember DIEnumMember; typedef struct _DIEnum DIEnum; typedef struct _DIErrorMember DIErrorMember; typedef struct _DIErrorDomain DIErrorDomain; -typedef struct _DINamespace DINamespace; typedef struct _DIComment DIComment; /* ---------------------------------------------------------------------------------------------------- */ @@ -103,6 +101,8 @@ DIAnnotation *di_base_get_annotation (DIBase *base, const gchar *name); const gchar *di_base_get_annotation_value (DIBase *base, const gchar *name); +DIBase *di_base_get_parent (DIBase *base); +const gchar *di_base_get_namespace (DIBase *base); /* ---------------------------------------------------------------------------------------------------- */ @@ -121,7 +121,6 @@ DIArgDirection di_arg_get_direction (DIArg *arg); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_method_get_name (DIMethod *method); -const gchar *di_method_get_fully_qualified_name (DIMethod *method); GList *di_method_get_args (DIMethod *method); const gchar *di_method_get_in_signature (DIMethod *method); const gchar *di_method_get_out_signature (DIMethod *method); @@ -129,14 +128,12 @@ const gchar *di_method_get_out_signature (DIMethod *method); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_signal_get_name (DISignal *signal); -const gchar *di_signal_get_fully_qualified_name (DISignal *signal); GList *di_signal_get_args (DISignal *signal); const gchar *di_signal_get_signature (DISignal *signal); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_property_get_name (DIProperty *property); -const gchar *di_property_get_fully_qualified_name (DIProperty *property); DIType *di_property_get_type (DIProperty *property); const gchar *di_property_get_signature (DIProperty *property); DIPropertyFlags di_property_get_flags (DIProperty *property); @@ -144,7 +141,6 @@ DIPropertyFlags di_property_get_flags (DIProperty *property); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_interface_get_name (DIInterface *interface); -const gchar *di_interface_get_fully_qualified_name (DIInterface *interface); GList *di_interface_get_methods (DIInterface *interface); GList *di_interface_get_signals (DIInterface *interface); GList *di_interface_get_properties (DIInterface *interface); @@ -163,55 +159,32 @@ DIType *di_struct_member_get_type (DIStructMember *struct_member); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_struct_get_name (DIStruct *struct_); -const gchar *di_struct_get_fully_qualified_name (DIStruct *struct_); GList *di_struct_get_members (DIStruct *struct_); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_enum_member_get_name (DIEnumMember *enum_member); -const gchar *di_enum_member_get_fully_qualified_name (DIEnumMember *enum_member); guint di_enum_member_get_value (DIEnumMember *enum_member); gboolean di_enum_member_get_unset (DIEnumMember *enum_member); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_enum_get_name (DIEnum *enum_); -const gchar *di_enum_get_fully_qualified_name (DIEnum *enum_); GList *di_enum_get_members (DIEnum *enum_); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_error_member_get_name (DIErrorMember *error_member); -const gchar *di_error_member_get_fully_qualified_name (DIErrorMember *error_member); /* ---------------------------------------------------------------------------------------------------- */ const gchar *di_error_domain_get_name (DIErrorDomain *error_domain); -const gchar *di_error_domain_get_fully_qualified_name (DIErrorDomain *error_domain); GList *di_error_domain_get_members (DIErrorDomain *error_domain); /* ---------------------------------------------------------------------------------------------------- */ -const gchar *di_namespace_get_name (DINamespace *namespace); -GList *di_namespace_get_interfaces (DINamespace *namespace); -GList *di_namespace_get_structs (DINamespace *namespace); -GList *di_namespace_get_enums (DINamespace *namespace); -GList *di_namespace_get_error_domains (DINamespace *namespace); -DIInterface *di_namespace_lookup_interface (DINamespace *namespace, - const gchar *name); -DIStruct *di_namespace_lookup_struct (DINamespace *namespace, - const gchar *name); -DIEnum *di_namespace_lookup_enum (DINamespace *namespace, - const gchar *name); -DIErrorDomain *di_namespace_lookup_error_domain (DINamespace *namespace, - const gchar *name); - -/* ---------------------------------------------------------------------------------------------------- */ - const gchar *di_comment_get_raw (DIComment *comment); gboolean di_comment_get_is_multiline (DIComment *comment); -const gchar *di_comment_get_symbol (DIComment *comment); -const gchar *di_comment_get_fully_qualified_symbol (DIComment *comment); DIBase *di_comment_get_base (DIComment *comment); const gchar *di_comment_get_brief (DIComment *comment); const gchar *di_comment_get_text (DIComment *comment); @@ -221,21 +194,31 @@ const gchar *di_comment_get_tag_value (DIComment *comment, /* ---------------------------------------------------------------------------------------------------- */ -DIParser *di_parser_new (const gchar *path); -GList *di_parser_get_namespaces (DIParser *parser); -GList *di_parser_get_comments (DIParser *parser); -DINamespace *di_parser_lookup_namespace (DIParser *parser, +DIParser *di_parser_new (gchar **files); +GList *di_parser_get_interfaces (DIParser *parser); +GList *di_parser_get_structs (DIParser *parser); +GList *di_parser_get_enums (DIParser *parser); +GList *di_parser_get_error_domains (DIParser *parser); +DIInterface *di_parser_lookup_interface (DIParser *parser, + const gchar *name); +DIStruct *di_parser_lookup_struct (DIParser *parser, const gchar *name); -DIBase *di_parser_lookup_symbol (DIParser *parser, - const gchar *fully_qualified_name); -DIComment *di_parser_lookup_comment_for_symbol (DIParser *parser, - const gchar *fully_qualified_name); +DIEnum *di_parser_lookup_enum (DIParser *parser, + const gchar *name); +DIErrorDomain *di_parser_lookup_error_domain (DIParser *parser, + const gchar *name); +GList *di_parser_get_comments (DIParser *parser); GList *di_parser_get_warnings (DIParser *parser); GList *di_parser_get_errors (DIParser *parser); void di_parser_free (DIParser *parser); /* ---------------------------------------------------------------------------------------------------- */ +void di_interface_print (DIInterface *interface, guint indent); +void di_struct_print (DIStruct *struct_, guint indent); +void di_enum_print (DIEnum *enum_, guint indent); +void di_error_domain_print (DIErrorDomain *error_domain, guint indent); + G_END_DECLS #endif /* __DBUS_IDL_H */ |