summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Eo.am8
-rw-r--r--src/lib/eo/Eo.h204
-rw-r--r--src/lib/eo/efl_class.eo4
-rw-r--r--src/lib/eo/efl_interface.eo (renamed from src/lib/eo/eo_interface.eo)4
-rw-r--r--src/lib/eo/efl_object.eo (renamed from src/lib/eo/eo_base.eo)86
-rw-r--r--src/lib/eo/efl_object_override.eo (renamed from src/lib/eo/eo_override.eo)2
-rw-r--r--src/lib/eo/eo.c184
-rw-r--r--src/lib/eo/eo_base_class.c340
-rw-r--r--src/lib/eo/eo_class.eo4
-rw-r--r--src/lib/eo/eo_class_class.c4
-rw-r--r--src/lib/eo/eo_private.h36
-rw-r--r--src/lib/eo/eo_ptr_indirection.h8
12 files changed, 442 insertions, 442 deletions
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 7d4c09b3af..f41c09f3c9 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -2,10 +2,10 @@
2### Library 2### Library
3 3
4eo_eolian_files = \ 4eo_eolian_files = \
5 lib/eo/eo_base.eo \ 5 lib/eo/efl_object.eo \
6 lib/eo/eo_class.eo \ 6 lib/eo/efl_class.eo \
7 lib/eo/eo_override.eo \ 7 lib/eo/efl_object_override.eo \
8 lib/eo/eo_interface.eo 8 lib/eo/efl_interface.eo
9 9
10eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c) 10eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c)
11eo_eolian_h = $(eo_eolian_files:%.eo=%.eo.h) 11eo_eolian_h = $(eo_eolian_files:%.eo=%.eo.h)
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index b3b4df6781..5821288015 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -89,8 +89,8 @@ extern "C" {
89 * 89 *
90 * Recommended reading: 90 * Recommended reading:
91 * 91 *
92 * @li @ref Eo_Class_Base 92 * @li @ref Efl_Class_Base
93 * @li @ref Eo_Class 93 * @li @ref Efl_Class
94 * @li @ref Eo_Events 94 * @li @ref Eo_Events
95 * @li @ref Eo_Composite_Objects 95 * @li @ref Eo_Composite_Objects
96 * 96 *
@@ -113,14 +113,14 @@ typedef struct _Eo_Object _Eo_Object;
113typedef struct _Eo_Opaque Eo; 113typedef struct _Eo_Opaque Eo;
114 114
115/** 115/**
116 * @typedef Eo_Class 116 * @typedef Efl_Class
117 * The basic class type - should be removed, just for compat. 117 * The basic class type - should be removed, just for compat.
118 */ 118 */
119typedef Eo Eo_Class; 119typedef Eo Efl_Class;
120#define _EO_CLASS_EO_CLASS_TYPE 120#define _EFL_CLASS_EO_CLASS_TYPE
121 121
122typedef Eo Eo_Base; 122typedef Eo Efl_Object;
123#define _EO_BASE_EO_CLASS_TYPE 123#define _EFL_BASE_EO_CLASS_TYPE
124 124
125#ifdef EFL_BETA_API_SUPPORT 125#ifdef EFL_BETA_API_SUPPORT
126 126
@@ -174,10 +174,10 @@ typedef enum _Eo_Op_Type Eo_Op_Type;
174 */ 174 */
175typedef void (*Eo_Del_Intercept) (Eo *obj_id); 175typedef void (*Eo_Del_Intercept) (Eo *obj_id);
176 176
177#include "eo_override.eo.h" 177#include "efl_object_override.eo.h"
178#include "eo_base.eo.h" 178#include "efl_object.eo.h"
179#include "eo_interface.eo.h" 179#include "efl_interface.eo.h"
180#define EO_CLASS EO_BASE_CLASS 180#define EO_CLASS EFL_OBJECT_CLASS
181 181
182/** 182/**
183 * @addtogroup Eo_Debug_Information Eo's Debug information helper. 183 * @addtogroup Eo_Debug_Information Eo's Debug information helper.
@@ -196,10 +196,10 @@ EAPI extern const Eina_Value_Type *EO_DBG_INFO_TYPE;
196 * @param[in] name name of the list 196 * @param[in] name name of the list
197 * @return the new list 197 * @return the new list
198 */ 198 */
199static inline Eo_Dbg_Info * 199static inline Efl_Dbg_Info *
200EO_DBG_INFO_LIST_APPEND(Eo_Dbg_Info *list, const char *name) 200EO_DBG_INFO_LIST_APPEND(Efl_Dbg_Info *list, const char *name)
201{ 201{
202 Eo_Dbg_Info *tmp = (Eo_Dbg_Info *)calloc(1, sizeof(*tmp)); 202 Efl_Dbg_Info *tmp = (Efl_Dbg_Info *)calloc(1, sizeof(*tmp));
203 203
204 if (!tmp) return NULL; 204 if (!tmp) return NULL;
205 tmp->name = eina_stringshare_add(name); 205 tmp->name = eina_stringshare_add(name);
@@ -214,17 +214,17 @@ EO_DBG_INFO_LIST_APPEND(Eo_Dbg_Info *list, const char *name)
214/** 214/**
215 * @def EO_DBG_INFO_APPEND 215 * @def EO_DBG_INFO_APPEND
216 * Creates a new debug info into a list 216 * Creates a new debug info into a list
217 * @param[in] LIST list where to append (Eo_Dbg_Info *) 217 * @param[in] LIST list where to append (Efl_Dbg_Info *)
218 * @param[in] NAME name of the parameter (const char *) 218 * @param[in] NAME name of the parameter (const char *)
219 * @param[in] TYPE type of the parameter (Eina_Value_Type *) 219 * @param[in] TYPE type of the parameter (Eina_Value_Type *)
220 * @param[in] VALUE value of the parameter 220 * @param[in] VALUE value of the parameter
221 */ 221 */
222#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE, VALUE) \ 222#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE, VALUE) \
223do { \ 223do { \
224 Eo_Dbg_Info *List = LIST; \ 224 Efl_Dbg_Info *List = LIST; \
225 if (List) \ 225 if (List) \
226 { \ 226 { \
227 Eo_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \ 227 Efl_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \
228 \ 228 \
229 if (!Tmp) break; \ 229 if (!Tmp) break; \
230 Tmp->name = eina_stringshare_add(NAME); \ 230 Tmp->name = eina_stringshare_add(NAME); \
@@ -235,10 +235,10 @@ do { \
235} while (0) 235} while (0)
236 236
237/** 237/**
238 * Frees the Eo_Dbg_Info tree. (The whole tree recursively). 238 * Frees the Efl_Dbg_Info tree. (The whole tree recursively).
239 * @param[in] info The tree to delete. 239 * @param[in] info The tree to delete.
240 */ 240 */
241EAPI void eo_dbg_info_free(Eo_Dbg_Info *info); 241EAPI void eo_dbg_info_free(Efl_Dbg_Info *info);
242 242
243/** 243/**
244 * @} 244 * @}
@@ -262,40 +262,40 @@ typedef unsigned int Eo_Op;
262 */ 262 */
263 263
264/** 264/**
265 * @def EO_EVENT_DESCRIPTION(name) 265 * @def EFL_EVENT_DESCRIPTION(name)
266 * An helper macro to help populating #Eo_Event_Description 266 * An helper macro to help populating #Efl_Event_Description
267 * @param name The name of the event. 267 * @param name The name of the event.
268 * @see Eo_Event_Description 268 * @see Efl_Event_Description
269 */ 269 */
270#define EO_EVENT_DESCRIPTION(name) { name, EINA_FALSE, EINA_FALSE, EINA_FALSE } 270#define EFL_EVENT_DESCRIPTION(name) { name, EINA_FALSE, EINA_FALSE, EINA_FALSE }
271 271
272/** 272/**
273 * @def EO_EVENT_DESCRIPTION_HOT(name) 273 * @def EFL_EVENT_DESCRIPTION_HOT(name)
274 * An helper macro to help populating #Eo_Event_Description and make 274 * An helper macro to help populating #Efl_Event_Description and make
275 * the event impossible to freeze. 275 * the event impossible to freeze.
276 * @param name The name of the event. 276 * @param name The name of the event.
277 * @see Eo_Event_Description 277 * @see Efl_Event_Description
278 * @see EO_EVENT_DESCRIPTION 278 * @see EFL_EVENT_DESCRIPTION
279 */ 279 */
280#define EO_EVENT_DESCRIPTION_HOT(name) { name, EINA_TRUE, EINA_FALSE, EINA_FALSE } 280#define EFL_EVENT_DESCRIPTION_HOT(name) { name, EINA_TRUE, EINA_FALSE, EINA_FALSE }
281 281
282/** 282/**
283 * @def EO_EVENT_DESCRIPTION(name) 283 * @def EFL_EVENT_DESCRIPTION(name)
284 * An helper macro to help populating #Eo_Event_Description 284 * An helper macro to help populating #Efl_Event_Description
285 * @param name The name of the event. 285 * @param name The name of the event.
286 * @see Eo_Event_Description 286 * @see Efl_Event_Description
287 */ 287 */
288#define EO_EVENT_DESCRIPTION_RESTART(name) { name, EINA_FALSE, EINA_FALSE, EINA_TRUE } 288#define EFL_EVENT_DESCRIPTION_RESTART(name) { name, EINA_FALSE, EINA_FALSE, EINA_TRUE }
289 289
290/** 290/**
291 * @def EO_EVENT_DESCRIPTION_HOT(name) 291 * @def EFL_EVENT_DESCRIPTION_HOT(name)
292 * An helper macro to help populating #Eo_Event_Description and make 292 * An helper macro to help populating #Efl_Event_Description and make
293 * the event impossible to freeze. 293 * the event impossible to freeze.
294 * @param name The name of the event. 294 * @param name The name of the event.
295 * @see Eo_Event_Description 295 * @see Efl_Event_Description
296 * @see EO_EVENT_DESCRIPTION 296 * @see EFL_EVENT_DESCRIPTION
297 */ 297 */
298#define EO_EVENT_DESCRIPTION_HOT_RESTART(name) { name, EINA_TRUE, EINA_FALSE, EINA_TRUE } 298#define EFL_EVENT_DESCRIPTION_HOT_RESTART(name) { name, EINA_TRUE, EINA_FALSE, EINA_TRUE }
299 299
300 300
301 301
@@ -304,7 +304,7 @@ typedef unsigned int Eo_Op;
304 */ 304 */
305 305
306/** 306/**
307 * @addtogroup Eo_Class Eo Class 307 * @addtogroup Efl_Class Efl Class
308 * @{ 308 * @{
309 */ 309 */
310 310
@@ -321,13 +321,13 @@ typedef unsigned int Eo_Op;
321 * You must use this macro if you want thread safety in class creation. 321 * You must use this macro if you want thread safety in class creation.
322 */ 322 */
323#define EO_DEFINE_CLASS(class_get_func_name, class_desc, parent_class, ...) \ 323#define EO_DEFINE_CLASS(class_get_func_name, class_desc, parent_class, ...) \
324const Eo_Class * \ 324const Efl_Class * \
325class_get_func_name(void) \ 325class_get_func_name(void) \
326{ \ 326{ \
327 const Eo_Class *_tmp_parent_class; \ 327 const Efl_Class *_tmp_parent_class; \
328 static volatile unsigned char lk_init = 0; \ 328 static volatile unsigned char lk_init = 0; \
329 static Eina_Spinlock _my_lock; \ 329 static Eina_Spinlock _my_lock; \
330 static const Eo_Class * volatile _my_class = NULL; \ 330 static const Efl_Class * volatile _my_class = NULL; \
331 static unsigned int _my_init_generation = 1; \ 331 static unsigned int _my_init_generation = 1; \
332 if (EINA_UNLIKELY(_eo_init_generation != _my_init_generation)) \ 332 if (EINA_UNLIKELY(_eo_init_generation != _my_init_generation)) \
333 { \ 333 { \
@@ -365,7 +365,7 @@ class_get_func_name(void) \
365/** 365/**
366 * An enum representing the possible types of an Eo class. 366 * An enum representing the possible types of an Eo class.
367 */ 367 */
368enum _Eo_Class_Type 368enum _Efl_Class_Type
369{ 369{
370 EO_CLASS_TYPE_REGULAR = 0, /**< Regular class. */ 370 EO_CLASS_TYPE_REGULAR = 0, /**< Regular class. */
371 EO_CLASS_TYPE_REGULAR_NO_INSTANT, /**< Regular non instant-able class. */ 371 EO_CLASS_TYPE_REGULAR_NO_INSTANT, /**< Regular non instant-able class. */
@@ -374,10 +374,10 @@ enum _Eo_Class_Type
374}; 374};
375 375
376/** 376/**
377 * @typedef Eo_Class_Type 377 * @typedef Efl_Class_Type
378 * A convenience typedef for #_Eo_Class_Type. 378 * A convenience typedef for #_Efl_Class_Type.
379 */ 379 */
380typedef enum _Eo_Class_Type Eo_Class_Type; 380typedef enum _Efl_Class_Type Efl_Class_Type;
381 381
382/** 382/**
383 * @def EO_VERSION 383 * @def EO_VERSION
@@ -385,12 +385,12 @@ typedef enum _Eo_Class_Type Eo_Class_Type;
385 */ 385 */
386#define EO_VERSION 2 386#define EO_VERSION 2
387 387
388typedef struct _Eo_Op_Description 388typedef struct _Efl_Op_Description
389{ 389{
390 void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */ 390 void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */
391 void *func; /**< The static function to call for the op. */ 391 void *func; /**< The static function to call for the op. */
392 Eo_Op_Type op_type; /**< The type of the Op. */ 392 Eo_Op_Type op_type; /**< The type of the Op. */
393} Eo_Op_Description; 393} Efl_Op_Description;
394 394
395/** 395/**
396 * @struct _Eo_Ops 396 * @struct _Eo_Ops
@@ -400,33 +400,33 @@ typedef struct _Eo_Op_Description
400 */ 400 */
401typedef struct _Eo_Ops 401typedef struct _Eo_Ops
402{ 402{
403 const Eo_Op_Description *descs; /**< The op descriptions array of size count. */ 403 const Efl_Op_Description *descs; /**< The op descriptions array of size count. */
404 size_t count; /**< Number of op descriptions. */ 404 size_t count; /**< Number of op descriptions. */
405} Eo_Ops; 405} Eo_Ops;
406 406
407/** 407/**
408 * @struct _Eo_Class_Description 408 * @struct _Efl_Class_Description
409 * This struct holds the description of a class. 409 * This struct holds the description of a class.
410 * This description should be passed to eo_class_new. 410 * This description should be passed to eo_class_new.
411 * Please use the #EO_CLASS_DESCRIPTION_OPS macro when populating it. 411 * Please use the #EO_CLASS_DESCRIPTION_OPS macro when populating it.
412 */ 412 */
413struct _Eo_Class_Description 413struct _Efl_Class_Description
414{ 414{
415 unsigned int version; /**< The current version of eo, use #EO_VERSION */ 415 unsigned int version; /**< The current version of eo, use #EO_VERSION */
416 const char *name; /**< The name of the class. */ 416 const char *name; /**< The name of the class. */
417 Eo_Class_Type type; /**< The type of the class. */ 417 Efl_Class_Type type; /**< The type of the class. */
418 Eo_Ops ops; /**< The ops description, should be filled using #EO_CLASS_DESCRIPTION_OPS (later sorted by Eo). */ 418 Eo_Ops ops; /**< The ops description, should be filled using #EO_CLASS_DESCRIPTION_OPS (later sorted by Eo). */
419 const Eo_Event_Description **events; /**< The event descriptions for this class. */ 419 const Efl_Event_Description **events; /**< The event descriptions for this class. */
420 size_t data_size; /**< The size of data (private + protected + public) this class needs per object. */ 420 size_t data_size; /**< The size of data (private + protected + public) this class needs per object. */
421 void (*class_constructor)(Eo_Class *klass); /**< The constructor of the class. */ 421 void (*class_constructor)(Efl_Class *klass); /**< The constructor of the class. */
422 void (*class_destructor)(Eo_Class *klass); /**< The destructor of the class. */ 422 void (*class_destructor)(Efl_Class *klass); /**< The destructor of the class. */
423}; 423};
424 424
425/** 425/**
426 * @typedef Eo_Class_Description 426 * @typedef Efl_Class_Description
427 * A convenience typedef for #_Eo_Class_Description 427 * A convenience typedef for #_Efl_Class_Description
428 */ 428 */
429typedef struct _Eo_Class_Description Eo_Class_Description; 429typedef struct _Efl_Class_Description Efl_Class_Description;
430 430
431/** 431/**
432 * @brief Create a new class. 432 * @brief Create a new class.
@@ -440,7 +440,7 @@ typedef struct _Eo_Class_Description Eo_Class_Description;
440 * 440 *
441 * @see #EO_DEFINE_CLASS 441 * @see #EO_DEFINE_CLASS
442 */ 442 */
443EAPI const Eo_Class *eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent, ...); 443EAPI const Efl_Class *eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent, ...);
444 444
445/** 445/**
446 * @brief Override Eo functions of this object. 446 * @brief Override Eo functions of this object.
@@ -479,7 +479,7 @@ EAPI Eina_Bool eo_override(Eo *obj, const Eo_Ops *ops);
479 * @see eo_override 479 * @see eo_override
480 */ 480 */
481#define EO_OVERRIDE_OPS_DEFINE(ops, ...) \ 481#define EO_OVERRIDE_OPS_DEFINE(ops, ...) \
482 const Eo_Op_Description _##ops##_descs[] = { __VA_ARGS__ }; \ 482 const Efl_Op_Description _##ops##_descs[] = { __VA_ARGS__ }; \
483 const Eo_Ops ops = { _##ops##_descs, EINA_C_ARRAY_LENGTH(_##ops##_descs) } 483 const Eo_Ops ops = { _##ops##_descs, EINA_C_ARRAY_LENGTH(_##ops##_descs) }
484 484
485/** 485/**
@@ -490,7 +490,7 @@ EAPI Eina_Bool eo_override(Eo *obj, const Eo_Ops *ops);
490 * 490 *
491 * Notice: This function does not support composite objects. 491 * Notice: This function does not support composite objects.
492 */ 492 */
493EAPI Eina_Bool eo_isa(const Eo *obj, const Eo_Class *klass); 493EAPI Eina_Bool eo_isa(const Eo *obj, const Efl_Class *klass);
494 494
495/** 495/**
496 * @brief Gets the name of the passed class. 496 * @brief Gets the name of the passed class.
@@ -499,7 +499,7 @@ EAPI Eina_Bool eo_isa(const Eo *obj, const Eo_Class *klass);
499 * 499 *
500 * @see eo_class_get() 500 * @see eo_class_get()
501 */ 501 */
502EAPI const char *eo_class_name_get(const Eo_Class *klass); 502EAPI const char *eo_class_name_get(const Efl_Class *klass);
503 503
504/** 504/**
505 * @} 505 * @}
@@ -521,7 +521,7 @@ EAPI Eina_Bool eo_init(void);
521 */ 521 */
522EAPI Eina_Bool eo_shutdown(void); 522EAPI Eina_Bool eo_shutdown(void);
523 523
524// Helpers macro to help populating #Eo_Class_Description. 524// Helpers macro to help populating #Efl_Class_Description.
525#define EO_CLASS_DESCRIPTION_NOOPS() { NULL, 0} 525#define EO_CLASS_DESCRIPTION_NOOPS() { NULL, 0}
526#define EO_CLASS_DESCRIPTION_OPS(op_descs) { op_descs, EINA_C_ARRAY_LENGTH(op_descs) } 526#define EO_CLASS_DESCRIPTION_OPS(op_descs) { op_descs, EINA_C_ARRAY_LENGTH(op_descs) }
527 527
@@ -679,7 +679,7 @@ EAPI void _eo_call_end(Eo_Op_Call_Data *call);
679// end of the eo_add. Calls finalize among others 679// end of the eo_add. Calls finalize among others
680EAPI Eo * _eo_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback); 680EAPI Eo * _eo_add_end(Eo *obj, Eina_Bool is_ref, Eina_Bool is_fallback);
681 681
682EAPI Eo *eo_super(const Eo *obj, const Eo_Class *cur_klass); 682EAPI Eo *eo_super(const Eo *obj, const Efl_Class *cur_klass);
683 683
684/*****************************************************************************/ 684/*****************************************************************************/
685 685
@@ -690,7 +690,7 @@ EAPI Eo *eo_super(const Eo *obj, const Eo_Class *cur_klass);
690 * 690 *
691 * @see eo_class_name_get() 691 * @see eo_class_name_get()
692 */ 692 */
693EAPI const Eo_Class *eo_class_get(const Eo *obj); 693EAPI const Efl_Class *eo_class_get(const Eo *obj);
694 694
695EAPI Eo *_eo_self_get(void); 695EAPI Eo *_eo_self_get(void);
696 696
@@ -757,7 +757,7 @@ EAPI Eo *_eo_self_get(void);
757 */ 757 */
758#define eo_add_ref(klass, parent, ...) _eo_add_common(klass, parent, EINA_TRUE, ##__VA_ARGS__) 758#define eo_add_ref(klass, parent, ...) _eo_add_common(klass, parent, EINA_TRUE, ##__VA_ARGS__)
759 759
760EAPI Eo * _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback); 760EAPI Eo * _eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent, Eina_Bool ref, Eina_Bool is_fallback);
761 761
762/** 762/**
763 * @brief Get a pointer to the data of an object for a specific class. 763 * @brief Get a pointer to the data of an object for a specific class.
@@ -770,7 +770,7 @@ EAPI Eo * _eo_add_internal_start(const char *file, int line, const Eo_Class *kla
770 * @see eo_data_ref() 770 * @see eo_data_ref()
771 * @see eo_data_unref() 771 * @see eo_data_unref()
772 */ 772 */
773EAPI void *eo_data_scope_get(const Eo *obj, const Eo_Class *klass); 773EAPI void *eo_data_scope_get(const Eo *obj, const Efl_Class *klass);
774 774
775/** 775/**
776 * @def eo_data_xref(obj, klass, ref_obj) 776 * @def eo_data_xref(obj, klass, ref_obj)
@@ -798,7 +798,7 @@ EAPI void *eo_data_scope_get(const Eo *obj, const Eo_Class *klass);
798 * 798 *
799 * @see eo_data_xunref_internal() 799 * @see eo_data_xunref_internal()
800 */ 800 */
801EAPI void *eo_data_xref_internal(const char *file, int line, const Eo *obj, const Eo_Class *klass, const Eo *ref_obj); 801EAPI void *eo_data_xref_internal(const char *file, int line, const Eo *obj, const Efl_Class *klass, const Eo *ref_obj);
802 802
803/** 803/**
804 * @def eo_data_xunref(obj, data, ref_obj) 804 * @def eo_data_xunref(obj, data, ref_obj)
@@ -888,18 +888,18 @@ EAPI int eo_ref_get(const Eo *obj);
888 * set the intercept function to NULL so it is not called again on the next 888 * set the intercept function to NULL so it is not called again on the next
889 * "real deletion". 889 * "real deletion".
890 * 890 *
891 * @see eo_del_intercept_get() 891 * @see efl_del_intercept_get()
892 * @see eo_unref() 892 * @see eo_unref()
893 * @see eo_del() 893 * @see efl_del()
894 */ 894 */
895EAPI void eo_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func); 895EAPI void efl_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func);
896 896
897/** 897/**
898 * @brief Get the deletion interceptor function 898 * @brief Get the deletion interceptor function
899 * @param obj The object to get the interceptor of 899 * @param obj The object to get the interceptor of
900 * @return The intercept function or NULL if none is set. 900 * @return The intercept function or NULL if none is set.
901 * 901 *
902 * This returns the interceptor function set by eo_del_intercept_set(). Note 902 * This returns the interceptor function set by efl_del_intercept_set(). Note
903 * that objects by default have no interceptor (NULL) set, but certain 903 * that objects by default have no interceptor (NULL) set, but certain
904 * classes may set one up in a constructor, so it is important to be able 904 * classes may set one up in a constructor, so it is important to be able
905 * to get the interceptor function to know if this has happend and 905 * to get the interceptor function to know if this has happend and
@@ -907,9 +907,9 @@ EAPI void eo_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func);
907 * own interceptor function has finished. It would generally be a bad idea 907 * own interceptor function has finished. It would generally be a bad idea
908 * though to override these functions. 908 * though to override these functions.
909 * 909 *
910 * @see eo_del_intercept_set() 910 * @see efl_del_intercept_set()
911 */ 911 */
912EAPI Eo_Del_Intercept eo_del_intercept_get(const Eo *obj); 912EAPI Eo_Del_Intercept efl_del_intercept_get(const Eo *obj);
913 913
914/** 914/**
915 * @def eo_xref(obj, ref_obj) 915 * @def eo_xref(obj, ref_obj)
@@ -988,27 +988,27 @@ EAPI Eina_Bool eo_manual_free(Eo *obj);
988EAPI Eina_Bool eo_destructed_is(const Eo *obj); 988EAPI Eina_Bool eo_destructed_is(const Eo *obj);
989 989
990/** 990/**
991 * @addtogroup Eo_Class_Class Eo's Class class. 991 * @addtogroup Efl_Class_Class Eo's Class class.
992 * @{ 992 * @{
993 */ 993 */
994 994
995#include "eo_class.eo.h" 995#include "efl_class.eo.h"
996 996
997/** 997/**
998 * @} 998 * @}
999 */ 999 */
1000 1000
1001/** 1001/**
1002 * @addtogroup Eo_Class_Base Eo's Base class. 1002 * @addtogroup Efl_Class_Base Eo's Base class.
1003 * @{ 1003 * @{
1004 */ 1004 */
1005 1005
1006/** 1006/**
1007 * @typedef eo_key_data_free_func 1007 * @typedef efl_key_data_free_func
1008 * Data free func prototype. 1008 * Data free func prototype.
1009 * XXX: DO NOT USE, only here for legacy. 1009 * XXX: DO NOT USE, only here for legacy.
1010 */ 1010 */
1011typedef void (*eo_key_data_free_func)(void *); 1011typedef void (*efl_key_data_free_func)(void *);
1012 1012
1013/** 1013/**
1014 * @def eo_weak_ref 1014 * @def eo_weak_ref
@@ -1016,11 +1016,11 @@ typedef void (*eo_key_data_free_func)(void *);
1016 * @param wref the pointer to use for the weak ref 1016 * @param wref the pointer to use for the weak ref
1017 * 1017 *
1018 * @see eo_weak_unref 1018 * @see eo_weak_unref
1019 * @see eo_wref_add 1019 * @see efl_wref_add
1020 */ 1020 */
1021#define eo_weak_ref(wref) \ 1021#define eo_weak_ref(wref) \
1022 do { \ 1022 do { \
1023 if (*wref) eo_wref_add(*wref, wref); \ 1023 if (*wref) efl_wref_add(*wref, wref); \
1024 } while (0) 1024 } while (0)
1025 1025
1026/** 1026/**
@@ -1029,22 +1029,22 @@ typedef void (*eo_key_data_free_func)(void *);
1029 * @param wref the pointer to use for the weak unref 1029 * @param wref the pointer to use for the weak unref
1030 * 1030 *
1031 * @see eo_weak_ref 1031 * @see eo_weak_ref
1032 * @see eo_wref_del 1032 * @see efl_wref_del
1033 * @see eo_wref_del_safe 1033 * @see efl_wref_del_safe
1034 */ 1034 */
1035#define eo_weak_unref(wref) \ 1035#define eo_weak_unref(wref) \
1036 do { \ 1036 do { \
1037 if (*wref) eo_wref_del(*wref, wref); \ 1037 if (*wref) efl_wref_del(*wref, wref); \
1038 } while (0) 1038 } while (0)
1039 1039
1040/** 1040/**
1041 * @def eo_wref_del_safe 1041 * @def efl_wref_del_safe
1042 * @brief Delete the weak reference passed. 1042 * @brief Delete the weak reference passed.
1043 * @param wref the weak reference to free. 1043 * @param wref the weak reference to free.
1044 * 1044 *
1045 * @see #eo_wref_del 1045 * @see #efl_wref_del
1046 */ 1046 */
1047#define eo_wref_del_safe(wref) eo_weak_unref(wref) 1047#define efl_wref_del_safe(wref) eo_weak_unref(wref)
1048 1048
1049/** 1049/**
1050 * @addtogroup Eo_Events Eo's Event Handling 1050 * @addtogroup Eo_Events Eo's Event Handling
@@ -1057,7 +1057,7 @@ typedef void (*eo_key_data_free_func)(void *);
1057 * anything about them. 1057 * anything about them.
1058 * @internal 1058 * @internal
1059 */ 1059 */
1060EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const char *_event_name); 1060EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name);
1061 1061
1062/** 1062/**
1063 * @def EO_CALLBACK_PRIORITY_BEFORE 1063 * @def EO_CALLBACK_PRIORITY_BEFORE
@@ -1081,24 +1081,24 @@ EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const
1081 * external symbols in it, because the addresses are only known at runtime. 1081 * external symbols in it, because the addresses are only known at runtime.
1082 */ 1082 */
1083#define EO_CALLBACKS_ARRAY_DEFINE(Name, ...) \ 1083#define EO_CALLBACKS_ARRAY_DEFINE(Name, ...) \
1084 static Eo_Callback_Array_Item * \ 1084 static Efl_Callback_Array_Item * \
1085 Name(void) \ 1085 Name(void) \
1086 { \ 1086 { \
1087 static Eo_Callback_Array_Item internal[sizeof ((Eo_Callback_Array_Item[]) { __VA_ARGS__ }) / \ 1087 static Efl_Callback_Array_Item internal[sizeof ((Efl_Callback_Array_Item[]) { __VA_ARGS__ }) / \
1088 sizeof (Eo_Callback_Array_Item) + \ 1088 sizeof (Efl_Callback_Array_Item) + \
1089 1] = { { 0, 0 } }; \ 1089 1] = { { 0, 0 } }; \
1090 if (internal[0].desc == NULL) \ 1090 if (internal[0].desc == NULL) \
1091 { \ 1091 { \
1092 memcpy(internal, \ 1092 memcpy(internal, \
1093 ((Eo_Callback_Array_Item[]) { __VA_ARGS__, { NULL, NULL } }), \ 1093 ((Efl_Callback_Array_Item[]) { __VA_ARGS__, { NULL, NULL } }), \
1094 sizeof (Eo_Callback_Array_Item) + \ 1094 sizeof (Efl_Callback_Array_Item) + \
1095 sizeof ((Eo_Callback_Array_Item[]) { __VA_ARGS__ })); \ 1095 sizeof ((Efl_Callback_Array_Item[]) { __VA_ARGS__ })); \
1096 } \ 1096 } \
1097 return internal; \ 1097 return internal; \
1098 } 1098 }
1099 1099
1100/** 1100/**
1101 * @def eo_event_callback_add(obj, desc, cb, data) 1101 * @def efl_event_callback_add(obj, desc, cb, data)
1102 * Add a callback for an event. 1102 * Add a callback for an event.
1103 * @param[in] desc The description of the event to listen to. 1103 * @param[in] desc The description of the event to listen to.
1104 * @param[in] cb the callback to call. 1104 * @param[in] cb the callback to call.
@@ -1106,24 +1106,24 @@ EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const
1106 * 1106 *
1107 * callbacks of the same priority are called in reverse order of creation. 1107 * callbacks of the same priority are called in reverse order of creation.
1108 * 1108 *
1109 * @see eo_event_callback_priority_add() 1109 * @see efl_event_callback_priority_add()
1110 */ 1110 */
1111#define eo_event_callback_add(obj, desc, cb, data) \ 1111#define efl_event_callback_add(obj, desc, cb, data) \
1112 eo_event_callback_priority_add(obj, desc, \ 1112 efl_event_callback_priority_add(obj, desc, \
1113 EO_CALLBACK_PRIORITY_DEFAULT, cb, data) 1113 EO_CALLBACK_PRIORITY_DEFAULT, cb, data)
1114 1114
1115/** 1115/**
1116 * @def eo_event_callback_array_add(obj, desc, cb, data) 1116 * @def efl_event_callback_array_add(obj, desc, cb, data)
1117 * Add a callback array for an event. 1117 * Add a callback array for an event.
1118 * @param[in] array an #Eo_Callback_Array_Item of events to listen to. 1118 * @param[in] array an #Efl_Callback_Array_Item of events to listen to.
1119 * @param[in] data additional data to pass to the callback. 1119 * @param[in] data additional data to pass to the callback.
1120 * 1120 *
1121 * callbacks of the same priority are called in reverse order of creation. 1121 * callbacks of the same priority are called in reverse order of creation.
1122 * 1122 *
1123 * @see eo_event_callback_array_priority_add() 1123 * @see efl_event_callback_array_priority_add()
1124 */ 1124 */
1125#define eo_event_callback_array_add(obj, array, data) \ 1125#define efl_event_callback_array_add(obj, array, data) \
1126 eo_event_callback_array_priority_add(obj, array, \ 1126 efl_event_callback_array_priority_add(obj, array, \
1127 EO_CALLBACK_PRIORITY_DEFAULT, data) 1127 EO_CALLBACK_PRIORITY_DEFAULT, data)
1128 1128
1129/** 1129/**
diff --git a/src/lib/eo/efl_class.eo b/src/lib/eo/efl_class.eo
new file mode 100644
index 0000000000..367848a49e
--- /dev/null
+++ b/src/lib/eo/efl_class.eo
@@ -0,0 +1,4 @@
1abstract Efl.Class ()
2{
3 data: null;
4}
diff --git a/src/lib/eo/eo_interface.eo b/src/lib/eo/efl_interface.eo
index e2a3e9cf58..4e404065f7 100644
--- a/src/lib/eo/eo_interface.eo
+++ b/src/lib/eo/efl_interface.eo
@@ -1,7 +1,7 @@
1interface Eo.Interface () 1interface Efl.Interface ()
2{ 2{
3 [[An interface for other interfaces to inherit from. 3 [[An interface for other interfaces to inherit from.
4 This is useful when you want to create interfaces and mixins that expose 4 This is useful when you want to create interfaces and mixins that expose
5 functions from a normal class, like for example @Eo.Base.constructor.]] 5 functions from a normal class, like for example @Efl.Object.constructor.]]
6} 6}
7 7
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/efl_object.eo
index d8387776b5..ab03526d42 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/efl_object.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3struct Eo.Event.Description { 3struct Efl.Event.Description {
4 [[This struct holds the description of a specific event.]] 4 [[This struct holds the description of a specific event.]]
5 name: string; [[name of the event.]] 5 name: string; [[name of the event.]]
6 unfreezable: bool; [[Eina_True if the event cannot be frozen.]] 6 unfreezable: bool; [[Eina_True if the event cannot be frozen.]]
@@ -10,32 +10,32 @@ struct Eo.Event.Description {
10 10
11struct Eo.Event { 11struct Eo.Event {
12 [[Parameter passed in event callbacks holding extra event parameters]] 12 [[Parameter passed in event callbacks holding extra event parameters]]
13 object: Eo.Base; [[The object the event was called on.]] 13 object: Efl.Object; [[The object the event was called on.]]
14 desc: ref(const(Eo.Event.Description)); [[The event description.]] 14 desc: ref(const(Efl.Event.Description)); [[The event description.]]
15 info: void_ptr; [[Extra event information passed by the event caller.]] 15 info: void_ptr; [[Extra event information passed by the event caller.]]
16} 16}
17 17
18type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype. 18type Efl.Event_Cb: __builtin_event_cb; [[An event callback prototype.
19 return $EO_CALLBACK_STOP to stop calling additional callbacks for the event, $EO_CALLBACK_CONTINUE to continue.]] 19 return $EO_CALLBACK_STOP to stop calling additional callbacks for the event, $EO_CALLBACK_CONTINUE to continue.]]
20 20
21 21
22struct Eo.Callback_Array_Item { 22struct Efl.Callback_Array_Item {
23 [[An item in an array of callback desc/func. 23 [[An item in an array of callback desc/func.
24 24
25 See also \@ref eo_event_callback_array_add. 25 See also \@ref efl_event_callback_array_add.
26 ]] 26 ]]
27 desc: ref(const(Eo.Event.Description)); [[The event description.]] 27 desc: ref(const(Efl.Event.Description)); [[The event description.]]
28 func: Eo.Event_Cb; [[The callback function.]] 28 func: Efl.Event_Cb; [[The callback function.]]
29} 29}
30 30
31struct Eo.Dbg_Info { 31struct Efl.Dbg_Info {
32 [[The structure for the debug info used by Eo.]] 32 [[The structure for the debug info used by Eo.]]
33 name: stringshare; [[The name of the part (stringshare).]] 33 name: stringshare; [[The name of the part (stringshare).]]
34 value: generic_value; [[The value.]] 34 value: generic_value; [[The value.]]
35} 35}
36 36
37 37
38type Eo.Callback_Priority: short; [[Callback priority value. Range is -32k - 32k. 38type Efl.Callback_Priority: short; [[Callback priority value. Range is -32k - 32k.
39 The lower the number, the higher the priority. 39 The lower the number, the higher the priority.
40 40
41 See \@ref EO_CALLBACK_PRIORITY_AFTER, 41 See \@ref EO_CALLBACK_PRIORITY_AFTER,
@@ -43,9 +43,9 @@ type Eo.Callback_Priority: short; [[Callback priority value. Range is -32k - 32k
43 \@ref EO_CALLBACK_PRIORITY_DEFAULT 43 \@ref EO_CALLBACK_PRIORITY_DEFAULT
44 ]] 44 ]]
45 45
46abstract Eo.Base () 46abstract Efl.Object ()
47{ 47{
48 eo_prefix: eo; 48 eo_prefix: efl;
49 49
50 methods { 50 methods {
51 @property parent { 51 @property parent {
@@ -53,7 +53,7 @@ abstract Eo.Base ()
53 53
54 Parents keep references to their children so in order to 54 Parents keep references to their children so in order to
55 delete objects that have parents you need to set parent to 55 delete objects that have parents you need to set parent to
56 NULL or use eo_del() that does that for you (and also unrefs 56 NULL or use efl_del() that does that for you (and also unrefs
57 the object). 57 the object).
58 58
59 The Eo parent is conceptually user set. That means that a parent 59 The Eo parent is conceptually user set. That means that a parent
@@ -70,13 +70,13 @@ abstract Eo.Base ()
70 get { 70 get {
71 } 71 }
72 values { 72 values {
73 parent: Eo.Base @nullable; [[the new parent]] 73 parent: Efl.Object @nullable; [[the new parent]]
74 } 74 }
75 } 75 }
76 del @const { 76 del @const {
77 [[Unrefs the object and reparents it to NULL. 77 [[Unrefs the object and reparents it to NULL.
78 78
79 Because eo_del() unrefs and reparents to NULL, it doesn't really delete the object. 79 Because efl_del() unrefs and reparents to NULL, it doesn't really delete the object.
80 80
81 This method accepts a const object for convenience, so all objects 81 This method accepts a const object for convenience, so all objects
82 could be passed to it easily. 82 could be passed to it easily.
@@ -156,16 +156,16 @@ abstract Eo.Base ()
156 If this is not done the class cannot be found up in the object tree. 156 If this is not done the class cannot be found up in the object tree.
157 ]] 157 ]]
158 params { 158 params {
159 klass : const(Eo.Base); [[The class identifier to search for]] 159 klass : const(Efl.Object); [[The class identifier to search for]]
160 } 160 }
161 return : Eo.Base; 161 return : Efl.Object;
162 } 162 }
163 constructor { 163 constructor {
164 [[Call the object's constructor. 164 [[Call the object's constructor.
165 165
166 Should not be used with #eo_do. Only use it with #eo_do_super. 166 Should not be used with #eo_do. Only use it with #eo_do_super.
167 ]] 167 ]]
168 return: Eo.Base; [[The new object created, can be NULL if aborting]] 168 return: Efl.Object; [[The new object created, can be NULL if aborting]]
169 } 169 }
170 destructor { 170 destructor {
171 [[Call the object's destructor. 171 [[Call the object's destructor.
@@ -175,7 +175,7 @@ abstract Eo.Base ()
175 } 175 }
176 finalize { 176 finalize {
177 [[Called at the end of #eo_add. Should not be called, just overridden.]] 177 [[Called at the end of #eo_add. Should not be called, just overridden.]]
178 return: Eo.Base; [[The new object created, can be NULL if aborting]] 178 return: Efl.Object; [[The new object created, can be NULL if aborting]]
179 } 179 }
180 name_find { 180 name_find {
181 [[Find a child object with the given name and return it. 181 [[Find a child object with the given name and return it.
@@ -188,7 +188,7 @@ abstract Eo.Base ()
188 params { 188 params {
189 @in search: string; [[the name search string]] 189 @in search: string; [[the name search string]]
190 } 190 }
191 return: Eo.Base; [[the first object found]] 191 return: Efl.Object; [[the first object found]]
192 } 192 }
193 wref_add { 193 wref_add {
194 [[Add a new weak reference to obj. 194 [[Add a new weak reference to obj.
@@ -200,13 +200,13 @@ abstract Eo.Base ()
200 being freed. 200 being freed.
201 ]] 201 ]]
202 params { 202 params {
203 @in wref: ref(Eo.Base); 203 @in wref: ref(Efl.Object);
204 } 204 }
205 } 205 }
206 wref_del { 206 wref_del {
207 [[Delete the weak reference passed.]] 207 [[Delete the weak reference passed.]]
208 params { 208 params {
209 @in wref: ref(Eo.Base); 209 @in wref: ref(Efl.Object);
210 } 210 }
211 } 211 }
212 @property key_data { 212 @property key_data {
@@ -244,12 +244,12 @@ abstract Eo.Base ()
244 } 244 }
245 set { 245 set {
246 values { 246 values {
247 objdata: const(Eo.Base); [[the object to set]] 247 objdata: const(Efl.Object); [[the object to set]]
248 } 248 }
249 } 249 }
250 get { 250 get {
251 values { 251 values {
252 objdata: Eo.Base; [[the object to set]] 252 objdata: Efl.Object; [[the object to set]]
253 } 253 }
254 } 254 }
255 } 255 }
@@ -267,12 +267,12 @@ abstract Eo.Base ()
267 } 267 }
268 set { 268 set {
269 values { 269 values {
270 objdata: const(Eo.Base); [[the object to set]] 270 objdata: const(Efl.Object); [[the object to set]]
271 } 271 }
272 } 272 }
273 get { 273 get {
274 values { 274 values {
275 objdata: Eo.Base; [[the object to set]] 275 objdata: Efl.Object; [[the object to set]]
276 } 276 }
277 } 277 }
278 } 278 }
@@ -325,9 +325,9 @@ abstract Eo.Base ()
325 ]] 325 ]]
326 return: bool; [[Return true when the callback has been successfully added.]] 326 return: bool; [[Return true when the callback has been successfully added.]]
327 params { 327 params {
328 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]] 328 @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
329 @in priority: Eo.Callback_Priority; [[The priority of the callback]] 329 @in priority: Efl.Callback_Priority; [[The priority of the callback]]
330 @in cb: Eo.Event_Cb; [[the callback to call]] 330 @in cb: Efl.Event_Cb; [[the callback to call]]
331 @in data: const(void_ptr); [[additional data to pass to the callback]] 331 @in data: const(void_ptr); [[additional data to pass to the callback]]
332 } 332 }
333 } 333 }
@@ -335,8 +335,8 @@ abstract Eo.Base ()
335 [[Del a callback with a specific data associated to it for an event.]] 335 [[Del a callback with a specific data associated to it for an event.]]
336 return: bool; [[Return true when the callback has been successfully removed.]] 336 return: bool; [[Return true when the callback has been successfully removed.]]
337 params { 337 params {
338 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]] 338 @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
339 @in func: Eo.Event_Cb; [[the callback to delete]] 339 @in func: Efl.Event_Cb; [[the callback to delete]]
340 @in user_data: const(void_ptr); [[The data to compare]] 340 @in user_data: const(void_ptr); [[The data to compare]]
341 } 341 }
342 } 342 }
@@ -348,8 +348,8 @@ abstract Eo.Base ()
348 ]] 348 ]]
349 return: bool; [[Return true when the callback has been successfully added.]] 349 return: bool; [[Return true when the callback has been successfully added.]]
350 params { 350 params {
351 @in array: ref(const(Eo.Callback_Array_Item)); [[an #Eo_Callback_Array_Item of events to listen to]] 351 @in array: ref(const(Efl.Callback_Array_Item)); [[an #Efl_Callback_Array_Item of events to listen to]]
352 @in priority: Eo.Callback_Priority; [[The priority of the callback]] 352 @in priority: Efl.Callback_Priority; [[The priority of the callback]]
353 @in data: const(void_ptr); [[additional data to pass to the callback]] 353 @in data: const(void_ptr); [[additional data to pass to the callback]]
354 } 354 }
355 } 355 }
@@ -359,14 +359,14 @@ abstract Eo.Base ()
359 ]] 359 ]]
360 return: bool; [[Return true when the callback has been successfully removed.]] 360 return: bool; [[Return true when the callback has been successfully removed.]]
361 params { 361 params {
362 @in array: ref(const(Eo.Callback_Array_Item)); [[an #Eo_Callback_Array_Item of events to listen to]] 362 @in array: ref(const(Efl.Callback_Array_Item)); [[an #Efl_Callback_Array_Item of events to listen to]]
363 @in user_data: const(void_ptr); [[The data to compare]] 363 @in user_data: const(void_ptr); [[The data to compare]]
364 } 364 }
365 } 365 }
366 event_callback_call { 366 event_callback_call {
367 [[Call the callbacks for an event of an object.]] 367 [[Call the callbacks for an event of an object.]]
368 params { 368 params {
369 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to call]] 369 @in desc: ref(const(Efl.Event.Description)); [[The description of the event to call]]
370 @in event_info: void_ptr; [[Extra event info to pass to the callbacks]] 370 @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
371 } 371 }
372 return: bool; [[$false if one of the callbacks aborted the call, 372 return: bool; [[$false if one of the callbacks aborted the call,
@@ -385,26 +385,26 @@ abstract Eo.Base ()
385 event_callback_forwarder_add { 385 event_callback_forwarder_add {
386 [[Add an event callback forwarder for an event and an object.]] 386 [[Add an event callback forwarder for an event and an object.]]
387 params { 387 params {
388 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]] 388 @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
389 @in new_obj: Eo.Base; [[The object to emit events from]] 389 @in new_obj: Efl.Object; [[The object to emit events from]]
390 } 390 }
391 } 391 }
392 event_callback_forwarder_del { 392 event_callback_forwarder_del {
393 [[Remove an event callback forwarder for an event and an object.]] 393 [[Remove an event callback forwarder for an event and an object.]]
394 params { 394 params {
395 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]] 395 @in desc: ref(const(Efl.Event.Description)); [[The description of the event to listen to]]
396 @in new_obj: Eo.Base; [[The object to emit events from]] 396 @in new_obj: Efl.Object; [[The object to emit events from]]
397 } 397 }
398 } 398 }
399 dbg_info_get { 399 dbg_info_get {
400 [[Get dbg information from the object.]] 400 [[Get dbg information from the object.]]
401 params { 401 params {
402 @in root_node: ref(Eo.Dbg_Info); [[node of the tree]] 402 @in root_node: ref(Efl.Dbg_Info); [[node of the tree]]
403 } 403 }
404 } 404 }
405 children_iterator_new { 405 children_iterator_new {
406 [[Get an iterator on all childrens]] 406 [[Get an iterator on all childrens]]
407 return: free(own(iterator<Eo.Base>), eina_iterator_free) @warn_unused; 407 return: free(own(iterator<Efl.Object>), eina_iterator_free) @warn_unused;
408 } 408 }
409 composite_attach { 409 composite_attach {
410 [[Make an object a composite object of another. 410 [[Make an object a composite object of another.
@@ -416,7 +416,7 @@ abstract Eo.Base ()
416 See @.composite_detach, @.composite_part_is. 416 See @.composite_detach, @.composite_part_is.
417 ]] 417 ]]
418 params { 418 params {
419 @in comp_obj: Eo.Base; [[the object that will be used to composite the parent.]] 419 @in comp_obj: Efl.Object; [[the object that will be used to composite the parent.]]
420 } 420 }
421 return: bool; [[$true if successful. $false otherwise.]] 421 return: bool; [[$true if successful. $false otherwise.]]
422 } 422 }
@@ -428,7 +428,7 @@ abstract Eo.Base ()
428 See @.composite_attach, @.composite_part_is. 428 See @.composite_attach, @.composite_part_is.
429 ]] 429 ]]
430 params { 430 params {
431 @in comp_obj: Eo.Base; [[the object that will be removed from the parent.]] 431 @in comp_obj: Efl.Object; [[the object that will be removed from the parent.]]
432 } 432 }
433 return: bool; [[$true if successful. $false otherwise.]] 433 return: bool; [[$true if successful. $false otherwise.]]
434 } 434 }
diff --git a/src/lib/eo/eo_override.eo b/src/lib/eo/efl_object_override.eo
index 8a3c404d9b..4d2074b6e2 100644
--- a/src/lib/eo/eo_override.eo
+++ b/src/lib/eo/efl_object_override.eo
@@ -1,4 +1,4 @@
1abstract Eo.Override () 1abstract Efl.Object.Override ()
2{ 2{
3 [[A special class to pass to #eo_super() when using #eo_override() 3 [[A special class to pass to #eo_super() when using #eo_override()
4 4
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 0690c446f9..33406df0c0 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -13,7 +13,7 @@
13#include "eo_private.h" 13#include "eo_private.h"
14#include "eo_add_fallback.h" 14#include "eo_add_fallback.h"
15 15
16#include "eo_override.eo.c" 16#include "efl_object_override.eo.c"
17 17
18#define EO_CLASS_IDS_FIRST 1 18#define EO_CLASS_IDS_FIRST 1
19#define EO_OP_IDS_FIRST 1 19#define EO_OP_IDS_FIRST 1
@@ -23,7 +23,7 @@ EAPI Eina_Spinlock _eo_class_creation_lock;
23EAPI unsigned int _eo_init_generation = 1; 23EAPI unsigned int _eo_init_generation = 1;
24int _eo_log_dom = -1; 24int _eo_log_dom = -1;
25 25
26static _Eo_Class **_eo_classes = NULL; 26static _Efl_Class **_eo_classes = NULL;
27static Eo_Id _eo_classes_last_id = 0; 27static Eo_Id _eo_classes_last_id = 0;
28static Eo_Id _eo_classes_alloc = 0; 28static Eo_Id _eo_classes_alloc = 0;
29static int _eo_init_count = 0; 29static int _eo_init_count = 0;
@@ -35,8 +35,8 @@ static size_t _eo_sz = 0;
35static size_t _eo_class_sz = 0; 35static size_t _eo_class_sz = 0;
36 36
37static void _eo_condtor_reset(_Eo_Object *obj); 37static void _eo_condtor_reset(_Eo_Object *obj);
38static inline void *_eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass); 38static inline void *_eo_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass);
39static inline void *_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Eo_Class *klass, const _Eo_Object *ref_obj); 39static inline void *_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_Class *klass, const _Eo_Object *ref_obj);
40static inline void _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj); 40static inline void _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj);
41 41
42/* Start of Dich */ 42/* Start of Dich */
@@ -53,7 +53,7 @@ static inline void _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _
53 * substraction at compile time. */ 53 * substraction at compile time. */
54#define _UNMASK_ID(id) ((id) - MASK_CLASS_TAG) 54#define _UNMASK_ID(id) ((id) - MASK_CLASS_TAG)
55#define ID_CLASS_GET(id) ({ \ 55#define ID_CLASS_GET(id) ({ \
56 (_Eo_Class *) (((_UNMASK_ID(id) <= _eo_classes_last_id) && (_UNMASK_ID(id) > 0)) ? \ 56 (_Efl_Class *) (((_UNMASK_ID(id) <= _eo_classes_last_id) && (_UNMASK_ID(id) > 0)) ? \
57 (_eo_classes[_UNMASK_ID(id) - 1]) : NULL); \ 57 (_eo_classes[_UNMASK_ID(id) - 1]) : NULL); \
58 }) 58 })
59 59
@@ -106,10 +106,10 @@ _vtable_func_get(const Eo_Vtable *vtable, Eo_Op op)
106} 106}
107 107
108/* XXX: Only used for a debug message below. Doesn't matter that it's slow. */ 108/* XXX: Only used for a debug message below. Doesn't matter that it's slow. */
109static const _Eo_Class * 109static const _Efl_Class *
110_eo_op_class_get(Eo_Op op) 110_eo_op_class_get(Eo_Op op)
111{ 111{
112 _Eo_Class **itr = _eo_classes; 112 _Efl_Class **itr = _eo_classes;
113 int mid, max, min; 113 int mid, max, min;
114 114
115 min = 0; 115 min = 0;
@@ -130,7 +130,7 @@ _eo_op_class_get(Eo_Op op)
130} 130}
131 131
132static inline Eina_Bool 132static inline Eina_Bool
133_vtable_func_set(Eo_Vtable *vtable, const _Eo_Class *klass, Eo_Op op, eo_op_func_type func) 133_vtable_func_set(Eo_Vtable *vtable, const _Efl_Class *klass, Eo_Op op, eo_op_func_type func)
134{ 134{
135 op_type_funcs *fsrc; 135 op_type_funcs *fsrc;
136 size_t idx1 = DICH_CHAIN1(op); 136 size_t idx1 = DICH_CHAIN1(op);
@@ -139,7 +139,7 @@ _vtable_func_set(Eo_Vtable *vtable, const _Eo_Class *klass, Eo_Op op, eo_op_func
139 fsrc = &chain1->funcs[DICH_CHAIN_LAST(op)]; 139 fsrc = &chain1->funcs[DICH_CHAIN_LAST(op)];
140 if (fsrc->src == klass) 140 if (fsrc->src == klass)
141 { 141 {
142 const _Eo_Class *op_kls = _eo_op_class_get(op); 142 const _Efl_Class *op_kls = _eo_op_class_get(op);
143 ERR("Class '%s': Overriding already set func %p for op %d (%s) with %p.", 143 ERR("Class '%s': Overriding already set func %p for op %d (%s) with %p.",
144 klass->desc->name, fsrc->func, op, op_kls->desc->name, func); 144 klass->desc->name, fsrc->func, op, op_kls->desc->name, func);
145 return EINA_FALSE; 145 return EINA_FALSE;
@@ -189,18 +189,18 @@ _eo_is_a_class(const Eo *eo_id)
189 return !!(oid & MASK_CLASS_TAG); 189 return !!(oid & MASK_CLASS_TAG);
190} 190}
191 191
192static inline _Eo_Class * 192static inline _Efl_Class *
193_eo_class_pointer_get(const Eo_Class *klass_id) 193_eo_class_pointer_get(const Efl_Class *klass_id)
194{ 194{
195#ifdef HAVE_EO_ID 195#ifdef HAVE_EO_ID
196 return ID_CLASS_GET((Eo_Id)klass_id); 196 return ID_CLASS_GET((Eo_Id)klass_id);
197#else 197#else
198 return (_Eo_Class *) klass_id; 198 return (_Efl_Class *) klass_id;
199#endif 199#endif
200} 200}
201 201
202static const char * 202static const char *
203_eo_op_desc_name_get(const Eo_Op_Description *desc) 203_eo_op_desc_name_get(const Efl_Op_Description *desc)
204{ 204{
205 static const char *fct_name = "unknown"; 205 static const char *fct_name = "unknown";
206 206
@@ -222,9 +222,9 @@ _eo_op_desc_name_get(const Eo_Op_Description *desc)
222} 222}
223 223
224static inline const op_type_funcs * 224static inline const op_type_funcs *
225_eo_kls_itr_next(const _Eo_Class *orig_kls, const _Eo_Class *cur_klass, Eo_Op op) 225_eo_kls_itr_next(const _Efl_Class *orig_kls, const _Efl_Class *cur_klass, Eo_Op op)
226{ 226{
227 const _Eo_Class **kls_itr = NULL; 227 const _Efl_Class **kls_itr = NULL;
228 228
229 /* Find the kls itr. */ 229 /* Find the kls itr. */
230 kls_itr = orig_kls->mro; 230 kls_itr = orig_kls->mro;
@@ -251,11 +251,11 @@ _eo_kls_itr_next(const _Eo_Class *orig_kls, const _Eo_Class *cur_klass, Eo_Op op
251 251
252/************************************ EO ************************************/ 252/************************************ EO ************************************/
253 253
254static const _Eo_Class *_super_class = NULL; 254static const _Efl_Class *_super_class = NULL;
255static Eina_Spinlock _super_class_lock; 255static Eina_Spinlock _super_class_lock;
256 256
257EAPI Eo * 257EAPI Eo *
258eo_super(const Eo *obj, const Eo_Class *cur_klass) 258eo_super(const Eo *obj, const Efl_Class *cur_klass)
259{ 259{
260 EO_CLASS_POINTER_RETURN_VAL(cur_klass, klass, NULL); 260 EO_CLASS_POINTER_RETURN_VAL(cur_klass, klass, NULL);
261 261
@@ -269,8 +269,8 @@ eo_super(const Eo *obj, const Eo_Class *cur_klass)
269EAPI Eina_Bool 269EAPI Eina_Bool
270_eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Call_Cache *cache, const char *file, int line) 270_eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Call_Cache *cache, const char *file, int line)
271{ 271{
272 const _Eo_Class *klass, *inputklass, *main_klass; 272 const _Efl_Class *klass, *inputklass, *main_klass;
273 const _Eo_Class *cur_klass = NULL; 273 const _Efl_Class *cur_klass = NULL;
274 _Eo_Object *obj = NULL; 274 _Eo_Object *obj = NULL;
275 const Eo_Vtable *vtable = NULL; 275 const Eo_Vtable *vtable = NULL;
276 const op_type_funcs *func; 276 const op_type_funcs *func;
@@ -301,9 +301,9 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal
301 vtable = obj->vtable; 301 vtable = obj->vtable;
302 302
303 if (_obj_is_override(obj) && cur_klass && 303 if (_obj_is_override(obj) && cur_klass &&
304 (_eo_class_id_get(cur_klass) == EO_OVERRIDE_CLASS)) 304 (_eo_class_id_get(cur_klass) == EFL_OBJECT_OVERRIDE_CLASS))
305 { 305 {
306 /* Doing a eo_super(obj, EO_OVERRIDE_CLASS) should result in calling 306 /* Doing a eo_super(obj, EFL_OBJECT_OVERRIDE_CLASS) should result in calling
307 * as if it's a normal class. */ 307 * as if it's a normal class. */
308 vtable = &klass->vtable; 308 vtable = &klass->vtable;
309 cur_klass = NULL; 309 cur_klass = NULL;
@@ -494,13 +494,13 @@ _eo_api_func_equal(const void *api_func1, const void *api_func2)
494/* api_func should be the pointer to the function on all platforms except windows, 494/* api_func should be the pointer to the function on all platforms except windows,
495 * in which it should be the the name of the function (string). 495 * in which it should be the the name of the function (string).
496 */ 496 */
497static inline const Eo_Op_Description * 497static inline const Efl_Op_Description *
498_eo_api_desc_get(const void *api_func, const _Eo_Class *klass, const _Eo_Class **extns) 498_eo_api_desc_get(const void *api_func, const _Efl_Class *klass, const _Efl_Class **extns)
499{ 499{
500 const _Eo_Class *cur_klass; 500 const _Efl_Class *cur_klass;
501 const _Eo_Class **kls_itr = NULL; 501 const _Efl_Class **kls_itr = NULL;
502 const Eo_Op_Description *op_desc; 502 const Efl_Op_Description *op_desc;
503 const Eo_Op_Description *op_descs; 503 const Efl_Op_Description *op_descs;
504 504
505 if (klass) 505 if (klass)
506 { 506 {
@@ -555,13 +555,13 @@ _eo_api_op_id_get(const void *api_func)
555/* klass is the klass we are working on. hierarchy_klass is the class whe should 555/* klass is the klass we are working on. hierarchy_klass is the class whe should
556 * use when validating. */ 556 * use when validating. */
557static Eina_Bool 557static Eina_Bool
558_eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Eo_Class *hierarchy_klass, const _Eo_Class *klass, Eina_Bool override_only) 558_eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Efl_Class *hierarchy_klass, const _Efl_Class *klass, Eina_Bool override_only)
559{ 559{
560 unsigned int i; 560 unsigned int i;
561 int op_id; 561 int op_id;
562 const void *last_api_func; 562 const void *last_api_func;
563 const Eo_Op_Description *op_desc; 563 const Efl_Op_Description *op_desc;
564 const Eo_Op_Description *op_descs; 564 const Efl_Op_Description *op_descs;
565 565
566 op_id = hierarchy_klass->base_id; 566 op_id = hierarchy_klass->base_id;
567 op_descs = ops->descs; 567 op_descs = ops->descs;
@@ -610,7 +610,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Eo_Class *hiera
610 } 610 }
611 else if ((op_desc->op_type == EO_OP_TYPE_REGULAR_OVERRIDE) || (op_desc->op_type == EO_OP_TYPE_CLASS_OVERRIDE)) 611 else if ((op_desc->op_type == EO_OP_TYPE_REGULAR_OVERRIDE) || (op_desc->op_type == EO_OP_TYPE_CLASS_OVERRIDE))
612 { 612 {
613 const Eo_Op_Description *api_desc; 613 const Efl_Op_Description *api_desc;
614 if (override_only) 614 if (override_only)
615 { 615 {
616 api_desc = _eo_api_desc_get(op_desc->api_func, hierarchy_klass, NULL); 616 api_desc = _eo_api_desc_get(op_desc->api_func, hierarchy_klass, NULL);
@@ -649,7 +649,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Eo_Ops *ops, const _Eo_Class *hiera
649} 649}
650 650
651EAPI Eo * 651EAPI Eo *
652_eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent_id, Eina_Bool ref EINA_UNUSED, Eina_Bool is_fallback) 652_eo_add_internal_start(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref EINA_UNUSED, Eina_Bool is_fallback)
653{ 653{
654 _Eo_Object *obj; 654 _Eo_Object *obj;
655 Eo_Stack_Frame *fptr = NULL; 655 Eo_Stack_Frame *fptr = NULL;
@@ -700,10 +700,10 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
700 eo_ref(eo_id); 700 eo_ref(eo_id);
701 701
702 /* Reference for the parent if is_ref is done in _eo_add_end */ 702 /* Reference for the parent if is_ref is done in _eo_add_end */
703 eo_parent_set(eo_id, parent_id); 703 efl_parent_set(eo_id, parent_id);
704 704
705 /* eo_id can change here. Freeing is done on the resolved object. */ 705 /* eo_id can change here. Freeing is done on the resolved object. */
706 eo_id = eo_constructor(eo_id); 706 eo_id = efl_constructor(eo_id);
707 if (!eo_id) 707 if (!eo_id)
708 { 708 {
709 ERR("Object of class '%s' - Error while constructing object", 709 ERR("Object of class '%s' - Error while constructing object",
@@ -711,7 +711,7 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
711 711
712 /* We have two refs at this point. */ 712 /* We have two refs at this point. */
713 _eo_unref(obj); 713 _eo_unref(obj);
714 eo_del((Eo *) obj->header.id); 714 efl_del((Eo *) obj->header.id);
715 return NULL; 715 return NULL;
716 } 716 }
717 else if (eo_id != _eo_obj_id_get(obj)) 717 else if (eo_id != _eo_obj_id_get(obj))
@@ -719,7 +719,7 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
719 EO_OBJ_POINTER_RETURN_VAL(eo_id, new_obj, NULL); 719 EO_OBJ_POINTER_RETURN_VAL(eo_id, new_obj, NULL);
720 /* We have two refs at this point. */ 720 /* We have two refs at this point. */
721 _eo_unref(obj); 721 _eo_unref(obj);
722 eo_del((Eo *) obj->header.id); 722 efl_del((Eo *) obj->header.id);
723 723
724 _eo_ref(new_obj); 724 _eo_ref(new_obj);
725 } 725 }
@@ -739,7 +739,7 @@ _eo_add_internal_end(Eo *eo_id, Eo *finalized_id)
739 739
740 if (!obj->condtor_done) 740 if (!obj->condtor_done)
741 { 741 {
742 const _Eo_Class *klass = obj->klass; 742 const _Efl_Class *klass = obj->klass;
743 743
744 ERR("Object of class '%s' - Not all of the object constructors have been executed.", 744 ERR("Object of class '%s' - Not all of the object constructors have been executed.",
745 klass->desc->name); 745 klass->desc->name);
@@ -770,17 +770,17 @@ _eo_add_internal_end(Eo *eo_id, Eo *finalized_id)
770 770
771cleanup: 771cleanup:
772 _eo_unref(obj); 772 _eo_unref(obj);
773 eo_del((Eo *) obj->header.id); 773 efl_del((Eo *) obj->header.id);
774 return NULL; 774 return NULL;
775} 775}
776 776
777EAPI Eo * 777EAPI Eo *
778_eo_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback) 778_eo_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
779{ 779{
780 Eo *ret = eo_finalize(eo_id); 780 Eo *ret = efl_finalize(eo_id);
781 ret = _eo_add_internal_end(eo_id, ret); 781 ret = _eo_add_internal_end(eo_id, ret);
782 782
783 if (is_ref && eo_parent_get(eo_id)) 783 if (is_ref && efl_parent_get(eo_id))
784 { 784 {
785 eo_ref(eo_id); 785 eo_ref(eo_id);
786 } 786 }
@@ -795,7 +795,7 @@ _eo_add_end(Eo *eo_id, Eina_Bool is_ref, Eina_Bool is_fallback)
795 795
796/*****************************************************************************/ 796/*****************************************************************************/
797 797
798EAPI const Eo_Class * 798EAPI const Efl_Class *
799eo_class_get(const Eo *eo_id) 799eo_class_get(const Eo *eo_id)
800{ 800{
801 if (_eo_is_a_class(eo_id)) 801 if (_eo_is_a_class(eo_id))
@@ -810,9 +810,9 @@ eo_class_get(const Eo *eo_id)
810} 810}
811 811
812EAPI const char * 812EAPI const char *
813eo_class_name_get(const Eo_Class *eo_id) 813eo_class_name_get(const Efl_Class *eo_id)
814{ 814{
815 const _Eo_Class *klass; 815 const _Efl_Class *klass;
816 816
817 if (_eo_is_a_class(eo_id)) 817 if (_eo_is_a_class(eo_id))
818 { 818 {
@@ -836,9 +836,9 @@ _vtable_init(Eo_Vtable *vtable, size_t size)
836} 836}
837 837
838static void 838static void
839_eo_class_base_op_init(_Eo_Class *klass) 839_eo_class_base_op_init(_Efl_Class *klass)
840{ 840{
841 const Eo_Class_Description *desc = klass->desc; 841 const Efl_Class_Description *desc = klass->desc;
842 842
843 klass->base_id = _eo_ops_last_id; 843 klass->base_id = _eo_ops_last_id;
844 844
@@ -849,9 +849,9 @@ _eo_class_base_op_init(_Eo_Class *klass)
849 849
850#ifdef EO_DEBUG 850#ifdef EO_DEBUG
851static Eina_Bool 851static Eina_Bool
852_eo_class_mro_has(const _Eo_Class *klass, const _Eo_Class *find) 852_eo_class_mro_has(const _Efl_Class *klass, const _Efl_Class *find)
853{ 853{
854 const _Eo_Class **itr; 854 const _Efl_Class **itr;
855 for (itr = klass->mro ; *itr ; itr++) 855 for (itr = klass->mro ; *itr ; itr++)
856 { 856 {
857 if (*itr == find) 857 if (*itr == find)
@@ -892,7 +892,7 @@ _eo_class_list_remove_duplicates(Eina_List* list)
892} 892}
893 893
894static Eina_List * 894static Eina_List *
895_eo_class_mro_add(Eina_List *mro, const _Eo_Class *klass) 895_eo_class_mro_add(Eina_List *mro, const _Efl_Class *klass)
896{ 896{
897 if (!klass) 897 if (!klass)
898 return mro; 898 return mro;
@@ -901,11 +901,11 @@ _eo_class_mro_add(Eina_List *mro, const _Eo_Class *klass)
901 901
902 /* Recursively add MIXINS extensions. */ 902 /* Recursively add MIXINS extensions. */
903 { 903 {
904 const _Eo_Class **extn_itr; 904 const _Efl_Class **extn_itr;
905 905
906 for (extn_itr = klass->extensions ; *extn_itr ; extn_itr++) 906 for (extn_itr = klass->extensions ; *extn_itr ; extn_itr++)
907 { 907 {
908 const _Eo_Class *extn = *extn_itr; 908 const _Efl_Class *extn = *extn_itr;
909 if (extn->desc->type == EO_CLASS_TYPE_MIXIN) 909 if (extn->desc->type == EO_CLASS_TYPE_MIXIN)
910 mro = _eo_class_mro_add(mro, extn); 910 mro = _eo_class_mro_add(mro, extn);
911 } 911 }
@@ -917,12 +917,12 @@ _eo_class_mro_add(Eina_List *mro, const _Eo_Class *klass)
917} 917}
918 918
919static Eina_List * 919static Eina_List *
920_eo_class_mro_init(const Eo_Class_Description *desc, const _Eo_Class *parent, Eina_List *extensions) 920_eo_class_mro_init(const Efl_Class_Description *desc, const _Efl_Class *parent, Eina_List *extensions)
921{ 921{
922 Eina_List *mro = NULL; 922 Eina_List *mro = NULL;
923 Eina_List *extn_itr = NULL; 923 Eina_List *extn_itr = NULL;
924 Eina_List *extn_pos = NULL; 924 Eina_List *extn_pos = NULL;
925 const _Eo_Class *extn = NULL; 925 const _Efl_Class *extn = NULL;
926 926
927 /* Add MIXINS extensions. */ 927 /* Add MIXINS extensions. */
928 EINA_LIST_FOREACH(extensions, extn_itr, extn) 928 EINA_LIST_FOREACH(extensions, extn_itr, extn)
@@ -969,7 +969,7 @@ _eo_class_mro_init(const Eo_Class_Description *desc, const _Eo_Class *parent, Ei
969} 969}
970 970
971static void 971static void
972_eo_class_constructor(_Eo_Class *klass) 972_eo_class_constructor(_Efl_Class *klass)
973{ 973{
974 klass->constructed = EINA_TRUE; 974 klass->constructed = EINA_TRUE;
975 975
@@ -978,7 +978,7 @@ _eo_class_constructor(_Eo_Class *klass)
978} 978}
979 979
980static void 980static void
981eo_class_free(_Eo_Class *klass) 981eo_class_free(_Efl_Class *klass)
982{ 982{
983 void *data; 983 void *data;
984 984
@@ -1015,7 +1015,7 @@ _eo_classes_release(void)
1015#ifdef HAVE_MMAP 1015#ifdef HAVE_MMAP
1016 size_t size; 1016 size_t size;
1017 1017
1018 size = _eo_classes_alloc * sizeof(_Eo_Class *); 1018 size = _eo_classes_alloc * sizeof(_Efl_Class *);
1019 if (_eo_classes) munmap(_eo_classes, size); 1019 if (_eo_classes) munmap(_eo_classes, size);
1020#else 1020#else
1021 free(_eo_classes); 1021 free(_eo_classes);
@@ -1033,10 +1033,10 @@ _eo_classes_expand(void)
1033 1033
1034 _eo_classes_last_id++; 1034 _eo_classes_last_id++;
1035 if (_eo_classes_last_id <= _eo_classes_alloc) return; 1035 if (_eo_classes_last_id <= _eo_classes_alloc) return;
1036 psize = _eo_classes_alloc * sizeof(_Eo_Class *); 1036 psize = _eo_classes_alloc * sizeof(_Efl_Class *);
1037#ifdef HAVE_MMAP 1037#ifdef HAVE_MMAP
1038 _eo_classes_alloc += (MEM_PAGE_SIZE / sizeof(_Eo_Class *)); 1038 _eo_classes_alloc += (MEM_PAGE_SIZE / sizeof(_Efl_Class *));
1039 newsize = _eo_classes_alloc * sizeof(_Eo_Class *); 1039 newsize = _eo_classes_alloc * sizeof(_Efl_Class *);
1040 ptr = mmap(NULL, newsize, PROT_READ | PROT_WRITE, 1040 ptr = mmap(NULL, newsize, PROT_READ | PROT_WRITE,
1041 MAP_PRIVATE | MAP_ANON, -1, 0); 1041 MAP_PRIVATE | MAP_ANON, -1, 0);
1042 if (ptr == MAP_FAILED) 1042 if (ptr == MAP_FAILED)
@@ -1048,7 +1048,7 @@ _eo_classes_expand(void)
1048 if (_eo_classes) munmap(_eo_classes, psize); 1048 if (_eo_classes) munmap(_eo_classes, psize);
1049#else 1049#else
1050 _eo_classes_alloc += 128; 1050 _eo_classes_alloc += 128;
1051 newsize = _eo_classes_alloc * sizeof(_Eo_Class *); 1051 newsize = _eo_classes_alloc * sizeof(_Efl_Class *);
1052 ptr = realloc(_eo_classes, newsize); 1052 ptr = realloc(_eo_classes, newsize);
1053 if (!ptr) 1053 if (!ptr)
1054 { 1054 {
@@ -1057,13 +1057,13 @@ _eo_classes_expand(void)
1057 } 1057 }
1058#endif 1058#endif
1059 memset(ptr + psize, 0, newsize - psize); 1059 memset(ptr + psize, 0, newsize - psize);
1060 _eo_classes = (_Eo_Class **)ptr; 1060 _eo_classes = (_Efl_Class **)ptr;
1061} 1061}
1062 1062
1063EAPI const Eo_Class * 1063EAPI const Efl_Class *
1064eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) 1064eo_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...)
1065{ 1065{
1066 _Eo_Class *klass; 1066 _Efl_Class *klass;
1067 va_list p_list; 1067 va_list p_list;
1068 size_t extn_sz, mro_sz, mixins_sz; 1068 size_t extn_sz, mro_sz, mixins_sz;
1069 Eina_List *extn_list, *mro, *mixins; 1069 Eina_List *extn_list, *mro, *mixins;
@@ -1071,7 +1071,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1071 EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL); 1071 EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL);
1072 EINA_SAFETY_ON_NULL_RETURN_VAL(desc->name, NULL); 1072 EINA_SAFETY_ON_NULL_RETURN_VAL(desc->name, NULL);
1073 1073
1074 _Eo_Class *parent = _eo_class_pointer_get(parent_id); 1074 _Efl_Class *parent = _eo_class_pointer_get(parent_id);
1075#ifndef HAVE_EO_ID 1075#ifndef HAVE_EO_ID
1076 if (parent && !EINA_MAGIC_CHECK((Eo_Header *) parent, EO_CLASS_EINA_MAGIC)) 1076 if (parent && !EINA_MAGIC_CHECK((Eo_Header *) parent, EO_CLASS_EINA_MAGIC))
1077 { 1077 {
@@ -1119,7 +1119,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1119 { 1119 {
1120 DBG("Started building extensions list for class '%s'", desc->name); 1120 DBG("Started building extensions list for class '%s'", desc->name);
1121 extn_list = NULL; 1121 extn_list = NULL;
1122 const _Eo_Class *extn = NULL; 1122 const _Efl_Class *extn = NULL;
1123 const Eo_Id *extn_id = NULL; 1123 const Eo_Id *extn_id = NULL;
1124 1124
1125 va_start(p_list, parent_id); 1125 va_start(p_list, parent_id);
@@ -1127,7 +1127,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1127 extn_id = va_arg(p_list, Eo_Id *); 1127 extn_id = va_arg(p_list, Eo_Id *);
1128 while (extn_id) 1128 while (extn_id)
1129 { 1129 {
1130 extn = _eo_class_pointer_get((Eo_Class *)extn_id); 1130 extn = _eo_class_pointer_get((Efl_Class *)extn_id);
1131 switch (extn->desc->type) 1131 switch (extn->desc->type)
1132 { 1132 {
1133 case EO_CLASS_TYPE_REGULAR_NO_INSTANT: 1133 case EO_CLASS_TYPE_REGULAR_NO_INSTANT:
@@ -1145,7 +1145,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1145 1145
1146 extn_list = _eo_class_list_remove_duplicates(extn_list); 1146 extn_list = _eo_class_list_remove_duplicates(extn_list);
1147 1147
1148 extn_sz = sizeof(_Eo_Class *) * (eina_list_count(extn_list) + 1); 1148 extn_sz = sizeof(_Efl_Class *) * (eina_list_count(extn_list) + 1);
1149 1149
1150 DBG("Finished building extensions list for class '%s'", desc->name); 1150 DBG("Finished building extensions list for class '%s'", desc->name);
1151 } 1151 }
@@ -1161,7 +1161,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1161 return NULL; 1161 return NULL;
1162 } 1162 }
1163 1163
1164 mro_sz = sizeof(_Eo_Class *) * (eina_list_count(mro) + 1); 1164 mro_sz = sizeof(_Efl_Class *) * (eina_list_count(mro) + 1);
1165 1165
1166 DBG("Finished building MRO list for class '%s'", desc->name); 1166 DBG("Finished building MRO list for class '%s'", desc->name);
1167 } 1167 }
@@ -1169,7 +1169,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1169 /* Prepare mixins list */ 1169 /* Prepare mixins list */
1170 { 1170 {
1171 Eina_List *itr; 1171 Eina_List *itr;
1172 const _Eo_Class *kls_itr; 1172 const _Efl_Class *kls_itr;
1173 1173
1174 DBG("Started building Mixins list for class '%s'", desc->name); 1174 DBG("Started building Mixins list for class '%s'", desc->name);
1175 1175
@@ -1196,8 +1196,8 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1196 eina_spinlock_new(&klass->iterators.trash_lock); 1196 eina_spinlock_new(&klass->iterators.trash_lock);
1197 klass->parent = parent; 1197 klass->parent = parent;
1198 klass->desc = desc; 1198 klass->desc = desc;
1199 klass->extensions = (const _Eo_Class **) ((char *) klass + _eo_class_sz); 1199 klass->extensions = (const _Efl_Class **) ((char *) klass + _eo_class_sz);
1200 klass->mro = (const _Eo_Class **) ((char *) klass->extensions + extn_sz); 1200 klass->mro = (const _Efl_Class **) ((char *) klass->extensions + extn_sz);
1201 klass->extn_data_off = (Eo_Extension_Data_Offset *) ((char *) klass->mro + mro_sz); 1201 klass->extn_data_off = (Eo_Extension_Data_Offset *) ((char *) klass->mro + mro_sz);
1202 if (klass->parent) 1202 if (klass->parent)
1203 { 1203 {
@@ -1218,8 +1218,8 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1218 1218
1219 /* Copy the extensions and free the list */ 1219 /* Copy the extensions and free the list */
1220 { 1220 {
1221 const _Eo_Class *extn = NULL; 1221 const _Efl_Class *extn = NULL;
1222 const _Eo_Class **extn_itr = klass->extensions; 1222 const _Efl_Class **extn_itr = klass->extensions;
1223 EINA_LIST_FREE(extn_list, extn) 1223 EINA_LIST_FREE(extn_list, extn)
1224 { 1224 {
1225 *(extn_itr++) = extn; 1225 *(extn_itr++) = extn;
@@ -1231,8 +1231,8 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1231 1231
1232 /* Copy the mro and free the list. */ 1232 /* Copy the mro and free the list. */
1233 { 1233 {
1234 const _Eo_Class *kls_itr = NULL; 1234 const _Efl_Class *kls_itr = NULL;
1235 const _Eo_Class **mro_itr = klass->mro; 1235 const _Efl_Class **mro_itr = klass->mro;
1236 EINA_LIST_FREE(mro, kls_itr) 1236 EINA_LIST_FREE(mro, kls_itr)
1237 { 1237 {
1238 *(mro_itr++) = kls_itr; 1238 *(mro_itr++) = kls_itr;
@@ -1248,7 +1248,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1248 1248
1249 /* Feed the mixins data offsets and free the mixins list. */ 1249 /* Feed the mixins data offsets and free the mixins list. */
1250 { 1250 {
1251 const _Eo_Class *kls_itr = NULL; 1251 const _Efl_Class *kls_itr = NULL;
1252 Eo_Extension_Data_Offset *extn_data_itr = klass->extn_data_off; 1252 Eo_Extension_Data_Offset *extn_data_itr = klass->extn_data_off;
1253 EINA_LIST_FREE(mixins, kls_itr) 1253 EINA_LIST_FREE(mixins, kls_itr)
1254 { 1254 {
@@ -1275,7 +1275,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1275 1275
1276 /* Flatten the function array */ 1276 /* Flatten the function array */
1277 { 1277 {
1278 const _Eo_Class **mro_itr = klass->mro; 1278 const _Efl_Class **mro_itr = klass->mro;
1279 for ( ; *mro_itr ; mro_itr++) 1279 for ( ; *mro_itr ; mro_itr++)
1280 ; 1280 ;
1281 1281
@@ -1288,11 +1288,11 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
1288 1288
1289 /* Mark which classes we implement */ 1289 /* Mark which classes we implement */
1290 { 1290 {
1291 const _Eo_Class **extn_itr; 1291 const _Efl_Class **extn_itr;
1292 1292
1293 for (extn_itr = klass->extensions ; *extn_itr ; extn_itr++) 1293 for (extn_itr = klass->extensions ; *extn_itr ; extn_itr++)
1294 { 1294 {
1295 const _Eo_Class *extn = *extn_itr; 1295 const _Efl_Class *extn = *extn_itr;
1296 /* Set it in the dich. */ 1296 /* Set it in the dich. */
1297 _vtable_func_set(&klass->vtable, klass, extn->base_id + 1297 _vtable_func_set(&klass->vtable, klass, extn->base_id +
1298 extn->desc->ops.count, _eo_class_isa_func); 1298 extn->desc->ops.count, _eo_class_isa_func);
@@ -1341,7 +1341,7 @@ EAPI Eina_Bool
1341eo_override(Eo *eo_id, const Eo_Ops *ops) 1341eo_override(Eo *eo_id, const Eo_Ops *ops)
1342{ 1342{
1343 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE); 1343 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE);
1344 EO_CLASS_POINTER_RETURN_VAL(EO_OVERRIDE_CLASS, klass, EINA_FALSE); 1344 EO_CLASS_POINTER_RETURN_VAL(EFL_OBJECT_OVERRIDE_CLASS, klass, EINA_FALSE);
1345 Eo_Vtable *previous = obj->vtable; 1345 Eo_Vtable *previous = obj->vtable;
1346 1346
1347 if (!ops) 1347 if (!ops)
@@ -1377,7 +1377,7 @@ eo_override(Eo *eo_id, const Eo_Ops *ops)
1377} 1377}
1378 1378
1379EAPI Eina_Bool 1379EAPI Eina_Bool
1380eo_isa(const Eo *eo_id, const Eo_Class *klass_id) 1380eo_isa(const Eo *eo_id, const Efl_Class *klass_id)
1381{ 1381{
1382 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE); 1382 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, EINA_FALSE);
1383 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EINA_FALSE); 1383 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EINA_FALSE);
@@ -1496,7 +1496,7 @@ ___eo_ref2_reset(const Eo *obj_id)
1496 1496
1497 1497
1498EAPI void 1498EAPI void
1499eo_del_intercept_set(Eo *obj_id, Eo_Del_Intercept del_intercept_func) 1499efl_del_intercept_set(Eo *obj_id, Eo_Del_Intercept del_intercept_func)
1500{ 1500{
1501 EO_OBJ_POINTER_RETURN(obj_id, obj); 1501 EO_OBJ_POINTER_RETURN(obj_id, obj);
1502 1502
@@ -1504,7 +1504,7 @@ eo_del_intercept_set(Eo *obj_id, Eo_Del_Intercept del_intercept_func)
1504} 1504}
1505 1505
1506EAPI Eo_Del_Intercept 1506EAPI Eo_Del_Intercept
1507eo_del_intercept_get(const Eo *obj_id) 1507efl_del_intercept_get(const Eo *obj_id)
1508{ 1508{
1509 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL); 1509 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
1510 1510
@@ -1525,7 +1525,7 @@ _eo_condtor_done(Eo *obj_id)
1525} 1525}
1526 1526
1527static inline void * 1527static inline void *
1528_eo_data_scope_safe_get(const _Eo_Object *obj, const _Eo_Class *klass) 1528_eo_data_scope_safe_get(const _Eo_Object *obj, const _Efl_Class *klass)
1529{ 1529{
1530 if (EINA_LIKELY(klass->desc->data_size > 0)) 1530 if (EINA_LIKELY(klass->desc->data_size > 0))
1531 { 1531 {
@@ -1536,7 +1536,7 @@ _eo_data_scope_safe_get(const _Eo_Object *obj, const _Eo_Class *klass)
1536} 1536}
1537 1537
1538static inline void * 1538static inline void *
1539_eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass) 1539_eo_data_scope_get(const _Eo_Object *obj, const _Efl_Class *klass)
1540{ 1540{
1541 if (EINA_LIKELY(klass->desc->type != EO_CLASS_TYPE_MIXIN)) 1541 if (EINA_LIKELY(klass->desc->type != EO_CLASS_TYPE_MIXIN))
1542 return ((char *) obj) + klass->data_offset; 1542 return ((char *) obj) + klass->data_offset;
@@ -1564,7 +1564,7 @@ _eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass)
1564} 1564}
1565 1565
1566static inline void * 1566static inline void *
1567_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Eo_Class *klass, const _Eo_Object *ref_obj) 1567_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Efl_Class *klass, const _Eo_Object *ref_obj)
1568{ 1568{
1569 void *data = NULL; 1569 void *data = NULL;
1570 if (klass != NULL) 1570 if (klass != NULL)
@@ -1592,7 +1592,7 @@ static inline void
1592_eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj) 1592_eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
1593{ 1593{
1594#ifdef EO_DEBUG 1594#ifdef EO_DEBUG
1595 const _Eo_Class *klass = obj->klass; 1595 const _Efl_Class *klass = obj->klass;
1596 Eina_Bool in_range = (((char *)data >= (((char *) obj) + _eo_sz)) && 1596 Eina_Bool in_range = (((char *)data >= (((char *) obj) + _eo_sz)) &&
1597 ((char *)data < (((char *) obj) + klass->obj_size))); 1597 ((char *)data < (((char *) obj) + klass->obj_size)));
1598 if (!in_range) 1598 if (!in_range)
@@ -1634,7 +1634,7 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
1634} 1634}
1635 1635
1636EAPI void * 1636EAPI void *
1637eo_data_scope_get(const Eo *obj_id, const Eo_Class *klass_id) 1637eo_data_scope_get(const Eo *obj_id, const Efl_Class *klass_id)
1638{ 1638{
1639 void *ret; 1639 void *ret;
1640 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL); 1640 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
@@ -1661,12 +1661,12 @@ eo_data_scope_get(const Eo *obj_id, const Eo_Class *klass_id)
1661} 1661}
1662 1662
1663EAPI void * 1663EAPI void *
1664eo_data_xref_internal(const char *file, int line, const Eo *obj_id, const Eo_Class *klass_id, const Eo *ref_obj_id) 1664eo_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_Class *klass_id, const Eo *ref_obj_id)
1665{ 1665{
1666 void *ret; 1666 void *ret;
1667 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL); 1667 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
1668 EO_OBJ_POINTER_RETURN_VAL(ref_obj_id, ref_obj, NULL); 1668 EO_OBJ_POINTER_RETURN_VAL(ref_obj_id, ref_obj, NULL);
1669 _Eo_Class *klass = NULL; 1669 _Efl_Class *klass = NULL;
1670 if (klass_id) 1670 if (klass_id)
1671 { 1671 {
1672 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass2, NULL); 1672 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass2, NULL);
@@ -1711,7 +1711,7 @@ eo_init(void)
1711 eina_init(); 1711 eina_init();
1712 1712
1713 _eo_sz = EO_ALIGN_SIZE(sizeof(_Eo_Object)); 1713 _eo_sz = EO_ALIGN_SIZE(sizeof(_Eo_Object));
1714 _eo_class_sz = EO_ALIGN_SIZE(sizeof(_Eo_Class)); 1714 _eo_class_sz = EO_ALIGN_SIZE(sizeof(_Efl_Class));
1715 1715
1716 _eo_classes = NULL; 1716 _eo_classes = NULL;
1717 _eo_classes_last_id = EO_CLASS_IDS_FIRST - 1; 1717 _eo_classes_last_id = EO_CLASS_IDS_FIRST - 1;
@@ -1775,7 +1775,7 @@ EAPI Eina_Bool
1775eo_shutdown(void) 1775eo_shutdown(void)
1776{ 1776{
1777 size_t i; 1777 size_t i;
1778 _Eo_Class **cls_itr = _eo_classes + _eo_classes_last_id - 1; 1778 _Efl_Class **cls_itr = _eo_classes + _eo_classes_last_id - 1;
1779 1779
1780 if (--_eo_init_count > 0) 1780 if (--_eo_init_count > 0)
1781 return EINA_TRUE; 1781 return EINA_TRUE;
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index e7742b80df..89d3618a2f 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -20,14 +20,14 @@ typedef struct
20 Eo *composite_parent; 20 Eo *composite_parent;
21 Eina_Inlist *generic_data; 21 Eina_Inlist *generic_data;
22 Eo ***wrefs; 22 Eo ***wrefs;
23} Eo_Base_Extension; 23} Efl_Object_Extension;
24 24
25typedef struct 25typedef struct
26{ 26{
27 Eina_Inlist *children; 27 Eina_Inlist *children;
28 Eo *parent; 28 Eo *parent;
29 29
30 Eo_Base_Extension *ext; 30 Efl_Object_Extension *ext;
31 Eo_Callback_Description *callbacks; 31 Eo_Callback_Description *callbacks;
32 32
33 Eina_Inlist *current; 33 Eina_Inlist *current;
@@ -36,7 +36,7 @@ typedef struct
36 unsigned short event_freeze_count; 36 unsigned short event_freeze_count;
37 Eina_Bool deletions_waiting : 1; 37 Eina_Bool deletions_waiting : 1;
38 Eina_Bool callback_stopped : 1; 38 Eina_Bool callback_stopped : 1;
39} Eo_Base_Data; 39} Efl_Object_Data;
40 40
41typedef enum { 41typedef enum {
42 DATA_PTR, 42 DATA_PTR,
@@ -61,30 +61,30 @@ typedef struct
61typedef struct 61typedef struct
62{ 62{
63 EINA_INLIST; 63 EINA_INLIST;
64 const Eo_Event_Description *desc; 64 const Efl_Event_Description *desc;
65 Eo_Callback_Description *current; 65 Eo_Callback_Description *current;
66} Eo_Current_Callback_Description; 66} Eo_Current_Callback_Description;
67 67
68static inline void 68static inline void
69_eo_base_extension_free(Eo_Base_Extension *ext) 69_efl_object_extension_free(Efl_Object_Extension *ext)
70{ 70{
71 free(ext); 71 free(ext);
72} 72}
73 73
74static inline void 74static inline void
75_eo_base_extension_need(Eo_Base_Data *pd) 75_efl_object_extension_need(Efl_Object_Data *pd)
76{ 76{
77 if (pd->ext) return; 77 if (pd->ext) return;
78 pd->ext = calloc(1, sizeof(Eo_Base_Extension)); 78 pd->ext = calloc(1, sizeof(Efl_Object_Extension));
79} 79}
80 80
81static inline void 81static inline void
82_eo_base_extension_noneed(Eo_Base_Data *pd) 82_efl_object_extension_noneed(Efl_Object_Data *pd)
83{ 83{
84 Eo_Base_Extension *ext = pd->ext; 84 Efl_Object_Extension *ext = pd->ext;
85 if ((!ext) || (ext->name) || (ext->comment) || (ext->generic_data) || 85 if ((!ext) || (ext->name) || (ext->comment) || (ext->generic_data) ||
86 (ext->wrefs) || (ext->composite_parent)) return; 86 (ext->wrefs) || (ext->composite_parent)) return;
87 _eo_base_extension_free(pd->ext); 87 _efl_object_extension_free(pd->ext);
88 pd->ext = NULL; 88 pd->ext = NULL;
89} 89}
90 90
@@ -98,11 +98,11 @@ _eo_generic_data_node_free(Eo_Generic_Data_Node *node)
98 case DATA_PTR: 98 case DATA_PTR:
99 break; 99 break;
100 case DATA_OBJ: 100 case DATA_OBJ:
101 eo_event_callback_del(node->d.obj, EO_EVENT_DEL, _key_generic_cb_del, node); 101 efl_event_callback_del(node->d.obj, EFL_EVENT_DEL, _key_generic_cb_del, node);
102 eo_unref(node->d.obj); 102 eo_unref(node->d.obj);
103 break; 103 break;
104 case DATA_OBJ_WEAK: 104 case DATA_OBJ_WEAK:
105 eo_event_callback_del(node->d.obj, EO_EVENT_DEL, _key_generic_cb_del, node); 105 efl_event_callback_del(node->d.obj, EFL_EVENT_DEL, _key_generic_cb_del, node);
106 break; 106 break;
107 case DATA_VAL: 107 case DATA_VAL:
108 eina_value_free(node->d.val); 108 eina_value_free(node->d.val);
@@ -113,10 +113,10 @@ _eo_generic_data_node_free(Eo_Generic_Data_Node *node)
113} 113}
114 114
115static void 115static void
116_eo_generic_data_del_all(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 116_eo_generic_data_del_all(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
117{ 117{
118 Eo_Generic_Data_Node *node; 118 Eo_Generic_Data_Node *node;
119 Eo_Base_Extension *ext = pd->ext; 119 Efl_Object_Extension *ext = pd->ext;
120 120
121 if (!ext) return; 121 if (!ext) return;
122 122
@@ -131,9 +131,9 @@ _eo_generic_data_del_all(Eo *obj EINA_UNUSED, Eo_Base_Data *pd)
131} 131}
132 132
133static void 133static void
134_eo_key_generic_direct_del(Eo_Base_Data *pd, Eo_Generic_Data_Node *node, Eina_Bool call_free) 134_eo_key_generic_direct_del(Efl_Object_Data *pd, Eo_Generic_Data_Node *node, Eina_Bool call_free)
135{ 135{
136 Eo_Base_Extension *ext = pd->ext; 136 Efl_Object_Extension *ext = pd->ext;
137 137
138 ext->generic_data = eina_inlist_remove 138 ext->generic_data = eina_inlist_remove
139 (ext->generic_data, EINA_INLIST_GET(node)); 139 (ext->generic_data, EINA_INLIST_GET(node));
@@ -141,10 +141,10 @@ _eo_key_generic_direct_del(Eo_Base_Data *pd, Eo_Generic_Data_Node *node, Eina_Bo
141} 141}
142 142
143static void 143static void
144_eo_key_generic_del(const Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, Eina_Bool call_free) 144_eo_key_generic_del(const Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *key, Eina_Bool call_free)
145{ 145{
146 Eo_Generic_Data_Node *node; 146 Eo_Generic_Data_Node *node;
147 Eo_Base_Extension *ext = pd->ext; 147 Efl_Object_Extension *ext = pd->ext;
148 148
149 EINA_INLIST_FOREACH(ext->generic_data, node) 149 EINA_INLIST_FOREACH(ext->generic_data, node)
150 { 150 {
@@ -160,10 +160,10 @@ _eo_key_generic_del(const Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key
160 160
161/* Return TRUE if the object was newly added. */ 161/* Return TRUE if the object was newly added. */
162static Eo_Generic_Data_Node * 162static Eo_Generic_Data_Node *
163_key_generic_set(const Eo *obj, Eo_Base_Data *pd, const char *key, const void *data, Eo_Generic_Data_Node_Type d_type, Eina_Bool call_free) 163_key_generic_set(const Eo *obj, Efl_Object_Data *pd, const char *key, const void *data, Eo_Generic_Data_Node_Type d_type, Eina_Bool call_free)
164{ 164{
165 Eo_Generic_Data_Node *node; 165 Eo_Generic_Data_Node *node;
166 Eo_Base_Extension *ext = pd->ext; 166 Efl_Object_Extension *ext = pd->ext;
167 167
168 if (!key) return NULL; 168 if (!key) return NULL;
169 if (ext) 169 if (ext)
@@ -187,7 +187,7 @@ _key_generic_set(const Eo *obj, Eo_Base_Data *pd, const char *key, const void *d
187 } 187 }
188 } 188 }
189 189
190 _eo_base_extension_need(pd); 190 _efl_object_extension_need(pd);
191 ext = pd->ext; 191 ext = pd->ext;
192 if (ext) 192 if (ext)
193 { 193 {
@@ -206,10 +206,10 @@ _key_generic_set(const Eo *obj, Eo_Base_Data *pd, const char *key, const void *d
206} 206}
207 207
208static void * 208static void *
209_key_generic_get(const Eo *obj, Eo_Base_Data *pd, const char *key, Eo_Generic_Data_Node_Type d_type) 209_key_generic_get(const Eo *obj, Efl_Object_Data *pd, const char *key, Eo_Generic_Data_Node_Type d_type)
210{ 210{
211 Eo_Generic_Data_Node *node; 211 Eo_Generic_Data_Node *node;
212 Eo_Base_Extension *ext = pd->ext; 212 Efl_Object_Extension *ext = pd->ext;
213 213
214 if (!key) return NULL; 214 if (!key) return NULL;
215 if (!ext) return NULL; 215 if (!ext) return NULL;
@@ -238,24 +238,24 @@ static void
238_key_generic_cb_del(void *data, const Eo_Event *event EINA_UNUSED) 238_key_generic_cb_del(void *data, const Eo_Event *event EINA_UNUSED)
239{ 239{
240 Eo_Generic_Data_Node *node = data; 240 Eo_Generic_Data_Node *node = data;
241 Eo_Base_Data *pd = eo_data_scope_get(node->obj, EO_BASE_CLASS); 241 Efl_Object_Data *pd = eo_data_scope_get(node->obj, EFL_OBJECT_CLASS);
242 _eo_key_generic_direct_del(pd, node, EINA_FALSE); 242 _eo_key_generic_direct_del(pd, node, EINA_FALSE);
243} 243}
244 244
245EOLIAN static void 245EOLIAN static void
246_eo_base_key_data_set(Eo *obj, Eo_Base_Data *pd, const char *key, const void *data) 246_efl_object_key_data_set(Eo *obj, Efl_Object_Data *pd, const char *key, const void *data)
247{ 247{
248 _key_generic_set(obj, pd, key, data, DATA_PTR, EINA_TRUE); 248 _key_generic_set(obj, pd, key, data, DATA_PTR, EINA_TRUE);
249} 249}
250 250
251EOLIAN static void * 251EOLIAN static void *
252_eo_base_key_data_get(Eo *obj, Eo_Base_Data *pd, const char *key) 252_efl_object_key_data_get(Eo *obj, Efl_Object_Data *pd, const char *key)
253{ 253{
254 return _key_generic_get(obj, pd, key, DATA_PTR); 254 return _key_generic_get(obj, pd, key, DATA_PTR);
255} 255}
256 256
257EOLIAN static void 257EOLIAN static void
258_eo_base_key_ref_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, const Eo *objdata) 258_efl_object_key_ref_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *key, const Eo *objdata)
259{ 259{
260 Eo_Generic_Data_Node *node; 260 Eo_Generic_Data_Node *node;
261 261
@@ -263,53 +263,53 @@ _eo_base_key_ref_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, con
263 if (node) 263 if (node)
264 { 264 {
265 eo_ref(objdata); 265 eo_ref(objdata);
266 eo_event_callback_add((Eo *)objdata, EO_EVENT_DEL, _key_generic_cb_del, node); 266 efl_event_callback_add((Eo *)objdata, EFL_EVENT_DEL, _key_generic_cb_del, node);
267 } 267 }
268} 268}
269 269
270EOLIAN static Eo * 270EOLIAN static Eo *
271_eo_base_key_ref_get(Eo *obj, Eo_Base_Data *pd, const char *key) 271_efl_object_key_ref_get(Eo *obj, Efl_Object_Data *pd, const char *key)
272{ 272{
273 return _key_generic_get(obj, pd, key, DATA_OBJ); 273 return _key_generic_get(obj, pd, key, DATA_OBJ);
274} 274}
275 275
276EOLIAN static void 276EOLIAN static void
277_eo_base_key_wref_set(Eo *obj, Eo_Base_Data *pd, const char * key, const Eo_Base *objdata) 277_efl_object_key_wref_set(Eo *obj, Efl_Object_Data *pd, const char * key, const Efl_Object *objdata)
278{ 278{
279 Eo_Generic_Data_Node *node; 279 Eo_Generic_Data_Node *node;
280 280
281 node = _key_generic_set(obj, pd, key, objdata, DATA_OBJ_WEAK, EINA_TRUE); 281 node = _key_generic_set(obj, pd, key, objdata, DATA_OBJ_WEAK, EINA_TRUE);
282 if (node) 282 if (node)
283 { 283 {
284 eo_event_callback_add((Eo *)objdata, EO_EVENT_DEL, _key_generic_cb_del, node); 284 efl_event_callback_add((Eo *)objdata, EFL_EVENT_DEL, _key_generic_cb_del, node);
285 } 285 }
286} 286}
287 287
288EOLIAN static Eo * 288EOLIAN static Eo *
289_eo_base_key_wref_get(Eo *obj, Eo_Base_Data *pd, const char * key) 289_efl_object_key_wref_get(Eo *obj, Efl_Object_Data *pd, const char * key)
290{ 290{
291 return _key_generic_get(obj, pd, key, DATA_OBJ_WEAK); 291 return _key_generic_get(obj, pd, key, DATA_OBJ_WEAK);
292} 292}
293 293
294EOLIAN static void 294EOLIAN static void
295_eo_base_key_value_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, Eina_Value *value) 295_efl_object_key_value_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *key, Eina_Value *value)
296{ 296{
297 _key_generic_set(obj, pd, key, value, DATA_VAL, EINA_TRUE); 297 _key_generic_set(obj, pd, key, value, DATA_VAL, EINA_TRUE);
298} 298}
299 299
300EOLIAN static Eina_Value * 300EOLIAN static Eina_Value *
301_eo_base_key_value_get(Eo *obj, Eo_Base_Data *pd, const char *key) 301_efl_object_key_value_get(Eo *obj, Efl_Object_Data *pd, const char *key)
302{ 302{
303 return _key_generic_get(obj, pd, key, DATA_VAL); 303 return _key_generic_get(obj, pd, key, DATA_VAL);
304} 304}
305 305
306EOLIAN static void 306EOLIAN static void
307_eo_base_name_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *name) 307_efl_object_name_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *name)
308{ 308{
309 if ((name) && (!name[0])) name = NULL; 309 if ((name) && (!name[0])) name = NULL;
310 if (name) 310 if (name)
311 { 311 {
312 _eo_base_extension_need(pd); 312 _efl_object_extension_need(pd);
313 if (pd->ext) eina_stringshare_replace(&(pd->ext->name), name); 313 if (pd->ext) eina_stringshare_replace(&(pd->ext->name), name);
314 } 314 }
315 else 315 else
@@ -318,13 +318,13 @@ _eo_base_name_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *name)
318 if (pd->ext->name) 318 if (pd->ext->name)
319 { 319 {
320 eina_stringshare_replace(&(pd->ext->name), name); 320 eina_stringshare_replace(&(pd->ext->name), name);
321 _eo_base_extension_noneed(pd); 321 _efl_object_extension_noneed(pd);
322 } 322 }
323 } 323 }
324} 324}
325 325
326EOLIAN static const char * 326EOLIAN static const char *
327_eo_base_name_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 327_efl_object_name_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
328{ 328{
329 if (!pd->ext) return NULL; 329 if (!pd->ext) return NULL;
330 return pd->ext->name; 330 return pd->ext->name;
@@ -386,8 +386,8 @@ _ismultiglob(const char *match)
386 return EINA_FALSE; 386 return EINA_FALSE;
387} 387}
388 388
389EOLIAN static Eo_Base * 389EOLIAN static Efl_Object *
390_eo_base_name_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search) 390_efl_object_name_find(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *search)
391{ 391{
392 Eo *child; 392 Eo *child;
393 _Eo_Object *child_eo; 393 _Eo_Object *child_eo;
@@ -441,13 +441,13 @@ _eo_base_name_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
441 EINA_INLIST_FOREACH(pd->children, child_eo) 441 EINA_INLIST_FOREACH(pd->children, child_eo)
442 { 442 {
443 child = _eo_obj_id_get(child_eo); 443 child = _eo_obj_id_get(child_eo);
444 name = eo_name_get(child); 444 name = efl_name_get(child);
445 klass_name = eo_class_name_get(eo_class_get(child)); 445 klass_name = eo_class_name_get(eo_class_get(child));
446 if (_name_match(klass, klass_glob, klass_name) && 446 if (_name_match(klass, klass_glob, klass_name) &&
447 (((!_matchall(klass)) && (!name) && (_matchall(search_name))) || 447 (((!_matchall(klass)) && (!name) && (_matchall(search_name))) ||
448 ((name) && _name_match(search_name, name_glob, name)))) 448 ((name) && _name_match(search_name, name_glob, name))))
449 return child; 449 return child;
450 child = eo_name_find(child, search); 450 child = efl_name_find(child, search);
451 if (child) return child; 451 if (child) return child;
452 } 452 }
453 } 453 }
@@ -459,10 +459,10 @@ _eo_base_name_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
459 EINA_INLIST_FOREACH(pd->children, child_eo) 459 EINA_INLIST_FOREACH(pd->children, child_eo)
460 { 460 {
461 child = _eo_obj_id_get(child_eo); 461 child = _eo_obj_id_get(child_eo);
462 name = eo_name_get(child); 462 name = efl_name_get(child);
463 if ((name) && (_name_match(search, EINA_TRUE, name))) 463 if ((name) && (_name_match(search, EINA_TRUE, name)))
464 return child; 464 return child;
465 child = eo_name_find(child, search); 465 child = efl_name_find(child, search);
466 if (child) return child; 466 if (child) return child;
467 } 467 }
468 } 468 }
@@ -472,10 +472,10 @@ _eo_base_name_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
472 EINA_INLIST_FOREACH(pd->children, child_eo) 472 EINA_INLIST_FOREACH(pd->children, child_eo)
473 { 473 {
474 child = _eo_obj_id_get(child_eo); 474 child = _eo_obj_id_get(child_eo);
475 name = eo_name_get(child); 475 name = efl_name_get(child);
476 if ((name) && (_name_match(search, EINA_FALSE, name))) 476 if ((name) && (_name_match(search, EINA_FALSE, name)))
477 return child; 477 return child;
478 child = eo_name_find(child, search); 478 child = efl_name_find(child, search);
479 if (child) return child; 479 if (child) return child;
480 } 480 }
481 } 481 }
@@ -485,12 +485,12 @@ _eo_base_name_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
485} 485}
486 486
487EOLIAN static void 487EOLIAN static void
488_eo_base_comment_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *comment) 488_efl_object_comment_set(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const char *comment)
489{ 489{
490 if ((comment) && (!comment[0])) comment = NULL; 490 if ((comment) && (!comment[0])) comment = NULL;
491 if (comment) 491 if (comment)
492 { 492 {
493 _eo_base_extension_need(pd); 493 _efl_object_extension_need(pd);
494 if (pd->ext) eina_stringshare_replace(&(pd->ext->comment), comment); 494 if (pd->ext) eina_stringshare_replace(&(pd->ext->comment), comment);
495 } 495 }
496 else 496 else
@@ -499,24 +499,24 @@ _eo_base_comment_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *comment)
499 if (pd->ext->comment) 499 if (pd->ext->comment)
500 { 500 {
501 eina_stringshare_replace(&(pd->ext->comment), comment); 501 eina_stringshare_replace(&(pd->ext->comment), comment);
502 _eo_base_extension_noneed(pd); 502 _efl_object_extension_noneed(pd);
503 } 503 }
504 } 504 }
505} 505}
506 506
507EOLIAN static const char * 507EOLIAN static const char *
508_eo_base_comment_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 508_efl_object_comment_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
509{ 509{
510 if (!pd->ext) return NULL; 510 if (!pd->ext) return NULL;
511 return pd->ext->comment; 511 return pd->ext->comment;
512} 512}
513 513
514EOLIAN static void 514EOLIAN static void
515_eo_base_del(const Eo *obj, Eo_Base_Data *pd EINA_UNUSED) 515_efl_object_del(const Eo *obj, Efl_Object_Data *pd EINA_UNUSED)
516{ 516{
517 if (eo_parent_get((Eo *) obj)) 517 if (efl_parent_get((Eo *) obj))
518 { 518 {
519 eo_parent_set((Eo *) obj, NULL); 519 efl_parent_set((Eo *) obj, NULL);
520 } 520 }
521 else 521 else
522 { 522 {
@@ -525,7 +525,7 @@ _eo_base_del(const Eo *obj, Eo_Base_Data *pd EINA_UNUSED)
525} 525}
526 526
527EOLIAN static void 527EOLIAN static void
528_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id) 528_efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
529{ 529{
530 if (pd->parent == parent_id) 530 if (pd->parent == parent_id)
531 return; 531 return;
@@ -534,9 +534,9 @@ _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
534 534
535 if (pd->parent) 535 if (pd->parent)
536 { 536 {
537 Eo_Base_Data *old_parent_pd; 537 Efl_Object_Data *old_parent_pd;
538 538
539 old_parent_pd = eo_data_scope_get(pd->parent, EO_BASE_CLASS); 539 old_parent_pd = eo_data_scope_get(pd->parent, EFL_OBJECT_CLASS);
540 if (old_parent_pd) 540 if (old_parent_pd)
541 { 541 {
542 old_parent_pd->children = eina_inlist_remove(old_parent_pd->children, 542 old_parent_pd->children = eina_inlist_remove(old_parent_pd->children,
@@ -559,8 +559,8 @@ _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
559 /* Set new parent */ 559 /* Set new parent */
560 if (parent_id) 560 if (parent_id)
561 { 561 {
562 Eo_Base_Data *parent_pd = NULL; 562 Efl_Object_Data *parent_pd = NULL;
563 parent_pd = eo_data_scope_get(parent_id, EO_BASE_CLASS); 563 parent_pd = eo_data_scope_get(parent_id, EFL_OBJECT_CLASS);
564 564
565 if (EINA_LIKELY(parent_pd != NULL)) 565 if (EINA_LIKELY(parent_pd != NULL))
566 { 566 {
@@ -582,23 +582,23 @@ _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
582} 582}
583 583
584EOLIAN static Eo * 584EOLIAN static Eo *
585_eo_base_parent_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 585_efl_object_parent_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
586{ 586{
587 return pd->parent; 587 return pd->parent;
588} 588}
589 589
590EOLIAN static Eina_Bool 590EOLIAN static Eina_Bool
591_eo_base_finalized_get(Eo *obj_id, Eo_Base_Data *pd EINA_UNUSED) 591_efl_object_finalized_get(Eo *obj_id, Efl_Object_Data *pd EINA_UNUSED)
592{ 592{
593 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); 593 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE);
594 594
595 return obj->finalized; 595 return obj->finalized;
596} 596}
597 597
598EOLIAN static Eo_Base * 598EOLIAN static Efl_Object *
599_eo_base_provider_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const Eo_Base *klass) 599_efl_object_provider_find(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const Efl_Object *klass)
600{ 600{
601 if (pd->parent) return eo_provider_find(pd->parent, klass); 601 if (pd->parent) return efl_provider_find(pd->parent, klass);
602 return NULL; 602 return NULL;
603} 603}
604 604
@@ -614,7 +614,7 @@ struct _Eo_Children_Iterator
614}; 614};
615 615
616static Eina_Bool 616static Eina_Bool
617_eo_children_iterator_next(Eo_Children_Iterator *it, void **data) 617_efl_children_iterator_next(Eo_Children_Iterator *it, void **data)
618{ 618{
619 if (!it->current) return EINA_FALSE; 619 if (!it->current) return EINA_FALSE;
620 620
@@ -629,18 +629,18 @@ _eo_children_iterator_next(Eo_Children_Iterator *it, void **data)
629} 629}
630 630
631static Eo * 631static Eo *
632_eo_children_iterator_container(Eo_Children_Iterator *it) 632_efl_children_iterator_container(Eo_Children_Iterator *it)
633{ 633{
634 return it->obj_id; 634 return it->obj_id;
635} 635}
636 636
637static void 637static void
638_eo_children_iterator_free(Eo_Children_Iterator *it) 638_efl_children_iterator_free(Eo_Children_Iterator *it)
639{ 639{
640 _Eo_Class *klass; 640 _Efl_Class *klass;
641 _Eo_Object *obj; 641 _Eo_Object *obj;
642 642
643 klass = (_Eo_Class*) it->obj->klass; 643 klass = (_Efl_Class*) it->obj->klass;
644 obj = it->obj; 644 obj = it->obj;
645 645
646 eina_spinlock_take(&klass->iterators.trash_lock); 646 eina_spinlock_take(&klass->iterators.trash_lock);
@@ -659,16 +659,16 @@ _eo_children_iterator_free(Eo_Children_Iterator *it)
659} 659}
660 660
661EOLIAN static Eina_Iterator * 661EOLIAN static Eina_Iterator *
662_eo_base_children_iterator_new(Eo *obj_id, Eo_Base_Data *pd) 662_efl_object_children_iterator_new(Eo *obj_id, Efl_Object_Data *pd)
663{ 663{
664 _Eo_Class *klass; 664 _Efl_Class *klass;
665 Eo_Children_Iterator *it; 665 Eo_Children_Iterator *it;
666 666
667 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL); 667 EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, NULL);
668 668
669 if (!pd->children) return NULL; 669 if (!pd->children) return NULL;
670 670
671 klass = (_Eo_Class *) obj->klass; 671 klass = (_Efl_Class *) obj->klass;
672 672
673 eina_spinlock_take(&klass->iterators.trash_lock); 673 eina_spinlock_take(&klass->iterators.trash_lock);
674 it = eina_trash_pop(&klass->iterators.trash); 674 it = eina_trash_pop(&klass->iterators.trash);
@@ -689,15 +689,15 @@ _eo_base_children_iterator_new(Eo *obj_id, Eo_Base_Data *pd)
689 it->obj = _eo_ref(obj); 689 it->obj = _eo_ref(obj);
690 it->obj_id = obj_id; 690 it->obj_id = obj_id;
691 691
692 it->iterator.next = FUNC_ITERATOR_NEXT(_eo_children_iterator_next); 692 it->iterator.next = FUNC_ITERATOR_NEXT(_efl_children_iterator_next);
693 it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_eo_children_iterator_container); 693 it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_efl_children_iterator_container);
694 it->iterator.free = FUNC_ITERATOR_FREE(_eo_children_iterator_free); 694 it->iterator.free = FUNC_ITERATOR_FREE(_efl_children_iterator_free);
695 695
696 return (Eina_Iterator *)it; 696 return (Eina_Iterator *)it;
697} 697}
698 698
699EOLIAN static void 699EOLIAN static void
700_eo_base_dbg_info_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd EINA_UNUSED, Eo_Dbg_Info *root_node EINA_UNUSED) 700_efl_object_dbg_info_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd EINA_UNUSED, Efl_Dbg_Info *root_node EINA_UNUSED)
701{ /* No info required in the meantime */ 701{ /* No info required in the meantime */
702 return; 702 return;
703} 703}
@@ -705,11 +705,11 @@ _eo_base_dbg_info_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd EINA_UNUSED, Eo_Dbg_
705/* Weak reference. */ 705/* Weak reference. */
706 706
707static inline size_t 707static inline size_t
708_wref_count(Eo_Base_Data *pd) 708_wref_count(Efl_Object_Data *pd)
709{ 709{
710 Eo ***itr; 710 Eo ***itr;
711 size_t count = 0; 711 size_t count = 0;
712 Eo_Base_Extension *ext = pd->ext; 712 Efl_Object_Extension *ext = pd->ext;
713 713
714 if ((!ext) || (!ext->wrefs)) return 0; 714 if ((!ext) || (!ext->wrefs)) return 0;
715 for (itr = ext->wrefs; *itr; itr++) count++; 715 for (itr = ext->wrefs; *itr; itr++) count++;
@@ -718,16 +718,16 @@ _wref_count(Eo_Base_Data *pd)
718} 718}
719 719
720EOLIAN static void 720EOLIAN static void
721_eo_base_wref_add(Eo *obj, Eo_Base_Data *pd, Eo **wref) 721_efl_object_wref_add(Eo *obj, Efl_Object_Data *pd, Eo **wref)
722{ 722{
723 size_t count; 723 size_t count;
724 Eo ***tmp; 724 Eo ***tmp;
725 Eo_Base_Extension *ext; 725 Efl_Object_Extension *ext;
726 726
727 count = _wref_count(pd); 727 count = _wref_count(pd);
728 count += 1; /* New wref. */ 728 count += 1; /* New wref. */
729 729
730 _eo_base_extension_need(pd); 730 _efl_object_extension_need(pd);
731 ext = pd->ext; 731 ext = pd->ext;
732 if (!ext) return; 732 if (!ext) return;
733 733
@@ -741,10 +741,10 @@ _eo_base_wref_add(Eo *obj, Eo_Base_Data *pd, Eo **wref)
741} 741}
742 742
743EOLIAN static void 743EOLIAN static void
744_eo_base_wref_del(Eo *obj, Eo_Base_Data *pd, Eo **wref) 744_efl_object_wref_del(Eo *obj, Efl_Object_Data *pd, Eo **wref)
745{ 745{
746 size_t count; 746 size_t count;
747 Eo_Base_Extension *ext = pd->ext; 747 Efl_Object_Extension *ext = pd->ext;
748 748
749 if (*wref != obj) 749 if (*wref != obj)
750 { 750 {
@@ -795,17 +795,17 @@ _eo_base_wref_del(Eo *obj, Eo_Base_Data *pd, Eo **wref)
795 { 795 {
796 free(ext->wrefs); 796 free(ext->wrefs);
797 ext->wrefs = NULL; 797 ext->wrefs = NULL;
798 _eo_base_extension_noneed(pd); 798 _efl_object_extension_noneed(pd);
799 } 799 }
800 800
801 *wref = NULL; 801 *wref = NULL;
802} 802}
803 803
804static inline void 804static inline void
805_wref_destruct(Eo_Base_Data *pd) 805_wref_destruct(Efl_Object_Data *pd)
806{ 806{
807 Eo ***itr; 807 Eo ***itr;
808 Eo_Base_Extension *ext = pd->ext; 808 Efl_Object_Extension *ext = pd->ext;
809 809
810 if ((!ext) || (!ext->wrefs)) return; 810 if ((!ext) || (!ext->wrefs)) return;
811 for (itr = ext->wrefs; *itr; itr++) **itr = NULL; 811 for (itr = ext->wrefs; *itr; itr++) **itr = NULL;
@@ -822,14 +822,14 @@ _wref_destruct(Eo_Base_Data *pd)
822/* XXX: Legacy support, remove when legacy is dead. */ 822/* XXX: Legacy support, remove when legacy is dead. */
823static Eina_Hash *_legacy_events_hash = NULL; 823static Eina_Hash *_legacy_events_hash = NULL;
824 824
825EAPI const Eo_Event_Description * 825EAPI const Efl_Event_Description *
826eo_base_legacy_only_event_description_get(const char *_event_name) 826efl_object_legacy_only_event_description_get(const char *_event_name)
827{ 827{
828 Eina_Stringshare *event_name = eina_stringshare_add(_event_name); 828 Eina_Stringshare *event_name = eina_stringshare_add(_event_name);
829 Eo_Event_Description *event_desc = eina_hash_find(_legacy_events_hash, event_name); 829 Efl_Event_Description *event_desc = eina_hash_find(_legacy_events_hash, event_name);
830 if (!event_desc) 830 if (!event_desc)
831 { 831 {
832 event_desc = calloc(1, sizeof(Eo_Event_Description)); 832 event_desc = calloc(1, sizeof(Efl_Event_Description));
833 event_desc->name = event_name; 833 event_desc->name = event_name;
834 event_desc->legacy_is = EINA_TRUE; 834 event_desc->legacy_is = EINA_TRUE;
835 eina_hash_add(_legacy_events_hash, event_name, event_desc); 835 eina_hash_add(_legacy_events_hash, event_name, event_desc);
@@ -843,7 +843,7 @@ eo_base_legacy_only_event_description_get(const char *_event_name)
843} 843}
844 844
845static inline Eina_Bool 845static inline Eina_Bool
846_legacy_event_desc_is(const Eo_Event_Description *desc) 846_legacy_event_desc_is(const Efl_Event_Description *desc)
847{ 847{
848 return desc->legacy_is; 848 return desc->legacy_is;
849} 849}
@@ -851,7 +851,7 @@ _legacy_event_desc_is(const Eo_Event_Description *desc)
851static void 851static void
852_legacy_events_hash_free_cb(void *_desc) 852_legacy_events_hash_free_cb(void *_desc)
853{ 853{
854 Eo_Event_Description *desc = _desc; 854 Efl_Event_Description *desc = _desc;
855 eina_stringshare_del(desc->name); 855 eina_stringshare_del(desc->name);
856 free(desc); 856 free(desc);
857} 857}
@@ -864,12 +864,12 @@ struct _Eo_Callback_Description
864 864
865 union 865 union
866 { 866 {
867 Eo_Callback_Array_Item item; 867 Efl_Callback_Array_Item item;
868 const Eo_Callback_Array_Item *item_array; 868 const Efl_Callback_Array_Item *item_array;
869 } items; 869 } items;
870 870
871 void *func_data; 871 void *func_data;
872 Eo_Callback_Priority priority; 872 Efl_Callback_Priority priority;
873 873
874 Eina_Bool delete_me : 1; 874 Eina_Bool delete_me : 1;
875 Eina_Bool func_array : 1; 875 Eina_Bool func_array : 1;
@@ -877,7 +877,7 @@ struct _Eo_Callback_Description
877 877
878/* Actually remove, doesn't care about walking list, or delete_me */ 878/* Actually remove, doesn't care about walking list, or delete_me */
879static void 879static void
880_eo_callback_remove(Eo_Base_Data *pd, Eo_Callback_Description *cb) 880_eo_callback_remove(Efl_Object_Data *pd, Eo_Callback_Description *cb)
881{ 881{
882 Eo_Callback_Description *itr, *pitr = NULL; 882 Eo_Callback_Description *itr, *pitr = NULL;
883 883
@@ -909,7 +909,7 @@ _eo_callback_remove(Eo_Base_Data *pd, Eo_Callback_Description *cb)
909 909
910/* Actually remove, doesn't care about walking list, or delete_me */ 910/* Actually remove, doesn't care about walking list, or delete_me */
911static void 911static void
912_eo_callback_remove_all(Eo_Base_Data *pd) 912_eo_callback_remove_all(Efl_Object_Data *pd)
913{ 913{
914 while (pd->callbacks) 914 while (pd->callbacks)
915 { 915 {
@@ -920,7 +920,7 @@ _eo_callback_remove_all(Eo_Base_Data *pd)
920} 920}
921 921
922static void 922static void
923_eo_callbacks_clear(Eo_Base_Data *pd) 923_eo_callbacks_clear(Efl_Object_Data *pd)
924{ 924{
925 Eo_Callback_Description *cb = NULL; 925 Eo_Callback_Description *cb = NULL;
926 926
@@ -947,7 +947,7 @@ _eo_callbacks_clear(Eo_Base_Data *pd)
947} 947}
948 948
949static void 949static void
950_eo_callbacks_sorted_insert(Eo_Base_Data *pd, Eo_Callback_Description *cb) 950_eo_callbacks_sorted_insert(Efl_Object_Data *pd, Eo_Callback_Description *cb)
951{ 951{
952 Eo_Callback_Description *itr, *itrp = NULL; 952 Eo_Callback_Description *itr, *itrp = NULL;
953 for (itr = pd->callbacks; itr && (itr->priority < cb->priority); 953 for (itr = pd->callbacks; itr && (itr->priority < cb->priority);
@@ -969,13 +969,13 @@ _eo_callbacks_sorted_insert(Eo_Base_Data *pd, Eo_Callback_Description *cb)
969} 969}
970 970
971EOLIAN static Eina_Bool 971EOLIAN static Eina_Bool
972_eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd, 972_efl_object_event_callback_priority_add(Eo *obj, Efl_Object_Data *pd,
973 const Eo_Event_Description *desc, 973 const Efl_Event_Description *desc,
974 Eo_Callback_Priority priority, 974 Efl_Callback_Priority priority,
975 Eo_Event_Cb func, 975 Efl_Event_Cb func,
976 const void *user_data) 976 const void *user_data)
977{ 977{
978 const Eo_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}}; 978 const Efl_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}};
979 Eo_Callback_Description *cb; 979 Eo_Callback_Description *cb;
980 980
981 cb = calloc(1, sizeof(*cb)); 981 cb = calloc(1, sizeof(*cb));
@@ -991,15 +991,15 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd,
991 cb->priority = priority; 991 cb->priority = priority;
992 _eo_callbacks_sorted_insert(pd, cb); 992 _eo_callbacks_sorted_insert(pd, cb);
993 993
994 eo_event_callback_call(obj, EO_EVENT_CALLBACK_ADD, (void *)arr); 994 efl_event_callback_call(obj, EFL_EVENT_CALLBACK_ADD, (void *)arr);
995 995
996 return EINA_TRUE; 996 return EINA_TRUE;
997} 997}
998 998
999EOLIAN static Eina_Bool 999EOLIAN static Eina_Bool
1000_eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd, 1000_efl_object_event_callback_del(Eo *obj, Efl_Object_Data *pd,
1001 const Eo_Event_Description *desc, 1001 const Efl_Event_Description *desc,
1002 Eo_Event_Cb func, 1002 Efl_Event_Cb func,
1003 const void *user_data) 1003 const void *user_data)
1004{ 1004{
1005 Eo_Callback_Description *cb; 1005 Eo_Callback_Description *cb;
@@ -1009,12 +1009,12 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd,
1009 if (!cb->delete_me && (cb->items.item.desc == desc) && 1009 if (!cb->delete_me && (cb->items.item.desc == desc) &&
1010 (cb->items.item.func == func) && (cb->func_data == user_data)) 1010 (cb->items.item.func == func) && (cb->func_data == user_data))
1011 { 1011 {
1012 const Eo_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}}; 1012 const Efl_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}};
1013 1013
1014 cb->delete_me = EINA_TRUE; 1014 cb->delete_me = EINA_TRUE;
1015 pd->deletions_waiting = EINA_TRUE; 1015 pd->deletions_waiting = EINA_TRUE;
1016 _eo_callbacks_clear(pd); 1016 _eo_callbacks_clear(pd);
1017 eo_event_callback_call(obj, EO_EVENT_CALLBACK_DEL, (void *)arr); 1017 efl_event_callback_call(obj, EFL_EVENT_CALLBACK_DEL, (void *)arr);
1018 return EINA_TRUE; 1018 return EINA_TRUE;
1019 } 1019 }
1020 } 1020 }
@@ -1024,9 +1024,9 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd,
1024} 1024}
1025 1025
1026EOLIAN static Eina_Bool 1026EOLIAN static Eina_Bool
1027_eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd, 1027_efl_object_event_callback_array_priority_add(Eo *obj, Efl_Object_Data *pd,
1028 const Eo_Callback_Array_Item *array, 1028 const Efl_Callback_Array_Item *array,
1029 Eo_Callback_Priority priority, 1029 Efl_Callback_Priority priority,
1030 const void *user_data) 1030 const void *user_data)
1031{ 1031{
1032 Eo_Callback_Description *cb; 1032 Eo_Callback_Description *cb;
@@ -1044,14 +1044,14 @@ _eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd,
1044 cb->func_array = EINA_TRUE; 1044 cb->func_array = EINA_TRUE;
1045 _eo_callbacks_sorted_insert(pd, cb); 1045 _eo_callbacks_sorted_insert(pd, cb);
1046 1046
1047 eo_event_callback_call(obj, EO_EVENT_CALLBACK_ADD, (void *)array); 1047 efl_event_callback_call(obj, EFL_EVENT_CALLBACK_ADD, (void *)array);
1048 1048
1049 return EINA_TRUE; 1049 return EINA_TRUE;
1050} 1050}
1051 1051
1052EOLIAN static Eina_Bool 1052EOLIAN static Eina_Bool
1053_eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd, 1053_efl_object_event_callback_array_del(Eo *obj, Efl_Object_Data *pd,
1054 const Eo_Callback_Array_Item *array, 1054 const Efl_Callback_Array_Item *array,
1055 const void *user_data) 1055 const void *user_data)
1056{ 1056{
1057 Eo_Callback_Description *cb; 1057 Eo_Callback_Description *cb;
@@ -1065,7 +1065,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
1065 pd->deletions_waiting = EINA_TRUE; 1065 pd->deletions_waiting = EINA_TRUE;
1066 _eo_callbacks_clear(pd); 1066 _eo_callbacks_clear(pd);
1067 1067
1068 eo_event_callback_call(obj, EO_EVENT_CALLBACK_DEL, (void *)array); 1068 efl_event_callback_call(obj, EFL_EVENT_CALLBACK_DEL, (void *)array);
1069 return EINA_TRUE; 1069 return EINA_TRUE;
1070 } 1070 }
1071 } 1071 }
@@ -1075,7 +1075,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
1075} 1075}
1076 1076
1077static Eina_Bool 1077static Eina_Bool
1078_cb_desc_match(const Eo_Event_Description *a, const Eo_Event_Description *b) 1078_cb_desc_match(const Efl_Event_Description *a, const Efl_Event_Description *b)
1079{ 1079{
1080 /* If one is legacy and the other is not, strcmp. Else, pointer compare. */ 1080 /* If one is legacy and the other is not, strcmp. Else, pointer compare. */
1081 if (EINA_UNLIKELY(_legacy_event_desc_is(a) != _legacy_event_desc_is(b))) 1081 if (EINA_UNLIKELY(_legacy_event_desc_is(a) != _legacy_event_desc_is(b)))
@@ -1087,8 +1087,8 @@ _cb_desc_match(const Eo_Event_Description *a, const Eo_Event_Description *b)
1087} 1087}
1088 1088
1089EOLIAN static Eina_Bool 1089EOLIAN static Eina_Bool
1090_eo_base_event_callback_call(Eo *obj_id, Eo_Base_Data *pd, 1090_efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
1091 const Eo_Event_Description *desc, 1091 const Efl_Event_Description *desc,
1092 void *event_info) 1092 void *event_info)
1093{ 1093{
1094 Eina_Bool callback_already_stopped = pd->callback_stopped; 1094 Eina_Bool callback_already_stopped = pd->callback_stopped;
@@ -1138,7 +1138,7 @@ _eo_base_event_callback_call(Eo *obj_id, Eo_Base_Data *pd,
1138 { 1138 {
1139 if (cb->func_array) 1139 if (cb->func_array)
1140 { 1140 {
1141 const Eo_Callback_Array_Item *it; 1141 const Efl_Callback_Array_Item *it;
1142 1142
1143 for (it = cb->items.item_array; it->func; it++) 1143 for (it = cb->items.item_array; it->func; it++)
1144 { 1144 {
@@ -1205,56 +1205,56 @@ end:
1205} 1205}
1206 1206
1207EOLIAN static void 1207EOLIAN static void
1208_eo_base_event_callback_stop(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 1208_efl_object_event_callback_stop(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
1209{ 1209{
1210 pd->callback_stopped = EINA_TRUE; 1210 pd->callback_stopped = EINA_TRUE;
1211} 1211}
1212 1212
1213static void 1213static void
1214_eo_event_forwarder_callback(void *data, const Eo_Event *event) 1214_efl_event_forwarder_callback(void *data, const Eo_Event *event)
1215{ 1215{
1216 Eo *new_obj = (Eo *) data; 1216 Eo *new_obj = (Eo *) data;
1217 Eina_Bool ret = EINA_FALSE; 1217 Eina_Bool ret = EINA_FALSE;
1218 1218
1219 ret = eo_event_callback_call(new_obj, event->desc, event->info); 1219 ret = efl_event_callback_call(new_obj, event->desc, event->info);
1220 1220
1221 if (!ret) 1221 if (!ret)
1222 { 1222 {
1223 eo_event_callback_stop(event->object); 1223 efl_event_callback_stop(event->object);
1224 } 1224 }
1225} 1225}
1226 1226
1227/* FIXME: Change default priority? Maybe call later? */ 1227/* FIXME: Change default priority? Maybe call later? */
1228EOLIAN static void 1228EOLIAN static void
1229_eo_base_event_callback_forwarder_add(Eo *obj, Eo_Base_Data *pd EINA_UNUSED, 1229_efl_object_event_callback_forwarder_add(Eo *obj, Efl_Object_Data *pd EINA_UNUSED,
1230 const Eo_Event_Description *desc, 1230 const Efl_Event_Description *desc,
1231 Eo *new_obj) 1231 Eo *new_obj)
1232{ 1232{
1233 1233
1234 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */ 1234 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */
1235 1235
1236 eo_event_callback_add(obj, desc, _eo_event_forwarder_callback, new_obj); 1236 efl_event_callback_add(obj, desc, _efl_event_forwarder_callback, new_obj);
1237} 1237}
1238 1238
1239EOLIAN static void 1239EOLIAN static void
1240_eo_base_event_callback_forwarder_del(Eo *obj, Eo_Base_Data *pd EINA_UNUSED, 1240_efl_object_event_callback_forwarder_del(Eo *obj, Efl_Object_Data *pd EINA_UNUSED,
1241 const Eo_Event_Description *desc, 1241 const Efl_Event_Description *desc,
1242 Eo *new_obj) 1242 Eo *new_obj)
1243{ 1243{
1244 1244
1245 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */ 1245 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */
1246 1246
1247 eo_event_callback_del(obj, desc, _eo_event_forwarder_callback, new_obj); 1247 efl_event_callback_del(obj, desc, _efl_event_forwarder_callback, new_obj);
1248} 1248}
1249 1249
1250EOLIAN static void 1250EOLIAN static void
1251_eo_base_event_freeze(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 1251_efl_object_event_freeze(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
1252{ 1252{
1253 pd->event_freeze_count++; 1253 pd->event_freeze_count++;
1254} 1254}
1255 1255
1256EOLIAN static void 1256EOLIAN static void
1257_eo_base_event_thaw(Eo *obj, Eo_Base_Data *pd) 1257_efl_object_event_thaw(Eo *obj, Efl_Object_Data *pd)
1258{ 1258{
1259 if (pd->event_freeze_count > 0) 1259 if (pd->event_freeze_count > 0)
1260 { 1260 {
@@ -1267,19 +1267,19 @@ _eo_base_event_thaw(Eo *obj, Eo_Base_Data *pd)
1267} 1267}
1268 1268
1269EOLIAN static int 1269EOLIAN static int
1270_eo_base_event_freeze_count_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd) 1270_efl_object_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
1271{ 1271{
1272 return pd->event_freeze_count; 1272 return pd->event_freeze_count;
1273} 1273}
1274 1274
1275EOLIAN static void 1275EOLIAN static void
1276_eo_base_event_global_freeze(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1276_efl_object_event_global_freeze(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
1277{ 1277{
1278 event_freeze_count++; 1278 event_freeze_count++;
1279} 1279}
1280 1280
1281EOLIAN static void 1281EOLIAN static void
1282_eo_base_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1282_efl_object_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
1283{ 1283{
1284 if (event_freeze_count > 0) 1284 if (event_freeze_count > 0)
1285 { 1285 {
@@ -1292,18 +1292,18 @@ _eo_base_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
1292} 1292}
1293 1293
1294EOLIAN static int 1294EOLIAN static int
1295_eo_base_event_global_freeze_count_get(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1295_efl_object_event_global_freeze_count_get(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
1296{ 1296{
1297 return event_freeze_count; 1297 return event_freeze_count;
1298} 1298}
1299 1299
1300EOLIAN static Eina_Bool 1300EOLIAN static Eina_Bool
1301_eo_base_composite_attach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_obj_id) 1301_efl_object_composite_attach(Eo *parent_id, Efl_Object_Data *pd EINA_UNUSED, Eo *comp_obj_id)
1302{ 1302{
1303 EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE); 1303 EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE);
1304 EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE); 1304 EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE);
1305 1305
1306 Eo_Base_Data *comp_pd = eo_data_scope_get(comp_obj_id, EO_BASE_CLASS); 1306 Efl_Object_Data *comp_pd = eo_data_scope_get(comp_obj_id, EFL_OBJECT_CLASS);
1307 /* Don't composite if we already have a composite object of this type */ 1307 /* Don't composite if we already have a composite object of this type */
1308 { 1308 {
1309 Eina_List *itr; 1309 Eina_List *itr;
@@ -1316,13 +1316,13 @@ _eo_base_composite_attach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_
1316 } 1316 }
1317 } 1317 }
1318 1318
1319 if (eo_composite_part_is(comp_obj_id)) 1319 if (efl_composite_part_is(comp_obj_id))
1320 { 1320 {
1321 eo_composite_detach(comp_pd->ext->composite_parent, comp_obj_id); 1321 efl_composite_detach(comp_pd->ext->composite_parent, comp_obj_id);
1322 } 1322 }
1323 1323
1324 /* Set the parent comp on the child. */ 1324 /* Set the parent comp on the child. */
1325 _eo_base_extension_need(comp_pd); 1325 _efl_object_extension_need(comp_pd);
1326 comp_pd->ext->composite_parent = parent_id; 1326 comp_pd->ext->composite_parent = parent_id;
1327 1327
1328 parent->composite_objects = eina_list_prepend(parent->composite_objects, comp_obj_id); 1328 parent->composite_objects = eina_list_prepend(parent->composite_objects, comp_obj_id);
@@ -1331,35 +1331,35 @@ _eo_base_composite_attach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_
1331} 1331}
1332 1332
1333EOLIAN static Eina_Bool 1333EOLIAN static Eina_Bool
1334_eo_base_composite_detach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_obj_id) 1334_efl_object_composite_detach(Eo *parent_id, Efl_Object_Data *pd EINA_UNUSED, Eo *comp_obj_id)
1335{ 1335{
1336 EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE); 1336 EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE);
1337 EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE); 1337 EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE);
1338 1338
1339 if (!eo_composite_part_is(comp_obj_id)) 1339 if (!efl_composite_part_is(comp_obj_id))
1340 return EINA_FALSE; 1340 return EINA_FALSE;
1341 1341
1342 parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id); 1342 parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id);
1343 /* Clear the comp parent on the child. */ 1343 /* Clear the comp parent on the child. */
1344 { 1344 {
1345 Eo_Base_Data *comp_pd = eo_data_scope_get(comp_obj_id, EO_BASE_CLASS); 1345 Efl_Object_Data *comp_pd = eo_data_scope_get(comp_obj_id, EFL_OBJECT_CLASS);
1346 comp_pd->ext->composite_parent = NULL; 1346 comp_pd->ext->composite_parent = NULL;
1347 1347
1348 _eo_base_extension_noneed(comp_pd); 1348 _efl_object_extension_noneed(comp_pd);
1349 } 1349 }
1350 1350
1351 return EINA_TRUE; 1351 return EINA_TRUE;
1352} 1352}
1353 1353
1354EOLIAN static Eina_Bool 1354EOLIAN static Eina_Bool
1355_eo_base_composite_part_is(Eo *comp_obj_id EINA_UNUSED, Eo_Base_Data *pd) 1355_efl_object_composite_part_is(Eo *comp_obj_id EINA_UNUSED, Efl_Object_Data *pd)
1356{ 1356{
1357 return pd->ext && pd->ext->composite_parent; 1357 return pd->ext && pd->ext->composite_parent;
1358} 1358}
1359 1359
1360/* Eo_Dbg */ 1360/* Eo_Dbg */
1361EAPI void 1361EAPI void
1362eo_dbg_info_free(Eo_Dbg_Info *info) 1362eo_dbg_info_free(Efl_Dbg_Info *info)
1363{ 1363{
1364 eina_value_flush(&(info->value)); 1364 eina_value_flush(&(info->value));
1365 free(info); 1365 free(info);
@@ -1375,7 +1375,7 @@ _eo_dbg_info_setup(const Eina_Value_Type *type, void *mem)
1375static Eina_Bool 1375static Eina_Bool
1376_eo_dbg_info_flush(const Eina_Value_Type *type EINA_UNUSED, void *_mem) 1376_eo_dbg_info_flush(const Eina_Value_Type *type EINA_UNUSED, void *_mem)
1377{ 1377{
1378 Eo_Dbg_Info *mem = *(Eo_Dbg_Info **) _mem; 1378 Efl_Dbg_Info *mem = *(Efl_Dbg_Info **) _mem;
1379 eina_stringshare_del(mem->name); 1379 eina_stringshare_del(mem->name);
1380 eina_value_flush(&(mem->value)); 1380 eina_value_flush(&(mem->value));
1381 free(mem); 1381 free(mem);
@@ -1385,10 +1385,10 @@ _eo_dbg_info_flush(const Eina_Value_Type *type EINA_UNUSED, void *_mem)
1385static Eina_Bool 1385static Eina_Bool
1386_eo_dbg_info_copy(const Eina_Value_Type *type EINA_UNUSED, const void *_src, void *_dst) 1386_eo_dbg_info_copy(const Eina_Value_Type *type EINA_UNUSED, const void *_src, void *_dst)
1387{ 1387{
1388 const Eo_Dbg_Info **src = (const Eo_Dbg_Info **) _src; 1388 const Efl_Dbg_Info **src = (const Efl_Dbg_Info **) _src;
1389 Eo_Dbg_Info **dst = _dst; 1389 Efl_Dbg_Info **dst = _dst;
1390 1390
1391 *dst = calloc(1, sizeof(Eo_Dbg_Info)); 1391 *dst = calloc(1, sizeof(Efl_Dbg_Info));
1392 if (!*dst) return EINA_FALSE; 1392 if (!*dst) return EINA_FALSE;
1393 (*dst)->name = eina_stringshare_ref((*src)->name); 1393 (*dst)->name = eina_stringshare_ref((*src)->name);
1394 eina_value_copy(&((*src)->value), &((*dst)->value)); 1394 eina_value_copy(&((*src)->value), &((*dst)->value));
@@ -1399,7 +1399,7 @@ static Eina_Bool
1399_eo_dbg_info_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) 1399_eo_dbg_info_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
1400{ 1400{
1401 /* FIXME: For the meanwhile, just use the inner type for the value. */ 1401 /* FIXME: For the meanwhile, just use the inner type for the value. */
1402 const Eo_Dbg_Info **src = (const Eo_Dbg_Info **) type_mem; 1402 const Efl_Dbg_Info **src = (const Efl_Dbg_Info **) type_mem;
1403 if (convert == EINA_VALUE_TYPE_STRINGSHARE || 1403 if (convert == EINA_VALUE_TYPE_STRINGSHARE ||
1404 convert == EINA_VALUE_TYPE_STRING) 1404 convert == EINA_VALUE_TYPE_STRING)
1405 { 1405 {
@@ -1419,7 +1419,7 @@ _eo_dbg_info_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Valu
1419static Eina_Bool 1419static Eina_Bool
1420_eo_dbg_info_pset(const Eina_Value_Type *type EINA_UNUSED, void *_mem, const void *_ptr) 1420_eo_dbg_info_pset(const Eina_Value_Type *type EINA_UNUSED, void *_mem, const void *_ptr)
1421{ 1421{
1422 Eo_Dbg_Info **mem = _mem; 1422 Efl_Dbg_Info **mem = _mem;
1423 if (*mem) 1423 if (*mem)
1424 free(*mem); 1424 free(*mem);
1425 *mem = (void *) _ptr; 1425 *mem = (void *) _ptr;
@@ -1429,15 +1429,15 @@ _eo_dbg_info_pset(const Eina_Value_Type *type EINA_UNUSED, void *_mem, const voi
1429static Eina_Bool 1429static Eina_Bool
1430_eo_dbg_info_pget(const Eina_Value_Type *type EINA_UNUSED, const void *_mem, void *_ptr) 1430_eo_dbg_info_pget(const Eina_Value_Type *type EINA_UNUSED, const void *_mem, void *_ptr)
1431{ 1431{
1432 Eo_Dbg_Info **ptr = _ptr; 1432 Efl_Dbg_Info **ptr = _ptr;
1433 *ptr = (void *) _mem; 1433 *ptr = (void *) _mem;
1434 return EINA_TRUE; 1434 return EINA_TRUE;
1435} 1435}
1436 1436
1437static const Eina_Value_Type _EO_DBG_INFO_TYPE = { 1437static const Eina_Value_Type _EO_DBG_INFO_TYPE = {
1438 EINA_VALUE_TYPE_VERSION, 1438 EINA_VALUE_TYPE_VERSION,
1439 sizeof(Eo_Dbg_Info *), 1439 sizeof(Efl_Dbg_Info *),
1440 "Eo_Dbg_Info_Ptr", 1440 "Efl_Dbg_Info_Ptr",
1441 _eo_dbg_info_setup, 1441 _eo_dbg_info_setup,
1442 _eo_dbg_info_flush, 1442 _eo_dbg_info_flush,
1443 _eo_dbg_info_copy, 1443 _eo_dbg_info_copy,
@@ -1454,11 +1454,11 @@ EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE;
1454 1454
1455/* EOF event callbacks */ 1455/* EOF event callbacks */
1456 1456
1457/* EO_BASE_CLASS stuff */ 1457/* EFL_OBJECT_CLASS stuff */
1458#define MY_CLASS EO_BASE_CLASS 1458#define MY_CLASS EFL_OBJECT_CLASS
1459 1459
1460EOLIAN static Eo * 1460EOLIAN static Eo *
1461_eo_base_constructor(Eo *obj, Eo_Base_Data *pd EINA_UNUSED) 1461_efl_object_constructor(Eo *obj, Efl_Object_Data *pd EINA_UNUSED)
1462{ 1462{
1463 DBG("%p - %s.", obj, eo_class_name_get(obj)); 1463 DBG("%p - %s.", obj, eo_class_name_get(obj));
1464 1464
@@ -1468,10 +1468,10 @@ _eo_base_constructor(Eo *obj, Eo_Base_Data *pd EINA_UNUSED)
1468} 1468}
1469 1469
1470EOLIAN static void 1470EOLIAN static void
1471_eo_base_destructor(Eo *obj, Eo_Base_Data *pd) 1471_efl_object_destructor(Eo *obj, Efl_Object_Data *pd)
1472{ 1472{
1473 Eo *child; 1473 Eo *child;
1474 Eo_Base_Extension *ext; 1474 Efl_Object_Extension *ext;
1475 1475
1476 DBG("%p - %s.", obj, eo_class_name_get(obj)); 1476 DBG("%p - %s.", obj, eo_class_name_get(obj));
1477 1477
@@ -1481,7 +1481,7 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
1481 while (pd->children) 1481 while (pd->children)
1482 { 1482 {
1483 child = _eo_obj_id_get(EINA_INLIST_CONTAINER_GET(pd->children, _Eo_Object)); 1483 child = _eo_obj_id_get(EINA_INLIST_CONTAINER_GET(pd->children, _Eo_Object));
1484 eo_parent_set(child, NULL); 1484 efl_parent_set(child, NULL);
1485 } 1485 }
1486 1486
1487 /* If we are a composite object, detach children */ 1487 /* If we are a composite object, detach children */
@@ -1491,19 +1491,19 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
1491 Eo *emb_obj_id; 1491 Eo *emb_obj_id;
1492 EINA_LIST_FOREACH_SAFE(obj_data->composite_objects, itr, next, emb_obj_id) 1492 EINA_LIST_FOREACH_SAFE(obj_data->composite_objects, itr, next, emb_obj_id)
1493 { 1493 {
1494 eo_composite_detach(obj, emb_obj_id); 1494 efl_composite_detach(obj, emb_obj_id);
1495 } 1495 }
1496 } 1496 }
1497 1497
1498 if (pd->ext && pd->ext->composite_parent) 1498 if (pd->ext && pd->ext->composite_parent)
1499 { 1499 {
1500 eo_composite_detach(pd->ext->composite_parent, obj); 1500 efl_composite_detach(pd->ext->composite_parent, obj);
1501 } 1501 }
1502 1502
1503 if (pd->parent) 1503 if (pd->parent)
1504 { 1504 {
1505 ERR("Object '%p' still has a parent at the time of destruction.", obj); 1505 ERR("Object '%p' still has a parent at the time of destruction.", obj);
1506 eo_parent_set(obj, NULL); 1506 efl_parent_set(obj, NULL);
1507 } 1507 }
1508 1508
1509 _eo_generic_data_del_all(obj, pd); 1509 _eo_generic_data_del_all(obj, pd);
@@ -1517,7 +1517,7 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
1517 ext->name = NULL; 1517 ext->name = NULL;
1518 eina_stringshare_del(ext->comment); 1518 eina_stringshare_del(ext->comment);
1519 ext->comment = NULL; 1519 ext->comment = NULL;
1520 _eo_base_extension_free(ext); 1520 _efl_object_extension_free(ext);
1521 pd->ext = NULL; 1521 pd->ext = NULL;
1522 } 1522 }
1523 1523
@@ -1525,22 +1525,22 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
1525} 1525}
1526 1526
1527EOLIAN static Eo * 1527EOLIAN static Eo *
1528_eo_base_finalize(Eo *obj, Eo_Base_Data *pd EINA_UNUSED) 1528_efl_object_finalize(Eo *obj, Efl_Object_Data *pd EINA_UNUSED)
1529{ 1529{
1530 return obj; 1530 return obj;
1531} 1531}
1532 1532
1533EOLIAN static void 1533EOLIAN static void
1534_eo_base_class_constructor(Eo_Class *klass EINA_UNUSED) 1534_efl_object_class_constructor(Efl_Class *klass EINA_UNUSED)
1535{ 1535{
1536 event_freeze_count = 0; 1536 event_freeze_count = 0;
1537 _legacy_events_hash = eina_hash_stringshared_new(_legacy_events_hash_free_cb); 1537 _legacy_events_hash = eina_hash_stringshared_new(_legacy_events_hash_free_cb);
1538} 1538}
1539 1539
1540EOLIAN static void 1540EOLIAN static void
1541_eo_base_class_destructor(Eo_Class *klass EINA_UNUSED) 1541_efl_object_class_destructor(Efl_Class *klass EINA_UNUSED)
1542{ 1542{
1543 eina_hash_free(_legacy_events_hash); 1543 eina_hash_free(_legacy_events_hash);
1544} 1544}
1545 1545
1546#include "eo_base.eo.c" 1546#include "efl_object.eo.c"
diff --git a/src/lib/eo/eo_class.eo b/src/lib/eo/eo_class.eo
deleted file mode 100644
index 4e37f3413e..0000000000
--- a/src/lib/eo/eo_class.eo
+++ /dev/null
@@ -1,4 +0,0 @@
1abstract Eo.Class ()
2{
3 data: null;
4}
diff --git a/src/lib/eo/eo_class_class.c b/src/lib/eo/eo_class_class.c
index 9d563f7264..e89b177543 100644
--- a/src/lib/eo/eo_class_class.c
+++ b/src/lib/eo/eo_class_class.c
@@ -4,5 +4,5 @@
4 4
5#include "Eo.h" 5#include "Eo.h"
6 6
7#include "eo_class.eo.c" 7#include "efl_class.eo.c"
8#include "eo_interface.eo.c" 8#include "efl_interface.eo.c"
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index d47fcca93a..4b2d4d1163 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -9,7 +9,7 @@
9#define EO_FREED_EINA_MAGIC 0xa186bb32 9#define EO_FREED_EINA_MAGIC 0xa186bb32
10#define EO_FREED_EINA_MAGIC_STR "Eo - Freed object" 10#define EO_FREED_EINA_MAGIC_STR "Eo - Freed object"
11#define EO_CLASS_EINA_MAGIC 0xa186ba32 11#define EO_CLASS_EINA_MAGIC 0xa186ba32
12#define EO_CLASS_EINA_MAGIC_STR "Eo Class" 12#define EO_CLASS_EINA_MAGIC_STR "Efl Class"
13 13
14#define EO_MAGIC_RETURN_VAL(d, magic, ret) \ 14#define EO_MAGIC_RETURN_VAL(d, magic, ret) \
15 do { \ 15 do { \
@@ -58,7 +58,7 @@ extern int _eo_log_dom;
58#define DBG(...) EINA_LOG_DOM_DBG(_eo_log_dom, __VA_ARGS__) 58#define DBG(...) EINA_LOG_DOM_DBG(_eo_log_dom, __VA_ARGS__)
59 59
60typedef uintptr_t Eo_Id; 60typedef uintptr_t Eo_Id;
61typedef struct _Eo_Class _Eo_Class; 61typedef struct _Efl_Class _Eo_Class;
62typedef struct _Eo_Header Eo_Header; 62typedef struct _Eo_Header Eo_Header;
63 63
64/* Retrieves the pointer to the object from the id */ 64/* Retrieves the pointer to the object from the id */
@@ -98,7 +98,7 @@ struct _Eo_Object
98{ 98{
99 Eo_Header header; 99 Eo_Header header;
100 EINA_INLIST; 100 EINA_INLIST;
101 const _Eo_Class *klass; 101 const _Efl_Class *klass;
102#ifdef EO_DEBUG 102#ifdef EO_DEBUG
103 Eina_Inlist *xrefs; 103 Eina_Inlist *xrefs;
104 Eina_Inlist *data_xrefs; 104 Eina_Inlist *data_xrefs;
@@ -129,7 +129,7 @@ typedef void (*eo_op_func_type)(Eo *, void *class_data, va_list *list);
129typedef struct 129typedef struct
130{ 130{
131 eo_op_func_type func; 131 eo_op_func_type func;
132 const _Eo_Class *src; 132 const _Efl_Class *src;
133} op_type_funcs; 133} op_type_funcs;
134 134
135struct _Dich_Chain1 135struct _Dich_Chain1
@@ -139,23 +139,23 @@ struct _Dich_Chain1
139 139
140typedef struct 140typedef struct
141{ 141{
142 const _Eo_Class *klass; 142 const _Efl_Class *klass;
143 size_t offset; 143 size_t offset;
144} Eo_Extension_Data_Offset; 144} Eo_Extension_Data_Offset;
145 145
146struct _Eo_Class 146struct _Efl_Class
147{ 147{
148 Eo_Header header; 148 Eo_Header header;
149 149
150 const _Eo_Class *parent; 150 const _Efl_Class *parent;
151 const Eo_Class_Description *desc; 151 const Efl_Class_Description *desc;
152 Eo_Vtable vtable; 152 Eo_Vtable vtable;
153 153
154 const _Eo_Class **extensions; 154 const _Efl_Class **extensions;
155 155
156 Eo_Extension_Data_Offset *extn_data_off; 156 Eo_Extension_Data_Offset *extn_data_off;
157 157
158 const _Eo_Class **mro; 158 const _Efl_Class **mro;
159 159
160 /* cached object for faster allocation */ 160 /* cached object for faster allocation */
161 struct { 161 struct {
@@ -200,7 +200,7 @@ Eo *_eo_header_id_get(const Eo_Header *header)
200} 200}
201 201
202static inline 202static inline
203Eo_Class *_eo_class_id_get(const _Eo_Class *klass) 203Efl_Class *_eo_class_id_get(const _Eo_Class *klass)
204{ 204{
205 return _eo_header_id_get((Eo_Header *) klass); 205 return _eo_header_id_get((Eo_Header *) klass);
206} 206}
@@ -218,18 +218,18 @@ _eo_condtor_reset(_Eo_Object *obj)
218} 218}
219 219
220static inline void 220static inline void
221_eo_del_internal(const char *file, int line, _Eo_Object *obj) 221_efl_del_internal(const char *file, int line, _Eo_Object *obj)
222{ 222{
223 /* We need that for the event callbacks that may ref/unref. */ 223 /* We need that for the event callbacks that may ref/unref. */
224 obj->refcount++; 224 obj->refcount++;
225 225
226 const _Eo_Class *klass = obj->klass; 226 const _Efl_Class *klass = obj->klass;
227 227
228 eo_event_callback_call(_eo_obj_id_get(obj), EO_EVENT_DEL, NULL); 228 efl_event_callback_call(_eo_obj_id_get(obj), EFL_EVENT_DEL, NULL);
229 229
230 _eo_condtor_reset(obj); 230 _eo_condtor_reset(obj);
231 231
232 eo_destructor(_eo_obj_id_get(obj)); 232 efl_destructor(_eo_obj_id_get(obj));
233 233
234 if (!obj->condtor_done) 234 if (!obj->condtor_done)
235 { 235 {
@@ -243,7 +243,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
243 Eo *emb_obj; 243 Eo *emb_obj;
244 EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj) 244 EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
245 { 245 {
246 eo_composite_detach(_eo_obj_id_get(obj), emb_obj); 246 efl_composite_detach(_eo_obj_id_get(obj), emb_obj);
247 } 247 }
248 } 248 }
249 249
@@ -260,7 +260,7 @@ _obj_is_override(_Eo_Object *obj)
260static inline void 260static inline void
261_eo_free(_Eo_Object *obj) 261_eo_free(_Eo_Object *obj)
262{ 262{
263 _Eo_Class *klass = (_Eo_Class*) obj->klass; 263 _Efl_Class *klass = (_Eo_Class*) obj->klass;
264 264
265#ifdef EO_DEBUG 265#ifdef EO_DEBUG
266 if (obj->datarefcount) 266 if (obj->datarefcount)
@@ -331,7 +331,7 @@ _eo_unref(_Eo_Object *obj)
331 331
332 obj->del_triggered = EINA_TRUE; 332 obj->del_triggered = EINA_TRUE;
333 333
334 _eo_del_internal(__FILE__, __LINE__, obj); 334 _efl_del_internal(__FILE__, __LINE__, obj);
335#ifdef EO_DEBUG 335#ifdef EO_DEBUG
336 /* If for some reason it's not empty, clear it. */ 336 /* If for some reason it's not empty, clear it. */
337 while (obj->xrefs) 337 while (obj->xrefs)
diff --git a/src/lib/eo/eo_ptr_indirection.h b/src/lib/eo/eo_ptr_indirection.h
index 7d7fc84bc2..d7f6dd3b15 100644
--- a/src/lib/eo/eo_ptr_indirection.h
+++ b/src/lib/eo/eo_ptr_indirection.h
@@ -46,7 +46,7 @@ void _eo_pointer_error(const char *msg);
46 } while (0) 46 } while (0)
47 47
48#define EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, ret) \ 48#define EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, ret) \
49 _Eo_Class *klass; \ 49 _Efl_Class *klass; \
50 do { \ 50 do { \
51 if (!klass_id) return ret; \ 51 if (!klass_id) return ret; \
52 klass = _eo_class_pointer_get(klass_id); \ 52 klass = _eo_class_pointer_get(klass_id); \
@@ -57,7 +57,7 @@ void _eo_pointer_error(const char *msg);
57 } while (0) 57 } while (0)
58 58
59#define EO_CLASS_POINTER_RETURN(klass_id, klass) \ 59#define EO_CLASS_POINTER_RETURN(klass_id, klass) \
60 _Eo_Class *klass; \ 60 _Efl_Class *klass; \
61 do { \ 61 do { \
62 if (!klass_id) return; \ 62 if (!klass_id) return; \
63 klass = _eo_class_pointer_get(klass_id); \ 63 klass = _eo_class_pointer_get(klass_id); \
@@ -96,7 +96,7 @@ void _eo_pointer_error(const char *msg);
96 } while (0) 96 } while (0)
97 97
98#define EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, ret) \ 98#define EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, ret) \
99 _Eo_Class *klass; \ 99 _Efl_Class *klass; \
100 do { \ 100 do { \
101 klass = _eo_class_pointer_get(klass_id); \ 101 klass = _eo_class_pointer_get(klass_id); \
102 if (!klass) return (ret); \ 102 if (!klass) return (ret); \
@@ -104,7 +104,7 @@ void _eo_pointer_error(const char *msg);
104 } while (0) 104 } while (0)
105 105
106#define EO_CLASS_POINTER_RETURN(klass_id, klass) \ 106#define EO_CLASS_POINTER_RETURN(klass_id, klass) \
107 _Eo_Class *klass; \ 107 _Efl_Class *klass; \
108 do { \ 108 do { \
109 klass = _eo_class_pointer_get(klass_id); \ 109 klass = _eo_class_pointer_get(klass_id); \
110 if (!klass) return; \ 110 if (!klass) return; \