[libgee] Hide inherited get and set methods from GLib.Object
- From: Didier 'Ptitjes' Villevalois <dvillevalois src gnome org>
- To: svn-commits-list gnome org
- Subject: [libgee] Hide inherited get and set methods from GLib.Object
- Date: Sun, 19 Jul 2009 14:15:19 +0000 (UTC)
commit ac152534e80b5105fffa45d38d2d6eff6154a697
Author: Didier 'Ptitjes <ptitjes free fr>
Date: Sun Jul 19 16:11:57 2009 +0200
Hide inherited get and set methods from GLib.Object
Signed-off-by: Julien Fontanet <julien fontanet isonoe net>
gee/arraylist.vala | 6 +++---
gee/hashmap.vala | 8 ++++----
gee/hashset.vala | 4 ++--
gee/readonlycollection.vala | 2 +-
gee/readonlylist.vala | 6 +++---
gee/readonlymap.vala | 4 ++--
gee/readonlyset.vala | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/gee/arraylist.vala b/gee/arraylist.vala
index 0135b84..38b6086 100644
--- a/gee/arraylist.vala
+++ b/gee/arraylist.vala
@@ -68,13 +68,13 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
return -1;
}
- public G? get (int index) {
+ public new G? get (int index) {
assert (index >= 0 && index < _size);
return _items[index];
}
- public void set (int index, G item) {
+ public new void set (int index, G item) {
assert (index >= 0 && index < _size);
_items[index] = item;
@@ -191,7 +191,7 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
return (_index < _list._size);
}
- public G? get () {
+ public new G? get () {
assert (_stamp == _list._stamp);
if (_index < 0 || _index >= _list._size) {
diff --git a/gee/hashmap.vala b/gee/hashmap.vala
index c69eac6..c8d0841 100644
--- a/gee/hashmap.vala
+++ b/gee/hashmap.vala
@@ -91,7 +91,7 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
return (*node != null);
}
- public V? get (K key) {
+ public new V? get (K key) {
Node<K,V>* node = (*lookup_node (key));
if (node != null) {
return node->value;
@@ -100,7 +100,7 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
}
}
- public void set (K key, V value) {
+ public new void set (K key, V value) {
Node<K,V>** node = lookup_node (key);
if (*node != null) {
(*node)->value = value;
@@ -257,7 +257,7 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
return (_node != null);
}
- public K? get () {
+ public new K? get () {
assert (_stamp == _map._stamp);
assert (_node != null);
return _node.key;
@@ -340,7 +340,7 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
return (_node != null);
}
- public V? get () {
+ public new V? get () {
assert (_stamp == _map._stamp);
assert (_node != null);
return _node.value;
diff --git a/gee/hashset.vala b/gee/hashset.vala
index ca1dae6..1e45232 100644
--- a/gee/hashset.vala
+++ b/gee/hashset.vala
@@ -170,7 +170,7 @@ public class Gee.HashSet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
}
private class Iterator<G> : Object, Gee.Iterator<G> {
- public HashSet<G> set {
+ public new HashSet<G> set {
set {
_set = value;
_stamp = _set._stamp;
@@ -199,7 +199,7 @@ public class Gee.HashSet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
return (_node != null);
}
- public G? get () {
+ public new G? get () {
assert (_stamp == _set._stamp);
assert (_node != null);
return _node.key;
diff --git a/gee/readonlycollection.vala b/gee/readonlycollection.vala
index 3a4ac77..e057297 100644
--- a/gee/readonlycollection.vala
+++ b/gee/readonlycollection.vala
@@ -77,7 +77,7 @@ public class Gee.ReadOnlyCollection<G> : Object, Iterable<G>, Collection<G> {
return false;
}
- public G? get () {
+ public new G? get () {
return null;
}
}
diff --git a/gee/readonlylist.vala b/gee/readonlylist.vala
index 55465f0..ee19b73 100644
--- a/gee/readonlylist.vala
+++ b/gee/readonlylist.vala
@@ -84,7 +84,7 @@ public class Gee.ReadOnlyList<G> : Object, Iterable<G>, Collection<G>, List<G> {
assert_not_reached ();
}
- public G? get (int index) {
+ public new G? get (int index) {
if (_list == null) {
return null;
}
@@ -92,7 +92,7 @@ public class Gee.ReadOnlyList<G> : Object, Iterable<G>, Collection<G>, List<G> {
return _list.get (index);
}
- public void set (int index, G o) {
+ public new void set (int index, G o) {
assert_not_reached ();
}
@@ -109,7 +109,7 @@ public class Gee.ReadOnlyList<G> : Object, Iterable<G>, Collection<G>, List<G> {
return false;
}
- public G? get () {
+ public new G? get () {
return null;
}
}
diff --git a/gee/readonlymap.vala b/gee/readonlymap.vala
index e629527..92997c8 100644
--- a/gee/readonlymap.vala
+++ b/gee/readonlymap.vala
@@ -64,7 +64,7 @@ public class Gee.ReadOnlyMap<K,V> : Object, Map<K,V> {
return _map.contains (key);
}
- public V? get (K key) {
+ public new V? get (K key) {
if (_map == null) {
return null;
}
@@ -72,7 +72,7 @@ public class Gee.ReadOnlyMap<K,V> : Object, Map<K,V> {
return _map.get (key);
}
- public void set (K key, V value) {
+ public new void set (K key, V value) {
assert_not_reached ();
}
diff --git a/gee/readonlyset.vala b/gee/readonlyset.vala
index 15bcd52..6da0803 100644
--- a/gee/readonlyset.vala
+++ b/gee/readonlyset.vala
@@ -30,7 +30,7 @@ public class Gee.ReadOnlySet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
get { return _set.size; }
}
- public Set<G> set {
+ public new Set<G> set {
set { _set = value; }
}
@@ -77,7 +77,7 @@ public class Gee.ReadOnlySet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
return false;
}
- public G? get () {
+ public new G? get () {
return null;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]