s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use GList instead of GSList in eek-container.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-17 13:22:46 +09:00
parent 7c0e29fc86
commit 84f614528f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eek/eek-container.c
View File

@ -53,7 +53,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (EekContainer, eek_container, EEK_TYPE_ELEMENT,
struct _EekContainerPrivate struct _EekContainerPrivate
{ {
GSList *children; GList *children;
}; };
static EekSerializableIface *eek_container_parent_serializable_iface; static EekSerializableIface *eek_container_parent_serializable_iface;
@ -63,7 +63,7 @@ eek_container_real_serialize (EekSerializable *self,
GVariantBuilder *builder) GVariantBuilder *builder)
{ {
EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self); EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
GSList *head; GList *head;
GVariantBuilder array; GVariantBuilder array;
eek_container_parent_serializable_iface->serialize (self, builder); eek_container_parent_serializable_iface->serialize (self, builder);
@ -119,7 +119,7 @@ eek_container_real_add_child (EekContainer *self,
g_return_if_fail (EEK_IS_ELEMENT(child)); g_return_if_fail (EEK_IS_ELEMENT(child));
g_object_ref (child); g_object_ref (child);
priv->children = g_slist_prepend (priv->children, child); priv->children = g_list_append (priv->children, child);
eek_element_set_parent (child, EEK_ELEMENT(self)); eek_element_set_parent (child, EEK_ELEMENT(self));
g_signal_emit_by_name (self, "child-added", child); g_signal_emit_by_name (self, "child-added", child);
} }
@ -129,13 +129,13 @@ eek_container_real_remove_child (EekContainer *self,
EekElement *child) EekElement *child)
{ {
EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self); EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
GSList *head; GList *head;
g_return_if_fail (EEK_IS_ELEMENT(child)); g_return_if_fail (EEK_IS_ELEMENT(child));
head = g_slist_find (priv->children, child); head = g_list_find (priv->children, child);
g_return_if_fail (head); g_return_if_fail (head);
g_object_unref (child); g_object_unref (child);
priv->children = g_slist_remove_link (priv->children, head); priv->children = g_list_remove_link (priv->children, head);
eek_element_set_parent (child, NULL); eek_element_set_parent (child, NULL);
g_signal_emit_by_name (self, "child-removed", child); g_signal_emit_by_name (self, "child-removed", child);
} }
@ -146,9 +146,9 @@ eek_container_real_foreach_child (EekContainer *self,
gpointer user_data) gpointer user_data)
{ {
EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self); EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
GSList *head; GList *head;
for (head = priv->children; head; head = g_slist_next (head)) for (head = priv->children; head; head = g_list_next (head))
(*callback) (EEK_ELEMENT(head->data), user_data); (*callback) (EEK_ELEMENT(head->data), user_data);
} }
@ -158,9 +158,9 @@ eek_container_real_find (EekContainer *self,
gpointer user_data) gpointer user_data)
{ {
EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self); EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
GSList *head; GList *head;
head = g_slist_find_custom (priv->children, user_data, (GCompareFunc)func); head = g_list_find_custom (priv->children, user_data, (GCompareFunc)func);
if (head) if (head)
return head->data; return head->data;
return NULL; return NULL;
@ -170,12 +170,12 @@ static void
eek_container_dispose (GObject *object) eek_container_dispose (GObject *object)
{ {
EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object); EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
GSList *head; GList *head;
for (head = priv->children; head; head = priv->children) { for (head = priv->children; head; head = priv->children) {
g_object_unref (head->data); g_object_unref (head->data);
priv->children = g_slist_next (head); priv->children = g_list_next (head);
g_slist_free1 (head); g_list_free1 (head);
} }
G_OBJECT_CLASS(eek_container_parent_class)->dispose (object); G_OBJECT_CLASS(eek_container_parent_class)->dispose (object);
} }