diff options
author | Cedric Bail <cedric.bail@samsung.com> | 2013-11-04 11:28:29 +0900 |
---|---|---|
committer | Cedric Bail <cedric.bail@samsung.com> | 2013-11-04 11:28:29 +0900 |
commit | 1c7f60208725a1a04d9970156c2e18dd3072264c (patch) | |
tree | 037dac999cd18e7f6209098d5050d6bdc57123c2 /src/lib | |
parent | f4ae52ea67b9c7885bc2911ae97d4d81e00dd70d (diff) |
edje: use const Eina_File for mmap_set function.
Diffstat (limited to '')
-rw-r--r-- | src/lib/edje/Edje_Common.h | 2 | ||||
-rw-r--r-- | src/lib/edje/Edje_Eo.h | 2 | ||||
-rw-r--r-- | src/lib/edje/Edje_Legacy.h | 2 | ||||
-rw-r--r-- | src/lib/edje/edje_cache.c | 5 | ||||
-rw-r--r-- | src/lib/edje/edje_load.c | 10 | ||||
-rw-r--r-- | src/lib/edje/edje_private.h | 4 | ||||
-rw-r--r-- | src/lib/edje/edje_smart.c | 2 |
7 files changed, 13 insertions, 14 deletions
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index dc5a01dfc2..3d3351a593 100644 --- a/src/lib/edje/Edje_Common.h +++ b/src/lib/edje/Edje_Common.h | |||
@@ -135,7 +135,7 @@ EAPI void edje_fontset_append_set (const char *fonts); | |||
135 | * | 135 | * |
136 | * Then, edje_file_data_get("test.edj", "key1") will return "value1" | 136 | * Then, edje_file_data_get("test.edj", "key1") will return "value1" |
137 | */ | 137 | */ |
138 | EAPI char *edje_mmap_data_get(Eina_File *f, const char *key); | 138 | EAPI char *edje_mmap_data_get(const Eina_File *f, const char *key); |
139 | 139 | ||
140 | /** | 140 | /** |
141 | * Get data from the file level data block of an edje file | 141 | * Get data from the file level data block of an edje file |
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index b892ac62f4..dfb887e64a 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h | |||
@@ -652,7 +652,7 @@ enum | |||
652 | * | 652 | * |
653 | * @see edje_object_file_set | 653 | * @see edje_object_file_set |
654 | */ | 654 | */ |
655 | #define edje_obj_mmap_set(file, group, ret) EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_MMAP_SET), EO_TYPECHECK(Eina_File*, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Bool *, ret) | 655 | #define edje_obj_mmap_set(file, group, ret) EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_MMAP_SET), EO_TYPECHECK(const Eina_File*, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Bool *, ret) |
656 | 656 | ||
657 | /** | 657 | /** |
658 | * @def edje_obj_file_get | 658 | * @def edje_obj_file_get |
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 196e498a39..9b0ae01c3f 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h | |||
@@ -1806,7 +1806,7 @@ EAPI Eina_Bool edje_object_file_set (Evas_Object *obj, const char | |||
1806 | * @see edje_object_mmap_set() | 1806 | * @see edje_object_mmap_set() |
1807 | * @since 1.8 | 1807 | * @since 1.8 |
1808 | */ | 1808 | */ |
1809 | EAPI Eina_Bool edje_object_mmap_set(Evas_Object *obj, Eina_File *file, const char *group); | 1809 | EAPI Eina_Bool edje_object_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group); |
1810 | 1810 | ||
1811 | 1811 | ||
1812 | /** | 1812 | /** |
diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c index 4a335c41b8..f2e9b20fad 100644 --- a/src/lib/edje/edje_cache.c +++ b/src/lib/edje/edje_cache.c | |||
@@ -1,6 +1,5 @@ | |||
1 | #include "edje_private.h" | 1 | #include "edje_private.h" |
2 | 2 | ||
3 | |||
4 | static Eina_Hash *_edje_file_hash = NULL; | 3 | static Eina_Hash *_edje_file_hash = NULL; |
5 | static int _edje_file_cache_size = 16; | 4 | static int _edje_file_cache_size = 16; |
6 | static Eina_List *_edje_file_cache = NULL; | 5 | static Eina_List *_edje_file_cache = NULL; |
@@ -299,7 +298,7 @@ _edje_file_change(void *data, int ev_type EINA_UNUSED, void *event) | |||
299 | #endif | 298 | #endif |
300 | 299 | ||
301 | static Edje_File * | 300 | static Edje_File * |
302 | _edje_file_open(Eina_File *f, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, time_t mtime) | 301 | _edje_file_open(const Eina_File *f, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, time_t mtime) |
303 | { | 302 | { |
304 | Edje_Color_Class *cc; | 303 | Edje_Color_Class *cc; |
305 | Edje_File *edf; | 304 | Edje_File *edf; |
@@ -399,7 +398,7 @@ _edje_file_dangling(Edje_File *edf) | |||
399 | #endif | 398 | #endif |
400 | 399 | ||
401 | Edje_File * | 400 | Edje_File * |
402 | _edje_cache_file_coll_open(Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed) | 401 | _edje_cache_file_coll_open(const Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed) |
403 | { | 402 | { |
404 | Edje_File *edf; | 403 | Edje_File *edf; |
405 | Eina_List *l, *hist; | 404 | Eina_List *l, *hist; |
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index d78fa68ad7..546f78e5a5 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c | |||
@@ -24,7 +24,7 @@ struct _Edje_Drag_Items | |||
24 | } page; | 24 | } page; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | void _edje_file_add(Edje *ed, Eina_File *f); | 27 | void _edje_file_add(Edje *ed, const Eina_File *f); |
28 | 28 | ||
29 | /* START - Nested part support */ | 29 | /* START - Nested part support */ |
30 | #define _edje_smart_nested_type "Evas_Smart_Nested" | 30 | #define _edje_smart_nested_type "Evas_Smart_Nested" |
@@ -83,7 +83,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *group) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | EAPI Eina_Bool | 85 | EAPI Eina_Bool |
86 | edje_object_mmap_set(Evas_Object *obj, Eina_File *file, const char *group) | 86 | edje_object_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group) |
87 | { | 87 | { |
88 | if (!obj) return EINA_FALSE; | 88 | if (!obj) return EINA_FALSE; |
89 | Eina_Bool ret = EINA_FALSE; | 89 | Eina_Bool ret = EINA_FALSE; |
@@ -295,7 +295,7 @@ edje_file_group_exists(const char *file, const char *glob) | |||
295 | } | 295 | } |
296 | 296 | ||
297 | EAPI char * | 297 | EAPI char * |
298 | edje_mmap_data_get(Eina_File *f, const char *key) | 298 | edje_mmap_data_get(const Eina_File *f, const char *key) |
299 | { | 299 | { |
300 | Edje_File *edf; | 300 | Edje_File *edf; |
301 | char *str = NULL; | 301 | char *str = NULL; |
@@ -357,7 +357,7 @@ _edje_physics_world_update_cb(void *data, EPhysics_World *world EINA_UNUSED, voi | |||
357 | #endif | 357 | #endif |
358 | 358 | ||
359 | int | 359 | int |
360 | _edje_object_file_set_internal(Evas_Object *obj, Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested) | 360 | _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested) |
361 | { | 361 | { |
362 | Edje *ed; | 362 | Edje *ed; |
363 | Evas *tev; | 363 | Evas *tev; |
@@ -1166,7 +1166,7 @@ on_error: | |||
1166 | } | 1166 | } |
1167 | 1167 | ||
1168 | void | 1168 | void |
1169 | _edje_file_add(Edje *ed, Eina_File *f) | 1169 | _edje_file_add(Edje *ed, const Eina_File *f) |
1170 | { | 1170 | { |
1171 | if (!_edje_edd_edje_file) return; | 1171 | if (!_edje_edd_edje_file) return; |
1172 | if (!f) | 1172 | if (!f) |
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index b1c199f6ae..42422d95bc 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h | |||
@@ -1972,7 +1972,7 @@ void *_edje_signal_callback_disable(const Edje_Signal_Callback_Group *cgp, | |||
1972 | EAPI void _edje_edd_init(void); | 1972 | EAPI void _edje_edd_init(void); |
1973 | EAPI void _edje_edd_shutdown(void); | 1973 | EAPI void _edje_edd_shutdown(void); |
1974 | 1974 | ||
1975 | int _edje_object_file_set_internal(Evas_Object *obj, Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested); | 1975 | int _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested); |
1976 | 1976 | ||
1977 | void _edje_file_del(Edje *ed); | 1977 | void _edje_file_del(Edje *ed); |
1978 | void _edje_file_free(Edje_File *edf); | 1978 | void _edje_file_free(Edje_File *edf); |
@@ -2154,7 +2154,7 @@ void _edje_textblock_styles_del(Edje *ed); | |||
2154 | void _edje_textblock_style_all_update(Edje *ed); | 2154 | void _edje_textblock_style_all_update(Edje *ed); |
2155 | void _edje_textblock_style_parse_and_fix(Edje_File *edf); | 2155 | void _edje_textblock_style_parse_and_fix(Edje_File *edf); |
2156 | void _edje_textblock_style_cleanup(Edje_File *edf); | 2156 | void _edje_textblock_style_cleanup(Edje_File *edf); |
2157 | Edje_File *_edje_cache_file_coll_open(Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed); | 2157 | Edje_File *_edje_cache_file_coll_open(const Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed); |
2158 | void _edje_cache_coll_clean(Edje_File *edf); | 2158 | void _edje_cache_coll_clean(Edje_File *edf); |
2159 | void _edje_cache_coll_flush(Edje_File *edf); | 2159 | void _edje_cache_coll_flush(Edje_File *edf); |
2160 | void _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc); | 2160 | void _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc); |
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index c5c073aff5..4fd547129f 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c | |||
@@ -363,7 +363,7 @@ _edje_smart_file_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) | |||
363 | static void | 363 | static void |
364 | _edje_smart_mmap_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) | 364 | _edje_smart_mmap_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) |
365 | { | 365 | { |
366 | Eina_File *f = va_arg(*list, Eina_File *); | 366 | const Eina_File *f = va_arg(*list, Eina_File *); |
367 | const char *group = va_arg(*list, const char *); | 367 | const char *group = va_arg(*list, const char *); |
368 | Eina_Bool *ret = va_arg(*list, Eina_Bool *); | 368 | Eina_Bool *ret = va_arg(*list, Eina_Bool *); |
369 | Eina_Array *nested; | 369 | Eina_Array *nested; |