Remove form association logic -- this is not the way to do it

svn path=/trunk/libdom/; revision=13423

4 files changed, 9 insertions, 51 deletions

diff --git a/src/html/html_element.c b/src/html/html_element.c
index 5fbf0da..bd095d8 100644
--- a/src/html/html_element.c
+++ b/src/html/html_element.c
@@ -25,15 +25,11 @@ dom_exception _dom_html_element_initialise(struct dom_document *doc,
 	if (err != DOM_NO_ERR)
 		return err;
 	
-	el->form = NULL;
 	return err;
 }
 
 void _dom_html_element_finalise(struct dom_html_element *ele)
 {
-	dom_node_unref(ele->form);
-	ele->form = NULL;
-
 	_dom_element_finalise(&ele->base);
 }
 
@@ -191,31 +187,3 @@ fail:
 	return err;
 }
 
-/**
- * Get the form element if this element is a form control
- *
- * \param ele   The element object
- * \param form  The form object
- */
-void _dom_html_element_get_form(dom_html_element *ele,
-		struct dom_html_form_element **form)
-{
-	*form = ele->form;
-	dom_node_ref(*form);
-}
-
-/**
- * Set the form element if this element is a form control
- *
- * \param ele   The element object
- * \param form  The form object
- */
-void _dom_html_element_associate_form(dom_html_element *ele,
-		struct dom_html_form_element *form)
-{
-	/* Unref the form if there is any */
-	dom_node_unref(form);
-	ele->form = form;
-	dom_node_ref(form);
-}
-
diff --git a/src/html/html_element.h b/src/html/html_element.h
index 29fb28d..e183ec3 100644
--- a/src/html/html_element.h
+++ b/src/html/html_element.h
@@ -12,8 +12,6 @@
 
 #include "core/element.h"
 
-struct dom_html_form_element;
-
 /**
  * The dom_html_element class
  *
@@ -21,10 +19,6 @@ struct dom_html_form_element;
 struct dom_html_element {
 	struct dom_element base;
 			/**< The base class */
-	struct dom_html_form_element *form;
-			/**< The form element which contains this element if
-			 *   this element is a form control
-			 */
 };
 
 dom_exception _dom_html_element_initialise(struct dom_document *doc,
@@ -49,12 +43,6 @@ dom_exception dom_html_element_get_bool_property(dom_html_element *ele,
 		const char *name, unsigned long len, bool *has);
 dom_exception dom_html_element_set_bool_property(dom_html_element *ele,
 		const char *name, unsigned long len, bool has);
-void _dom_html_element_get_form(dom_html_element *ele,
-		struct dom_html_form_element **form);
-void _dom_html_element_associate_form(dom_html_element *ele,
-		struct dom_html_form_element *form);
-
-
 
 #endif
 
diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c
index 11c4b98..ec5b110 100644
--- a/src/html/html_form_element.c
+++ b/src/html/html_form_element.c
@@ -229,9 +229,11 @@ dom_exception dom_html_form_element_reset(dom_html_form_element *ele)
  * src/html/html_collection.h for detail. */
 static bool _dom_is_form_control(struct dom_node_internal *node)
 {
+	UNUSED(node);
+
 	assert(node->type == DOM_ELEMENT_NODE);
-	dom_html_element *ele = (dom_html_element *) node;
 
-	return ele->form != NULL;
+	/** \todo: implement */
+	return false;
 }
 
diff --git a/src/html/html_isindex_element.c b/src/html/html_isindex_element.c
index a1343cb..0c02c22 100644
--- a/src/html/html_isindex_element.c
+++ b/src/html/html_isindex_element.c
@@ -59,6 +59,8 @@ dom_exception _dom_html_isindex_element_initialise(struct dom_document *doc,
 	dom_string *name = NULL;
 	dom_exception err;
 
+	UNUSED(form);
+
 	err = dom_string_create((const uint8_t *) "ISINDEX", SLEN("ISINDEX"),
 			&name);
 	if (err != DOM_NO_ERR)
@@ -67,9 +69,6 @@ dom_exception _dom_html_isindex_element_initialise(struct dom_document *doc,
 	err = _dom_html_element_initialise(doc, &ele->base, name, NULL, NULL);
 	dom_string_unref(name);
 
-	ele->base.form = form;
-	dom_node_ref(form);
-
 	return err;
 }
 
@@ -139,7 +138,8 @@ dom_exception _dom_html_isindex_element_copy(dom_node_internal *old,
 dom_exception dom_html_isindex_element_get_form(dom_html_isindex_element *ele,
 		struct dom_html_form_element **form)
 {
-	_dom_html_element_get_form(&ele->base, form);
+	UNUSED(ele);
+	UNUSED(form);
 
-	return DOM_NO_ERR;
+	return DOM_NOT_SUPPORTED_ERR;
 }