summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-11-04 11:27:59 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-11-04 11:27:59 +0900
commitf4ae52ea67b9c7885bc2911ae97d4d81e00dd70d (patch)
treeb897dbfb4ccdc80b0aef11e7b94325329d6fd00d /src/lib
parent687e4ae7442e9763e0587553d50a4177d2f9b6ca (diff)
evas: make mmap_set use const Eina_File.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Legacy.h2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c6
-rw-r--r--src/lib/evas/canvas/evas_object_text.c2
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
5668 * 5668 *
5669 * @see evas_obj_image_file_set 5669 * @see evas_obj_image_file_set
5670 */ 5670 */
5671#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) 5671#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)
5672 5672
5673/** 5673/**
5674 * @def evas_obj_image_file_get 5674 * @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,
3982 * 3982 *
3983 * @since 1.8 3983 * @since 1.8
3984 */ 3984 */
3985EAPI void evas_object_image_mmap_set(Evas_Object *eo_obj, Eina_File *f, const char *key); 3985EAPI void evas_object_image_mmap_set(Evas_Object *eo_obj, const Eina_File *f, const char *key);
3986 3986
3987/** 3987/**
3988 * Retrieve the source file from where an image object is to fetch the 3988 * 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
397} 397}
398 398
399static void 399static void
400_image_init_set(Eina_File *f, const char *file, const char *key, 400_image_init_set(const Eina_File *f, const char *file, const char *key,
401 Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Image *o, 401 Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Image *o,
402 Evas_Image_Load_Opts *lo) 402 Evas_Image_Load_Opts *lo)
403{ 403{
@@ -523,7 +523,7 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Image *
523} 523}
524 524
525EAPI void 525EAPI void
526evas_object_image_mmap_set(Evas_Object *eo_obj, Eina_File *f, const char *key) 526evas_object_image_mmap_set(Evas_Object *eo_obj, const Eina_File *f, const char *key)
527{ 527{
528 eo_do(eo_obj, evas_obj_image_mmap_set(f, key)); 528 eo_do(eo_obj, evas_obj_image_mmap_set(f, key));
529} 529}
@@ -535,7 +535,7 @@ _image_mmap_set(Eo *eo_obj, void *_pd, va_list *list)
535 Evas_Object_Image *o = _pd; 535 Evas_Object_Image *o = _pd;
536 Evas_Image_Load_Opts lo; 536 Evas_Image_Load_Opts lo;
537 537
538 Eina_File *f = va_arg(*list, Eina_File *); 538 const Eina_File *f = va_arg(*list, const Eina_File *);
539 const char *key = va_arg(*list, const char*); 539 const char *key = va_arg(*list, const char*);
540 540
541 if (o->cur->u.f == f) 541 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)
171 171
172 if ((EINA_INLIST_GET(it)->next) || 172 if ((EINA_INLIST_GET(it)->next) ||
173 (EINA_INLIST_GET(it)->prev) || 173 (EINA_INLIST_GET(it)->prev) ||
174 (o->items == (EINA_INLIST_GET(it)))) 174 (EINA_INLIST_GET(o->items) == (EINA_INLIST_GET(it))))
175 o->items = (Evas_Object_Text_Item *)eina_inlist_remove 175 o->items = (Evas_Object_Text_Item *)eina_inlist_remove
176 (EINA_INLIST_GET(o->items), EINA_INLIST_GET(it)); 176 (EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
177 _evas_object_text_item_clean(it); 177 _evas_object_text_item_clean(it);