efl_ui_progressbar: 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

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8144

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 1f22579..21d7d5d 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -200,7 +200,6 @@ elm_legacy_eolian_files = \
        lib/elementary/efl_ui_radio_legacy.eo \
        lib/elementary/efl_ui_video_legacy.eo \
        lib/elementary/efl_ui_win_legacy.eo \
-       lib/elementary/efl_ui_progressbar_legacy.eo \
        lib/elementary/efl_ui_clock_legacy.eo \
        lib/elementary/elm_code_widget_legacy.eo \
        lib/elementary/efl_ui_win_socket_legacy.eo \
@@ -339,6 +338,7 @@ lib/elementary/efl_ui_image_zoomable_legacy_eo.c \
 lib/elementary/efl_ui_layout_legacy_eo.c \
 lib/elementary/efl_ui_panes_eo.legacy.c \
 lib/elementary/efl_ui_panes_legacy_eo.c \
+lib/elementary/efl_ui_progressbar_legacy_eo.c \
 lib/elementary/elm_hoversel_eo.c \
 lib/elementary/elm_hoversel_eo.legacy.c \
 lib/elementary/elm_hoversel_item_eo.c \
@@ -370,6 +370,8 @@ lib/elementary/efl_ui_layout_legacy_eo.legacy.h \
 lib/elementary/efl_ui_panes_eo.legacy.h \
 lib/elementary/efl_ui_panes_legacy_eo.h \
 lib/elementary/efl_ui_panes_legacy_eo.legacy.h \
+lib/elementary/efl_ui_progressbar_legacy_eo.h \
+lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h \
 lib/elementary/elm_hoversel_eo.h \
 lib/elementary/elm_hoversel_eo.legacy.h \
 lib/elementary/elm_hoversel_item_eo.h \

diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 6298ce9..534f473 100644 (file)
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -830,7 +830,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
 
 #include "efl_ui_progressbar.eo.c"
 
-#include "efl_ui_progressbar_legacy.eo.h"
+#include "efl_ui_progressbar_legacy_eo.h"
 #include "efl_ui_progressbar_legacy_part.eo.h"
 
 #define MY_CLASS_NAME_LEGACY "elm_progressbar"
@@ -1102,4 +1102,4 @@ elm_progressbar_value_get(const Evas_Object *obj)
    return efl_ui_range_value_get(obj);
 }
 
-#include "efl_ui_progressbar_legacy.eo.c"
+#include "efl_ui_progressbar_legacy_eo.c"

diff --git a/src/lib/elementary/efl_ui_progressbar_legacy.eo b/src/lib/elementary/efl_ui_progressbar_legacy.eo
deleted file mode 100644 (file)
index a59f334..0000000
--- a/src/lib/elementary/efl_ui_progressbar_legacy.eo
+++ /dev/null
@@ -1,12 +0,0 @@
-class @beta Efl.Ui.Progressbar_Legacy extends Efl.Ui.Progressbar implements Efl.Ui.Legacy
-{
-   [[Elementary progressbar class]]
-   data: null;
-   implements {
-      class.constructor;
-      Efl.Object.constructor;
-      Efl.Ui.Widget.theme_apply;
-      Efl.Ui.Widget.widget_sub_object_del;
-      Efl.Part.part_get;
-   }
-}

diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_eo.c b/src/lib/elementary/efl_ui_progressbar_legacy_eo.c
new file mode 100644 (file)
index 0000000..8b32d45
--- /dev/null
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_eo.c
@@ -0,0 +1,47 @@
+
+Efl_Object *_efl_ui_progressbar_legacy_efl_object_constructor(Eo *obj, void *pd);
+
+
+Eina_Error _efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *pd);
+
+
+Eina_Bool _efl_ui_progressbar_legacy_efl_ui_widget_widget_sub_object_del(Eo *obj, void *pd, Efl_Canvas_Object *sub_obj);
+
+
+Efl_Object *_efl_ui_progressbar_legacy_efl_part_part_get(const Eo *obj, void *pd, const char *name);
+
+
+static Eina_Bool
+_efl_ui_progressbar_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_PROGRESSBAR_LEGACY_EXTRA_OPS
+#define EFL_UI_PROGRESSBAR_LEGACY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_progressbar_legacy_efl_object_constructor),
+      EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _efl_ui_progressbar_legacy_efl_ui_widget_theme_apply),
+      EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _efl_ui_progressbar_legacy_efl_ui_widget_widget_sub_object_del),
+      EFL_OBJECT_OP_FUNC(efl_part_get, _efl_ui_progressbar_legacy_efl_part_part_get),
+      EFL_UI_PROGRESSBAR_LEGACY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_progressbar_legacy_class_desc = {
+   EO_VERSION,
+   "Efl.Ui.Progressbar_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _efl_ui_progressbar_legacy_class_initializer,
+   _efl_ui_progressbar_legacy_class_constructor,
+   NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_progressbar_legacy_class_get, &_efl_ui_progressbar_legacy_class_desc, EFL_UI_PROGRESSBAR_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_eo.h b/src/lib/elementary/efl_ui_progressbar_legacy_eo.h
new file mode 100644 (file)
index 0000000..00807e3
--- /dev/null
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_eo.h
@@ -0,0 +1,26 @@
+#ifndef _EFL_UI_PROGRESSBAR_LEGACY_EO_H_
+#define _EFL_UI_PROGRESSBAR_LEGACY_EO_H_
+
+#ifndef _EFL_UI_PROGRESSBAR_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_PROGRESSBAR_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Progressbar_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_PROGRESSBAR_LEGACY_EO_TYPES
+#define _EFL_UI_PROGRESSBAR_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/** Elementary progressbar class
+ *
+ * @ingroup Efl_Ui_Progressbar_Legacy
+ */
+#define EFL_UI_PROGRESSBAR_LEGACY_CLASS efl_ui_progressbar_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_progressbar_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif

diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h
new file mode 100644 (file)
index 0000000..2e7912d
--- /dev/null
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_PROGRESSBAR_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_PROGRESSBAR_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_PROGRESSBAR_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_PROGRESSBAR_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Progressbar_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_PROGRESSBAR_LEGACY_EO_TYPES
+#define _EFL_UI_PROGRESSBAR_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 0b3ed6f..0fc69f8 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -2,7 +2,6 @@ pub_legacy_eo_files = [
   'efl_ui_radio_legacy.eo',
   'efl_ui_video_legacy.eo',
   'efl_ui_win_legacy.eo',
-  'efl_ui_progressbar_legacy.eo',
   'efl_ui_clock_legacy.eo',
   'elm_code_widget_legacy.eo',
   'efl_ui_win_socket_legacy.eo',
@@ -831,6 +830,8 @@ elementary_pub_headers = [
   'efl_ui_panes_eo.legacy.h',
   'efl_ui_panes_legacy_eo.h',
   'efl_ui_panes_legacy_eo.legacy.h',
+  'efl_ui_progressbar_legacy_eo.h',
+  'efl_ui_progressbar_legacy_eo.legacy.h',
   'elm_hoversel_eo.h',
   'elm_hoversel_eo.legacy.h',
   'elm_hoversel_item_eo.h',