rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=913453cf795bdc9bf73feb120a48a95f3dd84472
commit 913453cf795bdc9bf73feb120a48a95f3dd84472 Author: Vitalii Vorobiov <[email protected]> Date: Wed Sep 14 21:10:54 2016 +0300 resource_manager2: remove _gm prefix from functions its not group manager anymore --- src/bin/resource_manager/resource_manager2.c | 2 +- src/bin/resource_manager/resource_manager_load.c | 22 +++++++++++----------- .../resource_manager/resource_manager_private.h | 12 ++++++------ src/bin/resource_manager/resource_manager_react.c | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/bin/resource_manager/resource_manager2.c b/src/bin/resource_manager/resource_manager2.c index 01d39da..3cc1174 100644 --- a/src/bin/resource_manager/resource_manager2.c +++ b/src/bin/resource_manager/resource_manager2.c @@ -133,7 +133,7 @@ resource_manager_init(Project *project) _styles_resources_load(project); _global_data_resources_load(project); - _gm_groups_load(project); + _groups_load(project); _resource_dependency_load(project); diff --git a/src/bin/resource_manager/resource_manager_load.c b/src/bin/resource_manager/resource_manager_load.c index 55d48d0..c105e97 100644 --- a/src/bin/resource_manager/resource_manager_load.c +++ b/src/bin/resource_manager/resource_manager_load.c @@ -447,7 +447,7 @@ _group_name_parse(Group2 *group) } State2 * -_gm_state_add(Project *pro, Group2 *group, Part2 *part, const char *state_name, double state_value) +_state_add(Project *pro, Group2 *group, Part2 *part, const char *state_name, double state_value) { State2 *state; Eina_Stringshare *image_name; @@ -498,7 +498,7 @@ _gm_state_add(Project *pro, Group2 *group, Part2 *part, const char *state_name, } Part_Item2 * -_gm_part_item_add(Part2 *part, Eina_Stringshare *item_name, unsigned int i) +_part_item_add(Part2 *part, Eina_Stringshare *item_name, unsigned int i) { Part_Item2 *item; @@ -517,7 +517,7 @@ _gm_part_item_add(Part2 *part, Eina_Stringshare *item_name, unsigned int i) } Part2 * -_gm_part_add(Project *pro, Group2 *group, const char *part_name) +_part_add(Project *pro, Group2 *group, const char *part_name) { Part2 *part; Eina_List *states, *l; @@ -541,7 +541,7 @@ _gm_part_add(Project *pro, Group2 *group, const char *part_name) EINA_LIST_FOREACH(states, l, state_name) { state_name_split(state_name, &parsed_state_name, &val); - _gm_state_add(pro, group, part, parsed_state_name, val); + _state_add(pro, group, part, parsed_state_name, val); eina_stringshare_del(parsed_state_name); } edje_edit_string_list_free(states); @@ -553,7 +553,7 @@ _gm_part_add(Project *pro, Group2 *group, const char *part_name) for (i = 0; i < items_count; i++) { item_name = edje_edit_part_item_index_name_get(group->edit_object, part_name, i); - _gm_part_item_add(part, item_name, i); + _part_item_add(part, item_name, i); } } @@ -561,7 +561,7 @@ _gm_part_add(Project *pro, Group2 *group, const char *part_name) } Group_Data2 * -_gm_group_data_add(Project *pro, Group2 *group, Eina_Stringshare *group_data_name) +_group_data_add(Project *pro, Group2 *group, Eina_Stringshare *group_data_name) { Group_Data2 *group_data; @@ -636,12 +636,12 @@ _group_load(Project *pro, Group2 *group) { parts = edje_edit_parts_list_get(group->edit_object); EINA_LIST_FOREACH(parts, l, part_name) - _gm_part_add(pro, group, part_name); + _part_add(pro, group, part_name); edje_edit_string_list_free(parts); datas = edje_edit_group_data_list_get(group->edit_object); EINA_LIST_FOREACH(datas, l, group_data_name) - _gm_group_data_add(pro, group, group_data_name); + _group_data_add(pro, group, group_data_name); programs = edje_edit_programs_list_get(group->edit_object); EINA_LIST_FOREACH(programs, l, program_name) @@ -655,7 +655,7 @@ _group_load(Project *pro, Group2 *group) } Group2 * -_gm_group_add(Project *pro, Eina_Stringshare *group_name) +_group_add(Project *pro, Eina_Stringshare *group_name) { Group2 *res; @@ -668,7 +668,7 @@ _gm_group_add(Project *pro, Eina_Stringshare *group_name) } void -_gm_groups_load(Project *pro) +_groups_load(Project *pro) { Eina_List *collections, *l; Eina_Stringshare *group_name; @@ -686,7 +686,7 @@ _gm_groups_load(Project *pro) EINA_LIST_FOREACH(collections, l, group_name) { if (!strcmp(group_name, EFLETE_INTERNAL_GROUP_NAME)) continue; - _gm_group_add(pro, group_name); + _group_add(pro, group_name); } edje_file_collection_list_free(collections); diff --git a/src/bin/resource_manager/resource_manager_private.h b/src/bin/resource_manager/resource_manager_private.h index f27404f..66f4f9d 100644 --- a/src/bin/resource_manager/resource_manager_private.h +++ b/src/bin/resource_manager/resource_manager_private.h @@ -63,22 +63,22 @@ Eina_Bool _global_data_resources_load(Project *project); State2 * -_gm_state_add(Project *pro, +_state_add(Project *pro, Group2 *group, Part2 *part, const char *state_name, double state_value); Part_Item2 * -_gm_part_item_add(Part2 *part, +_part_item_add(Part2 *part, Eina_Stringshare *item_name, unsigned int i); Part2 * -_gm_part_add(Project *project, Group2 *group, const char *part_name); +_part_add(Project *project, Group2 *group, const char *part_name); Group_Data2 * -_gm_group_data_add(Project *pro, +_group_data_add(Project *pro, Group2 *group, Eina_Stringshare *group_data_name); @@ -86,13 +86,13 @@ Program2 * _program_load(Group2 *group, Eina_Stringshare *program_name); Group2 * -_gm_group_add(Project *pro, Eina_Stringshare *group_name); +_group_add(Project *pro, Eina_Stringshare *group_name); void _group_load(Project *pro, Group2 *group); void -_gm_groups_load(Project *project); +_groups_load(Project *project); /* DEPENDENCY BUILD */ diff --git a/src/bin/resource_manager/resource_manager_react.c b/src/bin/resource_manager/resource_manager_react.c index df38c09..d12c7f6 100644 --- a/src/bin/resource_manager/resource_manager_react.c +++ b/src/bin/resource_manager/resource_manager_react.c @@ -736,7 +736,7 @@ _editor_part_added_cb(void *data, Project *pro = (Project *)data; Group2 *group = _get_current_group2(pro); - Part2 *part = _gm_part_add(pro, group, part_name); + Part2 *part = _part_add(pro, group, part_name); _part_dependency_load(pro, group, part); } @@ -789,7 +789,7 @@ _editor_group_data_added_cb(void *data, Project *pro = (Project *)data; Group2 *group = _get_current_group2(pro); - _gm_group_data_add(pro, group, group_data_name); + _group_data_add(pro, group, group_data_name); } static void @@ -819,7 +819,7 @@ _editor_part_item_added_cb(void *data, unsigned int count = eina_list_count(part->items); /* we can use _item_dependency_load here, but let's avoid using edje edit */ - item = _gm_part_item_add(part, editor_item->item_name, count); + item = _part_item_add(part, editor_item->item_name, count); used = resource_manager_find(pro->RM.groups, editor_item->source); if (used) _resource_usage_resource_add((Resource2 *)item, used); @@ -851,7 +851,7 @@ _editor_state_added_cb(void *data __UNUSED__, Group2 *group = _get_current_group2(pro); part = (Part2 *)resource_manager_find(group->parts, editor_state->part_name); - state = _gm_state_add(pro, group, part, editor_state->state_name, editor_state->state_value); + state = _state_add(pro, group, part, editor_state->state_name, editor_state->state_value); _state_dependency_load(pro, group, part, state); } @@ -931,7 +931,7 @@ _editor_group_add_cb(void *data, Project *pro = (Project *)data; Group2 *group; - group = _gm_group_add(pro, group_name); + group = _group_add(pro, group_name); _group_load(pro, group); _group_dependency_load(pro, group); } --
