From cd38dce50f7c8183e52fe606a5cb37cffabb553a Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Date: Mon, 9 Apr 2018 16:34:53 -0500 Subject: [PATCH] Collections: renamed GomMap to GXml.Map --- gxml/Collections.vala | 2 +- gxml/GomCollections.vala | 2 +- gxml/GomElement.vala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gxml/Collections.vala b/gxml/Collections.vala index d39b8e8c..cb2ade71 100644 --- a/gxml/Collections.vala +++ b/gxml/Collections.vala @@ -41,7 +41,7 @@ public interface GXml.MappeableElement : Object, DomElement { /** * {@link Gee.Iterable} and {@link Gee.Traversable} implementation of {@link GomCollection} */ -public interface GXml.GomMap : Object, GomCollection, Traversable, Iterable { +public interface GXml.Map : Object, GomCollection, Traversable, Iterable { /** * An attribute's name in items to be added and used to retrieve elements * as key. diff --git a/gxml/GomCollections.vala b/gxml/GomCollections.vala index 09880965..ba3e782d 100644 --- a/gxml/GomCollections.vala +++ b/gxml/GomCollections.vala @@ -381,7 +381,7 @@ public class GXml.GomArrayList : GXml.BaseCollection, GXml.List { * } * }}} */ -public class GXml.GomHashMap : GXml.BaseCollection, GomMap { +public class GXml.GomHashMap : GXml.BaseCollection, GXml.Map { /** * A hashtable with all keys as string to node's index refered. Don't modify it manually. */ diff --git a/gxml/GomElement.vala b/gxml/GomElement.vala index 3fd3f7af..233b5f48 100644 --- a/gxml/GomElement.vala +++ b/gxml/GomElement.vala @@ -375,7 +375,7 @@ public class GXml.GomElement : GomNode, public DomNode? item (int index) { if (index < 0 || index >= size) return null; long i = -1; - foreach (Map.Entry e in order.ascending_entries) { + foreach (Gee.Map.Entry e in order.ascending_entries) { i++; if (i == index) { string name = e.value; @@ -557,7 +557,7 @@ public class GXml.GomElement : GomNode, } private long index_of (string name) { long i = -1; - foreach (Map.Entry e in order.ascending_entries) { + foreach (Gee.Map.Entry e in order.ascending_entries) { i++; if (e.value == name) return i; } -- GitLab