From e4958e9faa7bbf5992aea9d908374350f88f7efe Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 19 Sep 2016 13:05:32 -0700 Subject: [PATCH] ecore: remove useless ecore_parent.eo. --- src/Makefile_Ecore.am | 3 +-- src/lib/ecore/ecore.c | 6 ------ src/lib/ecore/ecore_parent.eo | 4 ---- src/lib/ecore/ecore_poller.c | 2 +- src/lib/ecore/ecore_private.h | 3 --- 5 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 src/lib/ecore/ecore_parent.eo diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 606ae66..e409dff 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -19,8 +19,7 @@ ecore_eolian_files_public = \ lib/ecore/efl_io_stdout.eo \ lib/ecore/efl_io_stderr.eo \ lib/ecore/efl_io_file.eo \ - lib/ecore/efl_io_copier.eo \ - lib/ecore/ecore_parent.eo + lib/ecore/efl_io_copier.eo ecore_eolian_files = \ $(ecore_eolian_files_public) \ diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index acf2822..6cca015 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c @@ -59,8 +59,6 @@ static FILE *_ecore_memory_statistic_file = NULL; static Eina_Bool _no_system_modules = EINA_FALSE; -Eo *_ecore_parent = NULL; - static const char *_ecore_magic_string_get(Ecore_Magic m); static int _ecore_init_count = 0; static int _ecore_init_count_threshold = 0; @@ -278,7 +276,6 @@ ecore_init(void) #if defined(GLIB_INTEGRATION_ALWAYS) if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate(); #endif - _ecore_parent = efl_add(ECORE_PARENT_CLASS, NULL); #if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) if (getenv("ECORE_MEM_STAT")) @@ -440,7 +437,6 @@ ecore_shutdown(void) eina_prefix_free(_ecore_pfx); _ecore_pfx = NULL; - efl_unref(_ecore_parent); efl_object_shutdown(); eina_shutdown(); @@ -1063,5 +1059,3 @@ ecore_memory_state_set(Ecore_Memory_State state) _ecore_memory_state = state; ecore_event_add(ECORE_EVENT_MEMORY_STATE, NULL, NULL, NULL); } - -#include "ecore_parent.eo.c" diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo deleted file mode 100644 index 239aa64..0000000 --- a/src/lib/ecore/ecore_parent.eo +++ /dev/null @@ -1,4 +0,0 @@ -class Ecore.Parent (Efl.Object) -{ - data: null; -} diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c index 5942616..7e476e6 100644 --- a/src/lib/ecore/ecore_poller.c +++ b/src/lib/ecore/ecore_poller.c @@ -237,7 +237,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED, const void *data) { Ecore_Poller *poller; - poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_added, type, interval, func, data)); + poller = efl_add(MY_CLASS, _mainloop_singleton, ecore_poller_constructor(efl_added, type, interval, func, data)); return poller; } diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index f31b2f5..e053c15 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h @@ -366,10 +366,7 @@ GENERIC_ALLOC_FREE_HEADER(Ecore_Win32_Handler, ecore_win32_handler); #undef GENERIC_ALLOC_FREE_HEADER extern Eo *_mainloop_singleton; -extern Eo *_ecore_parent; extern Efl_Version _app_efl_version; -#define ECORE_PARENT_CLASS ecore_parent_class_get() -EAPI const Efl_Class *ecore_parent_class_get(void) EINA_CONST; void ecore_loop_future_register(Efl_Loop *l EINA_UNUSED, Efl_Future *f); void ecore_loop_future_unregister(Efl_Loop *l EINA_UNUSED, Efl_Future *f); -- 2.7.4