expedite: porting to Eo

Signed-off-by: Yakov Goldberg <yakov.goldberg@gmail.com>

SVN revision: 83180

1 files changed, 16 insertions, 16 deletions

diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 7dbf9ff..cb2284d 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,19 +31,19 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         o_images[i] = o;
-        evas_object_image_file_set(o, build_path(icons[i % 1]), NULL);
-        evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
-        evas_object_resize(o, ICON_SIZE, ICON_SIZE);
-        evas_object_show(o);
-        
-        o = evas_object_text_add(evas);
+        eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
+                 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+                 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+                 evas_obj_visibility_set(EINA_TRUE));
+
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
         o_texts[i] = o;
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, icons[i % 1]);
-        evas_object_color_set(o, 0, 0, 0, 255);
-        evas_object_show(o);
+        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+                 evas_obj_text_text_set(icons[i % 1]),
+                 evas_obj_color_set(0, 0, 0, 255),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -52,8 +52,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
-   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -65,10 +65,10 @@ static void _loop(double t, int f)
    y = 0 - f;
    for (i = 0; i < NUM; i++)
      {
-        evas_object_move(o_images[i], x + 8, y);
-        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+        eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
         cent = (ICON_SIZE + 16 - tw) / 2;
-        evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+        eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
         x += ICON_SIZE + 16;
         if (x > win_w)
           {