From bacba21ab094b89d3464169210c884c3e5b493aa Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 25 Jun 2014 10:47:42 +0200 Subject: [PATCH] eo: fix build due to change in the Eo API. Apparently nobody is running expedite this days... --- src/bin/proxy_text_fixed.c | 2 +- src/bin/proxy_text_random.c | 4 ++-- src/bin/text_basic.c | 2 +- src/bin/text_change.c | 4 ++-- src/bin/text_styles.c | 2 +- src/bin/text_styles_different_strings.c | 2 +- src/bin/ui.c | 10 +++++----- src/bin/widgets_file_icons.c | 2 +- src/bin/widgets_file_icons_2.c | 2 +- src/bin/widgets_file_icons_2_grouped.c | 2 +- src/bin/widgets_file_icons_2_same.c | 2 +- src/bin/widgets_file_icons_2_same_grouped.c | 2 +- src/bin/widgets_file_icons_3.c | 2 +- src/bin/widgets_file_icons_4.c | 2 +- src/bin/widgets_list_1.c | 2 +- src/bin/widgets_list_1_grouped.c | 2 +- src/bin/widgets_list_2.c | 2 +- src/bin/widgets_list_2_grouped.c | 2 +- src/bin/widgets_list_3.c | 2 +- src/bin/widgets_list_3_grouped.c | 2 +- src/bin/widgets_list_4.c | 2 +- src/bin/widgets_list_4_grouped.c | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c index 43b251b..7da5711 100644 --- a/src/bin/proxy_text_fixed.c +++ b/src/bin/proxy_text_fixed.c @@ -31,7 +31,7 @@ static void _setup(void) o_texts[i] = o; if (o) eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), - evas_obj_text_text_set("This is a test string"), + evas_obj_text_set("This is a test string"), evas_obj_text_style_set(st), evas_obj_color_set(255, 255, 255, 255), evas_obj_text_shadow_color_set(0, 0, 0, 24), diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c index 6c88d39..2dde775 100644 --- a/src/bin/proxy_text_random.c +++ b/src/bin/proxy_text_random.c @@ -40,7 +40,7 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); if (o) - eo_do(o, evas_obj_text_text_set(buf)); + eo_do(o, evas_obj_text_set(buf)); if (o) eo_do(o, evas_obj_color_set(0, 0, 0, 255)); if (o) @@ -99,7 +99,7 @@ static void _loop(double t, int f) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); if (o_texts[0]) - eo_do(o_texts[0], evas_obj_text_text_set(buf)); + eo_do(o_texts[0], evas_obj_text_set(buf)); if (o_texts[0]) eo_do(o_texts[0], evas_obj_size_get(&w, &h)); for (i = 1; i < OBNUM; i++) diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c index 8900574..c7ecb97 100644 --- a/src/bin/text_basic.c +++ b/src/bin/text_basic.c @@ -29,7 +29,7 @@ static void _setup(void) o_texts[i] = o; if (o) eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), - evas_obj_text_text_set("This is a test string"), + evas_obj_text_set("This is a test string"), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/text_change.c b/src/bin/text_change.c index decedd7..3114931 100644 --- a/src/bin/text_change.c +++ b/src/bin/text_change.c @@ -42,7 +42,7 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); if (o) - eo_do(o, evas_obj_text_text_set(buf), + eo_do(o, evas_obj_text_set(buf), evas_obj_color_set(0, 0, 0, 255), evas_obj_size_get(&w, &h)); x = (win_w / 2) - (w / 2); @@ -81,7 +81,7 @@ static void _loop(double t, int f) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); if (o_texts[i]) - eo_do(o_texts[i], evas_obj_text_text_set(buf)); + eo_do(o_texts[i], evas_obj_text_set(buf)); } FPS_STD(NAME); } diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c index 0e6539d..5833efd 100644 --- a/src/bin/text_styles.c +++ b/src/bin/text_styles.c @@ -31,7 +31,7 @@ static void _setup(void) o_texts[i] = o; if (o) eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), - evas_obj_text_text_set("This is a test string"), + evas_obj_text_set("This is a test string"), evas_obj_text_style_set(st), evas_obj_color_set(255, 255, 255, 255), evas_obj_text_shadow_color_set(0, 0, 0, 24), diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c index d6e0e53..0ccf9bc 100644 --- a/src/bin/text_styles_different_strings.c +++ b/src/bin/text_styles_different_strings.c @@ -44,7 +44,7 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); if (o) - eo_do(o, evas_obj_text_text_set(buf), + eo_do(o, evas_obj_text_set(buf), evas_obj_text_style_set(st), evas_obj_color_set(255, 255, 255, 255), evas_obj_text_shadow_color_set(0, 0, 0, 24), diff --git a/src/bin/ui.c b/src/bin/ui.c index b07ef0b..1400afd 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -636,7 +636,7 @@ _ui_setup(void) eo_unref(o); if (o) eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set("EXPEDITE"), + evas_obj_text_set("EXPEDITE"), evas_obj_layer_set(100), evas_obj_color_set(0, 0, 0, 100), evas_obj_pass_events_set(1), @@ -652,7 +652,7 @@ _ui_setup(void) eo_unref(o); if (o) eo_do(o, evas_obj_text_font_set("Vera", 9), - evas_obj_text_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), + evas_obj_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), evas_obj_layer_set(100), evas_obj_color_set(0, 0, 0, 60), evas_obj_pass_events_set(1), @@ -708,7 +708,7 @@ _ui_setup(void) eo_unref(o); if (o) eo_do(o, evas_obj_text_font_set("Vera", 10), - evas_obj_text_text_set(""), + evas_obj_text_set(""), evas_obj_color_set(0, 0, 0, 100), evas_obj_pass_events_set(1), evas_obj_size_get(&w, &h)); @@ -908,7 +908,7 @@ ui_loop(void) o = o_menu_title; if (o) eo_do(o, evas_obj_color_set(a, a, a, a), - evas_obj_text_text_set(mi->text), + evas_obj_text_set(mi->text), evas_obj_size_get(&tw, &th)); x = (win_w - tw) / 2; y = (win_h / 2) + len + 48; @@ -960,7 +960,7 @@ ui_menu(void) eo_do(o_title, evas_obj_visibility_set(EINA_TRUE)); if (o_byline) eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE), - evas_obj_text_text_set + evas_obj_text_set ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.")); menu_active = 1; key_func = NULL; diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c index 07941f6..21ee738 100644 --- a/src/bin/widgets_file_icons.c +++ b/src/bin/widgets_file_icons.c @@ -56,7 +56,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 13]), + evas_obj_text_set(icons[i % 13]), evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW), evas_obj_color_set(255, 255, 255, 255), evas_obj_text_shadow_color_set(0, 0, 0, 24), diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c index dc2eded..3f08ceb 100644 --- a/src/bin/widgets_file_icons_2.c +++ b/src/bin/widgets_file_icons_2.c @@ -56,7 +56,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 13]), + evas_obj_text_set(icons[i % 13]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c index 4607a12..dd712b0 100644 --- a/src/bin/widgets_file_icons_2_grouped.c +++ b/src/bin/widgets_file_icons_2_grouped.c @@ -56,7 +56,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 13]), + evas_obj_text_set(icons[i % 13]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c index 9f87471..71cfb70 100644 --- a/src/bin/widgets_file_icons_2_same.c +++ b/src/bin/widgets_file_icons_2_same.c @@ -41,7 +41,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 1]), + evas_obj_text_set(icons[i % 1]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c index 70da798..75c8a50 100644 --- a/src/bin/widgets_file_icons_2_same_grouped.c +++ b/src/bin/widgets_file_icons_2_same_grouped.c @@ -41,7 +41,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 1]), + evas_obj_text_set(icons[i % 1]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c index 19877ee..52e34cc 100644 --- a/src/bin/widgets_file_icons_3.c +++ b/src/bin/widgets_file_icons_3.c @@ -56,7 +56,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 13]), + evas_obj_text_set(icons[i % 13]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c index 126f303..5c8a053 100644 --- a/src/bin/widgets_file_icons_4.c +++ b/src/bin/widgets_file_icons_4.c @@ -56,7 +56,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(icons[i % 13]), + evas_obj_text_set(icons[i % 13]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c index ea194a0..90716de 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c @@ -73,7 +73,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c index 0bf97d3..0aaa913 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c @@ -73,7 +73,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c index e7db9c5..a36897f 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c @@ -73,7 +73,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c index a99a4fc..6205a02 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c @@ -73,7 +73,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c index 1f27ee3..19ccc4a 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c @@ -102,7 +102,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c index 6fbd65d..b82c9f8 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c @@ -102,7 +102,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c index 5c403ee..858d4ec 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c @@ -102,7 +102,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); } diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c index c959a9a..1d7c991 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c @@ -102,7 +102,7 @@ static void _setup(void) o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), - evas_obj_text_text_set(labels[i % 26]), + evas_obj_text_set(labels[i % 26]), evas_obj_color_set(0, 0, 0, 255), evas_obj_visibility_set(EINA_TRUE)); }