diff --git a/legacy/edje/src/bin/edje_cc.c b/legacy/edje/src/bin/edje_cc.c index f086692222..fe8cc05bee 100644 --- a/legacy/edje/src/bin/edje_cc.c +++ b/legacy/edje/src/bin/edje_cc.c @@ -6,9 +6,9 @@ static void main_help(void); -Evas_List *img_dirs = NULL; -Evas_List *fnt_dirs = NULL; -Evas_List *defines = NULL; +Eina_List *img_dirs = NULL; +Eina_List *fnt_dirs = NULL; +Eina_List *defines = NULL; char *file_in = NULL; char *file_out = NULL; char *progname = NULL; @@ -79,12 +79,12 @@ main(int argc, char **argv) else if ((!strcmp(argv[i], "-id") || !strcmp(argv[i], "--image_dir")) && (i < (argc - 1))) { i++; - img_dirs = evas_list_append(img_dirs, argv[i]); + img_dirs = eina_list_append(img_dirs, argv[i]); } else if ((!strcmp(argv[i], "-fd") || !strcmp(argv[i], "--font_dir")) && (i < (argc - 1))) { i++; - fnt_dirs = evas_list_append(fnt_dirs, argv[i]); + fnt_dirs = eina_list_append(fnt_dirs, argv[i]); } else if ((!strcmp(argv[i], "-min-quality")) && (i < (argc - 1))) { @@ -102,7 +102,7 @@ main(int argc, char **argv) } else if (!strncmp(argv[i], "-D", 2)) { - defines = evas_list_append(defines, mem_strdup(argv[i])); + defines = eina_list_append(defines, mem_strdup(argv[i])); } else if ((!strcmp(argv[i], "-o")) && (i < (argc - 1))) { diff --git a/legacy/edje/src/bin/edje_cc.h b/legacy/edje/src/bin/edje_cc.h index 2c9af76dc1..d25410f261 100644 --- a/legacy/edje/src/bin/edje_cc.h +++ b/legacy/edje/src/bin/edje_cc.h @@ -36,7 +36,7 @@ struct _New_Statement_Handler struct _Font_List { - Evas_List *list; + Eina_List *list; }; struct _Font @@ -49,7 +49,7 @@ struct _Code { int l1, l2; char *shared; - Evas_List *programs; + Eina_List *programs; }; struct _Code_Program @@ -67,7 +67,7 @@ struct _SrcFile struct _SrcFile_List { - Evas_List *list; + Eina_List *list; }; /* global fn calls */ @@ -112,7 +112,7 @@ void source_edd(void); void source_fetch(void); int source_append(Eet_File *ef); SrcFile_List *source_load(Eet_File *ef); -int source_fontmap_save(Eet_File *ef, Evas_List *fonts); +int source_fontmap_save(Eet_File *ef, Eina_List *fonts); Font_List *source_fontmap_load(Eet_File *ef); void *mem_alloc(size_t size); @@ -120,8 +120,8 @@ char *mem_strdup(const char *s); #define SZ sizeof /* global vars */ -extern Evas_List *img_dirs; -extern Evas_List *fnt_dirs; +extern Eina_List *img_dirs; +extern Eina_List *fnt_dirs; extern char *file_in; extern char *file_out; extern char *progname; @@ -132,14 +132,14 @@ extern int no_raw; extern int min_quality; extern int max_quality; extern int line; -extern Evas_List *stack; -extern Evas_List *params; +extern Eina_List *stack; +extern Eina_List *params; extern Edje_File *edje_file; -extern Evas_List *edje_collections; -extern Evas_List *fonts; -extern Evas_List *codes; -extern Evas_List *defines; -extern Evas_List *aliases; +extern Eina_List *edje_collections; +extern Eina_List *fonts; +extern Eina_List *codes; +extern Eina_List *defines; +extern Eina_List *aliases; extern New_Object_Handler object_handlers[]; extern New_Statement_Handler statement_handlers[]; diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c index a8f7d052d3..4fccd9ab79 100644 --- a/legacy/edje/src/bin/edje_cc_handlers.c +++ b/legacy/edje/src/bin/edje_cc_handlers.c @@ -567,13 +567,11 @@ st_images_image(void) img = mem_alloc(SZ(Edje_Image_Directory_Entry)); img->entry = parse_str(0); { - Evas_List *l; + Eina_List *l; + Edje_Image_Directory_Entry *limg; - for (l = edje_file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(edje_file->image_dir->entries, l, limg) { - Edje_Image_Directory_Entry *limg; - - limg = l->data; if (!strcmp(limg->entry, img->entry)) { free(img->entry); @@ -582,8 +580,8 @@ st_images_image(void) } } } - edje_file->image_dir->entries = evas_list_append(edje_file->image_dir->entries, img); - img->id = evas_list_count(edje_file->image_dir->entries) - 1; + edje_file->image_dir->entries = eina_list_append(edje_file->image_dir->entries, img); + img->id = eina_list_count(edje_file->image_dir->entries) - 1; v = parse_enum(1, "RAW", 0, "COMP", 1, @@ -660,13 +658,11 @@ st_fonts_font(void) fn->file = parse_str(0); fn->name = parse_str(1); { - Evas_List *l; + Eina_List *l; + Font *lfn; - for (l = fonts; l; l = l->next) + EINA_LIST_FOREACH(fonts, l, lfn) { - Font *lfn; - - lfn = l->data; if (!strcmp(lfn->name, fn->name)) { free(fn->file); @@ -676,13 +672,13 @@ st_fonts_font(void) } } } - fonts = evas_list_append(fonts, fn); + fonts = eina_list_append(fonts, fn); if (edje_file->font_dir) { fnt = mem_alloc(SZ(Edje_Font_Directory_Entry)); fnt->entry = mem_strdup(fn->name); - edje_file->font_dir->entries = evas_list_append(edje_file->font_dir->entries, fnt); + edje_file->font_dir->entries = eina_list_append(edje_file->font_dir->entries, fnt); } } @@ -721,7 +717,7 @@ st_data_item(void) di = mem_alloc(SZ(Edje_Data)); di->key = parse_str(0); di->value = parse_str(1); - edje_file->data = evas_list_append(edje_file->data, di); + edje_file->data = eina_list_append(edje_file->data, di); } /** @@ -793,7 +789,7 @@ st_data_file(void) close(fd); di->value = value; - edje_file->data = evas_list_append(edje_file->data, di); + edje_file->data = eina_list_append(edje_file->data, di); free(filename); } @@ -825,7 +821,7 @@ ob_color_class(void) Edje_Color_Class *cc; cc = mem_alloc(SZ(Edje_Color_Class)); - edje_file->color_classes = evas_list_append(edje_file->color_classes, cc); + edje_file->color_classes = eina_list_append(edje_file->color_classes, cc); cc->r = 0; cc->g = 0; @@ -857,13 +853,12 @@ static void st_color_class_name(void) { Edje_Color_Class *cc, *tcc; - Evas_List *l; + Eina_List *l; - cc = evas_list_data(evas_list_last(edje_file->color_classes)); + cc = eina_list_data_get(eina_list_last(edje_file->color_classes)); cc->name = parse_str(0); - for (l = edje_file->color_classes; l; l = l->next) + EINA_LIST_FOREACH(edje_file->color_classes, l, tcc) { - tcc = l->data; if ((cc != tcc) && (!strcmp(cc->name, tcc->name))) { fprintf(stderr, "%s: Error. parse error %s:%i. There is already a color class named \"%s\"\n", @@ -890,7 +885,7 @@ st_color_class_color(void) check_arg_count(4); - cc = evas_list_data(evas_list_last(edje_file->color_classes)); + cc = eina_list_data_get(eina_list_last(edje_file->color_classes)); cc->r = parse_int_range(0, 0, 255); cc->g = parse_int_range(1, 0, 255); cc->b = parse_int_range(2, 0, 255); @@ -914,7 +909,7 @@ st_color_class_color2(void) check_arg_count(4); - cc = evas_list_data(evas_list_last(edje_file->color_classes)); + cc = eina_list_data_get(eina_list_last(edje_file->color_classes)); cc->r2 = parse_int_range(0, 0, 255); cc->g2 = parse_int_range(1, 0, 255); cc->b2 = parse_int_range(2, 0, 255); @@ -938,7 +933,7 @@ st_color_class_color3(void) check_arg_count(4); - cc = evas_list_data(evas_list_last(edje_file->color_classes)); + cc = eina_list_data_get(eina_list_last(edje_file->color_classes)); cc->r3 = parse_int_range(0, 0, 255); cc->g3 = parse_int_range(1, 0, 255); cc->b3 = parse_int_range(2, 0, 255); @@ -974,8 +969,8 @@ ob_spectrum(void) if (!edje_file->spectrum_dir) edje_file->spectrum_dir = mem_alloc(SZ(Edje_Spectrum_Directory)); se = mem_alloc(SZ(Edje_Spectrum_Directory_Entry)); - edje_file->spectrum_dir->entries = evas_list_append(edje_file->spectrum_dir->entries, se); - se->id = evas_list_count(edje_file->spectrum_dir->entries) - 1; + edje_file->spectrum_dir->entries = eina_list_append(edje_file->spectrum_dir->entries, se); + se->id = eina_list_count(edje_file->spectrum_dir->entries) - 1; se->entry = NULL; se->filename = NULL; se->color_list = NULL; @@ -996,7 +991,7 @@ st_spectrum_name(void) { Edje_Spectrum_Directory_Entry *se; - se = evas_list_data(evas_list_last(edje_file->spectrum_dir->entries)); + se = eina_list_data_get(eina_list_last(edje_file->spectrum_dir->entries)); se->entry = parse_str(0); } @@ -1018,10 +1013,10 @@ st_spectrum_color(void) Edje_Spectrum_Directory_Entry *se; Edje_Spectrum_Color *sc; - se = evas_list_data(evas_list_last(edje_file->spectrum_dir->entries)); + se = eina_list_data_get(eina_list_last(edje_file->spectrum_dir->entries)); sc = mem_alloc(SZ(Edje_Spectrum_Color)); - se->color_list = evas_list_append(se->color_list, sc); + se->color_list = eina_list_append(se->color_list, sc); sc->r = parse_int_range(0, 0, 255); sc->g = parse_int_range(1, 0, 255); sc->b = parse_int_range(2, 0, 255); @@ -1056,7 +1051,7 @@ ob_styles_style(void) Edje_Style *stl; stl = mem_alloc(SZ(Edje_Style)); - edje_file->styles = evas_list_append(edje_file->styles, stl); + edje_file->styles = eina_list_append(edje_file->styles, stl); } /** @@ -1073,13 +1068,12 @@ static void st_styles_style_name(void) { Edje_Style *stl, *tstl; - Evas_List *l; + Eina_List *l; - stl = evas_list_data(evas_list_last(edje_file->styles)); + stl = eina_list_data_get(eina_list_last(edje_file->styles)); stl->name = parse_str(0); - for (l = edje_file->styles; l; l = l->next) + EINA_LIST_FOREACH(edje_file->styles, l, tstl) { - tstl = l->data; if ((stl != tstl) && (!strcmp(stl->name, tstl->name))) { fprintf(stderr, "%s: Error. parse error %s:%i. There is already a style named \"%s\"\n", @@ -1106,7 +1100,7 @@ st_styles_style_base(void) Edje_Style *stl; Edje_Style_Tag *tag; - stl = evas_list_data(evas_list_last(edje_file->styles)); + stl = eina_list_data_get(eina_list_last(edje_file->styles)); if (stl->tags) { fprintf(stderr, "%s: Error. parse error %s:%i. There is already a basic format for the style\n", @@ -1116,7 +1110,7 @@ st_styles_style_base(void) tag = mem_alloc(SZ(Edje_Style_Tag)); tag->key = mem_strdup("DEFAULT"); tag->value = parse_str(0); - stl->tags = evas_list_append(stl->tags, tag); + stl->tags = eina_list_append(stl->tags, tag); } /** @@ -1135,11 +1129,11 @@ st_styles_style_tag(void) Edje_Style *stl; Edje_Style_Tag *tag; - stl = evas_list_data(evas_list_last(edje_file->styles)); + stl = eina_list_data_get(eina_list_last(edje_file->styles)); tag = mem_alloc(SZ(Edje_Style_Tag)); tag->key = parse_str(0); tag->value = parse_str(1); - stl->tags = evas_list_append(stl->tags, tag); + stl->tags = eina_list_append(stl->tags, tag); } /** @@ -1199,15 +1193,15 @@ ob_collections_group(void) Code *cd; de = mem_alloc(SZ(Edje_Part_Collection_Directory_Entry)); - edje_file->collection_dir->entries = evas_list_append(edje_file->collection_dir->entries, de); - de->id = evas_list_count(edje_file->collection_dir->entries) - 1; + edje_file->collection_dir->entries = eina_list_append(edje_file->collection_dir->entries, de); + de->id = eina_list_count(edje_file->collection_dir->entries) - 1; pc = mem_alloc(SZ(Edje_Part_Collection)); - edje_collections = evas_list_append(edje_collections, pc); - pc->id = evas_list_count(edje_collections) - 1; + edje_collections = eina_list_append(edje_collections, pc); + pc->id = eina_list_count(edje_collections) - 1; cd = mem_alloc(SZ(Code)); - codes = evas_list_append(codes, cd); + codes = eina_list_append(codes, cd); } /** @@ -1227,17 +1221,15 @@ static void st_collections_group_name(void) { Edje_Part_Collection_Directory_Entry *de; - Evas_List *l; - + Eina_List *l; + Edje_Part_Collection_Directory_Entry *de_other; + check_arg_count(1); - de = evas_list_data(evas_list_last(edje_file->collection_dir->entries)); + de = eina_list_data_get(eina_list_last(edje_file->collection_dir->entries)); de->entry = parse_str(0); - for (l = edje_file->collection_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(edje_file->collection_dir->entries, l, de_other) { - Edje_Part_Collection_Directory_Entry *de_other; - - de_other = l->data; if ((de_other != de) && (de_other->entry) && (!strcmp(de->entry, de_other->entry))) { @@ -1245,24 +1237,24 @@ st_collections_group_name(void) Code *cd; int i; - pc = evas_list_nth(edje_collections, de_other->id); - cd = evas_list_nth(codes, de_other->id); + pc = eina_list_nth(edje_collections, de_other->id); + cd = eina_list_nth(codes, de_other->id); edje_file->collection_dir->entries = - evas_list_remove(edje_file->collection_dir->entries, de_other); + eina_list_remove(edje_file->collection_dir->entries, de_other); edje_collections = - evas_list_remove(edje_collections, pc); + eina_list_remove(edje_collections, pc); codes = - evas_list_remove(codes, cd); - - for (i = 0, l = edje_file->collection_dir->entries; l; l = l->next, i++) + eina_list_remove(codes, cd); + + for (i = 0, l = edje_file->collection_dir->entries; l; l = eina_list_next(l), i++) { - de_other = l->data; + de_other = eina_list_data_get(l); de_other->id = i; } - for (i = 0, l = edje_collections; l; l = l->next, i++) + for (i = 0, l = edje_collections; l; l = eina_list_next(l), i++) { - pc = l->data; + pc = eina_list_data_get(l); pc->id = i; } break; @@ -1288,7 +1280,7 @@ st_collections_group_script_only(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); + pc = eina_list_data_get(eina_list_last(edje_collections)); pc->script_only = parse_bool(0); } @@ -1309,13 +1301,13 @@ st_collections_group_alias(void) Edje_Part_Collection_Directory_Entry *de, *alias; check_arg_count(1); - de = evas_list_data(evas_list_last(edje_file->collection_dir->entries)); + de = eina_list_data_get(eina_list_last(edje_file->collection_dir->entries)); alias = mem_alloc(SZ(Edje_Part_Collection_Directory_Entry)); alias->id = de->id; alias->entry = parse_str(0); - aliases = evas_list_append(aliases, alias); + aliases = eina_list_append(aliases, alias); } /** @@ -1336,7 +1328,7 @@ st_collections_group_min(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); + pc = eina_list_data_get(eina_list_last(edje_collections)); pc->prop.min.w = parse_int_range(0, 0, 0x7fffffff); pc->prop.min.h = parse_int_range(1, 0, 0x7fffffff); } @@ -1359,7 +1351,7 @@ st_collections_group_max(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); + pc = eina_list_data_get(eina_list_last(edje_collections)); pc->prop.max.w = parse_int_range(0, 0, 0x7fffffff); pc->prop.max.h = parse_int_range(1, 0, 0x7fffffff); } @@ -1398,8 +1390,8 @@ ob_collections_group_script(void) Edje_Part_Collection *pc; Code *cd; - pc = evas_list_data(evas_list_last(edje_collections)); - cd = evas_list_data(evas_list_last(codes)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + cd = eina_list_data_get(eina_list_last(codes)); if (!is_verbatim()) track_verbatim(1); else @@ -1431,11 +1423,11 @@ st_collections_group_data_item(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); + pc = eina_list_data_get(eina_list_last(edje_collections)); di = mem_alloc(SZ(Edje_Data)); di->key = parse_str(0); di->value = parse_str(1); - pc->data = evas_list_append(pc->data, di); + pc->data = eina_list_append(pc->data, di); } /** @@ -1476,9 +1468,9 @@ ob_collections_group_parts_part(void) Edje_Part *ep; ep = mem_alloc(SZ(Edje_Part)); - pc = evas_list_data(evas_list_last(edje_collections)); - pc->parts = evas_list_append(pc->parts, ep); - ep->id = evas_list_count(pc->parts) - 1; + pc = eina_list_data_get(eina_list_last(edje_collections)); + pc->parts = eina_list_append(pc->parts, ep); + ep->id = eina_list_count(pc->parts) - 1; ep->type = EDJE_PART_TYPE_IMAGE; ep->mouse_events = 1; ep->repeat_events = 0; @@ -1512,18 +1504,16 @@ st_collections_group_parts_part_name(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->name = parse_str(0); { - Evas_List *l; + Eina_List *l; + Edje_Part *lep; - for (l = pc->parts; l; l = l->next) + EINA_LIST_FOREACH(pc->parts, l, lep) { - Edje_Part *lep; - - lep = l->data; if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name))) { fprintf(stderr, "%s: Error. parse error %s:%i. There is already a part of the name %s\n", @@ -1560,8 +1550,8 @@ st_collections_group_parts_part_type(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->type = parse_enum(0, "NONE", EDJE_PART_TYPE_NONE, "RECT", EDJE_PART_TYPE_RECTANGLE, @@ -1594,8 +1584,8 @@ st_collections_group_parts_part_mouse_events(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->mouse_events = parse_bool(0); } @@ -1618,8 +1608,8 @@ st_collections_group_parts_part_repeat_events(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->repeat_events = parse_bool(0); } @@ -1646,8 +1636,8 @@ st_collections_group_parts_part_ignore_flags(void) check_min_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->ignore_flags = parse_flags(0, "NONE", EVAS_EVENT_FLAG_NONE, "ON_HOLD", EVAS_EVENT_FLAG_ON_HOLD, @@ -1678,8 +1668,8 @@ st_collections_group_parts_part_scale(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->scale = parse_bool(0); } @@ -1708,8 +1698,8 @@ st_collections_group_parts_part_pointer_mode(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->pointer_mode = parse_enum(0, "AUTOGRAB", EVAS_OBJECT_POINTER_MODE_AUTOGRAB, "NOGRAB", EVAS_OBJECT_POINTER_MODE_NOGRAB, @@ -1735,8 +1725,8 @@ st_collections_group_parts_part_precise_is_inside(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->precise_is_inside = parse_bool(0); } @@ -1760,8 +1750,8 @@ st_collections_group_parts_part_use_alternate_font_metrics(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->use_alternate_font_metrics = parse_bool(0); } @@ -1784,8 +1774,8 @@ st_collections_group_parts_part_clip_to_id(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); { char *name; @@ -1817,8 +1807,8 @@ st_collections_group_parts_part_source(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); //FIXME: validate this somehow (need to decide on the format also) ep->source = parse_str(0); @@ -1844,8 +1834,8 @@ st_collections_group_parts_part_source2(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); //FIXME: validate this somehow (need to decide on the format also) ep->source2 = parse_str(0); @@ -1871,8 +1861,8 @@ st_collections_group_parts_part_source3(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); //FIXME: validate this somehow (need to decide on the format also) ep->source3 = parse_str(0); @@ -1898,8 +1888,8 @@ st_collections_group_parts_part_source4(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); //FIXME: validate this somehow (need to decide on the format also) ep->source4 = parse_str(0); @@ -1925,8 +1915,8 @@ st_collections_group_parts_part_source5(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); //FIXME: validate this somehow (need to decide on the format also) ep->source5 = parse_str(0); @@ -1952,8 +1942,8 @@ st_collections_group_parts_part_source6(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); //FIXME: validate this somehow (need to decide on the format also) ep->source6 = parse_str(0); @@ -1988,8 +1978,8 @@ st_collections_group_parts_part_effect(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->effect = parse_enum(0, "NONE", EDJE_TEXT_EFFECT_NONE, "PLAIN", EDJE_TEXT_EFFECT_PLAIN, @@ -2050,8 +2040,8 @@ st_collections_group_parts_part_dragable_x(void) check_arg_count(3); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->dragable.x = parse_int_range(0, -1, 1); ep->dragable.step_x = parse_int_range(1, 0, 0x7fffffff); ep->dragable.count_x = parse_int_range(2, 0, 0x7fffffff); @@ -2080,8 +2070,8 @@ st_collections_group_parts_part_dragable_y(void) check_arg_count(3); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->dragable.y = parse_int_range(0, -1, 1); ep->dragable.step_y = parse_int_range(1, 0, 0x7fffffff); ep->dragable.count_y = parse_int_range(2, 0, 0x7fffffff); @@ -2107,8 +2097,8 @@ st_collections_group_parts_part_dragable_confine(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); { char *name; @@ -2137,8 +2127,8 @@ st_collections_group_parts_part_dragable_events(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); { char *name; @@ -2174,8 +2164,8 @@ st_collections_group_parts_part_entry_mode(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->entry_mode = parse_enum(0, "NONE", EDJE_ENTRY_EDIT_MODE_NONE, "PLAIN", EDJE_ENTRY_EDIT_MODE_SELECTABLE, @@ -2203,8 +2193,8 @@ st_collections_group_parts_part_multiline(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ep->multiline = parse_bool(0); } @@ -2245,13 +2235,13 @@ ob_collections_group_parts_part_description(void) Edje_Part *ep; Edje_Part_Description *ed; - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = mem_alloc(SZ(Edje_Part_Description)); if (!ep->default_desc) ep->default_desc = ed; else - ep->other_desc = evas_list_append(ep->other_desc, ed); + ep->other_desc = eina_list_append(ep->other_desc, ed); ed->visible = 1; ed->align.x = 0.5; ed->align.y = 0.5; @@ -2332,14 +2322,15 @@ st_collections_group_parts_part_description_inherit(void) Edje_Part_Collection *pc; Edje_Part *ep; Edje_Part_Description *ed, *parent = NULL; - Evas_List *l; + Eina_List *l; + Edje_Part_Image_Id *iid; char *parent_name, *state_name; double parent_val, state_val; check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); /* inherit may not be used in the default description */ if (!ep->other_desc) @@ -2350,7 +2341,7 @@ st_collections_group_parts_part_description_inherit(void) exit(-1); } - ed = evas_list_data(evas_list_last(ep->other_desc)); + ed = eina_list_data_get(eina_list_last(ep->other_desc)); if (!ed->state.name) { @@ -2369,6 +2360,7 @@ st_collections_group_parts_part_description_inherit(void) else { double min_dst = 999.0; + Edje_Part_Description *d; if (!strcmp(parent_name, "default")) { @@ -2376,10 +2368,8 @@ st_collections_group_parts_part_description_inherit(void) min_dst = ABS(ep->default_desc->state.value - parent_val); } - for (l = ep->other_desc; l; l = l->next) + EINA_LIST_FOREACH(ep->other_desc, l, d) { - Edje_Part_Description *d = l->data; - if (!strcmp (d->state.name, parent_name)) { double dst; @@ -2425,14 +2415,13 @@ st_collections_group_parts_part_description_inherit(void) */ ed->image.tween_list = NULL; - for (l = parent->image.tween_list; l; l = l->next) + EINA_LIST_FOREACH(parent->image.tween_list, l, iid) { - Edje_Part_Image_Id *iid, *iid_new; + Edje_Part_Image_Id *iid_new; - iid = l->data; iid_new = mem_alloc(SZ(Edje_Part_Image_Id)); data_queue_image_slave_lookup(&(iid->id), &(iid_new->id)); - ed->image.tween_list = evas_list_append(ed->image.tween_list, iid_new); + ed->image.tween_list = eina_list_append(ed->image.tween_list, iid_new); } #define STRDUP(x) x ? strdup(x) : NULL @@ -2471,10 +2460,10 @@ st_collections_group_parts_part_description_state(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); s = parse_str(0); if (!strcmp (s, "custom")) @@ -2509,10 +2498,10 @@ st_collections_group_parts_part_description_visible(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->visible = parse_bool(0); } @@ -2537,10 +2526,10 @@ st_collections_group_parts_part_description_align(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->align.x = parse_float_range(0, 0.0, 1.0); ed->align.y = parse_float_range(1, 0.0, 1.0); } @@ -2565,10 +2554,10 @@ st_collections_group_parts_part_description_fixed(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->fixed.w = parse_float_range(0, 0, 1); ed->fixed.h = parse_float_range(1, 0, 1); } @@ -2592,10 +2581,10 @@ st_collections_group_parts_part_description_min(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->min.w = parse_float_range(0, 0, 0x7fffffff); ed->min.h = parse_float_range(1, 0, 0x7fffffff); } @@ -2619,10 +2608,10 @@ st_collections_group_parts_part_description_max(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->max.w = parse_float_range(0, 0, 0x7fffffff); ed->max.h = parse_float_range(1, 0, 0x7fffffff); } @@ -2648,10 +2637,10 @@ st_collections_group_parts_part_description_step(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->step.x = parse_float_range(0, 0, 0x7fffffff); ed->step.y = parse_float_range(1, 0, 0x7fffffff); } @@ -2679,10 +2668,10 @@ st_collections_group_parts_part_description_aspect(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->aspect.min = parse_float_range(0, 0.0, 999999999.0); ed->aspect.max = parse_float_range(1, 0.0, 999999999.0); } @@ -2707,10 +2696,10 @@ st_collections_group_parts_part_description_aspect_preference(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->aspect.prefer = parse_enum(0, "NONE", EDJE_ASPECT_PREFER_NONE, "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, @@ -2740,10 +2729,10 @@ st_collections_group_parts_part_description_color_class(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->color_class = parse_str(0); } @@ -2766,10 +2755,10 @@ st_collections_group_parts_part_description_color(void) check_arg_count(4); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->color.r = parse_int_range(0, 0, 255); ed->color.g = parse_int_range(1, 0, 255); ed->color.b = parse_int_range(2, 0, 255); @@ -2795,10 +2784,10 @@ st_collections_group_parts_part_description_color2(void) check_arg_count(4); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->color2.r = parse_int_range(0, 0, 255); ed->color2.g = parse_int_range(1, 0, 255); ed->color2.b = parse_int_range(2, 0, 255); @@ -2824,10 +2813,10 @@ st_collections_group_parts_part_description_color3(void) check_arg_count(4); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->color3.r = parse_int_range(0, 0, 255); ed->color3.g = parse_int_range(1, 0, 255); ed->color3.b = parse_int_range(2, 0, 255); @@ -2877,10 +2866,10 @@ st_collections_group_parts_part_description_rel1_relative(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->rel1.relative_x = parse_float(0); ed->rel1.relative_y = parse_float(1); } @@ -2904,10 +2893,10 @@ st_collections_group_parts_part_description_rel1_offset(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->rel1.offset_x = parse_int(0); ed->rel1.offset_y = parse_int(1); } @@ -2932,10 +2921,10 @@ st_collections_group_parts_part_description_rel1_to(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -2966,10 +2955,10 @@ st_collections_group_parts_part_description_rel1_to_x(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -3000,10 +2989,10 @@ st_collections_group_parts_part_description_rel1_to_y(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -3022,10 +3011,10 @@ st_collections_group_parts_part_description_rel2_relative(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->rel2.relative_x = parse_float(0); ed->rel2.relative_y = parse_float(1); } @@ -3039,10 +3028,10 @@ st_collections_group_parts_part_description_rel2_offset(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->rel2.offset_x = parse_int(0); ed->rel2.offset_y = parse_int(1); } @@ -3056,10 +3045,10 @@ st_collections_group_parts_part_description_rel2_to(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -3079,10 +3068,10 @@ st_collections_group_parts_part_description_rel2_to_x(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -3101,10 +3090,10 @@ st_collections_group_parts_part_description_rel2_to_y(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -3153,8 +3142,8 @@ st_collections_group_parts_part_description_image_normal(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE) { @@ -3165,7 +3154,7 @@ st_collections_group_parts_part_description_image_normal(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -3196,8 +3185,8 @@ st_collections_group_parts_part_description_image_tween(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE) { @@ -3208,13 +3197,13 @@ st_collections_group_parts_part_description_image_tween(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; Edje_Part_Image_Id *iid; iid = mem_alloc(SZ(Edje_Part_Image_Id)); - ed->image.tween_list = evas_list_append(ed->image.tween_list, iid); + ed->image.tween_list = eina_list_append(ed->image.tween_list, iid); name = parse_str(0); data_queue_image_lookup(name, &(iid->id)); free(name); @@ -3242,8 +3231,8 @@ st_collections_group_parts_part_description_image_border(void) check_arg_count(4); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE) { @@ -3254,7 +3243,7 @@ st_collections_group_parts_part_description_image_border(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->border.l = parse_int_range(0, 0, 0x7fffffff); ed->border.r = parse_int_range(1, 0, 0x7fffffff); ed->border.t = parse_int_range(2, 0, 0x7fffffff); @@ -3282,8 +3271,8 @@ st_collections_group_parts_part_description_image_middle(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE) { @@ -3294,7 +3283,7 @@ st_collections_group_parts_part_description_image_middle(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->border.no_fill = !parse_bool(0); } @@ -3341,8 +3330,8 @@ st_collections_group_parts_part_description_fill_smooth(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE) { @@ -3353,7 +3342,7 @@ st_collections_group_parts_part_description_fill_smooth(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->fill.smooth = parse_bool(0); } @@ -3377,8 +3366,8 @@ st_collections_group_parts_part_description_fill_spread(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); /* XXX this will need to include IMAGES when spread support is added to evas images */ if (ep->type != EDJE_PART_TYPE_GRADIENT) @@ -3390,7 +3379,7 @@ st_collections_group_parts_part_description_fill_spread(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->fill.spread = parse_int_range(0, 0, 1); } @@ -3415,8 +3404,8 @@ st_collections_group_parts_part_description_fill_angle(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); /* XXX this will need to include IMAGES when angle support is added to evas images */ if (ep->type != EDJE_PART_TYPE_GRADIENT) @@ -3428,7 +3417,7 @@ st_collections_group_parts_part_description_fill_angle(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->fill.angle = parse_int_range(0, 0, 360); } @@ -3452,10 +3441,10 @@ st_collections_group_parts_part_description_fill_type(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); if (ep->type != EDJE_PART_TYPE_IMAGE) { @@ -3511,8 +3500,8 @@ st_collections_group_parts_part_description_fill_origin_relative(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -3523,7 +3512,7 @@ st_collections_group_parts_part_description_fill_origin_relative(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->fill.pos_rel_x = parse_float_range(0, -999999999.0, 999999999.0); ed->fill.pos_rel_y = parse_float_range(1, -999999999.0, 999999999.0); } @@ -3547,8 +3536,8 @@ st_collections_group_parts_part_description_fill_origin_offset(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -3559,7 +3548,7 @@ st_collections_group_parts_part_description_fill_origin_offset(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->fill.pos_abs_x = parse_int(0); ed->fill.pos_abs_y = parse_int(1); } @@ -3606,10 +3595,10 @@ st_collections_group_parts_part_description_fill_size_relative(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -3642,10 +3631,10 @@ st_collections_group_parts_part_description_fill_size_offset(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -3706,8 +3695,8 @@ st_collections_group_parts_part_description_text_text(void) char *str = NULL; int i; - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if ((ep->type != EDJE_PART_TYPE_TEXT) && (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) @@ -3719,7 +3708,7 @@ st_collections_group_parts_part_description_text_text(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); for (i = 0; ;i++) { char *s; @@ -3758,8 +3747,8 @@ st_collections_group_parts_part_description_text_text_class(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if ((ep->type != EDJE_PART_TYPE_TEXT) && (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) @@ -3771,7 +3760,7 @@ st_collections_group_parts_part_description_text_text_class(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.text_class = parse_str(0); } @@ -3796,8 +3785,8 @@ st_collections_group_parts_part_description_text_font(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_TEXT) { @@ -3808,7 +3797,7 @@ st_collections_group_parts_part_description_text_font(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.font = parse_str(0); } @@ -3833,8 +3822,8 @@ st_collections_group_parts_part_description_text_style(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_TEXTBLOCK) { @@ -3845,7 +3834,7 @@ st_collections_group_parts_part_description_text_style(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.style = parse_str(0); } @@ -3870,8 +3859,8 @@ st_collections_group_parts_part_description_text_size(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_TEXT) { @@ -3882,7 +3871,7 @@ st_collections_group_parts_part_description_text_size(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.size = parse_int_range(0, 0, 255); } @@ -3907,8 +3896,8 @@ st_collections_group_parts_part_description_text_fit(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_TEXT) { @@ -3919,7 +3908,7 @@ st_collections_group_parts_part_description_text_fit(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.fit_x = parse_bool(0); ed->text.fit_y = parse_bool(1); } @@ -3946,8 +3935,8 @@ st_collections_group_parts_part_description_text_min(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if ((ep->type != EDJE_PART_TYPE_TEXT) && (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) @@ -3959,7 +3948,7 @@ st_collections_group_parts_part_description_text_min(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.min_x = parse_bool(0); ed->text.min_y = parse_bool(1); } @@ -3986,8 +3975,8 @@ st_collections_group_parts_part_description_text_max(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if ((ep->type != EDJE_PART_TYPE_TEXT) && (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) @@ -3999,7 +3988,7 @@ st_collections_group_parts_part_description_text_max(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.max_x = parse_bool(0); ed->text.max_y = parse_bool(1); } @@ -4025,8 +4014,8 @@ st_collections_group_parts_part_description_text_align(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_TEXT) { @@ -4037,7 +4026,7 @@ st_collections_group_parts_part_description_text_align(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.align.x = parse_float_range(0, 0.0, 1.0); ed->text.align.y = parse_float_range(1, 0.0, 1.0); } @@ -4063,8 +4052,8 @@ st_collections_group_parts_part_description_text_source(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if ((ep->type != EDJE_PART_TYPE_TEXT) && (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) @@ -4076,7 +4065,7 @@ st_collections_group_parts_part_description_text_source(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -4107,8 +4096,8 @@ st_collections_group_parts_part_description_text_text_source(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if ((ep->type != EDJE_PART_TYPE_TEXT) && (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) @@ -4120,7 +4109,7 @@ st_collections_group_parts_part_description_text_text_source(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -4152,8 +4141,8 @@ st_collections_group_parts_part_description_text_elipsis(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_TEXT) { @@ -4164,7 +4153,7 @@ st_collections_group_parts_part_description_text_elipsis(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->text.elipsis = parse_float_range(0, 0.0, 1.0); } @@ -4222,8 +4211,8 @@ st_collections_group_parts_part_description_gradient_type(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -4234,7 +4223,7 @@ st_collections_group_parts_part_description_gradient_type(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); ed->gradient.type = parse_str(0); } @@ -4259,8 +4248,8 @@ st_collections_group_parts_part_description_gradient_spectrum(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -4271,7 +4260,7 @@ st_collections_group_parts_part_description_gradient_spectrum(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { char *name; @@ -4304,8 +4293,8 @@ st_collections_group_parts_part_description_gradient_rel1_relative(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -4316,7 +4305,7 @@ st_collections_group_parts_part_description_gradient_rel1_relative(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { ed->gradient.use_rel = 1; @@ -4347,8 +4336,8 @@ st_collections_group_parts_part_description_gradient_rel1_offset(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -4359,7 +4348,7 @@ st_collections_group_parts_part_description_gradient_rel1_offset(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { ed->gradient.use_rel = 1; @@ -4377,8 +4366,8 @@ st_collections_group_parts_part_description_gradient_rel2_relative(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -4389,7 +4378,7 @@ st_collections_group_parts_part_description_gradient_rel2_relative(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { ed->gradient.use_rel = 1; @@ -4407,8 +4396,8 @@ st_collections_group_parts_part_description_gradient_rel2_offset(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->parts)); if (ep->type != EDJE_PART_TYPE_GRADIENT) { @@ -4419,7 +4408,7 @@ st_collections_group_parts_part_description_gradient_rel2_offset(void) } ed = ep->default_desc; - if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); { ed->gradient.use_rel = 1; @@ -4463,10 +4452,10 @@ ob_collections_group_programs_program(void) Edje_Part_Collection *pc; Edje_Program *ep; - pc = evas_list_data(evas_list_last(edje_collections)); + pc = eina_list_data_get(eina_list_last(edje_collections)); ep = mem_alloc(SZ(Edje_Program)); - pc->programs = evas_list_append(pc->programs, ep); - ep->id = evas_list_count(pc->programs) - 1; + pc->programs = eina_list_append(pc->programs, ep); + ep->id = eina_list_count(pc->programs) - 1; ep->tween.mode = EDJE_TWEEN_MODE_LINEAR; ep->after = NULL; } @@ -4489,17 +4478,15 @@ st_collections_group_programs_program_name(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); ep->name = parse_str(0); { - Evas_List *l; + Eina_List *l; + Edje_Program *lep; - for (l = pc->programs; l; l = l->next) + EINA_LIST_FOREACH(pc->programs, l, lep) { - Edje_Program *lep; - - lep = l->data; if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name))) { fprintf(stderr, "%s: Error. parse error %s:%i. There is already a program of the name %s\n", @@ -4532,8 +4519,8 @@ st_collections_group_programs_program_signal(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); ep->signal = parse_str(0); } @@ -4557,8 +4544,8 @@ st_collections_group_programs_program_source(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); ep->source = parse_str(0); } @@ -4581,8 +4568,8 @@ st_collections_group_programs_program_in(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); ep->in.from = parse_float_range(0, 0.0, 999999999.0); ep->in.range = parse_float_range(1, 0.0, 999999999.0); } @@ -4609,8 +4596,8 @@ st_collections_group_programs_program_action(void) Edje_Part_Collection *pc; Edje_Program *ep; - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); ep->action = parse_enum(0, "STATE_SET", EDJE_ACTION_TYPE_STATE_SET, "ACTION_STOP", EDJE_ACTION_TYPE_ACTION_STOP, @@ -4685,8 +4672,8 @@ st_collections_group_programs_program_transition(void) check_arg_count(2); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); ep->tween.mode = parse_enum(0, "LINEAR", EDJE_TWEEN_MODE_LINEAR, "SINUSOIDAL", EDJE_TWEEN_MODE_SINUSOIDAL, @@ -4716,14 +4703,14 @@ st_collections_group_programs_program_target(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); { Edje_Program_Target *et; char *name; et = mem_alloc(SZ(Edje_Program_Target)); - ep->targets = evas_list_append(ep->targets, et); + ep->targets = eina_list_append(ep->targets, et); name = parse_str(0); if (ep->action == EDJE_ACTION_TYPE_STATE_SET) @@ -4769,8 +4756,8 @@ st_collections_group_programs_program_after(void) check_arg_count(1); - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); { Edje_Program_After *pa; char *name; @@ -4779,7 +4766,7 @@ st_collections_group_programs_program_after(void) pa = mem_alloc(SZ(Edje_Program_After)); pa->id = -1; - ep->after = evas_list_append(ep->after, pa); + ep->after = eina_list_append(ep->after, pa); data_queue_program_lookup(pc, name, &(pa->id)); free(name); @@ -4793,9 +4780,9 @@ ob_collections_group_programs_program_script(void) Edje_Program *ep; Code *cd; - pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->programs)); - cd = evas_list_data(evas_list_last(codes)); + pc = eina_list_data_get(eina_list_last(edje_collections)); + ep = eina_list_data_get(eina_list_last(pc->programs)); + cd = eina_list_data_get(eina_list_last(codes)); if (!is_verbatim()) track_verbatim(1); else @@ -4812,7 +4799,7 @@ ob_collections_group_programs_program_script(void) cp->l2 = get_verbatim_line2(); cp->id = ep->id; cp->script = s; - cd->programs = evas_list_append(cd->programs, cp); + cd->programs = eina_list_append(cd->programs, cp); set_verbatim(NULL, 0, 0); ep->action = EDJE_ACTION_TYPE_SCRIPT; } diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c index 30597475d9..5db10640ca 100644 --- a/legacy/edje/src/bin/edje_cc_out.c +++ b/legacy/edje/src/bin/edje_cc_out.c @@ -53,11 +53,11 @@ struct _Code_Lookup static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char *ptr, int len)); Edje_File *edje_file = NULL; -Evas_List *edje_collections = NULL; -Evas_List *fonts = NULL; -Evas_List *codes = NULL; -Evas_List *code_lookups = NULL; -Evas_List *aliases = NULL; +Eina_List *edje_collections = NULL; +Eina_List *fonts = NULL; +Eina_List *codes = NULL; +Eina_List *code_lookups = NULL; +Eina_List *aliases = NULL; static Eet_Data_Descriptor *edd_edje_file = NULL; static Eet_Data_Descriptor *edd_edje_image_directory = NULL; @@ -74,14 +74,14 @@ static Eet_Data_Descriptor *edd_edje_part_description = NULL; static Eet_Data_Descriptor *edd_edje_part_image_id = NULL; static Eet_Data_Descriptor *edd_edje_spectrum_color = NULL; -static Evas_List *part_lookups = NULL; -static Evas_List *program_lookups = NULL; -static Evas_List *group_lookups = NULL; -static Evas_List *image_lookups = NULL; -static Evas_List *spectrum_lookups = NULL; -static Evas_List *part_slave_lookups = NULL; -static Evas_List *image_slave_lookups= NULL; -static Evas_List *spectrum_slave_lookups= NULL; +static Eina_List *part_lookups = NULL; +static Eina_List *program_lookups = NULL; +static Eina_List *group_lookups = NULL; +static Eina_List *image_lookups = NULL; +static Eina_List *spectrum_lookups = NULL; +static Eina_List *part_slave_lookups = NULL; +static Eina_List *image_slave_lookups= NULL; +static Eina_List *spectrum_slave_lookups= NULL; #define ABORT_WRITE(eet_file, file) \ eet_close(eet_file); \ @@ -124,7 +124,8 @@ static void check_image_part_desc (Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description *epd, Eet_File *ef) { - Evas_List *l; + Eina_List *l; + Edje_Part_Image_Id *iid; return; if (epd->image.id == -1) @@ -132,10 +133,8 @@ check_image_part_desc (Edje_Part_Collection *pc, Edje_Part *ep, "part \"%s\", description \"%s\" %f\n", pc->id, ep->name, epd->state.name, epd->state.value); - for (l = epd->image.tween_list; l; l = l->next) + EINA_LIST_FOREACH(epd->image.tween_list, l, iid) { - Edje_Part_Image_Id *iid = l->data; - if (iid->id == -1) error_and_abort(ef, "Collection %i: tween image id missing for " "part \"%s\", description \"%s\" %f\n", @@ -147,7 +146,8 @@ static void check_part (Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef) { Edje_Part_Description *epd = ep->default_desc; - Evas_List *l; + Eina_List *l; + Edje_Part_Description *data; if (!epd) error_and_abort(ef, "Collection %i: default description missing " @@ -157,8 +157,8 @@ check_part (Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef) { check_image_part_desc (pc, ep, epd, ef); - for (l = ep->other_desc; l; l = l->next) - check_image_part_desc (pc, ep, l->data, ef); + EINA_LIST_FOREACH(ep->other_desc, l, data) + check_image_part_desc (pc, ep, data, ef); } } @@ -204,8 +204,8 @@ data_write_header(Eet_File *ef) /* copy aliases into collection directory */ while (aliases) { - edje_file->collection_dir->entries = evas_list_append(edje_file->collection_dir->entries, aliases->data); - aliases = evas_list_remove_list(aliases, aliases); + edje_file->collection_dir->entries = eina_list_append(edje_file->collection_dir->entries, eina_list_data_get(aliases)); + aliases = eina_list_remove_list(aliases, aliases); } } bytes = eet_data_write(ef, edd_edje_file, "edje_file", edje_file, 1); @@ -226,19 +226,18 @@ data_write_header(Eet_File *ef) static int data_write_fonts(Eet_File *ef, int *font_num, int *input_bytes, int *input_raw_bytes) { - Evas_List *l;; + Eina_List *l;; int bytes = 0; int total_bytes = 0; + Font *fn; - for (l = fonts; l; l = l->next) + EINA_LIST_FOREACH(fonts, l, fn) { - Font *fn; void *fdata = NULL; int fsize = 0; - Evas_List *ll; + Eina_List *ll; FILE *f; - fn = l->data; f = fopen(fn->file, "rb"); if (f) { @@ -259,11 +258,13 @@ data_write_fonts(Eet_File *ef, int *font_num, int *input_bytes, int *input_raw_b } else { - for (ll = fnt_dirs; ll; ll = ll->next) + char *data; + + EINA_LIST_FOREACH(fnt_dirs, ll, data) { char buf[4096]; - snprintf(buf, sizeof(buf), "%s/%s", (char *)(ll->data), fn->file); + snprintf(buf, sizeof(buf), "%s/%s", data, fn->file); f = fopen(buf, "rb"); if (f) { @@ -322,7 +323,7 @@ data_write_fonts(Eet_File *ef, int *font_num, int *input_bytes, int *input_raw_b static int data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw_bytes) { - Evas_List *l; + Eina_List *l; int bytes = 0; int total_bytes = 0; @@ -330,6 +331,7 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw { Ecore_Evas *ee; Evas *evas; + Edje_Image_Directory_Entry *img; ecore_init(); ecore_evas_init(); @@ -340,26 +342,24 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw "load.\n"); evas = ecore_evas_get(ee); - for (l = edje_file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(edje_file->image_dir->entries, l, img) { - Edje_Image_Directory_Entry *img; - - img = l->data; if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) { } else { Evas_Object *im; - Evas_List *ll; + Eina_List *ll; + char *data; im = NULL; - for (ll = img_dirs; ll; ll = ll->next) + EINA_LIST_FOREACH(img_dirs, ll, data) { char buf[4096]; snprintf(buf, sizeof(buf), "%s/%s", - (char *)(ll->data), img->entry); + data, img->entry); im = evas_object_image_add(evas); if (im) { @@ -501,70 +501,64 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw static void check_groups_names(Eet_File *ef) { - Evas_List *l; + Eina_List *l; + Edje_Part_Collection_Directory_Entry *de; if (!edje_file->collection_dir) return; /* check that all groups have names */ - for (l = edje_file->collection_dir->entries; l; l = l->next) - { - Edje_Part_Collection_Directory_Entry *de; - de = l->data; + EINA_LIST_FOREACH(edje_file->collection_dir->entries, l, de) if (!de->entry) error_and_abort(ef, "Collection %i: name missing.\n", de->id); - } } static void check_spectra(Eet_File *ef) { - Evas_List *l; + Eina_List *l; + Edje_Spectrum_Directory_Entry *se; if (!edje_file->spectrum_dir) return; /* check that all spectra are valid */ - for (l = edje_file->spectrum_dir->entries; l; l = l->next) - { - Edje_Spectrum_Directory_Entry *se; - se = l->data; - check_spectrum(se, ef); - } + EINA_LIST_FOREACH(edje_file->spectrum_dir->entries, l, se) + check_spectrum(se, ef); } static void check_groups(Eet_File *ef) { - Evas_List *l; + Eina_List *l; + Edje_Part_Collection *pc; /* sanity checks for parts and programs */ - for (l = edje_collections; l; l = l->next) + EINA_LIST_FOREACH(edje_collections, l, pc) { - Edje_Part_Collection *pc; - Evas_List *ll; + Eina_List *ll; + Edje_Part *part; + Edje_Program *prog; - pc = l->data; - for (ll = pc->parts; ll; ll = ll->next) - check_part(pc, ll->data, ef); - for (ll = pc->programs; ll; ll = ll->next) - check_program(pc, ll->data, ef); + EINA_LIST_FOREACH(pc->parts, ll, part) + check_part(pc, part, ef); + EINA_LIST_FOREACH(pc->programs, ll, prog) + check_program(pc, prog, ef); } } static int data_write_groups(Eet_File *ef, int *collection_num) { - Evas_List *l; + Eina_List *l; + Edje_Part_Collection *pc; int bytes = 0; int total_bytes = 0; - for (l = edje_collections; l; l = l->next) + EINA_LIST_FOREACH(edje_collections, l, pc) { - Edje_Part_Collection *pc; char buf[4096]; - pc = l->data; snprintf(buf, sizeof(buf), "collections/%i", pc->id); bytes = eet_data_write(ef, edd_edje_part_collection, buf, pc, 1); if (bytes <= 0) @@ -592,7 +586,8 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd) error_and_abort(ef, "Unable to open temp file \"%s\" for script " "compilation.\n", filename); - Evas_List *ll; + Eina_List *ll; + Code_Program *cp; fprintf(f, "#include \n"); int ln = 2; @@ -624,11 +619,8 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd) } ln += cd->l2 - cd->l1 + 1; } - for (ll = cd->programs; ll; ll = ll->next) + EINA_LIST_FOREACH(cd->programs, ll, cp) { - Code_Program *cp; - - cp = ll->data; if (cp->script) { while (ln < (cp->l1 - 1)) @@ -713,7 +705,7 @@ compile_script_file(Eet_File *ef, const char *source, const char *output, static void data_write_scripts(Eet_File *ef) { - Evas_List *l; + Eina_List *l; int i; #ifdef HAVE_EVIL @@ -722,10 +714,10 @@ data_write_scripts(Eet_File *ef) char *tmpdir = "/tmp"; #endif - for (i = 0, l = codes; l; l = l->next, i++) + for (i = 0, l = codes; l; l = eina_list_next(l), i++) { int fd; - Code *cd = l->data; + Code *cd = eina_list_data_get(l); if ((!cd->shared) && (!cd->programs)) continue; @@ -846,7 +838,7 @@ data_queue_group_lookup(char *name) Group_Lookup *gl; gl = mem_alloc(SZ(Group_Lookup)); - group_lookups = evas_list_append(group_lookups, gl); + group_lookups = eina_list_append(group_lookups, gl); gl->name = mem_strdup(name); } @@ -856,7 +848,7 @@ data_queue_part_lookup(Edje_Part_Collection *pc, char *name, int *dest) Part_Lookup *pl; pl = mem_alloc(SZ(Part_Lookup)); - part_lookups = evas_list_append(part_lookups, pl); + part_lookups = eina_list_append(part_lookups, pl); pl->pc = pc; pl->name = mem_strdup(name); pl->dest = dest; @@ -868,7 +860,7 @@ data_queue_program_lookup(Edje_Part_Collection *pc, char *name, int *dest) Program_Lookup *pl; pl = mem_alloc(SZ(Program_Lookup)); - program_lookups = evas_list_append(program_lookups, pl); + program_lookups = eina_list_append(program_lookups, pl); pl->pc = pc; pl->name = mem_strdup(name); pl->dest = dest; @@ -880,7 +872,7 @@ data_queue_image_lookup(char *name, int *dest) Image_Lookup *il; il = mem_alloc(SZ(Image_Lookup)); - image_lookups = evas_list_append(image_lookups, il); + image_lookups = eina_list_append(image_lookups, il); il->name = mem_strdup(name); il->dest = dest; } @@ -891,7 +883,7 @@ data_queue_spectrum_lookup(char *name, int *dest) Spectrum_Lookup *sl; sl = mem_alloc(SZ(Spectrum_Lookup)); - spectrum_lookups = evas_list_append(spectrum_lookups, sl); + spectrum_lookups = eina_list_append(spectrum_lookups, sl); sl->name = mem_strdup(name); sl->dest = dest; } @@ -902,7 +894,7 @@ data_queue_part_slave_lookup(int *master, int *slave) Slave_Lookup *sl; sl = mem_alloc(SZ(Slave_Lookup)); - part_slave_lookups = evas_list_append(part_slave_lookups, sl); + part_slave_lookups = eina_list_append(part_slave_lookups, sl); sl->master = master; sl->slave = slave; } @@ -913,7 +905,7 @@ data_queue_image_slave_lookup(int *master, int *slave) Slave_Lookup *sl; sl = mem_alloc(SZ(Slave_Lookup)); - image_slave_lookups = evas_list_append(image_slave_lookups, sl); + image_slave_lookups = eina_list_append(image_slave_lookups, sl); sl->master = master; sl->slave = slave; } @@ -924,41 +916,36 @@ data_queue_spectrum_slave_lookup(int *master, int *slave) Slave_Lookup *sl; sl = mem_alloc(SZ(Slave_Lookup)); - spectrum_slave_lookups = evas_list_append(spectrum_slave_lookups, sl); + spectrum_slave_lookups = eina_list_append(spectrum_slave_lookups, sl); sl->master = master; sl->slave = slave; } void -handle_slave_lookup(Evas_List *list, int *master, int value) +handle_slave_lookup(Eina_List *list, int *master, int value) { - Evas_List *l; + Eina_List *l; + Slave_Lookup *sl; - for (l = list; l; l = l->next) - { - Slave_Lookup *sl = l->data; - - if (sl->master == master) - *sl->slave = value; - } + EINA_LIST_FOREACH(list, l, sl) + if (sl->master == master) + *sl->slave = value; } void data_process_lookups(void) { - Evas_List *l; + Eina_List *l; while (part_lookups) { Part_Lookup *pl; + Edje_Part *ep; - pl = part_lookups->data; + pl = eina_list_data_get(part_lookups); - for (l = pl->pc->parts; l; l = l->next) + EINA_LIST_FOREACH(pl->pc->parts, l, ep) { - Edje_Part *ep; - - ep = l->data; if ((ep->name) && (!strcmp(ep->name, pl->name))) { handle_slave_lookup(part_slave_lookups, pl->dest, ep->id); @@ -972,7 +959,7 @@ data_process_lookups(void) progname, pl->name); exit(-1); } - part_lookups = evas_list_remove(part_lookups, pl); + part_lookups = eina_list_remove(part_lookups, pl); free(pl->name); free(pl); } @@ -980,14 +967,12 @@ data_process_lookups(void) while (program_lookups) { Program_Lookup *pl; + Edje_Program *ep; - pl = program_lookups->data; + pl = eina_list_data_get(program_lookups); - for (l = pl->pc->programs; l; l = l->next) + EINA_LIST_FOREACH(pl->pc->programs, l, ep) { - Edje_Program *ep; - - ep = l->data; if ((ep->name) && (!strcmp(ep->name, pl->name))) { *(pl->dest) = ep->id; @@ -1000,7 +985,7 @@ data_process_lookups(void) progname, pl->name); exit(-1); } - program_lookups = evas_list_remove(program_lookups, pl); + program_lookups = eina_list_remove(program_lookups, pl); free(pl->name); free(pl); } @@ -1008,12 +993,12 @@ data_process_lookups(void) while (group_lookups) { Group_Lookup *gl; + Edje_Part_Collection_Directory_Entry *de; - gl = group_lookups->data; - for (l = edje_file->collection_dir->entries; l; l = l->next) + gl = eina_list_data_get(group_lookups); + + EINA_LIST_FOREACH(edje_file->collection_dir->entries, l, de) { - Edje_Part_Collection_Directory_Entry *de; - de = l->data; if (!strcmp(de->entry, gl->name)) { break; @@ -1025,7 +1010,7 @@ data_process_lookups(void) progname, gl->name); exit(-1); } - group_lookups = evas_list_remove(group_lookups, gl); + group_lookups = eina_list_remove(group_lookups, gl); free(gl->name); free(gl); } @@ -1033,18 +1018,16 @@ data_process_lookups(void) while (image_lookups) { Image_Lookup *il; + Edje_Image_Directory_Entry *de; - il = image_lookups->data; + il = eina_list_data_get(image_lookups); if (!edje_file->image_dir) l = NULL; else { - for (l = edje_file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(edje_file->image_dir->entries, l, de) { - Edje_Image_Directory_Entry *de; - - de = l->data; if ((de->entry) && (!strcmp(de->entry, il->name))) { handle_slave_lookup(image_slave_lookups, il->dest, de->id); @@ -1063,7 +1046,7 @@ data_process_lookups(void) progname, il->name); exit(-1); } - image_lookups = evas_list_remove(image_lookups, il); + image_lookups = eina_list_remove(image_lookups, il); free(il->name); free(il); } @@ -1071,18 +1054,16 @@ data_process_lookups(void) while (spectrum_lookups) { Spectrum_Lookup *il; + Edje_Spectrum_Directory_Entry *de; - il = spectrum_lookups->data; + il = eina_list_data_get(spectrum_lookups); if (!edje_file->spectrum_dir) l = NULL; else { - for (l = edje_file->spectrum_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(edje_file->spectrum_dir->entries, l, de) { - Edje_Spectrum_Directory_Entry *de; - - de = l->data; *(il->dest) = 1; if ((de->entry) && (!strcmp(de->entry, il->name))) { @@ -1099,27 +1080,27 @@ data_process_lookups(void) progname, il->name); exit(-1); } - spectrum_lookups = evas_list_remove(spectrum_lookups, il); + spectrum_lookups = eina_list_remove(spectrum_lookups, il); free(il->name); free(il); } while (part_slave_lookups) { - free(part_slave_lookups->data); - part_slave_lookups = evas_list_remove_list(part_slave_lookups, part_slave_lookups); + free(eina_list_data_get(part_slave_lookups)); + part_slave_lookups = eina_list_remove_list(part_slave_lookups, part_slave_lookups); } while (image_slave_lookups) { - free(image_slave_lookups->data); - image_slave_lookups = evas_list_remove_list(image_slave_lookups, image_slave_lookups); + free(eina_list_data_get(image_slave_lookups)); + image_slave_lookups = eina_list_remove_list(image_slave_lookups, image_slave_lookups); } while (spectrum_slave_lookups) { - free(spectrum_slave_lookups->data); - spectrum_slave_lookups = evas_list_remove_list(spectrum_slave_lookups, spectrum_slave_lookups); + free(eina_list_data_get(spectrum_slave_lookups)); + spectrum_slave_lookups = eina_list_remove_list(spectrum_slave_lookups, spectrum_slave_lookups); } } @@ -1244,7 +1225,7 @@ _data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len data_queue_part_lookup(pc, name, &(cl->val)); - code_lookups = evas_list_append(code_lookups, cl); + code_lookups = eina_list_append(code_lookups, cl); } static void _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len) @@ -1256,7 +1237,7 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int data_queue_program_lookup(pc, name, &(cl->val)); - code_lookups = evas_list_append(code_lookups, cl); + code_lookups = eina_list_append(code_lookups, cl); } static void _data_queue_group_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len) @@ -1273,24 +1254,25 @@ _data_queue_image_pc_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int data_queue_image_lookup(name, &(cl->val)); - code_lookups = evas_list_append(code_lookups, cl); + code_lookups = eina_list_append(code_lookups, cl); } void data_process_scripts(void) { - Evas_List *l, *l2; + Eina_List *l, *l2; - for (l = codes, l2 = edje_collections; (l) && (l2); l = l->next, l2 = l2->next) + for (l = codes, l2 = edje_collections; (l) && (l2); l = eina_list_next(l), l2 = eina_list_next(l2)) { Code *cd; Edje_Part_Collection *pc; - cd = l->data; - pc = l2->data; + cd = eina_list_data_get(l); + pc = eina_list_data_get(l2); if ((cd->shared) || (cd->programs)) { - Evas_List *ll; + Eina_List *ll; + Code_Program *cp; if (cd->shared) { @@ -1299,11 +1281,8 @@ data_process_scripts(void) data_process_string(pc, "IMAGE", cd->shared, _data_queue_image_pc_lookup); data_process_string(pc, "GROUP", cd->shared, _data_queue_group_lookup); } - for (ll = cd->programs; ll; ll = ll->next) + EINA_LIST_FOREACH(cd->programs, ll, cp) { - Code_Program *cp; - - cp = ll->data; if (cp->script) { data_process_string(pc, "PART", cp->script, _data_queue_part_lookup); @@ -1319,15 +1298,14 @@ data_process_scripts(void) void data_process_script_lookups(void) { - Evas_List *l; + Eina_List *l; + Code_Lookup *cl; - for (l = code_lookups; l; l = l->next) + EINA_LIST_FOREACH(code_lookups, l, cl) { - Code_Lookup *cl; char buf[256]; int i, n; - cl = l->data; snprintf(buf, sizeof(buf), "%i", cl->val); n = strlen(buf); if (n > cl->len) diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c index 7210ce8299..57e0a1bbc4 100644 --- a/legacy/edje/src/bin/edje_cc_parse.c +++ b/legacy/edje/src/bin/edje_cc_parse.c @@ -39,8 +39,8 @@ static int strstrip(const char *in, char *out, size_t size); int line = 0; -Evas_List *stack = NULL; -Evas_List *params = NULL; +Eina_List *stack = NULL; +Eina_List *params = NULL; static char file_buf[4096]; static int verbatim = 0; @@ -83,7 +83,7 @@ new_object(void) { fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n", progname, file_in, line - 1, - (char *)evas_list_data(evas_list_last(stack))); + (char *)eina_list_data_get(eina_list_last(stack))); exit(-1); } free(id); @@ -113,7 +113,7 @@ new_statement(void) { fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n", progname, file_in, line - 1, - (char *)evas_list_data(evas_list_last(stack))); + (char *)eina_list_data_get(eina_list_last(stack))); exit(-1); } free(id); @@ -362,17 +362,18 @@ stack_id(void) { char *id; int len; - Evas_List *l; + Eina_List *l; + char *data; len = 0; - for (l = stack; l; l = l->next) - len += strlen(l->data) + 1; + EINA_LIST_FOREACH(stack, l, data) + len += strlen(data) + 1; id = mem_alloc(len); id[0] = 0; - for (l = stack; l; l = l->next) + EINA_LIST_FOREACH(stack, l, data) { - strcat(id, l->data); - if (l->next) strcat(id, "."); + strcat(id, data); + if (eina_list_next(l)) strcat(id, "."); } return id; } @@ -383,11 +384,11 @@ stack_chop_top(void) char *top; /* remove top from stack */ - top = evas_list_data(evas_list_last(stack)); + top = eina_list_data_get(eina_list_last(stack)); if (top) { free(top); - stack = evas_list_remove(stack, top); + stack = eina_list_remove(stack, top); } else { @@ -446,8 +447,8 @@ parse(char *data, off_t size) /* clear out params */ while (params) { - free(params->data); - params = evas_list_remove(params, params->data); + free(eina_list_data_get(params)); + params = eina_list_remove(params, eina_list_data_get(params)); } /* remove top from stack */ stack_chop_top(); @@ -467,10 +468,10 @@ parse(char *data, off_t size) else { if (do_params) - params = evas_list_append(params, token); + params = eina_list_append(params, token); else { - stack = evas_list_append(stack, token); + stack = eina_list_append(stack, token); new_object(); if ((verbatim == 1) && (p < (end - 2))) { @@ -638,19 +639,18 @@ compile(void) def = mem_strdup(""); else { - Evas_List *l; + Eina_List *l; int len; + char *data; len = 0; - for (l = defines; l; l = l->next) - { - len += strlen(l->data) + 1; - } + EINA_LIST_FOREACH(defines, l, data) + len += strlen(data) + 1; def = mem_alloc(len + 1); def[0] = 0; - for (l = defines; l; l = l->next) + EINA_LIST_FOREACH(defines, l, data) { - strcat(def, l->data); + strcat(def, data); strcat(def, " "); } } @@ -726,7 +726,7 @@ is_param(int n) { char *str; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (str) return 1; return 0; } @@ -738,7 +738,7 @@ is_num(int n) long int ret; char *end; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -758,7 +758,7 @@ parse_str(int n) char *str; char *s; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -821,7 +821,7 @@ parse_enum(int n, ...) int result; va_list va; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -839,13 +839,14 @@ parse_enum(int n, ...) int parse_flags(int n, ...) { - Evas_List *lst; + Eina_List *lst; int result = 0; va_list va; + char *data; va_start(va, n); - for (lst = evas_list_nth_list(params, n); lst != NULL; lst = lst->next) - result |= _parse_enum(lst->data, va); + EINA_LIST_FOREACH(eina_list_nth_list(params, n), lst, data) + result |= _parse_enum(data, va); va_end(va); return result; @@ -857,7 +858,7 @@ parse_int(int n) char *str; int i; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -874,7 +875,7 @@ parse_int_range(int n, int f, int t) char *str; int i; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -897,7 +898,7 @@ parse_bool(int n) char *str, buf[4096]; int i; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -933,7 +934,7 @@ parse_float(int n) char *str; double i; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -950,7 +951,7 @@ parse_float_range(int n, double f, double t) char *str; double i; - str = evas_list_nth(params, n); + str = eina_list_nth(params, n); if (!str) { fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", @@ -970,7 +971,7 @@ parse_float_range(int n, double f, double t) void check_arg_count(int required_args) { - int num_args = evas_list_count (params); + int num_args = eina_list_count (params); if (num_args != required_args) { @@ -983,7 +984,7 @@ check_arg_count(int required_args) void check_min_arg_count(int min_required_args) { - int num_args = evas_list_count (params); + int num_args = eina_list_count (params); if (num_args < min_required_args) { diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c index dcf64eaad6..3685dd1737 100644 --- a/legacy/edje/src/bin/edje_cc_sources.c +++ b/legacy/edje/src/bin/edje_cc_sources.c @@ -36,10 +36,10 @@ source_edd(void) eddc.func.mem_free = NULL; eddc.func.str_alloc = eina_stringshare_add; eddc.func.str_free = eina_stringshare_del; - eddc.func.list_next = evas_list_next; - eddc.func.list_append = evas_list_append; - eddc.func.list_data = evas_list_data; - eddc.func.list_free = evas_list_free; + eddc.func.list_next = eina_list_next; + eddc.func.list_append = eina_list_append; + eddc.func.list_data = eina_list_data_get; + eddc.func.list_free = eina_list_free; eddc.func.hash_foreach = evas_hash_foreach; eddc.func.hash_add = evas_hash_add; eddc.func.hash_free = evas_hash_free; @@ -93,7 +93,7 @@ source_fetch_file(const char *fil, const char *filname) fread(sf->file, sz, 1, f); sf->file[sz] = '\0'; fseek(f, 0, SEEK_SET); - srcfiles.list = evas_list_append(srcfiles.list, sf); + srcfiles.list = eina_list_append(srcfiles.list, sf); while (fgets(buf, sizeof(buf), f)) { @@ -244,7 +244,7 @@ source_load(Eet_File *ef) } int -source_fontmap_save(Eet_File *ef, Evas_List *fonts) +source_fontmap_save(Eet_File *ef, Eina_List *fonts) { Font_List fl; diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c index d9e5e24cb3..928b0bf918 100644 --- a/legacy/edje/src/bin/edje_decc.c +++ b/legacy/edje/src/bin/edje_decc.c @@ -94,9 +94,9 @@ decomp(void) eet_close(ef); return 0; } - if (!srcfiles->list->data || !root_filename_is_sane()) + if (!eina_list_data_get(srcfiles->list) || !root_filename_is_sane()) { - printf("ERROR: Invalid root filename: '%s'\n", (char *) srcfiles->list->data); + printf("ERROR: Invalid root filename: '%s'\n", (char *) eina_list_data_get(srcfiles->list)); eet_close(ef); return 0; } @@ -124,8 +124,9 @@ decomp(void) void output(void) { - Evas_List *l; + Eina_List *l; Eet_File *ef; + SrcFile *sf; char *outdir, *p; p = strrchr(file_in, '/'); @@ -142,11 +143,10 @@ output(void) if (edje_file->image_dir) { - for (l = edje_file->image_dir->entries; l; l = l->next) - { - Edje_Image_Directory_Entry *ei; + Edje_Image_Directory_Entry *ei; - ei = l->data; + EINA_LIST_FOREACH(edje_file->image_dir->entries, l, ei) + { if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) && (ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) && (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) && @@ -201,14 +201,12 @@ output(void) } } - for (l = srcfiles->list; l; l = l->next) + EINA_LIST_FOREACH(srcfiles->list, l, sf) { - SrcFile *sf; char out[4096]; FILE *f; char *pp; - sf = l->data; snprintf(out, sizeof(out), "%s/%s", outdir, sf->name); printf("Output Source File: %s\n", out); pp = strdup(out); @@ -241,14 +239,14 @@ output(void) } if (fontlist) { - for (l = fontlist->list; l; l = l->next) + Font *fn; + + EINA_LIST_FOREACH(fontlist->list, l, fn) { - Font *fn; void *font; int fontsize; char out[4096]; - fn = l->data; snprintf(out, sizeof(out), "fonts/%s", fn->name); font = eet_read(ef, out, &fontsize); if (font) @@ -283,7 +281,7 @@ output(void) { char out[4096]; FILE *f; - SrcFile *sf = srcfiles->list->data; + SrcFile *sf = eina_list_data_get(srcfiles->list); snprintf(out, sizeof(out), "%s/build.sh", outdir); printf("Output Build Script: %s\n", out); @@ -337,7 +335,7 @@ compiler_cmd_is_sane() static int root_filename_is_sane() { - SrcFile *sf = srcfiles->list->data; + SrcFile *sf = eina_list_data_get(srcfiles->list); char *f = sf->name, *ptr; if (!f || !*f) diff --git a/legacy/edje/src/bin/edje_decc.h b/legacy/edje/src/bin/edje_decc.h index a07a103e3e..2f9050e909 100644 --- a/legacy/edje/src/bin/edje_decc.h +++ b/legacy/edje/src/bin/edje_decc.h @@ -17,7 +17,7 @@ struct _Font struct _Font_List { - Evas_List *list; + Eina_List *list; }; struct _SrcFile @@ -28,14 +28,14 @@ struct _SrcFile struct _SrcFile_List { - Evas_List *list; + Eina_List *list; }; void source_edd(void); void source_fetch(void); int source_append(Eet_File *ef); SrcFile_List *source_load(Eet_File *ef); -int source_fontmap_save(Eet_File *ef, Evas_List *fonts); +int source_fontmap_save(Eet_File *ef, Eina_List *fonts); Font_List *source_fontmap_load(Eet_File *ef); void *mem_alloc(size_t size); diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h index 97b58ce9b1..3c60683522 100644 --- a/legacy/edje/src/lib/Edje.h +++ b/legacy/edje/src/lib/Edje.h @@ -175,8 +175,8 @@ extern "C" { EAPI double edje_scale_get (void); /* edje_load.c */ - EAPI Evas_List *edje_file_collection_list (const char *file); - EAPI void edje_file_collection_list_free (Evas_List *lst); + EAPI Eina_List *edje_file_collection_list (const char *file); + EAPI void edje_file_collection_list_free (Eina_List *lst); EAPI int edje_file_group_exists (const char *file, const char *glob); EAPI char *edje_file_data_get (const char *file, const char *key); EAPI void edje_file_cache_set (int count); @@ -190,10 +190,10 @@ extern "C" { /* edje_util.c */ EAPI void edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3); EAPI void edje_color_class_del(const char *color_class); - EAPI Evas_List * edje_color_class_list(void); + EAPI Eina_List * edje_color_class_list(void); EAPI void edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size size); EAPI void edje_text_class_del(const char *text_class); - EAPI Evas_List * edje_text_class_list(void); + EAPI Eina_List * edje_text_class_list(void); EAPI void edje_extern_object_min_size_set (Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh); EAPI void edje_extern_object_aspect_set(Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah); @@ -237,7 +237,7 @@ extern "C" { EAPI const char *edje_object_part_text_get (const Evas_Object *obj, const char *part); EAPI const char *edje_object_part_text_selection_get(const Evas_Object *obj, const char *part); EAPI void edje_object_part_text_insert (Evas_Object *obj, const char *part, const char *text); - EAPI Evas_List *edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part); + EAPI Eina_List *edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part); EAPI void edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void edje_object_part_swallow (Evas_Object *obj, const char *part, Evas_Object *obj_swallow); diff --git a/legacy/edje/src/lib/Edje_Edit.h b/legacy/edje/src/lib/Edje_Edit.h index 0e092a7dd2..7ed5ad8896 100644 --- a/legacy/edje/src/lib/Edje_Edit.h +++ b/legacy/edje/src/lib/Edje_Edit.h @@ -59,12 +59,12 @@ enum { * * Example: print all the part in a loaded edje_object * @code - * Evas_List *parts, *l; + * Eina_List *parts, *l; * * parts = edje_edit_parts_list_get(edje_object); - * while(l = parts; l; l = l->next) + * while(l = parts; l; l = eina_list_nexst(l)) * { - * printf("Part: %s\n", (char*)l->data); + * printf("Part: %s\n", (char*)eina_list_data_get(l)); * } * edje_edit_string_list_free(parts); * @endcode @@ -93,10 +93,10 @@ extern "C" { * General functions that don't fit in other cateories. */ //@{ -/** Free a generic Evas_List of (char *) allocated by an edje_edit_*_get() function.*/ +/** Free a generic Eina_List of (char *) allocated by an edje_edit_*_get() function.*/ EAPI void edje_edit_string_list_free( - Evas_List *lst ///< The list to free. Will also free all the strings. + Eina_List *lst ///< The list to free. Will also free all the strings. ); /** Free a generic string (char *) allocated by an edje_edit_*_get() function.*/ @@ -233,7 +233,7 @@ edje_edit_group_max_h_set( */ //@{ /** Retrieves a list with the item names inside the data block **/ -EAPI Evas_List * ///@return An Evas_List* of string (char *)containing all the data names. +EAPI Eina_List * ///@return An Eina_List* of string (char *)containing all the data names. edje_edit_data_list_get( Evas_Object *obj ///< The edje object ); @@ -289,7 +289,7 @@ edje_edit_data_name_set( /** Get the list of all the Color Classes in the given edje object. * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List * ///@return An Evas_List* of string (char *)containing all the classes names. +EAPI Eina_List * ///@return An Eina_List* of string (char *)containing all the classes names. edje_edit_color_classes_list_get( Evas_Object * obj ///< The edje object ); @@ -372,7 +372,7 @@ edje_edit_color_class_name_set( /**Get the list of all the parts in the given edje object. * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List * ///@return An Evas_List* of string (char *)containing all the part names. +EAPI Eina_List * ///@return An Eina_List* of string (char *)containing all the part names. edje_edit_parts_list_get( Evas_Object *obj ///< The edje object ); @@ -685,7 +685,7 @@ edje_edit_part_drag_event_set( */ //@{ /**Get the list of all the states in the given part.*/ -EAPI Evas_List * /**@return An Evas_List* of string (char *)containing all the states names found +EAPI Eina_List * /**@return An Eina_List* of string (char *)containing all the states names found * in part, including the float value (ex: "default 0.00"). * Use edje_edit_string_list_free() when you don't need it anymore. */ edje_edit_part_states_list_get( @@ -1424,7 +1424,7 @@ edje_edit_state_text_fit_y_set( /**Get the list of all the fonts in the given edje. * Use edje_edit_string_list_free() when you don't need the list anymore. */ -EAPI Evas_List * ///@return An Evas_List* of string (char *)containing all the fonts names found in the edje file. +EAPI Eina_List * ///@return An Eina_List* of string (char *)containing all the fonts names found in the edje file. edje_edit_fonts_list_get( Evas_Object *obj ///< The edje object ); @@ -1467,7 +1467,7 @@ edje_edit_state_font_set( /**Get the list of all the images in the given edje. * Use edje_edit_string_list_free() when you don't need the list anymore. */ -EAPI Evas_List * ///@return An Evas_List* of string (char *)containing all the images names found in the edje file. +EAPI Eina_List * ///@return An Eina_List* of string (char *)containing all the images names found in the edje file. edje_edit_images_list_get( Evas_Object *obj ///< The edje object ); @@ -1571,7 +1571,7 @@ edje_edit_state_image_border_fill_set( /**Get the list of all the tweens images in the given part state. * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List * ///@return A string list containing all the image name that form a tween animation in the given part state +EAPI Eina_List * ///@return A string list containing all the image name that form a tween animation in the given part state edje_edit_state_tweens_list_get( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1612,7 +1612,7 @@ edje_edit_state_tween_del( /**Get the list of all the spectrum in the given edje object. * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List * ///@return An Evas_List* of string(char *) containing all the spectra names. +EAPI Eina_List * ///@return An Eina_List* of string(char *) containing all the spectra names. edje_edit_spectrum_list_get( Evas_Object *obj ///< The edje object ); @@ -1896,10 +1896,10 @@ edje_edit_state_gradient_rel2_offset_y_set( /**Get the list of all the programs in the given edje object. * @param obj The edje object - * @return An Evas_List* of string (char *)containing all the program names. + * @return An Eina_List* of string (char *)containing all the program names. * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List * ///@return A string list containing all the program names +EAPI Eina_List * ///@return A string list containing all the program names edje_edit_programs_list_get( Evas_Object *obj ///< The edje object ); @@ -2027,7 +2027,7 @@ edje_edit_program_action_set( * Return a list of target name * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List* ///@return An Evas_List of char*, or NULL on error +EAPI Eina_List* ///@return An Eina_List of char*, or NULL on error edje_edit_program_targets_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name @@ -2055,7 +2055,7 @@ edje_edit_program_targets_clear( * Return a list of program name. * Use edje_edit_string_list_free() when you don't need it anymore. */ -EAPI Evas_List* ///@return An Evas_List of char*, or NULL on error +EAPI Eina_List* ///@return An Eina_List of char*, or NULL on error edje_edit_program_afters_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name diff --git a/legacy/edje/src/lib/edje_cache.c b/legacy/edje/src/lib/edje_cache.c index efb5136cf0..0048b65935 100644 --- a/legacy/edje/src/lib/edje_cache.c +++ b/legacy/edje/src/lib/edje_cache.c @@ -6,7 +6,7 @@ static Evas_Hash *_edje_file_hash = NULL; static int _edje_file_cache_size = 16; -static Evas_List *_edje_file_cache = NULL; +static Eina_List *_edje_file_cache = NULL; static int _edje_collection_cache_size = 16; @@ -14,16 +14,14 @@ static Edje_Part_Collection * _edje_file_coll_open(Edje_File *edf, const char *coll) { Edje_Part_Collection *edc = NULL; - Evas_List *l = NULL; + Edje_Part_Collection_Directory_Entry *ce; + Eina_List *l = NULL; int id = -1, size = 0; char buf[256]; void *data; - for (l = edf->collection_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(edf->collection_dir->entries, l, ce) { - Edje_Part_Collection_Directory_Entry *ce; - - ce = l->data; if ((ce->entry) && (!strcmp(ce->entry, coll))) { id = ce->id; @@ -58,14 +56,14 @@ _edje_font_hash(Edje_File *edf) if (edf->font_dir) { - Evas_List *l; - for (l = edf->font_dir->entries; l; l = evas_list_next(l)) + Eina_List *l; + Edje_Font_Directory_Entry *fnt; + + EINA_LIST_FOREACH(edf->font_dir->entries, l, fnt) { - Edje_Font_Directory_Entry *fnt; int length; char *tmp; - fnt = l->data; length = strlen(fnt->entry) + 7; tmp = alloca(length); @@ -87,8 +85,9 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co { Edje_File *edf; Edje_Part_Collection *edc; + Edje_Data *di; Eet_File *ef; - Evas_List *l; + Eina_List *l; struct stat st; if (stat(file, &st) != 0) @@ -133,11 +132,8 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co _edje_textblock_style_parse_and_fix(edf); - for (l = edf->data; l; l = l->next) - { - Edje_Data *di = l->data; - edf->data_cache = evas_hash_add(edf->data_cache, eina_stringshare_add(di->key), di->value); - } + EINA_LIST_FOREACH(edf->data, l, di) + edf->data_cache = evas_hash_add(edf->data_cache, eina_stringshare_add(di->key), di->value); if (coll) { @@ -160,8 +156,9 @@ Edje_File * _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret) { Edje_File *edf; - Evas_List *l, *hist; + Eina_List *l, *hist; Edje_Part_Collection *edc; + Edje_Part *ep; edf = evas_hash_find(_edje_file_hash, file); if (edf) @@ -170,13 +167,12 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E } else { - for (l = _edje_file_cache; l; l = l->next) + EINA_LIST_FOREACH(_edje_file_cache, l, edf) { - edf = l->data; if (!strcmp(edf->path, file)) { edf->references = 1; - _edje_file_cache = evas_list_remove_list(_edje_file_cache, l); + _edje_file_cache = eina_list_remove_list(_edje_file_cache, l); _edje_file_hash = evas_hash_add(_edje_file_hash, file, edf); break; } @@ -200,13 +196,12 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E } else { - for (l = edf->collection_cache; l; l = l->next) + EINA_LIST_FOREACH(edf->collection_cache, l, edc) { - edc = l->data; if (!strcmp(edc->part, coll)) { edc->references = 1; - edf->collection_cache = evas_list_remove_list(edf->collection_cache, l); + edf->collection_cache = eina_list_remove_list(edf->collection_cache, l); edf->collection_hash = evas_hash_add(edf->collection_hash, coll, edc); break; } @@ -222,29 +217,28 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E } else { - for (l = edc->parts; l; l = l->next) + EINA_LIST_FOREACH(edc->parts, l, ep) { - Edje_Part *ep, *ep2; + Edje_Part *ep2; /* Register any color classes in this parts descriptions. */ - ep = l->data; hist = NULL; - hist = evas_list_append(hist, ep); + hist = eina_list_append(hist, ep); ep2 = ep; while (ep2->dragable.confine_id >= 0) { - ep2 = evas_list_nth(edc->parts, ep2->dragable.confine_id); - if (evas_list_find(hist, ep2)) + ep2 = eina_list_nth(edc->parts, ep2->dragable.confine_id); + if (eina_list_data_find(hist, ep2)) { printf("EDJE ERROR: confine_to loops. invalidating loop.\n"); ep2->dragable.confine_id = -1; break; } - hist = evas_list_append(hist, ep2); + hist = eina_list_append(hist, ep2); } - evas_list_free(hist); + eina_list_free(hist); hist = NULL; - hist = evas_list_append(hist, ep); + hist = eina_list_append(hist, ep); ep2 = ep; while (ep2->dragable.events_id >= 0) { @@ -252,37 +246,37 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E prev = ep2; - ep2 = evas_list_nth(edc->parts, ep2->dragable.events_id); + ep2 = eina_list_nth(edc->parts, ep2->dragable.events_id); if (!ep2->dragable.x && !ep2->dragable.y) { prev->dragable.events_id = -1; break; } - if (evas_list_find(hist, ep2)) + if (eina_list_data_find(hist, ep2)) { printf("EDJE ERROR: events_to loops. invalidating loop.\n"); ep2->dragable.events_id = -1; break; } - hist = evas_list_append(hist, ep2); + hist = eina_list_append(hist, ep2); } - evas_list_free(hist); + eina_list_free(hist); hist = NULL; - hist = evas_list_append(hist, ep); + hist = eina_list_append(hist, ep); ep2 = ep; while (ep2->clip_to_id >= 0) { - ep2 = evas_list_nth(edc->parts, ep2->clip_to_id); - if (evas_list_find(hist, ep2)) + ep2 = eina_list_nth(edc->parts, ep2->clip_to_id); + if (eina_list_data_find(hist, ep2)) { printf("EDJE ERROR: clip_to loops. invalidating loop.\n"); ep2->clip_to_id = -1; break; } - hist = evas_list_append(hist, ep2); + hist = eina_list_append(hist, ep2); } - evas_list_free(hist); + eina_list_free(hist); hist = NULL; } } @@ -297,15 +291,15 @@ _edje_cache_coll_clean(Edje_File *edf) { int count; - count = evas_list_count(edf->collection_cache); + count = eina_list_count(edf->collection_cache); while ((edf->collection_cache) && (count > _edje_collection_cache_size)) { Edje_Part_Collection *edc; - edc = evas_list_last(edf->collection_cache)->data; - edf->collection_cache = evas_list_remove_list(edf->collection_cache, evas_list_last(edf->collection_cache)); + edc = eina_list_data_get(eina_list_last(edf->collection_cache)); + edf->collection_cache = eina_list_remove_list(edf->collection_cache, eina_list_last(edf->collection_cache)); _edje_collection_free(edf, edc); - count = evas_list_count(edf->collection_cache); + count = eina_list_count(edf->collection_cache); } } @@ -316,8 +310,8 @@ _edje_cache_coll_flush(Edje_File *edf) { Edje_Part_Collection *edc; - edc = evas_list_last(edf->collection_cache)->data; - edf->collection_cache = evas_list_remove_list(edf->collection_cache, evas_list_last(edf->collection_cache)); + edc = eina_list_data_get(eina_list_last(edf->collection_cache)); + edf->collection_cache = eina_list_remove_list(edf->collection_cache, eina_list_last(edf->collection_cache)); _edje_collection_free(edf, edc); } } @@ -328,7 +322,7 @@ _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc) edc->references--; if (edc->references != 0) return; edf->collection_hash = evas_hash_del(edf->collection_hash, edc->part, edc); - edf->collection_cache = evas_list_prepend(edf->collection_cache, edc); + edf->collection_cache = eina_list_prepend(edf->collection_cache, edc); _edje_cache_coll_clean(edf); } @@ -337,15 +331,15 @@ _edje_cache_file_clean(void) { int count; - count = evas_list_count(_edje_file_cache); + count = eina_list_count(_edje_file_cache); while ((_edje_file_cache) && (count > _edje_file_cache_size)) { Edje_File *edf; - edf = evas_list_last(_edje_file_cache)->data; - _edje_file_cache = evas_list_remove_list(_edje_file_cache, evas_list_last(_edje_file_cache)); + edf = eina_list_data_get(eina_list_last(_edje_file_cache)); + _edje_file_cache = eina_list_remove_list(_edje_file_cache, eina_list_last(_edje_file_cache)); _edje_file_free(edf); - count = evas_list_count(_edje_file_cache); + count = eina_list_count(_edje_file_cache); } } @@ -355,7 +349,7 @@ _edje_cache_file_unref(Edje_File *edf) edf->references--; if (edf->references != 0) return; _edje_file_hash = evas_hash_del(_edje_file_hash, edf->path, edf); - _edje_file_cache = evas_list_prepend(_edje_file_cache, edf); + _edje_file_cache = eina_list_prepend(_edje_file_cache, edf); _edje_cache_file_clean(); } @@ -398,17 +392,13 @@ edje_file_cache_flush(void) EAPI void edje_collection_cache_set(int count) { - Evas_List *l; + Eina_List *l; + Edje_File *edf; if (count < 0) count = 0; _edje_collection_cache_size = count; - for (l = _edje_file_cache; l; l = l->next) - { - Edje_File *edf; - - edf = l->data; - _edje_cache_coll_clean(edf); - } + EINA_LIST_FOREACH(_edje_file_cache, l, edf) + _edje_cache_coll_clean(edf); /* FIXME: freach in file hash too! */ } @@ -422,17 +412,13 @@ EAPI void edje_collection_cache_flush(void) { int ps; - Evas_List *l; + Eina_List *l; + Edje_File *edf; ps = _edje_collection_cache_size; _edje_collection_cache_size = 0; - for (l = _edje_file_cache; l; l = l->next) - { - Edje_File *edf; - - edf = l->data; - _edje_cache_coll_flush(edf); - } + EINA_LIST_FOREACH(_edje_file_cache, l, edf) + _edje_cache_coll_flush(edf); /* FIXME: freach in file hash too! */ _edje_collection_cache_size = ps; } diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index aa183f46e1..d412a00a18 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -53,7 +53,8 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *name, { Edje_Part *ep = rp->part; Edje_Part_Description *ret = NULL; - Evas_List *l; + Edje_Part_Description *d; + Eina_List *l; double min_dst = 999.0; if (!strcmp(name, "default") && val == 0.0) @@ -67,11 +68,8 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *name, ret = ep->default_desc; min_dst = ABS(ep->default_desc->state.value - val); } - - for (l = ep->other_desc; l; l = l->next) + EINA_LIST_FOREACH(ep->other_desc, l, d) { - Edje_Part_Description *d = l->data; - if (!strcmp(d->state.name, name)) { double dst; @@ -602,7 +600,7 @@ _edje_part_recalc_single(Edje *ed, const char *text = ""; const char *style = ""; Edje_Style *stl = NULL; - Evas_List *l; + Eina_List *l; if (chosen_desc->text.id_source >= 0) { @@ -630,9 +628,8 @@ _edje_part_recalc_single(Edje *ed, if (ep->text.text) text = ep->text.text; } - for (l = ed->file->styles; l; l = l->next) + EINA_LIST_FOREACH(ed->file->styles, l, stl) { - stl = l->data; if ((stl->name) && (!strcmp(stl->name, style))) break; stl = NULL; } @@ -1165,15 +1162,15 @@ _edje_gradient_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, p3->gradient.id != ep->gradient_id) { Edje_Spectrum_Directory_Entry *se; - Evas_List *l; + Edje_Spectrum_Color *sc; + Eina_List *l; - se = evas_list_nth(ed->file->spectrum_dir->entries, p3->gradient.id); + se = eina_list_nth(ed->file->spectrum_dir->entries, p3->gradient.id); if (se) { evas_object_gradient_clear(ep->object); - for (l = se->color_list; l; l = l->next) + EINA_LIST_FOREACH(se->color_list, l, sc) { - Edje_Spectrum_Color *sc = l->data; evas_object_gradient_color_stop_add(ep->object, sc->r, sc->g, sc->b, 255, sc->d); @@ -1205,7 +1202,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj Edje_Image_Directory_Entry *ie; if (!ed->file->image_dir) ie = NULL; - else ie = evas_list_nth(ed->file->image_dir->entries, (-image_id) - 1); + else ie = eina_list_nth(ed->file->image_dir->entries, (-image_id) - 1); if ((ie) && (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) && (ie->entry)) @@ -1217,7 +1214,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj { image_count = 2; if (ep->param2.description) - image_count += evas_list_count(ep->param2.description->image.tween_list); + image_count += eina_list_count(ep->param2.description->image.tween_list); image_num = (pos * ((double)image_count - 0.5)); if (image_num > (image_count - 1)) image_num = image_count - 1; @@ -1229,7 +1226,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj { Edje_Part_Image_Id *imid; - imid = evas_list_nth(ep->param2.description->image.tween_list, + imid = eina_list_nth(ep->param2.description->image.tween_list, image_num - 1); if (imid) image_id = imid->id; } diff --git a/legacy/edje/src/lib/edje_callbacks.c b/legacy/edje/src/lib/edje_callbacks.c index f95ded1a97..3fef44265d 100644 --- a/legacy/edje/src/lib/edje_callbacks.c +++ b/legacy/edje/src/lib/edje_callbacks.c @@ -334,61 +334,62 @@ int _edje_timer_cb(void *data) { double t; - Evas_List *l; - Evas_List *animl = NULL; + Eina_List *l; + Eina_List *animl = NULL; Edje *ed; t = ecore_time_get(); - for (l = _edje_animators; l; l = l->next) + EINA_LIST_FOREACH(_edje_animators, l, ed) { - ed = l->data; _edje_ref(ed); - animl = evas_list_append(animl, l->data); + animl = eina_list_append(animl, ed); } while (animl) { - Evas_List *newl = NULL; + Eina_List *newl = NULL; - ed = animl->data; + ed = eina_list_data_get(animl); _edje_block(ed); _edje_freeze(ed); - animl = evas_list_remove(animl, animl->data); + animl = eina_list_remove(animl, eina_list_data_get(animl)); if ((!ed->paused) && (!ed->delete_me)) { + const void *tmp; + ed->walking_actions = 1; - for (l = ed->actions; l; l = l->next) - newl = evas_list_append(newl, l->data); + EINA_LIST_FOREACH(ed->actions, l, tmp) + newl = eina_list_append(newl, tmp); while (newl) { Edje_Running_Program *runp; - runp = newl->data; - newl = evas_list_remove(newl, newl->data); + runp = eina_list_data_get(newl); + newl = eina_list_remove(newl, eina_list_data_get(newl)); if (!runp->delete_me) _edje_program_run_iterate(runp, t); if (_edje_block_break(ed)) { - evas_list_free(newl); + eina_list_free(newl); newl = NULL; goto break_prog; } } - for (l = ed->actions; l; l = l->next) - newl = evas_list_append(newl, l->data); + EINA_LIST_FOREACH(ed->actions, l, tmp) + newl = eina_list_append(newl, tmp); while (newl) { Edje_Running_Program *runp; - runp = newl->data; - newl = evas_list_remove(newl, newl->data); + runp = eina_list_data_get(newl); + newl = eina_list_remove(newl, eina_list_data_get(newl)); if (runp->delete_me) { _edje_anim_count--; runp->edje->actions = - evas_list_remove(runp->edje->actions, runp); + eina_list_remove(runp->edje->actions, runp); if (!runp->edje->actions) _edje_animators = - evas_list_remove(_edje_animators, runp->edje); + eina_list_remove(_edje_animators, runp->edje); free(runp); } } @@ -411,7 +412,7 @@ _edje_pending_timer_cb(void *data) Edje_Pending_Program *pp; pp = data; - pp->edje->pending_actions = evas_list_remove(pp->edje->pending_actions, pp); + pp->edje->pending_actions = eina_list_remove(pp->edje->pending_actions, pp); _edje_program_run(pp->edje, pp->program, 1, "", ""); free(pp); return 0; diff --git a/legacy/edje/src/lib/edje_container.c b/legacy/edje/src/lib/edje_container.c index 9a426cc41a..b8b75136ed 100644 --- a/legacy/edje/src/lib/edje_container.c +++ b/legacy/edje/src/lib/edje_container.c @@ -10,8 +10,9 @@ static void _edje_container_relayout(Smart_Data *sd) { - Evas_List *l; + Eina_List *l; Evas_Coord x, y, w, h, sw; + Edje_Item *ei; if (sd->freeze > 0) return; if (!sd->need_layout) return; @@ -25,11 +26,8 @@ _edje_container_relayout(Smart_Data *sd) w = 0; h = 0; - for (l = sd->children; l; l = l->next) + EINA_LIST_FOREACH(sd->children, l, ei) { - Edje_Item *ei; - - ei = l->data; if (sd->homogenous) h = sd->min_row_h; ei->y = y; @@ -44,7 +42,8 @@ _edje_container_relayout(Smart_Data *sd) static void _edje_container_recalc(Smart_Data *sd) { - Evas_List *l; + Eina_List *l; + Edje_Item *ei; int any_max_h = 0, any_max_w = 0; int i; @@ -80,11 +79,8 @@ _edje_container_recalc(Smart_Data *sd) else if ((sd->max_w >= 0) && (sd->w < sd->max_w)) sd->w = sd->max_w; - for (l = sd->children; l; l = l->next) + EINA_LIST_FOREACH(sd->children, l, ei) { - Edje_Item *ei; - - ei = l->data; if (ei->minh > sd->min_row_h) sd->min_row_h = ei->minh; if (sd->max_row_h >= 0) @@ -115,7 +111,7 @@ _edje_container_recalc(Smart_Data *sd) } if (sd->homogenous) { - sd->min_h = evas_list_count(sd->children) * sd->min_row_h; + sd->min_h = eina_list_count(sd->children) * sd->min_row_h; } sd->changed = 0; @@ -451,10 +447,10 @@ edje_container_item_append(Evas_Object *obj, Edje_Item *ei) sd = evas_object_smart_data_get(obj); if (!sd) return; - sd->children = evas_list_append(sd->children, ei); + sd->children = eina_list_append(sd->children, ei); sd->changed = 1; sd->change_child_list = 1; - sd->rows = evas_list_count(sd->children); + sd->rows = eina_list_count(sd->children); _edje_container_recalc(sd); } @@ -465,10 +461,10 @@ edje_container_item_prepend(Evas_Object *obj, Edje_Item *ei) sd = evas_object_smart_data_get(obj); if (!sd) return; - sd->children = evas_list_prepend(sd->children, ei); + sd->children = eina_list_prepend(sd->children, ei); sd->changed = 1; sd->change_child_list = 1; - sd->rows = evas_list_count(sd->children); + sd->rows = eina_list_count(sd->children); _edje_container_recalc(sd); } @@ -479,10 +475,10 @@ edje_container_item_append_relative(Evas_Object *obj, Edje_Item *ei, Edje_Item * sd = evas_object_smart_data_get(obj); if (!sd) return; - sd->children = evas_list_append_relative(sd->children, ei, rel); + sd->children = eina_list_append_relative(sd->children, ei, rel); sd->changed = 1; sd->change_child_list = 1; - sd->rows = evas_list_count(sd->children); + sd->rows = eina_list_count(sd->children); _edje_container_recalc(sd); } @@ -493,10 +489,10 @@ edje_container_item_prepend_relative(Evas_Object *obj, Edje_Item *ei, Edje_Item sd = evas_object_smart_data_get(obj); if (!sd) return; - sd->children = evas_list_prepend_relative(sd->children, ei, rel); + sd->children = eina_list_prepend_relative(sd->children, ei, rel); sd->changed = 1; sd->change_child_list = 1; - sd->rows = evas_list_count(sd->children); + sd->rows = eina_list_count(sd->children); _edje_container_recalc(sd); } @@ -508,14 +504,14 @@ edje_container_item_insert(Evas_Object *obj, Edje_Item *ei, int n) sd = evas_object_smart_data_get(obj); if (!sd) return; - rel = evas_list_nth(sd->children, n); + rel = eina_list_nth(sd->children, n); if (!rel) - sd->children = evas_list_append(sd->children, ei); + sd->children = eina_list_append(sd->children, ei); else - sd->children = evas_list_append_relative(sd->children, ei, rel); + sd->children = eina_list_append_relative(sd->children, ei, rel); sd->changed = 1; sd->change_child_list = 1; - sd->rows = evas_list_count(sd->children); + sd->rows = eina_list_count(sd->children); _edje_container_recalc(sd); } @@ -526,10 +522,10 @@ edje_container_item_remove(Evas_Object *obj, Edje_Item *ei) sd = evas_object_smart_data_get(obj); if (!sd) return; - sd->children = evas_list_remove(sd->children, ei); + sd->children = eina_list_remove(sd->children, ei); sd->changed = 1; sd->change_child_list = 1; - sd->rows = evas_list_count(sd->children); + sd->rows = eina_list_count(sd->children); _edje_container_recalc(sd); } @@ -640,7 +636,7 @@ edje_container_count_get(Evas_Object *obj) sd = evas_object_smart_data_get(obj); if (!sd) return 0; - return evas_list_count(sd->children); + return eina_list_count(sd->children); } Edje_Item * @@ -651,7 +647,7 @@ edje_container_item_first_get(Evas_Object *obj) sd = evas_object_smart_data_get(obj); if (!sd) return NULL; if (!sd->children) return NULL; - return sd->children->data; + return eina_list_data_get(sd->children); } Edje_Item * @@ -662,7 +658,7 @@ edje_container_item_last_get(Evas_Object *obj) sd = evas_object_smart_data_get(obj); if (!sd) return NULL; if (!sd->children) return NULL; - return evas_list_last(sd->children)->data; + return0 eina_list_data_get(eina_list_last(sd->children)); } Edje_Item * @@ -672,7 +668,7 @@ edje_container_item_nth_get(Evas_Object *obj, int n) sd = evas_object_smart_data_get(obj); if (!sd) return NULL; - return evas_list_nth(sd->children, n); + return eina_list_nth(sd->children, n); } void diff --git a/legacy/edje/src/lib/edje_container.h b/legacy/edje/src/lib/edje_container.h index fd2fb1058c..b2b154edf1 100644 --- a/legacy/edje/src/lib/edje_container.h +++ b/legacy/edje/src/lib/edje_container.h @@ -37,7 +37,7 @@ typedef struct _Smart_Data_Colinfo Smart_Data_Colinfo; struct _Smart_Data { Evas_Coord x, y, w, h; - Evas_List *children; + Eina_List *children; Evas_Object *smart_obj; int cols, rows; diff --git a/legacy/edje/src/lib/edje_data.c b/legacy/edje/src/lib/edje_data.c index 204bf3f63e..f2f9ddd430 100644 --- a/legacy/edje/src/lib/edje_data.c +++ b/legacy/edje/src/lib/edje_data.c @@ -83,10 +83,10 @@ _edje_edd_setup(void) eddc.func.mem_free = NULL; eddc.func.str_alloc = (char *(*)(const char *))eina_stringshare_add; eddc.func.str_free = eina_stringshare_del; - eddc.func.list_next = (void *(*)(void *))evas_list_next; - eddc.func.list_append = (void *(*)(void *, void *))evas_list_append; - eddc.func.list_data = (void *(*)(void *))evas_list_data; - eddc.func.list_free = (void *(*)(void *))evas_list_free; + eddc.func.list_next = (void *(*)(void *))eina_list_next; + eddc.func.list_append = (void *(*)(void *, void *))eina_list_append; + eddc.func.list_data = (void *(*)(void *))eina_list_data_get; + eddc.func.list_free = (void *(*)(void *))eina_list_free; eddc.func.hash_foreach = (void (*)(void *, int (*)(void *, const char *, void *, void *), void *))evas_hash_foreach; eddc.func.hash_add = (void *(*)(void *, const char *, void *))evas_hash_add; eddc.func.hash_free = (void (*)(void *))evas_hash_free; diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c index 9e3445140b..2d6d5568a8 100644 --- a/legacy/edje/src/lib/edje_edit.c +++ b/legacy/edje/src/lib/edje_edit.c @@ -116,7 +116,7 @@ static int _edje_image_id_find(Evas_Object *obj, const char *image_name) { Edje_Image_Directory_Entry *i; - Evas_List *l; + Eina_List *l; GET_ED_OR_RETURN(-1); @@ -125,9 +125,8 @@ _edje_image_id_find(Evas_Object *obj, const char *image_name) //printf("SEARCH IMAGE %s\n", image_name); - for (l = ed->file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->image_dir->entries, l, i) { - i = l->data; if (strcmp(image_name, i->entry) == 0) { //printf(" Found id: %d \n", i->id); @@ -142,7 +141,7 @@ static const char * _edje_image_name_find(Evas_Object *obj, int image_id) { Edje_Image_Directory_Entry *i; - Evas_List *l; + Eina_List *l; GET_ED_OR_RETURN(NULL); @@ -151,12 +150,9 @@ _edje_image_name_find(Evas_Object *obj, int image_id) //printf("SEARCH IMAGE ID %d\n", image_id); - for (l = ed->file->image_dir->entries; l; l = l->next) - { - i = l->data; - if (image_id == i->id) - return i->entry; - } + EINA_LIST_FOREACH(ed->file->image_dir->entries, l, i) + if (image_id == i->id) + return i->entry; return NULL; } @@ -164,7 +160,7 @@ _edje_image_name_find(Evas_Object *obj, int image_id) static void _edje_real_part_free(Edje_Real_Part *rp) { - Evas_List *l; + Eina_List *l; if (!rp) return; @@ -178,8 +174,8 @@ _edje_real_part_free(Edje_Real_Part *rp) l = rp->extra_objects; while (rp->extra_objects) { - evas_object_del(rp->extra_objects->data); - rp->extra_objects = evas_list_remove_list(rp->extra_objects, + evas_object_del(eina_list_data_get(rp->extra_objects)); + rp->extra_objects = eina_list_remove_list(rp->extra_objects, rp->extra_objects); } @@ -321,7 +317,9 @@ _edje_part_id_set(Edje *ed, Edje_Real_Part *rp, int new_id) */ int old_id; Edje_Part *part; - Evas_List *l, *ll; + Eina_List *l, *ll; + Edje_Part *p; + Edje_Program *epr; part = rp->part; @@ -336,12 +334,10 @@ _edje_part_id_set(Edje *ed, Edje_Real_Part *rp, int new_id) part->id = new_id; /* Fix all the dependecies in all parts... */ - for (l = ed->collection->parts; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->parts, l, p) { - Edje_Part *p; Edje_Part_Description *d; - p = l->data; //printf(" search id: %d in %s\n", old_id, p->name); if (p->clip_to_id == old_id) p->clip_to_id = new_id; if (p->dragable.confine_id == old_id) p->dragable.confine_id = new_id; @@ -356,9 +352,8 @@ _edje_part_id_set(Edje *ed, Edje_Real_Part *rp, int new_id) if (d->text.id_source == old_id) d->text.id_source = new_id; if (d->text.id_text_source == old_id) d->text.id_text_source = new_id; /* ...and in all other descriptions */ - for (ll = p->other_desc; ll; ll = ll->next) + EINA_LIST_FOREACH(p->other_desc, ll, d) { - d = ll->data; //printf(" search in %s (%s)\n", p->name, d->state.name); if (d->rel1.id_x == old_id) d->rel1.id_x = new_id; if (d->rel1.id_y == old_id) d->rel1.id_y = new_id; @@ -370,23 +365,19 @@ _edje_part_id_set(Edje *ed, Edje_Real_Part *rp, int new_id) } /*...and also in programs targets */ - for (l = ed->collection->programs; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->programs, l, epr) { - Edje_Program *epr; + Edje_Program_Target *pt; - epr = l->data; if (epr->action != EDJE_ACTION_TYPE_STATE_SET) continue; - for (ll = epr->targets; ll; ll = ll->next) + EINA_LIST_FOREACH(epr->targets, ll, pt) { - Edje_Program_Target *pt; - - pt = ll->data; if (pt->id == old_id) { if (new_id == -1) - epr->targets = evas_list_remove(epr->targets, pt); + epr->targets = eina_list_remove(epr->targets, pt); else pt->id = new_id; } @@ -408,7 +399,9 @@ _edje_parts_id_switch(Edje *ed, Edje_Real_Part *rp1, Edje_Real_Part *rp2) */ int id1; int id2; - Evas_List *l, *ll; + Eina_List *l, *ll; + Edje_Part *p; + Edje_Program *epr; printf("SWITCH ID OF PART %d AND %d\n", rp1->part->id, rp2->part->id); @@ -427,13 +420,11 @@ _edje_parts_id_switch(Edje *ed, Edje_Real_Part *rp1, Edje_Real_Part *rp2) ed->table_parts[id2] = rp1; // Fix all the dependecies in all parts... - for (l = ed->collection->parts; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->parts, l, p) { - Edje_Part *p; - Evas_List *ll; + Eina_List *ll; Edje_Part_Description *d; - p = l->data; //printf(" search id: %d in %s\n", old_id, p->name); if (p->clip_to_id == id1) p->clip_to_id = id2; else if (p->clip_to_id == id2) p->clip_to_id = id1; @@ -456,9 +447,8 @@ _edje_parts_id_switch(Edje *ed, Edje_Real_Part *rp1, Edje_Real_Part *rp2) if (d->text.id_text_source == id1) d->text.id_text_source = id2; else if (d->text.id_text_source == id2) d->text.id_text_source = id2; // ...and in all other descriptions - for (ll = p->other_desc; ll; ll = ll->next) + EINA_LIST_FOREACH(p->other_desc, ll, d) { - d = ll->data; //printf(" search in %s (%s)\n", p->name, d->state.name); if (d->rel1.id_x == id1) d->rel1.id_x = id2; else if (d->rel1.id_x == id2) d->rel1.id_x = id1; @@ -475,19 +465,15 @@ _edje_parts_id_switch(Edje *ed, Edje_Real_Part *rp1, Edje_Real_Part *rp2) } } //...and also in programs targets - for (l = ed->collection->programs; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->programs, l, epr) { - Edje_Program *epr; + Edje_Program_Target *pt; - epr = l->data; if (epr->action != EDJE_ACTION_TYPE_STATE_SET) continue; - for (ll = epr->targets; ll; ll = ll->next) + EINA_LIST_FOREACH(epr->targets, ll, pt) { - Edje_Program_Target *pt; - - pt = ll->data; if (pt->id == id1) pt->id = id2; else if (pt->id == id2) pt->id = id1; } @@ -502,7 +488,8 @@ _edje_fix_parts_id(Edje *ed) * After the execution of this function all parts will have a right * (uniqe & ordered) id. The table_parts is also updated. */ - Evas_List *l; + Eina_List *l; + Edje_Part *p; int correct_id; int count; @@ -512,11 +499,8 @@ _edje_fix_parts_id(Edje *ed) /* Give a correct id to all the parts */ correct_id = 0; - for (l = ed->collection->parts; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->parts, l, p) { - Edje_Part *p; - - p = l->data; //printf(" [%d]Checking part: %s id: %d\n", correct_id, p->name, p->id); if (p->id != correct_id) _edje_part_id_set(ed, ed->table_parts[p->id], correct_id); @@ -525,7 +509,7 @@ _edje_fix_parts_id(Edje *ed) } /* If we have removed some parts realloc table_parts */ - count = evas_list_count(ed->collection->parts); + count = eina_list_count(ed->collection->parts); if (count != ed->table_parts_size) { ed->table_parts = realloc(ed->table_parts, SZ(Edje_Real_Part *) * count); @@ -552,19 +536,14 @@ Edje_Spectrum_Directory_Entry * _edje_edit_spectrum_entry_get(Edje *ed, const char* spectra) { Edje_Spectrum_Directory_Entry *s; - Evas_List *l; + Eina_List *l; if (!ed->file || !spectra || !ed->file->spectrum_dir) return NULL; - for (l = ed->file->spectrum_dir->entries; l; l = l->next) - { - Edje_Spectrum_Directory_Entry *s; - - s = l->data; - if (!strcmp(s->entry, spectra)) - return s; - } + EINA_LIST_FOREACH(ed->file->spectrum_dir->entries, l, s) + if (!strcmp(s->entry, spectra)) + return s; return NULL; } @@ -572,19 +551,15 @@ _edje_edit_spectrum_entry_get(Edje *ed, const char* spectra) Edje_Spectrum_Directory_Entry * _edje_edit_spectrum_entry_get_by_id(Edje *ed, int spectra_id) { - Evas_List *l; + Edje_Spectrum_Directory_Entry *s; + Eina_List *l; if (!ed->file || !ed->file->spectrum_dir) return NULL; - for (l = ed->file->spectrum_dir->entries; l; l = l->next) - { - Edje_Spectrum_Directory_Entry *s; - - s = l->data; - if (s->id == spectra_id) - return s; - } + EINA_LIST_FOREACH(ed->file->spectrum_dir->entries, l, s) + if (s->id == spectra_id) + return s; return NULL; } @@ -594,14 +569,14 @@ _edje_edit_spectrum_entry_get_by_id(Edje *ed, int spectra_id) /*****************/ EAPI void -edje_edit_string_list_free(Evas_List *lst) +edje_edit_string_list_free(Eina_List *lst) { //printf("FREE LIST: \n"); while (lst) { - if (lst->data) eina_stringshare_del(lst->data); - //printf("FREE: %s\n", lst->data); - lst = evas_list_remove(lst, lst->data); + if (eina_list_data_get(lst)) eina_stringshare_del(eina_list_data_get(lst)); + //printf("FREE: %s\n", eina_list_data_get(lst)); + lst = eina_list_remove(lst, eina_list_data_get(lst)); } } @@ -626,8 +601,9 @@ EAPI unsigned char edje_edit_group_add(Evas_Object *obj, const char *name) { Edje_Part_Collection_Directory_Entry *de; + Edje_Part_Collection_Directory_Entry *d; Edje_Part_Collection *pc; - Evas_List *l; + Eina_List *l; int id; int search; //Code *cd; @@ -637,12 +613,9 @@ edje_edit_group_add(Evas_Object *obj, const char *name) printf("ADD GROUP: %s \n", name); /* check if a group with the same name already exists */ - for (l = ed->file->collection_dir->entries; l; l = l->next) - { - Edje_Part_Collection_Directory_Entry *d = l->data; - if (!strcmp(d->entry, name)) - return 0; - } + EINA_LIST_FOREACH(ed->file->collection_dir->entries, l, d) + if (!strcmp(d->entry, name)) + return 0; /* Create structs */ de = mem_alloc(SZ(Edje_Part_Collection_Directory_Entry)); @@ -662,10 +635,8 @@ edje_edit_group_add(Evas_Object *obj, const char *name) { unsigned char found = 0; - for (l = ed->file->collection_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->collection_dir->entries, l, d) { - Edje_Part_Collection_Directory_Entry *d = l->data; - // printf("search if %d is free [id %d]\n", search, d->id); if (search == d->id) { @@ -683,7 +654,7 @@ edje_edit_group_add(Evas_Object *obj, const char *name) printf(" new id: %d\n", id); de->id = id; de->entry = mem_strdup(name); - ed->file->collection_dir->entries = evas_list_append(ed->file->collection_dir->entries, de); + ed->file->collection_dir->entries = eina_list_append(ed->file->collection_dir->entries, de); /* Init Edje_Part_Collection */ pc->id = id; @@ -695,7 +666,7 @@ edje_edit_group_add(Evas_Object *obj, const char *name) pc->part = eina_stringshare_add(name); //cd = mem_alloc(SZ(Code)); - //codes = evas_list_append(codes, cd); + //codes = eina_list_append(codes, cd); ed->file->collection_hash = evas_hash_add(ed->file->collection_hash, name, pc); @@ -707,10 +678,11 @@ EAPI unsigned char edje_edit_group_del(Evas_Object *obj) { char buf[32]; - Evas_List *l; + Eina_List *l; int i; Edje_Part_Collection *g; Eet_File *eetf; + Edje_Part_Collection_Directory_Entry *e; GET_ED_OR_RETURN(0); @@ -718,7 +690,7 @@ edje_edit_group_del(Evas_Object *obj) printf("REMOVE GROUP: %s [id: %d]\n", g->part, g->id); /* Don't remove the last group */ - if (evas_list_count(ed->file->collection_dir->entries) < 2) + if (eina_list_count(ed->file->collection_dir->entries) < 2) return 0; /* Remove collection/id from eet file */ @@ -744,16 +716,13 @@ edje_edit_group_del(Evas_Object *obj) _edje_collection_free(ed->file, g); /* Update collection_dir */ - for (l = ed->file->collection_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->collection_dir->entries, l, e) { - Edje_Part_Collection_Directory_Entry *e; - - e = l->data; printf(" id: %d entry: %s\n", e->id, e->entry); if (e->id == g->id) { ed->file->collection_dir->entries = - evas_list_remove_list(ed->file->collection_dir->entries, l); + eina_list_remove_list(ed->file->collection_dir->entries, l); // free(e->entry); This should be right but cause a segv free(e); e = NULL; @@ -776,26 +745,23 @@ edje_edit_group_del(Evas_Object *obj) EAPI unsigned char edje_edit_group_exist(Evas_Object *obj, const char *group) { - Evas_List *l; + Eina_List *l; + Edje_Part_Collection_Directory_Entry *e; GET_ED_OR_RETURN(0); - for (l = ed->file->collection_dir->entries; l; l = l->next) - { - Edje_Part_Collection_Directory_Entry *e; - - e = l->data; - if (e->entry && !strcmp(e->entry, group)) - return 1; - } + EINA_LIST_FOREACH(ed->file->collection_dir->entries, l, e) + if (e->entry && !strcmp(e->entry, group)) + return 1; return 0; } EAPI unsigned char edje_edit_group_name_set(Evas_Object *obj, const char *new_name) { - Evas_List *l; + Eina_List *l; Edje_Part_Collection *pc; + Edje_Part_Collection_Directory_Entry *pce; GET_ED_OR_RETURN(0); @@ -810,10 +776,8 @@ edje_edit_group_name_set(Evas_Object *obj, const char *new_name) //if (pc->part && ed->file->free_strings) eina_stringshare_del(pc->part); TODO FIXME pc->part = eina_stringshare_add(new_name); - for (l = ed->file->collection_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->collection_dir->entries, l, pce) { - Edje_Part_Collection_Directory_Entry *pce = l->data; - if (pc->id == pce->id) { ed->file->collection_hash = evas_hash_del(ed->file->collection_hash, @@ -904,10 +868,11 @@ edje_edit_group_max_h_set(Evas_Object *obj, int h) /* DATA API */ /***************/ -EAPI Evas_List * +EAPI Eina_List * edje_edit_data_list_get(Evas_Object * obj) { - Evas_List *datas, *l; + Eina_List *datas, *l; + Edje_Data *d; GET_ED_OR_RETURN(NULL); @@ -915,11 +880,8 @@ edje_edit_data_list_get(Evas_Object * obj) return NULL; datas = NULL; - for (l = ed->file->data; l; l = l->next) - { - Edje_Data *d = l->data; - datas = evas_list_append(datas, eina_stringshare_add(d->key)); - } + EINA_LIST_FOREACH(ed->file->data, l, d) + datas = eina_list_append(datas, eina_stringshare_add(d->key)); return datas; } @@ -927,20 +889,18 @@ edje_edit_data_list_get(Evas_Object * obj) EAPI unsigned char edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value) { - Evas_List *l; + Eina_List *l; Edje_Data *d; + Edje_Data *dd; GET_ED_OR_RETURN(0); if (!itemname || !ed->file) return 0; - for (l = ed->file->data; l; l = l->next) - { - Edje_Data *dd = l->data; - if (strcmp(dd->key, itemname) == 0) - return 0; - } + EINA_LIST_FOREACH(ed->file->data, l, dd) + if (strcmp(dd->key, itemname) == 0) + return 0; d = mem_alloc(sizeof(Edje_Data)); if (!d) return 0; @@ -949,7 +909,7 @@ edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value) if (value) d->value = (char*)eina_stringshare_add(value); else d->value = NULL; - ed->file->data = evas_list_append(ed->file->data, d); + ed->file->data = eina_list_append(ed->file->data, d); return 1; } @@ -957,21 +917,21 @@ edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value) EAPI unsigned char edje_edit_data_del(Evas_Object *obj, const char *itemname) { - Evas_List *l; + Eina_List *l; + Edje_Data *d; GET_ED_OR_RETURN(0); if (!itemname || !ed->file || !ed->file->data) return 0; - for (l = ed->file->data; l; l = l->next) + EINA_LIST_FOREACH(ed->file->data, l, d) { - Edje_Data *d = l->data; if (strcmp(d->key, itemname) == 0) { _edje_if_string_free(ed, d->key); _edje_if_string_free(ed, d->value); - ed->file->data = evas_list_remove(ed->file->data, d); + ed->file->data = eina_list_remove(ed->file->data, d); free(d); return 1; } @@ -982,19 +942,17 @@ edje_edit_data_del(Evas_Object *obj, const char *itemname) EAPI const char * edje_edit_data_value_get(Evas_Object * obj, char *itemname) { - Evas_List *l; + Eina_List *l; + Edje_Data *d; GET_ED_OR_RETURN(NULL); if (!itemname || !ed->file || !ed->file->data) return NULL; - for (l = ed->file->data; l; l = l->next) - { - Edje_Data *d = l->data; - if (strcmp(d->key, itemname) == 0) - return eina_stringshare_add(d->value); - } + EINA_LIST_FOREACH(ed->file->data, l, d) + if (strcmp(d->key, itemname) == 0) + return eina_stringshare_add(d->value); return NULL; } @@ -1002,23 +960,21 @@ edje_edit_data_value_get(Evas_Object * obj, char *itemname) EAPI unsigned char edje_edit_data_value_set(Evas_Object *obj, const char *itemname, const char *value) { - Evas_List *l; + Eina_List *l; + Edje_Data *d; GET_ED_OR_RETURN(0); if (!itemname || !value || !ed->file || !ed->file->data) return 0; - for (l = ed->file->data; l; l = l->next) - { - Edje_Data *d = l->data; - if (strcmp(d->key, itemname) == 0) - { - _edje_if_string_free(ed, d->value); - d->value = (char*)eina_stringshare_add(value); - return 1; - } - } + EINA_LIST_FOREACH(ed->file->data, l, d) + if (strcmp(d->key, itemname) == 0) + { + _edje_if_string_free(ed, d->value); + d->value = (char*)eina_stringshare_add(value); + return 1; + } return 0; } @@ -1026,23 +982,21 @@ edje_edit_data_value_set(Evas_Object *obj, const char *itemname, const char *val EAPI unsigned char edje_edit_data_name_set(Evas_Object *obj, const char *itemname, const char *newname) { - Evas_List *l; + Eina_List *l; + Edje_Data *d; GET_ED_OR_RETURN(0); if (!itemname || !newname || !ed->file || !ed->file->data) return 0; - for (l = ed->file->data; l; l = l->next) - { - Edje_Data *d = l->data; - if (strcmp(d->key, itemname) == 0) - { - _edje_if_string_free(ed, d->key); - d->key = (char*)eina_stringshare_add(newname); - return 1; - } - } + EINA_LIST_FOREACH(ed->file->data, l, d) + if (strcmp(d->key, itemname) == 0) + { + _edje_if_string_free(ed, d->key); + d->key = (char*)eina_stringshare_add(newname); + return 1; + } return 0; } @@ -1051,24 +1005,20 @@ edje_edit_data_name_set(Evas_Object *obj, const char *itemname, const char *new /* COLOR CLASSES API */ /***********************/ -EAPI Evas_List * +EAPI Eina_List * edje_edit_color_classes_list_get(Evas_Object * obj) { - Evas_List *classes = NULL; - Evas_List *l; + Eina_List *classes = NULL; + Eina_List *l; + Edje_Color_Class *cc; GET_ED_OR_RETURN(NULL); if (!ed->file || !ed->file->color_classes) return NULL; -printf("GET CLASSES LIST %d %d\n", evas_list_count(ed->color_classes), evas_list_count(ed->file->color_classes)); - for (l = ed->file->color_classes; l; l = l->next) - { - Edje_Color_Class *cc; - - cc = l->data; - classes = evas_list_append(classes, eina_stringshare_add(cc->name)); - } + printf("GET CLASSES LIST %d %d\n", eina_list_count(ed->color_classes), eina_list_count(ed->file->color_classes)); + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + classes = eina_list_append(classes, eina_stringshare_add(cc->name)); return classes; } @@ -1076,94 +1026,86 @@ printf("GET CLASSES LIST %d %d\n", evas_list_count(ed->color_classes), evas_list EAPI unsigned char edje_edit_color_class_colors_get(Evas_Object *obj, const char *class_name, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3) { - Evas_List *l; + Eina_List *l; + Edje_Color_Class *cc; + GET_ED_OR_RETURN(0); if (!ed->file || !ed->file->color_classes) return 0; - for (l = ed->file->color_classes; l; l = l->next) - { - Edje_Color_Class *cc; + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if (!strcmp(cc->name, class_name)) + { + if (r) *r = cc->r; + if (g) *g = cc->g; + if (b) *b = cc->b; + if (a) *a = cc->a; - cc = l->data; - if (!strcmp(cc->name, class_name)) - { - if (r) *r = cc->r; - if (g) *g = cc->g; - if (b) *b = cc->b; - if (a) *a = cc->a; + if (r2) *r2 = cc->r2; + if (g2) *g2 = cc->g2; + if (b2) *b2 = cc->b2; + if (a2) *a2 = cc->a2; - if (r2) *r2 = cc->r2; - if (g2) *g2 = cc->g2; - if (b2) *b2 = cc->b2; - if (a2) *a2 = cc->a2; + if (r3) *r3 = cc->r3; + if (g3) *g3 = cc->g3; + if (b3) *b3 = cc->b3; + if (a3) *a3 = cc->a3; - if (r3) *r3 = cc->r3; - if (g3) *g3 = cc->g3; - if (b3) *b3 = cc->b3; - if (a3) *a3 = cc->a3; - - return 1; - } - } + return 1; + } return 0; } EAPI unsigned char edje_edit_color_class_colors_set(Evas_Object *obj, const char *class_name, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3) { - Evas_List *l; + Eina_List *l; + Edje_Color_Class *cc; + GET_ED_OR_RETURN(0); if (!ed->file || !ed->file->color_classes) return 0; - for (l = ed->file->color_classes; l; l = l->next) - { - Edje_Color_Class *cc; + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if (!strcmp(cc->name, class_name)) + { + if (r > -1) cc->r = r; + if (g > -1) cc->g = g; + if (b > -1) cc->b = b; + if (a > -1) cc->a = a; - cc = l->data; - if (!strcmp(cc->name, class_name)) - { - if (r > -1) cc->r = r; - if (g > -1) cc->g = g; - if (b > -1) cc->b = b; - if (a > -1) cc->a = a; + if (r2 > -1) cc->r2 = r2; + if (g2 > -1) cc->g2 = g2; + if (b2 > -1) cc->b2 = b2; + if (a2 > -1) cc->a2 = a2; - if (r2 > -1) cc->r2 = r2; - if (g2 > -1) cc->g2 = g2; - if (b2 > -1) cc->b2 = b2; - if (a2 > -1) cc->a2 = a2; + if (r3 > -1) cc->r3 = r3; + if (g3 > -1) cc->g3 = g3; + if (b3 > -1) cc->b3 = b3; + if (a3 > -1) cc->a3 = a3; - if (r3 > -1) cc->r3 = r3; - if (g3 > -1) cc->g3 = g3; - if (b3 > -1) cc->b3 = b3; - if (a3 > -1) cc->a3 = a3; - - return 1; - } - } + return 1; + } return 0; } EAPI unsigned char edje_edit_color_class_add(Evas_Object *obj, const char *name) { - Evas_List *l; + Eina_List *l; Edje_Color_Class *c; + Edje_Color_Class *cc; GET_ED_OR_RETURN(0); if (!name || !ed->file) return 0; - for (l = ed->file->color_classes; l; l = l->next) - { - Edje_Color_Class *cc = l->data; - if (strcmp(cc->name, name) == 0) - return 0; - } + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if (strcmp(cc->name, name) == 0) + return 0; c = mem_alloc(sizeof(Edje_Color_Class)); if (!c) return 0; @@ -1173,7 +1115,7 @@ edje_edit_color_class_add(Evas_Object *obj, const char *name) c->r2 = c->g2 = c->b2 = c->a2 = 255; c->r3 = c->g3 = c->b3 = c->a3 = 255; - ed->file->color_classes = evas_list_append(ed->file->color_classes, c); + ed->file->color_classes = eina_list_append(ed->file->color_classes, c); return 1; } @@ -1181,49 +1123,43 @@ edje_edit_color_class_add(Evas_Object *obj, const char *name) EAPI unsigned char edje_edit_color_class_del(Evas_Object *obj, const char *name) { - Evas_List *l; + Eina_List *l; + Edje_Color_Class *cc; GET_ED_OR_RETURN(0); if (!name || !ed->file || !ed->file->color_classes) return 0; - for (l = ed->file->color_classes; l; l = l->next) - { - Edje_Color_Class *cc = l->data; - if (strcmp(cc->name, name) == 0) - { - _edje_if_string_free(ed, cc->name); - ed->file->color_classes = evas_list_remove(ed->file->color_classes, cc); - free(cc); - return 1; - } - } + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if (strcmp(cc->name, name) == 0) + { + _edje_if_string_free(ed, cc->name); + ed->file->color_classes = eina_list_remove(ed->file->color_classes, cc); + free(cc); + return 1; + } return 0; } EAPI unsigned char edje_edit_color_class_name_set(Evas_Object *obj, const char *name, const char *newname) { - Evas_List *l; + Eina_List *l; + Edje_Color_Class *cc; GET_ED_OR_RETURN(0); if (!ed->file || !ed->file->color_classes) return 0; - for (l = ed->file->color_classes; l; l = l->next) - { - Edje_Color_Class *cc; - - cc = l->data; - if (!strcmp(cc->name, name)) - { - _edje_if_string_free(ed, cc->name); - cc->name = (char*)eina_stringshare_add(newname); - return 1; - } - } + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if (!strcmp(cc->name, name)) + { + _edje_if_string_free(ed, cc->name); + cc->name = (char*)eina_stringshare_add(newname); + return 1; + } return 0; } @@ -1233,10 +1169,10 @@ edje_edit_color_class_name_set(Evas_Object *obj, const char *name, const char *n /* PARTS API */ /***************/ -EAPI Evas_List * +EAPI Eina_List * edje_edit_parts_list_get(Evas_Object *obj) { - Evas_List *parts; + Eina_List *parts; int i; GET_ED_OR_RETURN(NULL); @@ -1249,7 +1185,7 @@ edje_edit_parts_list_get(Evas_Object *obj) Edje_Real_Part *rp; rp = ed->table_parts[i]; - parts = evas_list_append(parts, eina_stringshare_add(rp->part->name)); + parts = eina_list_append(parts, eina_stringshare_add(rp->part->name)); } return parts; @@ -1300,9 +1236,9 @@ edje_edit_part_add(Evas_Object *obj, const char* name, unsigned char type) /* Init Edje_Part */ pc = ed->collection; - pc->parts = evas_list_append(pc->parts, ep); + pc->parts = eina_list_append(pc->parts, ep); - ep->id = evas_list_count(pc->parts) - 1; + ep->id = eina_list_count(pc->parts) - 1; ep->type = type; ep->name = eina_stringshare_add(name); ep->mouse_events = 1; @@ -1452,7 +1388,7 @@ edje_edit_part_del(Evas_Object *obj, const char* part) /* Remove part from parts list */ pc = ed->collection; - pc->parts = evas_list_remove(pc->parts, ep); + pc->parts = eina_list_remove(pc->parts, ep); _edje_fix_parts_id(ed); /* Free Edje_Part and all descriptions */ @@ -1466,8 +1402,8 @@ edje_edit_part_del(Evas_Object *obj, const char* part) { Edje_Part_Description *desc; - desc = ep->other_desc->data; - ep->other_desc = evas_list_remove(ep->other_desc, desc); + desc = eina_list_data_get(ep->other_desc); + ep->other_desc = eina_list_remove(ep->other_desc, desc); _edje_collection_free_part_description_free(desc, 0); } free(ep); @@ -1502,8 +1438,8 @@ edje_edit_part_restack_below(Evas_Object *obj, const char* part) /* update parts list */ prev = ed->table_parts[(rp->part->id - 1) % ed->table_parts_size]; - group->parts = evas_list_remove(group->parts, rp->part); - group->parts = evas_list_prepend_relative(group->parts, rp->part, prev->part); + group->parts = eina_list_remove(group->parts, rp->part); + group->parts = eina_list_prepend_relative(group->parts, rp->part, prev->part); _edje_parts_id_switch(ed, rp, prev); @@ -1528,8 +1464,8 @@ edje_edit_part_restack_above(Evas_Object *obj, const char* part) /* update parts list */ next = ed->table_parts[(rp->part->id + 1) % ed->table_parts_size]; - group->parts = evas_list_remove(group->parts, rp->part); - group->parts = evas_list_append_relative(group->parts, rp->part, next->part); + group->parts = eina_list_remove(group->parts, rp->part); + group->parts = eina_list_append_relative(group->parts, rp->part, next->part); /* update ids */ _edje_parts_id_switch(ed, rp, next); @@ -1907,12 +1843,12 @@ edje_edit_part_drag_event_set(Evas_Object *obj, const char *part, const char *ev /*********************/ /* PART STATES API */ /*********************/ -EAPI Evas_List * +EAPI Eina_List * edje_edit_part_states_list_get(Evas_Object *obj, const char *part) { char state_name[PATH_MAX]; - Evas_List *states; - Evas_List *l; + Eina_List *states; + Eina_List *l; Edje_Part_Description *state; GET_RP_OR_RETURN(NULL); @@ -1926,16 +1862,15 @@ edje_edit_part_states_list_get(Evas_Object *obj, const char *part) state = rp->part->default_desc; snprintf(state_name, PATH_MAX, "%s %.2f", state->state.name, state->state.value); - states = evas_list_append(states, eina_stringshare_add(state_name)); + states = eina_list_append(states, eina_stringshare_add(state_name)); //printf("NEW STATE def: %s\n", state->state.name); //append other states - for (l = rp->part->other_desc; l; l = l->next) + EINA_LIST_FOREACH(rp->part->other_desc, l, state) { - state = l->data; snprintf(state_name, sizeof(state_name), "%s %.2f", state->state.name, state->state.value); - states = evas_list_append(states, eina_stringshare_add(state_name)); + states = eina_list_append(states, eina_stringshare_add(state_name)); //printf("NEW STATE: %s\n", state_name); } return states; @@ -1969,9 +1904,9 @@ edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state, { Edje_Program *epr = ed->table_programs[i]; - if (evas_list_count(epr->targets) == 1) + if (eina_list_count(epr->targets) == 1) { - Edje_Program_Target *t = epr->targets->data; + Edje_Program_Target *t = eina_list_data_get(epr->targets); if (t->id == part_id && !strcmp(epr->state, pd->state.name) && @@ -2008,7 +1943,7 @@ edje_edit_state_del(Evas_Object *obj, const char *part, const char *state) pd = _edje_part_description_find_byname(ed, part, state); if (!pd) return; - rp->part->other_desc = evas_list_remove(rp->part->other_desc, pd); + rp->part->other_desc = eina_list_remove(rp->part->other_desc, pd); _edje_collection_free_part_description_free(pd, 0); } @@ -2027,7 +1962,7 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name) if (!rp->part->default_desc) rp->part->default_desc = pd; else - rp->part->other_desc = evas_list_append(rp->part->other_desc, pd); + rp->part->other_desc = eina_list_append(rp->part->other_desc, pd); pd->state.name = eina_stringshare_add(name); pd->state.value = 0.0; @@ -2993,12 +2928,12 @@ edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part, const char *s edje_object_calc_force(obj); } -EAPI Evas_List * +EAPI Eina_List * edje_edit_fonts_list_get(Evas_Object *obj) { Edje_Font_Directory_Entry *f; - Evas_List *fonts = NULL; - Evas_List *l; + Eina_List *fonts = NULL; + Eina_List *l; GET_ED_OR_RETURN(NULL); @@ -3007,10 +2942,9 @@ edje_edit_fonts_list_get(Evas_Object *obj) printf("GET FONT LIST for %s\n", ed->file->path); - for (l = ed->file->font_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->font_dir->entries, l, f) { - f = l->data; - fonts = evas_list_append(fonts, eina_stringshare_add(f->entry)); + fonts = eina_list_append(fonts, eina_stringshare_add(f->entry)); printf(" Font: %s (%s) \n", f->entry, f->path); } @@ -3055,13 +2989,11 @@ edje_edit_font_add(Evas_Object *obj, const char* path) fn->name = mem_strdup(name); /*{ - Evas_List *l; + Eina_List *l; + Font *lfn; - for (l = fonts; l; l = l->next) + EINA_LIST_FOREACH(fonts, l, lfn) { - Font *lfn; - - lfn = l->data; if (!strcmp(lfn->name, fn->name)) { free(fn->file); @@ -3130,7 +3062,7 @@ edje_edit_font_add(Evas_Object *obj, const char* path) fnt->entry = mem_strdup(fn->name); fnt->path = mem_strdup(buf); - ed->file->font_dir->entries = evas_list_append(ed->file->font_dir->entries, fnt); + ed->file->font_dir->entries = eina_list_append(ed->file->font_dir->entries, fnt); ed->file->font_hash = evas_hash_direct_add(ed->file->font_hash, fnt->entry, fnt); } @@ -3184,12 +3116,12 @@ edje_edit_part_effect_set(Evas_Object *obj, const char *part, unsigned char effe /* IMAGES API */ /****************/ -EAPI Evas_List * +EAPI Eina_List * edje_edit_images_list_get(Evas_Object *obj) { Edje_Image_Directory_Entry *i; - Evas_List *images = NULL; - Evas_List *l; + Eina_List *images = NULL; + Eina_List *l; GET_ED_OR_RETURN(NULL); @@ -3198,10 +3130,9 @@ edje_edit_images_list_get(Evas_Object *obj) printf("GET IMAGES LIST for %s\n", ed->file->path); - for (l = ed->file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->image_dir->entries, l, i) { - i = l->data; - images = evas_list_append(images, eina_stringshare_add(i->entry)); + images = eina_list_append(images, eina_stringshare_add(i->entry)); //printf(" Image: %s (type: %d param: %d id: %d) \n", // i->entry, i->source_type, i->source_param, i->id); } @@ -3212,8 +3143,9 @@ edje_edit_images_list_get(Evas_Object *obj) EAPI unsigned char edje_edit_image_add(Evas_Object *obj, const char* path) { - Evas_List *l; + Eina_List *l; Edje_Image_Directory_Entry *de; + Edje_Image_Directory_Entry *i; int free_id = 0; char *name; @@ -3229,12 +3161,9 @@ edje_edit_image_add(Evas_Object *obj, const char* path) /* Loop trough image directory to find if image exist */ printf("Add Image '%s' (total %d)\n", path, - evas_list_count(ed->file->image_dir->entries)); - for (l = ed->file->image_dir->entries; l; l = l->next) + eina_list_count(ed->file->image_dir->entries)); + EINA_LIST_FOREACH(ed->file->image_dir->entries, l, i) { - Edje_Image_Directory_Entry *i; - - i = l->data; if (!i) return 0; if (i->id >= free_id) free_id = i->id + 1; /*TODO search for free (hole) id*/ printf("IMG: %s [%d]\n", i->entry, i->id); @@ -3256,7 +3185,7 @@ edje_edit_image_add(Evas_Object *obj, const char* path) /* Add image to Image Directory */ ed->file->image_dir->entries = - evas_list_append(ed->file->image_dir->entries, de); + eina_list_append(ed->file->image_dir->entries, de); return 1; } @@ -3271,16 +3200,15 @@ EAPI int edje_edit_image_compression_type_get(Evas_Object *obj, const char *image) { Edje_Image_Directory_Entry *i = NULL; - Evas_List *l; + Eina_List *l; GET_ED_OR_RETURN(-1); if (!ed->file) return -1; if (!ed->file->image_dir) return -1; - for (l = ed->file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->image_dir->entries, l, i) { - i = l->data; if (strcmp(i->entry, image) == 0) break; i = NULL; @@ -3310,15 +3238,14 @@ edje_edit_image_compression_type_get(Evas_Object *obj, const char *image) EAPI int edje_edit_image_compression_rate_get(Evas_Object *obj, const char *image) { - Evas_List *l; + Eina_List *l; Edje_Image_Directory_Entry *i; GET_ED_OR_RETURN(-1); // Gets the Image Entry - for (l = ed->file->image_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->image_dir->entries, l, i) { - i = l->data; if (strcmp(i->entry, image) == 0) break; i = NULL; } @@ -3360,23 +3287,22 @@ edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state, edje_object_calc_force(obj); } -EAPI Evas_List * +EAPI Eina_List * edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char *state) { Edje_Part_Image_Id *i; - Evas_List *tweens = NULL, *l; + Eina_List *tweens = NULL, *l; const char *name; GET_PD_OR_RETURN(NULL); //printf("GET TWEEN LIST for %s\n", state); - for (l = pd->image.tween_list; l; l = l->next) + EINA_LIST_FOREACH(pd->image.tween_list, l, i) { - i = l->data; name = _edje_image_name_find(obj, i->id); //printf(" t: %s\n", name); - tweens = evas_list_append(tweens, eina_stringshare_add(name)); + tweens = eina_list_append(tweens, eina_stringshare_add(name)); } return tweens; @@ -3399,7 +3325,7 @@ edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, i->id = id; /* add to tween list */ - pd->image.tween_list = evas_list_append(pd->image.tween_list, i); + pd->image.tween_list = eina_list_append(pd->image.tween_list, i); return 1; } @@ -3407,7 +3333,8 @@ edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, EAPI unsigned char edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, const char *tween) { - Evas_List *l; + Eina_List *l; + Edje_Part_Image_Id *i; int id; GET_PD_OR_RETURN(0); @@ -3417,14 +3344,11 @@ edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, id = _edje_image_id_find(obj, tween); if (id < 0) return 0; - for (l = pd->image.tween_list; l; l = l->next) + EINA_LIST_FOREACH(pd->image.tween_list, l, i) { - Edje_Part_Image_Id *i; - - i = l->data; if (i->id == id) { - pd->image.tween_list = evas_list_remove_list(pd->image.tween_list, l); + pd->image.tween_list = eina_list_remove_list(pd->image.tween_list, l); return 1; } } @@ -3479,12 +3403,12 @@ edje_edit_state_image_border_fill_set(Evas_Object *obj, const char *part, const /* SPECTRUM API */ /******************/ -EAPI Evas_List * +EAPI Eina_List * edje_edit_spectrum_list_get(Evas_Object *obj) { Edje_Spectrum_Directory_Entry *s; - Evas_List *spectrum = NULL; - Evas_List *l; + Eina_List *spectrum = NULL; + Eina_List *l; GET_ED_OR_RETURN(NULL); @@ -3493,11 +3417,10 @@ edje_edit_spectrum_list_get(Evas_Object *obj) //printf("GET SPECTRUM LIST for %s\n", ed->file->path); - for (l = ed->file->spectrum_dir->entries; l; l = l->next) + EINA_LIST_FOREACH(ed->file->spectrum_dir->entries, l, s) { - s = l->data; //printf("SPECTRUM: %s [id: %d]\n", s->entry, s->id); - spectrum = evas_list_append(spectrum, eina_stringshare_add(s->entry)); + spectrum = eina_list_append(spectrum, eina_stringshare_add(s->entry)); } return spectrum; @@ -3513,7 +3436,7 @@ edje_edit_spectra_add(Evas_Object *obj, const char* name) printf("SPECTRA ADD [new name:%s]\n", name); Edje_Spectrum_Directory_Entry *s; - Evas_List *l; + Eina_List *l; if (!ed->file) return 0; @@ -3523,8 +3446,8 @@ edje_edit_spectra_add(Evas_Object *obj, const char* name) ed->file->spectrum_dir = mem_alloc(SZ(Edje_Spectrum_Directory)); s = mem_alloc(SZ(Edje_Spectrum_Directory_Entry)); - ed->file->spectrum_dir->entries = evas_list_append(ed->file->spectrum_dir->entries, s); - s->id = evas_list_count(ed->file->spectrum_dir->entries) - 1; //TODO Search for id holes + ed->file->spectrum_dir->entries = eina_list_append(ed->file->spectrum_dir->entries, s); + s->id = eina_list_count(ed->file->spectrum_dir->entries) - 1; //TODO Search for id holes s->entry = (char*)eina_stringshare_add(name); s->filename = NULL; s->color_list = NULL; @@ -3544,15 +3467,15 @@ edje_edit_spectra_del(Evas_Object *obj, const char* spectra) printf("SPECTRA DEL %s\n", spectra); - ed->file->spectrum_dir->entries = evas_list_remove(ed->file->spectrum_dir->entries, s); + ed->file->spectrum_dir->entries = eina_list_remove(ed->file->spectrum_dir->entries, s); _edje_if_string_free(ed, s->entry); _edje_if_string_free(ed, s->filename); while (s->color_list) { Edje_Spectrum_Color *color; - color = s->color_list->data; + color = eina_list_data_get(s->color_list); free(color); - s->color_list = evas_list_remove_list(s->color_list, s->color_list); + s->color_list = eina_list_remove_list(s->color_list, s->color_list); } free(s); @@ -3589,7 +3512,7 @@ edje_edit_spectra_stop_num_get(Evas_Object *obj, const char* spectra) s = _edje_edit_spectrum_entry_get(ed, spectra); if (!s) return 0; - return evas_list_count(s->color_list); + return eina_list_count(s->color_list); } EAPI unsigned char @@ -3604,21 +3527,21 @@ edje_edit_spectra_stop_num_set(Evas_Object *obj, const char* spectra, int num) s = _edje_edit_spectrum_entry_get(ed, spectra); if (!s) return 0; - if (num == evas_list_count(s->color_list)) return 1; + if (num == eina_list_count(s->color_list)) return 1; //destroy all colors while (s->color_list) { - color = s->color_list->data; + color = eina_list_data_get(s->color_list); free(color); - s->color_list = evas_list_remove_list(s->color_list, s->color_list); + s->color_list = eina_list_remove_list(s->color_list, s->color_list); } //... and recreate (TODO we should optimize this function) while (num) { color = mem_alloc(SZ(Edje_Spectrum_Color)); - s->color_list = evas_list_append(s->color_list, color); + s->color_list = eina_list_append(s->color_list, color); color->r = 255; color->g = 255; color->b = 255; @@ -3641,7 +3564,7 @@ edje_edit_spectra_stop_color_get(Evas_Object *obj, const char* spectra, int stop if (!s) return 0; //printf("GET SPECTRA STOP COLOR for spectra: %s stopn: %d\n", spectra, stop_number); - color = evas_list_nth(s->color_list, stop_number); + color = eina_list_nth(s->color_list, stop_number); if (!color) return 0; if (r) *r = color->r; if (g) *g = color->g; @@ -3663,7 +3586,7 @@ edje_edit_spectra_stop_color_set(Evas_Object *obj, const char* spectra, int stop if (!s) return 0; printf("SET SPECTRA STOP COLOR for spectra: %s stopn: %d\n", spectra, stop_number); - color = evas_list_nth(s->color_list, stop_number); + color = eina_list_nth(s->color_list, stop_number); if (!color) return 0; color->r = r; color->g = g; @@ -3947,10 +3870,10 @@ _edje_program_get_byname(Evas_Object *obj, const char *prog_name) return NULL; } -EAPI Evas_List * +EAPI Eina_List * edje_edit_programs_list_get(Evas_Object *obj) { - Evas_List *progs = NULL; + Eina_List *progs = NULL; int i; GET_ED_OR_RETURN(NULL); @@ -3962,7 +3885,7 @@ edje_edit_programs_list_get(Evas_Object *obj) Edje_Program *epr; epr = ed->table_programs[i]; - progs = evas_list_append(progs, eina_stringshare_add(epr->name)); + progs = eina_list_append(progs, eina_stringshare_add(epr->name)); } return progs; @@ -3988,10 +3911,10 @@ edje_edit_program_add(Evas_Object *obj, const char *name) //Add program to group pc = ed->collection; - pc->programs = evas_list_append(pc->programs, epr); + pc->programs = eina_list_append(pc->programs, epr); //Init Edje_Program - epr->id = evas_list_count(pc->programs) - 1; + epr->id = eina_list_count(pc->programs) - 1; epr->name = eina_stringshare_add(name); epr->signal = NULL; epr->source = NULL; @@ -4029,7 +3952,7 @@ edje_edit_program_add(Evas_Object *obj, const char *name) EAPI unsigned char edje_edit_program_del(Evas_Object *obj, const char *prog) { - Evas_List *l; + Eina_List *l; Edje_Part_Collection *pc; int id, i; int old_id; @@ -4042,7 +3965,7 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) //Remove program from programs list id = epr->id; pc = ed->collection; - pc->programs = evas_list_remove(pc->programs, epr); + pc->programs = eina_list_remove(pc->programs, epr); //Free Edje_Program _edje_if_string_free(ed, epr->name); @@ -4055,16 +3978,16 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) { Edje_Program_Target *prt; - prt = epr->targets->data; - epr->targets = evas_list_remove_list(epr->targets, epr->targets); + prt = eina_list_data_get(epr->targets); + epr->targets = eina_list_remove_list(epr->targets, epr->targets); free(prt); } while (epr->after) { Edje_Program_After *pa; - pa = epr->after->data; - epr->after = evas_list_remove_list(epr->after, epr->after); + pa = eina_list_data_get(epr->after); + epr->after = eina_list_remove_list(epr->after, epr->after); free(pa); } free(epr); @@ -4105,7 +4028,7 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) { Edje_Program_After *pa; - pa = l->data; + pa = eina_list_data_get(l); if (pa->id == old_id) { // printf(" dep on after old_id\n"); @@ -4114,10 +4037,10 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) else if (pa->id == id) { // printf(" dep on after id\n"); - p->after = evas_list_remove(p->after, pa); + p->after = eina_list_remove(p->after, pa); } - if (l) l = l->next; + if (l) l = eina_list_next(l); } /* check in targets */ if (p->action == EDJE_ACTION_TYPE_ACTION_STOP) @@ -4127,7 +4050,7 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) { Edje_Program_Target *pt; - pt = l->data; + pt = eina_list_data_get(l); if (pt->id == old_id) { // printf(" dep on target old_id\n"); @@ -4136,9 +4059,9 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) else if (pt->id == id) { // printf(" dep on target id\n"); - p->targets = evas_list_remove(p->targets, pt); + p->targets = eina_list_remove(p->targets, pt); } - if (l) l = l->next; + if (l) l = eina_list_next(l); } } } @@ -4427,22 +4350,18 @@ edje_edit_program_action_set(Evas_Object *obj, const char *prog, int action) return 1; } -EAPI Evas_List * +EAPI Eina_List * edje_edit_program_targets_get(Evas_Object *obj, const char *prog) { - Evas_List *l, *targets = NULL; + Eina_List *l, *targets = NULL; + Edje_Program_Target *t; GET_ED_OR_RETURN(NULL); GET_EPR_OR_RETURN(NULL); - //printf("GET TARGETS for program: %s [count: %d]\n", prog, evas_list_count(epr->targets)); - - for (l = epr->targets; l; l = l->next) + //printf("GET TARGETS for program: %s [count: %d]\n", prog, eina_list_count(epr->targets)); + EINA_LIST_FOREACH(epr->targets, l, t) { - Edje_Program_Target *t; - - t = l->data; - if (epr->action == EDJE_ACTION_TYPE_STATE_SET) { /* the target is a part */ @@ -4450,7 +4369,7 @@ edje_edit_program_targets_get(Evas_Object *obj, const char *prog) p = ed->table_parts[t->id % ed->table_parts_size]; if (p && p->part && p->part->name) - targets = evas_list_append(targets, + targets = eina_list_append(targets, eina_stringshare_add(p->part->name)); } else if (epr->action == EDJE_ACTION_TYPE_ACTION_STOP) @@ -4460,7 +4379,7 @@ edje_edit_program_targets_get(Evas_Object *obj, const char *prog) p = ed->table_programs[t->id % ed->table_programs_size]; if (p && p->name) - targets = evas_list_append(targets, + targets = eina_list_append(targets, eina_stringshare_add(p->name)); } } @@ -4476,8 +4395,8 @@ edje_edit_program_targets_clear(Evas_Object *obj, const char *prog) { Edje_Program_Target *prt; - prt = epr->targets->data; - epr->targets = evas_list_remove_list(epr->targets, epr->targets); + prt = eina_list_data_get(epr->targets); + epr->targets = eina_list_remove_list(epr->targets, epr->targets); free(prt); } @@ -4518,32 +4437,30 @@ edje_edit_program_target_add(Evas_Object *obj, const char *prog, const char *tar if (!t) return 0; t->id = id; - epr->targets = evas_list_append(epr->targets, t); + epr->targets = eina_list_append(epr->targets, t); return 1; } -EAPI Evas_List * +EAPI Eina_List * edje_edit_program_afters_get(Evas_Object *obj, const char *prog) { - Evas_List *l, *afters = NULL; + Eina_List *l, *afters = NULL; + Edje_Program_After *a; GET_ED_OR_RETURN(NULL); GET_EPR_OR_RETURN(NULL); - // printf("GET AFTERS for program: %s [count: %d]\n", prog, evas_list_count(epr->after)); - - for (l = epr->after; l; l = l->next) + // printf("GET AFTERS for program: %s [count: %d]\n", prog, eina_list_count(epr->after)); + EINA_LIST_FOREACH(epr->after, l, a) { - Edje_Program_After *a; Edje_Program *p = NULL; - a = l->data; p = ed->table_programs[a->id % ed->table_programs_size]; if (p && p->name) { printf(" a: %d name: %s\n", a->id, p->name); - afters = evas_list_append(afters, eina_stringshare_add(p->name)); + afters = eina_list_append(afters, eina_stringshare_add(p->name)); } } return afters; @@ -4558,8 +4475,8 @@ edje_edit_program_afters_clear(Evas_Object *obj, const char *prog) { Edje_Program_After *pa; - pa = epr->after->data; - epr->after = evas_list_remove_list(epr->after, epr->after); + pa = eina_list_data_get(epr->after); + epr->after = eina_list_remove_list(epr->after, epr->after); free(pa); } @@ -4582,7 +4499,7 @@ edje_edit_program_after_add(Evas_Object *obj, const char *prog, const char *afte a->id = af->id; - epr->after = evas_list_append(epr->after, a); + epr->after = eina_list_append(epr->after, a); return 1; } @@ -4628,7 +4545,7 @@ _edje_generate_source_of_spectra(Edje * ed, const char *name, FILE * f) { Edje_Spectrum_Directory_Entry *d; Edje_Spectrum_Color *color = NULL; - Evas_List *l; + Eina_List *l; if (!ed || !name || !f) return; @@ -4637,13 +4554,10 @@ _edje_generate_source_of_spectra(Edje * ed, const char *name, FILE * f) fprintf(f, I1 "spectrum {\n"); fprintf(f, I2 "name: \"%s\";\n", d->entry); - for (l = d->color_list; l; l = l->next) - { - color = l->data; - if (color) - fprintf(f, I2 "color: %d %d %d %d %d;\n", color->r, color->g, - color->b, color->a, color->d); - } + EINA_LIST_FOREACH(d->color_list, l, color) + if (color) + fprintf(f, I2 "color: %d %d %d %d %d;\n", color->r, color->g, + color->b, color->a, color->d); fprintf(f, I1 "}\n"); } @@ -4652,30 +4566,28 @@ _edje_generate_source_of_spectra(Edje * ed, const char *name, FILE * f) static void _edje_generate_source_of_colorclass(Edje * ed, const char *name, FILE * f) { - Evas_List *l; + Eina_List *l; Edje_Color_Class *cc; - for (l = ed->file->color_classes; l; l = l->next) - { - cc = l->data; - if (!strcmp(cc->name, name)) - { - fprintf(f, I1 "color_class {\n"); - fprintf(f, I2 "name: \"%s\";\n", cc->name); - fprintf(f, I2 "color: %d %d %d %d;\n", cc->r, cc->g, cc->b, cc->a); - fprintf(f, I2 "color2: %d %d %d %d;\n", cc->r2, cc->g2, cc->b2, cc->a2); - fprintf(f, I2 "color3: %d %d %d %d;\n", cc->r3, cc->g3, cc->b3, cc->a3); - fprintf(f, I1 "}\n"); - } - } + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if (!strcmp(cc->name, name)) + { + fprintf(f, I1 "color_class {\n"); + fprintf(f, I2 "name: \"%s\";\n", cc->name); + fprintf(f, I2 "color: %d %d %d %d;\n", cc->r, cc->g, cc->b, cc->a); + fprintf(f, I2 "color2: %d %d %d %d;\n", cc->r2, cc->g2, cc->b2, cc->a2); + fprintf(f, I2 "color3: %d %d %d %d;\n", cc->r3, cc->g3, cc->b3, cc->a3); + fprintf(f, I1 "}\n"); + } } static void _edje_generate_source_of_program(Evas_Object *obj, const char *program, FILE *f) { - Evas_List *l, *ll; + Eina_List *l, *ll; const char *s, *s2; double db, db2; + char *data; GET_ED_OR_RETURN(); @@ -4759,16 +4671,16 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, FILE *f) /* Targets */ if (ll = edje_edit_program_targets_get(obj, program)) { - for (l = ll; l; l = l->next) - fprintf(f, I4"target: \"%s\";\n", (char *)l->data); + EINA_LIST_FOREACH(ll, l, data) + fprintf(f, I4"target: \"%s\";\n", data); edje_edit_string_list_free(ll); } /* Afters */ if (ll = edje_edit_program_afters_get(obj, program)) { - for (l = ll; l; l = l->next) - fprintf(f, I4"after: \"%s\";\n", (char *)l->data); + EINA_LIST_FOREACH(ll, l, data) + fprintf(f, I4"after: \"%s\";\n", data); edje_edit_string_list_free(ll); } @@ -4781,7 +4693,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, FILE *f) static void _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *state, FILE *f) { - Evas_List *l, *ll; + Eina_List *l, *ll; Edje_Real_Part *rp; const char *str; @@ -4876,12 +4788,14 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s //Image if (rp->part->type == EDJE_PART_TYPE_IMAGE) { + char *data; + fprintf(f, I5"image {\n"); fprintf(f, I6"normal: \"%s\";\n", _edje_image_name_find(obj, pd->image.id)); ll = edje_edit_state_tweens_list_get(obj, part, state); - for (l = ll; l; l = l->next) - fprintf(f, I6"tween: \"%s\";\n", (char *)l->data); + EINA_LIST_FOREACH(ll, l, data) + fprintf(f, I6"tween: \"%s\";\n", data); edje_edit_string_list_free(ll); if (pd->border.l || pd->border.r || pd->border.t || pd->border.b) @@ -4973,8 +4887,9 @@ static void _edje_generate_source_of_part(Evas_Object *obj, const char *part, FILE *f) { const char *str; - Evas_List *l, *ll; - + Eina_List *l, *ll; + char *data; + fprintf(f, I3"part {\n"); fprintf(f, I4"name: \"%s\";\n", part); fprintf(f, I4"type: %s;\n", types[edje_edit_part_type_get(obj, part)]); @@ -5026,8 +4941,8 @@ _edje_generate_source_of_part(Evas_Object *obj, const char *part, FILE *f) //Descriptions ll = edje_edit_part_states_list_get(obj, part); - for (l = ll; l; l = l->next) - _edje_generate_source_of_state(obj, part, (char*)l->data, f); + EINA_LIST_FOREACH(ll, l, data) + _edje_generate_source_of_state(obj, part, data, f); edje_edit_string_list_free(ll); fprintf(f, I3"}\n");//part @@ -5037,9 +4952,10 @@ static void _edje_generate_source_of_group(Edje *ed, const char *group, FILE *f) { Evas_Object *obj; - Evas_List *l, *ll; + Eina_List *l, *ll; int w, h; - + char *data; + obj = edje_object_add(ed->evas); if (!edje_object_file_set(obj, ed->file->path, group)) return; @@ -5056,10 +4972,8 @@ _edje_generate_source_of_group(Edje *ed, const char *group, FILE *f) /* Parts */ fprintf(f, I2"parts {\n"); ll = edje_edit_parts_list_get(obj); - for (l = ll; l; l = l->next) - { - _edje_generate_source_of_part(obj, (char*)l->data, f); - } + EINA_LIST_FOREACH(ll, l, data) + _edje_generate_source_of_part(obj, data, f); edje_edit_string_list_free(ll); fprintf(f, I2"}\n");//parts @@ -5067,8 +4981,8 @@ _edje_generate_source_of_group(Edje *ed, const char *group, FILE *f) if (ll = edje_edit_programs_list_get(obj)) { fprintf(f, I2 "programs {\n"); - for (l = ll; l; l = l->next) - _edje_generate_source_of_program(obj, (char *)l->data, f); + EINA_LIST_FOREACH(ll, l, data) + _edje_generate_source_of_program(obj, data, f); fprintf(f, I2 "}\n"); edje_edit_string_list_free(ll); } @@ -5088,8 +5002,8 @@ _edje_generate_source(Evas_Object *obj) int fd; FILE *f; - - Evas_List *l, *ll; + Eina_List *l, *ll; + char *entry; GET_ED_OR_RETURN(); @@ -5107,9 +5021,9 @@ _edje_generate_source(Evas_Object *obj) if (ll = edje_edit_images_list_get(obj)) { fprintf(f, I0"images {\n"); - for (l = ll; l; l = l->next) + + EINA_LIST_FOREACH(ll, l, entry) { - char *entry = l->data; // Name int comp = edje_edit_image_compression_type_get(obj, entry); if (comp < 0) continue; @@ -5133,9 +5047,8 @@ _edje_generate_source(Evas_Object *obj) { fprintf(f, I0"fonts {\n"); - for (l = ll; l; l = l->next) + EINA_LIST_FOREACH(ll, l, entry) { - char *entry = l->data; // TODO Fixme the filename is wrong fprintf(f, I1"font: \"%s.ttf\" \"%s\";\n", entry, entry); } @@ -5148,10 +5061,10 @@ _edje_generate_source(Evas_Object *obj) { fprintf(f, I0 "data {\n"); - for (l = ll; l; l = l->next) + EINA_LIST_FOREACH(ll, l, entry) { - fprintf(f, I1 "item: \"%s\" \"%s\";\n", (char *)l->data, - edje_edit_data_value_get(obj, (char *)l->data)); + fprintf(f, I1 "item: \"%s\" \"%s\";\n", entry, + edje_edit_data_value_get(obj, entry)); } fprintf(f, I0 "}\n\n"); @@ -5162,8 +5075,8 @@ _edje_generate_source(Evas_Object *obj) if (ll = edje_edit_color_classes_list_get(obj)) { fprintf(f, I0 "color_classes {\n"); - for (l = ll; l; l = l->next) - _edje_generate_source_of_colorclass(ed, (char *)l->data, f); + EINA_LIST_FOREACH(ll, l, entry) + _edje_generate_source_of_colorclass(ed, entry, f); fprintf(f, I0 "}\n\n"); edje_edit_string_list_free(ll); } @@ -5173,8 +5086,8 @@ _edje_generate_source(Evas_Object *obj) { fprintf(f, I0 "spectra {\n"); - for (l = ll; l; l = l->next) - _edje_generate_source_of_spectra(ed, (char *)l->data, f); + EINA_LIST_FOREACH(ll, l, entry) + _edje_generate_source_of_spectra(ed, entry, f); fprintf(f, I0 "}\n\n"); edje_edit_string_list_free(ll); @@ -5186,8 +5099,8 @@ _edje_generate_source(Evas_Object *obj) /* Collections */ fprintf(f, "collections {\n"); ll = edje_file_collection_list(ed->file->path); - for (l = ll; l; l = l->next) - _edje_generate_source_of_group(ed, (char*)l->data, f); + EINA_LIST_FOREACH(ll, l, entry) + _edje_generate_source_of_group(ed, entry, f); fprintf(f, "}\n\n"); edje_file_collection_list_free(ll); @@ -5226,10 +5139,10 @@ source_edd(void) eddc.func.mem_free = NULL; eddc.func.str_alloc = eina_stringshare_add; eddc.func.str_free = eina_stringshare_del; - eddc.func.list_next = evas_list_next; - eddc.func.list_append = evas_list_append; - eddc.func.list_data = evas_list_data; - eddc.func.list_free = evas_list_free; + eddc.func.list_next = eina_list_next; + eddc.func.list_append = eina_list_append; + eddc.func.list_data = eina_list_data_get; + eddc.func.list_free = eina_list_free; eddc.func.hash_foreach = evas_hash_foreach; eddc.func.hash_add = evas_hash_add; eddc.func.hash_free = evas_hash_free; @@ -5353,7 +5266,7 @@ edje_edit_save(Evas_Object *obj) //create the needed list of source files (only one) sfl = mem_alloc(SZ(SrcFile_List)); sfl->list = NULL; - sfl->list = evas_list_append(sfl->list, sf); + sfl->list = eina_list_append(sfl->list, sf); // write the sources list to the eet file source_edd(); @@ -5376,7 +5289,9 @@ edje_edit_save(Evas_Object *obj) EAPI void edje_edit_print_internal_status(Evas_Object *obj) { - Evas_List *l; + Eina_List *l; + Edje_Part *p; + Edje_Program *epr; GET_ED_OR_RETURN(); @@ -5391,13 +5306,11 @@ edje_edit_print_internal_status(Evas_Object *obj) printf(" parent: '%s'\n", ed->parent); printf("\n*** Parts [table:%d list:%d]\n", ed->table_parts_size, - evas_list_count(ed->collection->parts)); - for (l = ed->collection->parts; l; l = l->next) + eina_list_count(ed->collection->parts)); + EINA_LIST_FOREACH(ed->collection->parts, l, p) { - Edje_Part *p; Edje_Real_Part *rp; - p = l->data; rp = ed->table_parts[p->id % ed->table_parts_size]; printf(" [%d]%s ", p->id, p->name); if (p == rp->part) @@ -5407,13 +5320,11 @@ edje_edit_print_internal_status(Evas_Object *obj) } printf("\n*** Programs [table:%d list:%d]\n", ed->table_programs_size, - evas_list_count(ed->collection->programs)); - for (l = ed->collection->programs; l; l = l->next) + eina_list_count(ed->collection->programs)); + EINA_LIST_FOREACH(ed->collection->programs, l, epr) { - Edje_Program *epr; Edje_Program *epr2; - epr = l->data; epr2 = ed->table_programs[epr->id % ed->table_programs_size]; printf(" [%d]%s ", epr->id, epr->name); if (epr == epr2) diff --git a/legacy/edje/src/lib/edje_embryo.c b/legacy/edje/src/lib/edje_embryo.c index 62ece164f0..dad30c514d 100644 --- a/legacy/edje/src/lib/edje_embryo.c +++ b/legacy/edje/src/lib/edje_embryo.c @@ -688,7 +688,7 @@ _edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params) Edje *ed; int program_id = 0; Edje_Running_Program *runp; - Evas_List *l; + Eina_List *l; CHKPARAM(1); ed = embryo_program_data_get(ep); @@ -697,12 +697,9 @@ _edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params) ed->walking_actions = 1; - for (l = ed->actions; l; l = l->next) - { - runp = l->data; - if (program_id == runp->program->id) - _edje_program_end(ed, runp); - } + EINA_LIST_FOREACH(ed->actions, l, runp) + if (program_id == runp->program->id) + _edje_program_end(ed, runp); ed->walking_actions = 0; @@ -1507,7 +1504,8 @@ _edje_embryo_fn_custom_state(Embryo_Program *ep, Embryo_Cell *params) Edje *ed = embryo_program_data_get(ep); Edje_Real_Part *rp; Edje_Part_Description *parent, *d; - Evas_List *l; + Edje_Part_Image_Id *iid; + Eina_List *l; char *name; float val; @@ -1546,14 +1544,14 @@ _edje_embryo_fn_custom_state(Embryo_Program *ep, Embryo_Cell *params) */ d->image.tween_list = NULL; - for (l = parent->image.tween_list; l; l = l->next) + EINA_LIST_FOREACH(parent->image.tween_list, l, iid) { - Edje_Part_Image_Id *iid = l->data, *iid_new; + Edje_Part_Image_Id *iid_new; iid_new = calloc(1, sizeof(Edje_Part_Image_Id)); iid_new->id = iid->id; - d->image.tween_list = evas_list_append(d->image.tween_list, iid_new); + d->image.tween_list = eina_list_append(d->image.tween_list, iid_new); } #define DUP(x) x ? (char *)eina_stringshare_add(x) : NULL diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c index c5a152cb1f..f9a48736ca 100644 --- a/legacy/edje/src/lib/edje_entry.c +++ b/legacy/edje/src/lib/edje_entry.c @@ -23,9 +23,9 @@ struct _Entry Evas_Object *cursor_fg; Evas_Textblock_Cursor *cursor; Evas_Textblock_Cursor *sel_start, *sel_end; - Evas_List *sel; - Evas_List *anchors; - Evas_List *anchorlist; + Eina_List *sel; + Eina_List *anchors; + Eina_List *anchorlist; char *selection; Evas_Bool selecting : 1; Evas_Bool have_selection : 1; @@ -42,7 +42,7 @@ struct _Anchor Entry *en; char *name; Evas_Textblock_Cursor *start, *end; - Evas_List *sel; + Eina_List *sel; }; static void @@ -253,7 +253,7 @@ _sel_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) if (sel->obj_bg) evas_object_del(sel->obj_bg); if (sel->obj_fg) evas_object_del(sel->obj_fg); free(sel); - en->sel = evas_list_remove_list(en->sel, en->sel); + en->sel = eina_list_remove_list(en->sel, en->sel); } if (en->have_selection) { @@ -265,7 +265,7 @@ _sel_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) static void _sel_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) { - Evas_List *range = NULL, *l; + Eina_List *range = NULL, *l; Sel *sel; Evas_Coord x, y, w, h; Evas_Object *smart, *clip; @@ -274,7 +274,7 @@ _sel_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) clip = evas_object_clip_get(o); if (en->sel_start) range = evas_textblock_cursor_range_geometry_get(en->sel_start, en->sel_end); - if (evas_list_count(range) != evas_list_count(en->sel)) + if (eina_list_count(range) != eina_list_count(en->sel)) { while (en->sel) { @@ -282,16 +282,16 @@ _sel_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) if (sel->obj_bg) evas_object_del(sel->obj_bg); if (sel->obj_fg) evas_object_del(sel->obj_fg); free(sel); - en->sel = evas_list_remove_list(en->sel, en->sel); + en->sel = eina_list_remove_list(en->sel, en->sel); } if (en->have_selection) { - for (l = range; l; l = l->next) + for (l = range; l; l = eina_list_next(l)) { Evas_Object *ob; sel = calloc(1, sizeof(Sel)); - en->sel = evas_list_append(en->sel, sel); + en->sel = eina_list_append(en->sel, sel); ob = edje_object_add(en->rp->edje->evas); edje_object_file_set(ob, en->rp->edje->path, en->rp->part->source); evas_object_smart_member_add(ob, smart); @@ -313,11 +313,10 @@ _sel_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) } x = y = w = h = -1; evas_object_geometry_get(o, &x, &y, &w, &h); - for (l = en->sel; l; l = l->next) + EINA_LIST_FOREACH(en->sel, l, sel) { Evas_Textblock_Rectangle *r; - sel = l->data; r = range->data; if (sel->obj_bg) { @@ -329,7 +328,7 @@ _sel_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) evas_object_move(sel->obj_fg, x + r->x, y + r->y); evas_object_resize(sel->obj_fg, r->w, r->h); } - range = evas_list_remove_list(range, range); + range = eina_list_remove_list(range, range); free(r); } } @@ -452,20 +451,20 @@ _edje_anchor_mouse_out_cb(void *data, Evas *e, Evas_Object *obj, void *event_inf static void _anchors_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) { - Evas_List *l, *ll, *range; + Eina_List *l, *ll, *range; Evas_Coord x, y, w, h; Evas_Object *smart, *clip; Sel *sel; - + Anchor *an; + smart = evas_object_smart_parent_get(o); clip = evas_object_clip_get(o); x = y = w = h = -1; evas_object_geometry_get(o, &x, &y, &w, &h); - for (l = en->anchors; l; l = l->next) + EINA_LIST_FOREACH(en->anchors, l, an) { - Anchor *an = l->data; range = evas_textblock_cursor_range_geometry_get(an->start, an->end); - if (evas_list_count(range) != evas_list_count(an->sel)) + if (eina_list_count(range) != eina_list_count(an->sel)) { while (an->sel) { @@ -474,14 +473,14 @@ _anchors_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) if (sel->obj_fg) evas_object_del(sel->obj_fg); if (sel->obj) evas_object_del(sel->obj); free(sel); - an->sel = evas_list_remove_list(an->sel, an->sel); + an->sel = eina_list_remove_list(an->sel, an->sel); } - for (ll = range; ll; ll = ll->next) + for (ll = range; ll; ll = eina_list_next(ll)) { Evas_Object *ob; - + sel = calloc(1, sizeof(Sel)); - an->sel = evas_list_append(an->sel, sel); + an->sel = eina_list_append(an->sel, sel); ob = edje_object_add(en->rp->edje->evas); edje_object_file_set(ob, en->rp->edje->path, en->rp->part->source5); evas_object_smart_member_add(ob, smart); @@ -513,11 +512,10 @@ _anchors_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) sel->obj = ob; } } - for (ll = an->sel; ll; ll = ll->next) + EINA_LIST_FOREACH(an->sel, ll, sel) { Evas_Textblock_Rectangle *r; - - sel = ll->data; + r = range->data; if (sel->obj_bg) { @@ -534,7 +532,7 @@ _anchors_update(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) evas_object_move(sel->obj, x + r->x, y + r->y); evas_object_resize(sel->obj, r->w, r->h); } - range = evas_list_remove_list(range, range); + range = eina_list_remove_list(range, range); free(r); } } @@ -546,7 +544,7 @@ _anchors_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) while (en->anchorlist) { free(en->anchorlist->data); - en->anchorlist = evas_list_remove_list(en->anchorlist, en->anchorlist); + en->anchorlist = eina_list_remove_list(en->anchorlist, en->anchorlist); } while (en->anchors) { @@ -561,9 +559,9 @@ _anchors_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) if (sel->obj_fg) evas_object_del(sel->obj_fg); if (sel->obj) evas_object_del(sel->obj); free(sel); - an->sel = evas_list_remove_list(an->sel, an->sel); + an->sel = eina_list_remove_list(an->sel, an->sel); } - en->anchors = evas_list_remove_list(en->anchors, en->anchors); + en->anchors = eina_list_remove_list(en->anchors, en->anchors); } } @@ -597,7 +595,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) { an->name = strdup(p + 5); } - en->anchors = evas_list_append(en->anchors, an); + en->anchors = eina_list_append(en->anchors, an); an->start = evas_object_textblock_cursor_new(o); an->end = evas_object_textblock_cursor_new(o); evas_textblock_cursor_copy(c1, an->start); @@ -613,7 +611,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) if (an->name) free(an->name); evas_textblock_cursor_free(an->start); evas_textblock_cursor_free(an->end); - en->anchors = evas_list_remove(en->anchors, an); + en->anchors = eina_list_remove(en->anchors, an); free(an); } firsttext = 0; @@ -1259,22 +1257,23 @@ _edje_entry_set_cursor_end(Edje_Real_Part *rp) _curs_end(en->cursor, rp->object, en); } -const Evas_List * +const Eina_List * _edje_entry_anchors_list(Edje_Real_Part *rp) { Entry *en = rp->entry_data; - Evas_List *l, *anchors = NULL; + Eina_List *l, *anchors = NULL; + Anchor *an; + if (!en) return NULL; if (!en->anchorlist) { - for (l = en->anchors; l; l = l->next) + EINA_LIST_FOREACH(en->anchors, l, an) { - Anchor *an = l->data; char *n; - + n = an->name; if (!n) n = ""; - anchors = evas_list_append(anchors, strdup(n)); + anchors = eina_list_append(anchors, strdup(n)); } en->anchorlist = anchors; } diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c index c9c46ae9f4..25ecc16ae1 100644 --- a/legacy/edje/src/lib/edje_load.c +++ b/legacy/edje/src/lib/edje_load.c @@ -9,10 +9,10 @@ static Evas_Bool _edje_file_collection_hash_foreach(const Evas_Hash *hash, const #ifdef EDJE_PROGRAM_CACHE static Evas_Bool _edje_collection_free_prog_cache_matches_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata); #endif -static int _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Evas_List *group_path); +static int _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Eina_List *group_path); static void _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *source); -static Evas_List *_edje_swallows_collect(Edje *ed); +static Eina_List *_edje_swallows_collect(Edje *ed); /************************** API Routines **************************/ @@ -91,15 +91,15 @@ edje_object_load_error_get(const Evas_Object *obj) /** Get a list of groups in an edje file * @param file The path to the edje file * - * @return The Evas_List of group names (char *) + * @return The Eina_List of group names (char *) * * Note: the list must be freed using edje_file_collection_list_free() * when you are done with it. */ -EAPI Evas_List * +EAPI Eina_List * edje_file_collection_list(const char *file) { - Evas_List *lst = NULL; + Eina_List *lst = NULL; Edje_File *edf; int error_ret = 0; @@ -109,15 +109,11 @@ edje_file_collection_list(const char *file) { if (edf->collection_dir) { - Evas_List *l; + Eina_List *l; + Edje_Part_Collection_Directory_Entry *ce; - for (l = edf->collection_dir->entries; l; l = l->next) - { - Edje_Part_Collection_Directory_Entry *ce; - - ce = l->data; - lst = evas_list_append(lst, eina_stringshare_add(ce->entry)); - } + EINA_LIST_FOREACH(edf->collection_dir->entries, l, ce) + lst = eina_list_append(lst, eina_stringshare_add(ce->entry)); } _edje_cache_file_unref(edf); } @@ -125,17 +121,17 @@ edje_file_collection_list(const char *file) } /** Free file collection list - * @param lst The Evas_List of groups + * @param lst The Eina_List of groups * * Frees the list returned by edje_file_collection_list(). */ EAPI void -edje_file_collection_list_free(Evas_List *lst) +edje_file_collection_list_free(Eina_List *lst) { while (lst) { - if (lst->data) eina_stringshare_del(lst->data); - lst = evas_list_remove(lst, lst->data); + if (eina_list_data_get(lst)) eina_stringshare_del(eina_list_data_get(lst)); + lst = eina_list_remove(lst, eina_list_data_get(lst)); } } @@ -222,7 +218,7 @@ static void _edje_programs_patterns_init(Edje *ed) { Edje_Signals_Sources_Patterns *ssp = &ed->patterns.programs; - Evas_List *programs = ed->collection->programs; + Eina_List *programs = ed->collection->programs; if (ssp->signals_patterns) return; @@ -232,12 +228,12 @@ _edje_programs_patterns_init(Edje *ed) } static int -_edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Evas_List *group_path) +_edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Eina_List *group_path) { Edje *ed; int n; - Evas_List *parts = NULL; - Evas_List *old_swallows; + Eina_List *parts = NULL; + Eina_List *old_swallows; int group_path_started = 0; ed = _edje_fetch(obj); @@ -273,36 +269,34 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g } else { - Evas_List *l; + Eina_List *l; int i; int errors = 0; + Edje_Part *ep; /* colorclass stuff */ - for (l = ed->collection->parts; (l && ! errors); l = l->next) + EINA_LIST_FOREACH(ed->collection->parts, l, ep) { - Edje_Part *ep; - Evas_List *hist = NULL; - + Eina_List *hist = NULL; + Edje_Part_Description *desc; + + if (errors) + break; /* Register any color classes in this parts descriptions. */ - ep = l->data; if ((ep->default_desc) && (ep->default_desc->color_class)) _edje_color_class_member_add(ed, ep->default_desc->color_class); - for (hist = ep->other_desc; hist; hist = hist->next) - { - Edje_Part_Description *desc; - - desc = hist->data; - if (desc->color_class) - _edje_color_class_member_add(ed, desc->color_class); - } + + EINA_LIST_FOREACH(ep->other_desc, hist, desc) + if (desc->color_class) + _edje_color_class_member_add(ed, desc->color_class); } /* build real parts */ - for (n = 0, l = ed->collection->parts; l; l = l->next, n++) + for (n = 0, l = ed->collection->parts; l; l = eina_list_next(l), n++) { Edje_Part *ep; Edje_Real_Part *rp; - - ep = l->data; + + ep = eina_list_data_get(l); rp = calloc(1, sizeof(Edje_Real_Part)); if (!rp) { @@ -312,7 +306,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g rp->edje = ed; _edje_ref(rp->edje); rp->part = ep; - parts = evas_list_append(parts, rp); + parts = eina_list_append(parts, rp); rp->param1.description = ep->default_desc; rp->chosen_description = rp->param1.description; if (!rp->param1.description) @@ -377,13 +371,12 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g ed->table_parts_size = n; /* FIXME: check malloc return */ n = 0; - for (l = parts; l; l = l->next) + EINA_LIST_FOREACH(parts, l, rp) { - rp = l->data; ed->table_parts[n] = rp; n++; } - evas_list_free(parts); + eina_list_free(parts); for (i = 0; i < ed->table_parts_size; i++) { rp = ed->table_parts[i]; @@ -441,19 +434,17 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g _edje_programs_patterns_init(ed); - n = evas_list_count(ed->collection->programs); + n = eina_list_count(ed->collection->programs); if (n > 0) { + Edje_Program *pr; /* FIXME: keeping a table AND a list is just bad - nuke list */ ed->table_programs = malloc(sizeof(Edje_Program *) * n); ed->table_programs_size = n; /* FIXME: check malloc return */ n = 0; - for (l = ed->collection->programs; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->programs, l, pr) { - Edje_Program *pr; - - pr = l->data; ed->table_programs[n] = pr; n++; } @@ -488,19 +479,21 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g if (rp->part->type != EDJE_PART_TYPE_GROUP) continue; if (rp->part->source) { - Evas_List *l; + Eina_List *l; Evas_Object *child_obj; Edje *child_ed; const char *group_path_entry = eina_stringshare_add(rp->part->source); + const char *data; + if (!group_path) { - group_path = evas_list_append(NULL, eina_stringshare_add(group)); + group_path = eina_list_append(NULL, eina_stringshare_add(group)); group_path_started = 1; } /* make sure that this group isn't already in the tree of parents */ - for (l = group_path; l; l = l->next) + EINA_LIST_FOREACH(group_path, l, data) { - if (l->data == group_path_entry) + if (data == group_path_entry) { _edje_thaw(ed); _edje_unblock(ed); @@ -509,8 +502,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g eina_stringshare_del(group_path_entry); if (group_path_started) { - eina_stringshare_del(group_path->data); - evas_list_free(group_path); + eina_stringshare_del(eina_list_data_get(group_path)); + eina_list_free(group_path); } ed->load_error = EDJE_LOAD_ERROR_RECURSIVE_REFERENCE; return 0; @@ -518,7 +511,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g } child_obj = edje_object_add(ed->evas); - group_path = evas_list_append(group_path, group_path_entry); + group_path = eina_list_append(group_path, group_path_entry); if (!_edje_object_file_set_internal(child_obj, file, rp->part->source, group_path)) { _edje_thaw(ed); @@ -530,8 +523,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g { while (group_path) { - eina_stringshare_del(group_path->data); - group_path = evas_list_remove_list(group_path, group_path); + eina_stringshare_del(eina_list_data_get(group_path)); + group_path = eina_list_remove_list(group_path, group_path); } } ed->load_error = edje_object_load_error_get(child_obj); @@ -540,7 +533,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g child_ed = _edje_fetch(child_obj); child_ed->parent = eina_stringshare_add(rp->part->name); - group_path = evas_list_remove(group_path, group_path_entry); + group_path = eina_list_remove(group_path, group_path_entry); eina_stringshare_del(group_path_entry); edje_object_signal_callback_add(child_obj, "*", "*", _cb_signal_repeat, obj); @@ -552,8 +545,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g { while (group_path) { - eina_stringshare_del(group_path->data); - group_path = evas_list_remove_list(group_path, group_path); + eina_stringshare_del(eina_list_data_get(group_path)); + group_path = eina_list_remove_list(group_path, group_path); } } @@ -565,11 +558,11 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g const char *name; Evas_Object *swallow; - name = old_swallows->data; - old_swallows = evas_list_remove_list(old_swallows, old_swallows); + name = eina_list_data_get(old_swallows); + old_swallows = eina_list_remove_list(old_swallows, old_swallows); - swallow = old_swallows->data; - old_swallows = evas_list_remove_list(old_swallows, old_swallows); + swallow = eina_list_data_get(old_swallows); + old_swallows = eina_list_remove_list(old_swallows, old_swallows); edje_object_part_swallow(obj, name, swallow); eina_stringshare_del(name); @@ -609,10 +602,10 @@ _edje_file_add(Edje *ed) } } -static Evas_List * +static Eina_List * _edje_swallows_collect(Edje *ed) { - Evas_List *swallows = NULL; + Eina_List *swallows = NULL; int i; if (!ed->file || !ed->table_parts) return NULL; @@ -622,8 +615,8 @@ _edje_swallows_collect(Edje *ed) rp = ed->table_parts[i]; if (rp->part->type != EDJE_PART_TYPE_SWALLOW || !rp->swallowed_object) continue; - swallows = evas_list_append(swallows, eina_stringshare_add(rp->part->name)); - swallows = evas_list_append(swallows, rp->swallowed_object); + swallows = eina_list_append(swallows, eina_stringshare_add(rp->part->name)); + swallows = eina_list_append(swallows, rp->swallowed_object); } return swallows; } @@ -639,14 +632,12 @@ _edje_file_del(Edje *ed) if (!((ed->file) && (ed->collection))) return; if ((ed->file) && (ed->collection)) { - Evas_List *l; + Eina_List *l; + Edje_Part *ep; _edje_textblock_styles_del(ed); - for (l = ed->collection->parts; l; l = l->next) + EINA_LIST_FOREACH(ed->collection->parts, l, ep) { - Edje_Part *ep; - - ep = l->data; _edje_text_part_on_del(ed, ep); _edje_color_class_on_del(ed, ep); } @@ -711,20 +702,20 @@ _edje_file_del(Edje *ed) Edje_Running_Program *runp; _edje_anim_count--; - runp = ed->actions->data; - ed->actions = evas_list_remove(ed->actions, runp); + runp = eina_list_data_get(ed->actions); + ed->actions = eina_list_remove(ed->actions, runp); free(runp); } } - _edje_animators = evas_list_remove(_edje_animators, ed); + _edje_animators = eina_list_remove(_edje_animators, ed); if (ed->pending_actions) { while (ed->pending_actions) { Edje_Pending_Program *pp; - pp = ed->pending_actions->data; - ed->pending_actions = evas_list_remove(ed->pending_actions, pp); + pp = eina_list_data_get(ed->pending_actions); + ed->pending_actions = eina_list_remove(ed->pending_actions, pp); ecore_timer_del(pp->timer); free(pp); } @@ -758,9 +749,9 @@ _edje_file_free(Edje_File *edf) { Edje_Font_Directory_Entry *fe; - fe = edf->font_dir->entries->data; + fe = eina_list_data_get(edf->font_dir->entries); edf->font_dir->entries = - evas_list_remove_list(edf->font_dir->entries, edf->font_dir->entries); + eina_list_remove_list(edf->font_dir->entries, edf->font_dir->entries); edf->font_hash = evas_hash_del(edf->font_hash, fe->entry, edf); if (edf->free_strings && fe->path) eina_stringshare_del(fe->path); free(fe); @@ -773,9 +764,9 @@ _edje_file_free(Edje_File *edf) { Edje_Image_Directory_Entry *ie; - ie = edf->image_dir->entries->data; + ie = eina_list_data_get(edf->image_dir->entries); edf->image_dir->entries = - evas_list_remove_list(edf->image_dir->entries, edf->image_dir->entries); + eina_list_remove_list(edf->image_dir->entries, edf->image_dir->entries); if (edf->free_strings && ie->entry) eina_stringshare_del(ie->entry); free(ie); } @@ -787,9 +778,9 @@ _edje_file_free(Edje_File *edf) { Edje_Part_Collection_Directory_Entry *ce; - ce = edf->collection_dir->entries->data; + ce = eina_list_data_get(edf->collection_dir->entries); edf->collection_dir->entries = - evas_list_remove_list(edf->collection_dir->entries, edf->collection_dir->entries); + eina_list_remove_list(edf->collection_dir->entries, edf->collection_dir->entries); if (edf->free_strings && ce->entry) eina_stringshare_del(ce->entry); free(ce); } @@ -801,14 +792,14 @@ _edje_file_free(Edje_File *edf) { Edje_Spectrum_Directory_Entry *se; - se = edf->spectrum_dir->entries->data; + se = eina_list_data_get(edf->spectrum_dir->entries); edf->spectrum_dir->entries = - evas_list_remove_list(edf->spectrum_dir->entries, edf->spectrum_dir->entries); + eina_list_remove_list(edf->spectrum_dir->entries, edf->spectrum_dir->entries); while (se->color_list) { - free(se->color_list->data); + free(eina_list_data_get(se->color_list)); se->color_list = - evas_list_remove_list(se->color_list, se->color_list); + eina_list_remove_list(se->color_list, se->color_list); } if (edf->free_strings) { @@ -823,8 +814,8 @@ _edje_file_free(Edje_File *edf) { Edje_Data *edt; - edt = edf->data->data; - edf->data = evas_list_remove(edf->data, edt); + edt = eina_list_data_get(edf->data); + edf->data = eina_list_remove(edf->data, edt); if (edf->free_strings) { if (edt->key) eina_stringshare_del(edt->key); @@ -843,9 +834,9 @@ _edje_file_free(Edje_File *edf) { Edje_Color_Class *ecc; - ecc = edf->color_classes->data; + ecc = eina_list_data_get(edf->color_classes); edf->color_classes = - evas_list_remove_list(edf->color_classes, edf->color_classes); + eina_list_remove_list(edf->color_classes, edf->color_classes); if (edf->free_strings && ecc->name) eina_stringshare_del(ecc->name); free(ecc); } @@ -882,8 +873,8 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec) { Edje_Program *pr; - pr = ec->programs->data; - ec->programs = evas_list_remove_list(ec->programs, ec->programs); + pr = eina_list_data_get(ec->programs); + ec->programs = eina_list_remove_list(ec->programs, ec->programs); if (edf->free_strings) { if (pr->name) eina_stringshare_del(pr->name); @@ -896,16 +887,16 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec) { Edje_Program_Target *prt; - prt = pr->targets->data; - pr->targets = evas_list_remove_list(pr->targets, pr->targets); + prt = eina_list_data_get(pr->targets); + pr->targets = eina_list_remove_list(pr->targets, pr->targets); free(prt); } while (pr->after) { Edje_Program_After *pa; - pa = pr->after->data; - pr->after = evas_list_remove_list(pr->after, pr->after); + pa = eina_list_data_get(pr->after); + pr->after = eina_list_remove_list(pr->after, pr->after); free(pa); } free(pr); @@ -914,8 +905,8 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec) { Edje_Part *ep; - ep = ec->parts->data; - ec->parts = evas_list_remove(ec->parts, ep); + ep = eina_list_data_get(ec->parts); + ec->parts = eina_list_remove(ec->parts, ep); if (edf->free_strings && ep->name) eina_stringshare_del(ep->name); if (ep->default_desc) { @@ -926,8 +917,8 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec) { Edje_Part_Description *desc; - desc = ep->other_desc->data; - ep->other_desc = evas_list_remove(ep->other_desc, desc); + desc = eina_list_data_get(ep->other_desc); + ep->other_desc = eina_list_remove(ep->other_desc, desc); _edje_collection_free_part_description_free(desc, edf->free_strings); } free(ep); @@ -938,8 +929,8 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec) { Edje_Data *edt; - edt = ec->data->data; - ec->data = evas_list_remove(ec->data, edt); + edt = eina_list_data_get(ec->data); + ec->data = eina_list_remove(ec->data, edt); if (edf->free_strings) { if (edt->key) eina_stringshare_del(edt->key); @@ -970,8 +961,8 @@ _edje_collection_free_part_description_free(Edje_Part_Description *desc, unsigne { Edje_Part_Image_Id *pi; - pi = desc->image.tween_list->data; - desc->image.tween_list = evas_list_remove(desc->image.tween_list, pi); + pi = eina_list_data_get(desc->image.tween_list); + desc->image.tween_list = eina_list_remove(desc->image.tween_list, pi); free(pi); } if (free_strings) @@ -1007,7 +998,7 @@ _edje_file_collection_hash_foreach(const Evas_Hash *hash, const char *key, void static Evas_Bool _edje_collection_free_prog_cache_matches_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata) { - evas_list_free((Evas_List *)data); + eina_list_free((Eina_List *)data); return 1; hash = NULL; fdata = NULL; diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c index 2ce1f11d3e..40cdf72dc4 100644 --- a/legacy/edje/src/lib/edje_main.c +++ b/legacy/edje/src/lib/edje_main.c @@ -98,30 +98,30 @@ _edje_del(Edje *ed) ed->group = NULL; if ((ed->actions) || (ed->pending_actions)) { - _edje_animators = evas_list_remove(_edje_animators, ed); + _edje_animators = eina_list_remove(_edje_animators, ed); } while (ed->actions) { Edje_Running_Program *runp; - runp = ed->actions->data; - ed->actions = evas_list_remove(ed->actions, runp); + runp = eina_list_data_get(ed->actions); + ed->actions = eina_list_remove(ed->actions, runp); free(runp); } while (ed->pending_actions) { Edje_Pending_Program *pp; - pp = ed->pending_actions->data; - ed->pending_actions = evas_list_remove(ed->pending_actions, pp); + pp = eina_list_data_get(ed->pending_actions); + ed->pending_actions = eina_list_remove(ed->pending_actions, pp); free(pp); } while (ed->callbacks) { Edje_Signal_Callback *escb; - escb = ed->callbacks->data; - ed->callbacks = evas_list_remove(ed->callbacks, escb); + escb = eina_list_data_get(ed->callbacks); + ed->callbacks = eina_list_remove(ed->callbacks, escb); if (escb->signal) eina_stringshare_del(escb->signal); if (escb->source) eina_stringshare_del(escb->source); free(escb); @@ -130,8 +130,8 @@ _edje_del(Edje *ed) { Edje_Color_Class *cc; - cc = ed->color_classes->data; - ed->color_classes = evas_list_remove(ed->color_classes, cc); + cc = eina_list_data_get(ed->color_classes); + ed->color_classes = eina_list_remove(ed->color_classes, cc); if (cc->name) eina_stringshare_del(cc->name); free(cc); } @@ -139,8 +139,8 @@ _edje_del(Edje *ed) { Edje_Text_Class *tc; - tc = ed->text_classes->data; - ed->text_classes = evas_list_remove(ed->text_classes, tc); + tc = eina_list_data_get(ed->text_classes); + ed->text_classes = eina_list_remove(ed->text_classes, tc); if (tc->name) eina_stringshare_del(tc->name); if (tc->font) eina_stringshare_del(tc->font); free(tc); diff --git a/legacy/edje/src/lib/edje_match.c b/legacy/edje/src/lib/edje_match.c index 0c03d8a7a5..596ab9b5ac 100644 --- a/legacy/edje/src/lib/edje_match.c +++ b/legacy/edje/src/lib/edje_match.c @@ -250,21 +250,21 @@ _edje_match_patterns_exec_init_states(Edje_States *states, #define EDJE_MATCH_INIT(Func, Type, Source, Show) \ Edje_Patterns* \ - Func(Evas_List *lst) \ + Func(Eina_List *lst) \ { \ Edje_Patterns *r; \ size_t i; \ \ - if (!lst || evas_list_count(lst) <= 0) \ + if (!lst || eina_list_count(lst) <= 0) \ return NULL; \ \ r = malloc(sizeof (Edje_Patterns) + \ - evas_list_count(lst) \ + eina_list_count(lst) \ * sizeof (*r->finals) \ * sizeof(*r->patterns)); \ if (!r) return NULL; \ \ - r->patterns_size = evas_list_count(lst); \ + r->patterns_size = eina_list_count(lst); \ r->max_length = 0; \ r->patterns = (const char **) r->finals + r->patterns_size + 1; \ \ @@ -274,7 +274,7 @@ _edje_match_patterns_exec_init_states(Edje_States *states, Type *data; \ size_t j; \ \ - data = evas_list_data(lst); \ + data = eina_list_data_get(lst); \ if (!data) \ { \ free(r); \ @@ -296,7 +296,7 @@ _edje_match_patterns_exec_init_states(Edje_States *states, if (j > r->max_length) \ r->max_length = j; \ \ - lst = evas_list_next(lst); \ + lst = eina_list_next(lst); \ } \ \ if (!_edje_match_states_alloc(r, 2)) \ @@ -341,7 +341,7 @@ edje_match_programs_exec_check_finals(const size_t *signal_finals, const size_t *source_finals, const Edje_States *signal_states, const Edje_States *source_states, - Evas_List *programs, + Eina_List *programs, int (*func)(Edje_Program *pr, void *data), void *data) { @@ -356,7 +356,7 @@ edje_match_programs_exec_check_finals(const size_t *signal_finals, { Edje_Program *pr; - pr = evas_list_nth(programs, signal_states->states[i].idx); + pr = eina_list_nth(programs, signal_states->states[i].idx); if (pr) { if (func(pr, data)) @@ -374,7 +374,7 @@ edje_match_callback_exec_check_finals(const size_t *signal_finals, const Edje_States *source_states, const char *signal, const char *source, - Evas_List *callbacks, + Eina_List *callbacks, Edje *ed) { size_t i; @@ -389,7 +389,7 @@ edje_match_callback_exec_check_finals(const size_t *signal_finals, { Edje_Signal_Callback *escb; - escb = evas_list_nth(callbacks, signal_states->states[i].idx); + escb = eina_list_nth(callbacks, signal_states->states[i].idx); if (escb) { if ((!escb->just_added) @@ -479,7 +479,7 @@ edje_match_programs_exec(const Edje_Patterns *ppat_signal, const Edje_Patterns *ppat_source, const char *signal, const char *source, - Evas_List *programs, + Eina_List *programs, int (*func)(Edje_Program *pr, void *data), void *data) { @@ -513,7 +513,7 @@ edje_match_callback_exec(const Edje_Patterns *ppat_signal, const Edje_Patterns *ppat_source, const char *signal, const char *source, - Evas_List *callbacks, + Eina_List *callbacks, Edje *ed) { Edje_States *signal_result; diff --git a/legacy/edje/src/lib/edje_message_queue.c b/legacy/edje/src/lib/edje_message_queue.c index 631fe60c96..e20e00b8b7 100644 --- a/legacy/edje/src/lib/edje_message_queue.c +++ b/legacy/edje/src/lib/edje_message_queue.c @@ -7,8 +7,8 @@ static Ecore_Job *job = NULL; static Ecore_Timer *job_loss_timer = NULL; -static Evas_List *msgq = NULL; -static Evas_List *tmp_msgq = NULL; +static Eina_List *msgq = NULL; +static Eina_List *tmp_msgq = NULL; EAPI void edje_object_message_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg) @@ -41,30 +41,27 @@ edje_object_message_handler_set(Evas_Object *obj, void (*func) (void *data, Evas EAPI void edje_object_message_signal_process(Evas_Object *obj) { - Evas_List *l, *tmpq = NULL; + Eina_List *l, *tmpq = NULL; Edje *ed; + Edje_Message *em; + const void *data; ed = _edje_fetch(obj); if (!ed) return; - for (l = msgq; l; l = l->next) - { - Edje_Message *em; - - em = l->data; - if (em->edje == ed) - tmpq = evas_list_append(tmpq, em); - } + EINA_LIST_FOREACH(msgq, l, em) + if (em->edje == ed) + tmpq = eina_list_append(tmpq, em); /* now remove them from the old queue */ - for (l = tmpq; l; l = l->next) - msgq = evas_list_remove(msgq, l->data); + EINA_LIST_FOREACH(tmpq, l, data) + msgq = eina_list_remove(msgq, data); /* a temporary message queue */ if (tmp_msgq) { while (tmpq) { - tmp_msgq = evas_list_append(tmp_msgq, tmpq->data); - tmpq = evas_list_remove_list(tmpq, tmpq); + tmp_msgq = eina_list_append(tmp_msgq, tmpq->data); + tmpq = eina_list_remove_list(tmpq, tmpq); } } else @@ -78,7 +75,7 @@ edje_object_message_signal_process(Evas_Object *obj) Edje_Message *em; em = tmp_msgq->data; - tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq); + tmp_msgq = eina_list_remove_list(tmp_msgq, tmp_msgq); em->edje->message.num--; _edje_message_process(em); _edje_message_free(em); @@ -418,7 +415,7 @@ _edje_message_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, v } em->msg = msg; - msgq = evas_list_append(msgq, em); + msgq = eina_list_append(msgq, em); } void @@ -598,8 +595,8 @@ _edje_message_queue_process(void) { while (msgq) { - tmp_msgq = evas_list_append(tmp_msgq, msgq->data); - msgq = evas_list_remove_list(msgq, msgq); + tmp_msgq = eina_list_append(tmp_msgq, msgq->data); + msgq = eina_list_remove_list(msgq, msgq); } } else @@ -615,7 +612,7 @@ _edje_message_queue_process(void) em = tmp_msgq->data; ed = em->edje; - tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq); + tmp_msgq = eina_list_remove_list(tmp_msgq, tmp_msgq); em->edje->message.num--; if (!ed->delete_me) { @@ -649,7 +646,7 @@ _edje_message_queue_clear(void) Edje_Message *em; em = msgq->data; - msgq = evas_list_remove_list(msgq, msgq); + msgq = eina_list_remove_list(msgq, msgq); em->edje->message.num--; _edje_message_free(em); } @@ -658,7 +655,7 @@ _edje_message_queue_clear(void) Edje_Message *em; em = tmp_msgq->data; - tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq); + tmp_msgq = eina_list_remove_list(tmp_msgq, tmp_msgq); em->edje->message.num--; _edje_message_free(em); } @@ -667,21 +664,21 @@ _edje_message_queue_clear(void) void _edje_message_del(Edje *ed) { - Evas_List *l; + Eina_List *l; if (ed->message.num <= 0) return; /* delete any messages on the main queue for this edje object */ for (l = msgq; l; ) { Edje_Message *em; - Evas_List *lp; + Eina_List *lp; - em = l->data; + em = eina_list_data_get(l); lp = l; - l = l->next; + l = eina_list_next(l); if (em->edje == ed) { - msgq = evas_list_remove_list(msgq, lp); + msgq = eina_list_remove_list(msgq, lp); em->edje->message.num--; _edje_message_free(em); } @@ -691,14 +688,14 @@ _edje_message_del(Edje *ed) for (l = tmp_msgq; l; ) { Edje_Message *em; - Evas_List *lp; + Eina_List *lp; - em = l->data; + em = eina_list_data_get(l); lp = l; - l = l->next; + l = eina_list_next(l); if (em->edje == ed) { - tmp_msgq = evas_list_remove_list(tmp_msgq, lp); + tmp_msgq = eina_list_remove_list(tmp_msgq, lp); em->edje->message.num--; _edje_message_free(em); } diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h index c401c069d2..6bed52813e 100644 --- a/legacy/edje/src/lib/edje_private.h +++ b/legacy/edje/src/lib/edje_private.h @@ -279,9 +279,9 @@ struct _Edje_File Edje_Image_Directory *image_dir; Edje_Spectrum_Directory *spectrum_dir; Edje_Part_Collection_Directory *collection_dir; - Evas_List *data; - Evas_List *styles; - Evas_List *color_classes; + Eina_List *data; + Eina_List *styles; + Eina_List *color_classes; int references; char *compiler; @@ -290,7 +290,7 @@ struct _Edje_File Evas_Hash *collection_hash; Evas_Hash *font_hash; - Evas_List *collection_cache; + Eina_List *collection_cache; Evas_Hash *data_cache; Eet_File *ef; @@ -301,7 +301,7 @@ struct _Edje_File struct _Edje_Style { char *name; - Evas_List *tags; + Eina_List *tags; Evas_Textblock_Style *style; }; @@ -326,7 +326,7 @@ struct _Edje_Data struct _Edje_Font_Directory { - Evas_List *entries; /* a list of Edje_Font_Directory_Entry */ + Eina_List *entries; /* a list of Edje_Font_Directory_Entry */ }; struct _Edje_Font_Directory_Entry @@ -340,7 +340,7 @@ struct _Edje_Font_Directory_Entry struct _Edje_Image_Directory { - Evas_List *entries; /* a list of Edje_Image_Directory_Entry */ + Eina_List *entries; /* a list of Edje_Image_Directory_Entry */ }; struct _Edje_Image_Directory_Entry @@ -355,7 +355,7 @@ struct _Edje_Image_Directory_Entry struct _Edje_Spectrum_Directory { - Evas_List *entries; /* a list of Edje_Spectrum_Directory_Entry */ + Eina_List *entries; /* a list of Edje_Spectrum_Directory_Entry */ }; struct _Edje_Spectrum_Directory_Entry @@ -363,7 +363,7 @@ struct _Edje_Spectrum_Directory_Entry char *entry; /* only one of the following two should be included. filename takes precedence */ char *filename; /* filename of external spectrum. */ - Evas_List *color_list; /* list of Edje_Spectrum_Color */ + Eina_List *color_list; /* list of Edje_Spectrum_Color */ int id; }; @@ -400,9 +400,9 @@ struct _Edje_Program /* a conditional program to be run */ double time; /* time to graduate between current and new state */ } tween; - Evas_List *targets; /* list of target parts to apply the state to */ + Eina_List *targets; /* list of target parts to apply the state to */ - Evas_List *after; /* list of actions to run at the end of this, for looping */ + Eina_List *after; /* list of actions to run at the end of this, for looping */ }; struct _Edje_Program_Target /* the target of an action */ @@ -419,7 +419,7 @@ struct _Edje_Program_After /* the action to run after another action */ struct _Edje_Part_Collection_Directory { - Evas_List *entries; /* a list of Edje_Part_Collection_Directory_Entry */ + Eina_List *entries; /* a list of Edje_Part_Collection_Directory_Entry */ int references; }; @@ -434,9 +434,9 @@ struct _Edje_Part_Collection_Directory_Entry struct _Edje_Part_Collection { - Evas_List *programs; /* a list of Edje_Program */ - Evas_List *parts; /* a list of Edje_Part */ - Evas_List *data; + Eina_List *programs; /* a list of Edje_Program */ + Eina_List *parts; /* a list of Edje_Part */ + Eina_List *data; int id; /* the collection id */ @@ -463,7 +463,7 @@ struct _Edje_Part { const char *name; /* the name if any of the part */ Edje_Part_Description *default_desc; /* the part descriptor for default */ - Evas_List *other_desc; /* other possible descriptors */ + Eina_List *other_desc; /* other possible descriptors */ const char *source, *source2, *source3, *source4, *source5, *source6; int id; /* its id number */ int clip_to_id; /* the part id to clip this one to */ @@ -527,7 +527,7 @@ struct _Edje_Part_Description } rel1, rel2; struct { - Evas_List *tween_list; /* list of Edje_Part_Image_Id */ + Eina_List *tween_list; /* list of Edje_Part_Image_Id */ int id; /* the image id to use */ } image; @@ -638,11 +638,11 @@ struct _Edje Evas_Object *clipper; /* a big rect to clip this Edje to */ Edje_File *file; /* the file the data comes form */ Edje_Part_Collection *collection; /* the description being used */ - Evas_List *actions; /* currently running actions */ - Evas_List *callbacks; - Evas_List *pending_actions; - Evas_List *color_classes; - Evas_List *text_classes; + Eina_List *actions; /* currently running actions */ + Eina_List *callbacks; + Eina_List *pending_actions; + Eina_List *color_classes; + Eina_List *text_classes; /* variable pool for Edje Embryo scripts */ Edje_Var_Pool *var_pool; /* for faster lookups to avoid nth list walks */ @@ -693,7 +693,7 @@ struct _Edje_Real_Part { Edje *edje; Evas_Object *object; - Evas_List *extra_objects; + Eina_List *extra_objects; Evas_Object *swallowed_object; void *entry_data; Evas_Object *cursorbg_object; @@ -862,7 +862,7 @@ struct _Edje_Var_String struct _Edje_Var_List { - Evas_List *v; + Eina_List *v; }; struct _Edje_Var_Hash @@ -892,8 +892,8 @@ struct _Edje_Var_Animator struct _Edje_Var_Pool { int id_count; - Evas_List *timers; - Evas_List *animators; + Eina_List *timers; + Eina_List *animators; int size; Edje_Var *vars; int walking_list; @@ -962,11 +962,11 @@ struct _Edje_Patterns size_t finals[]; }; -Edje_Patterns *edje_match_collection_dir_init(Evas_List *lst); -Edje_Patterns *edje_match_programs_signal_init(Evas_List *lst); -Edje_Patterns *edje_match_programs_source_init(Evas_List *lst); -Edje_Patterns *edje_match_callback_signal_init(Evas_List *lst); -Edje_Patterns *edje_match_callback_source_init(Evas_List *lst); +Edje_Patterns *edje_match_collection_dir_init(Eina_List *lst); +Edje_Patterns *edje_match_programs_signal_init(Eina_List *lst); +Edje_Patterns *edje_match_programs_source_init(Eina_List *lst); +Edje_Patterns *edje_match_callback_signal_init(Eina_List *lst); +Edje_Patterns *edje_match_callback_source_init(Eina_List *lst); int edje_match_collection_dir_exec(const Edje_Patterns *ppat, const char *string); @@ -974,14 +974,14 @@ int edje_match_programs_exec(const Edje_Patterns *ppat_signal, const Edje_Patterns *ppat_source, const char *signal, const char *source, - Evas_List *programs, + Eina_List *programs, int (*func)(Edje_Program *pr, void *data), void *data); int edje_match_callback_exec(const Edje_Patterns *ppat_signal, const Edje_Patterns *ppat_source, const char *signal, const char *source, - Evas_List *callbacks, + Eina_List *callbacks, Edje *ed); void edje_match_patterns_free(Edje_Patterns *ppat); @@ -1008,8 +1008,8 @@ EAPI extern Eet_Data_Descriptor *_edje_edd_edje_spectrum_color; extern int _edje_anim_count; extern Ecore_Animator *_edje_timer; -extern Evas_List *_edje_animators; -extern Evas_List *_edje_edjes; +extern Eina_List *_edje_animators; +extern Eina_List *_edje_edjes; extern char *_edje_fontset_append; extern double _edje_scale; @@ -1244,7 +1244,7 @@ void _edje_entry_text_markup_set(Edje_Real_Part *rp, const char *text); void _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text); void _edje_entry_set_cursor_start(Edje_Real_Part *rp); void _edje_entry_set_cursor_end(Edje_Real_Part *rp); -const Evas_List *_edje_entry_anchors_list(Edje_Real_Part *rp); +const Eina_List *_edje_entry_anchors_list(Edje_Real_Part *rp); void _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); #endif diff --git a/legacy/edje/src/lib/edje_program.c b/legacy/edje/src/lib/edje_program.c index 557db30160..691115d991 100644 --- a/legacy/edje/src/lib/edje_program.c +++ b/legacy/edje/src/lib/edje_program.c @@ -8,7 +8,7 @@ static void _edje_emit_cb(Edje *ed, const char *sig, const char *src); int _edje_anim_count = 0; Ecore_Animator *_edje_timer = NULL; -Evas_List *_edje_animators = NULL; +Eina_List *_edje_animators = NULL; /************************** API Routines **************************/ @@ -99,7 +99,7 @@ edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const ch escb->source = eina_stringshare_add(source); escb->func = func; escb->data = data; - ed->callbacks = evas_list_append(ed->callbacks, escb); + ed->callbacks = eina_list_append(ed->callbacks, escb); if (ed->walking_callbacks) { escb->just_added = 1; @@ -125,17 +125,15 @@ EAPI void * edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source)) { Edje *ed; - Evas_List *l; + Eina_List *l; + Edje_Signal_Callback *escb; if ((!emission) || (!source) || (!func)) return NULL; ed = _edje_fetch(obj); if (!ed) return NULL; if (ed->delete_me) return NULL; - for (l = ed->callbacks; l; l = l->next) + EINA_LIST_FOREACH(ed->callbacks, l, escb) { - Edje_Signal_Callback *escb; - - escb = l->data; if ((escb->func == func) && ((!escb->signal && !emission[0]) || (escb->signal && !strcmp(escb->signal, emission))) && @@ -154,7 +152,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch { _edje_callbacks_patterns_clean(ed); - ed->callbacks = evas_list_remove_list(ed->callbacks, l); + ed->callbacks = eina_list_remove_list(ed->callbacks, l); if (escb->signal) eina_stringshare_del(escb->signal); if (escb->source) eina_stringshare_del(escb->source); free(escb); @@ -220,7 +218,8 @@ edje_object_play_set(Evas_Object *obj, int play) { Edje *ed; double t; - Evas_List *l; + Eina_List *l; + Edje_Running_Program *runp; int i; ed = _edje_fetch(obj); @@ -231,13 +230,8 @@ edje_object_play_set(Evas_Object *obj, int play) if (!ed->paused) return; ed->paused = 0; t = ecore_time_get() - ed->paused_at; - for (l = ed->actions; l; l = l->next) - { - Edje_Running_Program *runp; - - runp = l->data; - runp->start_time += t; - } + EINA_LIST_FOREACH(ed->actions, l, runp) + runp->start_time += t; } else { @@ -284,7 +278,7 @@ EAPI void edje_object_animation_set(Evas_Object *obj, int on) { Edje *ed; - Evas_List *l; + Eina_List *l; int i; ed = _edje_fetch(obj); @@ -295,20 +289,21 @@ edje_object_animation_set(Evas_Object *obj, int on) _edje_freeze(ed); if (!on) { - Evas_List *newl = NULL; + Eina_List *newl = NULL; + const void *data; - for (l = ed->actions; l; l = l->next) - newl = evas_list_append(newl, l->data); + EINA_LIST_FOREACH(ed->actions, l, data) + newl = eina_list_append(newl, data); while (newl) { Edje_Running_Program *runp; - runp = newl->data; - newl = evas_list_remove(newl, newl->data); + runp = eina_list_data_get(newl); + newl = eina_list_remove(newl, eina_list_data_get(newl)); _edje_program_run_iterate(runp, runp->start_time + runp->program->tween.time); if (_edje_block_break(ed)) { - evas_list_free(newl); + eina_list_free(newl); goto break_prog; } } @@ -360,8 +355,10 @@ int _edje_program_run_iterate(Edje_Running_Program *runp, double tim) { double t, total; - Evas_List *l; + Eina_List *l; Edje *ed; + Edje_Program_Target *pt; + Edje_Real_Part *rp; ed = runp->edje; if (ed->delete_me) return 0; @@ -372,12 +369,8 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim) total = runp->program->tween.time; t /= total; if (t > 1.0) t = 1.0; - for (l = runp->program->targets; l; l = l->next) + EINA_LIST_FOREACH(runp->program->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -387,12 +380,10 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim) } if (t >= 1.0) { - for (l = runp->program->targets; l; l = l->next) - { - Edje_Real_Part *rp; - Edje_Program_Target *pt; + Edje_Program_After *pa; - pt = l->data; + EINA_LIST_FOREACH(runp->program->targets, l, pt) + { if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -414,9 +405,9 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim) if (!ed->walking_actions) { _edje_anim_count--; - ed->actions = evas_list_remove(ed->actions, runp); + ed->actions = eina_list_remove(ed->actions, runp); if (!ed->actions) - _edje_animators = evas_list_remove(_edje_animators, ed); + _edje_animators = eina_list_remove(_edje_animators, ed); } // _edje_emit(ed, "program,stop", runp->program->name); if (_edje_block_break(ed)) @@ -424,10 +415,9 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim) if (!ed->walking_actions) free(runp); goto break_prog; } - for (l = runp->program->after; l; l = l->next) + EINA_LIST_FOREACH(runp->program->after, l, pa) { Edje_Program *pr; - Edje_Program_After *pa = l->data; if (pa->id >= 0) { @@ -457,19 +447,18 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim) void _edje_program_end(Edje *ed, Edje_Running_Program *runp) { - Evas_List *l; + Eina_List *l; + Edje_Program_Target *pt; const char *pname = NULL; int free_runp = 0; if (ed->delete_me) return; _edje_ref(ed); _edje_freeze(ed); - for (l = runp->program->targets; l; l = l->next) + EINA_LIST_FOREACH(runp->program->targets, l, pt) { Edje_Real_Part *rp; - Edje_Program_Target *pt; - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -492,11 +481,11 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp) if (!ed->walking_actions) { _edje_anim_count--; - ed->actions = evas_list_remove(ed->actions, runp); + ed->actions = eina_list_remove(ed->actions, runp); free_runp = 1; if (!ed->actions) { - _edje_animators = evas_list_remove(_edje_animators, ed); + _edje_animators = eina_list_remove(_edje_animators, ed); } } // _edje_emit(ed, "program,stop", pname); @@ -508,7 +497,11 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp) void _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const char *ssrc) { - Evas_List *l; + Eina_List *l; + Edje_Real_Part *rp; + Edje_Program_Target *pt; + Edje_Program *pr2; + Edje_Program_After *pa; /* limit self-feeding loops in programs to 64 levels */ static int recursions = 0; static int recursion_limit = 0; @@ -531,7 +524,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const } pp->edje = ed; pp->program = pr; - ed->pending_actions = evas_list_append(ed->pending_actions, pp); + ed->pending_actions = eina_list_append(ed->pending_actions, pp); return; } if ((recursions >= 64) || (recursion_limit)) @@ -552,12 +545,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const Edje_Running_Program *runp; runp = calloc(1, sizeof(Edje_Running_Program)); - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -578,12 +567,12 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const // _edje_emit(ed, "program,start", pr->name); if (_edje_block_break(ed)) { - ed->actions = evas_list_append(ed->actions, runp); + ed->actions = eina_list_append(ed->actions, runp); goto break_prog; } if (!ed->actions) - _edje_animators = evas_list_append(_edje_animators, ed); - ed->actions = evas_list_append(ed->actions, runp); + _edje_animators = eina_list_append(_edje_animators, ed); + ed->actions = eina_list_append(ed->actions, runp); runp->start_time = ecore_time_get(); runp->edje = ed; runp->program = pr; @@ -593,12 +582,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const } else { - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -620,11 +605,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const // _edje_emit(ed, "program,stop", pr->name); if (_edje_block_break(ed)) goto break_prog; - for (l = pr->after; l; l = l->next) + EINA_LIST_FOREACH(pr->after, l, pa) { - Edje_Program *pr2; - Edje_Program_After *pa = l->data; - if (pa->id >= 0) { pr2 = ed->table_programs[pa->id % ed->table_programs_size]; @@ -638,31 +620,25 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const else if (pr->action == EDJE_ACTION_TYPE_ACTION_STOP) { // _edje_emit(ed, "program,start", pr->name); - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Program_Target *pt; - Evas_List *ll; + Eina_List *ll; + Edje_Running_Program *runp; + Edje_Pending_Program *pp; - pt = l->data; - for (ll = ed->actions; ll; ll = ll->next) + EINA_LIST_FOREACH(ed->actions, ll, runp) { - Edje_Running_Program *runp; - - runp = ll->data; if (pt->id == runp->program->id) { _edje_program_end(ed, runp); goto done; } } - for (ll = ed->pending_actions; ll; ll = ll->next) + EINA_LIST_FOREACH(ed->pending_actions, ll, pp) { - Edje_Pending_Program *pp; - - pp = ll->data; if (pt->id == pp->program->id) { - ed->pending_actions = evas_list_remove(ed->pending_actions, pp); + ed->pending_actions = eina_list_remove(ed->pending_actions, pp); ecore_timer_del(pp->timer); free(pp); goto done; @@ -687,12 +663,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const { // _edje_emit(ed, "program,start", pr->name); if (_edje_block_break(ed)) goto break_prog; - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -717,12 +689,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const { // _edje_emit(ed, "program,start", pr->name); if (_edje_block_break(ed)) goto break_prog; - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -747,12 +715,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const { // _edje_emit(ed, "program,start", pr->name); if (_edje_block_break(ed)) goto break_prog; - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -793,12 +757,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const } else { - for (l = pr->targets; l; l = l->next) + EINA_LIST_FOREACH(pr->targets, l, pt) { - Edje_Real_Part *rp; - Edje_Program_Target *pt; - - pt = l->data; if (pt->id >= 0) { rp = ed->table_parts[pt->id % ed->table_parts_size]; @@ -828,11 +788,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const /* && (pr->tween.time > 0.0) && (!ed->no_anim))) */ )) { - for (l= pr->after; l; l = l->next) + EINA_LIST_FOREACH(pr->after, l, pa) { - Edje_Program *pr2; - Edje_Program_After *pa = l->data; - if (pa->id >= 0) { pr2 = ed->table_programs[pa->id % ed->table_programs_size]; @@ -863,7 +820,7 @@ _edje_emit(Edje *ed, const char *sig, const char *src) struct _Edje_Program_Data { #ifdef EDJE_PROGRAM_CACHE - Evas_List *matches; + Eina_List *matches; int matched; #endif Edje *ed; @@ -883,14 +840,14 @@ static int _edje_glob_callback(Edje_Program *pr, void *dt) if (_edje_block_break(data->ed)) { #ifdef EDJE_PROGRAM_CACHE - evas_list_free(data->matches); + eina_list_free(data->matches); data->matches = NULL; #endif return 1; } #ifdef EDJE_PROGRAM_CACHE - data->matches = evas_list_append(data->matches, pr); + data->matches = eina_list_append(data->matches, pr); #endif return 0; @@ -948,8 +905,9 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src) #ifdef EDJE_PROGRAM_CACHE { - Evas_List *matches; - Evas_List *l; + Eina_List *matches; + Eina_List *l; + Edje_Program *pr; if (evas_hash_find(ec->prog_cache.no_matches, tmps)) { @@ -957,11 +915,8 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src) } else if ((matches = evas_hash_find(ec->prog_cache.matches, tmps))) { - for (l = matches; l; l = l->next) + EINA_LIST_FOREACH(matches, l, pr) { - Edje_Program *pr; - - pr = l->data; _edje_program_run(ed, pr, 0, sig, src); if (_edje_block_break(ed)) { @@ -1023,7 +978,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src) static void _edje_emit_cb(Edje *ed, const char *sig, const char *src) { - Evas_List *l; + Eina_List *l; if (ed->delete_me) return; _edje_ref(ed); @@ -1054,20 +1009,20 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src) ed->walking_callbacks = 0; if ((ed->delete_callbacks) || (ed->just_added_callbacks)) { + Edje_Signal_Callback *escb; + ed->delete_callbacks = 0; ed->just_added_callbacks = 0; - for (l = ed->callbacks; l;) + EINA_LIST_FOREACH(ed->callbacks, l, escb) { - Edje_Signal_Callback *escb; - Evas_List *next_l; + Eina_List *next_l; - escb = l->data; - next_l = l->next; + next_l = eina_list_next(l); if (escb->just_added) escb->just_added = 0; if (escb->delete_me) { - ed->callbacks = evas_list_remove_list(ed->callbacks, l); + ed->callbacks = eina_list_remove_list(ed->callbacks, l); if (escb->signal) eina_stringshare_del(escb->signal); if (escb->source) eina_stringshare_del(escb->source); free(escb); diff --git a/legacy/edje/src/lib/edje_smart.c b/legacy/edje/src/lib/edje_smart.c index a66be7c0e7..d40b2db7c2 100644 --- a/legacy/edje/src/lib/edje_smart.c +++ b/legacy/edje/src/lib/edje_smart.c @@ -16,7 +16,7 @@ static void _edje_smart_clip_unset(Evas_Object * obj); static Evas_Smart *_edje_smart = NULL; -Evas_List *_edje_edjes = NULL; +Eina_List *_edje_edjes = NULL; /************************** API Routines **************************/ @@ -64,19 +64,20 @@ _edje_smart_add(Evas_Object *obj) evas_object_smart_data_set(obj, ed); evas_object_geometry_get(obj, &(ed->x), &(ed->y), &(ed->w), &(ed->h)); ed->obj = obj; - _edje_edjes = evas_list_append(_edje_edjes, obj); + _edje_edjes = eina_list_append(_edje_edjes, obj); _edje_entry_init(ed); /* { - Evas_List *l; + Eina_List *l; + const void *data; - printf("--- EDJE DUMP [%i]\n", evas_list_count(_edje_edjes)); - for (l = _edje_edjes; l; l = l->next) + printf("--- EDJE DUMP [%i]\n", eina_list_count(_edje_edjes)); + EINA_LIST_FOREACH(_edge_edges, l, data) { - ed = _edje_fetch(l->data); + ed = _edje_fetch(data); printf("EDJE: %80s | %80s\n", ed->path, ed->part); } - printf("--- EDJE DUMP [%i]\n", evas_list_count(_edje_edjes)); + printf("--- EDJE DUMP [%i]\n", eina_list_count(_edje_edjes)); } */ } @@ -92,7 +93,7 @@ _edje_smart_del(Evas_Object * obj) _edje_entry_shutdown(ed); ed->delete_me = 1; _edje_clean_objects(ed); - _edje_edjes = evas_list_remove(_edje_edjes, obj); + _edje_edjes = eina_list_remove(_edje_edjes, obj); evas_object_smart_data_set(obj, NULL); if (_edje_script_only(ed)) _edje_script_only_shutdown(ed); _edje_file_del(ed); @@ -135,14 +136,13 @@ _edje_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y) } if (ep->extra_objects) { - Evas_List *el; + Eina_List *el; + Evas_Object *o; - for (el = ep->extra_objects; el; el = el->next) + EINA_LIST_FOREACH(ep->extra_objects, el, o) { - Evas_Object *o; Evas_Coord oox, ooy; - o = el->data; evas_object_geometry_get(o, &oox, &ooy, NULL, NULL); evas_object_move(o, ed->x + ep->x + ep->offset.x + (oox - ox), ed->y + ep->y + ep->offset.y + (ooy - oy)); } diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c index 273375b597..771ae3c803 100644 --- a/legacy/edje/src/lib/edje_text.c +++ b/legacy/edje/src/lib/edje_text.c @@ -38,8 +38,9 @@ _edje_text_init(void) void _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep) { - Evas_List *tmp; + Eina_List *tmp; Edje_Part *pt = ep->part; + Edje_Part_Description *desc; if (ep->part->type != EDJE_PART_TYPE_TEXT) return; @@ -48,26 +49,19 @@ _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep) _edje_text_class_member_add(ed, pt->default_desc->text.text_class); /* If any other classes exist add them */ - for (tmp = pt->other_desc; tmp; tmp = tmp->next) - { - Edje_Part_Description *desc; - - desc = tmp->data; - if ((desc) && (desc->text.text_class)) - _edje_text_class_member_add(ed, desc->text.text_class); - } + EINA_LIST_FOREACH(pt->other_desc, tmp, desc) + if ((desc) && (desc->text.text_class)) + _edje_text_class_member_add(ed, desc->text.text_class); } void _edje_text_part_on_add_clippers(Edje *ed, Edje_Real_Part *ep) { - Evas_List *l; + Eina_List *l; + Evas_Object *o; - for (l = ep->extra_objects; l; l = l->next) + EINA_LIST_FOREACH(ep->extra_objects, l, o) { - Evas_Object *o; - - o = l->data; if (ep->part->clip_to_id >= 0) { ep->clip_to = ed->table_parts[ep->part->clip_to_id % ed->table_parts_size]; @@ -83,19 +77,15 @@ _edje_text_part_on_add_clippers(Edje *ed, Edje_Real_Part *ep) void _edje_text_part_on_del(Edje *ed, Edje_Part *pt) { - Evas_List *tmp; + Eina_List *tmp; + Edje_Part_Description *desc; if ((pt->default_desc) && (pt->default_desc->text.text_class)) _edje_text_class_member_del(ed, pt->default_desc->text.text_class); - for (tmp = pt->other_desc; tmp; tmp = tmp->next) - { - Edje_Part_Description *desc; - - desc = tmp->data; - if (desc->text.text_class) - _edje_text_class_member_del(ed, desc->text.text_class); - } + EINA_LIST_FOREACH(pt->other_desc, tmp, desc) + if (desc->text.text_class) + _edje_text_class_member_del(ed, desc->text.text_class); } void @@ -105,8 +95,8 @@ _edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep) { Evas_Object *o; - o = ep->extra_objects->data; - ep->extra_objects = evas_list_remove(ep->extra_objects, o); + o = eina_list_data_get(ep->extra_objects); + ep->extra_objects = eina_list_remove(ep->extra_objects, o); evas_object_del(o); } } diff --git a/legacy/edje/src/lib/edje_textblock_styles.c b/legacy/edje/src/lib/edje_textblock_styles.c index bd4ec205e7..3a0bccba50 100644 --- a/legacy/edje/src/lib/edje_textblock_styles.c +++ b/legacy/edje/src/lib/edje_textblock_styles.c @@ -228,13 +228,14 @@ _edje_format_reparse(Edje_File *edf, const char *str, Edje_Style_Tag **tag_ret) void _edje_textblock_style_all_update(Edje *ed) { - Evas_List *l, *ll; + Eina_List *l, *ll; + Edje_Style *stl; if (!ed->file) return; - for (l = ed->file->styles; l; l = l->next) + EINA_LIST_FOREACH(ed->file->styles, l, stl) { - Edje_Style *stl; + Edje_Style_Tag *tag; Edje_Text_Class *tc; char *buf = NULL; @@ -243,17 +244,13 @@ _edje_textblock_style_all_update(Edje *ed) int found = 0; char *fontset = NULL, *fontsource = NULL; - stl = l->data; /* Make sure the style is already defined */ if (!stl->style) break; /* Make sure the style contains a text_class */ - for (ll = stl->tags; ll; ll = ll->next) - { - tag = ll->data; - if (tag->text_class) - found = 1; - } + EINA_LIST_FOREACH(stl->tags, ll, tag) + if (tag->text_class) + found = 1; /* No text classes , goto next style */ if (!found) continue; @@ -264,9 +261,8 @@ _edje_textblock_style_all_update(Edje *ed) fontsource = _edje_str_escape(ed->file->path); /* Build the style from each tag */ - for (ll = stl->tags; ll; ll = ll->next) + EINA_LIST_FOREACH(stl->tags, ll, tag) { - tag = ll->data; if (!tag->key) continue; /* Add Tag Key */ @@ -335,23 +331,20 @@ _edje_textblock_style_all_update(Edje *ed) void _edje_textblock_styles_add(Edje *ed) { - Evas_List *l, *ll; + Eina_List *l, *ll; + Edje_Style *stl; if (!ed->file) return; - for (l = ed->file->styles; l; l = l->next) + EINA_LIST_FOREACH(ed->file->styles, l, stl) { - Edje_Style *stl; Edje_Style_Tag *tag; - stl = l->data; - /* Make sure the style contains the text_class */ - for (ll = stl->tags; ll; ll = ll->next) + EINA_LIST_FOREACH(stl->tags, ll, tag) { - tag = ll->data; - if (!tag->text_class) continue; - _edje_text_class_member_add(ed, tag->text_class); + if (!tag->text_class) continue; + _edje_text_class_member_add(ed, tag->text_class); } } } @@ -359,21 +352,18 @@ _edje_textblock_styles_add(Edje *ed) void _edje_textblock_styles_del(Edje *ed) { - Evas_List *l, *ll; + Eina_List *l, *ll; + Edje_Style *stl; if (!ed->file) return; - for (l = ed->file->styles; l; l = l->next) + EINA_LIST_FOREACH(ed->file->styles, l, stl) { - Edje_Style *stl; Edje_Style_Tag *tag; - stl = l->data; - /* Make sure the style contains the text_class */ - for (ll = stl->tags; ll; ll = ll->next) + EINA_LIST_FOREACH(stl->tags, ll, tag) { - tag = ll->data; if (!tag->text_class) continue; _edje_text_class_member_del(ed, tag->text_class); } @@ -389,18 +379,17 @@ _edje_textblock_styles_del(Edje *ed) void _edje_textblock_style_parse_and_fix(Edje_File *edf) { - Evas_List *l, *ll; + Eina_List *l, *ll; + Edje_Style *stl; - for (l = edf->styles; l; l = l->next) + EINA_LIST_FOREACH(edf->styles, l, stl) { - Edje_Style *stl; Edje_Style_Tag *tag; char *buf = NULL; int bufalloc = 0; int buflen = 0; char *fontset = NULL, *fontsource = NULL, *ts; - stl = l->data; if (stl->style) break; stl->style = evas_textblock_style_new(); @@ -411,9 +400,8 @@ _edje_textblock_style_parse_and_fix(Edje_File *edf) fontsource = _edje_str_escape(edf->path); /* Build the style from each tag */ - for (ll = stl->tags; ll; ll = ll->next) + EINA_LIST_FOREACH(stl->tags, ll, tag) { - tag = ll->data; if (!tag->key) continue; /* Add Tag Key */ @@ -479,13 +467,13 @@ _edje_textblock_style_cleanup(Edje_File *edf) Edje_Style *stl; stl = edf->styles->data; - edf->styles = evas_list_remove_list(edf->styles, edf->styles); + edf->styles = eina_list_remove_list(edf->styles, edf->styles); while (stl->tags) { Edje_Style_Tag *tag; tag = stl->tags->data; - stl->tags = evas_list_remove_list(stl->tags, stl->tags); + stl->tags = eina_list_remove_list(stl->tags, stl->tags); if (edf->free_strings) { if (tag->key) eina_stringshare_del(tag->key); diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index 22e4cabf88..acbe1a4f19 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -19,7 +19,7 @@ typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data; struct _Edje_List_Foreach_Data { - Evas_List *list; + Eina_List *list; }; static Evas_Bool _edje_color_class_list_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata); @@ -46,10 +46,11 @@ edje_freeze(void) #else // FIXME: could just have a global freeze instead of per object // above i tried.. but this broke some things. notable e17's menus. why? - Evas_List *l; + Eina_List *l; + Evas_Object *data; - for (l = _edje_edjes; l; l = l->next) - edje_object_freeze((Evas_Object *)(l->data)); + EINA_LIST_FOREACH(_edje_edjes, l, data) + edje_object_freeze(data); #endif } @@ -83,29 +84,30 @@ _edje_thaw_edje(Edje *ed) EAPI void edje_thaw(void) { + Evas_Object *data; #ifdef FASTFREEZE _edje_freeze_val--; printf("fr -- ->%i\n", _edje_freeze_val); if ((_edje_freeze_val <= 0) && (_edje_freeze_calc_count > 0)) { - Evas_List *l; + Eina_List *l; _edje_freeze_calc_count = 0; - for (l = _edje_edjes; l; l = l->next) + EINA_LIST_FOREACH(_edje_edjes, l, data) { Edje *ed; - - ed = _edje_fetch(l->data); + + ed = _edje_fetch(data); if (ed) _edje_thaw_edje(ed); } } #else // FIXME: could just have a global freeze instead of per object // comment as above.. why? - Evas_List *l; + Eina_List *l; - for (l = _edje_edjes; l; l = l->next) - edje_object_thaw((Evas_Object *)(l->data)); + EINA_LIST_FOREACH(_edje_edjes, l, data) + edje_object_thaw(data); #endif } @@ -128,12 +130,13 @@ edje_fontset_append_get(void) EAPI void edje_scale_set(double scale) { - Evas_List *l; + Eina_List *l; + Evas_Object *data; if (_edje_scale == scale) return; _edje_scale = scale; - for (l = _edje_edjes; l; l = l->next) - edje_object_calc_force((Evas_Object *)(l->data)); + EINA_LIST_FOREACH(_edje_edjes, l, data) + edje_object_calc_force(data); } EAPI double @@ -169,20 +172,16 @@ EAPI const char * edje_object_data_get(const Evas_Object *obj, const char *key) { Edje *ed; - Evas_List *l; + Eina_List *l; + Edje_Data *di; ed = _edje_fetch(obj); if ((!ed) || (!key)) return NULL; if (!ed->collection) return NULL; - for (l = ed->collection->data; l; l = l->next) - { - Edje_Data *di; - - di = l->data; - if ((di->key) && (!strcmp(di->key, key))) - return (const char *)di->value; - } + EINA_LIST_FOREACH(ed->collection->data, l, di) + if ((di->key) && (!strcmp(di->key, key))) + return (const char *)di->value; return NULL; } @@ -265,7 +264,7 @@ edje_object_thaw(Evas_Object *obj) EAPI void edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3) { - Evas_List *members; + Eina_List *members; Edje_Color_Class *cc; if (!color_class) return; @@ -325,10 +324,10 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2 { Edje *ed; - ed = members->data; + ed = eina_list_data_get(members); ed->dirty = 1; _edje_recalc(ed); - members = members->next; + members = eina_list_next(members); } } @@ -341,7 +340,7 @@ void edje_color_class_del(const char *color_class) { Edje_Color_Class *cc; - Evas_List *members; + Eina_List *members; if (!color_class) return; @@ -358,10 +357,10 @@ edje_color_class_del(const char *color_class) { Edje *ed; - ed = members->data; + ed = eina_list_data_get(members); ed->dirty = 1; _edje_recalc(ed); - members = members->next; + members = eina_list_next(members); } } @@ -371,7 +370,7 @@ edje_color_class_del(const char *color_class) * @return A list of color class names (strings). These strings and the list * must be free()'d by the caller. */ -Evas_List * +Eina_List * edje_color_class_list(void) { Edje_List_Foreach_Data fdata; @@ -389,7 +388,7 @@ _edje_color_class_list_foreach(const Evas_Hash *hash, const char *key, void *dat Edje_List_Foreach_Data *fd; fd = fdata; - fd->list = evas_list_append(fd->list, strdup(key)); + fd->list = eina_list_append(fd->list, strdup(key)); return 1; } @@ -420,7 +419,7 @@ EAPI void edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3) { Edje *ed; - Evas_List *l; + Eina_List *l; Edje_Color_Class *cc; int i; @@ -434,9 +433,8 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in if (b > 255) b = 255; if (a < 0) a = 0; if (a > 255) a = 255; - for (l = ed->color_classes; l; l = l->next) + EINA_LIST_FOREACH(ed->color_classes, l, cc) { - cc = l->data; if ((cc->name) && (!strcmp(cc->name, color_class))) { if ((cc->r == r) && (cc->g == g) && @@ -483,7 +481,7 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in cc->g3 = g3; cc->b3 = b3; cc->a3 = a3; - ed->color_classes = evas_list_append(ed->color_classes, cc); + ed->color_classes = eina_list_append(ed->color_classes, cc); ed->dirty = 1; for (i = 0; i < ed->table_parts_size; i++) @@ -507,19 +505,18 @@ void edje_object_color_class_del(Evas_Object *obj, const char *color_class) { Edje *ed; - Evas_List *l; + Eina_List *l; Edje_Color_Class *cc = NULL; int i; if (!color_class) return; ed = _edje_fetch(obj); - for (l = ed->color_classes; l; l = l->next) + EINA_LIST_FOREACH(ed->color_classes, l, cc) { - cc = l->data; if (!strcmp(cc->name, color_class)) { - ed->color_classes = evas_list_remove(ed->color_classes, cc); + ed->color_classes = eina_list_remove(ed->color_classes, cc); eina_stringshare_del(cc->name); free(cc); return; @@ -549,7 +546,7 @@ edje_object_color_class_del(Evas_Object *obj, const char *color_class) EAPI void edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size size) { - Evas_List *members; + Eina_List *members; Edje_Text_Class *tc; if (!text_class) return; @@ -603,11 +600,11 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz { Edje *ed; - ed = members->data; + ed = eina_list_data_get(members); ed->dirty = 1; _edje_textblock_style_all_update(ed); _edje_recalc(ed); - members = members->next; + members = eina_list_next(members); } } @@ -620,7 +617,7 @@ void edje_text_class_del(const char *text_class) { Edje_Text_Class *tc; - Evas_List *members; + Eina_List *members; if (!text_class) return; @@ -638,11 +635,11 @@ edje_text_class_del(const char *text_class) { Edje *ed; - ed = members->data; + ed = eina_list_data_get(members); ed->dirty = 1; _edje_textblock_style_all_update(ed); _edje_recalc(ed); - members = members->next; + members = eina_list_next(members); } } @@ -652,7 +649,7 @@ edje_text_class_del(const char *text_class) * @return A list of text class names (strings). These strings are stringshares and * the list must be free()'d by the caller. */ -Evas_List * +Eina_List * edje_text_class_list(void) { Edje_List_Foreach_Data fdata; @@ -670,7 +667,7 @@ _edje_text_class_list_foreach(const Evas_Hash *hash, const char *key, void *data Edje_List_Foreach_Data *fd; fd = fdata; - fd->list = evas_list_append(fd->list, eina_stringshare_add(key)); + fd->list = eina_list_append(fd->list, eina_stringshare_add(key)); return 1; } @@ -686,7 +683,7 @@ EAPI void edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char *font, Evas_Font_Size size) { Edje *ed; - Evas_List *l; + Eina_List *l; Edje_Text_Class *tc; int i; @@ -694,9 +691,8 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char if ((!ed) || (!text_class)) return; /* for each text_class in the edje */ - for (l = ed->text_classes; l; l = l->next) + EINA_LIST_FOREACH(ed->text_classes, l, tc) { - tc = l->data; if ((tc->name) && (!strcmp(tc->name, text_class))) { /* Match and the same, return */ @@ -742,7 +738,7 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char } /* Add to edje's text class list */ - ed->text_classes = evas_list_append(ed->text_classes, tc); + ed->text_classes = eina_list_append(ed->text_classes, tc); ed->dirty = 1; _edje_textblock_style_all_update(ed); _edje_recalc(ed); @@ -966,7 +962,7 @@ edje_object_part_text_insert(Evas_Object *obj, const char *part, const char *tex * @param part The part name * @return The list of anchors */ -EAPI Evas_List * +EAPI Eina_List * edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part) { Edje *ed; @@ -1866,28 +1862,22 @@ _edje_real_part_get(Edje *ed, const char *part) Edje_Color_Class * _edje_color_class_find(Edje *ed, const char *color_class) { - Evas_List *l; + Eina_List *l; Edje_Color_Class *cc = NULL; if ((!ed) || (!color_class)) return NULL; /* first look through the object scope */ - for (l = ed->color_classes; l; l = l->next) - { - cc = l->data; - if ((cc->name) && (!strcmp(color_class, cc->name))) return cc; - } + EINA_LIST_FOREACH(ed->color_classes, l, cc) + if ((cc->name) && (!strcmp(color_class, cc->name))) return cc; /* next look through the global scope */ cc = evas_hash_find(_edje_color_class_hash, color_class); if (cc) return cc; /* finally, look through the file scope */ - for (l = ed->file->color_classes; l; l = l->next) - { - cc = l->data; - if ((cc->name) && (!strcmp(color_class, cc->name))) return cc; - } + EINA_LIST_FOREACH(ed->file->color_classes, l, cc) + if ((cc->name) && (!strcmp(color_class, cc->name))) return cc; return NULL; } @@ -1895,7 +1885,7 @@ _edje_color_class_find(Edje *ed, const char *color_class) void _edje_color_class_member_add(Edje *ed, const char *color_class) { - Evas_List *members; + Eina_List *members; if ((!ed) || (!color_class)) return; members = evas_hash_find(_edje_color_class_member_hash, color_class); @@ -1905,7 +1895,7 @@ _edje_color_class_member_add(Edje *ed, const char *color_class) evas_hash_del(_edje_color_class_member_hash, color_class, members); } - members = evas_list_prepend(members, ed); + members = eina_list_prepend(members, ed); _edje_color_class_member_hash = evas_hash_add(_edje_color_class_member_hash, color_class, members); } @@ -1913,7 +1903,7 @@ _edje_color_class_member_add(Edje *ed, const char *color_class) void _edje_color_class_member_del(Edje *ed, const char *color_class) { - Evas_List *members; + Eina_List *members; if ((!ed) || (!color_class)) return; members = evas_hash_find(_edje_color_class_member_hash, color_class); @@ -1921,7 +1911,7 @@ _edje_color_class_member_del(Edje *ed, const char *color_class) _edje_color_class_member_hash = evas_hash_del(_edje_color_class_member_hash, color_class, members); - members = evas_list_remove(members, ed); + members = eina_list_remove(members, ed); if (members) { _edje_color_class_member_hash = @@ -1936,7 +1926,7 @@ _edje_color_class_member_del(Edje *ed, const char *color_class) static Evas_Bool member_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata) { - evas_list_free(data); + eina_list_free(data); return 1; } @@ -1972,41 +1962,33 @@ _edje_color_class_hash_free(void) void _edje_color_class_on_del(Edje *ed, Edje_Part *ep) { - Evas_List *tmp; + Eina_List *tmp; + Edje_Part_Description *desc; if ((ep->default_desc) && (ep->default_desc->color_class)) _edje_color_class_member_del(ed, ep->default_desc->color_class); - for (tmp = ep->other_desc; tmp; tmp = tmp->next) - { - Edje_Part_Description *desc; - - desc = tmp->data; - if (desc->color_class) - _edje_color_class_member_del(ed, desc->color_class); - } + EINA_LIST_FOREACH(ep->other_desc, tmp, desc) + if (desc->color_class) + _edje_color_class_member_del(ed, desc->color_class); } Edje_Text_Class * _edje_text_class_find(Edje *ed, const char *text_class) { - Evas_List *l; + Eina_List *l; + Edje_Text_Class *tc; if ((!ed) || (!text_class)) return NULL; - for (l = ed->text_classes; l; l = l->next) - { - Edje_Text_Class *tc; - - tc = l->data; - if ((tc->name) && (!strcmp(text_class, tc->name))) return tc; - } + EINA_LIST_FOREACH(ed->text_classes, l, tc) + if ((tc->name) && (!strcmp(text_class, tc->name))) return tc; return evas_hash_find(_edje_text_class_hash, text_class); } void _edje_text_class_member_add(Edje *ed, const char *text_class) { - Evas_List *members; + Eina_List *members; if ((!ed) || (!text_class)) return; @@ -2021,7 +2003,7 @@ _edje_text_class_member_add(Edje *ed, const char *text_class) } /* Update the member list */ - members = evas_list_prepend(members, ed); + members = eina_list_prepend(members, ed); /* Add the member list back */ _edje_text_class_member_hash = @@ -2031,7 +2013,7 @@ _edje_text_class_member_add(Edje *ed, const char *text_class) void _edje_text_class_member_del(Edje *ed, const char *text_class) { - Evas_List *members; + Eina_List *members; if ((!ed) || (!text_class)) return; members = evas_hash_find(_edje_text_class_member_hash, text_class); @@ -2040,7 +2022,7 @@ _edje_text_class_member_del(Edje *ed, const char *text_class) _edje_text_class_member_hash = evas_hash_del(_edje_text_class_member_hash, text_class, members); - members = evas_list_remove(members, ed); + members = eina_list_remove(members, ed); if (members) { _edje_text_class_member_hash = diff --git a/legacy/edje/src/lib/edje_var.c b/legacy/edje/src/lib/edje_var.c index af47980cb4..56fc4153eb 100644 --- a/legacy/edje/src/lib/edje_var.c +++ b/legacy/edje/src/lib/edje_var.c @@ -8,7 +8,7 @@ static int _edje_var_timer_cb(void *data); static int _edje_var_anim_cb(void *data); static Ecore_Animator *_edje_animator = NULL; -static Evas_List *_edje_anim_list = NULL; +static Eina_List *_edje_anim_list = NULL; static int _edje_var_timer_cb(void *data) @@ -24,7 +24,7 @@ _edje_var_timer_cb(void *data) embryo_program_vm_push(ed->collection->script); _edje_embryo_globals_init(ed); embryo_parameter_cell_push(ed->collection->script, (Embryo_Cell)et->val); - ed->var_pool->timers = evas_list_remove(ed->var_pool->timers, et); + ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et); fn = et->func; free(et); { @@ -44,32 +44,34 @@ _edje_var_timer_cb(void *data) static int _edje_var_anim_cb(void *data) { - Evas_List *l, *tl = NULL; + Eina_List *l, *tl = NULL; double t; + const void *tmp; t = ecore_time_get(); - for (l = _edje_anim_list; l; l = l->next) - tl = evas_list_append(tl, l->data); + EINA_LIST_FOREACH(_edje_anim_list, l, tmp) + tl = eina_list_append(tl, tmp); while (tl) { Edje *ed; - Evas_List *tl2; + Eina_List *tl2; + Edje_Var_Animator *ea; - ed = tl->data; + ed = eina_list_data_get(tl); _edje_ref(ed); _edje_block(ed); _edje_freeze(ed); - tl = evas_list_remove(tl, ed); + tl = eina_list_remove(tl, ed); if (!ed->var_pool) continue; tl2 = NULL; - for (l = ed->var_pool->animators; l; l = l->next) - tl2 = evas_list_append(tl2, l->data); + EINA_LIST_FOREACH(ed->var_pool->animators, l, tmp) + tl2 = eina_list_append(tl2, tmp); ed->var_pool->walking_list++; while (tl2) { Edje_Var_Animator *ea; - ea = tl2->data; + ea = eina_list_data_get(tl2); if ((ed->var_pool) && (!ea->delete_me)) { if ((!ed->paused) && (!ed->delete_me)) @@ -99,30 +101,27 @@ _edje_var_anim_cb(void *data) if (v == 1.0) ea->delete_me = 1; } } - tl2 = evas_list_remove(tl2, ea); + tl2 = eina_list_remove(tl2, ea); if (ed->block_break) { - evas_list_free(tl2); + eina_list_free(tl2); break; } } ed->var_pool->walking_list--; - for (l = ed->var_pool->animators; l;) + EINA_LIST_FOREACH(ed->var_pool->animators, l, ea) { - Edje_Var_Animator *ea; - - ea = l->data; if (ea->delete_me) { - l = l->next; - ed->var_pool->animators = evas_list_remove(ed->var_pool->animators, ea); + l = eina_list_next(l); + ed->var_pool->animators = eina_list_remove(ed->var_pool->animators, ea); free(ea); } else - l = l->next; + l = eina_list_next(l); } if (!ed->var_pool->animators) - _edje_anim_list = evas_list_remove(_edje_anim_list, ed); + _edje_anim_list = eina_list_remove(_edje_anim_list, ed); _edje_unblock(ed); _edje_thaw(ed); _edje_unref(ed); @@ -195,8 +194,8 @@ _edje_var_shutdown(Edje *ed) { while (ed->var_pool->vars[i].data.l.v) { - _edje_var_free(ed->var_pool->vars[i].data.l.v->data); - ed->var_pool->vars[i].data.l.v = evas_list_remove_list(ed->var_pool->vars[i].data.l.v, ed->var_pool->vars[i].data.l.v); + _edje_var_free(eina_list_data_get(ed->var_pool->vars[i].data.l.v)); + ed->var_pool->vars[i].data.l.v = eina_list_remove_list(ed->var_pool->vars[i].data.l.v, ed->var_pool->vars[i].data.l.v); } } } @@ -206,14 +205,14 @@ _edje_var_shutdown(Edje *ed) { Edje_Var_Timer *et; - et = ed->var_pool->timers->data; + et = eina_list_data_get(ed->var_pool->timers); ecore_timer_del(et->timer); free(et); - ed->var_pool->timers = evas_list_remove(ed->var_pool->timers, et); + ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et); } if (ed->var_pool->animators) { - _edje_anim_list = evas_list_remove(_edje_anim_list, ed); + _edje_anim_list = eina_list_remove(_edje_anim_list, ed); if (!_edje_anim_list) { if (_edje_animator) @@ -227,9 +226,9 @@ _edje_var_shutdown(Edje *ed) { Edje_Var_Animator *ea; - ea = ed->var_pool->animators->data; + ea = eina_list_data_get(ed->var_pool->animators); free(ea); - ed->var_pool->animators = evas_list_remove(ed->var_pool->animators, ea); + ed->var_pool->animators = eina_list_remove(ed->var_pool->animators, ea); } free(ed->var_pool); ed->var_pool = NULL; @@ -532,7 +531,7 @@ _edje_var_list_var_append(Edje *ed, int id, Edje_Var *var) id -= EDJE_VAR_MAGIC_BASE; if ((id < 0) || (id >= ed->var_pool->size)) return; if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return; - ed->var_pool->vars[id].data.l.v = evas_list_append(ed->var_pool->vars[id].data.l.v, var); + ed->var_pool->vars[id].data.l.v = eina_list_append(ed->var_pool->vars[id].data.l.v, var); } void @@ -543,7 +542,7 @@ _edje_var_list_var_prepend(Edje *ed, int id, Edje_Var *var) id -= EDJE_VAR_MAGIC_BASE; if ((id < 0) || (id >= ed->var_pool->size)) return; if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return; - ed->var_pool->vars[id].data.l.v = evas_list_prepend(ed->var_pool->vars[id].data.l.v, var); + ed->var_pool->vars[id].data.l.v = eina_list_prepend(ed->var_pool->vars[id].data.l.v, var); } void @@ -554,7 +553,7 @@ _edje_var_list_var_append_relative(Edje *ed, int id, Edje_Var *var, Edje_Var *re id -= EDJE_VAR_MAGIC_BASE; if ((id < 0) || (id >= ed->var_pool->size)) return; if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return; - ed->var_pool->vars[id].data.l.v = evas_list_append_relative(ed->var_pool->vars[id].data.l.v, var, relative); + ed->var_pool->vars[id].data.l.v = eina_list_append_relative(ed->var_pool->vars[id].data.l.v, var, relative); } void @@ -565,7 +564,7 @@ _edje_var_list_var_prepend_relative(Edje *ed, int id, Edje_Var *var, Edje_Var *r id -= EDJE_VAR_MAGIC_BASE; if ((id < 0) || (id >= ed->var_pool->size)) return; if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return; - ed->var_pool->vars[id].data.l.v = evas_list_prepend_relative(ed->var_pool->vars[id].data.l.v, var, relative); + ed->var_pool->vars[id].data.l.v = eina_list_prepend_relative(ed->var_pool->vars[id].data.l.v, var, relative); } Edje_Var * @@ -576,7 +575,7 @@ _edje_var_list_nth(Edje *ed, int id, int n) id -= EDJE_VAR_MAGIC_BASE; if ((id < 0) || (id >= ed->var_pool->size)) return NULL; if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return NULL; - return evas_list_nth(ed->var_pool->vars[id].data.l.v, n); + return eina_list_nth(ed->var_pool->vars[id].data.l.v, n); } int @@ -589,7 +588,7 @@ _edje_var_list_count_get(Edje *ed, int id) if (ed->var_pool->vars[id].type == EDJE_VAR_NONE) ed->var_pool->vars[id].type = EDJE_VAR_LIST; else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0; - return evas_list_count(ed->var_pool->vars[id].data.l.v); + return eina_list_count(ed->var_pool->vars[id].data.l.v); } void @@ -603,13 +602,13 @@ _edje_var_list_remove_nth(Edje *ed, int id, int n) ed->var_pool->vars[id].type = EDJE_VAR_LIST; else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return; { - Evas_List *nth; + Eina_List *nth; - nth = evas_list_nth_list(ed->var_pool->vars[id].data.l.v, n); + nth = eina_list_nth_list(ed->var_pool->vars[id].data.l.v, n); if (nth) { - _edje_var_free(nth->data); - ed->var_pool->vars[id].data.l.v = evas_list_remove_list(ed->var_pool->vars[id].data.l.v, nth); + _edje_var_free(eina_list_data_get(nth)); + ed->var_pool->vars[id].data.l.v = eina_list_remove_list(ed->var_pool->vars[id].data.l.v, nth); } } } @@ -956,23 +955,20 @@ _edje_var_timer_add(Edje *ed, double in, const char *fname, int val) free(et); return 0; } - ed->var_pool->timers = evas_list_prepend(ed->var_pool->timers, et); + ed->var_pool->timers = eina_list_prepend(ed->var_pool->timers, et); return et->id; } static Edje_Var_Timer * _edje_var_timer_find(Edje *ed, int id) { - Evas_List *l; + Eina_List *l; + Edje_Var_Timer *et; if (!ed->var_pool) return NULL; - for (l = ed->var_pool->timers; l; l = l->next) - { - Edje_Var_Timer *et = l->data; - - if (et->id == id) return et; - } + EINA_LIST_FOREACH(ed->var_pool->timers, l, et) + if (et->id == id) return et; return NULL; } @@ -985,7 +981,7 @@ _edje_var_timer_del(Edje *ed, int id) et = _edje_var_timer_find(ed, id); if (!et) return; - ed->var_pool->timers = evas_list_remove(ed->var_pool->timers, et); + ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et); ecore_timer_del(et->timer); free(et); } @@ -1008,8 +1004,8 @@ _edje_var_anim_add(Edje *ed, double len, const char *fname, int val) ea->edje = ed; ea->func = fn; ea->val = val; - _edje_anim_list = evas_list_append(_edje_anim_list, ed); - ed->var_pool->animators = evas_list_prepend(ed->var_pool->animators, ea); + _edje_anim_list = eina_list_append(_edje_anim_list, ed); + ed->var_pool->animators = eina_list_prepend(ed->var_pool->animators, ea); if (!_edje_animator) _edje_animator = ecore_animator_add(_edje_var_anim_cb, NULL); return ea->id; @@ -1018,16 +1014,13 @@ _edje_var_anim_add(Edje *ed, double len, const char *fname, int val) static Edje_Var_Animator * _edje_var_anim_find(Edje *ed, int id) { - Evas_List *l; + Eina_List *l; + Edje_Var_Animator *ea; if (!ed->var_pool) return NULL; - for (l = ed->var_pool->animators; l; l = l->next) - { - Edje_Var_Animator *ea = l->data; - - if (ea->id == id) return ea; - } + EINA_LIST_FOREACH(ed->var_pool->animators, l, ea) + if (ea->id == id) return ea; return NULL; } @@ -1046,12 +1039,12 @@ _edje_var_anim_del(Edje *ed, int id) return; } - ed->var_pool->animators = evas_list_remove(ed->var_pool->animators, ea); + ed->var_pool->animators = eina_list_remove(ed->var_pool->animators, ea); free(ea); if (ed->var_pool->animators) return; - _edje_anim_list = evas_list_remove(_edje_anim_list, ed); + _edje_anim_list = eina_list_remove(_edje_anim_list, ed); if (!_edje_anim_list) { if (_edje_animator)