summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:14:57 -0800
commita5b5d6d2771e6ec315d2cbd790c6c5d0948125a2 (patch)
treed6f651d24e436f8af525bc8709f499c4e167f657 /src/lib/elementary
parentca9daf94c63178bd1ebf726b746e210bb9a0143d (diff)
downloadefl-a5b5d6d2771e6ec315d2cbd790c6c5d0948125a2.tar.gz
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
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c2
-rw-r--r--src/lib/elementary/elm_code_widget.c4
-rw-r--r--src/lib/elementary/elm_code_widget_legacy.eo5
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.c27
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.h24
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/meson.build3
7 files changed, 73 insertions, 9 deletions
diff --git a/src/lib/elementary/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c
index 6386e15ff5..5b4e63380b 100644
--- 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 ec8a7fbd57..4456eb48f7 100644
--- 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
index 6de8928a25..0000000000
--- 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
index 0000000000..e16bdd1cc3
--- /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
index 0000000000..4d2b5ffb26
--- /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
index 0000000000..84577e3e7f
--- /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 469aa03c38..bad033e4df 100644
--- 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',
@@ -730,6 +729,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',