From bc5dda9c0c155ff429c450c3f369a87552ab5762 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 13 Aug 2009 12:53:12 +0000 Subject: [PATCH] * edje: Use new clean API from Eet. SVN revision: 41733 --- legacy/edje/src/bin/edje_cc_sources.c | 58 ++-------- legacy/edje/src/lib/edje_data.c | 149 ++++++++------------------ legacy/edje/src/lib/edje_edit.c | 50 +-------- 3 files changed, 56 insertions(+), 201 deletions(-) diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c index e25d63a83e..d184480c96 100644 --- a/legacy/edje/src/bin/edje_cc_sources.c +++ b/legacy/edje/src/bin/edje_cc_sources.c @@ -16,69 +16,27 @@ static Eet_Data_Descriptor *_font_list_edd = NULL; static SrcFile_List srcfiles = {NULL}; -#define NEWD(str, typ) \ - { eddc.name = str; eddc.size = sizeof(typ); } - -static char * -_edje_str_direct_alloc(const char *str) -{ - return (char *)str; -} - -static void -_edje_str_direct_free(const char *str) -{ -} - -static void * -_edje_eina_hash_add_alloc(void *hash, const char *key, void *data) -{ - Eina_Hash *result = hash; - - if (!result) result = eina_hash_string_small_new(NULL); - if (!result) return NULL; - - eina_hash_add(result, key, data); - - return result; -} - void source_edd(void) { Eet_Data_Descriptor_Class eddc; - eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; - eddc.func.mem_alloc = NULL; - eddc.func.mem_free = NULL; - eddc.func.str_alloc = eina_stringshare_add; - eddc.func.str_free = eina_stringshare_del; - eddc.func.list_next = eina_list_next; - eddc.func.list_append = eina_list_append; - eddc.func.list_data = eina_list_data_get; - eddc.func.list_free = eina_list_free; - eddc.func.hash_foreach = eina_hash_foreach; - eddc.func.hash_add = _edje_eina_hash_add_alloc; - eddc.func.hash_free = eina_hash_free; - eddc.func.str_direct_alloc = _edje_str_direct_alloc; - eddc.func.str_direct_free = _edje_str_direct_free; - - NEWD("srcfile", SrcFile); - _srcfile_edd = eet_data_descriptor3_new(&eddc); + eina_stream_data_descriptor_set(&eddc, "srcfile", sizeof (SrcFile)); + _srcfile_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "name", name, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "file", file, EET_T_INLINED_STRING); - NEWD("srcfile_list", SrcFile_List); - _srcfile_list_edd = eet_data_descriptor3_new(&eddc); + eina_stream_data_descriptor_set(&eddc, "srcfile_list", sizeof (SrcFile_List)); + _srcfile_list_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd); - NEWD("font", Font); - _font_edd = eet_data_descriptor3_new(&eddc); + eina_stream_data_descriptor_set(&eddc, "font", sizeof (Font)); + _font_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "file", file, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "name", name, EET_T_INLINED_STRING); - NEWD("font_list", Font_List); - _font_list_edd = eet_data_descriptor3_new(&eddc); + eina_stream_data_descriptor_set(&eddc, "font_list", sizeof (Font_List)); + _font_list_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_font_list_edd, Font_List, "list", list, _font_edd); } diff --git a/legacy/edje/src/lib/edje_data.c b/legacy/edje/src/lib/edje_data.c index 63ccb51390..4b91259679 100644 --- a/legacy/edje/src/lib/edje_data.c +++ b/legacy/edje/src/lib/edje_data.c @@ -27,9 +27,6 @@ EAPI Eet_Data_Descriptor *_edje_edd_edje_part = NULL; EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description = NULL; EAPI Eet_Data_Descriptor *_edje_edd_edje_part_image_id = NULL; -#define NEWD(str, typ) \ - { eddc.name = str; eddc.size = sizeof(typ); } - #define FREED(eed) \ if (eed) \ { \ @@ -64,142 +61,93 @@ _edje_edd_free(void) FREED(_edje_edd_edje_part_image_id); } -static char * -_edje_str_direct_alloc(const char *str) -{ - return (char *)str; -} - -static void -_edje_str_direct_free(const char *str) -{ -} - -static Eina_Hash * -_edje_eina_hash_add_alloc(Eina_Hash *hash, const char *key, void *data) -{ - if (!hash) hash = eina_hash_string_small_new(NULL); - if (!hash) return NULL; - - eina_hash_add(hash, key, data); - return hash; -} - void _edje_edd_setup(void) { Eet_Data_Descriptor_Class eddc; - eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; - eddc.func.mem_alloc = NULL; - eddc.func.mem_free = NULL; - eddc.func.str_alloc = (char *(*)(const char *))eina_stringshare_add; - eddc.func.str_free = eina_stringshare_del; - eddc.func.list_next = (void *(*)(void *))eina_list_next; - eddc.func.list_append = (void *(*)(void *, void *))eina_list_append; - eddc.func.list_data = (void *(*)(void *))eina_list_data_get; - eddc.func.list_free = (void *(*)(void *))eina_list_free; - eddc.func.hash_foreach = (void (*)(const Eina_Hash *, Eina_Bool (*)(const Eina_Hash *, const void *, void *, void *), void *))eina_hash_foreach; - eddc.func.hash_add = (Eina_Hash* (*)(Eina_Hash *, const char *, void *)) _edje_eina_hash_add_alloc; - eddc.func.hash_free = (void (*)(void *))eina_hash_free; - eddc.func.str_direct_alloc = _edje_str_direct_alloc; - eddc.func.str_direct_free = _edje_str_direct_free; - /* font directory */ - NEWD("Edje_Font_Directory_Entry", - Edje_Font_Directory_Entry); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Font_Directory_Entry); _edje_edd_edje_font_directory_entry = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_font_directory_entry, Edje_Font_Directory_Entry, "entry", entry, EET_T_STRING); - NEWD("Edje_Font_Directory", - Edje_Font_Directory); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Font_Directory); _edje_edd_edje_font_directory = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_font_directory, Edje_Font_Directory, "entries", entries, _edje_edd_edje_font_directory_entry); /* image directory */ - NEWD("Edje_Image_Directory_Entry", - Edje_Image_Directory_Entry); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Image_Directory_Entry); _edje_edd_edje_image_directory_entry = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "entry", entry, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "source_type", source_type, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "source_param", source_param, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "id", id, EET_T_INT); - NEWD("Edje_Image_Directory", - Edje_Image_Directory); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Image_Directory); _edje_edd_edje_image_directory = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_image_directory, Edje_Image_Directory, "entries", entries, _edje_edd_edje_image_directory_entry); /* spectrum directory */ - NEWD("Edje_Spectrum_Color", - Edje_Spectrum_Color); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Spectrum_Color); _edje_edd_edje_spectrum_color = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "r", r, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "g", g, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "b", b, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "a", a, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "d", d, EET_T_INT); - NEWD("Edje_Spectrum_Directory_Entry", - Edje_Spectrum_Directory_Entry); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Spectrum_Directory_Entry); _edje_edd_edje_spectrum_directory_entry = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "entry", entry, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "filename", filename, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "color_list", color_list, _edje_edd_edje_spectrum_color); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "id", id, EET_T_INT); - NEWD("Edje_Spectrum_Directory", - Edje_Spectrum_Directory); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Spectrum_Directory); _edje_edd_edje_spectrum_directory = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_spectrum_directory, Edje_Spectrum_Directory, "entries", entries, _edje_edd_edje_spectrum_directory_entry); /* collection directory */ - NEWD("Edje_Part_Collection_Directory_Entry", - Edje_Part_Collection_Directory_Entry); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Collection_Directory_Entry); _edje_edd_edje_part_collection_directory_entry = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection_directory_entry, Edje_Part_Collection_Directory_Entry, "entry", entry, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection_directory_entry, Edje_Part_Collection_Directory_Entry, "id", id, EET_T_INT); - NEWD("Edje_Part_Collection_Directory", - Edje_Part_Collection_Directory); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Collection_Directory); _edje_edd_edje_part_collection_directory = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection_directory, Edje_Part_Collection_Directory, "entries", entries, _edje_edd_edje_part_collection_directory_entry); /* generic data attachment */ - NEWD("Edje_Data", - Edje_Data); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Data); _edje_edd_edje_data = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_data, Edje_Data, "key", key, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_data, Edje_Data, "value", value, EET_T_STRING); - NEWD("Edje_Style_Tag", - Edje_Style_Tag); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Style_Tag); _edje_edd_edje_style_tag = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_style_tag, Edje_Style_Tag, "key", key, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_style_tag, Edje_Style_Tag, "value", value, EET_T_STRING); - NEWD("Edje_Style", - Edje_Style); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Style); _edje_edd_edje_style = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_style, Edje_Style, "name", name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_style, Edje_Style, "tags", tags, _edje_edd_edje_style_tag); - NEWD("Edje_Color_Class", - Edje_Color_Class); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Color_Class); _edje_edd_edje_color_class = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "name", name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "r", r, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "g", g, EET_T_UCHAR); @@ -215,10 +163,9 @@ _edje_edd_setup(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "a3", a3, EET_T_UCHAR); /* the main file directory */ - NEWD("Edje_File", - Edje_File); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_File); _edje_edd_edje_file = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "compiler", compiler, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "version", version, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "feature_ver", feature_ver, EET_T_INT); @@ -231,23 +178,20 @@ _edje_edd_setup(void) EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_file, Edje_File, "color_classes", color_classes, _edje_edd_edje_color_class); /* parts & programs - loaded induvidually */ - NEWD("Edje_Program_Target", - Edje_Program_Target); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Program_Target); _edje_edd_edje_program_target = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_target, Edje_Program_Target, "id", id, EET_T_INT); - NEWD("Edje_Program_After", - Edje_Program_After); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Program_After); _edje_edd_edje_program_after = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_after, Edje_Program_After, "id", id, EET_T_INT); - NEWD("Edje_Program", - Edje_Program); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Program); _edje_edd_edje_program = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "id", id, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "name", name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "signal", signal, EET_T_STRING); @@ -264,16 +208,14 @@ _edje_edd_setup(void) EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_program, Edje_Program, "targets", targets, _edje_edd_edje_program_target); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_program, Edje_Program, "after", after, _edje_edd_edje_program_after); - NEWD("Edje_Part_Image_Id", - Edje_Part_Image_Id); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Image_Id); _edje_edd_edje_part_image_id = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_image_id, Edje_Part_Image_Id, "id", id, EET_T_INT); - NEWD("Edje_Part_Description", - Edje_Part_Description); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Description); _edje_edd_edje_part_description = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "state.name", state.name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "state.value", state.value, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "visible", visible, EET_T_CHAR); @@ -377,10 +319,9 @@ _edje_edd_setup(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "table.padding.x", table.padding.x, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "table.padding.y", table.padding.y, EET_T_INT); - NEWD("Edje_Pack_Element", - Edje_Pack_Element); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Pack_Element); _edje_edd_edje_pack_element = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_pack_element, Edje_Pack_Element, "type", type, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_pack_element, Edje_Pack_Element, "name", name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_pack_element, Edje_Pack_Element, "source", source, EET_T_STRING); @@ -407,10 +348,9 @@ _edje_edd_setup(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_pack_element, Edje_Pack_Element, "colspan", colspan, EET_T_USHORT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_pack_element, Edje_Pack_Element, "rowspan", rowspan, EET_T_USHORT); - NEWD("Edje_Part", - Edje_Part); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part); _edje_edd_edje_part = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "name", name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "id", id, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "type", type, EET_T_UCHAR); @@ -444,10 +384,9 @@ _edje_edd_setup(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "source6", source6, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part, Edje_Part, "items", items, _edje_edd_edje_pack_element); - NEWD("Edje_Part_Collection", - Edje_Part_Collection); + EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Collection); _edje_edd_edje_part_collection = - eet_data_descriptor3_new(&eddc); + eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection, Edje_Part_Collection, "programs", programs, _edje_edd_edje_program); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection, Edje_Part_Collection, "parts", parts, _edje_edd_edje_part); EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection, Edje_Part_Collection, "data", data, _edje_edd_edje_data); diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c index fac0d24762..9981901f6a 100644 --- a/legacy/edje/src/lib/edje_edit.c +++ b/legacy/edje/src/lib/edje_edit.c @@ -5467,31 +5467,6 @@ _edje_generate_source(Evas_Object *obj) /* SAVING ROUTINES */ /*********************/ //////////////////////////////////////// -static char * -_edje_edit_str_direct_alloc(const char *str) -{ - return (char *)str; -} - -static void -_edje_edit_str_direct_free(const char *str) -{ -} - -static void * -_edje_eina_hash_add_alloc(void *hash, const void *key, void *data) -{ - Eina_Hash *result = hash; - - if (!result) result = eina_hash_string_small_new(NULL); - if (!result) return NULL; - - eina_hash_add(result, key, data); - - return result; -} - - static Eet_Data_Descriptor *_srcfile_edd = NULL; static Eet_Data_Descriptor *_srcfile_list_edd = NULL; @@ -5500,30 +5475,13 @@ source_edd(void) { Eet_Data_Descriptor_Class eddc; - eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; - eddc.func.mem_alloc = NULL; - eddc.func.mem_free = NULL; - eddc.func.str_alloc = eina_stringshare_add; - eddc.func.str_free = eina_stringshare_del; - eddc.func.list_next = eina_list_next; - eddc.func.list_append = eina_list_append; - eddc.func.list_data = eina_list_data_get; - eddc.func.list_free = eina_list_free; - eddc.func.hash_foreach = eina_hash_foreach; - eddc.func.hash_add = _edje_eina_hash_add_alloc; - eddc.func.hash_free = eina_hash_free; - eddc.func.str_direct_alloc = _edje_edit_str_direct_alloc; - eddc.func.str_direct_free = _edje_edit_str_direct_free; - - eddc.name = "srcfile"; - eddc.size = sizeof(SrcFile); - _srcfile_edd = eet_data_descriptor3_new(&eddc); + eina_stream_data_descriptor_set(&eddc, "srcfile", sizeof(SrcFile)); + _srcfile_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "name", name, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "file", file, EET_T_INLINED_STRING); - eddc.name = "srcfile_list"; - eddc.size = sizeof(SrcFile_List); - _srcfile_list_edd = eet_data_descriptor3_new(&eddc); + eina_stream_data_descriptor_set(&eddc, "srcfile_list", sizeof(SrcFile_List)); + _srcfile_list_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd); } /////////////////////////////////////////