From 3d7aaee2fa5b61dc001f9ce79983f24c4ece87a1 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Fri, 21 Aug 2015 14:22:11 +0200
Subject: Strip doc from event layer

---
 include/dom/events/event.h           |  3 +++
 src/core/document.c                  |  4 ++--
 src/core/node.c                      |  3 ---
 src/events/custom_event.c            | 10 ++++-----
 src/events/custom_event.h            |  6 ++----
 src/events/dispatch.c                | 14 ++++++------
 src/events/document_event.c          | 41 ++++++++++++++----------------------
 src/events/document_event.h          |  4 ++--
 src/events/event.c                   |  7 +++---
 src/events/event.h                   |  8 +------
 src/events/keyboard_event.c          | 10 ++++-----
 src/events/keyboard_event.h          |  6 ++----
 src/events/mouse_event.c             | 10 ++++-----
 src/events/mouse_event.h             |  6 ++----
 src/events/mouse_multi_wheel_event.c |  8 +++----
 src/events/mouse_multi_wheel_event.h |  4 ++--
 src/events/mouse_wheel_event.c       |  8 +++----
 src/events/mouse_wheel_event.h       |  5 ++---
 src/events/mutation_event.c          | 11 ++++------
 src/events/mutation_event.h          |  6 ++----
 src/events/mutation_name_event.c     |  8 +++----
 src/events/mutation_name_event.h     |  4 ++--
 src/events/text_event.c              | 10 ++++-----
 src/events/text_event.h              |  6 ++----
 src/events/ui_event.c                | 11 ++++------
 src/events/ui_event.h                |  6 ++----
 26 files changed, 89 insertions(+), 130 deletions(-)

diff --git a/include/dom/events/event.h b/include/dom/events/event.h
index 73e7ec0..e33758a 100644
--- a/include/dom/events/event.h
+++ b/include/dom/events/event.h
@@ -27,6 +27,9 @@ void _dom_event_ref(dom_event *evt);
 void _dom_event_unref(dom_event *evt);
 #define dom_event_unref(n) _dom_event_unref((dom_event *) (n))
 
+dom_exception _dom_event_create(dom_event **evt);
+#define dom_event_create(n) _dom_event_create((dom_event **) (n))
+
 dom_exception _dom_event_get_type(dom_event *evt, dom_string **type);
 #define dom_event_get_type(e, t) _dom_event_get_type((dom_event *) (e), \
 		(dom_string **) (t))
diff --git a/src/core/document.c b/src/core/document.c
index a78cde9..b68a066 100644
--- a/src/core/document.c
+++ b/src/core/document.c
@@ -266,7 +266,7 @@ dom_exception _dom_document_initialise(dom_document *doc,
 	}
 
 	/* We should not pass a NULL when all things hook up */
-	return _dom_document_event_internal_initialise(doc, &doc->dei, daf, daf_ctx);
+	return _dom_document_event_internal_initialise(&doc->dei, daf, daf_ctx);
 }
 
 
@@ -309,7 +309,7 @@ bool _dom_document_finalise(dom_document *doc)
 	dom_string_unref(doc->_memo_domcharacterdatamodified);
 	dom_string_unref(doc->_memo_domsubtreemodified);
 	
-	_dom_document_event_internal_finalise(doc, &doc->dei);
+	_dom_document_event_internal_finalise(&doc->dei);
 
 	return true;
 }
diff --git a/src/core/node.c b/src/core/node.c
index e500f3a..49033c0 100644
--- a/src/core/node.c
+++ b/src/core/node.c
@@ -2360,9 +2360,6 @@ dom_exception _dom_node_dispatch_event(dom_event_target *et,
 		return DOM_UNSPECIFIED_EVENT_TYPE_ERR;
 	}
 
-	if (evt->doc == NULL)
-		return DOM_NOT_SUPPORTED_ERR;
-	
 	doc = dom_node_get_owner(et);
 	if (doc == NULL) {
 		/* TODO: In the progress of parsing, many Nodes in the DTD has
diff --git a/src/events/custom_event.c b/src/events/custom_event.c
index 76d09bf..c3a99f9 100644
--- a/src/events/custom_event.c
+++ b/src/events/custom_event.c
@@ -18,8 +18,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_custom_event_create(struct dom_document *doc, 
-		struct dom_custom_event **evt)
+dom_exception _dom_custom_event_create(struct dom_custom_event **evt)
 {
 	*evt = malloc(sizeof(dom_custom_event));
 	if (*evt == NULL) 
@@ -27,7 +26,7 @@ dom_exception _dom_custom_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_custom_event_initialise(doc, *evt);
+	return _dom_custom_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -39,11 +38,10 @@ void _dom_custom_event_destroy(struct dom_custom_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_custom_event_initialise(struct dom_document *doc, 
-		struct dom_custom_event *evt)
+dom_exception _dom_custom_event_initialise(struct dom_custom_event *evt)
 {
 	evt->detail = NULL;
-	return _dom_event_initialise(doc, &evt->base);
+	return _dom_event_initialise(&evt->base);
 }
 
 /* Finalise function */
diff --git a/src/events/custom_event.h b/src/events/custom_event.h
index ed5d624..4c7a6fc 100644
--- a/src/events/custom_event.h
+++ b/src/events/custom_event.h
@@ -18,15 +18,13 @@ struct dom_custom_event {
 };
 
 /* Constructor */
-dom_exception _dom_custom_event_create(struct dom_document *doc, 
-		struct dom_custom_event **evt);
+dom_exception _dom_custom_event_create(struct dom_custom_event **evt);
 
 /* Destructor */
 void _dom_custom_event_destroy(struct dom_custom_event *evt);
 
 /* Initialise function */
-dom_exception _dom_custom_event_initialise(struct dom_document *doc, 
-		struct dom_custom_event *evt);
+dom_exception _dom_custom_event_initialise(struct dom_custom_event *evt);
 
 /* Finalise function */
 void _dom_custom_event_finalise(struct dom_custom_event *evt);
diff --git a/src/events/dispatch.c b/src/events/dispatch.c
index 64664c7..0e0048d 100644
--- a/src/events/dispatch.c
+++ b/src/events/dispatch.c
@@ -31,7 +31,7 @@ dom_exception __dom_dispatch_node_change_event(dom_document *doc,
 	dom_string *type = NULL;
 	dom_exception err;
 
-	err = _dom_mutation_event_create(doc, &evt);
+	err = _dom_mutation_event_create(&evt);
 	if (err != DOM_NO_ERR)
 		return err;
 	
@@ -77,7 +77,7 @@ dom_exception __dom_dispatch_node_change_document_event(dom_document *doc,
 	dom_string *type = NULL;
 	dom_exception err;
 
-	err = _dom_mutation_event_create(doc, &evt);
+	err = _dom_mutation_event_create(&evt);
 	if (err != DOM_NO_ERR)
 		return err;
 
@@ -128,7 +128,7 @@ dom_exception __dom_dispatch_attr_modified_event(dom_document *doc,
 	dom_string *type = NULL;
 	dom_exception err;
 
-	err = _dom_mutation_event_create(doc, &evt);
+	err = _dom_mutation_event_create(&evt);
 	if (err != DOM_NO_ERR)
 		return err;
 	
@@ -172,7 +172,7 @@ dom_exception __dom_dispatch_characterdata_modified_event(
 	dom_string *type = NULL;
 	dom_exception err;
 
-	err = _dom_mutation_event_create(doc, &evt);
+	err = _dom_mutation_event_create(&evt);
 	if (err != DOM_NO_ERR)
 		return err;
 	
@@ -208,7 +208,7 @@ dom_exception __dom_dispatch_subtree_modified_event(dom_document *doc,
 	dom_string *type = NULL;
 	dom_exception err;
 
-	err = _dom_mutation_event_create(doc, &evt);
+	err = _dom_mutation_event_create(&evt);
 	if (err != DOM_NO_ERR)
 		return err;
 	
@@ -248,7 +248,9 @@ dom_exception _dom_dispatch_generic_event(dom_document *doc,
 	struct dom_event *evt;
 	dom_exception err;
 
-	err = _dom_event_create(doc, &evt);
+	UNUSED(doc);
+
+	err = _dom_event_create(&evt);
 	if (err != DOM_NO_ERR)
 		return err;
 	
diff --git a/src/events/document_event.c b/src/events/document_event.c
index cd312ea..edabd92 100644
--- a/src/events/document_event.c
+++ b/src/events/document_event.c
@@ -43,13 +43,12 @@ static const char *__event_types[] = {
 /**
  * Initialise this DocumentEvent
  *
- * \param doc      The document object
  * \param dei      The DocumentEvent internal object
  * \param actions  The default action fetcher, the browser should provide such
  *                 a function to Event module.
  * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
  */
-dom_exception _dom_document_event_internal_initialise(struct dom_document *doc,
+dom_exception _dom_document_event_internal_initialise(
 		dom_document_event_internal *dei, 
 		dom_events_default_action_fetcher actions,
 		void *actions_ctx)
@@ -57,8 +56,6 @@ dom_exception _dom_document_event_internal_initialise(struct dom_document *doc,
 	lwc_error err;
 	int i;
 
-	UNUSED(doc);
-
 	for (i = 0; i < DOM_EVENT_COUNT; i++) {
 		err = lwc_intern_string(__event_types[i],
 				strlen(__event_types[i]), &dei->event_types[i]);
@@ -73,13 +70,10 @@ dom_exception _dom_document_event_internal_initialise(struct dom_document *doc,
 }
 
 /* Finalise this DocumentEvent */
-void _dom_document_event_internal_finalise(struct dom_document *doc,
-		dom_document_event_internal *dei)
+void _dom_document_event_internal_finalise(dom_document_event_internal *dei)
 {
 	int i;
 
-	UNUSED(doc);
-
 	for (i = 0; i < DOM_EVENT_COUNT; i++) {
 		if (dei->event_types[i] != NULL)
 			lwc_string_unref(dei->event_types[i]);
@@ -100,17 +94,17 @@ void _dom_document_event_internal_finalise(struct dom_document *doc,
  * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
  */
 dom_exception _dom_document_event_create_event(dom_document_event *de,
-		dom_string *type, struct dom_event **evt)
+		dom_string *type,
+		struct dom_event **evt)
 {
 	lwc_string *t = NULL;
 	dom_exception err;
-	struct dom_document *doc = de;
 	int i, et = 0;
 	dom_document_event_internal *dei;
 
 	err = dom_string_intern(type, &t);
 	if (err != DOM_NO_ERR)
-		return err;
+	       return err;
 
 	assert(t != NULL);
 	
@@ -125,41 +119,39 @@ dom_exception _dom_document_event_create_event(dom_document_event *de,
 
 	switch (et) {
 		case DOM_EVENT:
-			err = _dom_event_create(doc, evt);
+			err = _dom_event_create(evt);
 			break;
 		case DOM_CUSTOM_EVENT:
-			err = _dom_custom_event_create(doc,
-					(dom_custom_event **) evt);
+			err = _dom_custom_event_create((dom_custom_event **) evt);
 			break;
 		case DOM_UI_EVENT:
-			err = _dom_ui_event_create(doc, (dom_ui_event **) evt);
+			err = _dom_ui_event_create((dom_ui_event **) evt);
 			break;
 		case DOM_TEXT_EVENT:
-			err = _dom_text_event_create(doc,
-					(dom_text_event **) evt);
+			err = _dom_text_event_create((dom_text_event **) evt);
 			break;
 		case DOM_KEYBOARD_EVENT:
-			err = _dom_keyboard_event_create(doc,
+			err = _dom_keyboard_event_create(
 					(dom_keyboard_event **) evt);
 			break;
 		case DOM_MOUSE_EVENT:
-			err = _dom_mouse_event_create(doc,
+			err = _dom_mouse_event_create(
 					(dom_mouse_event **) evt);
 			break;
 		case DOM_MOUSE_MULTI_WHEEL_EVENT:
-			err = _dom_mouse_multi_wheel_event_create(doc, 
+			err = _dom_mouse_multi_wheel_event_create(
 					(dom_mouse_multi_wheel_event **) evt);
 			break;
 		case DOM_MOUSE_WHEEL_EVENT:
-			err = _dom_mouse_wheel_event_create(doc,
+			err = _dom_mouse_wheel_event_create(
 					(dom_mouse_wheel_event **) evt);
 			break;
 		case DOM_MUTATION_EVENT:
-			err = _dom_mutation_event_create(doc,
+			err = _dom_mutation_event_create(
 					(dom_mutation_event **) evt);
 			break;
 		case DOM_MUTATION_NAME_EVENT:
-			err = _dom_mutation_name_event_create(doc, 
+			err = _dom_mutation_name_event_create(
 					(dom_mutation_name_event **) evt);
 			break;
 	}
@@ -180,8 +172,7 @@ dom_exception _dom_document_event_create_event(dom_document_event *de,
  * DOM_NO_SUPPORTED_ERR.
  */
 dom_exception _dom_document_event_can_dispatch(dom_document_event *de,
-		dom_string *namespace, dom_string *type,
-		bool *can)
+		dom_string *namespace, dom_string *type, bool *can)
 {
 	UNUSED(de);
 	UNUSED(namespace);
diff --git a/src/events/document_event.h b/src/events/document_event.h
index 1e04045..fbc5542 100644
--- a/src/events/document_event.h
+++ b/src/events/document_event.h
@@ -52,13 +52,13 @@ typedef struct dom_document_event_internal dom_document_event_internal;
  */
 
 /* Initialise this DocumentEvent */
-dom_exception _dom_document_event_internal_initialise(struct dom_document *doc,
+dom_exception _dom_document_event_internal_initialise(
 		dom_document_event_internal *dei, 
 		dom_events_default_action_fetcher actions,
 		void *actions_ctx);
 
 /* Finalise this DocumentEvent */
-void _dom_document_event_internal_finalise(struct dom_document *doc,
+void _dom_document_event_internal_finalise(
 		dom_document_event_internal *dei);
 
 #endif
diff --git a/src/events/event.c b/src/events/event.c
index 8af111b..ebd4854 100644
--- a/src/events/event.c
+++ b/src/events/event.c
@@ -23,7 +23,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_event_create(dom_document *doc, dom_event **evt)
+dom_exception _dom_event_create(dom_event **evt)
 {
 	*evt = (dom_event *) malloc(sizeof(dom_event));
 	if (*evt == NULL) 
@@ -31,7 +31,7 @@ dom_exception _dom_event_create(dom_document *doc, dom_event **evt)
 	
 	(*evt)->vtable = &_event_vtable;
 
-	return _dom_event_initialise(doc, *evt);
+	return _dom_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -43,11 +43,10 @@ void _dom_event_destroy(dom_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_event_initialise(dom_document *doc, dom_event *evt)
+dom_exception _dom_event_initialise(dom_event *evt)
 {
 	assert(doc != NULL);
 
-	evt->doc = doc;
 	evt->stop = false;
 	evt->stop_now = false;
 	evt->prevent_default = false;
diff --git a/src/events/event.h b/src/events/event.h
index fa3d6b9..4835bd0 100644
--- a/src/events/event.h
+++ b/src/events/event.h
@@ -36,9 +36,6 @@ struct dom_event {
 
 	dom_string *namespace;	/**< The namespace of this event */
 
-	dom_document *doc;
-			/**< The document which created this event */
-
 	bool stop; 		/**< Whether stopPropagation is called */
 	bool stop_now;	/**< Whether stopImmediatePropagation is called */
 	bool prevent_default;
@@ -53,14 +50,11 @@ struct dom_event {
 	bool in_dispatch;	/**< Whether this event is in dispatch */
 };
 
-/* Constructor */
-dom_exception _dom_event_create(dom_document *doc, dom_event **evt);
-
 /* Destructor */
 void _dom_event_destroy(dom_event *evt);
 
 /* Initialise function */
-dom_exception _dom_event_initialise(dom_document *doc, dom_event *evt);
+dom_exception _dom_event_initialise(dom_event *evt);
 
 /* Finalise function */
 void _dom_event_finalise(dom_event *evt);
diff --git a/src/events/keyboard_event.c b/src/events/keyboard_event.c
index 76f32ba..fb29c18 100644
--- a/src/events/keyboard_event.c
+++ b/src/events/keyboard_event.c
@@ -20,8 +20,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_keyboard_event_create(struct dom_document *doc, 
-		struct dom_keyboard_event **evt)
+dom_exception _dom_keyboard_event_create(struct dom_keyboard_event **evt)
 {
 	*evt = malloc(sizeof(dom_keyboard_event));
 	if (*evt == NULL) 
@@ -29,7 +28,7 @@ dom_exception _dom_keyboard_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_keyboard_event_initialise(doc, *evt);
+	return _dom_keyboard_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -41,13 +40,12 @@ void _dom_keyboard_event_destroy(struct dom_keyboard_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_keyboard_event_initialise(struct dom_document *doc, 
-		struct dom_keyboard_event *evt)
+dom_exception _dom_keyboard_event_initialise(struct dom_keyboard_event *evt)
 {
 	evt->key_ident = NULL;
 	evt->modifier_state = 0;
 
-	return _dom_ui_event_initialise(doc, &evt->base);
+	return _dom_ui_event_initialise(&evt->base);
 }
 
 /* Finalise function */
diff --git a/src/events/keyboard_event.h b/src/events/keyboard_event.h
index b51518f..d640bbb 100644
--- a/src/events/keyboard_event.h
+++ b/src/events/keyboard_event.h
@@ -32,15 +32,13 @@ struct dom_keyboard_event {
 };
 
 /* Constructor */
-dom_exception _dom_keyboard_event_create(struct dom_document *doc, 
-		struct dom_keyboard_event **evt);
+dom_exception _dom_keyboard_event_create(struct dom_keyboard_event **evt);
 
 /* Destructor */
 void _dom_keyboard_event_destroy(struct dom_keyboard_event *evt);
 
 /* Initialise function */
-dom_exception _dom_keyboard_event_initialise(struct dom_document *doc, 
-		struct dom_keyboard_event *evt);
+dom_exception _dom_keyboard_event_initialise(struct dom_keyboard_event *evt);
 
 /* Finalise function */
 void _dom_keyboard_event_finalise(struct dom_keyboard_event *evt);
diff --git a/src/events/mouse_event.c b/src/events/mouse_event.c
index 3e76879..b3b2154 100644
--- a/src/events/mouse_event.c
+++ b/src/events/mouse_event.c
@@ -20,8 +20,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_mouse_event_create(struct dom_document *doc, 
-		struct dom_mouse_event **evt)
+dom_exception _dom_mouse_event_create(struct dom_mouse_event **evt)
 {
 	*evt = malloc(sizeof(dom_mouse_event));
 	if (*evt == NULL) 
@@ -29,7 +28,7 @@ dom_exception _dom_mouse_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_mouse_event_initialise(doc, *evt);
+	return _dom_mouse_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -41,12 +40,11 @@ void _dom_mouse_event_destroy(struct dom_mouse_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_mouse_event_initialise(struct dom_document *doc, 
-		struct dom_mouse_event *evt)
+dom_exception _dom_mouse_event_initialise(struct dom_mouse_event *evt)
 {
 	evt->modifier_state = 0;
 
-	return _dom_ui_event_initialise(doc, (dom_ui_event *) evt);
+	return _dom_ui_event_initialise((dom_ui_event *) evt);
 }
 
 /* The virtual destroy function */
diff --git a/src/events/mouse_event.h b/src/events/mouse_event.h
index e49bcd7..cb7a874 100644
--- a/src/events/mouse_event.h
+++ b/src/events/mouse_event.h
@@ -30,15 +30,13 @@ struct dom_mouse_event {
 };
 
 /* Constructor */
-dom_exception _dom_mouse_event_create(struct dom_document *doc, 
-		struct dom_mouse_event **evt);
+dom_exception _dom_mouse_event_create(struct dom_mouse_event **evt);
 
 /* Destructor */
 void _dom_mouse_event_destroy(struct dom_mouse_event *evt);
 
 /* Initialise function */
-dom_exception _dom_mouse_event_initialise(struct dom_document *doc, 
-		struct dom_mouse_event *evt);
+dom_exception _dom_mouse_event_initialise(struct dom_mouse_event *evt);
 
 /* Finalise function */
 #define _dom_mouse_event_finalise _dom_ui_event_finalise
diff --git a/src/events/mouse_multi_wheel_event.c b/src/events/mouse_multi_wheel_event.c
index 35f91af..bcbe8d5 100644
--- a/src/events/mouse_multi_wheel_event.c
+++ b/src/events/mouse_multi_wheel_event.c
@@ -21,7 +21,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_mouse_multi_wheel_event_create(struct dom_document *doc, 
+dom_exception _dom_mouse_multi_wheel_event_create(
 		struct dom_mouse_multi_wheel_event **evt)
 {
 	*evt = malloc(sizeof(dom_mouse_multi_wheel_event));
@@ -30,7 +30,7 @@ dom_exception _dom_mouse_multi_wheel_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_mouse_multi_wheel_event_initialise(doc, *evt);
+	return _dom_mouse_multi_wheel_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -43,10 +43,10 @@ void _dom_mouse_multi_wheel_event_destroy(
 }
 
 /* Initialise function */
-dom_exception _dom_mouse_multi_wheel_event_initialise(struct dom_document *doc,
+dom_exception _dom_mouse_multi_wheel_event_initialise(
 		struct dom_mouse_multi_wheel_event *evt)
 {
-	return _dom_mouse_event_initialise(doc, (dom_mouse_event *) evt);
+	return _dom_mouse_event_initialise((dom_mouse_event *) evt);
 }
 
 /* The virtual destroy function */
diff --git a/src/events/mouse_multi_wheel_event.h b/src/events/mouse_multi_wheel_event.h
index 0476911..2af1467 100644
--- a/src/events/mouse_multi_wheel_event.h
+++ b/src/events/mouse_multi_wheel_event.h
@@ -24,7 +24,7 @@ struct dom_mouse_multi_wheel_event {
 };
 
 /* Constructor */
-dom_exception _dom_mouse_multi_wheel_event_create(struct dom_document *doc, 
+dom_exception _dom_mouse_multi_wheel_event_create(
 		struct dom_mouse_multi_wheel_event **evt);
 
 /* Destructor */
@@ -32,7 +32,7 @@ void _dom_mouse_multi_wheel_event_destroy(
 		struct dom_mouse_multi_wheel_event *evt);
 
 /* Initialise function */
-dom_exception _dom_mouse_multi_wheel_event_initialise(struct dom_document *doc,
+dom_exception _dom_mouse_multi_wheel_event_initialise(
 		struct dom_mouse_multi_wheel_event *evt);
 
 /* Finalise function */
diff --git a/src/events/mouse_wheel_event.c b/src/events/mouse_wheel_event.c
index 778a53b..d59eab1 100644
--- a/src/events/mouse_wheel_event.c
+++ b/src/events/mouse_wheel_event.c
@@ -20,7 +20,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_mouse_wheel_event_create(struct dom_document *doc, 
+dom_exception _dom_mouse_wheel_event_create(
 		struct dom_mouse_wheel_event **evt)
 {
 	*evt = malloc(sizeof(dom_mouse_wheel_event));
@@ -29,7 +29,7 @@ dom_exception _dom_mouse_wheel_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_mouse_wheel_event_initialise(doc, 
+	return _dom_mouse_wheel_event_initialise(
 			(dom_mouse_wheel_event *) *evt);
 }
 
@@ -42,10 +42,10 @@ void _dom_mouse_wheel_event_destroy(struct dom_mouse_wheel_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_mouse_wheel_event_initialise(struct dom_document *doc,
+dom_exception _dom_mouse_wheel_event_initialise(
 		struct dom_mouse_wheel_event *evt)
 {
-	return _dom_mouse_event_initialise(doc, (dom_mouse_event *) evt);
+	return _dom_mouse_event_initialise((dom_mouse_event *) evt);
 }
 
 /* The virtual destroy function */
diff --git a/src/events/mouse_wheel_event.h b/src/events/mouse_wheel_event.h
index e78abf6..86f4919 100644
--- a/src/events/mouse_wheel_event.h
+++ b/src/events/mouse_wheel_event.h
@@ -22,14 +22,13 @@ struct dom_mouse_wheel_event {
 };
 
 /* Constructor */
-dom_exception _dom_mouse_wheel_event_create(struct dom_document *doc, 
-		struct dom_mouse_wheel_event **evt);
+dom_exception _dom_mouse_wheel_event_create(struct dom_mouse_wheel_event **evt);
 
 /* Destructor */
 void _dom_mouse_wheel_event_destroy(struct dom_mouse_wheel_event *evt);
 
 /* Initialise function */
-dom_exception _dom_mouse_wheel_event_initialise(struct dom_document *doc,
+dom_exception _dom_mouse_wheel_event_initialise(
 		struct dom_mouse_wheel_event *evt);
 
 /* Finalise function */
diff --git a/src/events/mutation_event.c b/src/events/mutation_event.c
index aeeefe7..df92c5f 100644
--- a/src/events/mutation_event.c
+++ b/src/events/mutation_event.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 
 #include "events/mutation_event.h"
-#include "core/document.h"
 
 static void _virtual_dom_mutation_event_destroy(struct dom_event *evt);
 
@@ -17,8 +16,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_mutation_event_create(struct dom_document *doc, 
-		struct dom_mutation_event **evt)
+dom_exception _dom_mutation_event_create(struct dom_mutation_event **evt)
 {
 	*evt = malloc(sizeof(dom_mutation_event));
 	if (*evt == NULL) 
@@ -26,7 +24,7 @@ dom_exception _dom_mutation_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_mutation_event_initialise(doc, *evt);
+	return _dom_mutation_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -38,15 +36,14 @@ void _dom_mutation_event_destroy(struct dom_mutation_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_mutation_event_initialise(struct dom_document *doc, 
-		struct dom_mutation_event *evt)
+dom_exception _dom_mutation_event_initialise(struct dom_mutation_event *evt)
 {
 	evt->related_node = NULL;
 	evt->prev_value = NULL;
 	evt->new_value = NULL;
 	evt->attr_name = NULL;
 
-	return _dom_event_initialise(doc, &evt->base);
+	return _dom_event_initialise(&evt->base);
 }
 
 /* Finalise function */
diff --git a/src/events/mutation_event.h b/src/events/mutation_event.h
index 142e18c..800f5c6 100644
--- a/src/events/mutation_event.h
+++ b/src/events/mutation_event.h
@@ -26,15 +26,13 @@ struct dom_mutation_event {
 };
 
 /* Constructor */
-dom_exception _dom_mutation_event_create(struct dom_document *doc, 
-		struct dom_mutation_event **evt);
+dom_exception _dom_mutation_event_create(struct dom_mutation_event **evt);
 
 /* Destructor */
 void _dom_mutation_event_destroy(struct dom_mutation_event *evt);
 
 /* Initialise function */
-dom_exception _dom_mutation_event_initialise(struct dom_document *doc, 
-		struct dom_mutation_event *evt);
+dom_exception _dom_mutation_event_initialise(struct dom_mutation_event *evt);
 
 /* Finalise function */
 void _dom_mutation_event_finalise(struct dom_mutation_event *evt);
diff --git a/src/events/mutation_name_event.c b/src/events/mutation_name_event.c
index c5c9345..e0ba82e 100644
--- a/src/events/mutation_name_event.c
+++ b/src/events/mutation_name_event.c
@@ -19,7 +19,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_mutation_name_event_create(struct dom_document *doc, 
+dom_exception _dom_mutation_name_event_create(
 		struct dom_mutation_name_event **evt)
 {
 	*evt = malloc(sizeof(dom_mutation_name_event));
@@ -28,7 +28,7 @@ dom_exception _dom_mutation_name_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_mutation_name_event_initialise(doc, *evt);
+	return _dom_mutation_name_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -40,13 +40,13 @@ void _dom_mutation_name_event_destroy(struct dom_mutation_name_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_mutation_name_event_initialise(struct dom_document *doc, 
+dom_exception _dom_mutation_name_event_initialise(
 		struct dom_mutation_name_event *evt)
 {
 	evt->prev_namespace = NULL;
 	evt->prev_nodename = NULL;
 
-	return _dom_event_initialise(doc, (dom_event *) evt);
+	return _dom_event_initialise((dom_event *) evt);
 }
 
 /* Finalise function */
diff --git a/src/events/mutation_name_event.h b/src/events/mutation_name_event.h
index 8849059..c7bd13d 100644
--- a/src/events/mutation_name_event.h
+++ b/src/events/mutation_name_event.h
@@ -23,14 +23,14 @@ struct dom_mutation_name_event {
 };
 
 /* Constructor */
-dom_exception _dom_mutation_name_event_create(struct dom_document *doc, 
+dom_exception _dom_mutation_name_event_create(
 		struct dom_mutation_name_event **evt);
 
 /* Destructor */
 void _dom_mutation_name_event_destroy(struct dom_mutation_name_event *evt);
 
 /* Initialise function */
-dom_exception _dom_mutation_name_event_initialise(struct dom_document *doc, 
+dom_exception _dom_mutation_name_event_initialise(
 		struct dom_mutation_name_event *evt);
 
 /* Finalise function */
diff --git a/src/events/text_event.c b/src/events/text_event.c
index 8457fe8..3437716 100644
--- a/src/events/text_event.c
+++ b/src/events/text_event.c
@@ -17,8 +17,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_text_event_create(struct dom_document *doc, 
-		struct dom_text_event **evt)
+dom_exception _dom_text_event_create(struct dom_text_event **evt)
 {
 	*evt = malloc(sizeof(dom_text_event));
 	if (*evt == NULL) 
@@ -26,7 +25,7 @@ dom_exception _dom_text_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_text_event_initialise(doc, *evt);
+	return _dom_text_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -38,11 +37,10 @@ void _dom_text_event_destroy(struct dom_text_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_text_event_initialise(struct dom_document *doc, 
-		struct dom_text_event *evt)
+dom_exception _dom_text_event_initialise(struct dom_text_event *evt)
 {
 	evt->data = NULL;
-	return _dom_ui_event_initialise(doc, &evt->base);
+	return _dom_ui_event_initialise(&evt->base);
 }
 
 /* Finalise function */
diff --git a/src/events/text_event.h b/src/events/text_event.h
index 8d9f063..e35e71c 100644
--- a/src/events/text_event.h
+++ b/src/events/text_event.h
@@ -21,15 +21,13 @@ struct dom_text_event {
 };
 
 /* Constructor */
-dom_exception _dom_text_event_create(struct dom_document *doc, 
-		struct dom_text_event **evt);
+dom_exception _dom_text_event_create(struct dom_text_event **evt);
 
 /* Destructor */
 void _dom_text_event_destroy(struct dom_text_event *evt);
 
 /* Initialise function */
-dom_exception _dom_text_event_initialise(struct dom_document *doc, 
-		struct dom_text_event *evt);
+dom_exception _dom_text_event_initialise(struct dom_text_event *evt);
 
 /* Finalise function */
 void _dom_text_event_finalise(struct dom_text_event *evt);
diff --git a/src/events/ui_event.c b/src/events/ui_event.c
index 911b0d0..4fac3b6 100644
--- a/src/events/ui_event.c
+++ b/src/events/ui_event.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 
 #include "events/ui_event.h"
-#include "core/document.h"
 
 static void _virtual_dom_ui_event_destroy(struct dom_event *evt);
 
@@ -17,8 +16,7 @@ static struct dom_event_private_vtable _event_vtable = {
 };
 
 /* Constructor */
-dom_exception _dom_ui_event_create(struct dom_document *doc, 
-		struct dom_ui_event **evt)
+dom_exception _dom_ui_event_create(struct dom_ui_event **evt)
 {
 	*evt = malloc(sizeof(dom_ui_event));
 	if (*evt == NULL) 
@@ -26,7 +24,7 @@ dom_exception _dom_ui_event_create(struct dom_document *doc,
 	
 	((struct dom_event *) *evt)->vtable = &_event_vtable;
 
-	return _dom_ui_event_initialise(doc, *evt);
+	return _dom_ui_event_initialise(*evt);
 }
 
 /* Destructor */
@@ -38,11 +36,10 @@ void _dom_ui_event_destroy(struct dom_ui_event *evt)
 }
 
 /* Initialise function */
-dom_exception _dom_ui_event_initialise(struct dom_document *doc, 
-		struct dom_ui_event *evt)
+dom_exception _dom_ui_event_initialise(struct dom_ui_event *evt)
 {
 	evt->view = NULL;
-	return _dom_event_initialise(doc, &evt->base);
+	return _dom_event_initialise(&evt->base);
 }
 
 /* Finalise function */
diff --git a/src/events/ui_event.h b/src/events/ui_event.h
index e60ed35..8f57677 100644
--- a/src/events/ui_event.h
+++ b/src/events/ui_event.h
@@ -36,15 +36,13 @@ struct dom_ui_event {
 };
 
 /* Constructor */
-dom_exception _dom_ui_event_create(struct dom_document *doc, 
-		struct dom_ui_event **evt);
+dom_exception _dom_ui_event_create(struct dom_ui_event **evt);
 
 /* Destructor */
 void _dom_ui_event_destroy(struct dom_ui_event *evt);
 
 /* Initialise function */
-dom_exception _dom_ui_event_initialise(struct dom_document *doc, 
-		struct dom_ui_event *evt);
+dom_exception _dom_ui_event_initialise(struct dom_ui_event *evt);
 
 /* Finalise function */
 void _dom_ui_event_finalise(struct dom_ui_event *evt);
-- 
cgit v1.2.3