Revert "expedite: fix for 5.5 compatibility."

This reverts commit f90323b79e546f021eb677b4fcb70e944d0f270e.

This is not intended...

Change-Id: Iabea31fb3cf02d8f02bd0f898977297afb0d6e3b

diff --git a/src/bin/about.c b/src/bin/about.c
index fedc17e..e61311e 100755 (executable)
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -1,6 +1,5 @@
 #include "main.h"
 
-#if 0
 static Evas_Object *o_text = NULL;
 
 static void
@@ -64,12 +63,10 @@ _key(const char *key)
         ui_menu();
      }
 }
-#endif
+
 void
 about_start(void)
 {
-#if 0
    _setup();
    ui_func_set(_key, _loop);
-#endif
 }

diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 771da3b..4d03c28 100755 (executable)
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -29,14 +29,9 @@ static void _setup(void)
      {
        o = evas_object_text_add(evas);
        o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 20);
         efl_text_set(o, "This is a test string");
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 20);
-        evas_object_text_text_set(o, "This is a test string");
-#endif
         evas_object_text_style_set(o, st);
         efl_gfx_color_set(o, 255, 255, 255, 255);
         evas_object_text_shadow_color_set(o, 0, 0, 0, 24);

diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index ee29073..eb0d3a2 100755 (executable)
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -37,15 +37,10 @@ static void _setup(void)
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-#if 0
+
    efl_text_font_family_set(o, "Vera-Bold");
    efl_text_font_size_set(o, 20);
    efl_text_set(o, buf);
-#else
-   evas_object_text_font_set(o, "Vera-Bold", 20);
-   evas_object_text_text_set(o, buf);
-#endif
-
    efl_gfx_color_set(o, 0, 0, 0, 255);
    exp_size_get(o, &w, &h);
    x = (win_w / 2) - (w / 2);

diff --git a/src/bin/proxy_textblock.c b/src/bin/proxy_textblock.c
index 41cafaa..262b81e 100644 (file)
--- a/src/bin/proxy_textblock.c
+++ b/src/bin/proxy_textblock.c
@@ -31,21 +31,12 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-#if 0
         o = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas);
         o_texts[i] = o;
-#else
-        o = evas_object_textblock_add(evas);
-        o_texts[i] = o;
-#endif
-
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 12);
-#endif
         efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_WORD);
         efl_text_multiline_set(o, 1);
-#if 0
         efl_text_set(o,
           "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do "
           "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut "
@@ -56,19 +47,6 @@ static void _setup(void)
           "culpa qui officia deserunt mollit anim id est laborum."
         );
         efl_text_color_set(o, 0, 0, 0, 255);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 12);
-        evas_object_textblock_text_markup_set(o,
-          "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do "
-          "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut "
-          "enim ad minim veniam, quis nostrud exercitation ullamco laboris "
-          "nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in "
-          "reprehenderit in voluptate velit esse cillum dolore eu fugiat "
-          "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in "
-          "culpa qui officia deserunt mollit anim id est laborum."
-        );
-        evas_object_color_set(o, 0, 0, 0, 255);
-#endif
         efl_gfx_entity_size_set(o, EINA_SIZE2D(480, 160));
         efl_gfx_entity_visible_set(o, EINA_TRUE);
 

diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index 9bb9aed..6f78c2a 100755 (executable)
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -64,14 +64,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 13]);
-#endif
         evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
         efl_gfx_color_set(o, 255, 255, 255, 255);
         evas_object_text_shadow_color_set(o, 0, 0, 0, 24);

diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index b0685a5..d5391e3 100755 (executable)
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -27,14 +27,9 @@ static void _setup(void)
      {
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 20);
         efl_text_set(o, "This is a test string");
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 20);
-        evas_object_text_text_set(o, "This is a test string");
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 0dac48c..d822abb 100755 (executable)
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,7 +34,6 @@ static void _setup(void)
      {
        o = evas_object_text_add(evas);
        o_texts[i] = o;
-#if 0
        efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 20);
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
@@ -43,10 +42,6 @@ static void _setup(void)
                 strs[rnd() % (sizeof(strs) / sizeof(char *))],
                 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
        efl_text_set(o, buf);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 20);
-        evas_object_text_text_set(o, buf);
-#endif
        efl_gfx_color_set(o, 0, 0, 0, 255);
        exp_size_get(o, &w, &h);
        x = (win_w / 2) - (w / 2);

diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 9a89eb8..f3f0d0f 100755 (executable)
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -29,14 +29,9 @@ static void _setup(void)
      {
        o = evas_object_text_add(evas);
        o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 20);
         efl_text_set(o, "This is a test string");
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 20);
-        evas_object_text_text_set(o, "This is a test string");
-#endif
         evas_object_text_style_set(o, st);
         efl_gfx_color_set(o, 255, 255, 255, 255);
         evas_object_text_shadow_color_set(o, 0, 0, 0, 24);

diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 3b6e955..e5cf355 100755 (executable)
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,7 +36,6 @@ static void _setup(void)
      {
        o = evas_object_text_add(evas);
        o_texts[i] = o;
-#if 0
        efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 20);
        snprintf(buf, sizeof(buf), "%s %s %s %s.",
@@ -45,10 +44,6 @@ static void _setup(void)
                 strs[rnd() % (sizeof(strs) / sizeof(char *))],
                 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
        efl_text_set(o, buf);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 20);
-        evas_object_text_text_set(o, buf);
-#endif
        evas_object_text_style_set(o, st);
        efl_gfx_color_set(o, 255, 255, 255, 255);
        evas_object_text_shadow_color_set(o, 0, 0, 0, 24);

diff --git a/src/bin/ui.c b/src/bin/ui.c
index 7939f60..21198fa 100644 (file)
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -415,14 +415,9 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_wallpaper = o;
 
    o = evas_object_text_add(evas);
-#if 0
    efl_text_font_family_set(o, "Vera-Bold");
    efl_text_font_size_set(o, 10);
    efl_text_set(o, "EXPEDITE");
-#else
-   evas_object_text_font_set(o, "Vera-Bold", 10);
-   evas_object_text_text_set(o, "EXPEDITE");
-#endif
    efl_gfx_stack_layer_set(o, 100);
    efl_gfx_color_set(o, 0, 0, 0, 100);
    evas_object_pass_events_set(o, 1);
@@ -434,14 +429,9 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_title = o;
 
    o = evas_object_text_add(evas);
-#if 0
    efl_text_font_family_set(o, "Vera");
    efl_text_font_size_set(o, 9);
    efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
-#else
-   evas_object_text_font_set(o, "Vera", 9);
-   evas_object_text_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
-#endif
    efl_gfx_stack_layer_set(o, 100);
    efl_gfx_color_set(o, 0, 0, 0, 60);
    evas_object_pass_events_set(o, 1);
@@ -478,14 +468,9 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_menu_text_sel = o;
 
    o = evas_object_text_add(evas);
-#if 0
    efl_text_font_family_set(o, "Vera");
    efl_text_font_size_set(o, 10);
    efl_text_set(o, "");
-#else
-   evas_object_text_font_set(o, "Vera", 10);
-   evas_object_text_text_set(o, "");
-#endif
    efl_gfx_color_set(o, 0, 0, 0, 100);
    evas_object_pass_events_set(o, 1);
    exp_size_get(o, &w, &h);

diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 539cf7d..21ec39b 100755 (executable)
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -55,14 +55,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 13]);
-#endif
         evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
         efl_gfx_color_set(o, 255, 255, 255, 255);
         evas_object_text_shadow_color_set(o, 0, 0, 0, 24);

diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index 8948c13..ba45e7e 100755 (executable)
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -55,14 +55,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 13]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 5c8983b..61e9b7f 100755 (executable)
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -55,14 +55,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 13]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index a9e4607..b61377a 100755 (executable)
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -40,14 +40,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 1]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 1]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, 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 cf07752..447bbd8 100755 (executable)
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -40,14 +40,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 1]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 1]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 0eef8fb..ed19400 100755 (executable)
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -55,14 +55,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 13]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 1b29020..7050bbd 100755 (executable)
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -55,14 +55,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 13]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 78dd04d..a2f0fa4 100755 (executable)
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -71,14 +71,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 45b2d17..f1d1d15 100755 (executable)
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -71,14 +71,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index ccbe0c9..877b0b0 100755 (executable)
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -71,14 +71,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index b5d5510..0f849c4 100755 (executable)
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -71,14 +71,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index ef0e40b..c391f1a 100755 (executable)
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -99,14 +99,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 2c3f8ce..d60ee7a 100755 (executable)
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -99,14 +99,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index a19ed3c..a79d5fa 100755 (executable)
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -99,14 +99,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 20);
-        evas_object_text_text_set(o, "This is a test string");
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }

diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 482a7f0..b9ddcb2 100755 (executable)
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -99,14 +99,9 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-#if 0
         efl_text_font_family_set(o, "Vera-Bold");
         efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
-#else
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-#endif
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
      }