bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eo2: prefix all the eo2_*internal* functions with an underscore. 

This prevents them from being auto-completed by IDEs which makes
development nicer.
This commit is contained in:
Tom Hacohen 2013-11-08 15:20:38 +00:00
parent 123ebca6d0
commit b8ae43b464
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/eo/Eo.h
View File

@ -856,11 +856,11 @@ EAPI void eo_error_set_internal(const Eo *obj, const char *file, int line);
#define eo2_add(klass, parent, ...) \
({ \
const Eo_Class *_tmp_klass = klass; \
Eo *_tmp_obj = eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
Eo *_tmp_obj = _eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
eo2_do(_tmp_obj, \
eo2_constructor(); \
__VA_ARGS__; \
_tmp_obj = eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
_tmp_obj = _eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
); \
_tmp_obj; \
})
@ -883,10 +883,10 @@ EAPI void eo_error_set_internal(const Eo *obj, const char *file, int line);
#define eo2_add_custom(klass, parent, ...) \
({ \
const Eo_Class *_tmp_klass = klass; \
Eo *_tmp_obj = eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
Eo *_tmp_obj = _eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
eo2_do(_tmp_obj, \
__VA_ARGS__; \
_tmp_obj = eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
_tmp_obj = _eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
); \
_tmp_obj; \
})
@ -904,8 +904,8 @@ EAPI void eo_error_set_internal(const Eo *obj, const char *file, int line);
* @see #eo_add
*/
EAPI Eo *eo_add_internal(const char *file, int line, const Eo_Class *klass, Eo *parent, ...);
EAPI Eo * eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent);
EAPI Eo * eo2_add_internal_end(const char *file, int line, const Eo *obj);
EAPI Eo * _eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent);
EAPI Eo * _eo2_add_internal_end(const char *file, int line, const Eo *obj);
/**
* @brief Get a pointer to the data of an object for a specific class.

6
src/lib/eo/eo.c
View File

@ -655,7 +655,7 @@ _eo2_class_funcs_set(_Eo_Class *klass)
}
EAPI Eo *
eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent_id)
_eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent_id)
{
_Eo_Object *obj;
@ -704,7 +704,7 @@ eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
}
EAPI Eo *
eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
_eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
{
Eo2_Stack_Frame *fptr;
@ -720,7 +720,7 @@ eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
{
ERR("in %s:%d: Object of class '%s' - Not all of the object constructors have been executed.",
file, line, fptr->cur_klass->desc->name);
/* Unref twice, once for the ref in eo2_add_internal_start, and once for the basic object ref. */
/* Unref twice, once for the ref in _eo2_add_internal_start, and once for the basic object ref. */
_eo_unref(fptr->obj);
_eo_unref(fptr->obj);
return NULL;