summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-09-19 13:05:32 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-09-19 13:05:32 -0700
commite4958e9faa7bbf5992aea9d908374350f88f7efe (patch)
treeeaf5082f0f5e82a5925ed10ed347e5256246bb5b /src
parent9799d45ee7ecc9667fe079ab8121ca9da008db3e (diff)
ecore: remove useless ecore_parent.eo.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore.am3
-rw-r--r--src/lib/ecore/ecore.c6
-rw-r--r--src/lib/ecore/ecore_parent.eo4
-rw-r--r--src/lib/ecore/ecore_poller.c2
-rw-r--r--src/lib/ecore/ecore_private.h3
5 files changed, 2 insertions, 16 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 606ae66482..e409dffad6 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -19,8 +19,7 @@ ecore_eolian_files_public = \
19 lib/ecore/efl_io_stdout.eo \ 19 lib/ecore/efl_io_stdout.eo \
20 lib/ecore/efl_io_stderr.eo \ 20 lib/ecore/efl_io_stderr.eo \
21 lib/ecore/efl_io_file.eo \ 21 lib/ecore/efl_io_file.eo \
22 lib/ecore/efl_io_copier.eo \ 22 lib/ecore/efl_io_copier.eo
23 lib/ecore/ecore_parent.eo
24 23
25ecore_eolian_files = \ 24ecore_eolian_files = \
26 $(ecore_eolian_files_public) \ 25 $(ecore_eolian_files_public) \
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index acf28229bd..6cca015e6c 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -59,8 +59,6 @@ static FILE *_ecore_memory_statistic_file = NULL;
59 59
60static Eina_Bool _no_system_modules = EINA_FALSE; 60static Eina_Bool _no_system_modules = EINA_FALSE;
61 61
62Eo *_ecore_parent = NULL;
63
64static const char *_ecore_magic_string_get(Ecore_Magic m); 62static const char *_ecore_magic_string_get(Ecore_Magic m);
65static int _ecore_init_count = 0; 63static int _ecore_init_count = 0;
66static int _ecore_init_count_threshold = 0; 64static int _ecore_init_count_threshold = 0;
@@ -278,7 +276,6 @@ ecore_init(void)
278#if defined(GLIB_INTEGRATION_ALWAYS) 276#if defined(GLIB_INTEGRATION_ALWAYS)
279 if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate(); 277 if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
280#endif 278#endif
281 _ecore_parent = efl_add(ECORE_PARENT_CLASS, NULL);
282 279
283#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) 280#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
284 if (getenv("ECORE_MEM_STAT")) 281 if (getenv("ECORE_MEM_STAT"))
@@ -440,7 +437,6 @@ ecore_shutdown(void)
440 eina_prefix_free(_ecore_pfx); 437 eina_prefix_free(_ecore_pfx);
441 _ecore_pfx = NULL; 438 _ecore_pfx = NULL;
442 439
443 efl_unref(_ecore_parent);
444 efl_object_shutdown(); 440 efl_object_shutdown();
445 441
446 eina_shutdown(); 442 eina_shutdown();
@@ -1063,5 +1059,3 @@ ecore_memory_state_set(Ecore_Memory_State state)
1063 _ecore_memory_state = state; 1059 _ecore_memory_state = state;
1064 ecore_event_add(ECORE_EVENT_MEMORY_STATE, NULL, NULL, NULL); 1060 ecore_event_add(ECORE_EVENT_MEMORY_STATE, NULL, NULL, NULL);
1065} 1061}
1066
1067#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 239aa647e9..0000000000
--- a/src/lib/ecore/ecore_parent.eo
+++ /dev/null
@@ -1,4 +0,0 @@
1class Ecore.Parent (Efl.Object)
2{
3 data: null;
4}
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 59426168f5..7e476e6cc4 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,
237 const void *data) 237 const void *data)
238{ 238{
239 Ecore_Poller *poller; 239 Ecore_Poller *poller;
240 poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_added, type, interval, func, data)); 240 poller = efl_add(MY_CLASS, _mainloop_singleton, ecore_poller_constructor(efl_added, type, interval, func, data));
241 return poller; 241 return poller;
242} 242}
243 243
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index f31b2f560e..e053c15eb8 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);
366#undef GENERIC_ALLOC_FREE_HEADER 366#undef GENERIC_ALLOC_FREE_HEADER
367 367
368extern Eo *_mainloop_singleton; 368extern Eo *_mainloop_singleton;
369extern Eo *_ecore_parent;
370extern Efl_Version _app_efl_version; 369extern Efl_Version _app_efl_version;
371#define ECORE_PARENT_CLASS ecore_parent_class_get()
372EAPI const Efl_Class *ecore_parent_class_get(void) EINA_CONST;
373 370
374void ecore_loop_future_register(Efl_Loop *l EINA_UNUSED, Efl_Future *f); 371void ecore_loop_future_register(Efl_Loop *l EINA_UNUSED, Efl_Future *f);
375void ecore_loop_future_unregister(Efl_Loop *l EINA_UNUSED, Efl_Future *f); 372void ecore_loop_future_unregister(Efl_Loop *l EINA_UNUSED, Efl_Future *f);