summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2015-10-23 11:55:51 +0100
committerVincent Sanders <vince@kyllikki.org>2015-10-23 15:31:40 +0100
commit89fe0e619357ddf707a2d301794b9ceb928a7836 (patch)
tree35e37d9a2454318d9baea522a1b52eb2eccc5e3a
parent0338d09eea66ede52ee364b8ca05986054bd077c (diff)
downloadlibdom-89fe0e619357ddf707a2d301794b9ceb928a7836.tar.gz
libdom-89fe0e619357ddf707a2d301794b9ceb928a7836.tar.bz2
Make HTMLOList IDL to c name mapping consistant
-rw-r--r--include/dom/html/html_olist_element.h30
-rw-r--r--src/html/html_document.c4
-rw-r--r--src/html/html_olist_element.c76
-rw-r--r--src/html/html_olist_element.h42
-rw-r--r--test/DOMTSHandler.pm1
5 files changed, 77 insertions, 76 deletions
diff --git a/include/dom/html/html_olist_element.h b/include/dom/html/html_olist_element.h
index 3d1511e..ca19ad1 100644
--- a/include/dom/html/html_olist_element.h
+++ b/include/dom/html/html_olist_element.h
@@ -5,31 +5,31 @@
* Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
* Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
*/
-#ifndef dom_html_o_list_element_h_
-#define dom_html_o_list_element_h_
+#ifndef dom_html_olist_element_h_
+#define dom_html_olist_element_h_
#include <stdbool.h>
#include <dom/core/exceptions.h>
#include <dom/core/string.h>
-typedef struct dom_html_o_list_element dom_html_o_list_element;
+typedef struct dom_html_olist_element dom_html_olist_element;
-dom_exception dom_html_o_list_element_get_compact(
- dom_html_o_list_element *ele, bool *compact);
+dom_exception dom_html_olist_element_get_compact(
+ dom_html_olist_element *ele, bool *compact);
-dom_exception dom_html_o_list_element_set_compact(
- dom_html_o_list_element *ele, bool compact);
+dom_exception dom_html_olist_element_set_compact(
+ dom_html_olist_element *ele, bool compact);
-dom_exception dom_html_o_list_element_get_start(
- dom_html_o_list_element *ele, int32_t *start);
+dom_exception dom_html_olist_element_get_start(
+ dom_html_olist_element *ele, int32_t *start);
-dom_exception dom_html_o_list_element_set_start(
- dom_html_o_list_element *ele, uint32_t start);
+dom_exception dom_html_olist_element_set_start(
+ dom_html_olist_element *ele, uint32_t start);
-dom_exception dom_html_o_list_element_get_type(
- dom_html_o_list_element *ele, dom_string **type);
+dom_exception dom_html_olist_element_get_type(
+ dom_html_olist_element *ele, dom_string **type);
-dom_exception dom_html_o_list_element_set_type(
- dom_html_o_list_element *ele, dom_string *type);
+dom_exception dom_html_olist_element_set_type(
+ dom_html_olist_element *ele, dom_string *type);
#endif
diff --git a/src/html/html_document.c b/src/html/html_document.c
index d6c5caa..7c2b633 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -304,8 +304,8 @@ _dom_html_document_create_element_internal(dom_html_document *html,
exc = _dom_html_u_list_element_create(html, namespace, prefix,
(dom_html_u_list_element **) result);
} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_OL])) {
- exc = _dom_html_o_list_element_create(html, namespace, prefix,
- (dom_html_o_list_element **) result);
+ exc = _dom_html_olist_element_create(html, namespace, prefix,
+ (dom_html_olist_element **) result);
} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_LI])) {
exc = _dom_html_li_element_create(html, namespace, prefix,
(dom_html_li_element **) result);
diff --git a/src/html/html_olist_element.c b/src/html/html_olist_element.c
index 16b8763..6f456c8 100644
--- a/src/html/html_olist_element.c
+++ b/src/html/html_olist_element.c
@@ -19,25 +19,25 @@
static struct dom_element_protected_vtable _protect_vtable = {
{
- DOM_NODE_PROTECT_VTABLE_HTML_O_LIST_ELEMENT
+ DOM_NODE_PROTECT_VTABLE_HTML_OLIST_ELEMENT
},
- DOM_HTML_O_LIST_ELEMENT_PROTECT_VTABLE
+ DOM_HTML_OLIST_ELEMENT_PROTECT_VTABLE
};
/**
- * Create a dom_html_o_list_element object
+ * Create a dom_html_olist_element object
*
* \param doc The document object
* \param ele The returned element object
* \return DOM_NO_ERR on success, appropriate dom_exception on failure.
*/
-dom_exception _dom_html_o_list_element_create(struct dom_html_document *doc,
+dom_exception _dom_html_olist_element_create(struct dom_html_document *doc,
dom_string *namespace, dom_string *o_listfix,
- struct dom_html_o_list_element **ele)
+ struct dom_html_olist_element **ele)
{
struct dom_node_internal *node;
- *ele = malloc(sizeof(dom_html_o_list_element));
+ *ele = malloc(sizeof(dom_html_olist_element));
if (*ele == NULL)
return DOM_NO_MEM_ERR;
@@ -46,19 +46,19 @@ dom_exception _dom_html_o_list_element_create(struct dom_html_document *doc,
node->base.vtable = &_dom_html_element_vtable;
node->vtable = &_protect_vtable;
- return _dom_html_o_list_element_initialise(doc, namespace, o_listfix, *ele);
+ return _dom_html_olist_element_initialise(doc, namespace, o_listfix, *ele);
}
/**
- * Initialise a dom_html_o_list_element object
+ * Initialise a dom_html_olist_element object
*
* \param doc The document object
- * \param ele The dom_html_o_list_element object
+ * \param ele The dom_html_olist_element object
* \return DOM_NO_ERR on success, appropriate dom_exception on failure.
*/
-dom_exception _dom_html_o_list_element_initialise(struct dom_html_document *doc,
+dom_exception _dom_html_olist_element_initialise(struct dom_html_document *doc,
dom_string *namespace, dom_string *o_listfix,
- struct dom_html_o_list_element *ele)
+ struct dom_html_olist_element *ele)
{
return _dom_html_element_initialise(doc, &ele->base,
doc->memoised[hds_OL],
@@ -66,33 +66,33 @@ dom_exception _dom_html_o_list_element_initialise(struct dom_html_document *doc,
}
/**
- * Finalise a dom_html_o_list_element object
+ * Finalise a dom_html_olist_element object
*
- * \param ele The dom_html_o_list_element object
+ * \param ele The dom_html_olist_element object
*/
-void _dom_html_o_list_element_finalise(struct dom_html_o_list_element *ele)
+void _dom_html_olist_element_finalise(struct dom_html_olist_element *ele)
{
_dom_html_element_finalise(&ele->base);
}
/**
- * Destroy a dom_html_o_list_element object
+ * Destroy a dom_html_olist_element object
*
- * \param ele The dom_html_o_list_element object
+ * \param ele The dom_html_olist_element object
*/
-void _dom_html_o_list_element_destroy(struct dom_html_o_list_element *ele)
+void _dom_html_olist_element_destroy(struct dom_html_olist_element *ele)
{
- _dom_html_o_list_element_finalise(ele);
+ _dom_html_olist_element_finalise(ele);
free(ele);
}
/**
* Get the compact Property
*
- * \param o_list The dom_html_o_list_element object
+ * \param o_list The dom_html_olist_element object
*/
-dom_exception dom_html_o_list_element_get_compact(
- dom_html_o_list_element *o_list, bool *compact)
+dom_exception dom_html_olist_element_get_compact(
+ dom_html_olist_element *o_list, bool *compact)
{
return dom_html_element_get_bool_property(&o_list->base, "compact",
SLEN("compact"), compact);
@@ -101,10 +101,10 @@ dom_exception dom_html_o_list_element_get_compact(
/**
* Set the compact Property
*
- * \param o_list The dom_html_o_list_element object
+ * \param o_list The dom_html_olist_element object
*/
-dom_exception dom_html_o_list_element_set_compact(
- dom_html_o_list_element *o_list, bool compact)
+dom_exception dom_html_olist_element_set_compact(
+ dom_html_olist_element *o_list, bool compact)
{
return dom_html_element_set_bool_property(&o_list->base, "compact",
SLEN("compact"), compact);
@@ -113,10 +113,10 @@ dom_exception dom_html_o_list_element_set_compact(
/**
* Get the start Property
*
- * \param o_list The dom_html_o_list_element object
+ * \param o_list The dom_html_olist_element object
*/
-dom_exception dom_html_o_list_element_get_start(
- dom_html_o_list_element *o_list, int32_t *start)
+dom_exception dom_html_olist_element_get_start(
+ dom_html_olist_element *o_list, int32_t *start)
{
return dom_html_element_get_int32_t_property(&o_list->base, "start",
SLEN("start"), start);
@@ -125,10 +125,10 @@ dom_exception dom_html_o_list_element_get_start(
/**
* Set the start Property
*
- * \param o_list The dom_html_o_list_element object
+ * \param o_list The dom_html_olist_element object
*/
-dom_exception dom_html_o_list_element_set_start(
- dom_html_o_list_element *o_list, uint32_t start)
+dom_exception dom_html_olist_element_set_start(
+ dom_html_olist_element *o_list, uint32_t start)
{
return dom_html_element_set_int32_t_property(&o_list->base, "start",
SLEN("start"), start);
@@ -139,7 +139,7 @@ dom_exception dom_html_o_list_element_set_start(
/* The virtual function used to parse attribute value, see src/core/element.c
* for detail */
-dom_exception _dom_html_o_list_element_parse_attribute(dom_element *ele,
+dom_exception _dom_html_olist_element_parse_attribute(dom_element *ele,
dom_string *name, dom_string *value,
dom_string **parsed)
{
@@ -153,13 +153,13 @@ dom_exception _dom_html_o_list_element_parse_attribute(dom_element *ele,
}
/* The virtual destroy function, see src/core/node.c for detail */
-void _dom_virtual_html_o_list_element_destroy(dom_node_internal *node)
+void _dom_virtual_html_olist_element_destroy(dom_node_internal *node)
{
- _dom_html_o_list_element_destroy((struct dom_html_o_list_element *) node);
+ _dom_html_olist_element_destroy((struct dom_html_olist_element *) node);
}
/* The virtual copy function, see src/core/node.c for detail */
-dom_exception _dom_html_o_list_element_copy(dom_node_internal *old,
+dom_exception _dom_html_olist_element_copy(dom_node_internal *old,
dom_node_internal **copy)
{
return _dom_html_element_copy(old, copy);
@@ -169,8 +169,8 @@ dom_exception _dom_html_o_list_element_copy(dom_node_internal *old,
/* API functions */
#define SIMPLE_GET(attr) \
- dom_exception dom_html_o_list_element_get_##attr( \
- dom_html_o_list_element *element, \
+ dom_exception dom_html_olist_element_get_##attr( \
+ dom_html_olist_element *element, \
dom_string **attr) \
{ \
dom_exception ret; \
@@ -186,8 +186,8 @@ dom_exception _dom_html_o_list_element_copy(dom_node_internal *old,
return ret; \
}
#define SIMPLE_SET(attr) \
- dom_exception dom_html_o_list_element_set_##attr( \
- dom_html_o_list_element *element, \
+ dom_exception dom_html_olist_element_set_##attr( \
+ dom_html_olist_element *element, \
dom_string *attr) \
{ \
dom_exception ret; \
diff --git a/src/html/html_olist_element.h b/src/html/html_olist_element.h
index 301d8ac..70601e8 100644
--- a/src/html/html_olist_element.h
+++ b/src/html/html_olist_element.h
@@ -6,47 +6,47 @@
* Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
*/
-#ifndef dom_internal_html_o_list_element_h_
-#define dom_internal_html_o_list_element_h_
+#ifndef dom_internal_html_olist_element_h_
+#define dom_internal_html_olist_element_h_
#include <dom/html/html_olist_element.h>
#include "html/html_element.h"
-struct dom_html_o_list_element {
+struct dom_html_olist_element {
struct dom_html_element base;
/**< The base class */
};
-/* Create a dom_html_o_list_element object */
-dom_exception _dom_html_o_list_element_create(struct dom_html_document *doc,
+/* Create a dom_html_olist_element object */
+dom_exception _dom_html_olist_element_create(struct dom_html_document *doc,
dom_string *namespace, dom_string *o_listfix,
- struct dom_html_o_list_element **ele);
+ struct dom_html_olist_element **ele);
-/* Initialise a dom_html_o_list_element object */
-dom_exception _dom_html_o_list_element_initialise(struct dom_html_document *doc,
+/* Initialise a dom_html_olist_element object */
+dom_exception _dom_html_olist_element_initialise(struct dom_html_document *doc,
dom_string *namespace, dom_string *o_listfix,
- struct dom_html_o_list_element *ele);
+ struct dom_html_olist_element *ele);
-/* Finalise a dom_html_o_list_element object */
-void _dom_html_o_list_element_finalise(struct dom_html_o_list_element *ele);
+/* Finalise a dom_html_olist_element object */
+void _dom_html_olist_element_finalise(struct dom_html_olist_element *ele);
-/* Destroy a dom_html_o_list_element object */
-void _dom_html_o_list_element_destroy(struct dom_html_o_list_element *ele);
+/* Destroy a dom_html_olist_element object */
+void _dom_html_olist_element_destroy(struct dom_html_olist_element *ele);
/* The protected virtual functions */
-dom_exception _dom_html_o_list_element_parse_attribute(dom_element *ele,
+dom_exception _dom_html_olist_element_parse_attribute(dom_element *ele,
dom_string *name, dom_string *value,
dom_string **parsed);
-void _dom_virtual_html_o_list_element_destroy(dom_node_internal *node);
-dom_exception _dom_html_o_list_element_copy(dom_node_internal *old,
+void _dom_virtual_html_olist_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_olist_element_copy(dom_node_internal *old,
dom_node_internal **copy);
-#define DOM_HTML_O_LIST_ELEMENT_PROTECT_VTABLE \
- _dom_html_o_list_element_parse_attribute
+#define DOM_HTML_OLIST_ELEMENT_PROTECT_VTABLE \
+ _dom_html_olist_element_parse_attribute
-#define DOM_NODE_PROTECT_VTABLE_HTML_O_LIST_ELEMENT \
- _dom_virtual_html_o_list_element_destroy, \
- _dom_html_o_list_element_copy
+#define DOM_NODE_PROTECT_VTABLE_HTML_OLIST_ELEMENT \
+ _dom_virtual_html_olist_element_destroy, \
+ _dom_html_olist_element_copy
#endif
diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm
index fec9bcb..a5081dd 100644
--- a/test/DOMTSHandler.pm
+++ b/test/DOMTSHandler.pm
@@ -66,6 +66,7 @@ our %special_prefix = (
HTMLTableSectionElement => "dom_html_table_section_element",
HTMLIsIndexElement => "dom_html_isindex_element",
HTMLIFrameElement => "dom_html_iframe_element",
+ HTMLOListElement => "dom_html_olist_element",
caption => "dom_html_table_caption_element *",
section => "dom_html_table_section_element *",
createCaption => "dom_html_element *",