cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e6cab273ee699bd752977a573725fcbf77e40ceb
commit e6cab273ee699bd752977a573725fcbf77e40ceb
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Tue Mar 5 17:00:37 2019 -0500
elm_check: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in
evas 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.b...@free.fr>
Differential Revision: https://phab.enlightenment.org/D8136
---
src/Makefile_Elementary.am | 5 ++-
src/lib/elementary/efl_ui_check.c | 5 ++-
src/lib/elementary/efl_ui_check.eo | 1 -
src/lib/elementary/efl_ui_check_eo.legacy.c | 12 ++++++
src/lib/elementary/efl_ui_check_eo.legacy.h | 38 +++++++++++++++++
src/lib/elementary/efl_ui_check_legacy.eo | 18 ---------
src/lib/elementary/efl_ui_check_legacy_eo.c | 47 ++++++++++++++++++++++
src/lib/elementary/efl_ui_check_legacy_eo.h | 32 +++++++++++++++
src/lib/elementary/efl_ui_check_legacy_eo.legacy.h | 17 ++++++++
src/lib/elementary/elm_check_legacy.h | 2 +-
src/lib/elementary/meson.build | 4 +-
11 files changed, 157 insertions(+), 24 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 8261eb6da8..1c083112c9 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -186,7 +186,6 @@ elm_private_eolian_files = \
# Legacy classes - not part of public EO API
elm_legacy_eolian_files = \
- lib/elementary/efl_ui_check_legacy.eo \
lib/elementary/efl_ui_radio_legacy.eo \
lib/elementary/efl_ui_video_legacy.eo \
lib/elementary/efl_ui_frame_legacy.eo \
@@ -325,6 +324,7 @@ noinst_DATA += $(elm_legacy_eolian_eo_h)
elm_legacy_eo_files = \
lib/elementary/efl_ui_bg_legacy_eo.c \
lib/elementary/efl_ui_button_legacy_eo.c \
+lib/elementary/efl_ui_check_legacy_eo.c \
lib/elementary/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@@ -337,6 +337,9 @@ lib/elementary/efl_ui_bg_legacy_eo.legacy.h \
lib/elementary/efl_ui_button_eo.legacy.h \
lib/elementary/efl_ui_button_legacy_eo.h \
lib/elementary/efl_ui_button_legacy_eo.legacy.h \
+lib/elementary/efl_ui_check_eo.legacy.h \
+lib/elementary/efl_ui_check_legacy_eo.h \
+lib/elementary/efl_ui_check_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_check.c
b/src/lib/elementary/efl_ui_check.c
index 488672a9a7..6056e5c572 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -448,8 +448,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_check.eo.c"
+#include "efl_ui_check_eo.legacy.c"
-#include "efl_ui_check_legacy.eo.h"
+#include "efl_ui_check_legacy_eo.h"
#include "efl_ui_check_legacy_part.eo.h"
#define MY_CLASS_NAME_LEGACY "elm_check"
@@ -557,4 +558,4 @@ elm_check_add(Evas_Object *parent)
return elm_legacy_add(EFL_UI_CHECK_LEGACY_CLASS, parent);
}
-#include "efl_ui_check_legacy.eo.c"
+#include "efl_ui_check_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_check.eo
b/src/lib/elementary/efl_ui_check.eo
index 4819c9b9ea..5bd3d187e1 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -7,7 +7,6 @@ class @beta Efl.Ui.Check extends Efl.Ui.Nstate implements
Efl.Access.Widget.Acti
except they do not work as a group, but independently, and only toggle
the value of a boolean between false and true.
]]
- legacy_prefix: elm_check;
methods {
@property selected {
[[The on/off state of the check object.]]
diff --git a/src/lib/elementary/efl_ui_check_eo.legacy.c
b/src/lib/elementary/efl_ui_check_eo.legacy.c
new file mode 100644
index 0000000000..ea58cc9249
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_eo.legacy.c
@@ -0,0 +1,12 @@
+
+EAPI void
+elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value)
+{
+ efl_ui_check_selected_set(obj, value);
+}
+
+EAPI Eina_Bool
+elm_check_selected_get(const Efl_Ui_Check *obj)
+{
+ return efl_ui_check_selected_get(obj);
+}
diff --git a/src/lib/elementary/efl_ui_check_eo.legacy.h
b/src/lib/elementary/efl_ui_check_eo.legacy.h
new file mode 100644
index 0000000000..5b3ade3f2f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_eo.legacy.h
@@ -0,0 +1,38 @@
+#ifndef _EFL_UI_CHECK_EO_LEGACY_H_
+#define _EFL_UI_CHECK_EO_LEGACY_H_
+
+#ifndef _EFL_UI_CHECK_EO_CLASS_TYPE
+#define _EFL_UI_CHECK_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Check;
+
+#endif
+
+#ifndef _EFL_UI_CHECK_EO_TYPES
+#define _EFL_UI_CHECK_EO_TYPES
+
+
+#endif
+
+/**
+ * @brief The on/off state of the check object.
+ *
+ * @param[in] obj The object.
+ * @param[in] value @c true if the check object is selected, @c false otherwise
+ *
+ * @ingroup Elm_Check_Group
+ */
+EAPI void elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value);
+
+/**
+ * @brief The on/off state of the check object.
+ *
+ * @param[in] obj The object.
+ *
+ * @return @c true if the check object is selected, @c false otherwise
+ *
+ * @ingroup Elm_Check_Group
+ */
+EAPI Eina_Bool elm_check_selected_get(const Efl_Ui_Check *obj);
+
+#endif
diff --git a/src/lib/elementary/efl_ui_check_legacy.eo
b/src/lib/elementary/efl_ui_check_legacy.eo
deleted file mode 100644
index f16ded2435..0000000000
--- a/src/lib/elementary/efl_ui_check_legacy.eo
+++ /dev/null
@@ -1,18 +0,0 @@
-class @beta Efl.Ui.Check_Legacy extends Efl.Ui.Check implements Efl.Ui.Legacy
-{
- [[Check widget
-
- The check widget allows for toggling a value between true and false.
- Check objects are a lot like radio objects in layout and functionality,
- except they do not work as a group, but independently, and only toggle
- the value of a boolean between false and true.
- ]]
- 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_check_legacy_eo.c
b/src/lib/elementary/efl_ui_check_legacy_eo.c
new file mode 100644
index 0000000000..cd1d466ee9
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.c
@@ -0,0 +1,47 @@
+
+Efl_Object *_efl_ui_check_legacy_efl_object_constructor(Eo *obj, void *pd);
+
+
+Eina_Error _efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *pd);
+
+
+Eina_Bool _efl_ui_check_legacy_efl_ui_widget_widget_sub_object_del(Eo *obj,
void *pd, Efl_Canvas_Object *sub_obj);
+
+
+Efl_Object *_efl_ui_check_legacy_efl_part_part_get(const Eo *obj, void *pd,
const char *name);
+
+
+static Eina_Bool
+_efl_ui_check_legacy_class_initializer(Efl_Class *klass)
+{
+ const Efl_Object_Ops *opsp = NULL;
+
+ const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_CHECK_LEGACY_EXTRA_OPS
+#define EFL_UI_CHECK_LEGACY_EXTRA_OPS
+#endif
+
+ EFL_OPS_DEFINE(ops,
+ EFL_OBJECT_OP_FUNC(efl_constructor,
_efl_ui_check_legacy_efl_object_constructor),
+ EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply,
_efl_ui_check_legacy_efl_ui_widget_theme_apply),
+ EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del,
_efl_ui_check_legacy_efl_ui_widget_widget_sub_object_del),
+ EFL_OBJECT_OP_FUNC(efl_part_get, _efl_ui_check_legacy_efl_part_part_get),
+ EFL_UI_CHECK_LEGACY_EXTRA_OPS
+ );
+ opsp = &ops;
+
+ return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_check_legacy_class_desc = {
+ EO_VERSION,
+ "Efl.Ui.Check_Legacy",
+ EFL_CLASS_TYPE_REGULAR,
+ 0,
+ _efl_ui_check_legacy_class_initializer,
+ _efl_ui_check_legacy_class_constructor,
+ NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_check_legacy_class_get,
&_efl_ui_check_legacy_class_desc, EFL_UI_CHECK_CLASS, EFL_UI_LEGACY_INTERFACE,
NULL);
diff --git a/src/lib/elementary/efl_ui_check_legacy_eo.h
b/src/lib/elementary/efl_ui_check_legacy_eo.h
new file mode 100644
index 0000000000..a8fb7f50e6
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.h
@@ -0,0 +1,32 @@
+#ifndef _EFL_UI_CHECK_LEGACY_EO_H_
+#define _EFL_UI_CHECK_LEGACY_EO_H_
+
+#ifndef _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Check_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_CHECK_LEGACY_EO_TYPES
+#define _EFL_UI_CHECK_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/**
+ * @brief Check widget
+ *
+ * The check widget allows for toggling a value between true and false. Check
+ * objects are a lot like radio objects in layout and functionality, except
+ * they do not work as a group, but independently, and only toggle the value of
+ * a boolean between false and true.
+ *
+ * @ingroup Efl_Ui_Check_Legacy
+ */
+#define EFL_UI_CHECK_LEGACY_CLASS efl_ui_check_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_check_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif
diff --git a/src/lib/elementary/efl_ui_check_legacy_eo.legacy.h
b/src/lib/elementary/efl_ui_check_legacy_eo.legacy.h
new file mode 100644
index 0000000000..efe4b009b3
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_CHECK_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_CHECK_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Check_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_CHECK_LEGACY_EO_TYPES
+#define _EFL_UI_CHECK_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/elm_check_legacy.h
b/src/lib/elementary/elm_check_legacy.h
index e5c702770a..b4192e74e4 100644
--- a/src/lib/elementary/elm_check_legacy.h
+++ b/src/lib/elementary/elm_check_legacy.h
@@ -52,5 +52,5 @@ EAPI void
elm_check_state_set(Evas_Object *obj, Eina_Bool
EAPI void elm_check_state_pointer_set(Evas_Object *obj,
Eina_Bool *statep);
#ifdef EFL_EO_API_SUPPORT
-# include "efl_ui_check.eo.legacy.h"
+# include "efl_ui_check_eo.legacy.h"
#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 0511104fdb..1d3a51c36b 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1,5 +1,4 @@
pub_legacy_eo_files = [
- 'efl_ui_check_legacy.eo',
'efl_ui_radio_legacy.eo',
'efl_ui_video_legacy.eo',
'efl_ui_frame_legacy.eo',
@@ -699,6 +698,9 @@ elementary_pub_headers = [
'efl_ui_button_eo.legacy.h',
'efl_ui_button_legacy_eo.h',
'efl_ui_button_legacy_eo.legacy.h',
+ 'efl_ui_check_eo.legacy.h',
+ 'efl_ui_check_legacy_eo.h',
+ 'efl_ui_check_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',
--
