elm_atspi_proxy: 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: Id177e3e193589e8147c97ee14d5b5311e6ec6604

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 0ea75e3..5d94090 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_proxy.eo \
        lib/elementary/efl_ui_image_zoomable_pan.eo \
        $(NULL)
 
@@ -268,6 +267,7 @@ 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_atspi_proxy_eo.c \
 lib/elementary/elm_box_eo.c \
 lib/elementary/elm_box_eo.legacy.c \
 lib/elementary/elm_bubble_eo.c \
@@ -449,6 +449,7 @@ 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_atspi_proxy_eo.legacy.h \
 lib/elementary/elm_box_eo.legacy.h \
 lib/elementary/elm_bubble_eo.legacy.h \
 lib/elementary/elm_calendar_eo.legacy.h \
@@ -560,6 +561,7 @@ 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_atspi_proxy_eo.h \
 lib/elementary/elm_box_eo.h \
 lib/elementary/elm_bubble_eo.h \
 lib/elementary/elm_calendar_eo.h \
@@ -829,7 +831,7 @@ includesub_HEADERS = \
        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_atspi_proxy.h \
        lib/elementary/elm_authors.h \
        lib/elementary/elm_bg.h \
        lib/elementary/elm_bg_legacy.h \

diff --git a/src/lib/elementary/elm_atspi_proxy.c b/src/lib/elementary/elm_atspi_proxy.c
index b9bb38f..91f077f 100644 (file)
--- a/src/lib/elementary/elm_atspi_proxy.c
+++ b/src/lib/elementary/elm_atspi_proxy.c
@@ -166,4 +166,4 @@ _elm_atspi_proxy_efl_ui_widget_atspi(Eo *obj, Elm_Atspi_Proxy_Data *_pd, Eina_Bo
      }
 }
 
-#include "elm_atspi_proxy.eo.c"
+#include "elm_atspi_proxy_eo.c"

diff --git a/src/lib/elementary/elm_atspi_proxy.eo b/src/lib/elementary/elm_atspi_proxy.eo
deleted file mode 100644 (file)
index c1d27d0..0000000
--- a/src/lib/elementary/elm_atspi_proxy.eo
+++ /dev/null
@@ -1,51 +0,0 @@
-enum Elm.Atspi.Proxy_Type
-{
-   SOCKET,
-   PLUG
-}
-
-class Elm.Atspi.Proxy extends Efl.Ui.Widget
-{
-   eo_prefix: elm_obj_atspi_proxy;
-   event_prefix: elm_atspi_proxy;
-   data: Elm_Atspi_Proxy_Data;
-   methods {
-      ctor {
-         [[ No description supplied by the EAPI.]]
-         params {
-            @in type: Elm.Atspi.Proxy_Type;
-         }
-      }
-      @property address {
-         set {
-         }
-         get {
-         }
-         values {
-            bus: string;
-            path: string;
-         }
-      }
-      @property type {
-         get {
-         }
-         values {
-            ret:Elm.Atspi.Proxy_Type;
-         }
-      }
-      address_get_retry_timer_add {
-      }
-   }
-   constructors {
-      .ctor;
-   }
-   implements {
-      Efl.Object.destructor;
-      Efl.Access.Object.access_children { get; }
-      Efl.Ui.Widget.atspi;
-   }
-   events {
-      connected: void;
-      disconnected: void;
-   }
-}

diff --git a/src/lib/elementary/elm_atspi_proxy.h b/src/lib/elementary/elm_atspi_proxy.h
index e062580..c0d85aa 100644 (file)
--- a/src/lib/elementary/elm_atspi_proxy.h
+++ b/src/lib/elementary/elm_atspi_proxy.h
@@ -1,7 +1,3 @@
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_atspi_proxy.eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
-#include "elm_atspi_proxy.eo.legacy.h"
+#include "elm_atspi_proxy_eo.legacy.h"
 #endif
-

diff --git a/src/lib/elementary/elm_atspi_proxy_eo.c b/src/lib/elementary/elm_atspi_proxy_eo.c
new file mode 100644 (file)
index 0000000..9d6b2a6
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_proxy_eo.c
@@ -0,0 +1,72 @@
+EWAPI const Efl_Event_Description _ELM_ATSPI_PROXY_EVENT_CONNECTED =
+   EFL_EVENT_DESCRIPTION("connected");
+EWAPI const Efl_Event_Description _ELM_ATSPI_PROXY_EVENT_DISCONNECTED =
+   EFL_EVENT_DESCRIPTION("disconnected");
+
+void _elm_atspi_proxy_ctor(Eo *obj, Elm_Atspi_Proxy_Data *pd, Elm_Atspi_Proxy_Type type);
+
+EOAPI EFL_VOID_FUNC_BODYV(elm_obj_atspi_proxy_ctor, EFL_FUNC_CALL(type), Elm_Atspi_Proxy_Type type);
+
+void _elm_atspi_proxy_address_set(Eo *obj, Elm_Atspi_Proxy_Data *pd, const char *bus, const char *path);
+
+EOAPI EFL_VOID_FUNC_BODYV(elm_obj_atspi_proxy_address_set, EFL_FUNC_CALL(bus, path), const char *bus, const char *path);
+
+void _elm_atspi_proxy_address_get(const Eo *obj, Elm_Atspi_Proxy_Data *pd, const char **bus, const char **path);
+
+EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_atspi_proxy_address_get, EFL_FUNC_CALL(bus, path), const char **bus, const char **path);
+
+Elm_Atspi_Proxy_Type _elm_atspi_proxy_type_get(const Eo *obj, Elm_Atspi_Proxy_Data *pd);
+
+EOAPI EFL_FUNC_BODY_CONST(elm_obj_atspi_proxy_type_get, Elm_Atspi_Proxy_Type, 0);
+
+void _elm_atspi_proxy_address_get_retry_timer_add(Eo *obj, Elm_Atspi_Proxy_Data *pd);
+
+EOAPI EFL_VOID_FUNC_BODY(elm_obj_atspi_proxy_address_get_retry_timer_add);
+
+void _elm_atspi_proxy_efl_object_destructor(Eo *obj, Elm_Atspi_Proxy_Data *pd);
+
+
+Eina_List *_elm_atspi_proxy_efl_access_object_access_children_get(const Eo *obj, Elm_Atspi_Proxy_Data *pd);
+
+
+void _elm_atspi_proxy_efl_ui_widget_atspi(Eo *obj, Elm_Atspi_Proxy_Data *pd, Eina_Bool is_atspi);
+
+
+static Eina_Bool
+_elm_atspi_proxy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef ELM_ATSPI_PROXY_EXTRA_OPS
+#define ELM_ATSPI_PROXY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_proxy_ctor, _elm_atspi_proxy_ctor),
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_proxy_address_set, _elm_atspi_proxy_address_set),
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_proxy_address_get, _elm_atspi_proxy_address_get),
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_proxy_type_get, _elm_atspi_proxy_type_get),
+      EFL_OBJECT_OP_FUNC(elm_obj_atspi_proxy_address_get_retry_timer_add, _elm_atspi_proxy_address_get_retry_timer_add),
+      EFL_OBJECT_OP_FUNC(efl_destructor, _elm_atspi_proxy_efl_object_destructor),
+      EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_atspi_proxy_efl_access_object_access_children_get),
+      EFL_OBJECT_OP_FUNC(efl_ui_widget_atspi, _elm_atspi_proxy_efl_ui_widget_atspi),
+      ELM_ATSPI_PROXY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _elm_atspi_proxy_class_desc = {
+   EO_VERSION,
+   "Elm.Atspi.Proxy",
+   EFL_CLASS_TYPE_REGULAR,
+   sizeof(Elm_Atspi_Proxy_Data),
+   _elm_atspi_proxy_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(elm_atspi_proxy_class_get, &_elm_atspi_proxy_class_desc, EFL_UI_WIDGET_CLASS, NULL);

diff --git a/src/lib/elementary/elm_atspi_proxy_eo.h b/src/lib/elementary/elm_atspi_proxy_eo.h
new file mode 100644 (file)
index 0000000..69247c1
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_proxy_eo.h
@@ -0,0 +1,58 @@
+#ifndef _ELM_ATSPI_PROXY_EO_H_
+#define _ELM_ATSPI_PROXY_EO_H_
+
+#ifndef _ELM_ATSPI_PROXY_EO_CLASS_TYPE
+#define _ELM_ATSPI_PROXY_EO_CLASS_TYPE
+
+typedef Eo Elm_Atspi_Proxy;
+
+#endif
+
+#ifndef _ELM_ATSPI_PROXY_EO_TYPES
+#define _ELM_ATSPI_PROXY_EO_TYPES
+
+typedef enum
+{
+  ELM_ATSPI_PROXY_TYPE_SOCKET = 0,
+  ELM_ATSPI_PROXY_TYPE_PLUG
+} Elm_Atspi_Proxy_Type;
+
+
+#endif
+#define ELM_ATSPI_PROXY_CLASS elm_atspi_proxy_class_get()
+
+EWAPI const Efl_Class *elm_atspi_proxy_class_get(void);
+
+/**
+ * @brief No description supplied by the EAPI.
+ *
+ * @param[in] obj The object.
+ * @param[in] type
+ *
+ * @ingroup Elm_Atspi_Proxy
+ */
+EOAPI void elm_obj_atspi_proxy_ctor(Eo *obj, Elm_Atspi_Proxy_Type type);
+
+EOAPI void elm_obj_atspi_proxy_address_set(Eo *obj, const char *bus, const char *path);
+
+EOAPI void elm_obj_atspi_proxy_address_get(const Eo *obj, const char **bus, const char **path);
+
+EOAPI Elm_Atspi_Proxy_Type elm_obj_atspi_proxy_type_get(const Eo *obj);
+
+EOAPI void elm_obj_atspi_proxy_address_get_retry_timer_add(Eo *obj);
+
+EWAPI extern const Efl_Event_Description _ELM_ATSPI_PROXY_EVENT_CONNECTED;
+
+/**
+ * No description
+ */
+#define ELM_ATSPI_PROXY_EVENT_CONNECTED (&(_ELM_ATSPI_PROXY_EVENT_CONNECTED))
+
+EWAPI extern const Efl_Event_Description _ELM_ATSPI_PROXY_EVENT_DISCONNECTED;
+
+/**
+ * No description
+ */
+#define ELM_ATSPI_PROXY_EVENT_DISCONNECTED (&(_ELM_ATSPI_PROXY_EVENT_DISCONNECTED))
+
+#endif

diff --git a/src/lib/elementary/elm_atspi_proxy_eo.legacy.h b/src/lib/elementary/elm_atspi_proxy_eo.legacy.h
new file mode 100644 (file)
index 0000000..211657f
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_proxy_eo.legacy.h
@@ -0,0 +1,28 @@
+#ifndef _ELM_ATSPI_PROXY_EO_LEGACY_H_
+#define _ELM_ATSPI_PROXY_EO_LEGACY_H_
+
+#ifndef _ELM_ATSPI_PROXY_EO_CLASS_TYPE
+#define _ELM_ATSPI_PROXY_EO_CLASS_TYPE
+
+typedef Eo Elm_Atspi_Proxy;
+
+#endif
+
+#ifndef _ELM_ATSPI_PROXY_EO_TYPES
+#define _ELM_ATSPI_PROXY_EO_TYPES
+
+typedef enum
+{
+  ELM_ATSPI_PROXY_TYPE_SOCKET = 0,
+  ELM_ATSPI_PROXY_TYPE_PLUG
+} Elm_Atspi_Proxy_Type;
+
+
+#endif
+
+
+
+
+
+
+#endif

diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index c59b3a1..6fb2aa6 100644 (file)
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -73,6 +73,7 @@
 #include "elm_atspi_app_object_eo.h"
 #include "elm_atspi_bridge_eo.h"
 #include "elm_atspi_ewk_wrapper_eo.h"
+#include "elm_atspi_proxy_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 9f849da..c4f790d 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -419,6 +419,8 @@ elementary_pub_headers = [
   'elm_atspi_bridge_eo.legacy.h',
   'elm_atspi_ewk_wrapper.h',
   'elm_atspi_ewk_wrapper_eo.legacy.h',
+  'elm_atspi_proxy.h',
+  'elm_atspi_proxy_eo.legacy.h',
   'elm_authors.h',
   'elm_bg.h',
   'elm_bg_legacy.h',
@@ -746,6 +748,7 @@ elementary_src = [
   'elm_atspi_app_object.c',
   'elm_atspi_bridge.c',
   'elm_atspi_ewk_wrapper.c',
+  'elm_atspi_proxy.c',
   'efl_ui_legacy.c',
   'efl_ui_bg.c',
   'elm_box.c',