[EGIT] [core/efl] master 02/02: Revert "ecore timer: 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=d3851b30268bd415a8789add914eae21070e832c

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

    Revert "ecore timer: change name of Eo constructor, to avoid clash in 
Eolian"
    
    This reverts commit f7808f1f22f1d149d61e2f5b086006e943a68b61.
---
 src/lib/ecore/Ecore_Eo.h    | 4 ++--
 src/lib/ecore/ecore_timer.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 97556f2..0daf06a 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -128,7 +128,7 @@ extern EAPI Eo_Op ECORE_TIMER_BASE_ID;
 
 enum
 {
-   ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR,
+   ECORE_TIMER_SUB_ID_CONSTRUCTOR,
    ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR,
    ECORE_TIMER_SUB_ID_INTERVAL_SET,
    ECORE_TIMER_SUB_ID_INTERVAL_GET,
@@ -151,7 +151,7 @@ enum
  * @param[in] data
  *
  */
-#define ecore_timer_constructor(in, func, data) 
ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR), EO_TYPECHECK(double, in), 
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
+#define ecore_timer_constructor(in, func, data) 
ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(double, in), 
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
 
 /**
  * @def ecore_timer_loop_constructor
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index c770c14..e6e488c 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -1002,7 +1002,7 @@ _class_constructor(Eo_Class *klass)
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
 
-        EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR), 
_timer_constructor),
+        EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), 
_timer_constructor),
         EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), 
_timer_loop_constructor),
         EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), 
_timer_interval_set),
         EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), 
_timer_interval_get),
@@ -1021,7 +1021,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR, "Creates a timer 
to call the given function in the given period of time."),
+     EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_CONSTRUCTOR, "Creates a timer to 
call the given function in the given period of time."),
      EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, "Creates a timer 
to call the given function in the given period of time."),
      EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_SET, "Change the interval 
the timer ticks of."),
      EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_GET, "Get the interval the 
timer ticks on."),

--