summaryrefslogtreecommitdiff
path: root/src
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:16:17 -0800
commit5d6382b9cedd5df6afdcd2d61ce5307538d4c53a (patch)
tree189822f9fa38bfab510709f89988f469c438678b /src
parent9ec139cefd86105e3b7b86af7600ce955a8f01da (diff)
elm_separator: 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/D8198
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/lib/elementary/elm_separator.c4
-rw-r--r--src/lib/elementary/elm_separator.eo24
-rw-r--r--src/lib/elementary/elm_separator_eo.c83
-rw-r--r--src/lib/elementary/elm_separator_eo.h45
-rw-r--r--src/lib/elementary/elm_separator_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_separator_eo.legacy.h38
-rw-r--r--src/lib/elementary/elm_separator_legacy.h2
-rw-r--r--src/lib/elementary/meson.build3
9 files changed, 187 insertions, 29 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 8e91c28..d44bd3c 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -205,7 +205,6 @@ elm_legacy_eolian_files = \
205 lib/elementary/elm_actionslider_part.eo \ 205 lib/elementary/elm_actionslider_part.eo \
206 lib/elementary/elm_bubble_part.eo \ 206 lib/elementary/elm_bubble_part.eo \
207 lib/elementary/elm_fileselector_part.eo \ 207 lib/elementary/elm_fileselector_part.eo \
208 lib/elementary/elm_separator.eo \
209 lib/elementary/elm_slideshow.eo \ 208 lib/elementary/elm_slideshow.eo \
210 lib/elementary/elm_slideshow_item.eo \ 209 lib/elementary/elm_slideshow_item.eo \
211 lib/elementary/elm_table.eo \ 210 lib/elementary/elm_table.eo \
@@ -384,6 +383,8 @@ lib/elementary/elm_segment_control_eo.c \
384lib/elementary/elm_segment_control_eo.legacy.c \ 383lib/elementary/elm_segment_control_eo.legacy.c \
385lib/elementary/elm_segment_control_item_eo.c \ 384lib/elementary/elm_segment_control_item_eo.c \
386lib/elementary/elm_segment_control_item_eo.legacy.c \ 385lib/elementary/elm_segment_control_item_eo.legacy.c \
386lib/elementary/elm_separator_eo.c \
387lib/elementary/elm_separator_eo.legacy.c \
387$(NULL) 388$(NULL)
388 389
389elm_legacy_eo_headers = \ 390elm_legacy_eo_headers = \
@@ -563,6 +564,8 @@ lib/elementary/elm_segment_control_eo.h \
563lib/elementary/elm_segment_control_eo.legacy.h \ 564lib/elementary/elm_segment_control_eo.legacy.h \
564lib/elementary/elm_segment_control_item_eo.h \ 565lib/elementary/elm_segment_control_item_eo.h \
565lib/elementary/elm_segment_control_item_eo.legacy.h \ 566lib/elementary/elm_segment_control_item_eo.legacy.h \
567lib/elementary/elm_separator_eo.h \
568lib/elementary/elm_separator_eo.legacy.h \
566$(NULL) 569$(NULL)
567 570
568 571
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index 8d94d05..2c73da1 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -7,7 +7,7 @@
7#include <Elementary.h> 7#include <Elementary.h>
8 8
9#include "elm_priv.h" 9#include "elm_priv.h"
10#include "elm_separator.eo.h" 10#include "elm_separator_eo.h"
11#include "elm_widget_separator.h" 11#include "elm_widget_separator.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13 13
@@ -104,4 +104,4 @@ _elm_separator_class_constructor(Efl_Class *klass)
104 ELM_LAYOUT_SIZING_EVAL_OPS(elm_separator), \ 104 ELM_LAYOUT_SIZING_EVAL_OPS(elm_separator), \
105 EFL_CANVAS_GROUP_ADD_OPS(elm_separator) 105 EFL_CANVAS_GROUP_ADD_OPS(elm_separator)
106 106
107#include "elm_separator.eo.c" 107#include "elm_separator_eo.c"
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
deleted file mode 100644
index 8356248..0000000
--- a/src/lib/elementary/elm_separator.eo
+++ /dev/null
@@ -1,24 +0,0 @@
1class Elm.Separator extends Efl.Ui.Layout_Base implements Efl.Ui.Legacy
2{
3 [[Elementary separator class]]
4 legacy_prefix: elm_separator;
5 eo_prefix: elm_obj_separator;
6 methods {
7 @property horizontal {
8 set {
9 [[Set the horizontal mode of a separator object]]
10 }
11 get {
12 [[Get the horizontal mode of a separator object]]
13 }
14 values {
15 horizontal: bool; [[If true, the separator is horizontal]]
16 }
17 }
18 }
19 implements {
20 class.constructor;
21 Efl.Object.constructor;
22 Efl.Ui.Widget.theme_apply;
23 }
24}
diff --git a/src/lib/elementary/elm_separator_eo.c b/src/lib/elementary/elm_separator_eo.c
new file mode 100644
index 0000000..1f8206f
--- /dev/null
+++ b/src/lib/elementary/elm_separator_eo.c
@@ -0,0 +1,83 @@
1
2void _elm_separator_horizontal_set(Eo *obj, Elm_Separator_Data *pd, Eina_Bool horizontal);
3
4
5static Eina_Error
6__eolian_elm_separator_horizontal_set_reflect(Eo *obj, Eina_Value val)
7{
8 Eina_Error r = 0; Eina_Bool cval;
9 if (!eina_value_bool_convert(&val, &cval))
10 {
11 r = EINA_ERROR_VALUE_FAILED;
12 goto end;
13 }
14 elm_obj_separator_horizontal_set(obj, cval);
15 end:
16 eina_value_flush(&val);
17 return r;
18}
19
20EOAPI EFL_VOID_FUNC_BODYV(elm_obj_separator_horizontal_set, EFL_FUNC_CALL(horizontal), Eina_Bool horizontal);
21
22Eina_Bool _elm_separator_horizontal_get(const Eo *obj, Elm_Separator_Data *pd);
23
24
25static Eina_Value
26__eolian_elm_separator_horizontal_get_reflect(Eo *obj)
27{
28 Eina_Bool val = elm_obj_separator_horizontal_get(obj);
29 return eina_value_bool_init(val);
30}
31
32EOAPI EFL_FUNC_BODY_CONST(elm_obj_separator_horizontal_get, Eina_Bool, 0);
33
34Efl_Object *_elm_separator_efl_object_constructor(Eo *obj, Elm_Separator_Data *pd);
35
36
37Eina_Error _elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *pd);
38
39
40static Eina_Bool
41_elm_separator_class_initializer(Efl_Class *klass)
42{
43 const Efl_Object_Ops *opsp = NULL;
44
45 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
46
47#ifndef ELM_SEPARATOR_EXTRA_OPS
48#define ELM_SEPARATOR_EXTRA_OPS
49#endif
50
51 EFL_OPS_DEFINE(ops,
52 EFL_OBJECT_OP_FUNC(elm_obj_separator_horizontal_set, _elm_separator_horizontal_set),
53 EFL_OBJECT_OP_FUNC(elm_obj_separator_horizontal_get, _elm_separator_horizontal_get),
54 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_separator_efl_object_constructor),
55 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_separator_efl_ui_widget_theme_apply),
56 ELM_SEPARATOR_EXTRA_OPS
57 );
58 opsp = &ops;
59
60 static const Efl_Object_Property_Reflection refl_table[] = {
61 {"horizontal", __eolian_elm_separator_horizontal_set_reflect, __eolian_elm_separator_horizontal_get_reflect},
62 };
63 static const Efl_Object_Property_Reflection_Ops rops = {
64 refl_table, EINA_C_ARRAY_LENGTH(refl_table)
65 };
66 ropsp = &rops;
67
68 return efl_class_functions_set(klass, opsp, ropsp);
69}
70
71static const Efl_Class_Description _elm_separator_class_desc = {
72 EO_VERSION,
73 "Elm.Separator",
74 EFL_CLASS_TYPE_REGULAR,
75 sizeof(Elm_Separator_Data),
76 _elm_separator_class_initializer,
77 _elm_separator_class_constructor,
78 NULL
79};
80
81EFL_DEFINE_CLASS(elm_separator_class_get, &_elm_separator_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
82
83#include "elm_separator_eo.legacy.c"
diff --git a/src/lib/elementary/elm_separator_eo.h b/src/lib/elementary/elm_separator_eo.h
new file mode 100644
index 0000000..ce4d5e0
--- /dev/null
+++ b/src/lib/elementary/elm_separator_eo.h
@@ -0,0 +1,45 @@
1#ifndef _ELM_SEPARATOR_EO_H_
2#define _ELM_SEPARATOR_EO_H_
3
4#ifndef _ELM_SEPARATOR_EO_CLASS_TYPE
5#define _ELM_SEPARATOR_EO_CLASS_TYPE
6
7typedef Eo Elm_Separator;
8
9#endif
10
11#ifndef _ELM_SEPARATOR_EO_TYPES
12#define _ELM_SEPARATOR_EO_TYPES
13
14
15#endif
16/** Elementary separator class
17 *
18 * @ingroup Elm_Separator
19 */
20#define ELM_SEPARATOR_CLASS elm_separator_class_get()
21
22EWAPI const Efl_Class *elm_separator_class_get(void);
23
24/**
25 * @brief Set the horizontal mode of a separator object
26 *
27 * @param[in] obj The object.
28 * @param[in] horizontal If true, the separator is horizontal
29 *
30 * @ingroup Elm_Separator
31 */
32EOAPI void elm_obj_separator_horizontal_set(Eo *obj, Eina_Bool horizontal);
33
34/**
35 * @brief Get the horizontal mode of a separator object
36 *
37 * @param[in] obj The object.
38 *
39 * @return If true, the separator is horizontal
40 *
41 * @ingroup Elm_Separator
42 */
43EOAPI Eina_Bool elm_obj_separator_horizontal_get(const Eo *obj);
44
45#endif
diff --git a/src/lib/elementary/elm_separator_eo.legacy.c b/src/lib/elementary/elm_separator_eo.legacy.c
new file mode 100644
index 0000000..13de300
--- /dev/null
+++ b/src/lib/elementary/elm_separator_eo.legacy.c
@@ -0,0 +1,12 @@
1
2EAPI void
3elm_separator_horizontal_set(Elm_Separator *obj, Eina_Bool horizontal)
4{
5 elm_obj_separator_horizontal_set(obj, horizontal);
6}
7
8EAPI Eina_Bool
9elm_separator_horizontal_get(const Elm_Separator *obj)
10{
11 return elm_obj_separator_horizontal_get(obj);
12}
diff --git a/src/lib/elementary/elm_separator_eo.legacy.h b/src/lib/elementary/elm_separator_eo.legacy.h
new file mode 100644
index 0000000..907250b
--- /dev/null
+++ b/src/lib/elementary/elm_separator_eo.legacy.h
@@ -0,0 +1,38 @@
1#ifndef _ELM_SEPARATOR_EO_LEGACY_H_
2#define _ELM_SEPARATOR_EO_LEGACY_H_
3
4#ifndef _ELM_SEPARATOR_EO_CLASS_TYPE
5#define _ELM_SEPARATOR_EO_CLASS_TYPE
6
7typedef Eo Elm_Separator;
8
9#endif
10
11#ifndef _ELM_SEPARATOR_EO_TYPES
12#define _ELM_SEPARATOR_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Set the horizontal mode of a separator object
19 *
20 * @param[in] obj The object.
21 * @param[in] horizontal If true, the separator is horizontal
22 *
23 * @ingroup Elm_Separator_Group
24 */
25EAPI void elm_separator_horizontal_set(Elm_Separator *obj, Eina_Bool horizontal);
26
27/**
28 * @brief Get the horizontal mode of a separator object
29 *
30 * @param[in] obj The object.
31 *
32 * @return If true, the separator is horizontal
33 *
34 * @ingroup Elm_Separator_Group
35 */
36EAPI Eina_Bool elm_separator_horizontal_get(const Elm_Separator *obj);
37
38#endif
diff --git a/src/lib/elementary/elm_separator_legacy.h b/src/lib/elementary/elm_separator_legacy.h
index 82cf44e..bd5ac73 100644
--- a/src/lib/elementary/elm_separator_legacy.h
+++ b/src/lib/elementary/elm_separator_legacy.h
@@ -9,4 +9,4 @@
9 */ 9 */
10EAPI Evas_Object *elm_separator_add(Evas_Object *parent); 10EAPI Evas_Object *elm_separator_add(Evas_Object *parent);
11 11
12#include "elm_separator.eo.legacy.h" \ No newline at end of file 12#include "elm_separator_eo.legacy.h" \ No newline at end of file
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 47df877..c06e47a 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -22,7 +22,6 @@ pub_legacy_eo_files = [
22 'elm_actionslider_part.eo', 22 'elm_actionslider_part.eo',
23 'elm_bubble_part.eo', 23 'elm_bubble_part.eo',
24 'elm_fileselector_part.eo', 24 'elm_fileselector_part.eo',
25 'elm_separator.eo',
26 'elm_slideshow.eo', 25 'elm_slideshow.eo',
27 'elm_slideshow_item.eo', 26 'elm_slideshow_item.eo',
28 'elm_table.eo', 27 'elm_table.eo',
@@ -790,6 +789,8 @@ elementary_pub_headers = [
790 'elm_segment_control_eo.legacy.h', 789 'elm_segment_control_eo.legacy.h',
791 'elm_segment_control_item_eo.h', 790 'elm_segment_control_item_eo.h',
792 'elm_segment_control_item_eo.legacy.h', 791 'elm_segment_control_item_eo.legacy.h',
792 'elm_separator_eo.h',
793 'elm_separator_eo.legacy.h',
793] 794]
794 795
795elementary_header_src = [ 796elementary_header_src = [