[EGIT] [core/efl] master 01/02: Revert "ecore animator: change name of Eo constructor, to avoid clash in Eolian"

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9fa8ea0e49fbf10a1aec66a7bdd8c621f1fc1625

commit 9fa8ea0e49fbf10a1aec66a7bdd8c621f1fc1625
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Mon Feb 17 12:04:40 2014 +0200

    Revert "ecore animator: change name of Eo constructor, to avoid clash in 
Eolian"
    
    This reverts commit 16c43796a6e888b858233e393c4b65c0ee6779a0.
---
 src/lib/ecore/Ecore_Eo.h   | 4 ++--
 src/lib/ecore/ecore_anim.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index c490457..97556f2 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;
 
 enum
 {
-   ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR,
+   ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR,
    ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR,
    ECORE_ANIMATOR_SUB_ID_LAST
 };
@@ -97,7 +97,7 @@ enum
  * @param[in] data
  *
  */
-#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)
+#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)
 
 /**
  * @def ecore_animator_timeline_constructor
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 43985a6..2bdd8d1 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -712,7 +712,7 @@ _class_constructor(Eo_Class *klass)
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_FREEZE), 
_ecore_animator_freeze),
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_THAW), 
_ecore_animator_thaw),
 
-        
EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR), 
_animator_constructor),
+        EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR), 
_animator_constructor),
         
EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), 
_animator_timeline_constructor),
         EO_OP_FUNC_SENTINEL
    };
@@ -721,7 +721,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR, "Add an 
animator to call func at every animation tick during main loop execution."),
+     EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR, "Add an animator to 
call func at every animation tick during main loop execution."),
      EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR, "Add an 
animator that runs for a limited time"),
      EO_OP_DESCRIPTION_SENTINEL
 };

--