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:15:37 -0800
commit56c234e7ad964f99d6f1b948c03eebb4350b6b4f (patch)
tree2098e72c7bdd004092ba1705a07d2896cf8220b5 /src
parent6db020521dd6857028426308943da7f5ea2dbba1 (diff)
elm_inwin: 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/D8179
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/lib/elementary/elm_inwin.c4
-rw-r--r--src/lib/elementary/elm_inwin.eo28
-rw-r--r--src/lib/elementary/elm_inwin_eo.c58
-rw-r--r--src/lib/elementary/elm_inwin_eo.h40
-rw-r--r--src/lib/elementary/elm_inwin_eo.legacy.c6
-rw-r--r--src/lib/elementary/elm_inwin_eo.legacy.h33
-rw-r--r--src/lib/elementary/elm_inwin_legacy.h2
-rw-r--r--src/lib/elementary/meson.build3
9 files changed, 146 insertions, 33 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index f16b37c..6718c88 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -223,7 +223,6 @@ elm_legacy_eolian_files = \
223 lib/elementary/elm_actionslider_part.eo \ 223 lib/elementary/elm_actionslider_part.eo \
224 lib/elementary/elm_bubble_part.eo \ 224 lib/elementary/elm_bubble_part.eo \
225 lib/elementary/elm_fileselector_part.eo \ 225 lib/elementary/elm_fileselector_part.eo \
226 lib/elementary/elm_inwin.eo \
227 lib/elementary/elm_mapbuf.eo \ 226 lib/elementary/elm_mapbuf.eo \
228 lib/elementary/elm_naviframe.eo \ 227 lib/elementary/elm_naviframe.eo \
229 lib/elementary/elm_naviframe_item.eo \ 228 lib/elementary/elm_naviframe_item.eo \
@@ -362,6 +361,8 @@ lib/elementary/elm_index_eo.legacy.c \
362lib/elementary/elm_index_item_eo.c \ 361lib/elementary/elm_index_item_eo.c \
363lib/elementary/elm_index_item_eo.legacy.c \ 362lib/elementary/elm_index_item_eo.legacy.c \
364lib/elementary/elm_interface_fileselector_eo.c \ 363lib/elementary/elm_interface_fileselector_eo.c \
364lib/elementary/elm_inwin_eo.c \
365lib/elementary/elm_inwin_eo.legacy.c \
365$(NULL) 366$(NULL)
366 367
367elm_legacy_eo_headers = \ 368elm_legacy_eo_headers = \
@@ -489,6 +490,8 @@ lib/elementary/elm_index_item_eo.h \
489lib/elementary/elm_index_item_eo.legacy.h \ 490lib/elementary/elm_index_item_eo.legacy.h \
490lib/elementary/elm_interface_fileselector_eo.h \ 491lib/elementary/elm_interface_fileselector_eo.h \
491lib/elementary/elm_interface_fileselector_eo.legacy.h \ 492lib/elementary/elm_interface_fileselector_eo.legacy.h \
493lib/elementary/elm_inwin_eo.h \
494lib/elementary/elm_inwin_eo.legacy.h \
492$(NULL) 495$(NULL)
493 496
494 497
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 110a614..bb6db93 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -10,7 +10,7 @@
10#include <Elementary.h> 10#include <Elementary.h>
11 11
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "elm_inwin.eo.h" 13#include "elm_inwin_eo.h"
14#include "elm_widget_inwin.h" 14#include "elm_widget_inwin.h"
15#include "elm_widget_layout.h" 15#include "elm_widget_layout.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
@@ -141,4 +141,4 @@ ELM_PART_CONTENT_DEFAULT_IMPLEMENT(elm_inwin, Elm_Inwin_Data)
141 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \ 141 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \
142 ELM_LAYOUT_SIZING_EVAL_OPS(elm_inwin) 142 ELM_LAYOUT_SIZING_EVAL_OPS(elm_inwin)
143 143
144#include "elm_inwin.eo.c" 144#include "elm_inwin_eo.c"
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
deleted file mode 100644
index ec8208a..0000000
--- a/src/lib/elementary/elm_inwin.eo
+++ /dev/null
@@ -1,28 +0,0 @@
1class Elm.Inwin extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy
2{
3 [[Elementary inwin class]]
4 legacy_prefix: elm_inwin;
5 eo_prefix: elm_obj_win_inwin;
6 methods {
7 activate {
8 [[Activates an inwin object, ensuring its visibility
9
10 This function will make sure that the inwin $obj is completely visible
11 by calling evas_object_show() and evas_object_raise() on it, to bring it
12 to the front. It also sets the keyboard focus to it, which will be passed
13 onto its content.
14
15 The object's theme will also receive the signal "elm,action,show" with
16 source "elm".]]
17
18 legacy: elm_win_inwin_activate;
19 }
20 }
21 implements {
22 class.constructor;
23 Efl.Object.constructor;
24 Efl.Ui.Widget.widget_parent { set; }
25 Efl.Content.content { get; set; }
26 Efl.Content.content_unset;
27 }
28}
diff --git a/src/lib/elementary/elm_inwin_eo.c b/src/lib/elementary/elm_inwin_eo.c
new file mode 100644
index 0000000..0cd70e6
--- /dev/null
+++ b/src/lib/elementary/elm_inwin_eo.c
@@ -0,0 +1,58 @@
1
2void _elm_inwin_activate(Eo *obj, Elm_Inwin_Data *pd);
3
4EOAPI EFL_VOID_FUNC_BODY(elm_obj_win_inwin_activate);
5
6Efl_Object *_elm_inwin_efl_object_constructor(Eo *obj, Elm_Inwin_Data *pd);
7
8
9void _elm_inwin_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Inwin_Data *pd, Efl_Ui_Widget *parent);
10
11
12Eina_Bool _elm_inwin_efl_content_content_set(Eo *obj, Elm_Inwin_Data *pd, Efl_Gfx_Entity *content);
13
14
15Efl_Gfx_Entity *_elm_inwin_efl_content_content_get(const Eo *obj, Elm_Inwin_Data *pd);
16
17
18Efl_Gfx_Entity *_elm_inwin_efl_content_content_unset(Eo *obj, Elm_Inwin_Data *pd);
19
20
21static Eina_Bool
22_elm_inwin_class_initializer(Efl_Class *klass)
23{
24 const Efl_Object_Ops *opsp = NULL;
25
26 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
27
28#ifndef ELM_INWIN_EXTRA_OPS
29#define ELM_INWIN_EXTRA_OPS
30#endif
31
32 EFL_OPS_DEFINE(ops,
33 EFL_OBJECT_OP_FUNC(elm_obj_win_inwin_activate, _elm_inwin_activate),
34 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_inwin_efl_object_constructor),
35 EFL_OBJECT_OP_FUNC(efl_ui_widget_parent_set, _elm_inwin_efl_ui_widget_widget_parent_set),
36 EFL_OBJECT_OP_FUNC(efl_content_set, _elm_inwin_efl_content_content_set),
37 EFL_OBJECT_OP_FUNC(efl_content_get, _elm_inwin_efl_content_content_get),
38 EFL_OBJECT_OP_FUNC(efl_content_unset, _elm_inwin_efl_content_content_unset),
39 ELM_INWIN_EXTRA_OPS
40 );
41 opsp = &ops;
42
43 return efl_class_functions_set(klass, opsp, ropsp);
44}
45
46static const Efl_Class_Description _elm_inwin_class_desc = {
47 EO_VERSION,
48 "Elm.Inwin",
49 EFL_CLASS_TYPE_REGULAR,
50 sizeof(Elm_Inwin_Data),
51 _elm_inwin_class_initializer,
52 _elm_inwin_class_constructor,
53 NULL
54};
55
56EFL_DEFINE_CLASS(elm_inwin_class_get, &_elm_inwin_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_CONTENT_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
57
58#include "elm_inwin_eo.legacy.c"
diff --git a/src/lib/elementary/elm_inwin_eo.h b/src/lib/elementary/elm_inwin_eo.h
new file mode 100644
index 0000000..cb6ad90
--- /dev/null
+++ b/src/lib/elementary/elm_inwin_eo.h
@@ -0,0 +1,40 @@
1#ifndef _ELM_INWIN_EO_H_
2#define _ELM_INWIN_EO_H_
3
4#ifndef _ELM_INWIN_EO_CLASS_TYPE
5#define _ELM_INWIN_EO_CLASS_TYPE
6
7typedef Eo Elm_Inwin;
8
9#endif
10
11#ifndef _ELM_INWIN_EO_TYPES
12#define _ELM_INWIN_EO_TYPES
13
14
15#endif
16/** Elementary inwin class
17 *
18 * @ingroup Elm_Inwin
19 */
20#define ELM_INWIN_CLASS elm_inwin_class_get()
21
22EWAPI const Efl_Class *elm_inwin_class_get(void);
23
24/**
25 * @brief Activates an inwin object, ensuring its visibility
26 *
27 * This function will make sure that the inwin @c obj is completely visible by
28 * calling evas_object_show() and evas_object_raise() on it, to bring it to the
29 * front. It also sets the keyboard focus to it, which will be passed onto its
30 * content.
31 *
32 * The object's theme will also receive the signal "elm,action,show" with
33 * source "elm".
34 * @param[in] obj The object.
35 *
36 * @ingroup Elm_Inwin
37 */
38EOAPI void elm_obj_win_inwin_activate(Eo *obj);
39
40#endif
diff --git a/src/lib/elementary/elm_inwin_eo.legacy.c b/src/lib/elementary/elm_inwin_eo.legacy.c
new file mode 100644
index 0000000..1f6b212
--- /dev/null
+++ b/src/lib/elementary/elm_inwin_eo.legacy.c
@@ -0,0 +1,6 @@
1
2EAPI void
3elm_win_inwin_activate(Elm_Inwin *obj)
4{
5 elm_obj_win_inwin_activate(obj);
6}
diff --git a/src/lib/elementary/elm_inwin_eo.legacy.h b/src/lib/elementary/elm_inwin_eo.legacy.h
new file mode 100644
index 0000000..b0e4170
--- /dev/null
+++ b/src/lib/elementary/elm_inwin_eo.legacy.h
@@ -0,0 +1,33 @@
1#ifndef _ELM_INWIN_EO_LEGACY_H_
2#define _ELM_INWIN_EO_LEGACY_H_
3
4#ifndef _ELM_INWIN_EO_CLASS_TYPE
5#define _ELM_INWIN_EO_CLASS_TYPE
6
7typedef Eo Elm_Inwin;
8
9#endif
10
11#ifndef _ELM_INWIN_EO_TYPES
12#define _ELM_INWIN_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Activates an inwin object, ensuring its visibility
19 *
20 * This function will make sure that the inwin @c obj is completely visible by
21 * calling evas_object_show() and evas_object_raise() on it, to bring it to the
22 * front. It also sets the keyboard focus to it, which will be passed onto its
23 * content.
24 *
25 * The object's theme will also receive the signal "elm,action,show" with
26 * source "elm".
27 * @param[in] obj The object.
28 *
29 * @ingroup Elm_Inwin_Group
30 */
31EAPI void elm_win_inwin_activate(Elm_Inwin *obj);
32
33#endif
diff --git a/src/lib/elementary/elm_inwin_legacy.h b/src/lib/elementary/elm_inwin_legacy.h
index a085db0..0f672e9 100644
--- a/src/lib/elementary/elm_inwin_legacy.h
+++ b/src/lib/elementary/elm_inwin_legacy.h
@@ -63,4 +63,4 @@ EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
63 */ 63 */
64EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj); 64EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj);
65 65
66#include "elm_inwin.eo.legacy.h" 66#include "elm_inwin_eo.legacy.h"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 3cf8fe8..8b2cde0 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -37,7 +37,6 @@ pub_legacy_eo_files = [
37 'elm_actionslider_part.eo', 37 'elm_actionslider_part.eo',
38 'elm_bubble_part.eo', 38 'elm_bubble_part.eo',
39 'elm_fileselector_part.eo', 39 'elm_fileselector_part.eo',
40 'elm_inwin.eo',
41 'elm_mapbuf.eo', 40 'elm_mapbuf.eo',
42 'elm_naviframe.eo', 41 'elm_naviframe.eo',
43 'elm_naviframe_item.eo', 42 'elm_naviframe_item.eo',
@@ -764,6 +763,8 @@ elementary_pub_headers = [
764 'elm_index_item_eo.legacy.h', 763 'elm_index_item_eo.legacy.h',
765 'elm_interface_fileselector_eo.h', 764 'elm_interface_fileselector_eo.h',
766 'elm_interface_fileselector_eo.legacy.h', 765 'elm_interface_fileselector_eo.legacy.h',
766 'elm_inwin_eo.h',
767 'elm_inwin_eo.legacy.h',
767] 768]
768 769
769elementary_header_src = [ 770elementary_header_src = [