elm_atspi_ewk_wrapper: remove all legacy usage from eo files

this takes the current generated output from eolian for legacy code in
efl and adds it to the tree, then removes legacy references from the
corresponding eo files. in the case where the entire eo file was for
a legacy object, that eo file has been removed from the tree

ref T7724

Change-Id: I7c4d070cf8ec121080b0534fba6c0b74314651cf

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index ee24acb..0ea75e3 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -143,7 +143,6 @@ elm_public_eolian_files += \
        lib/elementary/efl_ui_progressbar_legacy_part.eo \
        lib/elementary/elm_multibuttonentry_part.eo \
        lib/elementary/elm_interface_scrollable.eo \
-       lib/elementary/elm_atspi_ewk_wrapper.eo \
        lib/elementary/elm_atspi_proxy.eo \
        lib/elementary/efl_ui_image_zoomable_pan.eo \
        $(NULL)
@@ -267,6 +266,8 @@ lib/elementary/elm_actionslider_eo.legacy.c \
 lib/elementary/elm_atspi_app_object_eo.c \
 lib/elementary/elm_atspi_bridge_eo.c \
 lib/elementary/elm_atspi_bridge_eo.legacy.c \
+lib/elementary/elm_atspi_ewk_wrapper_eo.c \
+lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.c \
 lib/elementary/elm_box_eo.c \
 lib/elementary/elm_box_eo.legacy.c \
 lib/elementary/elm_bubble_eo.c \
@@ -447,6 +448,7 @@ lib/elementary/elm_access_eo.legacy.h \
 lib/elementary/elm_actionslider_eo.legacy.h \
 lib/elementary/elm_atspi_app_object_eo.legacy.h \
 lib/elementary/elm_atspi_bridge_eo.legacy.h \
+lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.h \
 lib/elementary/elm_box_eo.legacy.h \
 lib/elementary/elm_bubble_eo.legacy.h \
 lib/elementary/elm_calendar_eo.legacy.h \
@@ -557,6 +559,7 @@ lib/elementary/elm_access_eo.h \
 lib/elementary/elm_actionslider_eo.h \
 lib/elementary/elm_atspi_app_object_eo.h \
 lib/elementary/elm_atspi_bridge_eo.h \
+lib/elementary/elm_atspi_ewk_wrapper_eo.h \
 lib/elementary/elm_box_eo.h \
 lib/elementary/elm_bubble_eo.h \
 lib/elementary/elm_calendar_eo.h \
@@ -776,7 +779,6 @@ includesunstable_HEADERS = \
        lib/elementary/efl_ui_widget_pan.h \
        lib/elementary/efl_ui_nstate_private.h \
        lib/elementary/Efl_Ui.h \
-       lib/elementary/elm_atspi_ewk_wrapper.h \
        lib/elementary/efl_access_legacy.h \
        lib/elementary/efl_ui_widget_pager.h \
        lib/elementary/efl_page_transition.h \
@@ -826,6 +828,7 @@ includesub_HEADERS = \
        lib/elementary/elm_app.h \
        lib/elementary/elm_atspi_app_object.h \
        lib/elementary/elm_atspi_bridge.h \
+       lib/elementary/elm_atspi_ewk_wrapper.h \
         lib/elementary/elm_atspi_proxy.h \
        lib/elementary/elm_authors.h \
        lib/elementary/elm_bg.h \

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper.c b/src/lib/elementary/elm_atspi_ewk_wrapper.c
index 5c9fc43..d5e4e5e 100644 (file)
--- a/src/lib/elementary/elm_atspi_ewk_wrapper.c
+++ b/src/lib/elementary/elm_atspi_ewk_wrapper.c
@@ -212,4 +212,4 @@ _elm_atspi_ewk_wrapper_ewk_view_get(const Eo *obj EINA_UNUSED, Elm_Atspi_Ewk_Wra
 }
 
 
-#include "elm_atspi_ewk_wrapper.eo.c"
+#include "elm_atspi_ewk_wrapper_eo.c"

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper.eo b/src/lib/elementary/elm_atspi_ewk_wrapper.eo
deleted file mode 100644 (file)
index bb36380..0000000
--- a/src/lib/elementary/elm_atspi_ewk_wrapper.eo
+++ /dev/null
@@ -1,35 +0,0 @@
-class Elm.Atspi.Ewk_Wrapper extends Efl.Object implements Efl.Access.Object, Efl.Access.Component
-{
-   data: Elm_Atspi_Ewk_Wrapper_Data;
-   eo_prefix: elm_atspi_ewk_wrapper;
-   methods {
-      ewk_constructor {
-         params {
-             @in ewk: Efl.Object;
-         }
-      }
-      connection_init {
-      }
-      @property ewk_view {
-           get {
-           }
-           values {
-                ewk: Efl.Object;
-           }
-      }
-      a11y_init @class {
-            params {
-                @in parent: Efl.Object;
-                @in ewk: Efl.Object;
-            }
-      }
-   }
-   constructors {
-      .ewk_constructor;
-   }
-   implements {
-      Efl.Object.destructor;
-      Efl.Access.Object.access_children { get; }
-      Efl.Access.Component.accessible_at_point_get;
-   }
-}

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper.h b/src/lib/elementary/elm_atspi_ewk_wrapper.h
index 03ffe2a..0bebd75 100644 (file)
--- a/src/lib/elementary/elm_atspi_ewk_wrapper.h
+++ b/src/lib/elementary/elm_atspi_ewk_wrapper.h
@@ -1,8 +1,3 @@
-#ifdef EFL_BETA_API_SUPPORT
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_atspi_ewk_wrapper.eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
-#include "elm_atspi_ewk_wrapper.eo.legacy.h"
-#endif
+#include "elm_atspi_ewk_wrapper_eo.legacy.h"
 #endif

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper_eo.c b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.c
new file mode 100644 (file)
index 0000000..eff02ac
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.c
@@ -0,0 +1,73 @@
+
+void _elm_atspi_ewk_wrapper_ewk_constructor(Eo *obj, Elm_Atspi_Ewk_Wrapper_Data *pd, Efl_Object *ewk);
+
+EOAPI EFL_VOID_FUNC_BODYV(elm_obj_atspi_ewk_wrapper_ewk_constructor, EFL_FUNC_CALL(ewk), Efl_Object *ewk);
+
+void _elm_atspi_ewk_wrapper_connection_init(Eo *obj, Elm_Atspi_Ewk_Wrapper_Data *pd);
+
+EOAPI EFL_VOID_FUNC_BODY(elm_obj_atspi_ewk_wrapper_connection_init);
+
+Efl_Object *_elm_atspi_ewk_wrapper_ewk_view_get(const Eo *obj, Elm_Atspi_Ewk_Wrapper_Data *pd);
+
+EOAPI EFL_FUNC_BODY_CONST(elm_obj_atspi_ewk_wrapper_ewk_view_get, Efl_Object *, NULL);
+
+void _elm_atspi_ewk_wrapper_a11y_init(Efl_Object *parent, Efl_Object *ewk);
+
+EOAPI void elm_obj_atspi_ewk_wrapper_a11y_init(Efl_Object *parent, Efl_Object *ewk)
+{
+   elm_atspi_ewk_wrapper_class_get();
+   _elm_atspi_ewk_wrapper_a11y_init(parent, ewk);
+}
+EOAPI void elm_atspi_ewk_wrapper_a11y_init(Efl_Object *parent, Efl_Object *ewk)
+{
+   elm_atspi_ewk_wrapper_class_get();
+   _elm_atspi_ewk_wrapper_a11y_init(parent, ewk);
+}
+
+void _elm_atspi_ewk_wrapper_efl_object_destructor(Eo *obj, Elm_Atspi_Ewk_Wrapper_Data *pd);
+
+
+Eina_List *_elm_atspi_ewk_wrapper_efl_access_object_access_children_get(const Eo *obj, Elm_Atspi_Ewk_Wrapper_Data *pd);
+
+
+Efl_Object *_elm_atspi_ewk_wrapper_efl_access_component_accessible_at_point_get(Eo *obj, Elm_Atspi_Ewk_Wrapper_Data *pd, Eina_Bool screen_coords, int x, int y);
+
+
+static Eina_Bool
+_elm_atspi_ewk_wrapper_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef ELM_ATSPI_EWK_WRAPPER_EXTRA_OPS
+#define ELM_ATSPI_EWK_WRAPPER_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_ewk_wrapper_ewk_constructor, _elm_atspi_ewk_wrapper_ewk_constructor),
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_ewk_wrapper_connection_init, _elm_atspi_ewk_wrapper_connection_init),
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_ewk_wrapper_ewk_view_get, _elm_atspi_ewk_wrapper_ewk_view_get),
+      EFL_OBJECT_OP_FUNC(efl_destructor, _elm_atspi_ewk_wrapper_efl_object_destructor),
+      EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_atspi_ewk_wrapper_efl_access_object_access_children_get),
+      EFL_OBJECT_OP_FUNC(efl_access_component_accessible_at_point_get, _elm_atspi_ewk_wrapper_efl_access_component_accessible_at_point_get),
+      ELM_ATSPI_EWK_WRAPPER_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _elm_atspi_ewk_wrapper_class_desc = {
+   EO_VERSION,
+   "Elm.Atspi.Ewk_Wrapper",
+   EFL_CLASS_TYPE_REGULAR,
+   sizeof(Elm_Atspi_Ewk_Wrapper_Data),
+   _elm_atspi_ewk_wrapper_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(elm_atspi_ewk_wrapper_class_get, &_elm_atspi_ewk_wrapper_class_desc, EFL_OBJECT_CLASS, EFL_ACCESS_OBJECT_MIXIN, EFL_ACCESS_COMPONENT_MIXIN, NULL);
+
+#include "elm_atspi_ewk_wrapper_eo.legacy.c"

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper_eo.h b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.h
new file mode 100644 (file)
index 0000000..c1d7a2a
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.h
@@ -0,0 +1,28 @@
+#ifndef _ELM_ATSPI_EWK_WRAPPER_EO_H_
+#define _ELM_ATSPI_EWK_WRAPPER_EO_H_
+
+#ifndef _ELM_ATSPI_EWK_WRAPPER_EO_CLASS_TYPE
+#define _ELM_ATSPI_EWK_WRAPPER_EO_CLASS_TYPE
+
+typedef Eo Elm_Atspi_Ewk_Wrapper;
+
+#endif
+
+#ifndef _ELM_ATSPI_EWK_WRAPPER_EO_TYPES
+#define _ELM_ATSPI_EWK_WRAPPER_EO_TYPES
+
+
+#endif
+#define ELM_ATSPI_EWK_WRAPPER_CLASS elm_atspi_ewk_wrapper_class_get()
+
+EWAPI const Efl_Class *elm_atspi_ewk_wrapper_class_get(void);
+
+EOAPI void elm_obj_atspi_ewk_wrapper_ewk_constructor(Eo *obj, Efl_Object *ewk);
+
+EOAPI void elm_obj_atspi_ewk_wrapper_connection_init(Eo *obj);
+
+EOAPI Efl_Object *elm_obj_atspi_ewk_wrapper_ewk_view_get(const Eo *obj);
+
+EOAPI void elm_obj_atspi_ewk_wrapper_a11y_init(Efl_Object *parent, Efl_Object *ewk);
+
+#endif

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.c b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.c
new file mode 100644 (file)
index 0000000..cb91ba1
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.c
@@ -0,0 +1,18 @@
+
+EAPI void
+elm_atspi_ewk_wrapper_ewk_constructor(Elm_Atspi_Ewk_Wrapper *obj, Efl_Object *ewk)
+{
+   elm_obj_atspi_ewk_wrapper_ewk_constructor(obj, ewk);
+}
+
+EAPI void
+elm_atspi_ewk_wrapper_connection_init(Elm_Atspi_Ewk_Wrapper *obj)
+{
+   elm_obj_atspi_ewk_wrapper_connection_init(obj);
+}
+
+EAPI Efl_Object *
+elm_atspi_ewk_wrapper_ewk_view_get(const Elm_Atspi_Ewk_Wrapper *obj)
+{
+   return elm_obj_atspi_ewk_wrapper_ewk_view_get(obj);
+}

diff --git a/src/lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.h b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.h
new file mode 100644 (file)
index 0000000..1212e0b
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_ewk_wrapper_eo.legacy.h
@@ -0,0 +1,25 @@
+#ifndef _ELM_ATSPI_EWK_WRAPPER_EO_LEGACY_H_
+#define _ELM_ATSPI_EWK_WRAPPER_EO_LEGACY_H_
+
+#ifndef _ELM_ATSPI_EWK_WRAPPER_EO_CLASS_TYPE
+#define _ELM_ATSPI_EWK_WRAPPER_EO_CLASS_TYPE
+
+typedef Eo Elm_Atspi_Ewk_Wrapper;
+
+#endif
+
+#ifndef _ELM_ATSPI_EWK_WRAPPER_EO_TYPES
+#define _ELM_ATSPI_EWK_WRAPPER_EO_TYPES
+
+
+#endif
+
+EAPI void elm_atspi_ewk_wrapper_ewk_constructor(Elm_Atspi_Ewk_Wrapper *obj, Efl_Object *ewk);
+
+EAPI void elm_atspi_ewk_wrapper_connection_init(Elm_Atspi_Ewk_Wrapper *obj);
+
+EAPI Efl_Object *elm_atspi_ewk_wrapper_ewk_view_get(const Elm_Atspi_Ewk_Wrapper *obj);
+
+EAPI void elm_atspi_ewk_wrapper_a11y_init(Efl_Object *parent, Efl_Object *ewk);
+
+#endif

diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 37d0a79..c59b3a1 100644 (file)
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -72,6 +72,7 @@
 #include "elm_actionslider_eo.h"
 #include "elm_atspi_app_object_eo.h"
 #include "elm_atspi_bridge_eo.h"
+#include "elm_atspi_ewk_wrapper_eo.h"
 #include "elm_box_eo.h"
 #include "elm_bubble_eo.h"
 #include "elm_calendar_eo.h"

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 0f94ff3..9f849da 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -417,6 +417,8 @@ elementary_pub_headers = [
   'elm_atspi_app_object_eo.legacy.h',
   'elm_atspi_bridge.h',
   'elm_atspi_bridge_eo.legacy.h',
+  'elm_atspi_ewk_wrapper.h',
+  'elm_atspi_ewk_wrapper_eo.legacy.h',
   'elm_authors.h',
   'elm_bg.h',
   'elm_bg_legacy.h',
@@ -743,6 +745,7 @@ elementary_src = [
   'elm_actionslider.c',
   'elm_atspi_app_object.c',
   'elm_atspi_bridge.c',
+  'elm_atspi_ewk_wrapper.c',
   'efl_ui_legacy.c',
   'efl_ui_bg.c',
   'elm_box.c',