[gxml] GomObject: renamed to GXml.Object
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] GomObject: renamed to GXml.Object
- Date: Sat, 6 Jul 2019 04:53:34 +0000 (UTC)
commit 33e2916a8b238db43160eb0ae806a4a3ecb8bd2a
Author: Daniel Espinosa <esodan gmail com>
Date: Fri Jul 5 23:21:43 2019 -0500
GomObject: renamed to GXml.Object
gxml/Attr.vala | 2 +-
gxml/BaseCollection.vala | 8 +--
gxml/Collections.vala | 18 ++---
gxml/Document.vala | 4 +-
gxml/DomAttr.vala | 2 +-
gxml/DomCollections.vala | 10 +--
gxml/DomHtmlDocument.vala | 2 +-
gxml/Element.vala | 16 ++---
gxml/Event.vala | 2 +-
gxml/IXsdSchema.vala | 80 +++++++++++-----------
gxml/Node.vala | 2 +-
gxml/{GomObject.vala => Object.vala} | 20 +++---
gxml/Parser.vala | 20 +++---
gxml/Property.vala | 4 +-
gxml/Range.vala | 2 +-
gxml/StringRef.vala | 6 +-
gxml/TreeWalker.vala | 4 +-
gxml/XDocument.vala | 4 +-
gxml/XHashMapAttr.vala | 2 +-
gxml/XListChildren.vala | 2 +-
gxml/XNode.vala | 2 +-
gxml/XParser.vala | 20 +++---
gxml/XdParser.vala | 2 +-
gxml/meson.build | 2 +-
test/DocumentPerformanceIterateTest.vala | 2 +-
test/DocumentPerformanceTest.vala | 40 +++++------
test/DocumentTest.vala | 2 +-
test/ElementTest.vala | 8 +--
test/SerializationTest.vala | 10 +--
...t.vala => XDocumentPerformanceIterateTest.vala} | 4 +-
...anceTest.vala => XDocumentPerformanceTest.vala} | 40 +++++------
test/feedreader-test.vala | 2 +-
test/meson.build | 16 ++---
33 files changed, 180 insertions(+), 180 deletions(-)
---
diff --git a/gxml/Attr.vala b/gxml/Attr.vala
index c6500f7..5da7298 100644
--- a/gxml/Attr.vala
+++ b/gxml/Attr.vala
@@ -86,6 +86,6 @@ public class GXml.Attr : GXml.Node, GXml.DomAttr {
_parent = element;
_local_name = name;
_node_value = null;
- prop = new StringRef (element as GomObject, name);
+ prop = new StringRef (element as GXml.Object, name);
}
}
diff --git a/gxml/BaseCollection.vala b/gxml/BaseCollection.vala
index 1194c81..7e08d46 100644
--- a/gxml/BaseCollection.vala
+++ b/gxml/BaseCollection.vala
@@ -30,7 +30,7 @@ using Gee;
* in order to be able to add new references to elements. Use {@link initialize_element}
* to set parent element and {@link search} to find elements for collection.
*/
-public abstract class GXml.BaseCollection : Object, Traversable<DomElement>, Iterable<DomElement>,
Collection {
+public abstract class GXml.BaseCollection : GLib.Object, Traversable<DomElement>, Iterable<DomElement>,
Collection {
/**
* A collection of node's index refered. Don't modify it manually.
*/
@@ -89,7 +89,7 @@ public abstract class GXml.BaseCollection : Object, Traversable<DomElement>, Ite
throw new DomError.INVALID_NODE_TYPE_ERROR
(_("Invalid attempt to initialize a collection using an unsupported type. Only
GXmlGXml.Element is supported"));
}
- var o = Object.new (items_type) as GXml.Element;
+ var o = GLib.Object.new (items_type) as GXml.Element;
_items_name = o.local_name;
_items_type = items_type;
}
@@ -147,7 +147,7 @@ public abstract class GXml.BaseCollection : Object, Traversable<DomElement>, Ite
(_("Parent Element is invalid"));
for (int i = 0; i < _element.child_nodes.size; i++) {
var n = _element.child_nodes.get (i);
- if (n is GomObject) {
+ if (n is GXml.Object) {
if ((n as DomElement).local_name.down () == items_name.down ()) {
if (validate_append (i, n as DomElement))
_nodes_index.push_tail (i);
@@ -172,7 +172,7 @@ public abstract class GXml.BaseCollection : Object, Traversable<DomElement>, Ite
// Itarable Interface
public Iterator<DomElement> iterator () { return new CollectionIterator (this); }
// For Iterable interface implementation
- private class CollectionIterator : Object, Traversable<DomElement>, Iterator<DomElement> {
+ private class CollectionIterator : GLib.Object, Traversable<DomElement>, Iterator<DomElement> {
private int pos;
private Collection _collection;
public bool read_only { get { return false; } }
diff --git a/gxml/Collections.vala b/gxml/Collections.vala
index c236276..65bf7ce 100644
--- a/gxml/Collections.vala
+++ b/gxml/Collections.vala
@@ -25,7 +25,7 @@ using Gee;
/**
* A DOM4 interface to keep references to {@link DomElement} children of a {@link element}
*/
-public interface GXml.Collection : Object
+public interface GXml.Collection : GLib.Object
{
/**
* A list of child {@link DomElement} objects of {@link element}
@@ -106,7 +106,7 @@ public interface GXml.Collection : Object
if (items_type.is_a (GLib.Type.INVALID)) return null;
if (!items_type.is_a (typeof (DomElement))) return null;
if (element == null) return null;
- return Object.new (items_type,
+ return GLib.Object.new (items_type,
"owner_document", element.owner_document) as DomElement;
}
/**
@@ -128,7 +128,7 @@ public interface GXml.Collection : Object
/**
* {@link Gee.Iterable} and {@link Gee.Traversable} implementation of {@link GXml.Collection}
*/
-public interface GXml.List : Object, Collection, Traversable<DomElement>, Iterable<DomElement> {}
+public interface GXml.List : GLib.Object, Collection, Traversable<DomElement>, Iterable<DomElement> {}
/**
* Inteface to be implemented by {@link GXml.Collection} derived classes
@@ -137,14 +137,14 @@ public interface GXml.List : Object, Collection, Traversable<DomElement>, Iterab
* If {@link GomHashMap} has set its {@link GomHashMap.attribute_key}
* its value has precedence over this method.
*/
-public interface GXml.MappeableElement : Object, DomElement {
+public interface GXml.MappeableElement : GLib.Object, DomElement {
public abstract string get_map_key ();
}
/**
* {@link Gee.Iterable} and {@link Gee.Traversable} implementation of {@link GXml.Collection}
*/
-public interface GXml.Map : Object, GXml.Collection, Traversable<DomElement>, Iterable<DomElement> {
+public interface GXml.Map : GLib.Object, GXml.Collection, Traversable<DomElement>, Iterable<DomElement> {
/**
* An attribute's name in items to be added and used to retrieve elements
* as key.
@@ -170,7 +170,7 @@ public interface GXml.Map : Object, GXml.Collection, Traversable<DomElement>, It
* Inteface to be implemented by {@link GXml.Collection} derived classes
* in order to provide a strings to be used in {@link GomHashPairedMap} as keys.
*/
-public interface GXml.MappeableElementPairKey : Object, DomElement {
+public interface GXml.MappeableElementPairKey : GLib.Object, DomElement {
public abstract string get_map_primary_key ();
public abstract string get_map_secondary_key ();
}
@@ -179,7 +179,7 @@ public interface GXml.MappeableElementPairKey : Object, DomElement {
/**
* {@link Gee.Iterable} and {@link Gee.Traversable} implementation of {@link GXml.Collection}
*/
-public interface GXml.PairedMap : Object, GXml.Collection, Traversable<DomElement>, Iterable<DomElement> {
+public interface GXml.PairedMap : GLib.Object, GXml.Collection, Traversable<DomElement>,
Iterable<DomElement> {
/**
* An attribute's name in items to be added and used to retrieve elements
* as primary key.
@@ -221,7 +221,7 @@ public interface GXml.PairedMap : Object, GXml.Collection, Traversable<DomElemen
* If {@link GomHashMap} has set its {@link GomHashMap.attribute_key}
* its value has precedence over this method.
*/
-public interface GXml.MappeableElementThreeKey : Object, DomElement {
+public interface GXml.MappeableElementThreeKey : GLib.Object, DomElement {
/**
* Returns primary key of collection.
*/
@@ -239,7 +239,7 @@ public interface GXml.MappeableElementThreeKey : Object, DomElement {
/**
* {@link Gee.Iterable} and {@link Gee.Traversable} implementation of {@link GXml.Collection}
*/
-public interface GXml.ThreeMap : Object, GXml.Collection, Traversable<DomElement>, Iterable<DomElement> {
+public interface GXml.ThreeMap : GLib.Object, GXml.Collection, Traversable<DomElement>, Iterable<DomElement>
{
/**
* An attribute's name in items to be added and used to retrieve elements
* as primary key.
diff --git a/gxml/Document.vala b/gxml/Document.vala
index 651515e..53a32b4 100644
--- a/gxml/Document.vala
+++ b/gxml/Document.vala
@@ -101,7 +101,7 @@ public class GXml.Document : GXml.Node,
}
private GXml.Element get_root_gom_element () {
- Object obj = null;
+ GLib.Object obj = null;
foreach (ParamSpec spec in this.get_class ().list_properties ()) {
if ("::" in spec.get_nick ()) {
string name = spec.get_nick ().down ().replace ("::", "");
@@ -113,7 +113,7 @@ public class GXml.Document : GXml.Node,
get_property (spec.name, ref val);
obj = val.get_object () as GXml.Element;
if (obj == null) {
- obj = Object.new (spec.value_type,"owner-document", this.owner_document);
+ obj = GLib.Object.new (spec.value_type,"owner-document", this.owner_document);
try { this.append_child (obj as GXml.Element); }
catch (GLib.Error e) {
warning (_("Error while attempting to instantiate root property object: %s").printf
(e.message));
diff --git a/gxml/DomAttr.vala b/gxml/DomAttr.vala
index 7aaa860..d4792e6 100644
--- a/gxml/DomAttr.vala
+++ b/gxml/DomAttr.vala
@@ -20,7 +20,7 @@
* Daniel Espinosa <esodan gmail com>
*/
-public interface GXml.DomAttr : Object {
+public interface GXml.DomAttr : GLib.Object {
public abstract string? namespace_uri { owned get; }
public abstract string? prefix { owned get; }
public abstract string local_name { owned get; }
diff --git a/gxml/DomCollections.vala b/gxml/DomCollections.vala
index 5c2d6a9..51652e8 100644
--- a/gxml/DomCollections.vala
+++ b/gxml/DomCollections.vala
@@ -93,7 +93,7 @@ public interface GXml.DomHTMLCollection : GLib.Object, Gee.BidirList<GXml.DomEle
/**
* No implemented jet. This can lead to API changes in future versions.
*/
-public interface GXml.DomNodeIterator {
+public interface GXml.DomNodeIterator : GLib.Object {
public abstract DomNode root { get; }
public abstract DomNode reference_node { get; }
public abstract bool pointer_before_reference_node { get; }
@@ -109,7 +109,7 @@ public interface GXml.DomNodeIterator {
/**
* No implemented jet. This can lead to API changes in future versions.
*/
-public class GXml.DomNodeFilter : Object {
+public class GXml.DomNodeFilter : GLib.Object {
// Constants for acceptNode()
public const int FILTER_ACCEPT = 1;
public const int FILTER_REJECT = 2;
@@ -137,7 +137,7 @@ public class GXml.DomNodeFilter : Object {
/**
* No implemented jet. This can lead to API changes in future versions.
*/
-public interface GXml.DomTreeWalker : Object {
+public interface GXml.DomTreeWalker : GLib.Object {
public abstract DomNode root { get; }
public abstract int what_to_show { get; }
public abstract DomNodeFilter? filter { get; }
@@ -152,7 +152,7 @@ public interface GXml.DomTreeWalker : Object {
public abstract DomNode? next_node();
}
-public interface GXml.DomNamedNodeMap : Object, Gee.Map<string,DomNode> {
+public interface GXml.DomNamedNodeMap : GLib.Object, Gee.Map<string,DomNode> {
public abstract int length { get; }
public abstract DomNode? item (int index);
public abstract DomNode? get_named_item (string name);
@@ -185,6 +185,6 @@ public interface GXml.DomTokenList : GLib.Object, Gee.BidirList<string> {
/**
* No implemented jet. This can lead to API changes in future versions.
*/
-public interface GXml.DomSettableTokenList : GXml.DomTokenList {
+public interface GXml.DomSettableTokenList : GLib.Object, GXml.DomTokenList {
public abstract string @value { owned get; set; }
}
diff --git a/gxml/DomHtmlDocument.vala b/gxml/DomHtmlDocument.vala
index 4127c4e..7012e43 100644
--- a/gxml/DomHtmlDocument.vala
+++ b/gxml/DomHtmlDocument.vala
@@ -24,7 +24,7 @@
/**
* Interface for HTML handling implementation
*/
-public interface GXml.DomHtmlDocument : Object, GXml.DomDocument {
+public interface GXml.DomHtmlDocument : GLib.Object, GXml.DomDocument {
/**
* This method reads HTML documents using default parser
*/
diff --git a/gxml/Element.vala b/gxml/Element.vala
index 50776ae..2ced641 100644
--- a/gxml/Element.vala
+++ b/gxml/Element.vala
@@ -41,7 +41,7 @@ public class GXml.Element : GXml.Node,
DomNonDocumentTypeChildNode,
DomParentNode,
DomElement,
- GomObject {
+ GXml.Object {
/**
* Reference to {@link Attributes} for element's attributes.
* Derived classes should avoid to modify it.
@@ -294,7 +294,7 @@ public class GXml.Element : GXml.Node,
*/
public string? class_name {
owned get { return (this as GXml.Element).get_attribute ("class"); }
- set { (this as GomObject).set_attribute ("class", value); }
+ set { (this as GXml.Object).set_attribute ("class", value); }
}
/**
* A list of values of all attributes called 'class'.
@@ -331,7 +331,7 @@ public class GXml.Element : GXml.Node,
* already.
*
* Any instance properties of type {@link GXml.Element} or {@link Collection}
- * should be initialized using {@link GomObject.set_instance_property}
+ * should be initialized using {@link GXml.Object.set_instance_property}
*/
public void initialize (string local_name) {
_local_name = local_name;
@@ -400,7 +400,7 @@ public class GXml.Element : GXml.Node,
public DomNode? get_named_item (string name) {
if (name == "") return null;
- var ov = (_element as GomObject).get_attribute (name);
+ var ov = (_element as GXml.Object).get_attribute (name);
if (ov != null) {
return new GXml.Attr (_element, name, ov);
}
@@ -445,9 +445,9 @@ public class GXml.Element : GXml.Node,
if (!(node is GXml.Attr))
throw new DomError.HIERARCHY_REQUEST_ERROR (_("Invalid node type. GXml.Attr was expected"));
GXml.Attr attr = null;
- var pprop = (_element as GomObject).find_property_name ((node as GXml.Attr).local_name);
+ var pprop = (_element as GXml.Object).find_property_name ((node as GXml.Attr).local_name);
if (pprop != null) {
- (_element as GomObject).set_attribute ((node as GXml.Attr).local_name, node.node_value);
+ (_element as GXml.Object).set_attribute ((node as GXml.Attr).local_name, node.node_value);
attr = new GXml.Attr.reference (_element, (node as GXml.Attr).local_name);
} else {
attr = new GXml.Attr (_element, (node as GXml.Attr).local_name, node.node_value);
@@ -567,9 +567,9 @@ public class GXml.Element : GXml.Node,
p = (node as GXml.Attr).prefix + ":";
string k = (p+(node as GXml.Attr).local_name).down ();
GXml.Attr attr = null;
- var pprop = (_element as GomObject).find_property_name ((node as GXml.Attr).local_name);
+ var pprop = (_element as GXml.Object).find_property_name ((node as GXml.Attr).local_name);
if (pprop != null) {
- (_element as GomObject).set_attribute ((node as GXml.Attr).local_name, node.node_value);
+ (_element as GXml.Object).set_attribute ((node as GXml.Attr).local_name, node.node_value);
attr = new GXml.Attr.reference (_element, (node as GXml.Attr).local_name);
} else {
attr = new GXml.Attr.namespace (_element, (node as GXml.Attr).namespace_uri, (node as
GXml.Attr).prefix, (node as GXml.Attr).local_name, node.node_value);
diff --git a/gxml/Event.vala b/gxml/Event.vala
index 12e1286..7e7bb8c 100644
--- a/gxml/Event.vala
+++ b/gxml/Event.vala
@@ -23,7 +23,7 @@
/**
* DOM4 An event handler, powered by libxml2 library.
*/
-public class GXml.Event : Object, GXml.DomEvent {
+public class GXml.Event : GLib.Object, GXml.DomEvent {
protected string _etype;
protected DomEventTarget _event_target;
protected DomEventTarget _current_target;
diff --git a/gxml/IXsdSchema.vala b/gxml/IXsdSchema.vala
index d977f19..58f607a 100644
--- a/gxml/IXsdSchema.vala
+++ b/gxml/IXsdSchema.vala
@@ -40,11 +40,11 @@ public errordomain GXml.IXsdSchemaError {
INVALIDATION_ERROR
}
-public interface GXml.IXsdBaseType : Object {
+public interface GXml.IXsdBaseType : GLib.Object {
public abstract IXsdAnnotation anotation { get; set; }
}
-public interface GXml.IXsdSimpleType: Object, DomElement, IXsdBaseType {
+public interface GXml.IXsdSimpleType: GLib.Object, DomElement, IXsdBaseType {
public const string SCHEMA_NODE_NAME = "simpleType";
/**
* (#all | List of (list | union | restriction | extension))
@@ -57,8 +57,8 @@ public interface GXml.IXsdSimpleType: Object, DomElement, IXsdBaseType {
public abstract IXsdTypeUnion union { get; set; }
public abstract IXsdTypeRestriction restriction { get; set; }
}
-public interface GXml.IXsdTypeDef : Object {}
-public interface GXml.IXsdTypeRestriction : Object, IXsdTypeDef {
+public interface GXml.IXsdTypeDef : GLib.Object {}
+public interface GXml.IXsdTypeRestriction : GLib.Object, IXsdTypeDef {
public const string SCHEMA_NODE_NAME = "restriction";
public abstract string base { get; set; }
public abstract string id { get; set; }
@@ -67,27 +67,27 @@ public interface GXml.IXsdTypeRestriction : Object, IXsdTypeDef {
public abstract IXsdListTypeRestrictionEnumerations enumerations { get; set; }
public abstract IXsdListTypeRestrictionWhiteSpaces white_spaces { get; set; }
}
-public interface GXml.IXsdTypeList: Object, IXsdTypeDef {}
-public interface GXml.IXsdTypeUnion : Object, IXsdTypeDef {}
+public interface GXml.IXsdTypeList: GLib.Object, IXsdTypeDef {}
+public interface GXml.IXsdTypeUnion : GLib.Object, IXsdTypeDef {}
-public interface GXml.IXsdTypeRestrictionDef : Object {
+public interface GXml.IXsdTypeRestrictionDef : GLib.Object {
public abstract IXsdAnnotation annotation { get; set; }
}
-public interface GXml.IXsdTypeRestrictionMinExclusive : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionMinInclusive : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionMaxExclusive : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionMaxInclusive : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionTotalDigits : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionFractionDigits : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionLength : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionMinLength : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionMaxLength : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionEnumeration : Object, IXsdTypeRestrictionDef {
+public interface GXml.IXsdTypeRestrictionMinExclusive : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionMinInclusive : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionMaxExclusive : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionMaxInclusive : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionTotalDigits : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionFractionDigits : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionLength : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionMinLength : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionMaxLength : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionEnumeration : GLib.Object, IXsdTypeRestrictionDef {
public const string SCHEMA_NODE_NAME = "enumeration";
public abstract string id { get; set; }
public abstract string value { get; set; }
}
-public interface GXml.IXsdTypeRestrictionWhiteSpace: Object, IXsdTypeRestrictionDef {
+public interface GXml.IXsdTypeRestrictionWhiteSpace: GLib.Object, IXsdTypeRestrictionDef {
public const string SCHEMA_NODE_NAME = "whiteSpace";
public abstract bool fixed { get; set; default = false; }
public abstract string id { get; set; }
@@ -96,11 +96,11 @@ public interface GXml.IXsdTypeRestrictionWhiteSpace: Object, IXsdTypeRestriction
*/
public abstract string value { get; set; }
}
-public interface GXml.IXsdTypeRestrictionPattern : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionAssertion : Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdTypeRestrictionExplicitTimezone : Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionPattern : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionAssertion : GLib.Object, IXsdTypeRestrictionDef {}
+public interface GXml.IXsdTypeRestrictionExplicitTimezone : GLib.Object, IXsdTypeRestrictionDef {}
-public interface GXml.IXsdComplexType : Object, DomElement, IXsdBaseType {
+public interface GXml.IXsdComplexType : GLib.Object, DomElement, IXsdBaseType {
public const string SCHEMA_NODE_NAME = "complexType";
/**
* attribute name = abstract
@@ -134,12 +134,12 @@ public interface GXml.IXsdComplexType : Object, DomElement, IXsdBaseType {
public abstract IXsdListAttributesGroup group_attributes { get; }
}
-public interface GXml.IXsdExtension : Object, DomElement {
+public interface GXml.IXsdExtension : GLib.Object, DomElement {
public const string SCHEMA_NODE_NAME = "extension";
public abstract string base { get; set; }
}
-public interface GXml.IXsdElement : Object, DomElement {
+public interface GXml.IXsdElement : GLib.Object, DomElement {
public const string SCHEMA_NODE_NAME = "element";
/**
* attribute name = abstract
@@ -189,30 +189,30 @@ public interface GXml.IXsdElement : Object, DomElement {
// TODO: Missing: ((simpleType | complexType)?, alternative*, (unique | key | keyref)*))
}
-public interface GXml.IXsdAnnotation : Object {}
+public interface GXml.IXsdAnnotation : GLib.Object {}
-public interface GXml.IXsdBaseContent : Object {
+public interface GXml.IXsdBaseContent : GLib.Object {
public abstract IXsdAnnotation anotation { get; set; }
}
-public interface GXml.IXsdSimpleContent : Object, IXsdBaseContent {
+public interface GXml.IXsdSimpleContent : GLib.Object, IXsdBaseContent {
public const string SCHEMA_NODE_NAME = "simpleContent";
}
-public interface GXml.IXsdComplexContent : Object, IXsdBaseContent {
+public interface GXml.IXsdComplexContent : GLib.Object, IXsdBaseContent {
public const string SCHEMA_NODE_NAME = "complexContent";
}
-public interface GXml.IXsdOpenContent : Object, IXsdBaseContent {}
+public interface GXml.IXsdOpenContent : GLib.Object, IXsdBaseContent {}
-public interface GXml.IXsdBaseAttribute : Object {
+public interface GXml.IXsdBaseAttribute : GLib.Object {
public abstract IXsdAnnotation anotation { get; set; }
}
-public interface GXml.IXsdAttribute : Object {
+public interface GXml.IXsdAttribute : GLib.Object {
public const string SCHEMA_NODE_NAME = "attribute";
}
-public interface GXml.IXsdAttributeGroup : Object {
+public interface GXml.IXsdAttributeGroup : GLib.Object {
public const string SCHEMA_NODE_NAME = "attributeGroup";
}
-public interface GXml.IXsdList : Object, Collection {
+public interface GXml.IXsdList : GLib.Object, Collection {
public abstract DomElement element { get; construct set; }
public abstract Type items_type { get; construct set; }
public abstract Type items_name { get; construct set; }
@@ -223,10 +223,10 @@ public interface GXml.IXsdList : Object, Collection {
public abstract int index_of (DomElement element);
}
-public interface GXml.IXsdListElements : Object, IXsdList {}
-public interface GXml.IXsdListSimpleTypes : Object, IXsdList {}
-public interface GXml.IXsdListComplexTypes : Object, IXsdList {}
-public interface GXml.IXsdListAttributes : Object, IXsdList {}
-public interface GXml.IXsdListAttributesGroup : Object, IXsdList {}
-public interface GXml.IXsdListTypeRestrictionEnumerations : Object, IXsdList {}
-public interface GXml.IXsdListTypeRestrictionWhiteSpaces : Object, IXsdList {}
+public interface GXml.IXsdListElements : GLib.Object, IXsdList {}
+public interface GXml.IXsdListSimpleTypes : GLib.Object, IXsdList {}
+public interface GXml.IXsdListComplexTypes : GLib.Object, IXsdList {}
+public interface GXml.IXsdListAttributes : GLib.Object, IXsdList {}
+public interface GXml.IXsdListAttributesGroup : GLib.Object, IXsdList {}
+public interface GXml.IXsdListTypeRestrictionEnumerations : GLib.Object, IXsdList {}
+public interface GXml.IXsdListTypeRestrictionWhiteSpaces : GLib.Object, IXsdList {}
diff --git a/gxml/Node.vala b/gxml/Node.vala
index 5445cdd..ea65236 100644
--- a/gxml/Node.vala
+++ b/gxml/Node.vala
@@ -29,7 +29,7 @@ using Gee;
* This object avoids pre and post XML parsing, by using a one step parsing
* to translate text XML tree to an GObject based tree.
*/
-public class GXml.Node : Object,
+public class GXml.Node : GLib.Object,
DomEventTarget,
DomNode {
// DomNode
diff --git a/gxml/GomObject.vala b/gxml/Object.vala
similarity index 96%
rename from gxml/GomObject.vala
rename to gxml/Object.vala
index 95b5386..ef518bc 100644
--- a/gxml/GomObject.vala
+++ b/gxml/Object.vala
@@ -23,7 +23,7 @@
using GXml;
/**
- * A GXml Object Model (GOM) represents a {@link DomElement}. It has attributes
+ * A GXml Object Model represents a {@link DomElement}. It has attributes
* and children. All object's properties are handled as attributes if they are
* basic types like integers, strings, enums and others; {@link SerializableProperty}
* objects are handled as attributes too. If object's attribute is a {@link GLib.Object}
@@ -31,7 +31,7 @@ using GXml;
* other wise it is ignored when this object is used as {@link DomNode} in XML
* documents.
*/
-public interface GXml.GomObject : GLib.Object,
+public interface GXml.Object : GLib.Object,
DomNode,
DomElement {
/**
@@ -89,7 +89,7 @@ public interface GXml.GomObject : GLib.Object,
if ("::" in nick) nick = nick.replace ("::","");
string sname = spec.name.down ();
if (sname == name || nick == name) {
- if (spec.value_type.is_a (typeof (GomObject))
+ if (spec.value_type.is_a (typeof (GXml.Object))
|| spec.value_type.is_a (typeof (Collection))) {
#if DEBUG
GLib.message ("Found Property: "+pname);
@@ -107,7 +107,7 @@ public interface GXml.GomObject : GLib.Object,
public virtual GLib.List<ParamSpec> get_property_element_list () {
var l = new GLib.List<ParamSpec> ();
foreach (ParamSpec spec in this.get_class ().list_properties ()) {
- if ((spec.value_type.is_a (typeof (GomObject))
+ if ((spec.value_type.is_a (typeof (GXml.Object))
|| spec.value_type.is_a (typeof (Collection)))
&& spec.value_type.is_instantiatable ()) {
#if DEBUG
@@ -206,7 +206,7 @@ public interface GXml.GomObject : GLib.Object,
get_property (prop.name, ref v);
GXml.Property so = (Object) v as GXml.Property;
if (so == null) {
- var obj = Object.new (prop.value_type);
+ var obj = GLib.Object.new (prop.value_type);
v.set_object (obj);
set_property (prop.name, v);
so = obj as GXml.Property;
@@ -234,7 +234,7 @@ public interface GXml.GomObject : GLib.Object,
get_property (prop.name, ref v);
GXml.Property so = (Object) v as GXml.Property;
if (so == null) {
- var obj = Object.new (prop.value_type);
+ var obj = GLib.Object.new (prop.value_type);
v.set_object (obj);
set_property (prop.name, v);
so = obj as GXml.Property;
@@ -325,7 +325,7 @@ public interface GXml.GomObject : GLib.Object,
var prop = get_class ().find_property (name);
if (prop != null) {
if (prop.value_type.is_a (typeof(DomElement))) {
- var o = Object.new (prop.value_type) as DomElement;
+ var o = GLib.Object.new (prop.value_type) as DomElement;
foreach (DomNode n in this.child_nodes) {
if (!(n is DomElement)) continue;
if ((n as DomElement).local_name.down () == o.local_name.down ())
@@ -393,15 +393,15 @@ public interface GXml.GomObject : GLib.Object,
var prop = find_object_property_name (name);
if (prop == null) return false;
Value v = Value (prop.value_type);
- Object obj;
+ GLib.Object obj;
if (prop.value_type.is_a (typeof (Collection))) {
- obj = Object.new (prop.value_type, "element", this);
+ obj = GLib.Object.new (prop.value_type, "element", this);
v.set_object (obj);
set_property (prop.name, v);
return true;
}
if (prop.value_type.is_a (typeof (GXml.Element))) {
- obj = Object.new (prop.value_type,"owner-document", this.owner_document);
+ obj = GLib.Object.new (prop.value_type,"owner-document", this.owner_document);
try { this.append_child (obj as GXml.Element); }
catch (GLib.Error e) {
warning (_("Error while attempting to instantiate property object: %s").printf (e.message));
diff --git a/gxml/Parser.vala b/gxml/Parser.vala
index 3f18b10..b86ecaa 100644
--- a/gxml/Parser.vala
+++ b/gxml/Parser.vala
@@ -33,7 +33,7 @@ public errordomain GXml.ParserError {
/**
* XML parser engine for {@link DomDocument} implementations.
*/
-public interface GXml.Parser : Object {
+public interface GXml.Parser : GLib.Object {
/**
* Controls if, when writing to a file, a backup should
* be created.
@@ -202,12 +202,12 @@ public interface GXml.Parser : Object {
public virtual bool read_element_property (DomNode parent,
out DomNode element) throws GLib.Error {
element = null;
- if (!(parent is GomObject)) return false;
+ if (!(parent is GXml.Object)) return false;
foreach (ParamSpec pspec in
- (parent as GomObject).get_property_element_list ()) {
+ (parent as GXml.Object).get_property_element_list ()) {
if (pspec.value_type.is_a (typeof (Collection))) continue;
//if (!pspec.value_type.is_instantiatable ()) continue;
- var obj = Object.new (pspec.value_type,
+ var obj = GLib.Object.new (pspec.value_type,
"owner-document", node.owner_document) as DomElement;
if (obj.local_name.down ()
== current_node_name ().down ()) {
@@ -233,22 +233,22 @@ public interface GXml.Parser : Object {
public virtual bool add_element_collection (DomNode parent,
out DomNode element) throws GLib.Error {
element = null;
- if (!(parent is GomObject)) return false;
+ if (!(parent is GXml.Object)) return false;
foreach (ParamSpec pspec in
- (parent as GomObject).get_property_element_list ()) {
+ (parent as GXml.Object).get_property_element_list ()) {
if (!(pspec.value_type.is_a (typeof (Collection)))) continue;
Collection col;
Value vc = Value (pspec.value_type);
parent.get_property (pspec.name, ref vc);
col = vc.get_object () as Collection;
if (col == null) {
- col = Object.new (pspec.value_type,
+ col = GLib.Object.new (pspec.value_type,
"element", parent) as Collection;
vc.set_object (col);
parent.set_property (pspec.name, vc);
}
if (col.items_type == GLib.Type.INVALID
- || !(col.items_type.is_a (typeof (GomObject)))) {
+ || !(col.items_type.is_a (typeof (GXml.Object)))) {
throw new DomError.INVALID_NODE_TYPE_ERROR
(_("Invalid object type set to Collection"));
}
@@ -256,7 +256,7 @@ public interface GXml.Parser : Object {
throw new DomError.INVALID_NODE_TYPE_ERROR
(_("Invalid DomElement name for objects in Collection"));
}
- if (col.element == null || !(col.element is GomObject)) {
+ if (col.element == null || !(col.element is GXml.Object)) {
throw new DomError.INVALID_NODE_TYPE_ERROR
(_("Invalid Element set to Collection"));
}
@@ -264,7 +264,7 @@ public interface GXml.Parser : Object {
if (parent.owner_document == null)
throw new DomError.HIERARCHY_REQUEST_ERROR
(_("No document is set to node"));
- var obj = Object.new (col.items_type,
+ var obj = GLib.Object.new (col.items_type,
"owner-document", node.owner_document) as DomElement;
parent.append_child (obj);
read_element (obj as DomElement);
diff --git a/gxml/Property.vala b/gxml/Property.vala
index b20ee34..75dc770 100644
--- a/gxml/Property.vala
+++ b/gxml/Property.vala
@@ -26,7 +26,7 @@
* {@link DomElement} attributes. If object is instantiated it is
* written, if not is just ingnored.
*/
-public interface GXml.Property : Object
+public interface GXml.Property : GLib.Object
{
/**
* Attribute's value in the parent {@link DomElement} using a string.
@@ -44,7 +44,7 @@ public interface GXml.Property : Object
/**
* Base class for properties implementing {@link GomProperty} interface.
*/
-public abstract class GXml.BaseProperty : Object, GXml.Property {
+public abstract class GXml.BaseProperty : GLib.Object, GXml.Property {
/**
* {@inheritDoc}
*/
diff --git a/gxml/Range.vala b/gxml/Range.vala
index 51b6e98..9890710 100644
--- a/gxml/Range.vala
+++ b/gxml/Range.vala
@@ -24,7 +24,7 @@
/**
* DOM4 Range implementation, powered by libxml2 library.
*/
-public class GXml.Range : Object, GXml.DomRange {
+public class GXml.Range : GLib.Object, GXml.DomRange {
protected DomDocument _document;
protected DomNode _start_container;
protected int _start_offset;
diff --git a/gxml/StringRef.vala b/gxml/StringRef.vala
index 939e671..a21a780 100644
--- a/gxml/StringRef.vala
+++ b/gxml/StringRef.vala
@@ -20,8 +20,8 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GXml.StringRef : Object, GXml.Property {
- GomObject object;
+public class GXml.StringRef : GLib.Object, GXml.Property {
+ GXml.Object object;
string name;
public string? value {
owned get {
@@ -32,7 +32,7 @@ public class GXml.StringRef : Object, GXml.Property {
}
}
public bool validate_value (string? val) { return true; }
- public StringRef (GomObject obj, string name) {
+ public StringRef (GXml.Object obj, string name) {
object = obj;
this.name = name;
}
diff --git a/gxml/TreeWalker.vala b/gxml/TreeWalker.vala
index a0d42ca..a4e0239 100644
--- a/gxml/TreeWalker.vala
+++ b/gxml/TreeWalker.vala
@@ -22,7 +22,7 @@
[Version (since = "0.18")]
-public class GXml.TreeWalker : Object, GXml.DomTreeWalker {
+public class GXml.TreeWalker : GLib.Object, GXml.DomTreeWalker {
protected DomNode _root;
protected int _what_to_show;
protected DomNodeFilter? _filter;
@@ -155,4 +155,4 @@ public class GXml.TreeWalker : Object, GXml.DomTreeWalker {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/gxml/XDocument.vala b/gxml/XDocument.vala
index 54d09b6..3612860 100644
--- a/gxml/XDocument.vala
+++ b/gxml/XDocument.vala
@@ -425,7 +425,7 @@ public class GXml.XDocumentFragment : GXml.XDocument,
}
-public class GXml.GDomNodeIterator : Object, GXml.DomNodeIterator {
+public class GXml.GDomNodeIterator : GLib.Object, GXml.DomNodeIterator {
protected DomNode _root;
protected DomNode _reference_node;
protected bool _pointer_before_reference_node;
@@ -449,7 +449,7 @@ public class GXml.GDomNodeIterator : Object, GXml.DomNodeIterator {
}
-public class GXml.GDomTreeWalker : Object, GXml.DomTreeWalker {
+public class GXml.GDomTreeWalker : GLib.Object, GXml.DomTreeWalker {
protected DomNode _root;
protected int _what_to_show;
protected DomNodeFilter? _filter;
diff --git a/gxml/XHashMapAttr.vala b/gxml/XHashMapAttr.vala
index 7ea162a..22f92d2 100644
--- a/gxml/XHashMapAttr.vala
+++ b/gxml/XHashMapAttr.vala
@@ -160,7 +160,7 @@ public class GXml.XHashMapAttr : Gee.AbstractMap<string,GXml.XNode>,
return l;
}
}
- public class Iterator : Object, MapIterator<string,GXml.XNode> {
+ public class Iterator : GLib.Object, MapIterator<string,GXml.XNode> {
private GXml.XDocument _doc;
private Xml.Node *_node;
private Xml.Attr *_current;
diff --git a/gxml/XListChildren.vala b/gxml/XListChildren.vala
index 58478fb..4df7dee 100644
--- a/gxml/XListChildren.vala
+++ b/gxml/XListChildren.vala
@@ -151,7 +151,7 @@ public class GXml.XListChildren : AbstractBidirList<GXml.DomNode>,
}
public override bool read_only { get { return false; } }
// Iterator
- public class Iterator : Object, Traversable<GXml.DomNode>,
+ public class Iterator : GLib.Object, Traversable<GXml.DomNode>,
Gee.Iterator<GXml.DomNode>,
Gee.BidirIterator<GXml.DomNode>,
Gee.ListIterator<GXml.DomNode>,
diff --git a/gxml/XNode.vala b/gxml/XNode.vala
index 85ddf07..508d7a2 100644
--- a/gxml/XNode.vala
+++ b/gxml/XNode.vala
@@ -32,7 +32,7 @@ public errordomain GXml.Error {
/**
* DOM4 Base interface providing basic functionalities to all libxml2 DOM4 implementations.
*/
-public abstract class GXml.XNode : Object,
+public abstract class GXml.XNode : GLib.Object,
GXml.DomEventTarget,
GXml.DomNode
{
diff --git a/gxml/XParser.vala b/gxml/XParser.vala
index 213e0db..6c72329 100644
--- a/gxml/XParser.vala
+++ b/gxml/XParser.vala
@@ -26,7 +26,7 @@ using Xml;
/**
* {@link Parser} implementation using libxml2 engine
*/
-public class GXml.XParser : Object, GXml.Parser {
+public class GXml.XParser : GLib.Object, GXml.Parser {
private DomDocument _document;
private DomNode _node;
private TextReader tr;
@@ -216,7 +216,7 @@ public class GXml.XParser : Object, GXml.Parser {
read_child_nodes (node);
else {
(node as GXml.Element).unparsed = read_unparsed ();
- //warning ("Unparsed text: "+(node as GomObject).unparsed);
+ //warning ("Unparsed text: "+(node as GXml.Object).unparsed);
move_next_node ();
}
}
@@ -344,8 +344,8 @@ public class GXml.XParser : Object, GXml.Parser {
bool processed = false;
string attn = attrname;
if (prefix != null) attn = prefix+":"+attrname;
- if (node is GomObject) {
- processed = (element as GomObject).set_attribute (attn, attrval);
+ if (node is GXml.Object) {
+ processed = (element as GXml.Object).set_attribute (attn, attrval);
}
if (!processed) {
if (prefix != null) {
@@ -490,8 +490,8 @@ public class GXml.XParser : Object, GXml.Parser {
} else
tw.start_element ((node as DomElement).local_name);
- // GomObject serialization
- var lp = (node as GomObject).get_properties_list ();
+ // GXml.Object serialization
+ var lp = (node as GXml.Object).get_properties_list ();
foreach (ParamSpec pspec in lp) {
string attname = pspec.get_nick ().replace ("::","");
string val = null;
@@ -502,7 +502,7 @@ public class GXml.XParser : Object, GXml.Parser {
if (gp == null) continue;
val = gp.value;
} else {
- val = (node as GomObject).get_property_string (pspec);
+ val = (node as GXml.Object).get_property_string (pspec);
}
if (val == null) continue;
size += tw.write_attribute (attname, val);
@@ -596,8 +596,8 @@ public class GXml.XParser : Object, GXml.Parser {
tw.start_element ((node as DomElement).local_name);
Idle.add (start_node_async.callback);
yield;
- // GomObject serialization
- var lp = (node as GomObject).get_properties_list ();
+ // GXml.Object serialization
+ var lp = (node as GXml.Object).get_properties_list ();
foreach (ParamSpec pspec in lp) {
Idle.add (start_node_async.callback);
yield;
@@ -610,7 +610,7 @@ public class GXml.XParser : Object, GXml.Parser {
if (gp == null) continue;
val = gp.value;
} else {
- val = (node as GomObject).get_property_string (pspec);
+ val = (node as GXml.Object).get_property_string (pspec);
}
if (val == null) continue;
size += tw.write_attribute (attname, val);
diff --git a/gxml/XdParser.vala b/gxml/XdParser.vala
index 3e3460d..aa87d9d 100644
--- a/gxml/XdParser.vala
+++ b/gxml/XdParser.vala
@@ -24,7 +24,7 @@
* Parser implementation of {@link Parser} to parse {@link XDocument}
* documents.
*/
-private class GXml.XdParser : Object, Parser {
+private class GXml.XdParser : GLib.Object, Parser {
private XDocument document;
private DomNode _node;
diff --git a/gxml/meson.build b/gxml/meson.build
index c7cb867..053961d 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -55,7 +55,6 @@ valasources = files ([
'Element.vala',
'Enumeration.vala',
'Event.vala',
- 'GomObject.vala',
'gxml-init.vala',
'HashMap.vala',
'HashPairedMap.vala',
@@ -65,6 +64,7 @@ valasources = files ([
'LXPathObject.vala',
'Node.vala',
'NodeType.vala',
+ 'Object.vala',
'Parser.vala',
'Property.vala',
'Range.vala',
diff --git a/test/DocumentPerformanceIterateTest.vala b/test/DocumentPerformanceIterateTest.vala
index d148b85..213c187 100644
--- a/test/DocumentPerformanceIterateTest.vala
+++ b/test/DocumentPerformanceIterateTest.vala
@@ -27,7 +27,7 @@ class GXmlTest.Suite : Object
{
GLib.Intl.setlocale (GLib.LocaleCategory.ALL, "");
Test.init (ref args);
- Test.add_func ("/gxml/gom-document/performance/iterate", () => {
+ Test.add_func ("/gxml/document/performance/iterate", () => {
try {
DomDocument d = new GomDocument ();
File dir = File.new_for_path (GXmlTestConfig.TEST_DIR);
diff --git a/test/DocumentPerformanceTest.vala b/test/DocumentPerformanceTest.vala
index da4b2df..e1d8a6f 100644
--- a/test/DocumentPerformanceTest.vala
+++ b/test/DocumentPerformanceTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/* GXmlDocumentPerformanceTest.vala
+/* GomDocumentPerformanceTest.vala
*
* Copyright (C) 2019 Daniel Espinosa <esodan gmail com>
*
@@ -21,28 +21,28 @@
*/
using GXml;
-class GXmlTest.Suite : Object
+class GXmlTest.Suite : GLib.Object
{
static int main (string[] args)
{
GLib.Intl.setlocale (GLib.LocaleCategory.ALL, "");
Test.init (ref args);
- Test.add_func ("/gxml/x-document/performance", () => {
- try {
- DomDocument d = new XDocument ();
- File dir = File.new_for_path (GXmlTestConfig.TEST_DIR);
- assert (dir.query_exists ());
- File f = File.new_for_uri (dir.get_uri ()+"/test-large.xml");
- assert (f.query_exists ());
- Test.timer_start ();
- d.read_from_file (f);
- var t = Test.timer_elapsed ();
- message ("Elapsed time: %g", t);
- } catch (GLib.Error e) {
- warning ("Error: %s", e.message);
- assert_not_reached ();
- }
- });
- return Test.run ();
- }
+ Test.add_func ("/gxml/gom-document/performance", () => {
+ try {
+ DomDocument d = new GXml.Document ();
+ File dir = File.new_for_path (GXmlTestConfig.TEST_DIR);
+ assert (dir.query_exists ());
+ File f = File.new_for_uri (dir.get_uri ()+"/test-large.xml");
+ assert (f.query_exists ());
+ Test.timer_start ();
+ d.read_from_file (f);
+ var t = Test.timer_elapsed ();
+ message ("Elapsed time: %g", t);
+ } catch (GLib.Error e) {
+ warning ("Error: %s", e.message);
+ assert_not_reached ();
+ }
+ });
+ return Test.run ();
+}
}
diff --git a/test/DocumentTest.vala b/test/DocumentTest.vala
index a658391..1e852b2 100644
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@ -40,7 +40,7 @@ class GXml.DocumentTest : GXmlTest {
public string text { get; set; }
[Description (nick="::prop")]
public ObjectProperty prop { get; set; }
- public class ObjectProperty : Object, GXml.Property {
+ public class ObjectProperty : GLib.Object, GXml.Property {
public string? value { owned get; set; }
public bool validate_value (string? val) {
return true;
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index f0f2d14..8769128 100644
--- a/test/ElementTest.vala
+++ b/test/ElementTest.vala
@@ -22,10 +22,10 @@
using GXml;
-public interface NoInstantiatable : Object, GomObject {
+public interface NoInstantiatable : GLib.Object, GXml.Object {
public abstract string name { get; set; }
}
-public interface Property : Object, GXml.Property {}
+public interface Property : GLib.Object, GXml.Property {}
class ObjectParent : GXml.Element {
construct {
@@ -42,7 +42,7 @@ class ObjectParent : GXml.Element {
public ObjectProperty prop2 { get; set; }
[Description (nick="::prop3")]
public ObjectProperty prop3 { get; set; }
- public class ObjectProperty : Object, GXml.Property {
+ public class ObjectProperty : GLib.Object, GXml.Property {
public string? value { owned get; set; }
public bool validate_value (string? val) {
return true;
@@ -805,7 +805,7 @@ class GXml.ElementTest : GXmlTest {
assert (e.attributes.length == 9);
assert (e.attributes.item (8) != null);
assert ((e.attributes.item (8) as DomAttr).@value == "di1");
- e.child = Object.new (typeof (ObjectParent.ObjectChild),
+ e.child = GLib.Object.new (typeof (ObjectParent.ObjectChild),
"owner-document", e.owner_document) as ObjectParent.ObjectChild;
e.append_child (e.child);
assert (e.child != null);
diff --git a/test/SerializationTest.vala b/test/SerializationTest.vala
index 08985e9..00550e0 100644
--- a/test/SerializationTest.vala
+++ b/test/SerializationTest.vala
@@ -322,7 +322,7 @@ class SerializationTest : GXmlTest {
public string get_map_skey () { return get_map_secondary_key (); }
public string get_map_tkey () { return cover; }
public Book create_book (string name) {
- return Object.new (typeof (Book),
+ return GLib.Object.new (typeof (Book),
"owner-document", this.owner_document,
"name", name)
as Book;
@@ -355,7 +355,7 @@ class SerializationTest : GXmlTest {
public HashRegisters hashmap_registers {
get {
if (_hashmap_registers == null)
- _hashmap_registers = Object.new (typeof (HashRegisters),"element",this)
+ _hashmap_registers = GLib.Object.new (typeof (HashRegisters),"element",this)
as HashRegisters;
return _hashmap_registers;
}
@@ -366,7 +366,7 @@ class SerializationTest : GXmlTest {
public HashPairRegisters hashpair_registers {
get {
if (_hashpair_registers == null)
- _hashpair_registers = Object.new (typeof (HashPairRegisters),"element",this)
+ _hashpair_registers = GLib.Object.new (typeof (HashPairRegisters),"element",this)
as HashPairRegisters;
return _hashpair_registers;
}
@@ -377,7 +377,7 @@ class SerializationTest : GXmlTest {
public HashThreeRegisters hashthree_registers {
get {
if (_hashthree_registers == null)
- _hashthree_registers = Object.new (typeof (HashThreeRegisters),"element",this)
+ _hashthree_registers = GLib.Object.new (typeof (HashThreeRegisters),"element",this)
as HashThreeRegisters;
return _hashthree_registers;
}
@@ -913,7 +913,7 @@ class SerializationTest : GXmlTest {
#endif
assert ("<Motor On=\"false\" Torque=\"0.0000\" Speed=\"1.0000\"/>" in s);
assert (m.speed != null);
- assert (m is GomObject);
+ assert (m is GXml.Object);
assert (m.speed is GXml.Property);
assert (m.speed.get_double () == 1.0);
assert (m.speed.value != null);
diff --git a/test/GomDocumentPerformanceIterateTest.vala b/test/XDocumentPerformanceIterateTest.vala
similarity index 93%
rename from test/GomDocumentPerformanceIterateTest.vala
rename to test/XDocumentPerformanceIterateTest.vala
index 144cc68..dea053c 100644
--- a/test/GomDocumentPerformanceIterateTest.vala
+++ b/test/XDocumentPerformanceIterateTest.vala
@@ -27,9 +27,9 @@ class GXmlTest.Suite : Object
{
GLib.Intl.setlocale (GLib.LocaleCategory.ALL, "");
Test.init (ref args);
- Test.add_func ("/gxml/gom-document/performance/iterate", () => {
+ Test.add_func ("/gxml/x-document/performance/iterate", () => {
try {
- DomDocument d = new GomDocument ();
+ DomDocument d = new XDocument ();
File dir = File.new_for_path (GXmlTestConfig.TEST_DIR);
assert (dir.query_exists ());
File f = File.new_for_uri (dir.get_uri ()+"/test-large.xml");
diff --git a/test/GomDocumentPerformanceTest.vala b/test/XDocumentPerformanceTest.vala
similarity index 59%
rename from test/GomDocumentPerformanceTest.vala
rename to test/XDocumentPerformanceTest.vala
index 272ffdc..e457362 100644
--- a/test/GomDocumentPerformanceTest.vala
+++ b/test/XDocumentPerformanceTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/* GomDocumentPerformanceTest.vala
+/* GXmlDocumentPerformanceTest.vala
*
* Copyright (C) 2019 Daniel Espinosa <esodan gmail com>
*
@@ -21,28 +21,28 @@
*/
using GXml;
-class GXmlTest.Suite : Object
+class GXmlTest.Suite : GLib.Object
{
static int main (string[] args)
{
GLib.Intl.setlocale (GLib.LocaleCategory.ALL, "");
Test.init (ref args);
- Test.add_func ("/gxml/gom-document/performance", () => {
- try {
- DomDocument d = new GXml.Document ();
- File dir = File.new_for_path (GXmlTestConfig.TEST_DIR);
- assert (dir.query_exists ());
- File f = File.new_for_uri (dir.get_uri ()+"/test-large.xml");
- assert (f.query_exists ());
- Test.timer_start ();
- d.read_from_file (f);
- var t = Test.timer_elapsed ();
- message ("Elapsed time: %g", t);
- } catch (GLib.Error e) {
- warning ("Error: %s", e.message);
- assert_not_reached ();
- }
- });
- return Test.run ();
-}
+ Test.add_func ("/gxml/x-document/performance/load", () => {
+ try {
+ DomDocument d = new XDocument ();
+ File dir = File.new_for_path (GXmlTestConfig.TEST_DIR);
+ assert (dir.query_exists ());
+ File f = File.new_for_uri (dir.get_uri ()+"/test-large.xml");
+ assert (f.query_exists ());
+ Test.timer_start ();
+ d.read_from_file (f);
+ var t = Test.timer_elapsed ();
+ message ("Elapsed time: %g", t);
+ } catch (GLib.Error e) {
+ warning ("Error: %s", e.message);
+ assert_not_reached ();
+ }
+ });
+ return Test.run ();
+ }
}
diff --git a/test/feedreader-test.vala b/test/feedreader-test.vala
index 5a5019d..65d1408 100644
--- a/test/feedreader-test.vala
+++ b/test/feedreader-test.vala
@@ -11,7 +11,7 @@
using GXml;
-public class FeedReader : Object {
+public class FeedReader : GLib.Object {
public static int main (string[] args) {
try {
diff --git a/test/meson.build b/test/meson.build
index 9773fbf..1cc39c0 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -43,33 +43,33 @@ feedreadert = executable('feedreader_tests', feedreader_files + configvapi + con
files_gom_performance = files ([
- 'GomDocumentPerformanceTest.vala'
+ 'DocumentPerformanceTest.vala'
])
-gom_performance = executable('gom-performance-load', files_gom_performance + configvapi + configtestvapi,
+gom_performance = executable('performance-load', files_gom_performance + configvapi + configtestvapi,
vala_args : [],
dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep],
link_with: libgxml
)
-benchmark ('gom-performance-load', gom_performance)
+benchmark ('performance-load', gom_performance)
files_gom_performance_iterate = files ([
- 'GomDocumentPerformanceIterateTest.vala'
+ 'DocumentPerformanceIterateTest.vala'
])
-gom_performance_iterate = executable('gom-performance-iterate', files_gom_performance + configvapi +
configtestvapi,
+gom_performance_iterate = executable('performance-iterate', files_gom_performance + configvapi +
configtestvapi,
vala_args : [],
dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep],
link_with: libgxml
)
-benchmark ('gom-performance-iterate', gom_performance_iterate)
+benchmark ('performance-iterate', gom_performance_iterate)
files_libxml_performance = files ([
- 'DocumentPerformanceTest.vala'
+ 'XDocumentPerformanceTest.vala'
])
libxml_performance = executable('libxml-performance-load', files_libxml_performance + configvapi +
configtestvapi,
vala_args : [],
@@ -80,7 +80,7 @@ libxml_performance = executable('libxml-performance-load', files_libxml_performa
benchmark ('libxml-performance-load', libxml_performance)
files_libxml_performance_iterate = files ([
- 'DocumentPerformanceIterateTest.vala'
+ 'XDocumentPerformanceIterateTest.vala'
])
libxml_performance_iterate = executable('libxml-performance-iterate', files_gom_performance + configvapi +
configtestvapi,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
