edje: unbork amalgamation.

SVN revision: 80405

diff --git a/legacy/edje/src/bin/edje_cc.h b/legacy/edje/src/bin/edje_cc.h
index 9a6d2f2..66c67c9 100644 (file)
--- a/legacy/edje/src/bin/edje_cc.h
+++ b/legacy/edje/src/bin/edje_cc.h
@@ -45,8 +45,6 @@ typedef struct _New_Statement_Handler New_Statement_Handler;
 typedef struct _New_Nested_Handler    New_Nested_Handler;
 typedef struct _External_List         External_List;
 typedef struct _External              External;
-typedef struct _Font_List             Font_List;
-typedef struct _Font                  Font;
 typedef struct _Code                  Code;
 typedef struct _Code_Program          Code_Program;
 typedef struct _SrcFile               SrcFile;
@@ -86,17 +84,6 @@ struct _External
     char *name;
 };
 
-struct _Font_List
-{
-   Eina_List *list;
-};
-
-struct _Font
-{
-   char *name;
-   char *file;
-};
-
 struct _Code
 {
    int       l1, l2;
@@ -206,7 +193,7 @@ void    source_fetch(void);
 int     source_append(Eet_File *ef);
 SrcFile_List *source_load(Eet_File *ef);
 int     source_fontmap_save(Eet_File *ef, Eina_List *fonts);
-Font_List *source_fontmap_load(Eet_File *ef);
+Edje_Font_List *source_fontmap_load(Eet_File *ef);
 
 void   *mem_alloc(size_t size);
 char   *mem_strdup(const char *s);

diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c
index 367b493..7fbe674 100644 (file)
--- a/legacy/edje/src/bin/edje_cc_handlers.c
+++ b/legacy/edje/src/bin/edje_cc_handlers.c
@@ -1636,14 +1636,14 @@ st_images_set_image_size(void)
 static void
 st_fonts_font(void)
 {
-   Font *fn;
+   Edje_Font *fn;
 
    check_arg_count(2);
 
    if (!edje_file->fonts)
      edje_file->fonts = eina_hash_string_small_new(free);
 
-   fn = mem_alloc(SZ(Font));
+   fn = mem_alloc(SZ(Edje_Font));
    fn->file = parse_str(0);
    fn->name = parse_str(1);
 

diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index 38438ea..10a4cec 100644 (file)
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -147,7 +147,7 @@ struct _Head_Write
 struct _Fonts_Write
 {
    Eet_File *ef;
-   Font *fn;
+   Edje_Font *fn;
    char *errstr;
 };
 
@@ -532,7 +532,7 @@ static void
 data_write_fonts(Eet_File *ef, int *font_num)
 {
    Eina_Iterator *it;
-   Font *fn;
+   Edje_Font *fn;
 
    if (!edje_file->fonts) return;
 

diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c
index 818890f..ef23d32 100644 (file)
--- a/legacy/edje/src/bin/edje_cc_sources.c
+++ b/legacy/edje/src/bin/edje_cc_sources.c
@@ -235,17 +235,17 @@ source_load(Eet_File *ef)
 int
 source_fontmap_save(Eet_File *ef, Eina_List *font_list)
 {
-   Font_List fl;
+   Edje_Font_List fl;
 
    fl.list = font_list;
    return eet_data_write(ef, _font_list_edd, "edje_source_fontmap", &fl,
                          compress_mode);
 }
 
-Font_List *
+Edje_Font_List *
 source_fontmap_load(Eet_File *ef)
 {
-   Font_List *fl;
+   Edje_Font_List *fl;
 
    fl = eet_data_read(ef, _font_list_edd, "edje_source_fontmap");
    return fl;

diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index 01ece6a..3f96db2 100644 (file)
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -26,7 +26,7 @@ int compress_mode = EET_COMPRESSION_DEFAULT;
 
 Edje_File *edje_file = NULL;
 SrcFile_List *srcfiles = NULL;
-Font_List *fontlist = NULL;
+Edje_Font_List *fontlist = NULL;
 
 int line = 0;
 int build_sh = 1;

diff --git a/legacy/edje/src/bin/edje_decc.h b/legacy/edje/src/bin/edje_decc.h
index c562715..5aa52e5 100644 (file)
--- a/legacy/edje/src/bin/edje_decc.h
+++ b/legacy/edje/src/bin/edje_decc.h
@@ -29,22 +29,9 @@ extern int _edje_cc_log_dom ;
 #define DBG(...) EINA_LOG_DOM_DBG(_edje_cc_log_dom, __VA_ARGS__)
 
 /* types */
-typedef struct _Font                  Font;
-typedef struct _Font_List             Font_List;
 typedef struct _SrcFile               SrcFile;
 typedef struct _SrcFile_List          SrcFile_List;
 
-struct _Font
-{
-   char *file;
-   char *name;
-};
-
-struct _Font_List
-{
-   Eina_List *list;
-};
-
 struct _SrcFile
 {
    char *name;
@@ -61,7 +48,7 @@ void    source_fetch(void);
 int     source_append(Eet_File *ef);
 SrcFile_List *source_load(Eet_File *ef);
 int     source_fontmap_save(Eet_File *ef, Eina_List *fonts);
-Font_List *source_fontmap_load(Eet_File *ef);
+Edje_Font_List *source_fontmap_load(Eet_File *ef);
 
 void   *mem_alloc(size_t size);
 char   *mem_strdup(const char *s);

diff --git a/legacy/edje/src/bin/edje_pick.c b/legacy/edje/src/bin/edje_pick.c
index abe8348..684c59d 100644 (file)
--- a/legacy/edje/src/bin/edje_pick.c
+++ b/legacy/edje/src/bin/edje_pick.c
@@ -89,7 +89,7 @@ typedef struct _Edje_Pick_Tone Edje_Pick_Tone;
 \r
 struct _Edje_Pick_Font\r
 {\r
-   Font *f;\r
+   Edje_Font *f;\r
    Eina_Bool used;\r
 };\r
 typedef struct _Edje_Pick_Font Edje_Pick_Font;\r
@@ -246,7 +246,7 @@ _edje_pick_cleanup(Eina_List *ifs, Edje_File *out_file, Edje_Pick_Status s)
 \r
    EINA_LIST_FREE(context.fontlist, ft)\r
      {\r
-        Font *st = ft->f;\r
+        Edje_Font *st = ft->f;\r
 \r
         eina_stringshare_del(st->name);\r
         eina_stringshare_del(st->file);\r
@@ -836,9 +836,12 @@ _edje_pick_sounds_add(Edje_File *edf)
 static int\r
 _font_cmp(const void *d1, const void *d2)\r
 {\r
+   Edje_Font *f1 = d1;\r
+   Edje_Font *f2 = d2;\r
+\r
    /* Same font if (d1->name == d2->name) AND (d1->file == d2->file) */\r
-   return (strcmp(((Font *) d1)->name, ((Font *) d2)->name) |\r
-           strcmp(((Font *) d1)->file, ((Font *) d2)->file));\r
+   return (strcmp(f1->name, f2->name) |\r
+           strcmp(f1->file, f2->file));\r
 }\r
 \r
 static int\r
@@ -846,8 +849,8 @@ _Edje_Pick_Fonts_add(Edje_File *edf)
 {\r
    Eet_Data_Descriptor *_font_list_edd = NULL;\r
    Eet_Data_Descriptor *_font_edd;\r
-   Font_List *fl;\r
-   Font *f;\r
+   Edje_Font_List *fl;\r
+   Edje_Font *f;\r
    Eina_List *l;\r
 \r
    _edje_data_font_list_desc_make(&_font_list_edd, &_font_edd);\r
@@ -860,7 +863,7 @@ _Edje_Pick_Fonts_add(Edje_File *edf)
           {\r
              /* Add only fonts that are NOT regestered in our list */\r
              Edje_Pick_Font *ft =  malloc(sizeof(*ft));\r
-             Font *st = malloc(sizeof(*st));\r
+             Edje_Font *st = malloc(sizeof(*st));\r
 \r
              st->name = (char *) eina_stringshare_add(f->name);\r
              st->file = (char *) eina_stringshare_add(f->file);\r
@@ -1161,7 +1164,7 @@ main(int argc, char **argv)
    Edje_Part_Collection *edc;\r
    Edje_Part_Collection_Directory_Entry *ce;\r
    Eet_File *ef;\r
-   Font_List *fl;\r
+   Edje_Font_List *fl;\r
    Eina_List *f, *l;\r
    char buf[1024];\r
    void *n;\r

diff --git a/legacy/edje/src/lib/edje_data.c b/legacy/edje/src/lib/edje_data.c
index 75b02fc..10e7cab 100644 (file)
--- a/legacy/edje/src/lib/edje_data.c
+++ b/legacy/edje/src/lib/edje_data.c
@@ -1,4 +1,3 @@
-#include "edje_cc.h"  /* For struct Font */
 #include "edje_private.h"
 
 EAPI Eet_Data_Descriptor *_edje_edd_edje_file = NULL;
@@ -953,21 +952,21 @@ _edje_edd_init(void)
 
 EAPI void
 _edje_data_font_list_desc_make(Eet_Data_Descriptor **_font_list_edd,
-      Eet_Data_Descriptor **_font_edd)
+                              Eet_Data_Descriptor **_font_edd)
 {  /* User have to free: _font_list_edd, _font_edd */
    Eet_Data_Descriptor_Class eddc;
 
    eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc),
-                                             "font", sizeof (Font));
+                                             "font", sizeof (Edje_Font));
    *_font_edd = eet_data_descriptor_stream_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(*_font_edd, Font,
+   EET_DATA_DESCRIPTOR_ADD_BASIC(*_font_edd, Edje_Font,
                                  "file", file, EET_T_INLINED_STRING);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(*_font_edd, Font,
+   EET_DATA_DESCRIPTOR_ADD_BASIC(*_font_edd, Edje_Font,
                                  "name", name, EET_T_INLINED_STRING);
 
    eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc),
-                                             "font_list", sizeof (Font_List));
+                                             "font_list", sizeof (Edje_Font_List));
    *_font_list_edd = eet_data_descriptor_stream_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_LIST(*_font_list_edd, Font_List,
+   EET_DATA_DESCRIPTOR_ADD_LIST(*_font_list_edd, Edje_Font_List,
                                 "list", list, *_font_edd);
 }

diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index efe05e3..0ba7803 100644 (file)
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -1691,6 +1691,20 @@ struct _Edje_User_Defined
    } u;
 };
 
+typedef struct _Edje_Font_List             Edje_Font_List;
+typedef struct _Edje_Font                  Edje_Font;
+
+struct _Edje_Font_List
+{
+   Eina_List *list;
+};
+
+struct _Edje_Font
+{
+   char *name;
+   char *file;
+};
+
 Edje_Patterns   *edje_match_collection_dir_init(const Eina_List *lst);
 Edje_Patterns   *edje_match_programs_signal_init(Edje_Program * const *array,
                                                 unsigned int count);