Adjust according to recent Eo4 changes.

src/bin/about.c

@@ -9,9 +9,9 @@ _setup(void)
    Evas_Textblock_Style *st;
 
    o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
-   eo_do(o, efl_gfx_position_set(10, 40),
-         efl_gfx_size_set(win_w - 20, win_h - 50),
-         efl_gfx_visible_set(EINA_TRUE));
+   efl_gfx_position_set(o, 10, 40);
+   efl_gfx_size_set(o, win_w - 20, win_h - 50);
+   efl_gfx_visible_set(o, EINA_TRUE);
    st = evas_textblock_style_new();
    evas_textblock_style_set
      (st,
@@ -21,10 +21,10 @@ _setup(void)
       "p='+ font=Vera font_size=10 align=left'"
       "/p='- \n \n'"
       );
-   eo_do(o, evas_obj_textblock_style_set(st),
-         evas_obj_textblock_clear(),
-         evas_obj_textblock_text_markup_set
-     ("<center>"
+   evas_obj_textblock_style_set(o, st);
+   evas_obj_textblock_clear(o);
+   evas_obj_textblock_text_markup_set
+     (o, "<center>"
       "Enlightenment used to be a window manager project, but "
       "since has changed a lot to become a miniature desktop and mobile "
       "device environment all of its own. It is now made up of many "
@@ -40,8 +40,7 @@ _setup(void)
       "DirectFB and other targets to boot. It handles high level graphic "
       "layout descriptions that applications set up, dealing with the hard "
       "work of doing the drawing for them."
-      "</center>"
-      ));
+      "</center>");
    evas_textblock_style_free(st);
    o_text = o;
    ui_fps(0.0);

src/bin/font_effect_blur_alpha.c

@@ -54,7 +54,7 @@ static void _loop(double t, int f)
    char buf[256];
    char *str = "padding_set({ %d });blur({%d,color=black });";
    sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
-   eo_do(text, efl_gfx_filter_program_set(buf, "test"));
+   efl_gfx_filter_program_set(text, buf, "test");
 
    FPS_STD(NAME);
 }

src/bin/font_effect_blur_color.c

@@ -56,7 +56,7 @@ static void _loop(double t, int f)
    char buf[256];
    char *str = "a = buffer({ 'rgba' }); padding_set({ %d }); blend({dst=a, color=darkblue});blur({%d,src=a});";
    sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
-   eo_do(text, efl_gfx_filter_program_set(buf, "test"));
+   efl_gfx_filter_program_set(text, buf, "test");
 
    FPS_STD(NAME);
 }

src/bin/image_blend_border.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("bar.png"), NULL),
-              evas_obj_image_border_set(6, 6, 6, 6),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("bar.png"), NULL);
+        evas_obj_image_border_set(o, 6, 6, 6, 6);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_border_recolor.c

@@ -25,11 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("pan.png"), NULL),
-              efl_gfx_color_set(64, 64, 64, 255),
-              evas_obj_image_border_set(3, 3, 3, 3),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("pan.png"), NULL);
+        efl_gfx_color_set(o, 64, 64, 64, 255);
+        evas_obj_image_border_set(o, 3, 3, 3, 3);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -56,10 +55,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_fade_pow2_unscaled.c

@@ -27,15 +27,13 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        eo_do(o,
-              efl_gfx_color_set(a, a, a, a),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_color_set(o, a, a, a, a);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -60,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], efl_gfx_position_set(x, y));
+        efl_gfx_position_set(o_images[i], x, y);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_fade_unscaled.c

@@ -27,12 +27,11 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_color_set(a, a, a, a),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_color_set(o, a, a, a, a);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -57,7 +56,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], efl_gfx_position_set(x, y));
+        efl_gfx_position_set(o_images[i], x, y);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_many_smooth_same_scaled.c

@@ -30,12 +30,11 @@ static void _setup(void)
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
         h = 4 + ((n * (80 - 4)) / 100);
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_image_smooth_scale_set(1),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_image_smooth_scale_set(o, 1);
+        efl_gfx_size_set(o, w, h);
+        efl_gfx_fill_set(o, 0, 0, w, h);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -54,12 +53,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < MANYNUM; i++)
      {
-        eo_do(o_images[i],  efl_gfx_size_get(&w, &h));
+        efl_gfx_size_get(o_images[i], &w, &h);
         x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
-        eo_do(o_images[i], efl_gfx_position_set(x, y));
+        efl_gfx_position_set(o_images[i], x, y);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_same_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_image_smooth_scale_set(0),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_image_smooth_scale_set(o, 0);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_image_smooth_scale_set(0),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_image_smooth_scale_set(o, 0);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("image.png"), NULL),
-              efl_image_smooth_scale_set(0),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("image.png"), NULL);
+        efl_image_smooth_scale_set(o, 0);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_solid_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("image.png"), NULL),
-              efl_image_smooth_scale_set(0),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("image.png"), NULL);
+        efl_image_smooth_scale_set(o, 0);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude1.c

@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -36,14 +36,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude1_few.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
+             efl_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude1_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude1_very_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude2.c

@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -36,14 +36,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude2_few.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude2_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude2_very_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude3.c

@@ -28,7 +28,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -36,14 +36,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude3_few.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude3_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_occlude3_very_many.c

@@ -31,7 +31,7 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_set(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_set(o, build_path("image.png"), NULL);
+             efl_gfx_position_set(o, x, y);
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_position_set(o_images[i], x, y);
           }
      }
    FPS_STD(NAME);

src/bin/image_blend_smooth_same_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_image_smooth_scale_set(1),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_image_smooth_scale_set(o, 1);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("logo.png"), NULL),
-              efl_image_smooth_scale_set(1),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("logo.png"), NULL);
+        efl_image_smooth_scale_set(o, 1);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("image.png"), NULL),
-              efl_image_smooth_scale_set(1),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("image.png"), NULL);
+        efl_image_smooth_scale_set(o, 1);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_solid_scaled.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("image.png"), NULL),
-              efl_image_smooth_scale_set(1),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("image.png"), NULL);
+        efl_image_smooth_scale_set(o, 1);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_border.c

@@ -25,10 +25,9 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("frame.png"), NULL),
-              evas_obj_image_border_set(8, 8, 8, 8),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_file_set(o, build_path("frame.png"), NULL);
+        evas_obj_image_border_set(o, 8, 8, 8, 8);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        eo_do(o_images[i],
-              efl_gfx_position_set(x, y),
-              efl_gfx_size_set(w, h),
-              efl_gfx_fill_set(0, 0, w, h));
+        efl_gfx_position_set(o_images[i], x, y);
+        efl_gfx_size_set(o_images[i], w, h);
+        efl_gfx_fill_set(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_fade_pow2_unscaled.c

@@ -27,15 +27,13 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        eo_do(o,
-              efl_file_set(build_path("image.png"), NULL),
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160));
+        efl_file_set(o, build_path("image.png"), NULL);
+        efl_gfx_fill_set(o, 0, 0, 120, 160);
+        efl_gfx_size_set(o, 120, 160);
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        eo_do(o,
-              efl_gfx_color_set(a, a, a, a),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_color_set(o, a, a, a, a);
+        efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -60,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], efl_gfx_position_set(x, y));
+        efl_gfx_position_set(o_images[i], x, y);
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_fade_unscaled.c

@@ -27,14 +27,12 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-