summaryrefslogtreecommitdiff
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
parentca9daf94c63178bd1ebf726b746e210bb9a0143d (diff)
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
-rw-r--r--src/Makefile_Elementary.am4
-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
8 files changed, 76 insertions, 10 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index a228933..d755250 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -186,7 +186,6 @@ elm_private_eolian_files = \
186# Legacy classes - not part of public EO API 186# Legacy classes - not part of public EO API
187elm_legacy_eolian_files = \ 187elm_legacy_eolian_files = \
188 lib/elementary/efl_ui_clock_legacy.eo \ 188 lib/elementary/efl_ui_clock_legacy.eo \
189 lib/elementary/elm_code_widget_legacy.eo \
190 lib/elementary/elm_interface_fileselector.eo \ 189 lib/elementary/elm_interface_fileselector.eo \
191 lib/elementary/elm_colorselector.eo \ 190 lib/elementary/elm_colorselector.eo \
192 lib/elementary/elm_conformant.eo \ 191 lib/elementary/elm_conformant.eo \
@@ -338,6 +337,7 @@ lib/elementary/elm_calendar_item_eo.c \
338lib/elementary/elm_clock_eo.c \ 337lib/elementary/elm_clock_eo.c \
339lib/elementary/elm_clock_eo.legacy.c \ 338lib/elementary/elm_clock_eo.legacy.c \
340lib/elementary/elm_code_widget_eo.legacy.c \ 339lib/elementary/elm_code_widget_eo.legacy.c \
340lib/elementary/elm_code_widget_legacy_eo.c \
341lib/elementary/elm_hoversel_eo.c \ 341lib/elementary/elm_hoversel_eo.c \
342lib/elementary/elm_hoversel_item_eo.c \ 342lib/elementary/elm_hoversel_item_eo.c \
343lib/elementary/elm_hoversel_item_eo.legacy.c 343lib/elementary/elm_hoversel_item_eo.legacy.c
@@ -401,6 +401,8 @@ lib/elementary/elm_calendar_item_eo.legacy.h \
401lib/elementary/elm_clock_eo.h \ 401lib/elementary/elm_clock_eo.h \
402lib/elementary/elm_clock_eo.legacy.h \ 402lib/elementary/elm_clock_eo.legacy.h \
403lib/elementary/elm_code_widget_eo.legacy.h \ 403lib/elementary/elm_code_widget_eo.legacy.h \
404lib/elementary/elm_code_widget_legacy_eo.h \
405lib/elementary/elm_code_widget_legacy_eo.legacy.h \
404lib/elementary/elm_hoversel_eo.h \ 406lib/elementary/elm_hoversel_eo.h \
405lib/elementary/elm_hoversel_eo.legacy.h \ 407lib/elementary/elm_hoversel_eo.legacy.h \
406lib/elementary/elm_hoversel_item_eo.h \ 408lib/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
--- a/src/lib/elementary/elm_code_diff_widget.c
+++ b/src/lib/elementary/elm_code_diff_widget.c
@@ -5,7 +5,7 @@
5#include "Elementary.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8#include "elm_code_widget_legacy.eo.h" 8#include "elm_code_widget_legacy_eo.h"
9 9
10#define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft" 10#define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft"
11#define _ELM_CODE_DIFF_WIDGET_RIGHT "diffwidgetright" 11#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
--- 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[] = {
58 58
59static void _elm_code_widget_resize(Elm_Code_Widget *widget, Elm_Code_Line *newline); 59static void _elm_code_widget_resize(Elm_Code_Widget *widget, Elm_Code_Line *newline);
60 60
61#include "elm_code_widget_legacy.eo.h" 61#include "elm_code_widget_legacy_eo.h"
62 62
63EAPI Evas_Object * 63EAPI Evas_Object *
64elm_code_widget_add(Evas_Object *parent, Elm_Code *code) 64elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
@@ -68,7 +68,7 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
68 efl_ui_code_widget_code_set(efl_added, code)); 68 efl_ui_code_widget_code_set(efl_added, code));
69} 69}
70 70
71#include "elm_code_widget_legacy.eo.c" 71#include "elm_code_widget_legacy_eo.c"
72 72
73EOLIAN static Eo * 73EOLIAN static Eo *
74_elm_code_widget_efl_object_constructor(Eo *obj, Elm_Code_Widget_Data *pd) 74_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 6de8928..0000000
--- a/src/lib/elementary/elm_code_widget_legacy.eo
+++ /dev/null
@@ -1,5 +0,0 @@
1class Elm.Code_Widget_Legacy extends Elm.Code_Widget implements Efl.Ui.Legacy
2{
3 [[Elementary code widget]]
4 data: null;
5}
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 0000000..e16bdd1
--- /dev/null
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.c
@@ -0,0 +1,27 @@
1
2static Eina_Bool
3_elm_code_widget_legacy_class_initializer(Efl_Class *klass)
4{
5 const Efl_Object_Ops *opsp = NULL;
6
7 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
8
9#ifdef ELM_CODE_WIDGET_LEGACY_EXTRA_OPS
10 EFL_OPS_DEFINE(ops, ELM_CODE_WIDGET_LEGACY_EXTRA_OPS);
11 opsp = &ops;
12#endif
13
14 return efl_class_functions_set(klass, opsp, ropsp);
15}
16
17static const Efl_Class_Description _elm_code_widget_legacy_class_desc = {
18 EO_VERSION,
19 "Elm.Code_Widget_Legacy",
20 EFL_CLASS_TYPE_REGULAR,
21 0,
22 _elm_code_widget_legacy_class_initializer,
23 NULL,
24 NULL
25};
26
27EFL_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 0000000..4d2b5ff
--- /dev/null
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.h
@@ -0,0 +1,24 @@
1#ifndef _ELM_CODE_WIDGET_LEGACY_EO_H_
2#define _ELM_CODE_WIDGET_LEGACY_EO_H_
3
4#ifndef _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
5#define _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Elm_Code_Widget_Legacy;
8
9#endif
10
11#ifndef _ELM_CODE_WIDGET_LEGACY_EO_TYPES
12#define _ELM_CODE_WIDGET_LEGACY_EO_TYPES
13
14
15#endif
16/** Elementary code widget
17 *
18 * @ingroup Elm_Code_Widget_Legacy
19 */
20#define ELM_CODE_WIDGET_LEGACY_CLASS elm_code_widget_legacy_class_get()
21
22EWAPI const Efl_Class *elm_code_widget_legacy_class_get(void);
23
24#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 0000000..84577e3
--- /dev/null
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ELM_CODE_WIDGET_LEGACY_EO_LEGACY_H_
2#define _ELM_CODE_WIDGET_LEGACY_EO_LEGACY_H_
3
4#ifndef _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
5#define _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Elm_Code_Widget_Legacy;
8
9#endif
10
11#ifndef _ELM_CODE_WIDGET_LEGACY_EO_TYPES
12#define _ELM_CODE_WIDGET_LEGACY_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 469aa03..bad033e 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1,6 +1,5 @@
1pub_legacy_eo_files = [ 1pub_legacy_eo_files = [
2 'efl_ui_clock_legacy.eo', 2 'efl_ui_clock_legacy.eo',
3 'elm_code_widget_legacy.eo',
4 'elm_interface_fileselector.eo', 3 'elm_interface_fileselector.eo',
5 'elm_colorselector.eo', 4 'elm_colorselector.eo',
6 'elm_conformant.eo', 5 'elm_conformant.eo',
@@ -730,6 +729,8 @@ elementary_pub_headers = [
730 'elm_clock_eo.h', 729 'elm_clock_eo.h',
731 'elm_clock_eo.legacy.h', 730 'elm_clock_eo.legacy.h',
732 'elm_code_widget_eo.legacy.h', 731 'elm_code_widget_eo.legacy.h',
732 'elm_code_widget_legacy_eo.h',
733 'elm_code_widget_legacy_eo.legacy.h',
733 'elm_hoversel_eo.h', 734 'elm_hoversel_eo.h',
734 'elm_hoversel_eo.legacy.h', 735 'elm_hoversel_eo.legacy.h',
735 'elm_hoversel_item_eo.h', 736 'elm_hoversel_item_eo.h',