From 83700fe13c495193d72c95e906c0866e39c6e5c9 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 11 Jul 2019 15:34:31 -0700 Subject: [PATCH] ecore: remove efl_loop_{un,}register from .eo. We have to keep this as an API, but binding do not need to see it at this point. Reviewed-by: Mike Blumenkrantz Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D9297 --- src/lib/ecore/Ecore_Eo.h | 7 +++++++ src/lib/ecore/efl_loop.c | 10 ++++++++-- src/lib/ecore/efl_loop.eo | 16 ---------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h index 363868c1a4..22c9e38f3c 100644 --- a/src/lib/ecore/Ecore_Eo.h +++ b/src/lib/ecore/Ecore_Eo.h @@ -42,6 +42,13 @@ #include "efl_app.eo.h" #include "efl_appthread.eo.h" +/* To be deprecated at some point */ + +/** Please use efl_provider_register instead. */ +EAPI Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); +/** Please use efl_provider_unregister instead. */ +EAPI Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider); + /** * @brief Quits the main loop once all the events currently on the queue have * been processed. diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c index b8a910cc8a..3a7171c565 100644 --- a/src/lib/ecore/efl_loop.c +++ b/src/lib/ecore/efl_loop.c @@ -505,6 +505,8 @@ _efl_loop_register(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, return efl_provider_register(obj, klass, provider); } +EFL_FUNC_BODYV(efl_loop_register, Eina_Bool, EINA_FALSE, EFL_FUNC_CALL(klass, provider), const Efl_Class *klass, const Efl_Object *provider); + static Eina_Bool _efl_loop_unregister(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, const Efl_Class *klass, const Efl_Object *provider) @@ -512,6 +514,8 @@ _efl_loop_unregister(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, return efl_provider_unregister(obj, klass, provider); } +EFL_FUNC_BODYV(efl_loop_unregister, Eina_Bool, EINA_FALSE, EFL_FUNC_CALL(klass, provider), const Efl_Class *klass, const Efl_Object *provider); + void _efl_loop_messages_filter(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, void *handler_pd) { @@ -672,7 +676,9 @@ efl_loop_future_scheduler_get(const Eo *obj) return NULL; } -#define EFL_LOOP_EXTRA_OPS \ - EFL_OBJECT_OP_FUNC(efl_loop_message_process, _efl_loop_message_process) +#define EFL_LOOP_EXTRA_OPS \ + EFL_OBJECT_OP_FUNC(efl_loop_message_process, _efl_loop_message_process), \ + EFL_OBJECT_OP_FUNC(efl_loop_register, _efl_loop_register), \ + EFL_OBJECT_OP_FUNC(efl_loop_unregister, _efl_loop_unregister) #include "efl_loop.eo.c" diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo index eca974bd59..b92e515bb9 100644 --- a/src/lib/ecore/efl_loop.eo +++ b/src/lib/ecore/efl_loop.eo @@ -102,22 +102,6 @@ abstract Efl.Loop extends Efl.Task } return: future @owned; [[The future handle.]] } - register { - [[Will register a manager of a specific class to be answered by eo.provider_find.]] - params { - @in klass: const(Efl.Class); [[The class provided by the registered provider.]] - @in provider: const(Efl.Object); [[The provider for the newly registered class that has to provide that said Efl.Class.]] - } - return: bool; [[$true if successfully register, $false otherwise.]] - } - unregister { - [[Will unregister a manager of a specific class that was previously registered and answered by eo.provider_find.]] - params { - @in klass: const(Efl.Class); [[The class provided by the provider to unregister for.]] - @in provider: const(Efl.Object); [[The provider for the registered class to unregister.]] - } - return: bool; [[$true if successfully unregistered, $false otherwise.]] - } } events { idle,enter @restart: void; [[Event occurs once the main loop enters the idle state.]]