[gxml] Renamed DocumentType to xDocumentType



commit 86af056968e10fe9a0d26ff94d3a648a3998111e
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue May 12 12:44:29 2015 -0500

    Renamed DocumentType to xDocumentType

 gxml/libxml-Document.vala         |   18 +++++++++---------
 gxml/libxml-DocumentFragment.vala |    2 +-
 gxml/libxml-DocumentType.vala     |    4 ++--
 gxml/libxml-Implementation.vala   |    4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gxml/libxml-Document.vala b/gxml/libxml-Document.vala
index 2aabb73..a34cf10 100644
--- a/gxml/libxml-Document.vala
+++ b/gxml/libxml-Document.vala
@@ -51,7 +51,7 @@ namespace GXml {
         *
         * The xDocument has a root document element { link GXml.xElement}.
         * A xDocument's schema can be defined through its
-        * { link GXml.DocumentType}.
+        * { link GXml.xDocumentType}.
         *
         * Version: DOM Level 1 Core<<BR>>
         * URL: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#i-xDocument]]
@@ -165,8 +165,8 @@ namespace GXml {
                 * Version: DOM Level 1 Core<<BR>>
                 * URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#attribute-doctype]]
                 */
-               public DocumentType? doctype {
-                       // either null, or a DocumentType object
+               public xDocumentType? doctype {
+                       // either null, or a xDocumentType object
                        get;
                        private set;
                }
@@ -237,7 +237,7 @@ namespace GXml {
                 *
                 * @return The new document; this must be freed with { link GLib.Object.unref}
                 */
-               internal xDocument.with_implementation (Implementation impl, string? namespace_uri, string? 
qualified_name, DocumentType? doctype) {
+               internal xDocument.with_implementation (Implementation impl, string? namespace_uri, string? 
qualified_name, xDocumentType? doctype) {
                        this ();
                        this.implementation = impl;
 
@@ -284,7 +284,7 @@ namespace GXml {
                                this.doctype = null;
                        } else {
                                // TODO: make sure libxml2 binding patch for this makes it through
-                               this.doctype = new DocumentType (doc->int_subset, doc->ext_subset, this);
+                               this.doctype = new xDocumentType (doc->int_subset, doc->ext_subset, this);
                        }
                        this.implementation = new Implementation ();
                }
@@ -944,7 +944,7 @@ namespace GXml {
                 * `ref_child`, an existing child of this
                 * { link GXml.xDocument}. A document can only have one
                 * { link GXml.xElement} child (the root element) and
-                * one { link GXml.DocumentType}.
+                * one { link GXml.xDocumentType}.
                 *
                 * Version: DOM Level 1 Core<<BR>>
                 * URL: [[http://www.w3.org/TR/DOM-Level-3-Core/core.html#ID-952280727]]
@@ -969,7 +969,7 @@ namespace GXml {
                 * Appends new_child to this document, appearing at
                 * the end of its list of children.  A document can
                 * only have one { link GXml.xElement} child, the root
-                * element, and one { link GXml.DocumentType}.
+                * element, and one { link GXml.xDocumentType}.
                 *
                 * Version: DOM Level 1 Core<<BR>>
                 * URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#method-appendChild]]
@@ -990,9 +990,9 @@ namespace GXml {
                                }
                        } else if (new_child.node_type == NodeType.DOCUMENT_TYPE) {
                                if (this.doctype == null) {
-                                       this.doctype = (DocumentType)new_child;
+                                       this.doctype = (xDocumentType)new_child;
                                } else {
-                                       GXml.warning (DomException.HIERARCHY_REQUEST, "Document already has a 
doctype.  Could not add new doctype with name '%s'.".printf (((DocumentType)new_child).name));
+                                       GXml.warning (DomException.HIERARCHY_REQUEST, "Document already has a 
doctype.  Could not add new doctype with name '%s'.".printf (((xDocumentType)new_child).name));
                                }
                        } else {
                                return this.child_nodes.append_child (new_child);
diff --git a/gxml/libxml-DocumentFragment.vala b/gxml/libxml-DocumentFragment.vala
index a22c718..8218399 100644
--- a/gxml/libxml-DocumentFragment.vala
+++ b/gxml/libxml-DocumentFragment.vala
@@ -52,7 +52,7 @@ namespace GXml {
         * Version: DOM Level 1 Core<<BR>>
         * URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-B63ED1A3]]
         */
-       public class DocumentFragment : BackedNode {
+       public class DocumentFragment : BackedNode { // TODO: Create DomDocumentFragment interface
                internal DocumentFragment (Xml.Node *fragment_node, xDocument doc) {
                        base (fragment_node, doc);
                }
diff --git a/gxml/libxml-DocumentType.vala b/gxml/libxml-DocumentType.vala
index 2c20885..631ecef 100644
--- a/gxml/libxml-DocumentType.vala
+++ b/gxml/libxml-DocumentType.vala
@@ -29,13 +29,13 @@ namespace GXml {
         * 
         * For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-412266927]]
         */
-       public class DocumentType : xNode {
+       public class xDocumentType : xNode {
                private Xml.Doc* doc;
                private Xml.Dtd *int_subset;
                private Xml.Dtd *ext_subset;
 
                /** Constructor */
-               internal DocumentType (Xml.Dtd *int_subset, Xml.Dtd *ext_subset, xDocument doc) {
+               internal xDocumentType (Xml.Dtd *int_subset, Xml.Dtd *ext_subset, xDocument doc) {
                        // TODO: for name, we want a real name of the doc type
                        base (NodeType.DOCUMENT_TYPE, doc);
 
diff --git a/gxml/libxml-Implementation.vala b/gxml/libxml-Implementation.vala
index eb72a2f..856491a 100644
--- a/gxml/libxml-Implementation.vala
+++ b/gxml/libxml-Implementation.vala
@@ -68,7 +68,7 @@ namespace GXml {
                }
 
                // Not using Node's, because this doctype shouldn't have ANY owner yet
-               internal void check_wrong_document (DocumentType? doctype) {
+               internal void check_wrong_document (xDocumentType? doctype) {
                        if (doctype != null && doctype.owner_document != null) {
                                GXml.warning (DomException.WRONG_DOCUMENT, "The supplied doctype is already 
connected to an existing document.");
                        }
@@ -87,7 +87,7 @@ namespace GXml {
                 *
                 * @return The new document
                 */
-               public xDocument create_document (string? namespace_uri, string? qualified_name, 
DocumentType? doctype) {
+               public xDocument create_document (string? namespace_uri, string? qualified_name, 
xDocumentType? doctype) {
                        xDocument doc;
 
                        check_namespace (namespace_uri, qualified_name);


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