From 911fac4c2f32847da4891d4e22cfd248c908d607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Sun, 9 Jan 2011 05:58:34 +0100 Subject: Replace GSList with GList in LdDiagram. This has been an unnecessary limitation. --- src/ld-canvas.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/ld-canvas.c') diff --git a/src/ld-canvas.c b/src/ld-canvas.c index 394746d..bacef26 100644 --- a/src/ld-canvas.c +++ b/src/ld-canvas.c @@ -829,11 +829,11 @@ move_object_to_coords (LdCanvas *self, LdDiagramObject *object, static LdDiagramObject * get_object_at_coords (LdCanvas *self, gdouble x, gdouble y) { - GSList *objects, *iter; + GList *objects, *iter; /* Iterate from the top object downwards. */ - objects = (GSList *) ld_diagram_get_objects (self->priv->diagram); - for (iter = objects; iter; iter = g_slist_next (iter)) + objects = (GList *) ld_diagram_get_objects (self->priv->diagram); + for (iter = objects; iter; iter = g_list_next (iter)) { LdDiagramObject *object; @@ -847,7 +847,7 @@ get_object_at_coords (LdCanvas *self, gdouble x, gdouble y) static gboolean is_object_selected (LdCanvas *self, LdDiagramObject *object) { - return g_slist_find (ld_diagram_get_selection (self->priv->diagram), + return g_list_find (ld_diagram_get_selection (self->priv->diagram), object) != NULL; } @@ -934,13 +934,13 @@ object_hit_test (LdCanvas *self, LdDiagramObject *object, gdouble x, gdouble y) static void check_terminals (LdCanvas *self, gdouble x, gdouble y) { - GSList *objects, *iter; + GList *objects, *iter; LdDiagramSymbol *closest_symbol = NULL; gdouble closest_distance = TERMINAL_HOVER_TOLERANCE; LdPoint closest_terminal; - objects = (GSList *) ld_diagram_get_objects (self->priv->diagram); - for (iter = objects; iter; iter = g_slist_next (iter)) + objects = (GList *) ld_diagram_get_objects (self->priv->diagram); + for (iter = objects; iter; iter = g_list_next (iter)) { LdDiagramObject *diagram_object; gdouble object_x, object_y; @@ -1246,7 +1246,7 @@ draw_terminal (GtkWidget *widget, DrawData *data) static void draw_diagram (GtkWidget *widget, DrawData *data) { - GSList *objects; + GList *objects; if (!data->self->priv->diagram) return; @@ -1257,7 +1257,7 @@ draw_diagram (GtkWidget *widget, DrawData *data) /* Draw objects from the diagram. */ objects = ld_diagram_get_objects (data->self->priv->diagram); - g_slist_foreach (objects, (GFunc) draw_object, data); + g_list_foreach (objects, (GFunc) draw_object, data); switch (data->self->priv->operation) { -- cgit v1.2.3