From 68d377afe6e053f146b04a756ff41f4790771890 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 21 Oct 2008 12:19:57 +0000 Subject: [PATCH] Rename EINA_INLIST_ITER_NEXT/EINA_INLIST_ITER_LAST to EINA_INLIST_FOREACH/ EINA_INLIST_REVERSE_FOREACH so it best match is behaviour. Asked by Gustavo. SVN revision: 36928 --- legacy/eina/src/include/eina_inlist.h | 4 +- legacy/eina/src/lib/eina_benchmark.c | 2 +- legacy/eina/src/lib/eina_counter.c | 2 +- legacy/eina/src/lib/eina_magic.c | 4 +- .../mp/chained_pool/eina_chained_mempool.c | 4 +- legacy/eina/src/tests/eina_bench_array.c | 2 +- legacy/eina/src/tests/eina_test_inlist.c | 2 +- legacy/evas/src/lib/canvas/evas_callbacks.c | 6 +-- legacy/evas/src/lib/canvas/evas_events.c | 8 ++-- legacy/evas/src/lib/canvas/evas_layer.c | 6 +-- legacy/evas/src/lib/canvas/evas_main.c | 4 +- .../evas/src/lib/canvas/evas_object_image.c | 8 ++-- legacy/evas/src/lib/canvas/evas_object_main.c | 16 +++---- legacy/evas/src/lib/canvas/evas_object_text.c | 6 +-- .../src/lib/canvas/evas_object_textblock.c | 46 +++++++++---------- legacy/evas/src/lib/canvas/evas_render.c | 8 ++-- .../src/lib/engines/common/evas_font_load.c | 6 +-- .../evas/src/lib/engines/common/evas_pipe.c | 2 +- .../lib/engines/common/evas_polygon_main.c | 8 ++-- .../src/lib/engines/common/evas_regionbuf.c | 4 +- .../engines/common_16/evas_soft16_polygon.c | 6 +-- .../src/modules/engines/directfb/polygon.c | 6 +-- .../engines/software_16_ddraw/evas_engine.c | 2 +- .../engines/software_16_sdl/evas_engine.c | 2 +- .../engines/software_16_wince/evas_engine.c | 2 +- .../engines/software_16_x11/evas_engine.c | 2 +- .../engines/xrender_x11/evas_engine_image.c | 2 +- .../engines/xrender_x11/evas_engine_xrender.c | 4 +- .../engines/xrender_xcb/evas_engine_image.c | 2 +- .../engines/xrender_xcb/evas_engine_xrender.c | 4 +- 30 files changed, 90 insertions(+), 90 deletions(-) diff --git a/legacy/eina/src/include/eina_inlist.h b/legacy/eina/src/include/eina_inlist.h index dd05250fed..8d79679e46 100644 --- a/legacy/eina/src/include/eina_inlist.h +++ b/legacy/eina/src/include/eina_inlist.h @@ -51,8 +51,8 @@ EAPI Eina_Inlist * eina_inlist_demote(Eina_Inlist *list, Eina_Inlist *item); EAPI Eina_Iterator *eina_inlist_iterator_new(const Eina_Inlist *in_list); EAPI Eina_Accessor *eina_inlist_accessor_new(const Eina_Inlist *in_list); -#define EINA_INLIST_ITER_NEXT(list, l) for (l = (void*)list; l; l = (void*)(l->__in_list.next)) -#define EINA_INLIST_ITER_LAST(list, l) for (l = (void*)(list->last); l; l = (void*)(l->__in_list.prev)) +#define EINA_INLIST_FOREACH(list, l) for (l = (void*)list; l; l = (void*)(l->__in_list.next)) +#define EINA_INLIST_REVERSE_FOREACH(list, l) for (l = (void*)(list->last); l; l = (void*)(l->__in_list.prev)) /** @} */ diff --git a/legacy/eina/src/lib/eina_benchmark.c b/legacy/eina/src/lib/eina_benchmark.c index e2972ef9ae..f2530e4c5a 100644 --- a/legacy/eina/src/lib/eina_benchmark.c +++ b/legacy/eina/src/lib/eina_benchmark.c @@ -332,7 +332,7 @@ eina_benchmark_run(Eina_Benchmark *bench) "set ylabel \"time\"\n" "plot ", bench->name, bench->run, bench->name, bench->run); - EINA_INLIST_ITER_NEXT(bench->runs, run) + EINA_INLIST_FOREACH(bench->runs, run) { Eina_Counter *counter; int i; diff --git a/legacy/eina/src/lib/eina_counter.c b/legacy/eina/src/lib/eina_counter.c index e700cda245..29a546bb5d 100644 --- a/legacy/eina/src/lib/eina_counter.c +++ b/legacy/eina/src/lib/eina_counter.c @@ -396,7 +396,7 @@ eina_counter_dump(Eina_Counter *counter, FILE *out) fprintf(out, "# specimen\texperiment time\tstarting time\tending time\n"); - EINA_INLIST_ITER_LAST(counter->clocks, clk) + EINA_INLIST_REVERSE_FOREACH(counter->clocks, clk) { long int start; long int end; diff --git a/legacy/eina/src/lib/eina_magic.c b/legacy/eina/src/lib/eina_magic.c index 0e9726edc0..c1bb09585b 100644 --- a/legacy/eina/src/lib/eina_magic.c +++ b/legacy/eina/src/lib/eina_magic.c @@ -95,7 +95,7 @@ eina_magic_string_get(Eina_Magic magic) { Eina_Magic_String *ems; - EINA_INLIST_ITER_NEXT(strings, ems) + EINA_INLIST_FOREACH(strings, ems) if (ems->magic == magic) return ems->string; @@ -107,7 +107,7 @@ eina_magic_string_set(Eina_Magic magic, const char *magic_name) { Eina_Magic_String *ems; - EINA_INLIST_ITER_NEXT(strings, ems) + EINA_INLIST_FOREACH(strings, ems) if (ems->magic == magic) { free(ems->string); diff --git a/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c b/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c index e2f7c56f72..2377d206c4 100644 --- a/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c +++ b/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c @@ -86,7 +86,7 @@ eina_chained_mempool_malloc(void *data, __UNUSED__ unsigned int size) void *mem; // look 4 pool from 2nd bucket on - EINA_INLIST_ITER_NEXT(pool->first, p) + EINA_INLIST_FOREACH(pool->first, p) { // base is not NULL - has a free slot if (p->base) @@ -126,7 +126,7 @@ eina_chained_mempool_free(void *data, void *ptr) psize = item_alloc * pool->pool_size; // look 4 pool - EINA_INLIST_ITER_NEXT(pool->first, p) + EINA_INLIST_FOREACH(pool->first, p) { // pool mem base pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool)); diff --git a/legacy/eina/src/tests/eina_bench_array.c b/legacy/eina/src/tests/eina_bench_array.c index 139d35e0bf..40c8ef7994 100644 --- a/legacy/eina/src/tests/eina_bench_array.c +++ b/legacy/eina/src/tests/eina_bench_array.c @@ -361,7 +361,7 @@ eina_bench_inlist_4evas_render(int request) } } - EINA_INLIST_ITER_NEXT(head, ebo) + EINA_INLIST_FOREACH(head, ebo) ebo->keep = rand() < (RAND_MAX / 2) ? ebo->keep : EINA_FALSE; } diff --git a/legacy/eina/src/tests/eina_test_inlist.c b/legacy/eina/src/tests/eina_test_inlist.c index 9bfa85e2e6..a42625fcd8 100644 --- a/legacy/eina/src/tests/eina_test_inlist.c +++ b/legacy/eina/src/tests/eina_test_inlist.c @@ -82,7 +82,7 @@ START_TEST(eina_inlist_simple) tmp = _eina_test_inlist_build(81); lst = eina_inlist_append_relative(lst, EINA_INLIST_GET(tmp), NULL); - EINA_INLIST_ITER_NEXT(lst, tmp) + EINA_INLIST_FOREACH(lst, tmp) { switch (i) { diff --git a/legacy/evas/src/lib/canvas/evas_callbacks.c b/legacy/evas/src/lib/canvas/evas_callbacks.c index 9dfedf6d02..2967c2b4ba 100644 --- a/legacy/evas/src/lib/canvas/evas_callbacks.c +++ b/legacy/evas/src/lib/canvas/evas_callbacks.c @@ -44,7 +44,7 @@ evas_object_event_callback_all_del(Evas_Object *obj) Evas_Func_Node *fn; if (!obj->callbacks) return; - EINA_INLIST_ITER_NEXT(obj->callbacks->callbacks, fn) + EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn) fn->delete_me = 1; } @@ -385,7 +385,7 @@ evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, void ( if (!obj->callbacks) return NULL; - EINA_INLIST_ITER_NEXT(obj->callbacks->callbacks, fn) + EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn) { if ((fn->func == func) && (fn->type == type) && (!fn->delete_me)) { @@ -442,7 +442,7 @@ evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, v if (!obj->callbacks) return NULL; - EINA_INLIST_ITER_NEXT(obj->callbacks->callbacks, fn) + EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn) { if ((fn->func == func) && (fn->type == type) && (fn->data == data) && (!fn->delete_me)) { diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c index 2f1010818c..61bc3bb6c9 100644 --- a/legacy/evas/src/lib/canvas/evas_events.c +++ b/legacy/evas/src/lib/canvas/evas_events.c @@ -7,7 +7,7 @@ _evas_event_object_list_in_get(Evas *e, Evas_List *in, const Eina_Inlist *list, Evas_Object *obj; if (!list) return in; - EINA_INLIST_ITER_LAST(list, obj) + EINA_INLIST_REVERSE_FOREACH(list, obj) { if (obj == stop) { @@ -62,7 +62,7 @@ evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y) Evas_List *in = NULL; if (!e->layers) return NULL; - EINA_INLIST_ITER_LAST((EINA_INLIST_GET(e->layers)), lay) + EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { int norep; @@ -145,11 +145,11 @@ evas_event_thaw(Evas *e) { Evas_Layer *lay; - EINA_INLIST_ITER_NEXT((EINA_INLIST_GET(e->layers)), lay) + EINA_INLIST_FOREACH((EINA_INLIST_GET(e->layers)), lay) { Evas_Object *obj; - EINA_INLIST_ITER_NEXT(lay->objects, obj) + EINA_INLIST_FOREACH(lay->objects, obj) { evas_object_clip_recalc(obj); evas_object_recalc_clippees(obj); diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/legacy/evas/src/lib/canvas/evas_layer.c index ad1e6d1d12..993abdadfa 100644 --- a/legacy/evas/src/lib/canvas/evas_layer.c +++ b/legacy/evas/src/lib/canvas/evas_layer.c @@ -54,7 +54,7 @@ evas_layer_pre_free(Evas_Layer *lay) { Evas_Object *obj; - EINA_INLIST_ITER_NEXT(lay->objects, obj) + EINA_INLIST_FOREACH(lay->objects, obj) { if ((!obj->smart.parent) && (!obj->delete_me)) evas_object_del(obj); @@ -79,7 +79,7 @@ evas_layer_find(Evas *e, short layer_num) { Evas_Layer *layer; - EINA_INLIST_ITER_NEXT(e->layers, layer) + EINA_INLIST_FOREACH(e->layers, layer) { if (layer->layer == layer_num) return layer; } @@ -91,7 +91,7 @@ evas_layer_add(Evas_Layer *lay) { Evas_Layer *layer; - EINA_INLIST_ITER_NEXT(lay->evas->layers, layer) + EINA_INLIST_FOREACH(lay->evas->layers, layer) { if (layer->layer > lay->layer) { diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c index eeb576a920..0651d92ed4 100644 --- a/legacy/evas/src/lib/canvas/evas_main.c +++ b/legacy/evas/src/lib/canvas/evas_main.c @@ -110,13 +110,13 @@ evas_free(Evas *e) while (del) { del = 0; - EINA_INLIST_ITER_NEXT(e->layers, lay) + EINA_INLIST_FOREACH(e->layers, lay) { Evas_Object *o; evas_layer_pre_free(lay); - EINA_INLIST_ITER_NEXT(lay->objects, o) + EINA_INLIST_FOREACH(lay->objects, o) { if ((o->callbacks) && (o->callbacks->walking_list)) { diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index fa72e9f9bc..86c1e6c556 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -1793,11 +1793,11 @@ evas_image_cache_reload(Evas *e) MAGIC_CHECK_END(); evas_image_cache_flush(e); - EINA_INLIST_ITER_NEXT(e->layers, layer) + EINA_INLIST_FOREACH(e->layers, layer) { Evas_Object *obj; - EINA_INLIST_ITER_NEXT(layer->objects, obj) + EINA_INLIST_FOREACH(layer->objects, obj) { Evas_Object_Image *o; @@ -1809,11 +1809,11 @@ evas_image_cache_reload(Evas *e) } } evas_image_cache_flush(e); - EINA_INLIST_ITER_NEXT(e->layers, layer) + EINA_INLIST_FOREACH(e->layers, layer) { Evas_Object *obj; - EINA_INLIST_ITER_NEXT(layer->objects, obj) + EINA_INLIST_FOREACH(layer->objects, obj) { Evas_Object_Image *o; diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c index 5b8bdfe55a..16f06f4ddb 100644 --- a/legacy/evas/src/lib/canvas/evas_object_main.c +++ b/legacy/evas/src/lib/canvas/evas_object_main.c @@ -1413,11 +1413,11 @@ evas_object_top_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool i yy = y; //// xx = evas_coord_world_x_to_screen(e, x); //// yy = evas_coord_world_y_to_screen(e, y); - EINA_INLIST_ITER_LAST((EINA_INLIST_GET(e->layers)), lay) + EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { Evas_Object *obj; - EINA_INLIST_ITER_LAST(get_layer_objects_last(lay), obj) + EINA_INLIST_REVERSE_FOREACH(get_layer_objects_last(lay), obj) { if (obj->delete_me) continue; if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; @@ -1469,11 +1469,11 @@ evas_object_top_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas //// hh = evas_coord_world_y_to_screen(e, h); if (ww < 1) ww = 1; if (hh < 1) hh = 1; - EINA_INLIST_ITER_LAST((EINA_INLIST_GET(e->layers)), lay) + EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { Evas_Object *obj; - EINA_INLIST_ITER_LAST(get_layer_objects_last(lay), obj) + EINA_INLIST_REVERSE_FOREACH(get_layer_objects_last(lay), obj) { if (obj->delete_me) continue; if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; @@ -1507,11 +1507,11 @@ evas_objects_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool incl yy = y; //// xx = evas_coord_world_x_to_screen(e, x); //// yy = evas_coord_world_y_to_screen(e, y); - EINA_INLIST_ITER_LAST((EINA_INLIST_GET(e->layers)), lay) + EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { Evas_Object *obj; - EINA_INLIST_ITER_LAST(get_layer_objects_last(lay), obj) + EINA_INLIST_REVERSE_FOREACH(get_layer_objects_last(lay), obj) { if (obj->delete_me) continue; if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; @@ -1551,11 +1551,11 @@ evas_objects_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Co //// hh = evas_coord_world_y_to_screen(e, h); if (ww < 1) ww = 1; if (hh < 1) hh = 1; - EINA_INLIST_ITER_LAST((EINA_INLIST_GET(e->layers)), lay) + EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { Evas_Object *obj; - EINA_INLIST_ITER_LAST(get_layer_objects_last(lay), obj) + EINA_INLIST_REVERSE_FOREACH(get_layer_objects_last(lay), obj) { if (obj->delete_me) continue; if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c index 19c6d0d276..8b00989afe 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/legacy/evas/src/lib/canvas/evas_object_text.c @@ -1018,7 +1018,7 @@ evas_font_object_rehint(Evas_Object *obj) { if (obj->smart.smart) { - EINA_INLIST_ITER_NEXT(evas_object_smart_members_get_direct(obj), obj) + EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj) evas_font_object_rehint(obj); } else @@ -1040,11 +1040,11 @@ evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting) MAGIC_CHECK_END(); if (e->hinting == hinting) return; e->hinting = hinting; - EINA_INLIST_ITER_NEXT(e->layers, lay) + EINA_INLIST_FOREACH(e->layers, lay) { Evas_Object *obj; - EINA_INLIST_ITER_NEXT(lay->objects, obj) + EINA_INLIST_FOREACH(lay->objects, obj) evas_font_object_rehint(obj); } } diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index ca643d0b51..4841299f58 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -224,7 +224,7 @@ _style_match_replace(Evas_Textblock_Style *ts, char *s) { Evas_Object_Style_Tag *tag; - EINA_INLIST_ITER_NEXT(ts->tags, tag) + EINA_INLIST_FOREACH(ts->tags, tag) { if (!strcmp(tag->replace, s)) return tag->tag; } @@ -236,7 +236,7 @@ _style_match_tag(Evas_Textblock_Style *ts, char *s) { Evas_Object_Style_Tag *tag; - EINA_INLIST_ITER_NEXT(ts->tags, tag) + EINA_INLIST_FOREACH(ts->tags, tag) { if (!strcmp(tag->tag, s)) return tag->replace; } @@ -1491,7 +1491,7 @@ _layout_line_advance(Ctxt *c, Evas_Object_Textblock_Format *fmt) c->maxascent = c->maxdescent = 0; if (!c->ln->items) _layout_format_ascent_descent_adjust(c, fmt); - EINA_INLIST_ITER_NEXT(c->ln->items, it) + EINA_INLIST_FOREACH(c->ln->items, it) { int endx; @@ -1733,7 +1733,7 @@ _layout_walk_back_to_item_word_redo(Ctxt *c, Evas_Object_Textblock_Item *it) int index, tw, th, inset, adv; /* it is not appended yet */ - EINA_INLIST_ITER_LAST((EINA_INLIST_GET(c->ln->items)), pit) + EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(c->ln->items)), pit) { if (_layout_ends_with_space(pit->text)) { @@ -2079,7 +2079,7 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ return; } /* run through all text and format nodes generating lines */ - EINA_INLIST_ITER_NEXT(c->o->nodes, n) + EINA_INLIST_FOREACH(c->o->nodes, n) { if (!c->ln) _layout_line_new(c, fmt); if ((n->type == NODE_FORMAT) && (n->text)) @@ -2174,7 +2174,7 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ c->format_stack = evas_list_remove_list(c->format_stack, c->format_stack); _format_free(c->obj, fmt); } - EINA_INLIST_ITER_NEXT(c->lines, ln) + EINA_INLIST_FOREACH(c->lines, ln) { if (ln->line_no == -1) { @@ -2251,14 +2251,14 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node *n, in Evas_Object_Textblock *o; o = (Evas_Object_Textblock *)(obj->object_data); -/* EINA_INLIST_ITER_NEXT(o->nodes, nn) */ +/* EINA_INLIST_FOREACH(o->nodes, nn) */ /* ; */ - EINA_INLIST_ITER_NEXT(o->lines, ln) + EINA_INLIST_FOREACH(o->lines, ln) { Evas_Object_Textblock_Format_Item *fit; Evas_Object_Textblock_Item *it; - EINA_INLIST_ITER_NEXT(ln->items, it) + EINA_INLIST_FOREACH(ln->items, it) { if (it->source_node == n) { @@ -2270,7 +2270,7 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node *n, in } } } - EINA_INLIST_ITER_NEXT(ln->format_items, fit) + EINA_INLIST_FOREACH(ln->format_items, fit) { if (fit->source_node == n) { @@ -2290,11 +2290,11 @@ _find_layout_format_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node Evas_Object_Textblock *o; o = (Evas_Object_Textblock *)(obj->object_data); - EINA_INLIST_ITER_NEXT(o->lines, ln) + EINA_INLIST_FOREACH(o->lines, ln) { Evas_Object_Textblock_Format_Item *fi; - EINA_INLIST_ITER_NEXT(ln->format_items, fi) + EINA_INLIST_FOREACH(ln->format_items, fi) { if (fi->source_node == n) { @@ -2313,7 +2313,7 @@ _find_layout_line_num(const Evas_Object *obj, int line) Evas_Object_Textblock *o; o = (Evas_Object_Textblock *)(obj->object_data); - EINA_INLIST_ITER_NEXT(o->lines, ln) + EINA_INLIST_FOREACH(o->lines, ln) { if (ln->line_no == line) return ln; } @@ -2961,7 +2961,7 @@ evas_object_textblock_text_markup_get(const Evas_Object *obj) TB_HEAD_RETURN(NULL); if (o->markup_text) return(o->markup_text); - EINA_INLIST_ITER_NEXT(o->nodes, n) + EINA_INLIST_FOREACH(o->nodes, n) { if ((n->type == NODE_FORMAT) && (n->text)) { @@ -4309,7 +4309,7 @@ evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Ev n2 = cur2->node; index = cur2->pos; chr = evas_common_font_utf8_get_next((unsigned char *)n2->text, &index); - EINA_INLIST_ITER_NEXT(n1, n) + EINA_INLIST_FOREACH(n1, n) { if (n->type == NODE_TEXT) { @@ -4569,12 +4569,12 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E if (!o->formatted.valid) _relayout(cur->obj); x += o->style_pad.l; y += o->style_pad.t; - EINA_INLIST_ITER_NEXT(o->lines, ln) + EINA_INLIST_FOREACH(o->lines, ln) { if (ln->y > y) break; if ((ln->y <= y) && ((ln->y + ln->h) > y)) { - EINA_INLIST_ITER_NEXT(ln->items, it) + EINA_INLIST_FOREACH(ln->items, it) { if ((it->x + ln->x) > x) { @@ -4600,7 +4600,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E return 1; } } - EINA_INLIST_ITER_NEXT(ln->format_items, fi) + EINA_INLIST_FOREACH(ln->format_items, fi) { if ((fi->x + ln->x) > x) break; if (((fi->x + ln->x) <= x) && (((fi->x + ln->x) + fi->w) > x)) @@ -4638,7 +4638,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y) o = (Evas_Object_Textblock *)(cur->obj->object_data); if (!o->formatted.valid) _relayout(cur->obj); y += o->style_pad.t; - EINA_INLIST_ITER_NEXT(o->lines, ln) + EINA_INLIST_FOREACH(o->lines, ln) { if (ln->y > y) break; if ((ln->y <= y) && ((ln->y + ln->h) > y)) @@ -4963,7 +4963,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void obj->layer->evas->engine.func->context_multiplier_unset(output, context); #define ITEM_WALK() \ - EINA_INLIST_ITER_NEXT(o->lines, ln) \ + EINA_INLIST_FOREACH(o->lines, ln) \ { \ Evas_Object_Textblock_Item *it; \ \ @@ -4971,7 +4971,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void pline = 0; \ pline2 = 0; \ pstrike = 0; \ - EINA_INLIST_ITER_NEXT(ln->items, it) \ + EINA_INLIST_FOREACH(ln->items, it) \ { \ int yoff; \ \ @@ -5549,11 +5549,11 @@ _evas_object_textblock_rehint(Evas_Object *obj) Evas_Object_Textblock_Line *ln; o = (Evas_Object_Textblock *)(obj->object_data); - EINA_INLIST_ITER_NEXT(o->lines, ln) + EINA_INLIST_FOREACH(o->lines, ln) { Evas_Object_Textblock_Item *it; - EINA_INLIST_ITER_NEXT(ln->items, it) + EINA_INLIST_FOREACH(ln->items, it) { if (it->format->font.font) evas_font_load_hinting_set(obj->layer->evas, diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c index 774bf01836..888515784f 100644 --- a/legacy/evas/src/lib/canvas/evas_render.c +++ b/legacy/evas/src/lib/canvas/evas_render.c @@ -136,7 +136,7 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Eina_Array *active eina_array_push(render_objects, obj); obj->render_pre = 1; - EINA_INLIST_ITER_NEXT(evas_object_smart_members_get_direct(obj), obj2) + EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2) { _evas_render_phase1_object_process(e, obj2, active_objects, @@ -173,7 +173,7 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Eina_Array *active eina_array_push(render_objects, obj); obj->render_pre = 1; - EINA_INLIST_ITER_NEXT(evas_object_smart_members_get_direct(obj), obj2) + EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2) { _evas_render_phase1_object_process(e, obj2, active_objects, @@ -204,11 +204,11 @@ _evas_render_phase1_process(Evas *e, Eina_Array *active_objects, Eina_Array *res Evas_Layer *lay; int clean_them = 0; - EINA_INLIST_ITER_NEXT(e->layers, lay) + EINA_INLIST_FOREACH(e->layers, lay) { Evas_Object *obj; - EINA_INLIST_ITER_NEXT(lay->objects, obj) + EINA_INLIST_FOREACH(lay->objects, obj) { clean_them |= _evas_render_phase1_object_process(e, obj, active_objects, restack_objects, diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c index 12b7895fbb..b7634260a4 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_load.c +++ b/legacy/evas/src/lib/engines/common/evas_font_load.c @@ -94,7 +94,7 @@ evas_common_font_source_find(const char *name) RGBA_Font_Source *fs; if (!name) return NULL; - EINA_INLIST_ITER_NEXT(fonts_src, fs) + EINA_INLIST_FOREACH(fonts_src, fs) { if ((fs->name) && (!strcmp(name, fs->name))) { @@ -549,7 +549,7 @@ evas_common_font_flush_last(void) RGBA_Font_Int *fi_tmp; RGBA_Font_Int *fi = NULL; - EINA_INLIST_ITER_NEXT(fonts, fi_tmp) + EINA_INLIST_FOREACH(fonts, fi_tmp) { if (fi_tmp->references == 0) fi = fi_tmp; } @@ -573,7 +573,7 @@ evas_common_font_int_find(const char *name, int size) { RGBA_Font_Int *fi; - EINA_INLIST_ITER_NEXT(fonts, fi) + EINA_INLIST_FOREACH(fonts, fi) { if ((fi->size == size) && (!strcmp(name, fi->src->name))) { diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/legacy/evas/src/lib/engines/common/evas_pipe.c index 2ea14e911a..d3d5d7ead4 100644 --- a/legacy/evas/src/lib/engines/common/evas_pipe.c +++ b/legacy/evas/src/lib/engines/common/evas_pipe.c @@ -87,7 +87,7 @@ evas_common_pipe_thread(void *data) // { // thinfo->info = NULL; // printf(" TH %i GO\n", thinfo->thread_num); - EINA_INLIST_ITER_NEXT(EINA_INLIST_GET(info->im->pipe), p) + EINA_INLIST_FOREACH(EINA_INLIST_GET(info->im->pipe), p) { int i; diff --git a/legacy/evas/src/lib/engines/common/evas_polygon_main.c b/legacy/evas/src/lib/engines/common/evas_polygon_main.c index ba023ec794..f92b1bca5b 100644 --- a/legacy/evas/src/lib/engines/common/evas_polygon_main.c +++ b/legacy/evas/src/lib/engines/common/evas_polygon_main.c @@ -166,7 +166,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po evas_common_cpu_end_opt(); - n = 0; EINA_INLIST_ITER_NEXT(points, pt) n++; + n = 0; EINA_INLIST_FOREACH(points, pt) n++; if (n < 3) return; edges = malloc(sizeof(RGBA_Edge) * n); if (!edges) return; @@ -185,7 +185,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po } k = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { point[k].x = pt->x; point[k].y = pt->y; @@ -195,7 +195,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po qsort(point, n, sizeof(RGBA_Vertex), polygon_point_sorter); for (k = 0; k < n; k++) sorted_index[k] = point[k].i; k = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { point[k].x = pt->x; point[k].y = pt->y; @@ -275,7 +275,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po { RGBA_Span *span; - EINA_INLIST_ITER_NEXT(spans, span) + EINA_INLIST_FOREACH(spans, span) { DATA32 *ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_regionbuf.c b/legacy/evas/src/lib/engines/common/evas_regionbuf.c index 70e0c13ab0..711882eb23 100644 --- a/legacy/evas/src/lib/engines/common/evas_regionbuf.c +++ b/legacy/evas/src/lib/engines/common/evas_regionbuf.c @@ -54,7 +54,7 @@ evas_common_regionbuf_span_add(Regionbuf *rb, int x1, int x2, int y) if (x2 < (rb->w - 1)) x2 = rb->w - 1; sp_start = NULL; sp_stop = NULL; - EINA_INLIST_ITER_NEXT(rb->spans[y], span) + EINA_INLIST_FOREACH(rb->spans[y], span) { nspan = (Regionspan *)(EINA_INLIST_GET(span))->next; /* we dont know what t do with the span yet */ @@ -168,7 +168,7 @@ evas_common_regionbuf_span_del(Regionbuf *rb, int x1, int x2, int y) if (x2 < (rb->w - 1)) x2 = rb->w - 1; sp_start = NULL; sp_stop = NULL; - EINA_INLIST_ITER_NEXT(rb->spans[y], span) + EINA_INLIST_FOREACH(rb->spans[y], span) { nspan = (Regionspan *)(EINA_INLIST_GET(l))->next; /* we dont know what t do with the span yet */ diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_polygon.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_polygon.c index 3129f1918b..9400aa0308 100644 --- a/legacy/evas/src/lib/engines/common_16/evas_soft16_polygon.c +++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_polygon.c @@ -113,7 +113,7 @@ soft16_polygon_draw(Soft16_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point return; n = 0; - EINA_INLIST_ITER_NEXT(points, pt) n++; + EINA_INLIST_FOREACH(points, pt) n++; if (n < 3) return; @@ -138,7 +138,7 @@ soft16_polygon_draw(Soft16_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point } k = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { point[k].x = pt->x; point[k].y = pt->y; @@ -151,7 +151,7 @@ soft16_polygon_draw(Soft16_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point sorted_index[k] = point[k].i; k = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { point[k].x = pt->x; point[k].y = pt->y; diff --git a/legacy/evas/src/modules/engines/directfb/polygon.c b/legacy/evas/src/modules/engines/directfb/polygon.c index f108a2d97f..8e2d288e83 100644 --- a/legacy/evas/src/modules/engines/directfb/polygon.c +++ b/legacy/evas/src/modules/engines/directfb/polygon.c @@ -159,7 +159,7 @@ _dfb_polygon_draw(IDirectFBSurface *surface, RGBA_Draw_Context *dc, Eina_Inlist if (!_dfb_surface_set_color_from_context(surface, dc)) return; - n = 0; EINA_INLIST_ITER_NEXT(points, pt) n++; + n = 0; EINA_INLIST_FOREACH(points, pt) n++; if (n < 3) return; edges = malloc(sizeof(RGBA_Edge) * n); if (!edges) return; @@ -178,7 +178,7 @@ _dfb_polygon_draw(IDirectFBSurface *surface, RGBA_Draw_Context *dc, Eina_Inlist } k = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { point[k].x = pt->x; point[k].y = pt->y; @@ -188,7 +188,7 @@ _dfb_polygon_draw(IDirectFBSurface *surface, RGBA_Draw_Context *dc, Eina_Inlist qsort(point, n, sizeof(RGBA_Vertex), polygon_point_sorter); for (k = 0; k < n; k++) sorted_index[k] = point[k].i; k = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { point[k].x = pt->x; point[k].y = pt->y; diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c b/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c index 78419dd7d3..d87e3c85c7 100644 --- a/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c @@ -80,7 +80,7 @@ _tmp_out_alloc(Render_Engine *re) Tilebuf_Rect *r; int w = 0, h = 0; - EINA_INLIST_ITER_NEXT(re->rects, r) + EINA_INLIST_FOREACH(re->rects, r) { if (r->w > w) w = r->w; if (r->h > h) h = r->h; diff --git a/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c b/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c index 8ef93775ad..a215a093d8 100644 --- a/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c @@ -88,7 +88,7 @@ _tmp_out_alloc(Render_Engine *re) Tilebuf_Rect *r; int w = 0, h = 0; - EINA_INLIST_ITER_NEXT(re->rects, r) + EINA_INLIST_FOREACH(re->rects, r) { if (r->w > w) w = r->w; if (r->h > h) h = r->h; diff --git a/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c b/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c index f3e4b4f10f..0ca6b0b654 100644 --- a/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c @@ -113,7 +113,7 @@ _tmp_out_alloc(Render_Engine *re) Tilebuf_Rect *r; int w = 0, h = 0; - EINA_INLIST_ITER_NEXT(re->rects, r) + EINA_INLIST_FOREACH(re->rects, r) { if (r->w > w) w = r->w; if (r->h > h) h = r->h; diff --git a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c index 5788d33f85..7327bb7c85 100644 --- a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c @@ -70,7 +70,7 @@ _tmp_out_alloc(Render_Engine *re) Tilebuf_Rect *r; int w = 0, h = 0; - EINA_INLIST_ITER_NEXT(re->rects, r) + EINA_INLIST_FOREACH(re->rects, r) { if (r->w > w) w = r->w; if (r->h > h) h = r->h; diff --git a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_image.c b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_image.c index baf485e436..f21263caed 100644 --- a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_image.c +++ b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_image.c @@ -597,7 +597,7 @@ _xre_image_surface_gen(XR_Image *im) rects = evas_common_tilebuf_get_render_rects(im->updates); if (rects) { - EINA_INLIST_ITER_NEXT(rects, r) + EINA_INLIST_FOREACH(rects, r) { int rx, ry, rw, rh; diff --git a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c index 42de9511e4..ad8ddb6aa5 100644 --- a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c +++ b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c @@ -686,7 +686,7 @@ _xre_poly_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, RGBA_Polygon_Point *p int op; if ((!rs) || (!dc)) return; - num = 0; EINA_INLIST_ITER_NEXT(points, pt) num++; + num = 0; EINA_INLIST_FOREACH(points, pt) num++; if (num < 3) return; op = PictOpOver; if (dc->render_op == _EVAS_RENDER_BLEND) @@ -725,7 +725,7 @@ _xre_poly_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, RGBA_Polygon_Point *p pts = malloc(num * sizeof(XPointDouble)); if (!pts) return; i = 0; - EINA_INLIST_ITER_NEXT(points, pt) + EINA_INLIST_FOREACH(points, pt) { if (i < num) { diff --git a/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_image.c b/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_image.c index 2c46be439b..323f26c907 100644 --- a/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_image.c +++ b/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_image.c @@ -536,7 +536,7 @@ _xre_image_surface_gen(XR_Image *im) rects = evas_common_tilebuf_get_render_rects(im->updates); if (rects) { - EINA_INLIST_ITER_NEXT(rects, r) + EINA_INLIST_FOREACH(rects, r) { int rx, ry, rw, rh; diff --git a/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_xrender.c b/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_xrender.c index a91b4883ff..b13cc27e43 100644 --- a/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_xrender.c +++ b/legacy/evas/src/modules/engines/xrender_xcb/evas_engine_xrender.c @@ -820,7 +820,7 @@ _xre_poly_draw(Xcb_Render_Surface *rs, RGBA_Draw_Context *dc, RGBA_Polygon_Point /* int op; */ /* if ((!rs) || (!dc)) return; */ -/* num = 0; EINA_INLIST_ITER_NEXT(points, pt) num++; */ +/* num = 0; EINA_INLIST_FOREACH(points, pt) num++; */ /* if (num < 3) return; */ /* a = (dc->col.col >> 24) & 0xff; */ /* if (a == 0) return; */ @@ -840,7 +840,7 @@ _xre_poly_draw(Xcb_Render_Surface *rs, RGBA_Draw_Context *dc, RGBA_Polygon_Point /* pts = malloc(num * sizeof(XPointDouble)); */ /* if (!pts) return; */ /* i = 0; */ -/* EINA_INLIST_ITER_NEXT(points, pt) */ +/* EINA_INLIST_FOREACH(points, pt) */ /* { */ /* if (i < num) */ /* { */