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:15:58 -0800
commitfeba0d905c2b5bed773d8fb3ba89fbb26132ab1e (patch)
treed2e27c7544ee891e503f965f37abfe442d82cb34
parent563bc027cd0e80a82aded426f0c58a36028b917a (diff)
elm_pan: 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/D8189
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.h4
-rw-r--r--src/lib/elementary/elm_pan.eo58
-rw-r--r--src/lib/elementary/elm_pan_eo.c76
-rw-r--r--src/lib/elementary/elm_pan_eo.h87
-rw-r--r--src/lib/elementary/elm_pan_eo.legacy.c30
-rw-r--r--src/lib/elementary/elm_pan_eo.legacy.h72
-rw-r--r--src/lib/elementary/meson.build3
9 files changed, 274 insertions, 63 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index ce7103c..2987c19 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -149,7 +149,6 @@ elm_public_eolian_files += \
149 lib/elementary/elm_atspi_bridge.eo \ 149 lib/elementary/elm_atspi_bridge.eo \
150 lib/elementary/elm_atspi_app_object.eo \ 150 lib/elementary/elm_atspi_app_object.eo \
151 lib/elementary/efl_ui_image_zoomable_pan.eo \ 151 lib/elementary/efl_ui_image_zoomable_pan.eo \
152 lib/elementary/elm_pan.eo \
153 lib/elementary/elm_toolbar.eo \ 152 lib/elementary/elm_toolbar.eo \
154 lib/elementary/elm_toolbar_item.eo \ 153 lib/elementary/elm_toolbar_item.eo \
155 lib/elementary/elm_view_list.eo \ 154 lib/elementary/elm_view_list.eo \
@@ -376,6 +375,8 @@ lib/elementary/elm_notify_eo.c \
376lib/elementary/elm_notify_eo.legacy.c \ 375lib/elementary/elm_notify_eo.legacy.c \
377lib/elementary/elm_panel_eo.c \ 376lib/elementary/elm_panel_eo.c \
378lib/elementary/elm_panel_eo.legacy.c \ 377lib/elementary/elm_panel_eo.legacy.c \
378lib/elementary/elm_pan_eo.c \
379lib/elementary/elm_pan_eo.legacy.c \
379$(NULL) 380$(NULL)
380 381
381elm_legacy_eo_headers = \ 382elm_legacy_eo_headers = \
@@ -533,6 +534,8 @@ lib/elementary/elm_notify_eo.h \
533lib/elementary/elm_notify_eo.legacy.h \ 534lib/elementary/elm_notify_eo.legacy.h \
534lib/elementary/elm_panel_eo.h \ 535lib/elementary/elm_panel_eo.h \
535lib/elementary/elm_panel_eo.legacy.h \ 536lib/elementary/elm_panel_eo.legacy.h \
537lib/elementary/elm_pan_eo.h \
538lib/elementary/elm_pan_eo.legacy.h \
536$(NULL) 539$(NULL)
537 540
538 541
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index e23cc5a..e40ab07 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -4972,4 +4972,4 @@ _elm_interface_scrollable_item_loop_enabled_get(const Eo *obj EINA_UNUSED, Elm_S
4972 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_interface_scrollable) 4972 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_interface_scrollable)
4973 4973
4974#include "elm_interface_scrollable.eo.c" 4974#include "elm_interface_scrollable.eo.c"
4975#include "elm_pan.eo.c" 4975#include "elm_pan_eo.c"
diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index 4da12df..64e6f88 100644
--- a/src/lib/elementary/elm_interface_scrollable.h
+++ b/src/lib/elementary/elm_interface_scrollable.h
@@ -32,10 +32,10 @@
32 */ 32 */
33 33
34#ifdef EFL_EO_API_SUPPORT 34#ifdef EFL_EO_API_SUPPORT
35#include "elm_pan.eo.h" 35#include "elm_pan_eo.h"
36#endif 36#endif
37#ifndef EFL_NOLEGACY_API_SUPPORT 37#ifndef EFL_NOLEGACY_API_SUPPORT
38#include "elm_pan.eo.legacy.h" 38#include "elm_pan_eo.legacy.h"
39#endif 39#endif
40 40
41/** 41/**
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
deleted file mode 100644
index 086032e..0000000
--- a/src/lib/elementary/elm_pan.eo
+++ /dev/null
@@ -1,58 +0,0 @@
1class Elm.Pan extends Efl.Canvas.Group
2{
3 [[Elementary pan class]]
4 legacy_prefix: elm_pan;
5 eo_prefix: elm_obj_pan;
6 event_prefix: elm_pan;
7 data: Elm_Pan_Smart_Data;
8 methods {
9 @property pos {
10 [[Position]]
11 set {
12 }
13 get {
14 }
15 values {
16 x: int; [[X coordinate]]
17 y: int; [[Y coordinate]]
18 }
19 }
20 @property content_size {
21 [[Content size]]
22 get {
23 }
24 values {
25 w: int; [[Width]]
26 h: int; [[Height]]
27 }
28 }
29 @property pos_min {
30 [[Minimal position]]
31 get {
32 }
33 values {
34 x: int; [[X coordinate]]
35 y: int; [[Y coordinate]]
36 }
37 }
38 @property pos_max {
39 [[Maximal position]]
40 get {
41 }
42 values {
43 x: int; [[X coordinate]]
44 y: int; [[Y coordinate]]
45 }
46 }
47 }
48 implements {
49 Efl.Object.constructor;
50 class.constructor;
51 Efl.Gfx.Entity.visible { set; }
52 Efl.Gfx.Entity.position { set; }
53 Efl.Gfx.Entity.size { set; }
54 }
55 events {
56 changed: void; [[Called when pan object changed]]
57 }
58}
diff --git a/src/lib/elementary/elm_pan_eo.c b/src/lib/elementary/elm_pan_eo.c
new file mode 100644
index 0000000..7214e12
--- /dev/null
+++ b/src/lib/elementary/elm_pan_eo.c
@@ -0,0 +1,76 @@
1EWAPI const Efl_Event_Description _ELM_PAN_EVENT_CHANGED =
2 EFL_EVENT_DESCRIPTION("changed");
3
4void _elm_pan_pos_set(Eo *obj, Elm_Pan_Smart_Data *pd, int x, int y);
5
6EOAPI EFL_VOID_FUNC_BODYV(elm_obj_pan_pos_set, EFL_FUNC_CALL(x, y), int x, int y);
7
8void _elm_pan_pos_get(const Eo *obj, Elm_Pan_Smart_Data *pd, int *x, int *y);
9
10EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_pan_pos_get, EFL_FUNC_CALL(x, y), int *x, int *y);
11
12void _elm_pan_content_size_get(const Eo *obj, Elm_Pan_Smart_Data *pd, int *w, int *h);
13
14EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_pan_content_size_get, EFL_FUNC_CALL(w, h), int *w, int *h);
15
16void _elm_pan_pos_min_get(const Eo *obj, Elm_Pan_Smart_Data *pd, int *x, int *y);
17
18EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_pan_pos_min_get, EFL_FUNC_CALL(x, y), int *x, int *y);
19
20void _elm_pan_pos_max_get(const Eo *obj, Elm_Pan_Smart_Data *pd, int *x, int *y);
21
22EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_pan_pos_max_get, EFL_FUNC_CALL(x, y), int *x, int *y);
23
24Efl_Object *_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *pd);
25
26
27void _elm_pan_efl_gfx_entity_visible_set(Eo *obj, Elm_Pan_Smart_Data *pd, Eina_Bool v);
28
29
30void _elm_pan_efl_gfx_entity_position_set(Eo *obj, Elm_Pan_Smart_Data *pd, Eina_Position2D pos);
31
32
33void _elm_pan_efl_gfx_entity_size_set(Eo *obj, Elm_Pan_Smart_Data *pd, Eina_Size2D size);
34
35
36static Eina_Bool
37_elm_pan_class_initializer(Efl_Class *klass)
38{
39 const Efl_Object_Ops *opsp = NULL;
40
41 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
42
43#ifndef ELM_PAN_EXTRA_OPS
44#define ELM_PAN_EXTRA_OPS
45#endif
46
47 EFL_OPS_DEFINE(ops,
48 EFL_OBJECT_OP_FUNC(elm_obj_pan_pos_set, _elm_pan_pos_set),
49 EFL_OBJECT_OP_FUNC(elm_obj_pan_pos_get, _elm_pan_pos_get),
50 EFL_OBJECT_OP_FUNC(elm_obj_pan_content_size_get, _elm_pan_content_size_get),
51 EFL_OBJECT_OP_FUNC(elm_obj_pan_pos_min_get, _elm_pan_pos_min_get),
52 EFL_OBJECT_OP_FUNC(elm_obj_pan_pos_max_get, _elm_pan_pos_max_get),
53 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_pan_efl_object_constructor),
54 EFL_OBJECT_OP_FUNC(efl_gfx_entity_visible_set, _elm_pan_efl_gfx_entity_visible_set),
55 EFL_OBJECT_OP_FUNC(efl_gfx_entity_position_set, _elm_pan_efl_gfx_entity_position_set),
56 EFL_OBJECT_OP_FUNC(efl_gfx_entity_size_set, _elm_pan_efl_gfx_entity_size_set),
57 ELM_PAN_EXTRA_OPS
58 );
59 opsp = &ops;
60
61 return efl_class_functions_set(klass, opsp, ropsp);
62}
63
64static const Efl_Class_Description _elm_pan_class_desc = {
65 EO_VERSION,
66 "Elm.Pan",
67 EFL_CLASS_TYPE_REGULAR,
68 sizeof(Elm_Pan_Smart_Data),
69 _elm_pan_class_initializer,
70 _elm_pan_class_constructor,
71 NULL
72};
73
74EFL_DEFINE_CLASS(elm_pan_class_get, &_elm_pan_class_desc, EFL_CANVAS_GROUP_CLASS, NULL);
75
76#include "elm_pan_eo.legacy.c"
diff --git a/src/lib/elementary/elm_pan_eo.h b/src/lib/elementary/elm_pan_eo.h
new file mode 100644
index 0000000..a09652a
--- /dev/null
+++ b/src/lib/elementary/elm_pan_eo.h
@@ -0,0 +1,87 @@
1#ifndef _ELM_PAN_EO_H_
2#define _ELM_PAN_EO_H_
3
4#ifndef _ELM_PAN_EO_CLASS_TYPE
5#define _ELM_PAN_EO_CLASS_TYPE
6
7typedef Eo Elm_Pan;
8
9#endif
10
11#ifndef _ELM_PAN_EO_TYPES
12#define _ELM_PAN_EO_TYPES
13
14
15#endif
16/** Elementary pan class
17 *
18 * @ingroup Elm_Pan
19 */
20#define ELM_PAN_CLASS elm_pan_class_get()
21
22EWAPI const Efl_Class *elm_pan_class_get(void);
23
24/**
25 * @brief Position
26 *
27 * @param[in] obj The object.
28 * @param[in] x X coordinate
29 * @param[in] y Y coordinate
30 *
31 * @ingroup Elm_Pan
32 */
33EOAPI void elm_obj_pan_pos_set(Eo *obj, int x, int y);
34
35/**
36 * @brief Position
37 *
38 * @param[in] obj The object.
39 * @param[out] x X coordinate
40 * @param[out] y Y coordinate
41 *
42 * @ingroup Elm_Pan
43 */
44EOAPI void elm_obj_pan_pos_get(const Eo *obj, int *x, int *y);
45
46/**
47 * @brief Content size
48 *
49 * @param[in] obj The object.
50 * @param[out] w Width
51 * @param[out] h Height
52 *
53 * @ingroup Elm_Pan
54 */
55EOAPI void elm_obj_pan_content_size_get(const Eo *obj, int *w, int *h);
56
57/**
58 * @brief Minimal position
59 *
60 * @param[in] obj The object.
61 * @param[out] x X coordinate
62 * @param[out] y Y coordinate
63 *
64 * @ingroup Elm_Pan
65 */
66EOAPI void elm_obj_pan_pos_min_get(const Eo *obj, int *x, int *y);
67
68/**
69 * @brief Maximal position
70 *
71 * @param[in] obj The object.
72 * @param[out] x X coordinate
73 * @param[out] y Y coordinate
74 *
75 * @ingroup Elm_Pan
76 */
77EOAPI void elm_obj_pan_pos_max_get(const Eo *obj, int *x, int *y);
78
79EWAPI extern const Efl_Event_Description _ELM_PAN_EVENT_CHANGED;
80
81/** Called when pan object changed
82 *
83 * @ingroup Elm_Pan
84 */
85#define ELM_PAN_EVENT_CHANGED (&(_ELM_PAN_EVENT_CHANGED))
86
87#endif
diff --git a/src/lib/elementary/elm_pan_eo.legacy.c b/src/lib/elementary/elm_pan_eo.legacy.c
new file mode 100644
index 0000000..0b4e98f
--- /dev/null
+++ b/src/lib/elementary/elm_pan_eo.legacy.c
@@ -0,0 +1,30 @@
1
2EAPI void
3elm_pan_pos_set(Elm_Pan *obj, int x, int y)
4{
5 elm_obj_pan_pos_set(obj, x, y);
6}
7
8EAPI void
9elm_pan_pos_get(const Elm_Pan *obj, int *x, int *y)
10{
11 elm_obj_pan_pos_get(obj, x, y);
12}
13
14EAPI void
15elm_pan_content_size_get(const Elm_Pan *obj, int *w, int *h)
16{
17 elm_obj_pan_content_size_get(obj, w, h);
18}
19
20EAPI void
21elm_pan_pos_min_get(const Elm_Pan *obj, int *x, int *y)
22{
23 elm_obj_pan_pos_min_get(obj, x, y);
24}
25
26EAPI void
27elm_pan_pos_max_get(const Elm_Pan *obj, int *x, int *y)
28{
29 elm_obj_pan_pos_max_get(obj, x, y);
30}
diff --git a/src/lib/elementary/elm_pan_eo.legacy.h b/src/lib/elementary/elm_pan_eo.legacy.h
new file mode 100644
index 0000000..857b2e8
--- /dev/null
+++ b/src/lib/elementary/elm_pan_eo.legacy.h
@@ -0,0 +1,72 @@
1#ifndef _ELM_PAN_EO_LEGACY_H_
2#define _ELM_PAN_EO_LEGACY_H_
3
4#ifndef _ELM_PAN_EO_CLASS_TYPE
5#define _ELM_PAN_EO_CLASS_TYPE
6
7typedef Eo Elm_Pan;
8
9#endif
10
11#ifndef _ELM_PAN_EO_TYPES
12#define _ELM_PAN_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Position
19 *
20 * @param[in] obj The object.
21 * @param[in] x X coordinate
22 * @param[in] y Y coordinate
23 *
24 * @ingroup Elm_Pan_Group
25 */
26EAPI void elm_pan_pos_set(Elm_Pan *obj, int x, int y);
27
28/**
29 * @brief Position
30 *
31 * @param[in] obj The object.
32 * @param[out] x X coordinate
33 * @param[out] y Y coordinate
34 *
35 * @ingroup Elm_Pan_Group
36 */
37EAPI void elm_pan_pos_get(const Elm_Pan *obj, int *x, int *y);
38
39/**
40 * @brief Content size
41 *
42 * @param[in] obj The object.
43 * @param[out] w Width
44 * @param[out] h Height
45 *
46 * @ingroup Elm_Pan_Group
47 */
48EAPI void elm_pan_content_size_get(const Elm_Pan *obj, int *w, int *h);
49
50/**
51 * @brief Minimal position
52 *
53 * @param[in] obj The object.
54 * @param[out] x X coordinate
55 * @param[out] y Y coordinate
56 *
57 * @ingroup Elm_Pan_Group
58 */
59EAPI void elm_pan_pos_min_get(const Elm_Pan *obj, int *x, int *y);
60
61/**
62 * @brief Maximal position
63 *
64 * @param[in] obj The object.
65 * @param[out] x X coordinate
66 * @param[out] y Y coordinate
67 *
68 * @ingroup Elm_Pan_Group
69 */
70EAPI void elm_pan_pos_max_get(const Elm_Pan *obj, int *x, int *y);
71
72#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 72b7d30..e61e549 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -198,7 +198,6 @@ pub_eo_files = [
198 'elm_atspi_bridge.eo', 198 'elm_atspi_bridge.eo',
199 'elm_atspi_app_object.eo', 199 'elm_atspi_app_object.eo',
200 'efl_ui_image_zoomable_pan.eo', 200 'efl_ui_image_zoomable_pan.eo',
201 'elm_pan.eo',
202 'elm_toolbar.eo', 201 'elm_toolbar.eo',
203 'elm_toolbar_item.eo', 202 'elm_toolbar_item.eo',
204 'elm_view_list.eo', 203 'elm_view_list.eo',
@@ -779,6 +778,8 @@ elementary_pub_headers = [
779 'elm_notify_eo.legacy.h', 778 'elm_notify_eo.legacy.h',
780 'elm_panel_eo.h', 779 'elm_panel_eo.h',
781 'elm_panel_eo.legacy.h', 780 'elm_panel_eo.legacy.h',
781 'elm_pan_eo.h',
782 'elm_pan_eo.legacy.h',
782] 783]
783 784
784elementary_header_src = [ 785elementary_header_src = [