summaryrefslogtreecommitdiff
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
parent212eca4321764524cad43b9bb785edf6794eeb69 (diff)
Follow Eo -> Efl renames
-rw-r--r--efl/elementary/elementary_cdef.pxi2
-rw-r--r--efl/elementary/systray.pxi6
-rw-r--r--efl/elementary/systray_cdef.pxi2
-rw-r--r--efl/eo/efl.eo.pyx66
-rw-r--r--efl/evas/efl.evas_object_smart.pxi28
-rw-r--r--include/efl.c_eo.pxd130
-rw-r--r--include/efl.evas.pxd20
7 files changed, 127 insertions, 127 deletions
diff --git a/efl/elementary/elementary_cdef.pxi b/efl/elementary/elementary_cdef.pxi
index e8c5ac8..a9751e4 100644
--- a/efl/elementary/elementary_cdef.pxi
+++ b/efl/elementary/elementary_cdef.pxi
@@ -1,4 +1,4 @@
1from efl.c_eo cimport Eo as cEo, Eo_Class, eo_add 1from efl.c_eo cimport Eo as cEo, Efl_Class, efl_add
2from efl.eina cimport Eina_Rectangle, Eina_Compare_Cb, \ 2from efl.eina cimport Eina_Rectangle, Eina_Compare_Cb, \
3 eina_list_free, eina_list_append, eina_stringshare_del 3 eina_list_free, eina_list_append, eina_stringshare_del
4from efl.evas cimport Eina_List, Eina_Bool, Evas_Object, Evas_Font_Size, \ 4from efl.evas cimport Eina_List, Eina_Bool, Evas_Object, Evas_Font_Size, \
diff --git a/efl/elementary/systray.pxi b/efl/elementary/systray.pxi
index 94896fd..267eecd 100644
--- a/efl/elementary/systray.pxi
+++ b/efl/elementary/systray.pxi
@@ -26,7 +26,7 @@ cdef class Systray(Eo):
26 """ 26 """
27 27
28 def __init__(self, Eo parent not None, *args, **kwargs): 28 def __init__(self, Eo parent not None, *args, **kwargs):
29 cdef cEo *obj = eo_add(elm_systray_class_get(), parent.obj) 29 cdef cEo *obj = efl_add(elm_systray_class_get(), parent.obj)
30 self._set_obj(obj) 30 self._set_obj(obj)
31 self._set_properties_from_keyword_args(kwargs) 31 self._set_properties_from_keyword_args(kwargs)
32 32
@@ -108,13 +108,13 @@ cdef class Systray(Eo):
108 elm_obj_systray_menu_set(self.obj, value.obj) 108 elm_obj_systray_menu_set(self.obj, value.obj)
109 109
110 def __get__(self): 110 def __get__(self):
111 return object_from_instance(elm_obj_systray_menu_get(self.obj)) 111 return object_from_instance(<cEo *>elm_obj_systray_menu_get(self.obj))
112 112
113 def menu_set(self, Eo value): 113 def menu_set(self, Eo value):
114 elm_obj_systray_menu_set(self.obj, value.obj) 114 elm_obj_systray_menu_set(self.obj, value.obj)
115 115
116 def menu_get(self): 116 def menu_get(self):
117 return object_from_instance(elm_obj_systray_menu_get(self.obj)) 117 return object_from_instance(<cEo *>elm_obj_systray_menu_get(self.obj))
118 118
119 property att_icon_name: 119 property att_icon_name:
120 """The name of the attention icon to be used by the Status Notifier Item. 120 """The name of the attention icon to be used by the Status Notifier Item.
diff --git a/efl/elementary/systray_cdef.pxi b/efl/elementary/systray_cdef.pxi
index 759a54d..3768c7c 100644
--- a/efl/elementary/systray_cdef.pxi
+++ b/efl/elementary/systray_cdef.pxi
@@ -4,7 +4,7 @@ cdef extern from "Elementary.h":
4 4
5 ctypedef cEo Elm_Systray 5 ctypedef cEo Elm_Systray
6 6
7 const Eo_Class *elm_systray_class_get() 7 const Efl_Class *elm_systray_class_get()
8 8
9 void elm_obj_systray_id_set(cEo *obj, const char *id) 9 void elm_obj_systray_id_set(cEo *obj, const char *id)
10 const char * elm_obj_systray_id_get(const cEo *obj) 10 const char * elm_obj_systray_id_get(const cEo *obj)
diff --git a/efl/eo/efl.eo.pyx b/efl/eo/efl.eo.pyx
index bc559e8..4880e07 100644
--- a/efl/eo/efl.eo.pyx
+++ b/efl/eo/efl.eo.pyx
@@ -36,15 +36,15 @@ from efl.eina cimport Eina_Bool, \
36 Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \ 36 Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \
37 eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \ 37 eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \
38 Eina_Iterator, eina_iterator_next, eina_iterator_free 38 Eina_Iterator, eina_iterator_next, eina_iterator_free
39from efl.c_eo cimport Eo as cEo, eo_init, eo_shutdown, eo_del, \ 39from efl.c_eo cimport Eo as cEo, efl_object_init, efl_object_shutdown, efl_del, \
40 eo_class_name_get, eo_class_get, eo_base_class_get,\ 40 efl_class_name_get, efl_class_get, efl_object_class_get,\
41 eo_key_data_set, eo_key_data_get, \ 41 efl_key_data_set, efl_key_data_get, \
42 eo_event_callback_add, eo_event_callback_del, EO_EVENT_DEL, \ 42 efl_event_callback_add, efl_event_callback_del, EFL_EVENT_DEL, \
43 eo_parent_get, eo_parent_set, Eo_Event_Description, \ 43 efl_parent_get, efl_parent_set, Efl_Event_Description, \
44 eo_event_freeze, eo_event_thaw, eo_event_freeze_count_get, \ 44 efl_event_freeze, efl_event_thaw, efl_event_freeze_count_get, \
45 eo_event_global_freeze, eo_event_global_thaw, \ 45 efl_event_global_freeze, efl_event_global_thaw, \
46 eo_event_global_freeze_count_get, eo_event_callback_stop, \ 46 efl_event_global_freeze_count_get, efl_event_callback_stop, \
47 eo_children_iterator_new, Eo_Event 47 efl_children_iterator_new, Eo_Event
48 48
49from efl.utils.logger cimport add_logger 49from efl.utils.logger cimport add_logger
50 50
@@ -61,23 +61,23 @@ import atexit
61 61
62def init(): 62def init():
63 EINA_LOG_DOM_INFO(PY_EFL_EO_LOG_DOMAIN, "Initializing efl.eo", NULL) 63 EINA_LOG_DOM_INFO(PY_EFL_EO_LOG_DOMAIN, "Initializing efl.eo", NULL)
64 return eo_init() 64 return efl_object_init()
65 65
66def shutdown(): 66def shutdown():
67 EINA_LOG_DOM_INFO(PY_EFL_EO_LOG_DOMAIN, "Shutting down efl.eo", NULL) 67 EINA_LOG_DOM_INFO(PY_EFL_EO_LOG_DOMAIN, "Shutting down efl.eo", NULL)
68 return eo_shutdown() 68 return efl_object_shutdown()
69 69
70init() 70init()
71atexit.register(shutdown) 71atexit.register(shutdown)
72 72
73def event_global_freeze_count_get(): 73def event_global_freeze_count_get():
74 return eo_event_global_freeze_count_get(<const cEo *>eo_base_class_get()) 74 return efl_event_global_freeze_count_get(<const cEo *>efl_object_class_get())
75 75
76def event_global_freeze(): 76def event_global_freeze():
77 eo_event_global_freeze(<const cEo *>eo_base_class_get()) 77 efl_event_global_freeze(<const cEo *>efl_object_class_get())
78 78
79def event_global_thaw(): 79def event_global_thaw():
80 eo_event_global_thaw(<const cEo *>eo_base_class_get()) 80 efl_event_global_thaw(<const cEo *>efl_object_class_get())
81 81
82###################################################################### 82######################################################################
83 83
@@ -113,14 +113,14 @@ cdef api object object_from_instance(cEo *obj):
113 cdef: 113 cdef:
114 void *data = NULL 114 void *data = NULL
115 Eo o 115 Eo o
116 const char *cls_name = eo_class_name_get(eo_class_get(obj)) 116 const char *cls_name = efl_class_name_get(efl_class_get(obj))
117 type cls 117 type cls
118 void *cls_ret 118 void *cls_ret
119 119
120 if obj == NULL: 120 if obj == NULL:
121 return None 121 return None
122 122
123 data = eo_key_data_get(obj, "python-eo") 123 data = efl_key_data_get(obj, "python-eo")
124 if data != NULL: 124 if data != NULL:
125 EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN, 125 EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN,
126 "Returning a Python object instance for Eo of type %s.", cls_name) 126 "Returning a Python object instance for Eo of type %s.", cls_name)
@@ -182,16 +182,16 @@ cdef void _register_decorated_callbacks(Eo obj):
182###################################################################### 182######################################################################
183 183
184 184
185cdef void _eo_event_del_cb(void *data, const Eo_Event *event) with gil: 185cdef void _efl_event_del_cb(void *data, const Eo_Event *event) with gil:
186 cdef: 186 cdef:
187 Eo self = <Eo>data 187 Eo self = <Eo>data
188 const char *cls_name = eo_class_name_get(eo_class_get(self.obj)) 188 const char *cls_name = efl_class_name_get(efl_class_get(self.obj))
189 189
190 EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN, "Deleting Eo: %s", cls_name) 190 EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN, "Deleting Eo: %s", cls_name)
191 191
192 eo_event_callback_stop(self.obj) 192 efl_event_callback_stop(self.obj)
193 eo_event_callback_del(self.obj, EO_EVENT_DEL, _eo_event_del_cb, <const void *>self) 193 efl_event_callback_del(self.obj, EFL_EVENT_DEL, _efl_event_del_cb, <const void *>self)
194 eo_key_data_set(self.obj, "python-eo", NULL) 194 efl_key_data_set(self.obj, "python-eo", NULL)
195 self.obj = NULL 195 self.obj = NULL
196 Py_DECREF(self) 196 Py_DECREF(self)
197 197
@@ -235,7 +235,7 @@ cdef class Eo(object):
235 def __repr__(self): 235 def __repr__(self):
236 cdef cEo *parent = NULL 236 cdef cEo *parent = NULL
237 if self.obj != NULL: 237 if self.obj != NULL:
238 parent = eo_parent_get(self.obj) 238 parent = efl_parent_get(self.obj)
239 return ("<%s object (Eo) at %#x (obj=%#x, parent=%#x, refcount=%d)>") % ( 239 return ("<%s object (Eo) at %#x (obj=%#x, parent=%#x, refcount=%d)>") % (
240 type(self).__name__, 240 type(self).__name__,
241 <uintptr_t><void *>self, 241 <uintptr_t><void *>self,
@@ -251,14 +251,14 @@ cdef class Eo(object):
251 assert obj != NULL, "Cannot set a NULL object" 251 assert obj != NULL, "Cannot set a NULL object"
252 252
253 self.obj = obj 253 self.obj = obj
254 eo_key_data_set(self.obj, "python-eo", <void *>self) 254 efl_key_data_set(self.obj, "python-eo", <void *>self)
255 eo_event_callback_add(self.obj, EO_EVENT_DEL, _eo_event_del_cb, <const void *>self) 255 efl_event_callback_add(self.obj, EFL_EVENT_DEL, _efl_event_del_cb, <const void *>self)
256 Py_INCREF(self) 256 Py_INCREF(self)
257 257
258 # from efl 1.18 eo.parent changed behaviour, objects are now reparented 258 # from efl 1.18 eo.parent changed behaviour, objects are now reparented
259 # when, fe, swallowed. This is the hack to keep the old behavior. 259 # when, fe, swallowed. This is the hack to keep the old behavior.
260 try: 260 try:
261 parent = object_from_instance(eo_parent_get(obj)) 261 parent = object_from_instance(efl_parent_get(obj))
262 except ValueError: 262 except ValueError:
263 parent = None 263 parent = None
264 self.internal_data["_legacy_parent"] = parent 264 self.internal_data["_legacy_parent"] = parent
@@ -268,7 +268,7 @@ cdef class Eo(object):
268 def _wipe_obj_data_NEVER_USE_THIS(self): 268 def _wipe_obj_data_NEVER_USE_THIS(self):
269 # only used in tests/eo/test_02_class_names.py 269 # only used in tests/eo/test_02_class_names.py
270 # to force object_from_instance() to recreate the obj 270 # to force object_from_instance() to recreate the obj
271 eo_key_data_set(self.obj, "python-eo", NULL) 271 efl_key_data_set(self.obj, "python-eo", NULL)
272 272
273 cdef int _set_properties_from_keyword_args(self, dict kwargs) except 0: 273 cdef int _set_properties_from_keyword_args(self, dict kwargs) except 0:
274 if kwargs: 274 if kwargs:
@@ -277,7 +277,7 @@ cdef class Eo(object):
277 return 1 277 return 1
278 278
279 def __iter__(self): 279 def __iter__(self):
280 return EoIterator.create(eo_children_iterator_new(self.obj)) 280 return EoIterator.create(efl_children_iterator_new(self.obj))
281 281
282 def delete(self): 282 def delete(self):
283 """Delete the object and free internal resources. 283 """Delete the object and free internal resources.
@@ -287,7 +287,7 @@ cdef class Eo(object):
287 garbage collector when there are no more reference to it. 287 garbage collector when there are no more reference to it.
288 288
289 """ 289 """
290 eo_del(self.obj) 290 efl_del(self.obj)
291 291
292 def is_deleted(self): 292 def is_deleted(self):
293 """Check if the object has been deleted thus leaving the object shallow. 293 """Check if the object has been deleted thus leaving the object shallow.
@@ -306,25 +306,25 @@ cdef class Eo(object):
306 """ 306 """
307 def __set__(self, Eo parent): 307 def __set__(self, Eo parent):
308 self.internal_data["_legacy_parent"] = parent 308 self.internal_data["_legacy_parent"] = parent
309 eo_parent_set(self.obj, parent.obj) 309 efl_parent_set(self.obj, parent.obj)
310 310
311 def __get__(self): 311 def __get__(self):
312 return self.internal_data["_legacy_parent"] 312 return self.internal_data["_legacy_parent"]
313 313
314 def parent_set(self, Eo parent): 314 def parent_set(self, Eo parent):
315 self.internal_data["_legacy_parent"] = parent 315 self.internal_data["_legacy_parent"] = parent
316 eo_parent_set(self.obj, parent.obj) 316 efl_parent_set(self.obj, parent.obj)
317 317
318 def parent_get(self): 318 def parent_get(self):
319 return self.internal_data["_legacy_parent"] 319 return self.internal_data["_legacy_parent"]
320 320
321 def event_freeze(self): 321 def event_freeze(self):
322 """Pause event propagation for this object.""" 322 """Pause event propagation for this object."""
323 eo_event_freeze(self.obj) 323 efl_event_freeze(self.obj)
324 324
325 def event_thaw(self): 325 def event_thaw(self):
326 """Restart event propagation for this object.""" 326 """Restart event propagation for this object."""
327 eo_event_thaw(self.obj) 327 efl_event_thaw(self.obj)
328 328
329 def event_freeze_count_get(self): 329 def event_freeze_count_get(self):
330 """Get the event freeze count for this object. 330 """Get the event freeze count for this object.
@@ -333,4 +333,4 @@ cdef class Eo(object):
333 :rtype: int 333 :rtype: int
334 334
335 """ 335 """
336 return eo_event_freeze_count_get(self.obj) 336 return efl_event_freeze_count_get(self.obj)
diff --git a/efl/evas/efl.evas_object_smart.pxi b/efl/evas/efl.evas_object_smart.pxi
index 2e71f66..dc3c396 100644
--- a/efl/evas/efl.evas_object_smart.pxi
+++ b/efl/evas/efl.evas_object_smart.pxi
@@ -16,7 +16,7 @@
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from efl.utils.conversions cimport eina_list_objects_to_python_list 18from efl.utils.conversions cimport eina_list_objects_to_python_list
19from efl.c_eo cimport eo_key_data_set, eo_key_data_get 19from efl.c_eo cimport efl_key_data_set, efl_key_data_get
20from efl.eo cimport Eo, EoIterator 20from efl.eo cimport Eo, EoIterator
21 21
22from cpython cimport Py_INCREF, Py_DECREF, PyObject_Call, \ 22from cpython cimport Py_INCREF, Py_DECREF, PyObject_Call, \
@@ -106,7 +106,7 @@ cdef void _smart_object_delete(Evas_Object *o) with gil:
106 return 106 return
107 cls = <Smart>tmp 107 cls = <Smart>tmp
108 108
109 tmp = eo_key_data_get(o, "python-eo") 109 tmp = efl_key_data_get(o, "python-eo")
110 if tmp == NULL: 110 if tmp == NULL:
111 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 111 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
112 obj = None 112 obj = None
@@ -131,7 +131,7 @@ cdef void _smart_object_move(Evas_Object *o, Evas_Coord x, Evas_Coord y) with gi
131 return 131 return
132 cls = <Smart>tmp 132 cls = <Smart>tmp
133 133
134 tmp = eo_key_data_get(o, "python-eo") 134 tmp = efl_key_data_get(o, "python-eo")
135 if tmp == NULL: 135 if tmp == NULL:
136 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 136 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
137 obj = None 137 obj = None
@@ -156,7 +156,7 @@ cdef void _smart_object_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h) with
156 return 156 return
157 cls = <Smart>tmp 157 cls = <Smart>tmp
158 158
159 tmp = eo_key_data_get(o, "python-eo") 159 tmp = efl_key_data_get(o, "python-eo")
160 if tmp == NULL: 160 if tmp == NULL:
161 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 161 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
162 obj = None 162 obj = None
@@ -181,7 +181,7 @@ cdef void _smart_object_show(Evas_Object *o) with gil:
181 return 181 return
182 cls = <Smart>tmp 182 cls = <Smart>tmp
183 183
184 tmp = eo_key_data_get(o, "python-eo") 184 tmp = efl_key_data_get(o, "python-eo")
185 if tmp == NULL: 185 if tmp == NULL:
186 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 186 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
187 obj = None 187 obj = None
@@ -206,7 +206,7 @@ cdef void _smart_object_hide(Evas_Object *o) with gil:
206 return 206 return
207 cls = <Smart>tmp 207 cls = <Smart>tmp
208 208
209 tmp = eo_key_data_get(o, "python-eo") 209 tmp = efl_key_data_get(o, "python-eo")
210 if tmp == NULL: 210 if tmp == NULL:
211 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 211 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
212 obj = None 212 obj = None
@@ -231,7 +231,7 @@ cdef void _smart_object_color_set(Evas_Object *o, int r, int g, int b, int a) wi
231 return 231 return
232 cls = <Smart>tmp 232 cls = <Smart>tmp
233 233
234 tmp = eo_key_data_get(o, "python-eo") 234 tmp = efl_key_data_get(o, "python-eo")
235 if tmp == NULL: 235 if tmp == NULL:
236 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 236 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
237 obj = None 237 obj = None
@@ -257,7 +257,7 @@ cdef void _smart_object_clip_set(Evas_Object *o, Evas_Object *clip) with gil:
257 return 257 return
258 cls = <Smart>tmp 258 cls = <Smart>tmp
259 259
260 tmp = eo_key_data_get(o, "python-eo") 260 tmp = efl_key_data_get(o, "python-eo")
261 if tmp == NULL: 261 if tmp == NULL:
262 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 262 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
263 obj = None 263 obj = None
@@ -284,7 +284,7 @@ cdef void _smart_object_clip_unset(Evas_Object *o) with gil:
284 return 284 return
285 cls = <Smart>tmp 285 cls = <Smart>tmp
286 286
287 tmp = eo_key_data_get(o, "python-eo") 287 tmp = efl_key_data_get(o, "python-eo")
288 if tmp == NULL: 288 if tmp == NULL:
289 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 289 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
290 obj = None 290 obj = None
@@ -309,7 +309,7 @@ cdef void _smart_object_calculate(Evas_Object *o) with gil:
309 return 309 return
310 cls = <Smart>tmp 310 cls = <Smart>tmp
311 311
312 tmp = eo_key_data_get(o, "python-eo") 312 tmp = efl_key_data_get(o, "python-eo")
313 if tmp == NULL: 313 if tmp == NULL:
314 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 314 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
315 obj = None 315 obj = None
@@ -335,7 +335,7 @@ cdef void _smart_object_member_add(Evas_Object *o, Evas_Object *clip) with gil:
335 return 335 return
336 cls = <Smart>tmp 336 cls = <Smart>tmp
337 337
338 tmp = eo_key_data_get(o, "python-eo") 338 tmp = efl_key_data_get(o, "python-eo")
339 if tmp == NULL: 339 if tmp == NULL:
340 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 340 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
341 obj = None 341 obj = None
@@ -363,7 +363,7 @@ cdef void _smart_object_member_del(Evas_Object *o, Evas_Object *clip) with gil:
363 return 363 return
364 cls = <Smart>tmp 364 cls = <Smart>tmp
365 365
366 tmp = eo_key_data_get(o, "python-eo") 366 tmp = efl_key_data_get(o, "python-eo")
367 if tmp == NULL: 367 if tmp == NULL:
368 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 368 EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
369 obj = None 369 obj = None
@@ -406,7 +406,7 @@ cdef void _smart_callback(void *data, Evas_Object *o, void *event_info) with gil
406 list tmp_args 406 list tmp_args
407 list lst 407 list lst
408 408
409 tmp = eo_key_data_get(o, "python-eo") 409 tmp = efl_key_data_get(o, "python-eo")
410 if tmp == NULL: 410 if tmp == NULL:
411 EINA_LOG_DOM_ERR(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL) 411 EINA_LOG_DOM_ERR(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
412 return 412 return
@@ -704,7 +704,7 @@ cdef class SmartObject(Object):
704 assert obj != NULL, "Cannot set a NULL object" 704 assert obj != NULL, "Cannot set a NULL object"
705 705
706 self.obj = obj 706 self.obj = obj
707 eo_key_data_set(self.obj, "python-eo", <void *>self) 707 efl_key_data_set(self.obj, "python-eo", <void *>self)
708 evas_object_event_callback_add(obj, enums.EVAS_CALLBACK_FREE, 708 evas_object_event_callback_add(obj, enums.EVAS_CALLBACK_FREE,
709 obj_free_cb, <void *>self) 709 obj_free_cb, <void *>self)
710 Py_INCREF(self) 710 Py_INCREF(self)
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)