Eolian: Legacy integration of Evas Common Interface

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index c0f2641..df85f92 100644 (file)
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -33,6 +33,7 @@ BUILT_SOURCES += \
                  lib/evas/canvas/evas_table.eo.legacy.h \
                  lib/evas/canvas/evas_common_interface.eo.c \
                  lib/evas/canvas/evas_common_interface.eo.h \
+                 lib/evas/canvas/evas_common_interface.eo.legacy.h \
                  lib/evas/canvas/evas_object.eo.c \
                  lib/evas/canvas/evas_object.eo.h \
                  lib/evas/canvas/evas.eo.c \
@@ -128,8 +129,10 @@ nodist_installed_evascanvasheaders_DATA = \
                                         lib/evas/canvas/evas_textgrid.eo.legacy.h \
                                         lib/evas/canvas/evas_table.eo.legacy.h \
                                         lib/evas/canvas/evas_smart.eo.legacy.h \
-                                        lib/evas/canvas/evas_smart_clipped.eo.legacy.h
-
+                                        lib/evas/canvas/evas_smart_clipped.eo.legacy.h \
+                                        lib/evas/canvas/evas_table.eo.legacy.h \
+                                        lib/evas/canvas/evas_common_interface.eo.legacy.h
+                    
 noinst_HEADERS = \
 lib/evas/include/evas_inline.x \
 lib/evas/include/evas_private.h \

diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 491e84a..39c5c95 100644 (file)
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2148,18 +2148,7 @@ EAPI void             evas_object_color_set(Evas_Object *obj, int r, int g, int
  */
 EAPI void             evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) EINA_ARG_NONNULL(1);
 
-/**
- * Retrieves the Evas canvas that the given object lives on.
- *
- * @param   obj The given Evas object.
- * @return  A pointer to the canvas where the object is on.
- *
- * This function is most useful at code contexts where you need to
- * operate on the canvas but have only the object pointer.
- *
- * @ingroup Evas_Object_Group_Basic
- */
-EAPI Evas            *evas_object_evas_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+#include "canvas/evas_common_interface.eo.legacy.h"
 
 /**
  * Retrieves the type of the given Evas object.

diff --git a/src/lib/evas/canvas/evas_common_interface.eo b/src/lib/evas/canvas/evas_common_interface.eo
index 7c885c2..8a221b8 100644 (file)
--- a/src/lib/evas/canvas/evas_common_interface.eo
+++ b/src/lib/evas/canvas/evas_common_interface.eo
@@ -6,6 +6,7 @@ interface Evas_Common_Interface ()
       evas {
          get {
             /*@ No description supplied by the EAPI. */
+            legacy evas_object_evas_get;
          }
          values {
             Evas *ret;
@@ -15,5 +16,4 @@ interface Evas_Common_Interface ()
    implements {
       virtual::evas::get;
    }
-
 }
\ No newline at end of file

diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 61b54bb..b20ecfb 100644 (file)
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1411,17 +1411,6 @@ _evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *o
    return obj->cur->render_op;
 }
 
-EAPI Evas *
-evas_object_evas_get(const Evas_Object *eo_obj)
-{
-   MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   Evas *eo_evas = NULL;
-   eo_do((Eo *)eo_obj, eo_evas = evas_common_evas_get());
-   return eo_evas;
-}
-
 EOLIAN static void
 _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root)
 {