From 2cf15dc33531c5b9f9bde27aaaab9b6e712306d0 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 13 Aug 2009 13:26:43 +0000 Subject: [PATCH] * eet: Fix prefix. SVN revision: 41735 --- legacy/edje/src/bin/edje_cc_sources.c | 8 ++--- legacy/edje/src/lib/edje_data.c | 44 +++++++++++++-------------- legacy/edje/src/lib/edje_edit.c | 4 +-- legacy/eet/src/lib/Eet.h | 8 ++--- legacy/eet/src/lib/eet_data.c | 14 ++++----- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c index d184480c96..55986a5c9f 100644 --- a/legacy/edje/src/bin/edje_cc_sources.c +++ b/legacy/edje/src/bin/edje_cc_sources.c @@ -21,21 +21,21 @@ source_edd(void) { Eet_Data_Descriptor_Class eddc; - eina_stream_data_descriptor_set(&eddc, "srcfile", sizeof (SrcFile)); + eet_eina_stream_data_descriptor_class_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); - eina_stream_data_descriptor_set(&eddc, "srcfile_list", sizeof (SrcFile_List)); + eet_eina_stream_data_descriptor_class_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); - eina_stream_data_descriptor_set(&eddc, "font", sizeof (Font)); + eet_eina_stream_data_descriptor_class_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); - eina_stream_data_descriptor_set(&eddc, "font_list", sizeof (Font_List)); + eet_eina_stream_data_descriptor_class_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 4b91259679..da2340a7f2 100644 --- a/legacy/edje/src/lib/edje_data.c +++ b/legacy/edje/src/lib/edje_data.c @@ -67,18 +67,18 @@ _edje_edd_setup(void) Eet_Data_Descriptor_Class eddc; /* font directory */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Font_Directory_Entry); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Font_Directory_Entry); _edje_edd_edje_font_directory_entry = 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Font_Directory); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Font_Directory); _edje_edd_edje_font_directory = 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 */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Image_Directory_Entry); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Image_Directory_Entry); _edje_edd_edje_image_directory_entry = 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); @@ -86,13 +86,13 @@ _edje_edd_setup(void) 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Image_Directory); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Image_Directory); _edje_edd_edje_image_directory = 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 */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Spectrum_Color); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Spectrum_Color); _edje_edd_edje_spectrum_color = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "r", r, EET_T_INT); @@ -101,7 +101,7 @@ _edje_edd_setup(void) 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Spectrum_Directory_Entry); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Spectrum_Directory_Entry); _edje_edd_edje_spectrum_directory_entry = 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); @@ -109,43 +109,43 @@ _edje_edd_setup(void) 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Spectrum_Directory); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Spectrum_Directory); _edje_edd_edje_spectrum_directory = 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 */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Collection_Directory_Entry); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part_Collection_Directory_Entry); _edje_edd_edje_part_collection_directory_entry = 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Collection_Directory); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part_Collection_Directory); _edje_edd_edje_part_collection_directory = 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 */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Data); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Data); _edje_edd_edje_data = 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Style_Tag); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Style_Tag); _edje_edd_edje_style_tag = 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Style); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Style); _edje_edd_edje_style = 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Color_Class); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Color_Class); _edje_edd_edje_color_class = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "name", name, EET_T_STRING); @@ -163,7 +163,7 @@ _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 */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_File); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_File); _edje_edd_edje_file = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "compiler", compiler, EET_T_STRING); @@ -178,18 +178,18 @@ _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 */ - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Program_Target); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Program_Target); _edje_edd_edje_program_target = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_target, Edje_Program_Target, "id", id, EET_T_INT); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Program_After); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Program_After); _edje_edd_edje_program_after = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_after, Edje_Program_After, "id", id, EET_T_INT); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Program); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Program); _edje_edd_edje_program = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "id", id, EET_T_INT); @@ -208,12 +208,12 @@ _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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Image_Id); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part_Image_Id); _edje_edd_edje_part_image_id = 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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Description); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part_Description); _edje_edd_edje_part_description = 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); @@ -319,7 +319,7 @@ _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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Pack_Element); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Pack_Element); _edje_edd_edje_pack_element = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_pack_element, Edje_Pack_Element, "type", type, EET_T_UCHAR); @@ -348,7 +348,7 @@ _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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part); _edje_edd_edje_part = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "name", name, EET_T_STRING); @@ -384,7 +384,7 @@ _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); - EINA_FILE_DATA_DESCRIPTOR_SET(&eddc, Edje_Part_Collection); + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part_Collection); _edje_edd_edje_part_collection = 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); diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c index 9981901f6a..b0b282df15 100644 --- a/legacy/edje/src/lib/edje_edit.c +++ b/legacy/edje/src/lib/edje_edit.c @@ -5475,12 +5475,12 @@ source_edd(void) { Eet_Data_Descriptor_Class eddc; - eina_stream_data_descriptor_set(&eddc, "srcfile", sizeof(SrcFile)); + eet_eina_stream_data_descriptor_class_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); - eina_stream_data_descriptor_set(&eddc, "srcfile_list", sizeof(SrcFile_List)); + eet_eina_stream_data_descriptor_class_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); } diff --git a/legacy/eet/src/lib/Eet.h b/legacy/eet/src/lib/Eet.h index a82178e528..1db85f6eda 100644 --- a/legacy/eet/src/lib/Eet.h +++ b/legacy/eet/src/lib/Eet.h @@ -1049,7 +1049,7 @@ extern "C" { * * @since 1.3.0 */ - EAPI Eina_Bool eina_stream_data_descriptor_set(Eet_Data_Descriptor_Class *class, const char *name, int size); + EAPI Eina_Bool eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *class, const char *name, int size); /** * This macro is an helper that set all the parameter of an Eet_Data_Descriptor_Class @@ -1061,7 +1061,7 @@ extern "C" { * * @since 1.3.0 */ -#define EINA_STREAM_DATA_DESCRIPTOR_SET(Class, Type) eina_stream_data_descriptor_set(Class, #Type , sizeof (Type)); +#define EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(Class, Type) eet_eina_stream_data_descriptor_class_set(Class, #Type , sizeof (Type)); /** * This function is an helper that set all the parameter of an Eet_Data_Descriptor_Class @@ -1074,7 +1074,7 @@ extern "C" { * * @since 1.3.0 */ - EAPI Eina_Bool eina_file_data_descriptor_set(Eet_Data_Descriptor_Class *class, const char *name, int size); + EAPI Eina_Bool eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *class, const char *name, int size); /** * This macro is an helper that set all the parameter of an Eet_Data_Descriptor_Class @@ -1086,7 +1086,7 @@ extern "C" { * * @since 1.3.0 */ -#define EINA_FILE_DATA_DESCRIPTOR_SET(Class, Type) eina_file_data_descriptor_set(Class, #Type , sizeof (Type)); +#define EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(Class, Type) eet_eina_file_data_descriptor_class_set(Class, #Type , sizeof (Type)); /** * This function frees a data descriptor when it is not needed anymore. diff --git a/legacy/eet/src/lib/eet_data.c b/legacy/eet/src/lib/eet_data.c index 23e676f252..b95bc4844f 100644 --- a/legacy/eet/src/lib/eet_data.c +++ b/legacy/eet/src/lib/eet_data.c @@ -1022,19 +1022,19 @@ _eet_eina_hash_add_alloc(Eina_Hash *hash, const char *key, void *data) } static char * -_edje_str_direct_alloc(const char *str) +_eet_str_direct_alloc(const char *str) { return (char *)str; } static void -_edje_str_direct_free(const char *str) +_eet_str_direct_free(const char *str) { } /*---*/ EAPI Eina_Bool -eina_stream_data_descriptor_set(Eet_Data_Descriptor_Class *class, const char *name, int size) +eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *class, const char *name, int size) { if (!class || !name) return EINA_FALSE; @@ -1058,15 +1058,15 @@ eina_stream_data_descriptor_set(Eet_Data_Descriptor_Class *class, const char *na } EAPI Eina_Bool -eina_file_data_descriptor_set(Eet_Data_Descriptor_Class *class, const char *name, int size) +eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *class, const char *name, int size) { - if (!eina_stream_data_descriptor_set(class, name, size)) + if (!eet_eina_stream_data_descriptor_class_set(class, name, size)) return EINA_FALSE; class->version = 2; - class->func.str_direct_alloc = _edje_str_direct_alloc; - class->func.str_direct_free = _edje_str_direct_free; + class->func.str_direct_alloc = _eet_str_direct_alloc; + class->func.str_direct_free = _eet_str_direct_free; return EINA_TRUE; }