enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Edje: Remove excessive casts and use type Edje_Object 

Use type Edje_Object instead of Eo in legacy EAPI's.

Spotted in TAsn's ABI report, under "Problems with Symbols".
I believe this will actually add two changes (Eo -> Edje_Object),
but I like the typing better ;)
This commit is contained in:
Conrad Meyer 2015-04-08 14:34:46 +09:00
parent 6dd135d4c6
commit 0c21b91f0f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/Edje_Common.h
View File

@ -16,6 +16,8 @@ typedef struct _Edje_Version
EAPI extern Edje_Version *edje_version;
typedef Eo Edje_Object;
/**
* @typedef Edje_Color_Class
* Type for edje color class

6
src/lib/edje/Edje_Legacy.h
View File

@ -189,7 +189,7 @@ EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect
* @param[in] group The name of the group, in @p file, which implements an
Edje object
*/
EAPI Eina_Bool edje_object_file_set(Eo *obj, const char *file, const char *group);
EAPI Eina_Bool edje_object_file_set(Edje_Object *obj, const char *file, const char *group);
/**
*
@ -210,7 +210,7 @@ EAPI Eina_Bool edje_object_file_set(Eo *obj, const char *file, const char *group
* @param[out] group The name of the group, in @p file, which implements an
Edje object
*/
EAPI void edje_object_file_get(const Eo *obj, const char **file, const char **group);
EAPI void edje_object_file_get(const Edje_Object *obj, const char **file, const char **group);
/**
@ -246,7 +246,7 @@ EAPI void edje_object_file_get(const Eo *obj, const char **file, const char **gr
* @param[in] group The name of the group, in @p file, which implements an
Edje object
*/
EAPI Eina_Bool edje_object_mmap_set(Eo *obj, const Eina_File *file, const char *group);
EAPI Eina_Bool edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group);
#include "edje_object.eo.legacy.h"

10
src/lib/edje/edje_smart.c
View File

@ -369,21 +369,21 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
{
Eina_Bool ret;
return eo_do_ret((Edje_Object *)obj, ret, efl_file_mmap_set(file, group));
return eo_do_ret(obj, ret, efl_file_mmap_set(file, group));
}
EAPI Eina_Bool
edje_object_file_set(Eo *obj, const char *file, const char *group)
edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
{
Eina_Bool ret = 0;
eo_do((Eo *) obj, ret = efl_file_set(file, group));
eo_do(obj, ret = efl_file_set(file, group));
return ret;
}
EAPI void
edje_object_file_get(const Eo *obj, const char **file, const char **group)
edje_object_file_get(const Edje_Object *obj, const char **file, const char **group)
{
eo_do((Eo *) obj, efl_file_get(file, group));
eo_do((Edje_Object *) obj, efl_file_get(file, group));
}
#include "edje_object.eo.c"