diff options
author | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2017-07-11 17:22:17 +0900 |
---|---|---|
committer | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2017-08-18 12:06:01 +0900 |
commit | c933deacdebb0a61cbbc68cb5cbd13601fdcb2ec (patch) | |
tree | 6be1c91ef787481085d02377edd1c2b6bd0885a4 | |
parent | ab1bd04c1c694e3e3702c8c39a939a3bfaf89824 (diff) | |
download | efl-c933deacdebb0a61cbbc68cb5cbd13601fdcb2ec.tar.gz |
efl_animation: Change word "animation" to "instance" for instance class
-rw-r--r-- | src/lib/evas/Evas_Internal.h | 4 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance.c | 10 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance.eo | 8 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_alpha.c | 10 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_group.c | 14 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_group_parallel.c | 20 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_group_sequential.c | 20 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_rotate.c | 10 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_scale.c | 10 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_instance_translate.c | 10 |
10 files changed, 58 insertions, 58 deletions
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index 69f4164dc5..7c23f50745 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h @@ -121,9 +121,9 @@ EOAPI void efl_animation_instance_translate_get(const Eo *obj, int *from_x, int EOAPI void efl_animation_instance_translate_absolute_set(Eo *obj, int from_x, int from_y, int to_x, int to_y); EOAPI void efl_animation_instance_translate_absolute_get(const Eo *obj, int *from_x, int *from_y, int *to_x, int *to_y); -EOAPI void efl_animation_instance_group_instance_add(Eo *obj, Efl_Animation_Instance *animation); +EOAPI void efl_animation_instance_group_instance_add(Eo *obj, Efl_Animation_Instance *instance); -EOAPI void efl_animation_instance_group_instance_del(Eo *obj, Efl_Animation_Instance *animation); +EOAPI void efl_animation_instance_group_instance_del(Eo *obj, Efl_Animation_Instance *instance); EOAPI Eina_List *efl_animation_instance_group_instances_get(Eo *obj); diff --git a/src/lib/evas/canvas/efl_animation_instance.c b/src/lib/evas/canvas/efl_animation_instance.c index 75c3de2ad5..9b6f357eb9 100644 --- a/src/lib/evas/canvas/efl_animation_instance.c +++ b/src/lib/evas/canvas/efl_animation_instance.c @@ -5,14 +5,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) diff --git a/src/lib/evas/canvas/efl_animation_instance.eo b/src/lib/evas/canvas/efl_animation_instance.eo index 2d1cc8fe95..5b20e74206 100644 --- a/src/lib/evas/canvas/efl_animation_instance.eo +++ b/src/lib/evas/canvas/efl_animation_instance.eo @@ -7,16 +7,16 @@ abstract Efl.Animation.Instance (Efl.Object) data: Evas_Object_Animation_Instance_Data; methods { start { - [[Start animation.]] + [[Start animation instance.]] } cancel { - [[Cancel animation.]] + [[Cancel animation instance.]] } pause { - [[Pause animation.]] + [[Pause animation instance.]] } resume { - [[Resume animation.]] + [[Resume animation instance.]] } } implements { diff --git a/src/lib/evas/canvas/efl_animation_instance_alpha.c b/src/lib/evas/canvas/efl_animation_instance_alpha.c index 5ccc799032..776e3163b5 100644 --- a/src/lib/evas/canvas/efl_animation_instance_alpha.c +++ b/src/lib/evas/canvas/efl_animation_instance_alpha.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_ALPHA_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_ALPHA_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_ALPHA_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) diff --git a/src/lib/evas/canvas/efl_animation_instance_group.c b/src/lib/evas/canvas/efl_animation_instance_group.c index 57d6359340..3fdacc6133 100644 --- a/src/lib/evas/canvas/efl_animation_instance_group.c +++ b/src/lib/evas/canvas/efl_animation_instance_group.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_GROUP_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) @@ -165,9 +165,9 @@ _efl_animation_instance_group_efl_object_destructor(Eo *eo_obj, /* Internal EO APIs */ -EOAPI EFL_VOID_FUNC_BODYV(efl_animation_instance_group_instance_add, EFL_FUNC_CALL(animation), Efl_Animation_Instance *animation); +EOAPI EFL_VOID_FUNC_BODYV(efl_animation_instance_group_instance_add, EFL_FUNC_CALL(instance), Efl_Animation_Instance *instance); -EOAPI EFL_VOID_FUNC_BODYV(efl_animation_instance_group_instance_del, EFL_FUNC_CALL(animation), Efl_Animation_Instance *animation); +EOAPI EFL_VOID_FUNC_BODYV(efl_animation_instance_group_instance_del, EFL_FUNC_CALL(instance), Efl_Animation_Instance *instance); EOAPI EFL_FUNC_BODY(efl_animation_instance_group_instances_get, Eina_List *, NULL); diff --git a/src/lib/evas/canvas/efl_animation_instance_group_parallel.c b/src/lib/evas/canvas/efl_animation_instance_group_parallel.c index 0c27c34af3..c0093e10b7 100644 --- a/src/lib/evas/canvas/efl_animation_instance_group_parallel.c +++ b/src/lib/evas/canvas/efl_animation_instance_group_parallel.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_GROUP_PARALLEL_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_GROUP_PARALLEL_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_GROUP_PARALLEL_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) @@ -137,13 +137,13 @@ _start(Eo *eo_obj, Evas_Object_Animation_Instance_Group_Parallel_Data *pd) efl_event_callback_call(eo_obj, EFL_ANIMATION_INSTANCE_EVENT_START, NULL); - Eina_List *animations = efl_animation_instance_group_instances_get(eo_obj); + Eina_List *instances = efl_animation_instance_group_instances_get(eo_obj); Eina_List *l; - Efl_Animation *anim; - EINA_LIST_FOREACH(animations, l, anim) + Efl_Animation *inst; + EINA_LIST_FOREACH(instances, l, inst) { - //Data should be registered before animation starts - efl_animation_instance_member_start(anim); + //Data should be registered before animation instance starts + efl_animation_instance_member_start(inst); pd->animate_inst_count++; } } diff --git a/src/lib/evas/canvas/efl_animation_instance_group_sequential.c b/src/lib/evas/canvas/efl_animation_instance_group_sequential.c index b6ce25ae4d..ead54d3a99 100644 --- a/src/lib/evas/canvas/efl_animation_instance_group_sequential.c +++ b/src/lib/evas/canvas/efl_animation_instance_group_sequential.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_GROUP_SEQUENTIAL_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_GROUP_SEQUENTIAL_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_GROUP_SEQUENTIAL_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) @@ -81,8 +81,8 @@ _post_end_cb(void *data, const Efl_Event *event) pd->current_index++; - Eina_List *animations = efl_animation_instance_group_instances_get(eo_obj); - if (eina_list_count(animations) == pd->current_index) + Eina_List *instances = efl_animation_instance_group_instances_get(eo_obj); + if (eina_list_count(instances) == pd->current_index) { pd->current_index = 0; @@ -119,12 +119,12 @@ _member_post_end_cb(void *data, const Efl_Event *event) static void _index_animation_start(Eo *eo_obj, int index) { - Efl_Animation_Instance *anim = + Efl_Animation_Instance *inst = eina_list_nth(efl_animation_instance_group_instances_get(eo_obj), index); - if (!anim || efl_animation_instance_is_deleted(anim)) + if (!inst || efl_animation_instance_is_deleted(inst)) return; - efl_animation_instance_member_start(anim); + efl_animation_instance_member_start(inst); } static void diff --git a/src/lib/evas/canvas/efl_animation_instance_rotate.c b/src/lib/evas/canvas/efl_animation_instance_rotate.c index 2150acc611..839246811d 100644 --- a/src/lib/evas/canvas/efl_animation_instance_rotate.c +++ b/src/lib/evas/canvas/efl_animation_instance_rotate.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_ROTATE_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_ROTATE_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_ROTATE_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) diff --git a/src/lib/evas/canvas/efl_animation_instance_scale.c b/src/lib/evas/canvas/efl_animation_instance_scale.c index d250d52fc3..b91f473800 100644 --- a/src/lib/evas/canvas/efl_animation_instance_scale.c +++ b/src/lib/evas/canvas/efl_animation_instance_scale.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_SCALE_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_SCALE_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_SCALE_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) diff --git a/src/lib/evas/canvas/efl_animation_instance_translate.c b/src/lib/evas/canvas/efl_animation_instance_translate.c index f4f3348b25..76bf12a287 100644 --- a/src/lib/evas/canvas/efl_animation_instance_translate.c +++ b/src/lib/evas/canvas/efl_animation_instance_translate.c @@ -4,14 +4,14 @@ #define MY_CLASS EFL_ANIMATION_INSTANCE_TRANSLATE_CLASS #define MY_CLASS_NAME efl_class_name_get(MY_CLASS) -#define EFL_ANIMATION_INSTANCE_TRANSLATE_CHECK_OR_RETURN(anim, ...) \ +#define EFL_ANIMATION_INSTANCE_TRANSLATE_CHECK_OR_RETURN(inst, ...) \ do { \ - if (!anim) { \ - CRI("Efl_Animation_Instance " # anim " is NULL!"); \ + if (!inst) { \ + CRI("Efl_Animation_Instance " # inst " is NULL!"); \ return __VA_ARGS__; \ } \ - if (efl_animation_instance_is_deleted(anim)) { \ - ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \ + if (efl_animation_instance_is_deleted(inst)) { \ + ERR("Efl_Animation_Instance " # inst " has already been deleted!"); \ return __VA_ARGS__; \ } \ } while (0) |