Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/edje
Dir : e17/libs/edje/src/lib Modified Files: Edje.h edje_edit.c edje_load.c edje_main.c edje_private.h edje_util.c Log Message: Fix name incoherency: rename Edje->part to group. It is very confusing to have "part" there and in the methods call, because we want the group name, not part. =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/Edje.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- Edje.h 31 May 2008 06:10:58 -0000 1.54 +++ Edje.h 14 Aug 2008 18:04:42 -0000 1.55 @@ -203,8 +203,8 @@ EAPI const char *edje_object_data_get (Evas_Object *obj, const char *key); /* edje_load.c */ - EAPI int edje_object_file_set (Evas_Object *obj, const char *file, const char *part); - EAPI void edje_object_file_get (Evas_Object *obj, const char **file, const char **part); + EAPI int edje_object_file_set (Evas_Object *obj, const char *file, const char *group); + EAPI void edje_object_file_get (Evas_Object *obj, const char **file, const char **group); EAPI int edje_object_load_error_get (Evas_Object *obj); /* edje_program.c */ =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- edje_edit.c 30 Jul 2008 22:41:04 -0000 1.23 +++ edje_edit.c 14 Aug 2008 18:04:42 -0000 1.24 @@ -4256,7 +4256,7 @@ printf("*** Edje\n"); printf(" path: '%s'\n", ed->path); - printf(" part: '%s'\n", ed->part); + printf(" group: '%s'\n", ed->group); printf(" parent: '%s'\n", ed->parent); printf("\n*** Parts [table:%d list:%d]\n", ed->table_parts_size, =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -3 -r1.128 -r1.129 --- edje_load.c 2 Aug 2008 01:33:39 -0000 1.128 +++ edje_load.c 14 Aug 2008 18:04:42 -0000 1.129 @@ -9,7 +9,7 @@ #ifdef EDJE_PROGRAM_CACHE static int _edje_collection_free_prog_cache_matches_free_cb(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 *part, Evas_List *group_path); +static int _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Evas_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); @@ -20,7 +20,7 @@ /** Sets the EET file and group to load @a obj from * @param obj A valid Evas_Object handle * @param file The path to the EET file - * @param part The group name in the Edje + * @param group The group name in the Edje * @return 0 on Error\n * 1 on Success and sets EDJE_LOAD_ERROR_NONE * @@ -29,27 +29,27 @@ * specifies the file and group name to load @a obj from. */ EAPI int -edje_object_file_set(Evas_Object *obj, const char *file, const char *part) +edje_object_file_set(Evas_Object *obj, const char *file, const char *group) { - return _edje_object_file_set_internal(obj, file, part, NULL); + return _edje_object_file_set_internal(obj, file, group, NULL); } /* FIXDOC: Verify/expand doc. */ /** Get the file and group name that @a obj was loaded from * @param obj A valid Evas_Object handle * @param file A pointer to store a pointer to the filename in - * @param part A pointer to store a pointer to the group name in + * @param group A pointer to store a pointer to the group name in * * This gets the EET file location and group for the given Evas_Object. * If @a obj is either not an edje file, or has not had its file/group set - * using edje_object_file_set(), then both @a file and @a part will be set + * using edje_object_file_set(), then both @a file and @a group will be set * to NULL. * - * It is valid to pass in NULL for either @a file or @a part if you are not + * It is valid to pass in NULL for either @a file or @a group if you are not * interested in one of the values. */ EAPI void -edje_object_file_get(Evas_Object *obj, const char **file, const char **part) +edje_object_file_get(Evas_Object *obj, const char **file, const char **group) { Edje *ed; @@ -57,11 +57,11 @@ if (!ed) { if (file) *file = NULL; - if (part) *part = NULL; + if (group) *group = NULL; return; } if (file) *file = ed->path; - if (part) *part = ed->part; + if (group) *group = ed->group; } /* FIXDOC: Verify. return error? */ @@ -229,7 +229,7 @@ } static int -_edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *part, Evas_List *group_path) +_edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, Evas_List *group_path) { Edje *ed; int n; @@ -240,9 +240,9 @@ ed = _edje_fetch(obj); if (!ed) return 0; if (!file) file = ""; - if (!part) part = ""; + if (!group) group = ""; if (((ed->path) && (!strcmp(file, ed->path))) && - (ed->part) && (!strcmp(part, ed->part))) + (ed->group) && (!strcmp(group, ed->group))) return 1; old_swallows = _edje_swallows_collect(ed); @@ -251,9 +251,9 @@ _edje_file_del(ed); if (ed->path) evas_stringshare_del(ed->path); - if (ed->part) evas_stringshare_del(ed->part); + if (ed->group) evas_stringshare_del(ed->group); ed->path = evas_stringshare_add(file); - ed->part = evas_stringshare_add(part); + ed->group = evas_stringshare_add(group); ed->load_error = EDJE_LOAD_ERROR_NONE; _edje_file_add(ed); @@ -489,7 +489,7 @@ const char *group_path_entry = evas_stringshare_add(rp->part->source); if (!group_path) { - group_path = evas_list_append(NULL, evas_stringshare_add(part)); + group_path = evas_list_append(NULL, evas_stringshare_add(group)); group_path_started = 1; } /* make sure that this group isn't already in the tree of parents */ @@ -590,7 +590,7 @@ _edje_file_add(Edje *ed) { if (_edje_edd_edje_file == NULL) return; - ed->file = _edje_cache_file_coll_open(ed->path, ed->part, + ed->file = _edje_cache_file_coll_open(ed->path, ed->group, &(ed->load_error), &(ed->collection)); =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/edje_main.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- edje_main.c 7 Jun 2008 10:06:13 -0000 1.57 +++ edje_main.c 14 Aug 2008 18:04:43 -0000 1.58 @@ -88,10 +88,10 @@ _edje_callbacks_patterns_clean(ed); _edje_file_del(ed); if (ed->path) evas_stringshare_del(ed->path); - if (ed->part) evas_stringshare_del(ed->part); + if (ed->group) evas_stringshare_del(ed->group); if (ed->parent) evas_stringshare_del(ed->parent); ed->path = NULL; - ed->part = NULL; + ed->group = NULL; if ((ed->actions) || (ed->pending_actions)) { _edje_animators = evas_list_remove(_edje_animators, ed); =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v retrieving revision 1.152 retrieving revision 1.153 diff -u -3 -r1.152 -r1.153 --- edje_private.h 27 Jun 2008 03:14:57 -0000 1.152 +++ edje_private.h 14 Aug 2008 18:04:43 -0000 1.153 @@ -622,7 +622,7 @@ struct _Edje { const char *path; - const char *part; + const char *group; const char *parent; Evas_Coord x, y, w, h; =================================================================== RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -3 -r1.109 -r1.110 --- edje_util.c 13 Jul 2008 13:55:43 -0000 1.109 +++ edje_util.c 14 Aug 2008 18:04:43 -0000 1.110 @@ -1245,7 +1245,7 @@ if ((ed->w > 4000) || (ed->h > 4000)) { printf("EDJE ERROR: file %s, group %s has a non-fixed part. add fixed: 1 1; ???\n", - ed->path, ed->part); + ed->path, ed->group); if (pep) printf(" Problem part is: %s\n", pep->part->name); printf(" Will recalc min size not allowing broken parts to affect the result.\n"); ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs