elm_code_widget_legacy: 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/D8159

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index ec8c19d..bd546b7 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -197,7 +197,6 @@ endif
 # Legacy classes - not part of public EO API
 elm_legacy_eolian_files = \
        lib/elementary/efl_ui_clock_legacy.eo \
-       lib/elementary/elm_code_widget_legacy.eo \
        lib/elementary/elm_interface_fileselector.eo \
        lib/elementary/efl_ui_animation_view.eo \
        lib/elementary/elm_colorselector.eo \
@@ -350,6 +349,7 @@ lib/elementary/elm_calendar_item_eo.c \
 lib/elementary/elm_clock_eo.c \
 lib/elementary/elm_clock_eo.legacy.c \
 lib/elementary/elm_code_widget_eo.legacy.c \
+lib/elementary/elm_code_widget_legacy_eo.c \
 lib/elementary/elm_hoversel_eo.c \
 lib/elementary/elm_hoversel_item_eo.c \
 lib/elementary/elm_hoversel_item_eo.legacy.c
@@ -413,6 +413,8 @@ lib/elementary/elm_calendar_item_eo.legacy.h \
 lib/elementary/elm_clock_eo.h \
 lib/elementary/elm_clock_eo.legacy.h \
 lib/elementary/elm_code_widget_eo.legacy.h \
+lib/elementary/elm_code_widget_legacy_eo.h \
+lib/elementary/elm_code_widget_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/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c
index 6386e15..5b4e633 100644 (file)
--- a/src/lib/elementary/elm_code_diff_widget.c
+++ b/src/lib/elementary/elm_code_diff_widget.c
@@ -5,7 +5,7 @@
 #include "Elementary.h"
 
 #include "elm_code_private.h"
-#include "elm_code_widget_legacy.eo.h"
+#include "elm_code_widget_legacy_eo.h"
 
 #define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft"
 #define _ELM_CODE_DIFF_WIDGET_RIGHT "diffwidgetright"

diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index ec8a7fb..4456eb4 100644 (file)
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -58,7 +58,7 @@ static Eina_Unicode status_icons[] = {
 
 static void _elm_code_widget_resize(Elm_Code_Widget *widget, Elm_Code_Line *newline);
 
-#include "elm_code_widget_legacy.eo.h"
+#include "elm_code_widget_legacy_eo.h"
 
 EAPI Evas_Object *
 elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
@@ -68,7 +68,7 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
                          efl_ui_code_widget_code_set(efl_added, code));
 }
 
-#include "elm_code_widget_legacy.eo.c"
+#include "elm_code_widget_legacy_eo.c"
 
 EOLIAN static Eo *
 _elm_code_widget_efl_object_constructor(Eo *obj, Elm_Code_Widget_Data *pd)

diff --git a/src/lib/elementary/elm_code_widget_legacy.eo b/src/lib/elementary/elm_code_widget_legacy.eo
deleted file mode 100644 (file)
index 6de8928..0000000
--- a/src/lib/elementary/elm_code_widget_legacy.eo
+++ /dev/null
@@ -1,5 +0,0 @@
-class Elm.Code_Widget_Legacy extends Elm.Code_Widget implements Efl.Ui.Legacy
-{
-   [[Elementary code widget]]
-   data: null;
-}

diff --git a/src/lib/elementary/elm_code_widget_legacy_eo.c b/src/lib/elementary/elm_code_widget_legacy_eo.c
new file mode 100644 (file)
index 0000000..e16bdd1
--- /dev/null
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.c
@@ -0,0 +1,27 @@
+
+static Eina_Bool
+_elm_code_widget_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifdef ELM_CODE_WIDGET_LEGACY_EXTRA_OPS
+   EFL_OPS_DEFINE(ops, ELM_CODE_WIDGET_LEGACY_EXTRA_OPS);
+   opsp = &ops;
+#endif
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _elm_code_widget_legacy_class_desc = {
+   EO_VERSION,
+   "Elm.Code_Widget_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _elm_code_widget_legacy_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(elm_code_widget_legacy_class_get, &_elm_code_widget_legacy_class_desc, ELM_CODE_WIDGET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

diff --git a/src/lib/elementary/elm_code_widget_legacy_eo.h b/src/lib/elementary/elm_code_widget_legacy_eo.h
new file mode 100644 (file)
index 0000000..4d2b5ff
--- /dev/null
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.h
@@ -0,0 +1,24 @@
+#ifndef _ELM_CODE_WIDGET_LEGACY_EO_H_
+#define _ELM_CODE_WIDGET_LEGACY_EO_H_
+
+#ifndef _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
+#define _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Elm_Code_Widget_Legacy;
+
+#endif
+
+#ifndef _ELM_CODE_WIDGET_LEGACY_EO_TYPES
+#define _ELM_CODE_WIDGET_LEGACY_EO_TYPES
+
+
+#endif
+/** Elementary code widget
+ *
+ * @ingroup Elm_Code_Widget_Legacy
+ */
+#define ELM_CODE_WIDGET_LEGACY_CLASS elm_code_widget_legacy_class_get()
+
+EWAPI const Efl_Class *elm_code_widget_legacy_class_get(void);
+
+#endif

diff --git a/src/lib/elementary/elm_code_widget_legacy_eo.legacy.h b/src/lib/elementary/elm_code_widget_legacy_eo.legacy.h
new file mode 100644 (file)
index 0000000..84577e3
--- /dev/null
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _ELM_CODE_WIDGET_LEGACY_EO_LEGACY_H_
+#define _ELM_CODE_WIDGET_LEGACY_EO_LEGACY_H_
+
+#ifndef _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
+#define _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Elm_Code_Widget_Legacy;
+
+#endif
+
+#ifndef _ELM_CODE_WIDGET_LEGACY_EO_TYPES
+#define _ELM_CODE_WIDGET_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index a6de43b..006228e 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1,6 +1,5 @@
 pub_legacy_eo_files = [
   'efl_ui_clock_legacy.eo',
-  'elm_code_widget_legacy.eo',
   'elm_interface_fileselector.eo',
   'elm_colorselector.eo',
   'elm_conformant.eo',
@@ -850,6 +849,8 @@ elementary_pub_headers = [
   'elm_clock_eo.h',
   'elm_clock_eo.legacy.h',
   'elm_code_widget_eo.legacy.h',
+  'elm_code_widget_legacy_eo.h',
+  'elm_code_widget_legacy_eo.legacy.h',
   'elm_hoversel_eo.h',
   'elm_hoversel_eo.legacy.h',
   'elm_hoversel_item_eo.h',