* edje: move code around.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@51016 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/edje_cc_handlers.c b/src/bin/edje_cc_handlers.c
index 2041584..2c92ffa 100644 (file)
--- a/src/bin/edje_cc_handlers.c
+++ b/src/bin/edje_cc_handlers.c
@@ -1194,11 +1194,11 @@ st_fonts_font(void)
 static void
 st_data_item(void)
 {
-   Edje_Data *di;
+   Old_Edje_Data *di;
 
    check_arg_count(2);
 
-   di = mem_alloc(SZ(Edje_Data));
+   di = mem_alloc(SZ(Old_Edje_Data));
    di->key = parse_str(0);
    di->value = parse_str(1);
    edje_file->data = eina_list_append(edje_file->data, di);
@@ -1221,7 +1221,7 @@ st_data_file(void)
 {
    const char *data;
    const char *over;
-   Edje_Data *di;
+   Old_Edje_Data *di;
    char *filename;
    char *value;
    int fd;
@@ -1230,7 +1230,7 @@ st_data_file(void)
 
    check_arg_count(2);
 
-   di = mem_alloc(SZ(Edje_Data));
+   di = mem_alloc(SZ(Old_Edje_Data));
    di->key = parse_str(0);
    filename = parse_str(1);
 
@@ -1868,12 +1868,12 @@ static void
 st_collections_group_data_item(void)
 {
    Old_Edje_Part_Collection *pc;
-   Edje_Data *di;
+   Old_Edje_Data *di;
 
    check_arg_count(2);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
-   di = mem_alloc(SZ(Edje_Data));
+   di = mem_alloc(SZ(Old_Edje_Data));
    di->key = parse_str(0);
    di->value = parse_str(1);
    pc->data = eina_list_append(pc->data, di);

diff --git a/src/bin/edje_convert.c b/src/bin/edje_convert.c
index 459c1f1..384eb5c 100644 (file)
--- a/src/bin/edje_convert.c
+++ b/src/bin/edje_convert.c
@@ -111,7 +111,7 @@ _edje_file_convert(Eet_File *ef, Old_Edje_File *oedf)
    Edje_Font_Directory_Entry *fnt;
    Edje_File *edf;
    Eina_List *l;
-   Edje_Data *ed;
+   Old_Edje_Data *ed;
 
    if (oedf->version < 2) return NULL;
 
@@ -195,7 +195,7 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
    Edje_Part_Collection *edc;
    Old_Edje_Part *part;
    Edje_Program *pg;
-   Edje_Data *di;
+   Old_Edje_Data *di;
    Eina_List *l;
    unsigned int k;
 

diff --git a/src/bin/edje_convert.h b/src/bin/edje_convert.h
index be43a10..0bbb38e 100644 (file)
--- a/src/bin/edje_convert.h
+++ b/src/bin/edje_convert.h
@@ -1,6 +1,8 @@
 #ifndef EDJE_CONVERT_H__
 # define EDJE_CONVERT_H__
 
+
+typedef struct _Old_Edje_File                  Old_Edje_File;
 typedef struct _Old_Edje_Image_Directory       Old_Edje_Image_Directory;
 typedef struct _Old_Edje_Font_Directory         Old_Edje_Font_Directory;
 typedef struct _Old_Edje_External_Directory    Old_Edje_External_Directory;
@@ -9,9 +11,9 @@ typedef struct _Old_Edje_Part_Collection       Old_Edje_Part_Collection;
 typedef struct _Old_Edje_Part_Collection_Directory Old_Edje_Part_Collection_Directory;
 typedef struct _Old_Edje_Part_Description       Old_Edje_Part_Description;
 typedef struct _Old_Edje_Part_Description_Spec_Image Old_Edje_Part_Description_Spec_Image;
-typedef struct _Edje_Data                       Edje_Data;
+typedef struct _Old_Edje_Data                   Old_Edje_Data;
 
-struct _Edje_Data
+struct _Old_Edje_Data
 {
    const char *key;
    char *value;

diff --git a/src/bin/edje_data_convert.c b/src/bin/edje_data_convert.c
index 687153b..85da2ac 100644 (file)
--- a/src/bin/edje_data_convert.c
+++ b/src/bin/edje_data_convert.c
@@ -139,11 +139,11 @@ _edje_edd_old_init(void)
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_part_collection_directory, Old_Edje_Part_Collection_Directory, "entries", entries, _edje_edd_old_edje_part_collection_directory_entry);
 
    /* generic data attachment */
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Data);
+   eet_eina_file_data_descriptor_class_set(&eddc, "Edje_Data", sizeof (Old_Edje_Data));
    _edje_edd_old_edje_data =
      eet_data_descriptor_file_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_data, Edje_Data, "key", key, EET_T_STRING);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_data, Edje_Data, "value", value, EET_T_STRING);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_data, Old_Edje_Data, "key", key, EET_T_STRING);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_data, Old_Edje_Data, "value", value, EET_T_STRING);
 
    EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Style_Tag);
    _edje_edd_old_edje_style_tag =

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 225924d..68cc7a3 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -243,8 +243,6 @@ typedef struct _Edje_Part_Description_Spec_Box       Edje_Part_Description_Spec_
 typedef struct _Edje_Part_Description_Spec_Table     Edje_Part_Description_Spec_Table;
 typedef struct _Edje_Patterns                        Edje_Patterns;
 
-typedef struct _Old_Edje_File                       Old_Edje_File;
-
 #define EDJE_INF_MAX_W 100000
 #define EDJE_INF_MAX_H 100000