Eolian: Legacy integration of Ecore

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d6c7731..d861e5f 100644 (file)
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -4,18 +4,23 @@
 BUILT_SOURCES += \
                  lib/ecore/ecore_timer.eo.c \
                  lib/ecore/ecore_timer.eo.h \
+                 lib/ecore/ecore_timer.eo.legacy.h \
                  lib/ecore/ecore_poll.eo.c \
                  lib/ecore/ecore_poll.eo.h \
+                 lib/ecore/ecore_poll.eo.legacy.h \
                  lib/ecore/ecore_job.eo.c \
                  lib/ecore/ecore_job.eo.h \
+                 lib/ecore/ecore_job.eo.legacy.h \
                  lib/ecore/ecore_idler.eo.c \
                  lib/ecore/ecore_idler.eo.h \
+                 lib/ecore/ecore_idler.eo.legacy.h \
                  lib/ecore/ecore_idle_enterer.eo.c \
                  lib/ecore/ecore_idle_enterer.eo.h \
                  lib/ecore/ecore_idle_exiter.eo.c \
                  lib/ecore/ecore_idle_exiter.eo.h \
                  lib/ecore/ecore_animator.eo.c \
                  lib/ecore/ecore_animator.eo.h \
+                 lib/ecore/ecore_animator.eo.legacy.h \
                  lib/ecore/ecore_parent.eo.c \
                  lib/ecore/ecore_parent.eo.h
 
@@ -51,7 +56,12 @@ nodist_installed_ecoremainheaders_DATA = \
                                         lib/ecore/ecore_idle_enterer.eo.h \
                                         lib/ecore/ecore_idle_exiter.eo.h \
                                         lib/ecore/ecore_animator.eo.h \
-                                        lib/ecore/ecore_parent.eo.h
+                                        lib/ecore/ecore_parent.eo.h \
+                                        lib/ecore/ecore_timer.eo.legacy.h \
+                                        lib/ecore/ecore_poll.eo.legacy.h \
+                                        lib/ecore/ecore_job.eo.legacy.h \
+                                        lib/ecore/ecore_idler.eo.legacy.h \
+                                        lib/ecore/ecore_animator.eo.legacy.h
 
 lib_ecore_libecore_la_SOURCES = \
 lib/ecore/ecore.c \

diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 38e8c93..70c8ac9 100644 (file)
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -10,62 +10,9 @@ extern "C" {
  *
  * @{
  */
-#include "ecore_poll.eo.h"
-#if 0
-#define ECORE_POLLER_CLASS ecore_poller_class_get()
-const Eo_Class *ecore_poller_class_get(void) EINA_CONST;
-extern EAPI Eo_Op ECORE_POLLER_BASE_ID;
-
-enum
-{
-   ECORE_POLLER_SUB_ID_CONSTRUCTOR,
-   ECORE_POLLER_SUB_ID_INTERVAL_SET,
-   ECORE_POLLER_SUB_ID_INTERVAL_GET,
-   ECORE_POLLER_SUB_ID_LAST,
-};
-
-#define ECORE_POLLER_ID(sub_id) (ECORE_POLLER_BASE_ID + sub_id)
-
-/**
- * @def ecore_poller_constructor
- * @since 1.8
- *
- * Contructor with parameters for Ecore Poller.
- *
- * @param[in] type
- * @param[in] interval
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_poller_constructor(type, interval, func, data) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Poller_Type, type), EO_TYPECHECK(int, interval), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
 
-/**
- * @def ecore_poller_interval_set
- * @since 1.8
- *
- * Changes the polling interval rate of poller.
- *
- * @param[in] interval
- * @param[out] ret
- *
- * @see ecore_poller_poller_interval_set
- */
-#define ecore_poller_interval_set(interval, ret) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(int, interval), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def ecore_poller_interval_get
- * @since 1.8
- *
- * Gets the polling interval rate of poller.
- *
- * @param[out] ret
- *
- * @see ecore_poller_poller_interval_get
- */
-#define ecore_poller_interval_get(ret) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(int *, ret)
+#include "ecore_poll.eo.h"
 
-#endif
 /**
  * @}
  */
@@ -75,49 +22,10 @@ enum
  *
  * @{
  */
-#include "ecore_animator.eo.h"
-#if 0
-
-#define ECORE_ANIMATOR_CLASS ecore_animator_class_get()
-const Eo_Class *ecore_animator_class_get(void) EINA_CONST;
 
-extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID;
-
-enum
-{
-   ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR,
-   ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR,
-   ECORE_ANIMATOR_SUB_ID_LAST
-};
-
-#define ECORE_ANIMATOR_ID(sub_id) (ECORE_ANIMATOR_BASE_ID + sub_id)
-
-/**
- * @def ecore_animator_constructor
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] func
- * @param[in] 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)
+#include "ecore_animator.eo.h"
 
 /**
- * @def ecore_animator_timeline_constructor
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] runtime
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_animator_timeline_constructor(runtime, func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), EO_TYPECHECK(double, runtime), EO_TYPECHECK(Ecore_Timeline_Cb, func), EO_TYPECHECK(const void *, data)
-#endif
-/**
  * @}
  */
 
@@ -126,112 +34,10 @@ enum
  *
  * @{
  */
-#include "ecore_timer.eo.h"
-#if 0
-
-#define ECORE_TIMER_CLASS ecore_timer_class_get()
-const Eo_Class *ecore_timer_class_get(void) EINA_CONST;
-extern EAPI Eo_Op ECORE_TIMER_BASE_ID;
-
-enum
-{
-   ECORE_TIMER_SUB_ID_CONSTRUCTOR,
-   ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR,
-   ECORE_TIMER_SUB_ID_INTERVAL_SET,
-   ECORE_TIMER_SUB_ID_INTERVAL_GET,
-   ECORE_TIMER_SUB_ID_DELAY,
-   ECORE_TIMER_SUB_ID_RESET,
-   ECORE_TIMER_SUB_ID_PENDING_GET,
-   ECORE_TIMER_SUB_ID_LAST,
-};
-
-#define ECORE_TIMER_ID(sub_id) (ECORE_TIMER_BASE_ID + sub_id)
-
-/**
- * @def ecore_timer_constructor
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] in
- * @param[in] func
- * @param[in] 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
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] in
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_timer_loop_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
-
-/**
- * @def ecore_obj_timer_interval_set
- * @since 1.8
- *
- * Change the interval the timer ticks of.
- *
- * @param[in] in
- *
- * @see ecore_timer_interval_set
- */
-#define ecore_obj_timer_interval_set(in) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(double, in)
-
-/**
- * @def ecore_obj_timer_interval_get
- * @since 1.8
- *
- * Get the interval the timer ticks on.
- *
- * @param[out] ret
- *
- * @see ecore_timer_interval_get
- */
-#define ecore_obj_timer_interval_get(ret) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def ecore_obj_timer_delay
- * @since 1.8
- *
- * Add some delay for the next occurrence of a timer.
- *
- * @param[in] add
- *
- * @see ecore_timer_delay
- */
-#define ecore_obj_timer_delay(add) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_DELAY), EO_TYPECHECK(double, add)
 
-/**
- * @def ecore_obj_timer_reset
- * @since 1.8
- *
- * Reset a timer to its full interval.
- *
- * @see ecore_timer_reset
- */
-#define ecore_obj_timer_reset() ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_RESET)
+#include "ecore_timer.eo.h"
 
 /**
- * @def ecore_obj_timer_pending_get
- * @since 1.8
- *
- * Get the pending time regarding a timer.
- *
- * @param[out] ret
- *
- * @see ecore_timer_pending_get
- */
-#define ecore_obj_timer_pending_get(ret) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_PENDING_GET), EO_TYPECHECK(double *, ret)
-#endif
-/**
  * @}
  */
 
@@ -240,112 +46,11 @@ enum
  *
  * @{
  */
-#include "ecore_idler.eo.h"
-#if 0
-
-#define ECORE_IDLER_CLASS ecore_idler_class_get()
-const Eo_Class *ecore_idler_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ECORE_IDLER_BASE_ID;
-
-enum
-{
-   ECORE_IDLER_SUB_ID_CONSTRUCTOR,
-   ECORE_IDLER_SUB_ID_LAST
-};
 
-#define ECORE_IDLER_ID(sub_id) (ECORE_IDLER_BASE_ID + sub_id)
-
-/**
- * @def ecore_idler_constructor
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_idler_constructor(func, data) ECORE_IDLER_ID(ECORE_IDLER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
-
-#endif
-/**
- *
- */
-#include "ecore_idle_enterer.eo.h"
-#if 0
-
-#define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get()
-const Eo_Class *ecore_idle_enterer_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID;
-
-enum
-{
-   ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR,
-   ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR,
-   ECORE_IDLE_ENTERER_SUB_ID_LAST
-};
-
-#define ECORE_IDLE_ENTERER_ID(sub_id) (ECORE_IDLE_ENTERER_BASE_ID + sub_id)
-
-/**
- * @def ecore_idle_enterer_after_constructor
- * @since 1.8
- *
- * Contructor. Will insert the handler at the end of the list.
- *
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_idle_enterer_after_constructor(func, data) ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
-
-/**
- * @def ecore_idle_enterer_before_constructor
- * @since 1.8
- *
- * Contructor. Will insert the handler at the beginning of the list.
- *
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_idle_enterer_before_constructor(func, data) ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
-
-#endif
-/**
- *
- */
+#include "ecore_idler.eo.h"
 #include "ecore_idle_exiter.eo.h"
-#if 0
-
-#define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get()
-const Eo_Class *ecore_idle_exiter_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID;
-
-enum
-{
-   ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR,
-   ECORE_IDLE_EXITER_SUB_ID_LAST
-};
-
-#define ECORE_IDLE_EXITER_ID(sub_id) (ECORE_IDLE_EXITER_BASE_ID + sub_id)
-
-/**
- * @def ecore_idle_exiter_constructor
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_idle_exiter_constructor(func, data) ECORE_IDLE_EXITER_ID(ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
+#include "ecore_idle_enterer.eo.h"
 
-#endif
 /**
  * @}
  */
@@ -355,35 +60,9 @@ enum
  *
  * @{
  */
-#include "ecore_job.eo.h"
-#if 0
-
-#define ECORE_JOB_CLASS ecore_job_class_get()
-const Eo_Class *ecore_job_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ECORE_JOB_BASE_ID;
 
-enum
-{
-   ECORE_JOB_SUB_ID_CONSTRUCTOR,
-   ECORE_JOB_SUB_ID_LAST
-};
-
-#define ECORE_JOB_ID(sub_id) (ECORE_JOB_BASE_ID + sub_id)
-
-/**
- * @def ecore_job_constructor
- * @since 1.8
- *
- * Contructor.
- *
- * @param[in] func
- * @param[in] data
- *
- */
-#define ecore_job_constructor(func, data) ECORE_JOB_ID(ECORE_JOB_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Cb, func), EO_TYPECHECK(const void *, data)
+#include "ecore_job.eo.h"
 
-#endif
 /**
  * @}
  */

diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h
index 381f0e8..66a50e3 100644 (file)
--- a/src/lib/ecore/Ecore_Legacy.h
+++ b/src/lib/ecore/Ecore_Legacy.h
@@ -9,24 +9,6 @@ extern "C" {
  */
 
 /**
- * @brief Changes the polling interval rate of @p poller.
- * @param poller The Ecore_Poller to change the interval of.
- * @param interval The tick interval to set; must be a power of 2 and <= 32768.
- * @return Returns true on success, false on failure.
- *
- * This allows the changing of a poller's polling interval. It is useful when
- * you want to alter a poll rate without deleting and re-creating a poller.
- */
-EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
-/**
- * @brief Gets the polling interval rate of @p poller.
- * @param poller The Ecore_Poller to change the interval of.
- * @return Returns the interval, in ticks, that @p poller polls at.
- *
- * This returns a poller's polling interval, or 0 on error.
- */
-EAPI int ecore_poller_poller_interval_get(const Ecore_Poller *poller);
-/**
  * @brief Creates a poller to call the given function at a particular tick interval.
  * @param type The ticker type to attach the poller to. Must be ECORE_POLLER_CORE.
  * @param interval The poll interval.
@@ -63,6 +45,8 @@ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_
  */
 EAPI void *ecore_poller_del(Ecore_Poller *poller);
 
+#include "ecore_poll.eo.legacy.h"
+
 /**
  * @}
  */
@@ -164,6 +148,8 @@ EAPI void ecore_animator_freeze(Ecore_Animator *animator);
  */
 EAPI void ecore_animator_thaw(Ecore_Animator *animator);
 
+#include "ecore_animator.eo.legacy.h"
+
 /**
  * @}
  */
@@ -176,14 +162,12 @@ EAPI void ecore_animator_thaw(Ecore_Animator *animator);
 EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
 EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
 EAPI void *ecore_timer_del(Ecore_Timer *timer);
-EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
-EAPI double ecore_timer_interval_get(const Ecore_Timer *timer);
 EAPI void ecore_timer_freeze(Ecore_Timer *timer);
 EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
 EAPI void ecore_timer_thaw(Ecore_Timer *timer);
-EAPI void ecore_timer_delay(Ecore_Timer *timer, double add);
-EAPI void ecore_timer_reset(Ecore_Timer *timer);
-EAPI double ecore_timer_pending_get(const Ecore_Timer *timer);
+
+#include "ecore_timer.eo.legacy.h"
+
 /**
  * @}
  */
@@ -223,6 +207,9 @@ EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
 
 EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
 EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
+
+#include "ecore_idler.eo.legacy.h"
+
 /**
  * @}
  */
@@ -234,6 +221,9 @@ EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
  */
 EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
 EAPI void *ecore_job_del(Ecore_Job *obj);
+
+#include "ecore_job.eo.legacy.h"
+
 /**
  * @}
  */