[aravis/dom: 5/5] dom: make compilation pass with Gc derived from DomDocument and GcNode from DomElement.



commit 3f1c383990f6526216fdac1d4d5860507b22890e
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Feb 20 19:00:01 2012 +0100

    dom: make compilation pass with Gc derived from DomDocument and GcNode from DomElement.

 src/Makefile.am              |    2 -
 src/arv.h                    |    9 ++++++
 src/arvdom.h                 |   41 ---------------------------
 src/arvdomcharacterdata.c    |    6 ++--
 src/arvdomcharacterdata.h    |   12 ++++----
 src/arvdomdocument.c         |   28 +++++++------------
 src/arvdomdocument.h         |   17 ++++-------
 src/arvdomdocumentfragment.c |    4 +-
 src/arvdomdocumentfragment.h |   14 +++++-----
 src/arvdomelement.c          |    8 +++---
 src/arvdomelement.h          |   13 ++++-----
 src/arvdomimplementation.h   |    2 +-
 src/arvdomnamednodemap.c     |   10 +++---
 src/arvdomnamednodemap.h     |   14 +++++-----
 src/arvdomnode.c             |   62 +++++++++++++++++++++---------------------
 src/arvdomnode.h             |   14 +++++-----
 src/arvdomnodelist.c         |    4 +-
 src/arvdomnodelist.h         |   14 +++++-----
 src/arvdomparser.c           |    6 ++--
 src/arvdomtext.c             |    4 +-
 src/arvdomtext.h             |   12 ++++----
 src/arvdomtypes.h            |   44 -----------------------------
 src/arvgc.c                  |    7 +++-
 src/arvgc.h                  |    5 ++-
 src/arvgcnode.c              |    2 +-
 src/arvgcnode.h              |    5 ++-
 src/arvtypes.h               |    9 ++++++
 27 files changed, 145 insertions(+), 223 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d90065..8548c45 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,8 +86,6 @@ ARAVIS_HDRS = 					\
 	arvdebug.h				\
 	arvsystem.h				\
 	arvevaluator.h				\
-	arvdom.h				\
-	arvdomtypes.h				\
 	arvdomnode.h				\
 	arvdomnodelist.h			\
 	arvdomnamednodemap.h			\
diff --git a/src/arv.h b/src/arv.h
index b85bda6..b24d5fe 100644
--- a/src/arv.h
+++ b/src/arv.h
@@ -24,11 +24,20 @@
 #define ARV_H
 
 #include <arvtypes.h>
+
 #include <arvdebug.h>
 #include <arvmisc.h>
 #include <arvzip.h>
 #include <arvsystem.h>
 #include <arvevaluator.h>
+#include <arvdomnode.h>
+#include <arvdomnodelist.h>
+#include <arvdomdocument.h>
+#include <arvdomelement.h>
+#include <arvdomcharacterdata.h>
+#include <arvdomtext.h>
+#include <arvdomimplementation.h>
+#include <arvdomparser.h>
 #include <arvcamera.h>
 #include <arvgc.h>
 #include <arvgcnode.h>
diff --git a/src/arvdomcharacterdata.c b/src/arvdomcharacterdata.c
index 7880da7..b179086 100644
--- a/src/arvdomcharacterdata.c
+++ b/src/arvdomcharacterdata.c
@@ -60,7 +60,7 @@ arv_dom_character_data_set_node_value (ArvDomNode* self, const char *value)
 const char *
 arv_dom_character_data_get_data (ArvDomCharacterData* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_CHARACTER_DATA (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_CHARACTER_DATA (self), NULL);
 
 	return self->data;
 }
@@ -68,7 +68,7 @@ arv_dom_character_data_get_data (ArvDomCharacterData* self)
 void
 arv_dom_character_data_set_data (ArvDomCharacterData* self, const char * value)
 {
-	g_return_if_fail (LSM_IS_DOM_CHARACTER_DATA (self));
+	g_return_if_fail (ARV_IS_DOM_CHARACTER_DATA (self));
 	g_return_if_fail (value != NULL);
 
 	g_free (self->data);
@@ -111,4 +111,4 @@ arv_dom_character_data_class_init (ArvDomCharacterDataClass *character_data_clas
 	node_class->get_node_value = arv_dom_character_data_get_node_value;
 }
 
-G_DEFINE_ABSTRACT_TYPE (ArvDomCharacterData, arv_dom_character_data, LSM_TYPE_DOM_NODE)
+G_DEFINE_ABSTRACT_TYPE (ArvDomCharacterData, arv_dom_character_data, ARV_TYPE_DOM_NODE)
diff --git a/src/arvdomcharacterdata.h b/src/arvdomcharacterdata.h
index eb32f00..46c5373 100644
--- a/src/arvdomcharacterdata.h
+++ b/src/arvdomcharacterdata.h
@@ -28,12 +28,12 @@
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_CHARACTER_DATA             (arv_dom_character_data_get_type ())
-#define ARV_DOM_CHARACTER_DATA(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_CHARACTER_DATA, ArvDomCharacterData))
-#define ARV_DOM_CHARACTER_DATA_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_CHARACTER_DATA, ArvDomNodeClass))
-#define LSM_IS_DOM_CHARACTER_DATA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_CHARACTER_DATA))
-#define LSM_IS_DOM_CHARACTER_DATA_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_CHARACTER_DATA))
-#define ARV_DOM_CHARACTER_DATA_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_CHARACTER_DATA, ArvDomCharacterDataClass))
+#define ARV_TYPE_DOM_CHARACTER_DATA             (arv_dom_character_data_get_type ())
+#define ARV_DOM_CHARACTER_DATA(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_CHARACTER_DATA, ArvDomCharacterData))
+#define ARV_DOM_CHARACTER_DATA_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_CHARACTER_DATA, ArvDomNodeClass))
+#define ARV_IS_DOM_CHARACTER_DATA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_CHARACTER_DATA))
+#define ARV_IS_DOM_CHARACTER_DATA_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_CHARACTER_DATA))
+#define ARV_DOM_CHARACTER_DATA_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_CHARACTER_DATA, ArvDomCharacterDataClass))
 
 typedef struct _ArvDomCharacterDataClass ArvDomCharacterDataClass;
 
diff --git a/src/arvdomdocument.c b/src/arvdomdocument.c
index 4204f77..215a23e 100644
--- a/src/arvdomdocument.c
+++ b/src/arvdomdocument.c
@@ -55,7 +55,7 @@ arv_dom_document_get_node_type (ArvDomNode *node)
 ArvDomElement *
 arv_dom_document_get_document_element (ArvDomDocument *self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_DOCUMENT (self), NULL);
 
 	return ARV_DOM_ELEMENT (arv_dom_node_get_first_child (ARV_DOM_NODE (self)));
 }
@@ -65,7 +65,7 @@ arv_dom_document_create_element (ArvDomDocument *document, const char *tag_name)
 {
 	ArvDomDocumentClass *document_class;
 
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (document), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_DOCUMENT (document), NULL);
 
 	document_class = ARV_DOM_DOCUMENT_GET_CLASS (document);
 	if (document_class->create_element != NULL)
@@ -83,23 +83,15 @@ arv_dom_document_create_text_node_base (ArvDomDocument *document, const char *da
 ArvDomText *
 arv_dom_document_create_text_node (ArvDomDocument *document, const char *data)
 {
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (document), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_DOCUMENT (document), NULL);
 
 	return ARV_DOM_DOCUMENT_GET_CLASS (document)->create_text_node (document, data);
 }
 
-ArvDomView *
-arv_dom_document_create_view (ArvDomDocument *self)
-{
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (self), NULL);
-
-	return ARV_DOM_DOCUMENT_GET_CLASS (self)->create_view (self);
-}
-
 ArvDomElement *
 arv_dom_document_get_element_by_id (ArvDomDocument *self, const char *id)
 {
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_DOCUMENT (self), NULL);
 	g_return_val_if_fail (id != NULL, NULL);
 
 	arv_debug_dom ("[ArvDomDocument::get_element_by_id] Lookup '%s'", id);
@@ -112,7 +104,7 @@ arv_dom_document_register_element (ArvDomDocument *self, ArvDomElement *element,
 {
 	char *old_id;
 
-	g_return_if_fail (LSM_IS_DOM_DOCUMENT (self));
+	g_return_if_fail (ARV_IS_DOM_DOCUMENT (self));
 
 	old_id = g_hash_table_lookup (self->elements, element);
 	if (old_id != NULL) {
@@ -135,7 +127,7 @@ arv_dom_document_register_element (ArvDomDocument *self, ArvDomElement *element,
 const char *
 arv_dom_document_get_url (ArvDomDocument *self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_DOCUMENT (self), NULL);
 
 	return self->url;
 }
@@ -143,7 +135,7 @@ arv_dom_document_get_url (ArvDomDocument *self)
 void
 arv_dom_document_set_path (ArvDomDocument *self, const char *path)
 {
-	g_return_if_fail (LSM_IS_DOM_DOCUMENT (self));
+	g_return_if_fail (ARV_IS_DOM_DOCUMENT (self));
 
 	g_free (self->url);
 
@@ -158,7 +150,7 @@ arv_dom_document_set_path (ArvDomDocument *self, const char *path)
 void
 arv_dom_document_set_url (ArvDomDocument *self, const char *url)
 {
-	g_return_if_fail (LSM_IS_DOM_DOCUMENT (self));
+	g_return_if_fail (ARV_IS_DOM_DOCUMENT (self));
 	g_return_if_fail (url == NULL || arv_str_is_uri (url));
 
 	g_free (self->url);
@@ -171,7 +163,7 @@ arv_dom_document_get_href_data (ArvDomDocument *self, const char *href, gsize *s
 	GFile *file;
 	char *data = NULL;
 
-	g_return_val_if_fail (LSM_IS_DOM_DOCUMENT (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_DOCUMENT (self), NULL);
 	g_return_val_if_fail (href != NULL, NULL);
 
 	if (strncmp (href, "data:", 5) == 0) {
@@ -240,5 +232,5 @@ arv_dom_document_class_init (ArvDomDocumentClass *klass)
 	klass->create_text_node = arv_dom_document_create_text_node_base;
 }
 
-G_DEFINE_ABSTRACT_TYPE (ArvDomDocument, arv_dom_document, LSM_TYPE_DOM_NODE)
+G_DEFINE_ABSTRACT_TYPE (ArvDomDocument, arv_dom_document, ARV_TYPE_DOM_NODE)
 
diff --git a/src/arvdomdocument.h b/src/arvdomdocument.h
index 1fd4cd2..384a51b 100644
--- a/src/arvdomdocument.h
+++ b/src/arvdomdocument.h
@@ -25,17 +25,16 @@
 #define ARV_DOM_DOCUMENT_H
 
 #include <arvtypes.h>
-#include <arvdomtypes.h>
 #include <arvdomnode.h>
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_DOCUMENT             (arv_dom_document_get_type ())
-#define ARV_DOM_DOCUMENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_DOCUMENT, ArvDomDocument))
-#define ARV_DOM_DOCUMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_DOCUMENT, ArvDomDocumentClass))
-#define LSM_IS_DOM_DOCUMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_DOCUMENT))
-#define LSM_IS_DOM_DOCUMENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_DOCUMENT))
-#define ARV_DOM_DOCUMENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_DOCUMENT, ArvDomDocumentClass))
+#define ARV_TYPE_DOM_DOCUMENT             (arv_dom_document_get_type ())
+#define ARV_DOM_DOCUMENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_DOCUMENT, ArvDomDocument))
+#define ARV_DOM_DOCUMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_DOCUMENT, ArvDomDocumentClass))
+#define ARV_IS_DOM_DOCUMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_DOCUMENT))
+#define ARV_IS_DOM_DOCUMENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_DOCUMENT))
+#define ARV_DOM_DOCUMENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_DOCUMENT, ArvDomDocumentClass))
 
 typedef struct _ArvDomDocumentClass ArvDomDocumentClass;
 
@@ -55,8 +54,6 @@ struct _ArvDomDocumentClass {
 	ArvDomElement *	(*get_document_element) (ArvDomDocument* self);
 	ArvDomElement *	(*create_element) 	(ArvDomDocument* self, const char *tag_name);
 	ArvDomText * 	(*create_text_node) 	(ArvDomDocument* self, const char *data);
-
-	ArvDomView*	(*create_view) 		(ArvDomDocument *self);
 };
 
 GType arv_dom_document_get_type (void);
@@ -68,8 +65,6 @@ ArvDomElement *	arv_dom_document_get_element_by_id 	(ArvDomDocument *self, const
 
 void 		arv_dom_document_register_element 	(ArvDomDocument *self, ArvDomElement *element, const char *id);
 
-ArvDomView*	arv_dom_document_create_view		(ArvDomDocument *self);
-
 const char * 	arv_dom_document_get_url 		(ArvDomDocument *self);
 void		arv_dom_document_set_url		(ArvDomDocument *self, const char *url);
 void 		arv_dom_document_set_path 		(ArvDomDocument *self, const char *path);
diff --git a/src/arvdomdocumentfragment.c b/src/arvdomdocumentfragment.c
index 4c84033..64fd849 100644
--- a/src/arvdomdocumentfragment.c
+++ b/src/arvdomdocumentfragment.c
@@ -56,7 +56,7 @@ arv_dom_document_fragment_get_node_type (ArvDomNode *node)
 ArvDomDocumentFragment *
 arv_dom_document_fragment_new (void)
 {
-	return g_object_new (LSM_TYPE_DOM_DOCUMENT_FRAGMENT, NULL);
+	return g_object_new (ARV_TYPE_DOM_DOCUMENT_FRAGMENT, NULL);
 }
 
 static void
@@ -78,4 +78,4 @@ arv_dom_document_fragment_class_init (ArvDomDocumentFragmentClass *klass)
 	node_class->get_node_type = arv_dom_document_fragment_get_node_type;
 }
 
-G_DEFINE_ABSTRACT_TYPE (ArvDomDocumentFragment, arv_dom_document_fragment, LSM_TYPE_DOM_NODE)
+G_DEFINE_ABSTRACT_TYPE (ArvDomDocumentFragment, arv_dom_document_fragment, ARV_TYPE_DOM_NODE)
diff --git a/src/arvdomdocumentfragment.h b/src/arvdomdocumentfragment.h
index ac223d6..1772c46 100644
--- a/src/arvdomdocumentfragment.h
+++ b/src/arvdomdocumentfragment.h
@@ -24,17 +24,17 @@
 #ifndef ARV_DOM_DOCUMENT_FRAGMENT_H
 #define ARV_DOM_DOCUMENT_FRAGMENT_H
 
-#include <arvdom.h>
+#include <arvtypes.h>
 #include <arvdomnode.h>
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_DOCUMENT_FRAGMENT             (arv_dom_document_fragment_get_type ())
-#define ARV_DOM_DOCUMENT_FRAGMENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_DOCUMENT_FRAGMENT, ArvDomDocumentFragment))
-#define ARV_DOM_DOCUMENT_FRAGMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_DOCUMENT_FRAGMENT, ArvDomDocumentFragmentClass))
-#define LSM_IS_DOM_DOCUMENT_FRAGMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_DOCUMENT_FRAGMENT))
-#define LSM_IS_DOM_DOCUMENT_FRAGMENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_DOCUMENT_FRAGMENT))
-#define ARV_DOM_DOCUMENT_FRAGMENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_DOCUMENT_FRAGMENT, ArvDomDocumentFragmentClass))
+#define ARV_TYPE_DOM_DOCUMENT_FRAGMENT             (arv_dom_document_fragment_get_type ())
+#define ARV_DOM_DOCUMENT_FRAGMENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_DOCUMENT_FRAGMENT, ArvDomDocumentFragment))
+#define ARV_DOM_DOCUMENT_FRAGMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_DOCUMENT_FRAGMENT, ArvDomDocumentFragmentClass))
+#define ARV_IS_DOM_DOCUMENT_FRAGMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_DOCUMENT_FRAGMENT))
+#define ARV_IS_DOM_DOCUMENT_FRAGMENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_DOCUMENT_FRAGMENT))
+#define ARV_DOM_DOCUMENT_FRAGMENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_DOCUMENT_FRAGMENT, ArvDomDocumentFragmentClass))
 
 typedef struct _ArvDomDocumentFragmentClass ArvDomDocumentFragmentClass;
 
diff --git a/src/arvdomelement.c b/src/arvdomelement.c
index 0d4e54b..ada9bf8 100644
--- a/src/arvdomelement.c
+++ b/src/arvdomelement.c
@@ -77,7 +77,7 @@ arv_dom_element_write_to_stream (ArvDomNode *self, GOutputStream *stream, GError
 const char *
 arv_dom_element_get_attribute (ArvDomElement* self, const char* name)
 {
-	g_return_val_if_fail (LSM_IS_DOM_ELEMENT (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_ELEMENT (self), NULL);
 	g_return_val_if_fail (name != NULL, NULL);
 
 	return ARV_DOM_ELEMENT_GET_CLASS (self)->get_attribute (self, name);
@@ -86,7 +86,7 @@ arv_dom_element_get_attribute (ArvDomElement* self, const char* name)
 void
 arv_dom_element_set_attribute (ArvDomElement* self, const char* name, const char* attribute_value)
 {
-	g_return_if_fail (LSM_IS_DOM_ELEMENT (self));
+	g_return_if_fail (ARV_IS_DOM_ELEMENT (self));
 	g_return_if_fail (name != NULL);
 
 	ARV_DOM_ELEMENT_GET_CLASS (self)->set_attribute (self, name, attribute_value);
@@ -97,7 +97,7 @@ arv_dom_element_set_attribute (ArvDomElement* self, const char* name, const char
 const char *
 arv_dom_element_get_tag_name (ArvDomElement *self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_ELEMENT (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_ELEMENT (self), NULL);
 
 	return arv_dom_node_get_node_name (ARV_DOM_NODE (self));
 }
@@ -121,4 +121,4 @@ arv_dom_element_class_init (ArvDomElementClass *klass)
 	node_class->write_to_stream = arv_dom_element_write_to_stream;
 }
 
-G_DEFINE_ABSTRACT_TYPE (ArvDomElement, arv_dom_element, LSM_TYPE_DOM_NODE)
+G_DEFINE_ABSTRACT_TYPE (ArvDomElement, arv_dom_element, ARV_TYPE_DOM_NODE)
diff --git a/src/arvdomelement.h b/src/arvdomelement.h
index 1bedfbb..317f8d6 100644
--- a/src/arvdomelement.h
+++ b/src/arvdomelement.h
@@ -24,17 +24,16 @@
 #ifndef ARV_DOM_ELEMENT_H
 #define ARV_DOM_ELEMENT_H
 
-#include <arvdom.h>
 #include <arvdomnode.h>
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_ELEMENT             (arv_dom_element_get_type ())
-#define ARV_DOM_ELEMENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_ELEMENT, ArvDomElement))
-#define ARV_DOM_ELEMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_ELEMENT, ArvDomElementClass))
-#define LSM_IS_DOM_ELEMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_ELEMENT))
-#define LSM_IS_DOM_ELEMENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_ELEMENT))
-#define ARV_DOM_ELEMENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_ELEMENT, ArvDomElementClass))
+#define ARV_TYPE_DOM_ELEMENT             (arv_dom_element_get_type ())
+#define ARV_DOM_ELEMENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_ELEMENT, ArvDomElement))
+#define ARV_DOM_ELEMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_ELEMENT, ArvDomElementClass))
+#define ARV_IS_DOM_ELEMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_ELEMENT))
+#define ARV_IS_DOM_ELEMENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_ELEMENT))
+#define ARV_DOM_ELEMENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_ELEMENT, ArvDomElementClass))
 
 typedef struct _ArvDomElementClass ArvDomElementClass;
 
diff --git a/src/arvdomimplementation.h b/src/arvdomimplementation.h
index e061b12..38e3426 100644
--- a/src/arvdomimplementation.h
+++ b/src/arvdomimplementation.h
@@ -24,7 +24,7 @@
 #ifndef ARV_DOM_IMPLEMENTATION_H
 #define ARV_DOM_IMPLEMENTATION_H
 
-#include <arvdomtypes.h>
+#include <arvtypes.h>
 #include <arvdomdocument.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvdomnamednodemap.c b/src/arvdomnamednodemap.c
index 318a7cf..179ec1d 100644
--- a/src/arvdomnamednodemap.c
+++ b/src/arvdomnamednodemap.c
@@ -29,7 +29,7 @@
 ArvDomNode *
 arv_dom_named_node_map_get_named_item (ArvDomNamedNodeMap *map, const char *name)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NAMED_NODE_MAP (map), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NAMED_NODE_MAP (map), NULL);
 
 	return ARV_DOM_NAMED_NODE_MAP_GET_CLASS (map)->get (map, name);
 }
@@ -37,7 +37,7 @@ arv_dom_named_node_map_get_named_item (ArvDomNamedNodeMap *map, const char *name
 ArvDomNode *
 arv_dom_named_node_map_set_named_item (ArvDomNamedNodeMap *map, ArvDomNode *node)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NAMED_NODE_MAP (map), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NAMED_NODE_MAP (map), NULL);
 
 	return ARV_DOM_NAMED_NODE_MAP_GET_CLASS (map)->set (map, node);
 }
@@ -45,7 +45,7 @@ arv_dom_named_node_map_set_named_item (ArvDomNamedNodeMap *map, ArvDomNode *node
 ArvDomNode *
 arv_dom_named_node_map_remove_named_item (ArvDomNamedNodeMap *map, const char *name)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NAMED_NODE_MAP (map), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NAMED_NODE_MAP (map), NULL);
 
 	return ARV_DOM_NAMED_NODE_MAP_GET_CLASS (map)->remove (map, name);
 }
@@ -53,7 +53,7 @@ arv_dom_named_node_map_remove_named_item (ArvDomNamedNodeMap *map, const char *n
 ArvDomNode *
 arv_dom_named_node_map_get_item (ArvDomNamedNodeMap *map, unsigned int index)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NAMED_NODE_MAP (map), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NAMED_NODE_MAP (map), NULL);
 
 	return ARV_DOM_NAMED_NODE_MAP_GET_CLASS (map)->get_item (map, index);
 }
@@ -61,7 +61,7 @@ arv_dom_named_node_map_get_item (ArvDomNamedNodeMap *map, unsigned int index)
 unsigned int
 arv_dom_named_node_map_get_length (ArvDomNamedNodeMap *map)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NAMED_NODE_MAP (map), 0);
+	g_return_val_if_fail (ARV_IS_DOM_NAMED_NODE_MAP (map), 0);
 
 	return ARV_DOM_NAMED_NODE_MAP_GET_CLASS (map)->get_length (map);
 }
diff --git a/src/arvdomnamednodemap.h b/src/arvdomnamednodemap.h
index a175ed0..2602600 100644
--- a/src/arvdomnamednodemap.h
+++ b/src/arvdomnamednodemap.h
@@ -24,16 +24,16 @@
 #ifndef ARV_DOM_NAMED_NODE_MAP_H
 #define ARV_DOM_NAMED_NODE_MAP_H
 
-#include <arvdomtypes.h>
+#include <arvtypes.h>
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_NAMED_NODE_MAP             (arv_dom_named_node_map_get_type ())
-#define ARV_DOM_NAMED_NODE_MAP(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_NAMED_NODE_MAP, ArvDomNamedNodeMap))
-#define ARV_DOM_NAMED_NODE_MAP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_NAMED_NODE_MAP, ArvDomNamedNodeMapClass))
-#define LSM_IS_DOM_NAMED_NODE_MAP(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_NAMED_NODE_MAP))
-#define LSM_IS_DOM_NAMED_NODE_MAP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_NAMED_NODE_MAP))
-#define ARV_DOM_NAMED_NODE_MAP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_NAMED_NODE_MAP, ArvDomNamedNodeMapClass))
+#define ARV_TYPE_DOM_NAMED_NODE_MAP             (arv_dom_named_node_map_get_type ())
+#define ARV_DOM_NAMED_NODE_MAP(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_NAMED_NODE_MAP, ArvDomNamedNodeMap))
+#define ARV_DOM_NAMED_NODE_MAP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_NAMED_NODE_MAP, ArvDomNamedNodeMapClass))
+#define ARV_IS_DOM_NAMED_NODE_MAP(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_NAMED_NODE_MAP))
+#define ARV_IS_DOM_NAMED_NODE_MAP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_NAMED_NODE_MAP))
+#define ARV_DOM_NAMED_NODE_MAP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_NAMED_NODE_MAP, ArvDomNamedNodeMapClass))
 
 typedef struct _ArvDomNamedNodeMapClass ArvDomNamedNodeMapClass;
 
diff --git a/src/arvdomnode.c b/src/arvdomnode.c
index 039d0fb..64fbe39 100644
--- a/src/arvdomnode.c
+++ b/src/arvdomnode.c
@@ -36,12 +36,12 @@
 /* ArvDomNodeChildList */
 
 
-#define LSM_TYPE_DOM_NODE_CHILD_LIST             (arv_dom_node_child_list_get_type ())
-#define ARV_DOM_NODE_CHILD_LIST(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_NODE_CHILD_LIST, ArvDomNodeChildList))
-#define ARV_DOM_NODE_CHILD_LIST_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_NODE_CHILD_LIST, ArvDomNodeChildListClass))
-#define LSM_IS_DOM_NODE_CHILD_LIST(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_NODE_CHILD_LIST))
-#define LSM_IS_DOM_NODE_CHILD_LIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_NODE_CHILD_LIST))
-#define ARV_DOM_NODE_CHILD_LIST_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_NODE_CHILD_LIST, ArvDomNodeChildListClass))
+#define ARV_TYPE_DOM_NODE_CHILD_LIST             (arv_dom_node_child_list_get_type ())
+#define ARV_DOM_NODE_CHILD_LIST(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_NODE_CHILD_LIST, ArvDomNodeChildList))
+#define ARV_DOM_NODE_CHILD_LIST_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_NODE_CHILD_LIST, ArvDomNodeChildListClass))
+#define ARV_IS_DOM_NODE_CHILD_LIST(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_NODE_CHILD_LIST))
+#define ARV_IS_DOM_NODE_CHILD_LIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_NODE_CHILD_LIST))
+#define ARV_DOM_NODE_CHILD_LIST_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_NODE_CHILD_LIST, ArvDomNodeChildListClass))
 
 typedef struct _ArvDomNodeChildListClass ArvDomNodeChildListClass;
 
@@ -107,9 +107,9 @@ arv_dom_node_child_list_new (ArvDomNode *parent_node)
 {
 	ArvDomNodeChildList *list;
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (parent_node), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (parent_node), NULL);
 
-	list = g_object_new (LSM_TYPE_DOM_NODE_CHILD_LIST, NULL);
+	list = g_object_new (ARV_TYPE_DOM_NODE_CHILD_LIST, NULL);
 	list->parent_node = parent_node;
 
 	g_object_weak_ref (G_OBJECT (parent_node), arv_dom_node_child_list_weak_notify_cb, list);
@@ -149,7 +149,7 @@ arv_dom_node_child_list_class_init (ArvDomNodeChildListClass *klass)
 	node_list_class->get_length = arv_dom_node_child_list_get_length;
 }
 
-G_DEFINE_TYPE (ArvDomNodeChildList, arv_dom_node_child_list, LSM_TYPE_DOM_NODE_LIST)
+G_DEFINE_TYPE (ArvDomNodeChildList, arv_dom_node_child_list, ARV_TYPE_DOM_NODE_LIST)
 
 static GObjectClass *parent_class = NULL;
 
@@ -225,7 +225,7 @@ ArvDomNodeType arv_dom_node_get_node_type (ArvDomNode* self)
 ArvDomNode*
 arv_dom_node_get_parent_node (ArvDomNode* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	return self->parent_node;
 }
@@ -235,7 +235,7 @@ arv_dom_node_get_child_nodes (ArvDomNode* self)
 {
 	ArvDomNodeList *list;
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	list = g_object_get_data (G_OBJECT (self), "child-nodes");
 
@@ -250,7 +250,7 @@ arv_dom_node_get_child_nodes (ArvDomNode* self)
 ArvDomNode*
 arv_dom_node_get_first_child (ArvDomNode* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	return self->first_child;
 }
@@ -258,7 +258,7 @@ arv_dom_node_get_first_child (ArvDomNode* self)
 ArvDomNode*
 arv_dom_node_get_last_child (ArvDomNode* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	return self->last_child;
 }
@@ -266,7 +266,7 @@ arv_dom_node_get_last_child (ArvDomNode* self)
 ArvDomNode*
 arv_dom_node_get_previous_sibling (ArvDomNode* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	return self->previous_sibling;
 }
@@ -274,7 +274,7 @@ arv_dom_node_get_previous_sibling (ArvDomNode* self)
 ArvDomNode*
 arv_dom_node_get_next_sibling (ArvDomNode* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	return self->next_sibling;
 }
@@ -290,11 +290,11 @@ arv_dom_node_get_owner_document (ArvDomNode* self)
 {
 	ArvDomNode *parent;
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	for (parent = self;
 	     parent != NULL &&
-	     !LSM_IS_DOM_DOCUMENT (parent);
+	     !ARV_IS_DOM_DOCUMENT (parent);
 	     parent = parent->parent_node);
 
 	return ARV_DOM_DOCUMENT (parent);
@@ -327,18 +327,18 @@ arv_dom_node_insert_before (ArvDomNode* self, ArvDomNode* new_child, ArvDomNode*
 	if (ref_child == NULL)
 		arv_dom_node_append_child (self, new_child);
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (new_child), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (new_child), NULL);
 
 	if (new_child->parent_node != NULL)
 		arv_dom_node_remove_child (self, new_child);
 
-	if (!LSM_IS_DOM_NODE (self)) {
+	if (!ARV_IS_DOM_NODE (self)) {
 		g_critical ("%s: self is not a ArvDomNode", G_STRFUNC);
 		g_object_unref (new_child);
 		return NULL;
 	}
 
-	if (!LSM_IS_DOM_NODE (ref_child)) {
+	if (!ARV_IS_DOM_NODE (ref_child)) {
 		g_critical ("%s: ref_child is not a ArvDomNode", G_STRFUNC);
 		g_object_unref (new_child);
 		return NULL;
@@ -407,9 +407,9 @@ arv_dom_node_replace_child (ArvDomNode* self, ArvDomNode* new_child, ArvDomNode*
 	if (new_child == NULL)
 		return arv_dom_node_remove_child (self, old_child);
 
-	if (!LSM_IS_DOM_NODE (new_child)) {
+	if (!ARV_IS_DOM_NODE (new_child)) {
 		g_critical ("%s: new_child is not a ArvDomNode", G_STRFUNC);
-		if (LSM_IS_DOM_NODE (old_child))
+		if (ARV_IS_DOM_NODE (old_child))
 			g_object_unref (old_child);
 		return NULL;
 	}
@@ -423,13 +423,13 @@ arv_dom_node_replace_child (ArvDomNode* self, ArvDomNode* new_child, ArvDomNode*
 		return NULL;
 	}
 
-	if (!LSM_IS_DOM_NODE (old_child)) {
+	if (!ARV_IS_DOM_NODE (old_child)) {
 		g_critical ("%s: old_child is not a ArvDomNode", G_STRFUNC);
 		g_object_unref (new_child);
 		return NULL;
 	}
 
-	if (!LSM_IS_DOM_NODE (self)) {
+	if (!ARV_IS_DOM_NODE (self)) {
 		g_critical ("%s: self is not a ArvDomNode", G_STRFUNC);
 		g_object_unref (new_child);
 		g_object_unref (old_child);
@@ -475,12 +475,12 @@ arv_dom_node_remove_child (ArvDomNode* self, ArvDomNode* old_child)
 	ArvDomNode *node;
 	ArvDomNodeClass *node_class;
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), NULL);
 
 	if (old_child == NULL)
 		return NULL;
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (old_child), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (old_child), NULL);
 
 	for (node = self->first_child;
 	     node != NULL && node != old_child;
@@ -532,9 +532,9 @@ arv_dom_node_append_child (ArvDomNode* self, ArvDomNode* new_child)
 	if (new_child == NULL)
 		return NULL;
 
-	g_return_val_if_fail (LSM_IS_DOM_NODE (new_child), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (new_child), NULL);
 
-	if (!LSM_IS_DOM_NODE (self)) {
+	if (!ARV_IS_DOM_NODE (self)) {
 		g_critical ("%s: self is not a ArvDomNode", G_STRFUNC);
 		g_object_unref (new_child);
 		return NULL;
@@ -584,7 +584,7 @@ arv_dom_node_changed (ArvDomNode *self)
 	ArvDomNode *child_node;
 	ArvDomNodeClass *node_class;
 
-	g_return_if_fail (LSM_IS_DOM_NODE (self));
+	g_return_if_fail (ARV_IS_DOM_NODE (self));
 
 	node_class = ARV_DOM_NODE_GET_CLASS (self);
 
@@ -606,7 +606,7 @@ arv_dom_node_changed (ArvDomNode *self)
 gboolean
 arv_dom_node_has_child_nodes (ArvDomNode* self)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE (self), FALSE);
+	g_return_val_if_fail (ARV_IS_DOM_NODE (self), FALSE);
 
 	return self->first_child != NULL;
 }
@@ -625,7 +625,7 @@ arv_dom_node_write_to_stream (ArvDomNode *self, GOutputStream *stream, GError **
 {
 	ArvDomNodeClass *node_class;
 
-	g_return_if_fail (LSM_IS_DOM_NODE (self));
+	g_return_if_fail (ARV_IS_DOM_NODE (self));
 	g_return_if_fail (G_IS_OUTPUT_STREAM (stream));
 
 	node_class = ARV_DOM_NODE_GET_CLASS (self);
diff --git a/src/arvdomnode.h b/src/arvdomnode.h
index 901731d..4b22771 100644
--- a/src/arvdomnode.h
+++ b/src/arvdomnode.h
@@ -24,7 +24,7 @@
 #ifndef ARV_DOM_NODE_H
 #define ARV_DOM_NODE_H
 
-#include <arvdomtypes.h>
+#include <arvtypes.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
@@ -44,12 +44,12 @@ typedef enum  {
 	ARV_DOM_NODE_TYPE_NOTATION_NODE
 } ArvDomNodeType;
 
-#define LSM_TYPE_DOM_NODE             (arv_dom_node_get_type ())
-#define ARV_DOM_NODE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_NODE, ArvDomNode))
-#define ARV_DOM_NODE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_NODE, ArvDomNodeClass))
-#define LSM_IS_DOM_NODE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_NODE))
-#define LSM_IS_DOM_NODE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_NODE))
-#define ARV_DOM_NODE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_NODE, ArvDomNodeClass))
+#define ARV_TYPE_DOM_NODE             (arv_dom_node_get_type ())
+#define ARV_DOM_NODE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_NODE, ArvDomNode))
+#define ARV_DOM_NODE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_NODE, ArvDomNodeClass))
+#define ARV_IS_DOM_NODE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_NODE))
+#define ARV_IS_DOM_NODE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_NODE))
+#define ARV_DOM_NODE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_NODE, ArvDomNodeClass))
 
 typedef struct _ArvDomNodeClass ArvDomNodeClass;
 
diff --git a/src/arvdomnodelist.c b/src/arvdomnodelist.c
index 4cfc50f..59da58c 100644
--- a/src/arvdomnodelist.c
+++ b/src/arvdomnodelist.c
@@ -29,7 +29,7 @@
 ArvDomNode *
 arv_dom_node_list_get_item (ArvDomNodeList *list, unsigned int index)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE_LIST (list), NULL);
+	g_return_val_if_fail (ARV_IS_DOM_NODE_LIST (list), NULL);
 
 	return ARV_DOM_NODE_LIST_GET_CLASS (list)->get_item (list, index);
 }
@@ -37,7 +37,7 @@ arv_dom_node_list_get_item (ArvDomNodeList *list, unsigned int index)
 unsigned int
 arv_dom_node_list_get_length (ArvDomNodeList *list)
 {
-	g_return_val_if_fail (LSM_IS_DOM_NODE_LIST (list), 0);
+	g_return_val_if_fail (ARV_IS_DOM_NODE_LIST (list), 0);
 
 	return ARV_DOM_NODE_LIST_GET_CLASS (list)->get_length (list);
 }
diff --git a/src/arvdomnodelist.h b/src/arvdomnodelist.h
index ec2ae24..6840c73 100644
--- a/src/arvdomnodelist.h
+++ b/src/arvdomnodelist.h
@@ -24,16 +24,16 @@
 #ifndef ARV_DOM_NODE_LIST_H
 #define ARV_DOM_NODE_LIST_H
 
-#include <arvdomtypes.h>
+#include <arvtypes.h>
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_NODE_LIST             (arv_dom_node_list_get_type ())
-#define ARV_DOM_NODE_LIST(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_NODE_LIST, ArvDomNodeList))
-#define ARV_DOM_NODE_LIST_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_NODE_LIST, ArvDomNodeListClass))
-#define LSM_IS_DOM_NODE_LIST(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_NODE_LIST))
-#define LSM_IS_DOM_NODE_LIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_NODE_LIST))
-#define ARV_DOM_NODE_LIST_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_NODE_LIST, ArvDomNodeListClass))
+#define ARV_TYPE_DOM_NODE_LIST             (arv_dom_node_list_get_type ())
+#define ARV_DOM_NODE_LIST(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_NODE_LIST, ArvDomNodeList))
+#define ARV_DOM_NODE_LIST_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_NODE_LIST, ArvDomNodeListClass))
+#define ARV_IS_DOM_NODE_LIST(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_NODE_LIST))
+#define ARV_IS_DOM_NODE_LIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_NODE_LIST))
+#define ARV_DOM_NODE_LIST_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_NODE_LIST, ArvDomNodeListClass))
 
 typedef struct _ArvDomNodeListClass ArvDomNodeListClass;
 
diff --git a/src/arvdomparser.c b/src/arvdomparser.c
index 892665d..4a9efef 100644
--- a/src/arvdomparser.c
+++ b/src/arvdomparser.c
@@ -98,12 +98,12 @@ arv_dom_parser_start_element(void *user_data,
 		state->document = arv_dom_implementation_create_document (NULL, (char *) name);
 		state->current_node = ARV_DOM_NODE (state->document);
 
-		g_return_if_fail (LSM_IS_DOM_DOCUMENT (state->document));
+		g_return_if_fail (ARV_IS_DOM_DOCUMENT (state->document));
 	}
 
 	node = ARV_DOM_NODE (arv_dom_document_create_element (ARV_DOM_DOCUMENT (state->document), (char *) name));
 
-	if (LSM_IS_DOM_NODE (node) && arv_dom_node_append_child (state->current_node, node) != NULL) {
+	if (ARV_IS_DOM_NODE (node) && arv_dom_node_append_child (state->current_node, node) != NULL) {
 		if (attrs != NULL)
 			for (i = 0; attrs[i] != NULL && attrs[i+1] != NULL; i += 2)
 				arv_dom_element_set_attribute (ARV_DOM_ELEMENT (node),
@@ -352,7 +352,7 @@ arv_dom_document_new_from_url (const char *url, GError **error)
 void
 arv_dom_document_save_to_stream (ArvDomDocument *document, GOutputStream *stream, GError **error)
 {
-	g_return_if_fail (LSM_IS_DOM_DOCUMENT (document));
+	g_return_if_fail (ARV_IS_DOM_DOCUMENT (document));
 	g_return_if_fail (G_IS_OUTPUT_STREAM (stream));
 
 	arv_dom_node_write_to_stream (ARV_DOM_NODE (document), stream, error);
diff --git a/src/arvdomtext.c b/src/arvdomtext.c
index 48b7613..f75d3a0 100644
--- a/src/arvdomtext.c
+++ b/src/arvdomtext.c
@@ -55,7 +55,7 @@ arv_dom_text_new (const char *data)
 {
 	ArvDomNode *node;
 
-	node = g_object_new (LSM_TYPE_DOM_TEXT, NULL);
+	node = g_object_new (ARV_TYPE_DOM_TEXT, NULL);
 
 	arv_dom_character_data_set_data (ARV_DOM_CHARACTER_DATA (node), data);
 
@@ -79,4 +79,4 @@ arv_dom_text_class_init (ArvDomTextClass *klass)
 	node_class->get_node_type = arv_dom_text_get_node_type;
 }
 
-G_DEFINE_TYPE (ArvDomText, arv_dom_text, LSM_TYPE_DOM_CHARACTER_DATA)
+G_DEFINE_TYPE (ArvDomText, arv_dom_text, ARV_TYPE_DOM_CHARACTER_DATA)
diff --git a/src/arvdomtext.h b/src/arvdomtext.h
index 3a50e16..8c2defb 100644
--- a/src/arvdomtext.h
+++ b/src/arvdomtext.h
@@ -28,12 +28,12 @@
 
 G_BEGIN_DECLS
 
-#define LSM_TYPE_DOM_TEXT             (arv_dom_text_get_type ())
-#define ARV_DOM_TEXT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), LSM_TYPE_DOM_TEXT, ArvDomText))
-#define ARV_DOM_TEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), LSM_TYPE_DOM_TEXT, ArvDomTextClass))
-#define LSM_IS_DOM_TEXT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LSM_TYPE_DOM_TEXT))
-#define LSM_IS_DOM_TEXT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), LSM_TYPE_DOM_TEXT))
-#define ARV_DOM_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), LSM_TYPE_DOM_TEXT, ArvDomTextClass))
+#define ARV_TYPE_DOM_TEXT             (arv_dom_text_get_type ())
+#define ARV_DOM_TEXT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ARV_TYPE_DOM_TEXT, ArvDomText))
+#define ARV_DOM_TEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ARV_TYPE_DOM_TEXT, ArvDomTextClass))
+#define ARV_IS_DOM_TEXT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ARV_TYPE_DOM_TEXT))
+#define ARV_IS_DOM_TEXT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ARV_TYPE_DOM_TEXT))
+#define ARV_DOM_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), ARV_TYPE_DOM_TEXT, ArvDomTextClass))
 
 typedef struct _ArvDomTextClass ArvDomTextClass;
 
diff --git a/src/arvgc.c b/src/arvgc.c
index 47ac015..45350b4 100644
--- a/src/arvgc.c
+++ b/src/arvgc.c
@@ -49,6 +49,7 @@
 
 static GObjectClass *parent_class = NULL;
 
+#if 0
 static ArvGcNode *
 arv_gc_create_node (ArvGc *genicam, const char *type)
 {
@@ -293,6 +294,7 @@ arv_gc_parse_xml (ArvGc *genicam, const char *xml, size_t size)
 
 	xmlSAXUserParseMemory (&sax_handler, &state, xml, size);
 }
+#endif
 
 /**
  * arv_gc_get_node:
@@ -424,7 +426,8 @@ arv_gc_new (ArvDevice *device, const void *xml, size_t size)
 	g_return_val_if_fail (genicam != NULL, NULL);
 	genicam->device = device;
 
-	arv_gc_parse_xml (genicam, (char *) xml, size);
+	/* FIXME */
+/*        arv_gc_parse_xml (genicam, (char *) xml, size);*/
 
 	return genicam;
 }
@@ -455,4 +458,4 @@ arv_gc_class_init (ArvGcClass *node_class)
 	object_class->finalize = arv_gc_finalize;
 }
 
-G_DEFINE_TYPE (ArvGc, arv_gc, G_TYPE_OBJECT)
+G_DEFINE_TYPE (ArvGc, arv_gc, ARV_TYPE_DOM_DOCUMENT)
diff --git a/src/arvgc.h b/src/arvgc.h
index 8a2b19a..fe59406 100644
--- a/src/arvgc.h
+++ b/src/arvgc.h
@@ -24,6 +24,7 @@
 #define ARV_GC_H
 
 #include <arvtypes.h>
+#include <arvdomdocument.h>
 
 G_BEGIN_DECLS
 
@@ -37,14 +38,14 @@ G_BEGIN_DECLS
 typedef struct _ArvGcClass ArvGcClass;
 
 struct _ArvGc {
-	GObject	object;
+	ArvDomDocument base;
 
 	GHashTable *nodes;
 	ArvDevice *device;
 };
 
 struct _ArvGcClass {
-	GObjectClass parent_class;
+	ArvDomDocumentClass parent_class;
 };
 
 GType arv_gc_get_type (void);
diff --git a/src/arvgcnode.c b/src/arvgcnode.c
index ab050ef..db6a5fa 100644
--- a/src/arvgcnode.c
+++ b/src/arvgcnode.c
@@ -390,4 +390,4 @@ arv_gc_node_class_init (ArvGcNodeClass *node_class)
 	node_class->get_value_type = NULL;
 }
 
-G_DEFINE_TYPE (ArvGcNode, arv_gc_node, G_TYPE_OBJECT)
+G_DEFINE_TYPE (ArvGcNode, arv_gc_node, ARV_TYPE_DOM_ELEMENT)
diff --git a/src/arvgcnode.h b/src/arvgcnode.h
index f4d413c..23b2475 100644
--- a/src/arvgcnode.h
+++ b/src/arvgcnode.h
@@ -24,6 +24,7 @@
 #define ARV_GC_NODE_H
 
 #include <arvtypes.h>
+#include <arvdomelement.h>
 
 G_BEGIN_DECLS
 
@@ -38,13 +39,13 @@ typedef struct _ArvGcNodePrivate ArvGcNodePrivate;
 typedef struct _ArvGcNodeClass ArvGcNodeClass;
 
 struct _ArvGcNode {
-	GObject	object;
+	ArvDomElement	base;
 
 	ArvGcNodePrivate *priv;
 };
 
 struct _ArvGcNodeClass {
-	GObjectClass parent_class;
+	ArvDomElementClass parent_class;
 
 	const char *	(*get_node_name)		(ArvGcNode *gc_node);
 
diff --git a/src/arvtypes.h b/src/arvtypes.h
index 63326cf..f5e215c 100644
--- a/src/arvtypes.h
+++ b/src/arvtypes.h
@@ -31,6 +31,15 @@ typedef struct _ArvCamera 		ArvCamera;
 
 typedef struct _ArvEvaluator 		ArvEvaluator;
 
+typedef struct _ArvDomNode ArvDomNode;
+typedef struct _ArvDomNodeList ArvDomNodeList;
+typedef struct _ArvDomNamedNodeMap ArvDomNamedNodeMap;
+typedef struct _ArvDomElement ArvDomElement;
+typedef struct _ArvDomDocument ArvDomDocument;
+typedef struct _ArvDomDocumentFragment ArvDomDocumentFragment;
+typedef struct _ArvDomCharacterData ArvDomCharacterData;
+typedef struct _ArvDomText ArvDomText;
+
 typedef struct _ArvGc 			ArvGc;
 
 typedef struct _ArvGcNode 		ArvGcNode;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]