From: Cedric Bail <cedric.bail@samsung.com>
Date: Mon, 4 Nov 2013 02:27:59 +0000 (+0900)
Subject: evas: make mmap_set use const Eina_File.
X-Git-Tag: v1.8.0-alpha1~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4ae52ea67b9c7885bc2911ae97d4d81e00dd70d;p=platform%2Fupstream%2Fefl.git

evas: make mmap_set use const Eina_File.
---

diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 256cfc9..717d434 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -5668,7 +5668,7 @@ enum
  *
  * @see evas_obj_image_file_set
  */
-#define evas_obj_image_mmap_set(f, key) EVAS_OBJ_IMAGE_ID(EVAS_OBJ_IMAGE_SUB_ID_MMAP_SET), EO_TYPECHECK(Eina_File *, f), EO_TYPECHECK(const char*, key)
+#define evas_obj_image_mmap_set(f, key) EVAS_OBJ_IMAGE_ID(EVAS_OBJ_IMAGE_SUB_ID_MMAP_SET), EO_TYPECHECK(const Eina_File *, f), EO_TYPECHECK(const char*, key)
 
 /**
  * @def evas_obj_image_file_get
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 8b362be..e2dbf0e 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3982,7 +3982,7 @@ EAPI void                          evas_object_image_file_set(Evas_Object *obj,
  *
  * @since 1.8
  */
-EAPI void                          evas_object_image_mmap_set(Evas_Object *eo_obj, Eina_File *f, const char *key);
+EAPI void                          evas_object_image_mmap_set(Evas_Object *eo_obj, const Eina_File *f, const char *key);
 
 /**
  * Retrieve the source file from where an image object is to fetch the
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index af42860..312b5c6 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -397,7 +397,7 @@ evas_object_image_memfile_set(Evas_Object *eo_obj, void *data, int size, char *f
 }
 
 static void
-_image_init_set(Eina_File *f, const char *file, const char *key,
+_image_init_set(const Eina_File *f, const char *file, const char *key,
                 Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Image *o,
                 Evas_Image_Load_Opts *lo)
 {
@@ -523,7 +523,7 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Image *
 }
 
 EAPI void
-evas_object_image_mmap_set(Evas_Object *eo_obj, Eina_File *f, const char *key)
+evas_object_image_mmap_set(Evas_Object *eo_obj, const Eina_File *f, const char *key)
 {
    eo_do(eo_obj, evas_obj_image_mmap_set(f, key));
 }
@@ -535,7 +535,7 @@ _image_mmap_set(Eo *eo_obj, void *_pd, va_list *list)
    Evas_Object_Image *o = _pd;
    Evas_Image_Load_Opts lo;
 
-   Eina_File *f = va_arg(*list, Eina_File *);
+   const Eina_File *f = va_arg(*list, const Eina_File *);
    const char *key = va_arg(*list, const char*);
 
    if (o->cur->u.f == f)
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index b61e7d0..dd16e21 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -171,7 +171,7 @@ _evas_object_text_item_del(Evas_Object_Text *o, Evas_Object_Text_Item *it)
 
    if ((EINA_INLIST_GET(it)->next) ||
        (EINA_INLIST_GET(it)->prev) ||
-       (o->items == (EINA_INLIST_GET(it))))
+       (EINA_INLIST_GET(o->items) == (EINA_INLIST_GET(it))))
      o->items = (Evas_Object_Text_Item *)eina_inlist_remove
      (EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
    _evas_object_text_item_clean(it);