summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2016-08-21 19:53:41 +0300
committerKai Huuhko <kai.huuhko@gmail.com>2016-08-21 19:53:41 +0300
commit6fa2d3ff954aaf7cc7ad44e8b7c0c7bd52fba782 (patch)
treeb7f29017438a86fffbeea9e3512cfc26d9193dc2 /include
parent212eca4321764524cad43b9bb785edf6794eeb69 (diff)
Follow Eo -> Efl renames
Diffstat (limited to 'include')
-rw-r--r--include/efl.c_eo.pxd130
-rw-r--r--include/efl.evas.pxd20
2 files changed, 75 insertions, 75 deletions
diff --git a/include/efl.c_eo.pxd b/include/efl.c_eo.pxd
index 4039f64..dab91b7 100644
--- a/include/efl.c_eo.pxd
+++ b/include/efl.c_eo.pxd
@@ -22,56 +22,56 @@ cdef extern from "Eo.h":
22 #################################################################### 22 ####################################################################
23 # Enums (not exported to python, only for internal use) 23 # Enums (not exported to python, only for internal use)
24 # 24 #
25 cdef enum: 25 #cdef enum:
26 EO_BASE_SUB_ID_CONSTRUCTOR 26 # EO_BASE_SUB_ID_CONSTRUCTOR
27 EO_BASE_SUB_ID_DESTRUCTOR 27 # EO_BASE_SUB_ID_DESTRUCTOR
28 EO_BASE_SUB_ID_PARENT_SET 28 # EO_BASE_SUB_ID_PARENT_SET
29 EO_BASE_SUB_ID_PARENT_GET 29 # EO_BASE_SUB_ID_PARENT_GET
30 EO_BASE_SUB_ID_CHILDREN_ITERATOR_NEW 30 # EO_BASE_SUB_ID_CHILDREN_ITERATOR_NEW
31 EO_BASE_SUB_ID_DATA_SET 31 # EO_BASE_SUB_ID_DATA_SET
32 EO_BASE_SUB_ID_DATA_GET 32 # EO_BASE_SUB_ID_DATA_GET
33 EO_BASE_SUB_ID_DATA_DEL 33 # EO_BASE_SUB_ID_DATA_DEL
34 EO_BASE_SUB_ID_WREF_ADD 34 # EO_BASE_SUB_ID_WREF_ADD
35 EO_BASE_SUB_ID_WREF_DEL 35 # EO_BASE_SUB_ID_WREF_DEL
36 EO_BASE_SUB_ID_EVENT_CALLBACK_PRIORITY_ADD 36 # EO_BASE_SUB_ID_EVENT_CALLBACK_PRIORITY_ADD
37 EO_BASE_SUB_ID_EVENT_CALLBACK_DEL 37 # EO_BASE_SUB_ID_EVENT_CALLBACK_DEL
38 EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_PRIORITY_ADD 38 # EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_PRIORITY_ADD
39 EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_DEL 39 # EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_DEL
40 EO_BASE_SUB_ID_EVENT_CALLBACK_CALL 40 # EO_BASE_SUB_ID_EVENT_CALLBACK_CALL
41 EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_ADD 41 # EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_ADD
42 EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_DEL 42 # EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_DEL
43 EO_BASE_SUB_ID_EVENT_FREEZE 43 # EO_BASE_SUB_ID_EVENT_FREEZE
44 EO_BASE_SUB_ID_EVENT_THAW 44 # EO_BASE_SUB_ID_EVENT_THAW
45 EO_BASE_SUB_ID_EVENT_FREEZE_GET 45 # EO_BASE_SUB_ID_EVENT_FREEZE_GET
46 EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE 46 # EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE
47 EO_BASE_SUB_ID_EVENT_GLOBAL_THAW 47 # EO_BASE_SUB_ID_EVENT_GLOBAL_THAW
48 EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE_GET 48 # EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE_GET
49 EO_BASE_SUB_ID_DBG_INFO_GET 49 # EO_BASE_SUB_ID_DBG_INFO_GET
50 EO_BASE_SUB_ID_LAST 50 # EO_BASE_SUB_ID_LAST
51 51
52 cdef enum: 52 cdef enum:
53 EO_CALLBACK_PRIORITY_BEFORE 53 EFL_CALLBACK_PRIORITY_BEFORE
54 EO_CALLBACK_PRIORITY_DEFAULT 54 EFL_CALLBACK_PRIORITY_DEFAULT
55 EO_CALLBACK_PRIORITY_AFTER 55 EFL_CALLBACK_PRIORITY_AFTER
56 56
57 57
58 #################################################################### 58 ####################################################################
59 # Structures 59 # Structures
60 # 60 #
61 ctypedef struct Eo 61 ctypedef struct Eo
62 ctypedef Eo Eo_Base 62 ctypedef Eo Efl_Object
63 63
64 ctypedef struct Eo_Class 64 ctypedef Eo Efl_Class
65 65
66 ctypedef struct _Eo_Event_Description: 66 ctypedef struct _Efl_Event_Description:
67 const char *name # name of the event. 67 const char *name # name of the event.
68 Eina_Bool unfreezable # Eina_True if the event cannot be frozen. 68 Eina_Bool unfreezable # Eina_True if the event cannot be frozen.
69 Eina_Bool legacy_is # Internal use: if is a legacy event. 69 Eina_Bool legacy_is # Internal use: if is a legacy event.
70 ctypedef _Eo_Event_Description Eo_Event_Description 70 ctypedef _Efl_Event_Description Efl_Event_Description
71 71
72 ctypedef struct _Eo_Event: 72 ctypedef struct _Eo_Event:
73 Eo_Base *obj # The object the event was called on. */ 73 Efl_Object *obj # The object the event was called on. */
74 const Eo_Event_Description *desc # The event description. */ 74 const Efl_Event_Description *desc # The event description. */
75 void *event_info # Extra event information passed by the event caller. */ 75 void *event_info # Extra event information passed by the event caller. */
76 ctypedef _Eo_Event Eo_Event 76 ctypedef _Eo_Event Eo_Event
77 77
@@ -80,55 +80,55 @@ cdef extern from "Eo.h":
80 # Eo Events 80 # Eo Events
81 # 81 #
82 82
83 cdef const Eo_Event_Description *EO_EVENT_DEL 83 cdef const Efl_Event_Description *EFL_EVENT_DEL
84 84
85 85
86 #################################################################### 86 ####################################################################
87 # Other typedefs 87 # Other typedefs
88 # 88 #
89 ctypedef void (*Eo_Event_Cb)(void *data, const Eo_Event *event) 89 ctypedef void (*Efl_Event_Cb)(void *data, const Eo_Event *event)
90 90
91 ctypedef void (*eo_key_data_free_func)(void *) 91 ctypedef void (*efl_key_data_free_func)(void *)
92 92
93 93
94 #################################################################### 94 ####################################################################
95 # Functions 95 # Functions
96 # 96 #
97 int eo_init() 97 int efl_object_init()
98 int eo_shutdown() 98 int efl_object_shutdown()
99 99
100 Eo *eo_add(const Eo_Class *klass, Eo *parent, ...) 100 Eo *efl_add(const Efl_Class *klass, Eo *parent, ...)
101 void eo_del(const Eo *obj) 101 void efl_del(const Eo *obj)
102 Eo *eo_ref(const Eo *obj) 102 Eo *efl_ref(const Eo *obj)
103 void eo_unref(const Eo *obj) 103 void efl_unref(const Eo *obj)
104 int eo_ref_get(const Eo *obj) 104 int efl_ref_get(const Eo *obj)
105 105
106 void eo_wref_add(Eo **wref) 106 void efl_wref_add(Eo **wref)
107 107
108 const Eo_Class *eo_base_class_get() 108 const Efl_Class *efl_object_class_get()
109 109
110 void eo_key_data_set(Eo *obj, const char *key, const void *data) 110 void efl_key_data_set(Eo *obj, const char *key, const void *data)
111 void *eo_key_data_get(Eo *obj, const char *key) 111 void *efl_key_data_get(Eo *obj, const char *key)
112 112
113 const Eo_Class *eo_class_get(const Eo *obj) 113 const Efl_Class *efl_class_get(const Eo *obj)
114 const char *eo_class_name_get(const Eo_Class *klass) 114 const char *efl_class_name_get(const Efl_Class *klass)
115 115
116 void eo_parent_set(Eo *obj, Eo *parent) 116 void efl_parent_set(Eo *obj, Eo *parent)
117 Eo *eo_parent_get(const Eo *obj) 117 Eo *efl_parent_get(const Eo *obj)
118 118
119 void eo_event_callback_stop(Eo *obj) 119 void efl_event_callback_stop(Eo *obj)
120 void eo_event_callback_forwarder_add(Eo *obj, const Eo_Event_Description *desc, Eo *new_obj) 120 void efl_event_callback_forwarder_add(Eo *obj, const Efl_Event_Description *desc, Eo *new_obj)
121 void eo_event_callback_forwarder_del(Eo *obj, const Eo_Event_Description *desc, Eo *new_obj) 121 void efl_event_callback_forwarder_del(Eo *obj, const Efl_Event_Description *desc, Eo *new_obj)
122 122
123 void eo_event_freeze(Eo *obj) 123 void efl_event_freeze(Eo *obj)
124 void eo_event_thaw(Eo *obj) 124 void efl_event_thaw(Eo *obj)
125 int eo_event_freeze_count_get(const Eo *obj) 125 int efl_event_freeze_count_get(const Eo *obj)
126 126
127 void eo_event_global_freeze(Eo *obj) 127 void efl_event_global_freeze(Eo *obj)
128 void eo_event_global_thaw(Eo *obj) 128 void efl_event_global_thaw(Eo *obj)
129 int eo_event_global_freeze_count_get(const Eo *obj) 129 int efl_event_global_freeze_count_get(const Eo *obj)
130 130
131 Eina_Bool eo_event_callback_add(Eo *obj, const Eo_Event_Description *desc, Eo_Event_Cb cb, const void *data) 131 Eina_Bool efl_event_callback_add(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb cb, const void *data)
132 Eina_Bool eo_event_callback_del(Eo *obj, const Eo_Event_Description *desc, Eo_Event_Cb cb, const void *data) 132 Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb cb, const void *data)
133 133
134 Eina_Iterator * eo_children_iterator_new(Eo *obj) 134 Eina_Iterator * efl_children_iterator_new(Eo *obj)
diff --git a/include/efl.evas.pxd b/include/efl.evas.pxd
index fe2998e..7f5ed6b 100644
--- a/include/efl.evas.pxd
+++ b/include/efl.evas.pxd
@@ -18,7 +18,7 @@
18from cpython cimport PyObject 18from cpython cimport PyObject
19from efl.eina cimport * 19from efl.eina cimport *
20from efl.eo cimport Eo 20from efl.eo cimport Eo
21from efl.c_eo cimport Eo as cEo, Eo_Class 21from efl.c_eo cimport Eo as cEo, Efl_Class
22 22
23from efl.evas.enums cimport Evas_Button_Flags, Evas_BiDi_Direction, \ 23from efl.evas.enums cimport Evas_Button_Flags, Evas_BiDi_Direction, \
24 Evas_Callback_Type, Evas_Event_Flags, Evas_Touch_Point_State, \ 24 Evas_Callback_Type, Evas_Event_Flags, Evas_Touch_Point_State, \
@@ -304,7 +304,7 @@ cdef extern from "Evas.h":
304 Evas *evas_new() 304 Evas *evas_new()
305 void evas_free(Evas *e) 305 void evas_free(Evas *e)
306 306
307 const Eo_Class *evas_class_get() 307 const Efl_Class *evas_class_get()
308 308
309 int evas_render_method_lookup(const char *name) 309 int evas_render_method_lookup(const char *name)
310 Eina_List *evas_render_method_list() 310 Eina_List *evas_render_method_list()
@@ -516,7 +516,7 @@ cdef extern from "Evas.h":
516 void evas_smart_free(Evas_Smart *s) 516 void evas_smart_free(Evas_Smart *s)
517 Evas_Smart *evas_smart_class_new(Evas_Smart_Class *sc) 517 Evas_Smart *evas_smart_class_new(Evas_Smart_Class *sc)
518 Evas_Smart_Class *evas_smart_class_get(Evas_Smart *s) 518 Evas_Smart_Class *evas_smart_class_get(Evas_Smart *s)
519 const Eo_Class *evas_object_smart_class_get() 519 const Efl_Class *evas_object_smart_class_get()
520 const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count) 520 const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count)
521 const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name) 521 const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name)
522 522
@@ -550,7 +550,7 @@ cdef extern from "Evas.h":
550 # Rectangle Object 550 # Rectangle Object
551 # 551 #
552 Evas_Object *evas_object_rectangle_add(Evas *e) 552 Evas_Object *evas_object_rectangle_add(Evas *e)
553 const Eo_Class *evas_object_rectangle_class_get() 553 const Efl_Class *evas_object_rectangle_class_get()
554 554
555 555
556 #################################################################### 556 ####################################################################
@@ -559,7 +559,7 @@ cdef extern from "Evas.h":
559 Evas_Object *evas_object_line_add(Evas *e) 559 Evas_Object *evas_object_line_add(Evas *e)
560 void evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2) 560 void evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2)
561 void evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2) 561 void evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2)
562 const Eo_Class *evas_object_line_class_get() 562 const Efl_Class *evas_object_line_class_get()
563 563
564 564
565 #################################################################### 565 ####################################################################
@@ -568,7 +568,7 @@ cdef extern from "Evas.h":
568 Evas_Object *evas_object_image_add(Evas *e) 568 Evas_Object *evas_object_image_add(Evas *e)
569 # TODO: Use this?: Evas_Object *evas_object_image_filled_add(Evas *e) 569 # TODO: Use this?: Evas_Object *evas_object_image_filled_add(Evas *e)
570 # TODO: void evas_object_image_memfile_set(Evas_Object *obj, void *data, int size, char *format, char *key) 570 # TODO: void evas_object_image_memfile_set(Evas_Object *obj, void *data, int size, char *format, char *key)
571 # TODO: Is this needed?: const Eo_Class *evas_object_image_class_get() 571 # TODO: Is this needed?: const Efl_Class *evas_object_image_class_get()
572 void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key) 572 void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
573 void evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key) 573 void evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key)
574 void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b) 574 void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
@@ -647,7 +647,7 @@ cdef extern from "Evas.h":
647 # Polygon Object 647 # Polygon Object
648 # 648 #
649 Evas_Object *evas_object_polygon_add(Evas *e) 649 Evas_Object *evas_object_polygon_add(Evas *e)
650 const Eo_Class *evas_object_polygon_class_get() 650 const Efl_Class *evas_object_polygon_class_get()
651 void evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y) 651 void evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
652 void evas_object_polygon_points_clear(Evas_Object *obj) 652 void evas_object_polygon_points_clear(Evas_Object *obj)
653 653
@@ -656,7 +656,7 @@ cdef extern from "Evas.h":
656 # Text Object (py3:TODO) 656 # Text Object (py3:TODO)
657 # 657 #
658 Evas_Object *evas_object_text_add(Evas *e) 658 Evas_Object *evas_object_text_add(Evas *e)
659 const Eo_Class *evas_object_text_class_get() 659 const Efl_Class *evas_object_text_class_get()
660 void evas_object_text_font_source_set(Evas_Object *obj, const char *font) 660 void evas_object_text_font_source_set(Evas_Object *obj, const char *font)
661 const char *evas_object_text_font_source_get(const Evas_Object *obj) 661 const char *evas_object_text_font_source_get(const Evas_Object *obj)
662 void evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size) 662 void evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size)
@@ -689,7 +689,7 @@ cdef extern from "Evas.h":
689 # Textblock Object (py3:TODO) 689 # Textblock Object (py3:TODO)
690 # 690 #
691 Evas_Object *evas_object_textblock_add(Evas *e) 691 Evas_Object *evas_object_textblock_add(Evas *e)
692 const Eo_Class *evas_object_textblock_class_get() 692 const Efl_Class *evas_object_textblock_class_get()
693 Evas_Textblock_Style *evas_textblock_style_new() 693 Evas_Textblock_Style *evas_textblock_style_new()
694 void evas_textblock_style_free(Evas_Textblock_Style *ts) 694 void evas_textblock_style_free(Evas_Textblock_Style *ts)
695 void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) 695 void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
@@ -753,7 +753,7 @@ cdef extern from "Evas.h":
753 # 753 #
754 Evas_Object *evas_object_box_add(Evas *e) 754 Evas_Object *evas_object_box_add(Evas *e)
755 Evas_Object *evas_object_box_add_to(Evas_Object *parent) 755 Evas_Object *evas_object_box_add_to(Evas_Object *parent)
756 # TODO: Is this needed?: const Eo_Class *evas_object_box_class_get() 756 # TODO: Is this needed?: const Efl_Class *evas_object_box_class_get()
757 757
758 void evas_object_box_align_set(Evas_Object *o, double horizontal, double vertical) 758 void evas_object_box_align_set(Evas_Object *o, double horizontal, double vertical)
759 void evas_object_box_align_get(const Evas_Object *o, double *horizontal, double *vertical) 759 void evas_object_box_align_get(const Evas_Object *o, double *horizontal, double *vertical)