summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-02-17 12:04:40 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-02-17 12:04:40 +0200
commit9fa8ea0e49fbf10a1aec66a7bdd8c621f1fc1625 (patch)
tree7ec507935e3d15f59cb4dfd789e1802bea12d536
parente7e3f73bbe9f21dfb4ee1fc692e0fcfb12b0cdc5 (diff)
Revert "ecore animator: change name of Eo constructor, to avoid clash in Eolian"
This reverts commit 16c43796a6e888b858233e393c4b65c0ee6779a0.
-rw-r--r--src/lib/ecore/Ecore_Eo.h4
-rw-r--r--src/lib/ecore/ecore_anim.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index c490457067..97556f2b9d 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -80,7 +80,7 @@ extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID;
80 80
81enum 81enum
82{ 82{
83 ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR, 83 ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR,
84 ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR, 84 ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR,
85 ECORE_ANIMATOR_SUB_ID_LAST 85 ECORE_ANIMATOR_SUB_ID_LAST
86}; 86};
@@ -97,7 +97,7 @@ enum
97 * @param[in] data 97 * @param[in] data
98 * 98 *
99 */ 99 */
100#define ecore_animator_constructor(func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data) 100#define ecore_animator_constructor(func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
101 101
102/** 102/**
103 * @def ecore_animator_timeline_constructor 103 * @def ecore_animator_timeline_constructor
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 43985a6d2c..2bdd8d1b83 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -712,7 +712,7 @@ _class_constructor(Eo_Class *klass)
712 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_FREEZE), _ecore_animator_freeze), 712 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_FREEZE), _ecore_animator_freeze),
713 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_THAW), _ecore_animator_thaw), 713 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_THAW), _ecore_animator_thaw),
714 714
715 EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR), _animator_constructor), 715 EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR), _animator_constructor),
716 EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), _animator_timeline_constructor), 716 EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), _animator_timeline_constructor),
717 EO_OP_FUNC_SENTINEL 717 EO_OP_FUNC_SENTINEL
718 }; 718 };
@@ -721,7 +721,7 @@ _class_constructor(Eo_Class *klass)
721} 721}
722 722
723static const Eo_Op_Description op_desc[] = { 723static const Eo_Op_Description op_desc[] = {
724 EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR, "Add an animator to call func at every animation tick during main loop execution."), 724 EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR, "Add an animator to call func at every animation tick during main loop execution."),
725 EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR, "Add an animator that runs for a limited time"), 725 EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR, "Add an animator that runs for a limited time"),
726 EO_OP_DESCRIPTION_SENTINEL 726 EO_OP_DESCRIPTION_SENTINEL
727}; 727};