edje: remove duplicated code and rely on Efl.File { set; get; } mixin.

diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 00f7b7a..e6d7677 100644 (file)
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -168,8 +168,11 @@ _edje_object_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file,
 }
 
 EOLIAN Efl_Image_Load_Error
-_edje_object_load_error_get(Eo *obj EINA_UNUSED, Edje *ed)
+_edje_object_load_error_get(Eo *obj, Edje *ed)
 {
+   Efl_Image_Load_Error p = efl_file_load_error_get(obj);
+
+   if (p != EFL_IMAGE_LOAD_ERROR_NONE) return p;
    switch (ed->load_error)
      {
       case EDJE_LOAD_ERROR_NONE: return EFL_IMAGE_LOAD_ERROR_NONE;
@@ -189,8 +192,11 @@ _edje_object_load_error_get(Eo *obj EINA_UNUSED, Edje *ed)
 EAPI Edje_Load_Error
 edje_object_load_error_get(const Eo *obj)
 {
+   Efl_Image_Load_Error p = efl_file_load_error_get(obj);
    Edje *ed;
 
+   if (p != EFL_IMAGE_LOAD_ERROR_NONE) return EDJE_LOAD_ERROR_DOES_NOT_EXIST;
+
    ed = _edje_fetch(obj);
    if (!ed) return EDJE_LOAD_ERROR_GENERIC;
    return ed->load_error;

diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index c898878..104928c 100644 (file)
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -388,7 +388,6 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.Gfx.position { set; }
       Efl.Gfx.size { set; }
       Efl.Object.constructor;
-      Efl.Object.destructor;
       Efl.Object.debug_name_override;
       Efl.Canvas.Object.no_render { set; }
       Efl.Canvas.Object.paragraph_direction { set; }
@@ -411,7 +410,6 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.Ui.Base.language { set; get; }
       Efl.Ui.Base.scale { set; get; }
       Efl.Ui.Base.base_scale { get; }
-      Efl.File.file { get; set; }
       Efl.File.mmap { get; set; }
       Efl.Container.content_remove;
       Efl.Part.part; [[Returns @Efl.Canvas.Layout.Part.]]

diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index d84d004..b2610ee 100644 (file)
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1721,7 +1721,6 @@ struct _Edje
 #endif
    double                duration_scale;
    double                paused_at;
-   Efl_Vpath_File       *file_obj;
    Eina_List            *user_defined;
    lua_State            *L;
    Eina_Inlist          *lua_objs;

diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 8f1c219..b660d35 100644 (file)
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -47,17 +47,6 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
    return obj;
 }
 
-EOLIAN static void
-_edje_object_efl_object_destructor(Eo *obj, Edje *class_data)
-{
-   if (class_data->file_obj)
-     {
-        efl_del(class_data->file_obj);
-        class_data->file_obj = NULL;
-     }
-   efl_destructor(efl_super(obj, MY_CLASS));
-}
-
 EOLIAN static Eina_Strbuf *
 _edje_object_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb)
 {
@@ -376,74 +365,6 @@ _edje_object_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed)
 }
 
 EOLIAN static Eina_Bool
-_edje_object_efl_file_file_set(Eo *obj, Edje *ed, const char *file, const char *group)
-{
-   Eina_Bool ret;
-   Eina_File *f = NULL;
-   Eina_Array *nested;
-
-   ret = EINA_FALSE;
-
-   if (ed->file_obj)
-     {
-        efl_del(ed->file_obj);
-        ed->file_obj = NULL;
-     }
-   if (file)
-     {
-        const char *file2;
-
-        ed->file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, file);
-        efl_vpath_file_do(ed->file_obj);
-        // XXX:FIXME: allow this to be async
-        efl_vpath_file_wait(ed->file_obj);
-        file2 = efl_vpath_file_result_get(ed->file_obj);
-
-        f = eina_file_open(file2, EINA_FALSE);
-        if ((ed->file_obj) && (!efl_vpath_file_keep_get(ed->file_obj)))
-          {
-             efl_del(ed->file_obj);
-             ed->file_obj = NULL;
-          }
-        if (!f)
-          {
-             efl_del(ed->file_obj);
-             ed->file_obj = NULL;
-             if (ed->path) eina_stringshare_del(ed->path);
-             ed->path = NULL;
-             ed->load_error = EDJE_LOAD_ERROR_DOES_NOT_EXIST;
-             return ret;
-          }
-     }
-   nested = eina_array_new(8);
-
-   if (_edje_object_file_set_internal(obj, f, group, NULL, NULL, nested))
-     {
-        if (file)
-          {
-             ed->path = eina_stringshare_add(file);
-          }
-        else
-          {
-             if (ed->path) eina_stringshare_del(ed->path);
-             ed->path = NULL;
-          }
-        ret = EINA_TRUE;
-     }
-   else
-     {
-        if (ed->path) eina_stringshare_del(ed->path);
-        ed->path = NULL;
-     }
-
-   eina_array_free(nested);
-   eina_file_close(f);
-   _edje_object_orientation_inform(obj);
-
-   return ret;
-}
-
-EOLIAN static Eina_Bool
 _edje_object_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED,
                                const Eina_File *f, const char *key)
 {
@@ -467,7 +388,7 @@ EOLIAN static void
 _edje_object_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd,
                                const Eina_File **f, const char **key)
 {
-   if (f) *f = pd->file->f;
+   if (f) *f = pd->file ? pd->file->f : NULL;
    if (key) *key = pd->group;
 }