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:16:32 -0800
commita0aefabfd3765e2e51350581add0fe4bf9179a20 (patch)
treeb650349ea5156f9ecef29621ac2f4c06d6eb06eb
parent964968bfcc732b3f3a05a1a907312236b8f2abe1 (diff)
elm_thumb: 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/D8205
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/elementary/elm_thumb.c4
-rw-r--r--src/lib/elementary/elm_thumb.eo26
-rw-r--r--src/lib/elementary/elm_thumb_eo.c85
-rw-r--r--src/lib/elementary/elm_thumb_eo.h64
-rw-r--r--src/lib/elementary/elm_thumb_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_thumb_legacy.h2
-rw-r--r--src/lib/elementary/elm_view_form.c2
-rw-r--r--src/lib/elementary/meson.build3
9 files changed, 175 insertions, 32 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 1dd3760..3f632df 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -198,7 +198,6 @@ elm_legacy_eolian_files = \
198 lib/elementary/elm_actionslider_part.eo \ 198 lib/elementary/elm_actionslider_part.eo \
199 lib/elementary/elm_bubble_part.eo \ 199 lib/elementary/elm_bubble_part.eo \
200 lib/elementary/elm_fileselector_part.eo \ 200 lib/elementary/elm_fileselector_part.eo \
201 lib/elementary/elm_thumb.eo \
202 $(NULL) 201 $(NULL)
203 202
204elm_eolian_type_files = \ 203elm_eolian_type_files = \
@@ -392,6 +391,7 @@ lib/elementary/elm_systray_eo.c \
392lib/elementary/elm_systray_eo.legacy.c \ 391lib/elementary/elm_systray_eo.legacy.c \
393lib/elementary/elm_table_eo.c \ 392lib/elementary/elm_table_eo.c \
394lib/elementary/elm_table_eo.legacy.c \ 393lib/elementary/elm_table_eo.legacy.c \
394lib/elementary/elm_thumb_eo.c \
395$(NULL) 395$(NULL)
396 396
397elm_legacy_eo_headers = \ 397elm_legacy_eo_headers = \
@@ -593,6 +593,8 @@ lib/elementary/elm_systray_eo.h \
593lib/elementary/elm_systray_eo.legacy.h \ 593lib/elementary/elm_systray_eo.legacy.h \
594lib/elementary/elm_table_eo.h \ 594lib/elementary/elm_table_eo.h \
595lib/elementary/elm_table_eo.legacy.h \ 595lib/elementary/elm_table_eo.legacy.h \
596lib/elementary/elm_thumb_eo.h \
597lib/elementary/elm_thumb_eo.legacy.h \
596$(NULL) 598$(NULL)
597 599
598 600
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index a36abe7..df6244e 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.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_thumb.eo.h" 10#include "elm_thumb_eo.h"
11#include "elm_widget_thumb.h" 11#include "elm_widget_thumb.h"
12 12
13#define MY_CLASS_NAME "Elm_Thumb" 13#define MY_CLASS_NAME "Elm_Thumb"
@@ -936,4 +936,4 @@ elm_thumb_reload(Evas_Object *obj)
936#define ELM_THUMB_EXTRA_OPS \ 936#define ELM_THUMB_EXTRA_OPS \
937 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_thumb) 937 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_thumb)
938 938
939#include "elm_thumb.eo.c" 939#include "elm_thumb_eo.c"
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
deleted file mode 100644
index 76837b3..0000000
--- a/src/lib/elementary/elm_thumb.eo
+++ /dev/null
@@ -1,26 +0,0 @@
1class Elm.Thumb extends Efl.Ui.Layout_Base implements Efl.File, Efl.Ui.Clickable,
2 Efl.Ui.Draggable, Efl.Ui.Legacy
3{
4 [[Elementary thumbnail class]]
5 legacy_prefix: elm_thumb;
6 eo_prefix: elm_obj_thumb;
7 event_prefix: elm_thumb;
8 implements {
9 class.constructor;
10 Efl.Object.constructor;
11 Efl.Object.finalize;
12 Efl.File.load;
13 Efl.File.loaded { get; }
14 Efl.File.file { get; set; }
15 Efl.File.key { get; set; }
16 Efl.Gfx.Entity.visible { set; }
17 Efl.Ui.Draggable.drag_target { get; set; }
18 }
19 events {
20 generate,error: void; [[Called when an error occurred during thumbnail generation]]
21 generate,start: void; [[Called when thumbnail generation started]]
22 generate,stop: void; [[Called when thumbnail generation stopped]]
23 load,error: void; [[Called when an error occurred during loading]]
24 press: void; [[Called when pressed]]
25 }
26}
diff --git a/src/lib/elementary/elm_thumb_eo.c b/src/lib/elementary/elm_thumb_eo.c
new file mode 100644
index 0000000..d65f2ee
--- /dev/null
+++ b/src/lib/elementary/elm_thumb_eo.c
@@ -0,0 +1,85 @@
1EWAPI const Efl_Event_Description _ELM_THUMB_EVENT_GENERATE_ERROR =
2 EFL_EVENT_DESCRIPTION("generate,error");
3EWAPI const Efl_Event_Description _ELM_THUMB_EVENT_GENERATE_START =
4 EFL_EVENT_DESCRIPTION("generate,start");
5EWAPI const Efl_Event_Description _ELM_THUMB_EVENT_GENERATE_STOP =
6 EFL_EVENT_DESCRIPTION("generate,stop");
7EWAPI const Efl_Event_Description _ELM_THUMB_EVENT_LOAD_ERROR =
8 EFL_EVENT_DESCRIPTION("load,error");
9EWAPI const Efl_Event_Description _ELM_THUMB_EVENT_PRESS =
10 EFL_EVENT_DESCRIPTION("press");
11
12Efl_Object *_elm_thumb_efl_object_constructor(Eo *obj, Elm_Thumb_Data *pd);
13
14
15Efl_Object *_elm_thumb_efl_object_finalize(Eo *obj, Elm_Thumb_Data *pd);
16
17
18Eina_Error _elm_thumb_efl_file_load(Eo *obj, Elm_Thumb_Data *pd);
19
20
21Eina_Bool _elm_thumb_efl_file_loaded_get(const Eo *obj, Elm_Thumb_Data *pd);
22
23
24Eina_Error _elm_thumb_efl_file_file_set(Eo *obj, Elm_Thumb_Data *pd, const char *file);
25
26
27const char *_elm_thumb_efl_file_file_get(const Eo *obj, Elm_Thumb_Data *pd);
28
29
30void _elm_thumb_efl_file_key_set(Eo *obj, Elm_Thumb_Data *pd, const char *key);
31
32
33const char *_elm_thumb_efl_file_key_get(const Eo *obj, Elm_Thumb_Data *pd);
34
35
36void _elm_thumb_efl_gfx_entity_visible_set(Eo *obj, Elm_Thumb_Data *pd, Eina_Bool v);
37
38
39void _elm_thumb_efl_ui_draggable_drag_target_set(Eo *obj, Elm_Thumb_Data *pd, Eina_Bool set);
40
41
42Eina_Bool _elm_thumb_efl_ui_draggable_drag_target_get(const Eo *obj, Elm_Thumb_Data *pd);
43
44
45static Eina_Bool
46_elm_thumb_class_initializer(Efl_Class *klass)
47{
48 const Efl_Object_Ops *opsp = NULL;
49
50 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
51
52#ifndef ELM_THUMB_EXTRA_OPS
53#define ELM_THUMB_EXTRA_OPS
54#endif
55
56 EFL_OPS_DEFINE(ops,
57 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_thumb_efl_object_constructor),
58 EFL_OBJECT_OP_FUNC(efl_finalize, _elm_thumb_efl_object_finalize),
59 EFL_OBJECT_OP_FUNC(efl_file_load, _elm_thumb_efl_file_load),
60 EFL_OBJECT_OP_FUNC(efl_file_loaded_get, _elm_thumb_efl_file_loaded_get),
61 EFL_OBJECT_OP_FUNC(efl_file_set, _elm_thumb_efl_file_file_set),
62 EFL_OBJECT_OP_FUNC(efl_file_get, _elm_thumb_efl_file_file_get),
63 EFL_OBJECT_OP_FUNC(efl_file_key_set, _elm_thumb_efl_file_key_set),
64 EFL_OBJECT_OP_FUNC(efl_file_key_get, _elm_thumb_efl_file_key_get),
65 EFL_OBJECT_OP_FUNC(efl_gfx_entity_visible_set, _elm_thumb_efl_gfx_entity_visible_set),
66 EFL_OBJECT_OP_FUNC(efl_ui_draggable_drag_target_set, _elm_thumb_efl_ui_draggable_drag_target_set),
67 EFL_OBJECT_OP_FUNC(efl_ui_draggable_drag_target_get, _elm_thumb_efl_ui_draggable_drag_target_get),
68 ELM_THUMB_EXTRA_OPS
69 );
70 opsp = &ops;
71
72 return efl_class_functions_set(klass, opsp, ropsp);
73}
74
75static const Efl_Class_Description _elm_thumb_class_desc = {
76 EO_VERSION,
77 "Elm.Thumb",
78 EFL_CLASS_TYPE_REGULAR,
79 sizeof(Elm_Thumb_Data),
80 _elm_thumb_class_initializer,
81 _elm_thumb_class_constructor,
82 NULL
83};
84
85EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_UI_CLICKABLE_INTERFACE, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_thumb_eo.h b/src/lib/elementary/elm_thumb_eo.h
new file mode 100644
index 0000000..09eed0a
--- /dev/null
+++ b/src/lib/elementary/elm_thumb_eo.h
@@ -0,0 +1,64 @@
1#ifndef _ELM_THUMB_EO_H_
2#define _ELM_THUMB_EO_H_
3
4#ifndef _ELM_THUMB_EO_CLASS_TYPE
5#define _ELM_THUMB_EO_CLASS_TYPE
6
7typedef Eo Elm_Thumb;
8
9#endif
10
11#ifndef _ELM_THUMB_EO_TYPES
12#define _ELM_THUMB_EO_TYPES
13
14
15#endif
16/** Elementary thumbnail class
17 *
18 * @ingroup Elm_Thumb
19 */
20#define ELM_THUMB_CLASS elm_thumb_class_get()
21
22EWAPI const Efl_Class *elm_thumb_class_get(void);
23
24EWAPI extern const Efl_Event_Description _ELM_THUMB_EVENT_GENERATE_ERROR;
25
26/** Called when an error occurred during thumbnail generation
27 *
28 * @ingroup Elm_Thumb
29 */
30#define ELM_THUMB_EVENT_GENERATE_ERROR (&(_ELM_THUMB_EVENT_GENERATE_ERROR))
31
32EWAPI extern const Efl_Event_Description _ELM_THUMB_EVENT_GENERATE_START;
33
34/** Called when thumbnail generation started
35 *
36 * @ingroup Elm_Thumb
37 */
38#define ELM_THUMB_EVENT_GENERATE_START (&(_ELM_THUMB_EVENT_GENERATE_START))
39
40EWAPI extern const Efl_Event_Description _ELM_THUMB_EVENT_GENERATE_STOP;
41
42/** Called when thumbnail generation stopped
43 *
44 * @ingroup Elm_Thumb
45 */
46#define ELM_THUMB_EVENT_GENERATE_STOP (&(_ELM_THUMB_EVENT_GENERATE_STOP))
47
48EWAPI extern const Efl_Event_Description _ELM_THUMB_EVENT_LOAD_ERROR;
49
50/** Called when an error occurred during loading
51 *
52 * @ingroup Elm_Thumb
53 */
54#define ELM_THUMB_EVENT_LOAD_ERROR (&(_ELM_THUMB_EVENT_LOAD_ERROR))
55
56EWAPI extern const Efl_Event_Description _ELM_THUMB_EVENT_PRESS;
57
58/** Called when pressed
59 *
60 * @ingroup Elm_Thumb
61 */
62#define ELM_THUMB_EVENT_PRESS (&(_ELM_THUMB_EVENT_PRESS))
63
64#endif
diff --git a/src/lib/elementary/elm_thumb_eo.legacy.h b/src/lib/elementary/elm_thumb_eo.legacy.h
new file mode 100644
index 0000000..cde5938
--- /dev/null
+++ b/src/lib/elementary/elm_thumb_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ELM_THUMB_EO_LEGACY_H_
2#define _ELM_THUMB_EO_LEGACY_H_
3
4#ifndef _ELM_THUMB_EO_CLASS_TYPE
5#define _ELM_THUMB_EO_CLASS_TYPE
6
7typedef Eo Elm_Thumb;
8
9#endif
10
11#ifndef _ELM_THUMB_EO_TYPES
12#define _ELM_THUMB_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/elm_thumb_legacy.h b/src/lib/elementary/elm_thumb_legacy.h
index b37e395..48fcc1a 100644
--- a/src/lib/elementary/elm_thumb_legacy.h
+++ b/src/lib/elementary/elm_thumb_legacy.h
@@ -314,4 +314,4 @@ EAPI void elm_thumb_path_get(const Evas_Object *obj, const char **file, const ch
314 */ 314 */
315EAPI void elm_thumb_reload(Evas_Object *obj); 315EAPI void elm_thumb_reload(Evas_Object *obj);
316 316
317#include "elm_thumb.eo.legacy.h" 317#include "elm_thumb_eo.legacy.h"
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 23f20e4..5bb910b 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -10,7 +10,7 @@
10 10
11#include "elm_priv.h" 11#include "elm_priv.h"
12#include "elm_entry_eo.h" 12#include "elm_entry_eo.h"
13#include "elm_thumb.eo.h" 13#include "elm_thumb_eo.h"
14#include "elm_label_eo.h" 14#include "elm_label_eo.h"
15 15
16#include <assert.h> 16#include <assert.h>
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 6637554..2e79282 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -18,7 +18,6 @@ pub_legacy_eo_files = [
18 'elm_actionslider_part.eo', 18 'elm_actionslider_part.eo',
19 'elm_bubble_part.eo', 19 'elm_bubble_part.eo',
20 'elm_fileselector_part.eo', 20 'elm_fileselector_part.eo',
21 'elm_thumb.eo',
22] 21]
23 22
24pub_eo_file_target = [] 23pub_eo_file_target = []
@@ -801,6 +800,8 @@ elementary_pub_headers = [
801 'elm_systray_eo.legacy.h', 800 'elm_systray_eo.legacy.h',
802 'elm_table_eo.h', 801 'elm_table_eo.h',
803 'elm_table_eo.legacy.h', 802 'elm_table_eo.legacy.h',
803 'elm_thumb_eo.h',
804 'elm_thumb_eo.legacy.h',
804] 805]
805 806
806elementary_header_src = [ 807elementary_header_src = [