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 ;)

diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index de4861d..ecacc73 100644 (file)
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -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

diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index e5e9800..be1f06d 100644 (file)
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -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"

diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 0bf8399..97d31b2 100644 (file)
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -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"