diff options
| author | Cedric Bail <cedric.bail@samsung.com> | 2013-11-04 11:27:59 +0900 |
|---|---|---|
| committer | Cedric Bail <cedric.bail@samsung.com> | 2013-11-04 11:27:59 +0900 |
| commit | f4ae52ea67b9c7885bc2911ae97d4d81e00dd70d (patch) | |
| tree | b897dbfb4ccdc80b0aef11e7b94325329d6fd00d | |
| parent | 687e4ae7442e9763e0587553d50a4177d2f9b6ca (diff) | |
| download | efl-f4ae52ea67b9c7885bc2911ae97d4d81e00dd70d.tar.gz | |
evas: make mmap_set use const Eina_File.
| -rw-r--r-- | src/lib/evas/Evas_Eo.h | 2 | ||||
| -rw-r--r-- | src/lib/evas/Evas_Legacy.h | 2 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_image.c | 6 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_text.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 256cfc980c..717d434c5d 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 8b362bec44..e2dbf0ea41 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 af42860ba2..312b5c6dc7 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 b61e7d0c68..dd16e21fd8 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); |