diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-21 22:18:10 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-21 22:18:10 +0000 |
| commit | 83f3338663c4969eebefd8c2c43bd3fc43587fdd (patch) | |
| tree | e48ba69628c5ba793533094e308c1fce9acb21aa /src/core/element.h | |
| parent | 4ade8ad1c7b23e6eeeee6681acbdb43fb10cab43 (diff) | |
| download | libdom-83f3338663c4969eebefd8c2c43bd3fc43587fdd.tar.gz libdom-83f3338663c4969eebefd8c2c43bd3fc43587fdd.tar.bz2 | |
Merge branches/jmb/dom-alloc-purge back to trunk
svn path=/trunk/libdom/; revision=13316
Diffstat (limited to 'src/core/element.h')
| -rw-r--r-- | src/core/element.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/core/element.h b/src/core/element.h index 66d1a50..77a040b 100644 --- a/src/core/element.h +++ b/src/core/element.h @@ -33,25 +33,24 @@ struct dom_element { struct dom_hash_table *ns_attributes; /**< Attributes with prefix */ - struct lwc_string_s *id_ns; /**< The id attribute's namespace */ + dom_string *id_ns; /**< The id attribute's namespace */ - struct lwc_string_s *id_name; /**< The id attribute's name */ + dom_string *id_name; /**< The id attribute's name */ struct dom_type_info *schema_type_info; /**< Type information */ }; dom_exception _dom_element_create(struct dom_document *doc, - struct lwc_string_s *name, struct lwc_string_s *namespace, - struct lwc_string_s *prefix, struct dom_element **result); + dom_string *name, dom_string *namespace, + dom_string *prefix, struct dom_element **result); dom_exception _dom_element_initialise(struct dom_document *doc, - struct dom_element *el, struct lwc_string_s *name, - struct lwc_string_s *namespace, struct lwc_string_s *prefix); + struct dom_element *el, dom_string *name, + dom_string *namespace, dom_string *prefix); -void _dom_element_finalise(struct dom_document *doc, struct dom_element *ele); +void _dom_element_finalise(struct dom_element *ele); -void _dom_element_destroy(struct dom_document *doc, - struct dom_element *element); +void _dom_element_destroy(struct dom_element *element); /* The virtual functions of dom_element */ @@ -212,22 +211,18 @@ dom_exception _dom_element_parse_attribute(dom_element *ele, dom_string *name, dom_string *value, dom_string **parsed); void __dom_element_destroy(dom_node_internal *node); -dom_exception _dom_element_alloc(struct dom_document *doc, - struct dom_node_internal *n, struct dom_node_internal **ret); -dom_exception _dom_element_copy(struct dom_node_internal *new, - struct dom_node_internal *old); +dom_exception _dom_element_copy(dom_node_internal *old, + dom_node_internal **copy); #define DOM_ELEMENT_PROTECT_VTABLE \ _dom_element_parse_attribute #define DOM_NODE_PROTECT_VTABLE_ELEMENT \ __dom_element_destroy, \ - _dom_element_alloc, \ _dom_element_copy /* Helper functions*/ -dom_exception _dom_element_get_id(struct dom_element *ele, - struct lwc_string_s **id); +dom_exception _dom_element_get_id(struct dom_element *ele, dom_string **id); extern struct dom_element_vtable _dom_element_vtable; |