expedite: porting to Eo

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

SVN revision: 83180

src/bin/about.c

@@ -8,10 +8,10 @@ _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = evas_object_textblock_add(evas);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
-   evas_object_move(o, 10, 40);
+   eo_do(o, evas_obj_position_set(10, 40),
-   evas_object_resize(o, win_w - 20, win_h - 50);
+            evas_obj_size_set(win_w - 20, win_h - 50),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
    st = evas_textblock_style_new();
    evas_textblock_style_set
      (st,
@@ -21,12 +21,10 @@ _setup(void)
       "p='+ font=Vera font_size=10 align=left'"
       "/p='- \n \n'"
       );
-   evas_object_textblock_style_set(o, st);
+   eo_do(o, evas_obj_textblock_style_set(st),
-   evas_textblock_style_free(st);
+            evas_obj_textblock_clear(),
-   evas_object_textblock_clear(o);
+            evas_obj_textblock_text_markup_set
-   evas_object_textblock_text_markup_set
+     ("<center>"
-     (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 "
@@ -43,7 +41,8 @@ _setup(void)
       "layout descriptions that applications set up, dealing with the hard "
       "work of doing the drawing for them."
       "</center>"
-      );
+      ));
+   evas_textblock_style_free(st);
    o_text = o;
    ui_fps(0.0);
 }
@@ -51,7 +50,7 @@ _setup(void)
 static void
 _cleanup(void)
 {
-   evas_object_del(o_text);
+   eo_del(o_text);
    o_text = NULL;
 }
 

src/bin/filter_object_blur.c

@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_BLUR);
+        evas_object_filter_set(o, EVAS_FILTER_BLUR);
-	evas_object_filter_param_int_set(o, "radius", 3);
+        evas_object_filter_param_int_set(o, "radius", 3);
-	evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_blur_solid.c

@@ -24,16 +24,16 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_BLUR);
+        evas_object_filter_set(o, EVAS_FILTER_BLUR);
-	evas_object_filter_param_int_set(o, "radius", 5);
+        evas_object_filter_param_int_set(o, "radius", 5);
-	evas_object_layer_set(o,1);
+        eo_do(o, evas_obj_layer_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -59,7 +59,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_brightness.c

@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
+        evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
-	evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
+        evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
-	evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
 	evas_object_filter_param_float_set(o_images[i], "adjust",
 			((i + f) % OBNUM) / (2.0 * OBNUM) - 1);
      }

src/bin/filter_object_brightness_solid.c

@@ -24,17 +24,17 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
+        evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
-	evas_object_filter_param_float_set(o, "adjust",
+        evas_object_filter_param_float_set(o, "adjust",
-			i / (2.0 * OBNUM) - 1.0);
+              i / (2.0 * OBNUM) - 1.0);
-	evas_object_layer_set(o,1);
+        eo_do(o, evas_obj_layer_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -60,7 +60,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
 	evas_object_filter_param_float_set(o_images[i], "adjust",
 			(((i + f) % OBNUM) * 2.0) / (OBNUM) - 1.0);
      }

src/bin/filter_object_colors.c

@@ -29,12 +29,12 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+	         evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160));
 	evas_object_filter_set(o, filters[i % 3]);
-	evas_object_show(o);
+	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
 	src = o;
 	o_images[i] = src;
      }
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -62,7 +62,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_colors_solid.c

@@ -29,13 +29,13 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("image.png"), NULL);
+	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+	         evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160));
 	evas_object_filter_set(o, filters[i % 3]);
-	evas_object_layer_set(o,1);
+	eo_do(o, evas_obj_layer_set(1),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
 	src = o;
 	o_images[i] = src;
      }
@@ -47,7 +47,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -63,7 +63,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_greyscale.c

@@ -24,14 +24,14 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
+        evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
-	evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -57,7 +57,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_greyscale_solid.c

@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
+        evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
-	evas_object_layer_set(o,1);
+        eo_do(o, evas_obj_layer_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_invert.c

@@ -24,14 +24,14 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_INVERT);
+        evas_object_filter_set(o, EVAS_FILTER_INVERT);
-	evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -57,7 +57,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_invert_solid.c

@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_INVERT);
+        evas_object_filter_set(o, EVAS_FILTER_INVERT);
-	evas_object_layer_set(o,1);
+        eo_do(o, evas_obj_layer_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_sepia.c

@@ -24,14 +24,14 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_SEPIA);
+        evas_object_filter_set(o, EVAS_FILTER_SEPIA);
-	evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -57,7 +57,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/filter_object_sepia_solid.c

@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_filter_set(o, EVAS_FILTER_SEPIA);
+        evas_object_filter_set(o, EVAS_FILTER_SEPIA);
-	evas_object_layer_set(o,1);
+        eo_do(o, evas_obj_layer_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	src = o;
+        src = o;
-	o_images[i] = src;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_border.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("bar.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
-	evas_object_image_border_set(o, 6, 6, 6, 6);
+                 evas_obj_image_border_set(6, 6, 6, 6),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_border_recolor.c

@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("pan.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
-	evas_object_color_set(o, 64, 64, 64, 255);
+                 evas_obj_color_set(64, 64, 64, 255),
-	evas_object_image_border_set(o, 3, 3, 3, 3);
+                 evas_obj_image_border_set(3, 3, 3, 3),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_fade_pow2_unscaled.c

@@ -24,16 +24,16 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
+
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        evas_object_color_set(o, a, a, a, a);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_fade_unscaled.c

@@ -24,15 +24,14 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o = evas_object_image_add(evas);
+        o_images[i] = o;
-	o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_size_set(120, 160));
-	evas_object_resize(o, 120, 160);
         a = rnd()&0xff;
-        evas_object_color_set(o, a, a, a, a);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +40,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -52,12 +51,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_same_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 40 + ((i % 3) * (w0 / 2));
+        w = 40 + ((i % 3) * (w0 / 2));
-	h = 40 + ((i % 3) * (h0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 40 + ((i % 3) * (w0 / 2));
+        w = 40 + ((i % 3) * (w0 / 2));
-	h = 40 + ((i % 3) * (h0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_solid_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude1.c

@@ -24,22 +24,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude1_few.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
+          eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
+             eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude1_many.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude1_very_many.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i < (OBNUM / 2))
+        if (i < (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude2.c

@@ -24,22 +24,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i & 0x1)
+        if (i & 0x1)
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i & 0x1)
+        if (i & 0x1)
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude2_few.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i & 0x1)
+        if (i & 0x1)
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i & 0x1)
+        if (i & 0x1)
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude2_many.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i & 0x1)
+        if (i & 0x1)
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i & 0x1)
+        if (i & 0x1)
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude2_very_many.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i & 0x1)
+        if (i & 0x1)
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i & 0x1)
+        if (i & 0x1)
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude3.c

@@ -24,22 +24,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude3_few.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude3_many.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude3_very_many.c

@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  evas_object_image_file_set(o, build_path("logo.png"), NULL);
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
-	else
+        else
-	  {
+          {
-	     Evas_Coord x, y;
+             Evas_Coord x, y;
 
-	     evas_object_image_file_set(o, build_path("image.png"), NULL);
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
-	     x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-	     y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-	     evas_object_move(o, x, y);
+             eo_do(o, evas_obj_position_set(x, y));
-	  }
+          }
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (i > (OBNUM / 2))
+        if (i > (OBNUM / 2))
-	  {
+          {
-	     w = 120;
+             w = 120;
-	     h = 160;
+             h = 160;
-	     x = (win_w / 2) - (w / 2);
+             x = (win_w / 2) - (w / 2);
-	     x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	     y = (win_h / 2) - (h / 2);
+             y = (win_h / 2) - (h / 2);
-	     y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	     evas_object_move(o_images[i], x, y);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
-	  }
+          }
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_same_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 1);
+                 evas_obj_image_smooth_scale_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 40 + ((i % 3) * (w0 / 2));
+        w = 40 + ((i % 3) * (w0 / 2));
-	h = 40 + ((i % 3) * (h0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 1);
+                 evas_obj_image_smooth_scale_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 1);
+                 evas_obj_image_smooth_scale_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 40 + ((i % 3) * (w0 / 2));
+        w = 40 + ((i % 3) * (w0 / 2));
-	h = 40 + ((i % 3) * (h0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_solid_scaled.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_smooth_scale_set(o, 1);
+                 evas_obj_image_smooth_scale_set(1),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_border.c

@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("frame.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
-	evas_object_image_border_set(o, 8, 8, 8, 8);
+                 evas_obj_image_border_set(8, 8, 8, 8),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_fade_pow2_unscaled.c

@@ -24,16 +24,16 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
+
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        evas_object_color_set(o, a, a, a, a);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_fade_unscaled.c

@@ -24,15 +24,15 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
+
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        evas_object_color_set(o, a, a, a, a);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -52,12 +52,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_middle_border.c

@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("bar.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
-	evas_object_image_border_set(o, 6, 6, 6, 6);
+                 evas_obj_image_border_set(6, 6, 6, 6),
-        evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+                 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-	h0 = 80;
+        h0 = 80;
-	w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-	h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_middle_unscaled.c

@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_border_set(o, 43, 48, 48, 83);
+                 evas_obj_image_border_set(43, 48, 48, 83),
-        evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+                 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -50,12 +50,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_unscaled.c

@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_unscaled.c

@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_crossfade.c

@@ -22,19 +22,19 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_images[0] = o;
-   evas_object_image_file_set(o, build_path("im1.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
 
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_images[1] = o;
-   evas_object_image_file_set(o, build_path("im2.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 2; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 2; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,7 +53,7 @@ static void _loop(double t, int f)
 
    a = f & 0x1f;
    a = ((a << 3) | (a >> 2)) & 0xff;
-   evas_object_color_set(o_images[1], a, a, a, a);
+   eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
    FPS_STD(NAME);
 }
 

src/bin/image_data_argb.c

@@ -24,15 +24,15 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-	evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
-	evas_object_image_size_set(o, 640, 480);
+                 evas_obj_image_size_set(640, 480),
-	evas_object_image_alpha_set(o, 0);
+                 evas_obj_image_alpha_set(0),
-	evas_object_image_fill_set(o, 0, 0, 640, 480);
+                 evas_obj_image_fill_set(0, 0, 640, 480),
-	evas_object_resize(o, 640, 480);
+                 evas_obj_size_set(640, 480),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,29 +51,30 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
-	unsigned int *data, *p;
+        unsigned int *data, *p;
 
         w = 640;
-	h = 480;
+        h = 480;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h),
-	data = evas_object_image_data_get(o_images[i], 1);
+                           evas_obj_image_data_get(1, (void **) &data),
-        st = evas_object_image_stride_get(o_images[i]) >> 2;
+                           evas_obj_image_stride_get(&st));
-	p = data;
+        st = st >> 2;
-	for (y = 0; y < h; y++)
+        p = data;
-	  {
+        for (y = 0; y < h; y++)
-	     for (x = 0; x < w; x++)
+          {
-	       {
+             for (x = 0; x < w; x++)
-		  *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
+               {
-		  p++;
+                  *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
-	       }
+                  p++;
+               }
              p += (st - w);
-	  }
+          }
-	evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data),
-	evas_object_image_data_update_add(o_images[i], 0, 0, w, h);
+                           evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_data_argb_alpha.c

@@ -24,15 +24,15 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
-	evas_object_image_size_set(o, 640, 480);
+                 evas_obj_image_size_set(640, 480),
-	evas_object_image_alpha_set(o, 1);
+                 evas_obj_image_alpha_set(1),
-	evas_object_image_fill_set(o, 0, 0, 640, 480);
+                 evas_obj_image_fill_set(0, 0, 640, 480),
-	evas_object_resize(o, 640, 480);
+                 evas_obj_size_set(640, 480),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,40 +51,41 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
-	unsigned int *data, *p;
+        unsigned int *data, *p;
-	int a, r, g, b;
+        int a, r, g, b;
         w = 640;
-	h = 480;
+        h = 480;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h),
-	data = evas_object_image_data_get(o_images[i], 1);
+                           evas_obj_image_data_get(1, (void **) &data),
-        st = evas_object_image_stride_get(o_images[i]) >> 2;
+                           evas_obj_image_stride_get(&st));
-	p = data;
+        st = st >> 2;
-	for (y = 0; y < h; y++)
+        p = data;
-	  {
+        for (y = 0; y < h; y++)
-	     for (x = 0; x < w; x++)
+          {
-	       {
+             for (x = 0; x < w; x++)
-		  r = (x * y / 7) + f;
+               {
-		  g = (x / 2);
+                  r = (x * y / 7) + f;
-		  b = (y / 2);
+                  g = (x / 2);
-		  a = (x + y);
+                  b = (y / 2);
-		  r &= 0xff;
+                  a = (x + y);
-		  g &= 0xff;
+                  r &= 0xff;
-		  b &= 0xff;
+                  g &= 0xff;
-		  a &= 0xff;
+                  b &= 0xff;
-		  r = (a * r) / 255;
+                  a &= 0xff;
-		  g = (a * g) / 255;
+                  r = (a * r) / 255;
-		  b = (a * b) / 255;
+                  g = (a * g) / 255;
-		  *p = (a << 24) | (r << 16) | (g << 8) | b;
+                  b = (a * b) / 255;
-		  p++;
+                  *p = (a << 24) | (r << 16) | (g << 8) | b;
-	       }
+                  p++;
+               }
              p += (st - w);
-	  }
+          }
-	evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data),
-	evas_object_image_data_update_add(o_images[i], 0, 0, w, h);
+                           evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_data_ycbcr601pl.c

@@ -28,44 +28,44 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-	evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-	evas_object_image_size_set(o, 640, 480);
+                 evas_obj_image_size_set(640, 480),
-	evas_object_image_alpha_set(o, 0);
+                 evas_obj_image_alpha_set(0),
-	evas_object_image_fill_set(o, 0, 0, 640, 480);
+                 evas_obj_image_fill_set(0, 0, 640, 480),
-	evas_object_resize(o, 640, 480);
+                 evas_obj_size_set(640, 480),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	yp = malloc(640 * 480);
+        yp = malloc(640 * 480);
-	up = malloc(320 * 240);
+        up = malloc(320 * 240);
-	vp = malloc(320 * 240);
+        vp = malloc(320 * 240);
-	f = fopen(build_path("tp.yuv"), "rb");
+        f = fopen(build_path("tp.yuv"), "rb");
-	if (f)
+        if (f)
-	  {
+          {
-	     r = fread(yp, 640 * 480, 1, f);
+             r = fread(yp, 640 * 480, 1, f);
-	     r = fread(up, 320 * 240, 1, f);
+             r = fread(up, 320 * 240, 1, f);
-	     r = fread(vp, 320 * 240, 1, f);
+             r = fread(vp, 320 * 240, 1, f);
-	     fclose(f);
+             fclose(f);
-	  }
+          }
-	data = evas_object_image_data_get(o_images[i], 1);
+        data = evas_object_image_data_get(o_images[i], 1);
-	lp = data;
+        lp = data;
-	for (y = 0; y < 480; y++)
+        for (y = 0; y < 480; y++)
-	  {
+          {
-	     *lp = yp + (y * 640);
+             *lp = yp + (y * 640);
-	     lp++;
+             lp++;
-	  }
+          }
-	for (y = 0; y < 240; y++)
+        for (y = 0; y < 240; y++)
-	  {
+          {
-	     *lp = up + (y * 320);
+             *lp = up + (y * 320);
-	     lp++;
+             lp++;
-	  }
+          }
-	for (y = 0; y < 240; y++)
+        for (y = 0; y < 240; y++)
-	  {
+          {
-	     *lp = vp + (y * 320);
+             *lp = vp + (y * 320);
-	     lp++;
+             lp++;
-	  }
+          }
-	evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -88,13 +88,13 @@ static void _loop(double t, int f)
    for (i = 0; i < 1; i++)
      {
         w = 640;
-	h = 480;
+        h = 480;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
-	evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h),
-	evas_object_image_data_update_add(o_images[i], 0, 0, 640, 480);
+                           evas_obj_image_data_update_add( 0, 0, 640, 480));
      }
    FPS_STD(NAME);
 }

src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c

@@ -28,16 +28,16 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-        evas_object_image_size_set(o, 640, 480);
+                 evas_obj_image_size_set(640, 480),
-        evas_object_image_alpha_set(o, 0);
+                 evas_obj_image_alpha_set(0),
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
+                 evas_obj_image_fill_set(0, 0, 640, 480),
-        evas_object_resize(o, 640, 480);
+                 evas_obj_size_set(640, 480),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
@@ -66,7 +66,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -100,8 +100,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_data_ycbcr601pl_map_solid_rotate.c

@@ -28,15 +28,15 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-        evas_object_image_size_set(o, 640, 480);
+                 evas_obj_image_size_set(640, 480),
-        evas_object_image_alpha_set(o, 0);
+                 evas_obj_image_alpha_set(0),
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
+                 evas_obj_image_fill_set(0, 0, 640, 480),
-        evas_object_resize(o, 640, 480);
+                 evas_obj_size_set(640, 480),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
@@ -65,7 +65,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -98,8 +98,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_data_ycbcr601pl_wide_stride.c

@@ -28,48 +28,48 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-	evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-	evas_object_image_size_set(o, 320, 480);
+                 evas_obj_image_size_set(320, 480),
-	evas_object_image_alpha_set(o, 0);
+                 evas_obj_image_alpha_set(0),
-	evas_object_image_fill_set(o, 0, 0, 640, 480);
+                 evas_obj_image_fill_set(0, 0, 640, 480),
-	evas_object_resize(o, 640, 480);
+                 evas_obj_size_set(640, 480),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	yp = malloc(640 * 480);
+        yp = malloc(640 * 480);
-	up = malloc(320 * 240);
+        up = malloc(320 * 240);
-	vp = malloc(320 * 240);
+        vp = malloc(320 * 240);
-	f = fopen(build_path("tp.yuv"), "rb");
+        f = fopen(build_path("tp.yuv"), "rb");
-	if (f)
+        if (f)
-	  {
+          {
-	     r = fread(yp, 640 * 480, 1, f);
+             r = fread(yp, 640 * 480, 1, f);
-	     r = fread(up, 320 * 240, 1, f);
+             r = fread(up, 320 * 240, 1, f);
-	     r = fread(vp, 320 * 240, 1, f);
+             r = fread(vp, 320 * 240, 1, f);
-	     fclose(f);
+             fclose(f);
-	  }
+          }
-	data = evas_object_image_data_get(o_images[i], 1);
+        data = evas_object_image_data_get(o_images[i], 1);
-	if (data)
+        if (data)
-	  {
+          {
-	     lp = data;
+             lp = data;
-	     for (y = 0; y < 480; y++)
+             for (y = 0; y < 480; y++)
-	       {
+               {
-		  *lp = yp + (y * 640);
+                  *lp = yp + (y * 640);
-		  lp++;
+                  lp++;
-	       }
+               }
-	     for (y = 0; y < 240; y++)
+             for (y = 0; y < 240; y++)
-	       {
+               {
-		  *lp = up + (y * 320);
+                  *lp = up + (y * 320);
-		  lp++;
+                  lp++;
-	       }
+               }
-	     for (y = 0; y < 240; y++)
+             for (y = 0; y < 240; y++)
-	       {
+               {
-		  *lp = vp + (y * 320);
+                  *lp = vp + (y * 320);
-		  lp++;
+                  lp++;
-	       }
+               }
-	     evas_object_image_data_set(o_images[i], data);
+             eo_do(o_images[i], evas_obj_image_data_set(data),
-	     evas_object_image_data_update_add(o_images[i], 0, 0, 320, 480);
+                                evas_obj_image_data_update_add( 0, 0, 320, 480));
-	  }
+          }
      }
    done = 0;
 }
@@ -78,7 +78,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -97,9 +97,9 @@ static void _loop(double t, int f)
 	h = 480;
 	x = (win_w / 2) - (w / 2);
 	y = (win_h / 2) - (h / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
-	evas_object_resize(o_images[i], w, h);
+	eo_do(o_images[i], evas_obj_size_set(w, h));
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+	eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
 
 	w = 320 - 16 + f;
 	if (w < 1) w = 1;
@@ -107,7 +107,7 @@ static void _loop(double t, int f)
 
 	w &= ~0x1;
 
-	evas_object_image_size_set(o_images[i], w, 480);
+	eo_do(o_images[i], evas_obj_image_size_set(w, 480));
 	data = evas_object_image_data_get(o_images[i], 1);
 	if (data)
 	  {
@@ -127,8 +127,8 @@ static void _loop(double t, int f)
 		  *lp = vp + (y * 320);
 		  lp++;
 	       }
-	     evas_object_image_data_set(o_images[i], data);
+	     eo_do(o_images[i], evas_obj_image_data_set(data));
-	     evas_object_image_data_update_add(o_images[i], 0, 0, w, 480);
+	     eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
 	  }
      }
    FPS_STD(NAME);

src/bin/image_map_3d_1.c

@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-        evas_object_image_fill_set(o, 0, 0, 256, 256);
+                 evas_obj_image_fill_set(0, 0, 256, 256),
-        evas_object_resize(o, 256, 256);
+                 evas_obj_size_set(256, 256),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 256,   0);
    POINT(1, 2,  w,  h,  d, 256, 256);
    POINT(1, 3,  w,  h, -d,   0, 256);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 256,   0);
    POINT(2, 2, -w,  h,  d, 256, 256);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 256,   0);
    POINT(3, 2, -w,  h, -d, 256, 256);
    POINT(3, 3, -w,  h,  d,   0, 256);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 256,   0);
    POINT(4, 2,  w, -h, -d, 256, 256);
    POINT(4, 3, -w, -h, -d,   0, 256);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 256,   0);
    POINT(5, 2,  w,  h,  d, 256, 256);
    POINT(5, 3, -w,  h,  d,   0, 256);
-   
+
    return c;
 }
 
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
+                                      c->side[i].pt[j].x + x,
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
                                       c->side[i].pt[j].u,
@@ -130,13 +130,13 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             evas_object_map_enable_set(c->side[i].o, 1);
+             eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-             evas_object_map_set(c->side[i].o, m);
+                                 evas_obj_map_set(m),
-             evas_object_show(c->side[i].o);
+                                 evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          evas_object_hide(c->side[i].o);
+          eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -159,17 +159,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_2.c

@@ -54,13 +54,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-        evas_object_image_fill_set(o, 0, 0, 256, 256);
+                 evas_obj_image_fill_set(0, 0, 256, 256),
-        evas_object_resize(o, 256, 256);
+                 evas_obj_size_set(256, 256),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -71,7 +71,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 256,   0);
    POINT(1, 2,  w,  h,  d, 256, 256);
    POINT(1, 3,  w,  h, -d,   0, 256);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 256,   0);
    POINT(2, 2, -w,  h,  d, 256, 256);
@@ -81,17 +81,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 256,   0);
    POINT(3, 2, -w,  h, -d, 256, 256);
    POINT(3, 3, -w,  h,  d,   0, 256);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 256,   0);
    POINT(4, 2,  w, -h, -d, 256, 256);
    POINT(4, 3, -w, -h, -d,   0, 256);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 256,   0);
    POINT(5, 2,  w,  h,  d, 256, 256);
    POINT(5, 3, -w,  h,  d,   0, 256);
-   
+
    return c;
 }
 
@@ -103,18 +103,18 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
+                                      c->side[i].pt[j].x + x,
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
                                       c->side[i].pt[j].u,
@@ -128,13 +128,13 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             evas_object_map_enable_set(c->side[i].o, 1);
+             eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-             evas_object_map_set(c->side[i].o, m);
+                                 evas_obj_map_set(m),
-             evas_object_show(c->side[i].o);
+                                 evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          evas_object_hide(c->side[i].o);
+          eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -157,17 +157,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
@@ -196,20 +196,20 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   _cube_pos(cubes[0], 
+   _cube_pos(cubes[0],
              (win_w / 2) - 640, (win_h / 2) - 256, 512,
              f / 2.0, f, f / 3.0);
-   _cube_pos(cubes[1], 
+   _cube_pos(cubes[1],
              (win_w / 2) + 512, (win_h / 2) - 128, 384,
              f / 3.0, f / 2.0, f / 4.0);
-   _cube_pos(cubes[2], 
+   _cube_pos(cubes[2],
-             (win_w / 2) - 384, (win_h / 2) + 128, 256, 
+             (win_w / 2) - 384, (win_h / 2) + 128, 256,
              f / 2.0, f / 3.0, f);
-   _cube_pos(cubes[3], 
+   _cube_pos(cubes[3],
-             (win_w / 2) + 256, (win_h / 2) + 64, 128, 
+             (win_w / 2) + 256, (win_h / 2) + 64, 128,
              f, f / 5.0, f / 2.0);
-   _cube_pos(cubes[4], 
+   _cube_pos(cubes[4],
-             (win_w / 2), (win_h / 2), 0, 
+             (win_w / 2), (win_h / 2), 0,
              f / 4.0, f / 3.0, f / 5.0);
    FPS_STD(NAME);
 }

src/bin/image_map_3d_3.c

@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-        evas_object_image_fill_set(o, 0, 0, 256, 256);
+                 evas_obj_image_fill_set(0, 0, 256, 256),
-        evas_object_resize(o, 256, 256);
+                 evas_obj_size_set(256, 256),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 256,   0);
    POINT(1, 2,  w,  h,  d, 256, 256);
    POINT(1, 3,  w,  h, -d,   0, 256);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 256,   0);
    POINT(2, 2, -w,  h,  d, 256, 256);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 256,   0);
    POINT(3, 2, -w,  h, -d, 256, 256);
    POINT(3, 3, -w,  h,  d,   0, 256);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 256,   0);
    POINT(4, 2,  w, -h, -d, 256, 256);
    POINT(4, 3, -w, -h, -d,   0, 256);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 256,   0);
    POINT(5, 2,  w,  h,  d, 256, 256);
    POINT(5, 3, -w,  h,  d,   0, 256);
-   
+
    return c;
 }
 
@@ -104,23 +104,23 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
+                                      c->side[i].pt[j].x + x,
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
-                                      c->side[i].pt[j].u,
+                                         c->side[i].pt[j].u,
-                                      c->side[i].pt[j].v);
+                                         c->side[i].pt[j].v);
              evas_map_point_color_set(m, j, 255, 255, 255, 128);
           }
         evas_map_util_3d_rotate(m, dx, dy, dz, x, y, z);
@@ -128,9 +128,9 @@ _cube_pos(Cube *c,
                                   255, 255, 255,
                                   20, 20, 20);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
-        evas_object_map_enable_set(c->side[i].o, 1);
+        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-        evas_object_map_set(c->side[i].o, m);
+                            evas_obj_map_set(m));
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -153,17 +153,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
@@ -192,20 +192,20 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   _cube_pos(cubes[0], 
+   _cube_pos(cubes[0],
              (win_w / 2) - 640, (win_h / 2) - 256, 512,
              f / 2.0, f, f / 3.0);
-   _cube_pos(cubes[1], 
+   _cube_pos(cubes[1],
              (win_w / 2) + 512, (win_h / 2) - 128, 384,
              f / 3.0, f / 2.0, f / 4.0);
-   _cube_pos(cubes[2], 
+   _cube_pos(cubes[2],
-             (win_w / 2) - 384, (win_h / 2) + 128, 256, 
+             (win_w / 2) - 384, (win_h / 2) + 128, 256,
              f / 2.0, f / 3.0, f);
-   _cube_pos(cubes[3], 
+   _cube_pos(cubes[3],
-             (win_w / 2) + 256, (win_h / 2) + 64, 128, 
+             (win_w / 2) + 256, (win_h / 2) + 64, 128,
              f, f / 5.0, f / 2.0);
-   _cube_pos(cubes[4], 
+   _cube_pos(cubes[4],
-             (win_w / 2), (win_h / 2), 0, 
+             (win_w / 2), (win_h / 2), 0,
              f / 4.0, f / 3.0, f / 5.0);
    FPS_STD(NAME);
 }

src/bin/image_map_3d_4.c

@@ -54,13 +54,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-        evas_object_image_fill_set(o, 0, 0, 256, 256);
+                 evas_obj_image_fill_set(0, 0, 256, 256),
-        evas_object_resize(o, 256, 256);
+                 evas_obj_size_set(256, 256),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -71,7 +71,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 256,   0);
    POINT(1, 2,  w,  h,  d, 256, 256);
    POINT(1, 3,  w,  h, -d,   0, 256);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 256,   0);
    POINT(2, 2, -w,  h,  d, 256, 256);
@@ -81,17 +81,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 256,   0);
    POINT(3, 2, -w,  h, -d, 256, 256);
    POINT(3, 3, -w,  h,  d,   0, 256);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 256,   0);
    POINT(4, 2,  w, -h, -d, 256, 256);
    POINT(4, 3, -w, -h, -d,   0, 256);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 256,   0);
    POINT(5, 2,  w,  h,  d, 256, 256);
    POINT(5, 3, -w,  h,  d,   0, 256);
-   
+
    return c;
 }
 
@@ -103,22 +103,22 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
+                                      c->side[i].pt[j].x + x,
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
-                                      c->side[i].pt[j].u,
+                                         c->side[i].pt[j].u,
-                                      c->side[i].pt[j].v);
+                                         c->side[i].pt[j].v);
              evas_map_point_color_set(m, j, 255, 255, 255, 128);
           }
         evas_map_util_3d_rotate(m, dx, dy, dz, x, y, z);
@@ -126,9 +126,9 @@ _cube_pos(Cube *c,
                                   255, 255, 255,
                                   20, 20, 20);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
-        evas_object_map_enable_set(c->side[i].o, 1);
+        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-        evas_object_map_set(c->side[i].o, m);
+              evas_obj_map_set(m));
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -151,17 +151,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
@@ -190,20 +190,20 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   _cube_pos(cubes[0], 
+   _cube_pos(cubes[0],
              (win_w / 2) - 640, (win_h / 2) - 256, 512,
              f / 2.0, f, f / 3.0);
-   _cube_pos(cubes[1], 
+   _cube_pos(cubes[1],
              (win_w / 2) + 512, (win_h / 2) - 128, 384,
              f / 3.0, f / 2.0, f / 4.0);
-   _cube_pos(cubes[2], 
+   _cube_pos(cubes[2],
-             (win_w / 2) - 384, (win_h / 2) + 128, 256, 
+             (win_w / 2) - 384, (win_h / 2) + 128, 256,
              f / 2.0, f / 3.0, f);
-   _cube_pos(cubes[3], 
+   _cube_pos(cubes[3],
-             (win_w / 2) + 256, (win_h / 2) + 64, 128, 
+             (win_w / 2) + 256, (win_h / 2) + 64, 128,
              f, f / 5.0, f / 2.0);
-   _cube_pos(cubes[4], 
+   _cube_pos(cubes[4],
-             (win_w / 2), (win_h / 2), 0, 
+             (win_w / 2), (win_h / 2), 0,
              f / 4.0, f / 3.0, f / 5.0);
    FPS_STD(NAME);
 }

src/bin/image_map_3d_5.c

@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-        evas_object_image_fill_set(o, 0, 0, 720, 420);
+                 evas_obj_image_fill_set(0, 0, 720, 420),
-        evas_object_resize(o, 720, 420);
+                 evas_obj_size_set(720, 420),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 720,   0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 720,   0);
    POINT(1, 2,  w,  h,  d, 720, 420);
    POINT(1, 3,  w,  h, -d,   0, 420);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 720,   0);
    POINT(2, 2, -w,  h,  d, 720, 420);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 720,   0);
    POINT(3, 2, -w,  h, -d, 720, 420);
    POINT(3, 3, -w,  h,  d,   0, 420);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 720,   0);
    POINT(4, 2,  w, -h, -d, 720, 420);
    POINT(4, 3, -w, -h, -d,   0, 420);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 720,   0);
    POINT(5, 2,  w,  h,  d, 720, 420);
    POINT(5, 3, -w,  h,  d,   0, 420);
-   
+
    return c;
 }
 
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
+                                      c->side[i].pt[j].x + x,
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
                                       c->side[i].pt[j].u,
@@ -130,13 +130,13 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
         if (evas_map_util_clockwise_get(m))
           {
-             evas_object_map_enable_set(c->side[i].o, 1);
+             eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-             evas_object_map_set(c->side[i].o, m);
+                                 evas_obj_map_set(m),
-             evas_object_show(c->side[i].o);
+                                 evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          evas_object_hide(c->side[i].o);
+          eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -159,17 +159,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
@@ -190,8 +190,8 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   _cube_pos(cubes[0], 
+   _cube_pos(cubes[0],
-             (win_w / 2), (win_h / 2), 0, 
+             (win_w / 2), (win_h / 2), 0,
              0, f, 0);
    FPS_STD(NAME);
 }

src/bin/image_map_3d_6.c

@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-        evas_object_image_fill_set(o, 0, 0, 720, 420);
+                 evas_obj_image_fill_set(0, 0, 720, 420),
-        evas_object_resize(o, 720, 420);
+                 evas_obj_size_set(720, 420),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 720,   0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 720,   0);
    POINT(1, 2,  w,  h,  d, 720, 420);
    POINT(1, 3,  w,  h, -d,   0, 420);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 720,   0);
    POINT(2, 2, -w,  h,  d, 720, 420);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 720,   0);
    POINT(3, 2, -w,  h, -d, 720, 420);
    POINT(3, 3, -w,  h,  d,   0, 420);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 720,   0);
    POINT(4, 2,  w, -h, -d, 720, 420);
    POINT(4, 3, -w, -h, -d,   0, 420);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 720,   0);
    POINT(5, 2,  w,  h,  d, 720, 420);
    POINT(5, 3, -w,  h,  d,   0, 420);
-   
+
    return c;
 }
 
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
+                                      c->side[i].pt[j].x + x,
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
                                       c->side[i].pt[j].u,
@@ -127,13 +127,13 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
         if (evas_map_util_clockwise_get(m))
           {
-             evas_object_map_enable_set(c->side[i].o, 1);
+             eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-             evas_object_map_set(c->side[i].o, m);
+                                 evas_obj_map_set(m),
-             evas_object_show(c->side[i].o);
+                                 evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          evas_object_hide(c->side[i].o);
+          eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -156,17 +156,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
@@ -187,8 +187,8 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   _cube_pos(cubes[0], 
+   _cube_pos(cubes[0],
-             (win_w / 2), (win_h / 2), 0, 
+             (win_w / 2), (win_h / 2), 0,
              0, f, 0);
    FPS_STD(NAME);
 }

src/bin/image_map_3d_flow.c

@@ -28,24 +28,24 @@ static void _setup(void)
    for (i = 0; i < CNUM; i++)
      {
         char buf[256];
-        
+
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-	evas_object_image_fill_set(o, 0, 0, 256, 256);
+                 evas_obj_image_fill_set(0, 0, 256, 256),
-	evas_object_resize(o, 256, 256);
+                 evas_obj_size_set(256, 256),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-        
+
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_reflec[i] = o;
+        o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-	evas_object_image_fill_set(o, 0, 0, 256, 256);
+                 evas_obj_image_fill_set(0, 0, 256, 256),
-	evas_object_resize(o, 256, 256);
+                 evas_obj_size_set(256, 256),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -54,8 +54,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < CNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < CNUM; i++) eo_del(o_images[i]);
-   for (i = 0; i < CNUM; i++) evas_object_del(o_reflec[i]);
+   for (i = 0; i < CNUM; i++) eo_del(o_reflec[i]);
 }
 
 /* loop - do things */
@@ -114,73 +114,73 @@ static void _loop(double t, int f)
              if (z < 0) z = -z;
              z = (w / 2) - z;
           }
-        
+
         x += c;
-        
+
         x -= (w / 2);
         xx = x + w;
 
         y -= (h / 2);
         yy = y + h;
-        
+
         if (c <= 0)
           {
-             evas_object_raise(o_images[i]);
+             eo_do(o_images[i], evas_obj_raise());
-             evas_object_raise(o_reflec[i]);
+             eo_do(o_reflec[i], evas_obj_raise());
           }
         else
           {
-             evas_object_lower(o_images[i]);
+             eo_do(o_images[i], evas_obj_lower());
-             evas_object_lower(o_reflec[i]);
+             eo_do(o_reflec[i], evas_obj_lower());
           }
-        
+
         evas_map_point_coord_set   (m, 0, x, y, -z);
         evas_map_point_image_uv_set(m, 0, 0, 0);
         evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
+
         evas_map_point_coord_set   (m, 1, xx, y, -z);
         evas_map_point_image_uv_set(m, 1, 256, 0);
         evas_map_point_color_set   (m, 1, 255, 255, 255, 255);
-        
+
         evas_map_point_coord_set   (m, 2, xx, yy, -z);
         evas_map_point_image_uv_set(m, 2, 256, 256);
         evas_map_point_color_set   (m, 2, 255, 255, 255, 255);
-        
+
         evas_map_point_coord_set   (m, 3, x, yy, -z);
         evas_map_point_image_uv_set(m, 3, 0, 256);
         evas_map_point_color_set   (m, 3, 255, 255, 255, 255);
-        
+
-        evas_map_util_3d_rotate(m, 0, ang, 0, 
+        evas_map_util_3d_rotate(m, 0, ang, 0,
                                 x + (w / 2), y + (h / 2), 0);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
-        
+
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
 
         evas_map_point_coord_set   (m, 0, x, yy, -z);
         evas_map_point_image_uv_set(m, 0, 0, 256);
         evas_map_point_color_set   (m, 0, 128, 128, 128, 128);
-        
+
         evas_map_point_coord_set   (m, 1, xx, yy, -z);
         evas_map_point_image_uv_set(m, 1, 256, 256);
         evas_map_point_color_set   (m, 1, 128, 128, 128, 128);
-        
+
         evas_map_point_coord_set   (m, 2, xx, yy + h, -z);
         evas_map_point_image_uv_set(m, 2, 256, 0);
         evas_map_point_color_set   (m, 2, 0, 0, 0, 0);
-        
+
         evas_map_point_coord_set   (m, 3, x, yy + h, -z);
         evas_map_point_image_uv_set(m, 3, 0, 0);
         evas_map_point_color_set   (m, 3, 0, 0, 0, 0);
-        
+
-        evas_map_util_3d_rotate(m, 0, ang, 0, 
+        evas_map_util_3d_rotate(m, 0, ang, 0,
                                 x + (w / 2), y + (h / 2), 0);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
-        
+
-        evas_object_map_enable_set(o_reflec[i], 1);
+        eo_do(o_reflec[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_reflec[i], m);
+              evas_obj_map_set(m));
      }
-   
+
    FPS_STD(NAME);
 }
 

src/bin/image_map_color_alpha_nearest_rotate.c

@@ -24,13 +24,13 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_alpha_nearest_solid_rotate.c

@@ -24,13 +24,13 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,13 +53,13 @@ static void _loop(double t, int f)
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
 
-	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+        evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
 
         evas_map_point_color_set(m, 0, 255, 255, 255, 255);
         evas_map_point_color_set(m, 1, 255, 0, 0, 255);
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_alpha_rotate.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,13 +51,13 @@ static void _loop(double t, int f)
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
 
-	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+        evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
 
         evas_map_point_color_set(m, 0, 255, 255, 255, 255);
         evas_map_point_color_set(m, 1, 255, 0, 0, 255);
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_alpha_solid_rotate.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -65,8 +65,8 @@ static void _loop(double t, int f)
         evas_map_point_color_set(m, 3, 0, 0, 0, 0);
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_nearest_rotate.c

@@ -24,13 +24,13 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_nearest_solid_rotate.c

@@ -24,13 +24,13 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_rotate.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_color_solid_rotate.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,13 +51,13 @@ static void _loop(double t, int f)
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
 
-	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+        evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
 
         evas_map_point_color_set(m, 0, 255, 255, 255, 255);
         evas_map_point_color_set(m, 1, 255, 0, 0, 255);
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_nearest_rotate.c

@@ -24,13 +24,13 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,18 +53,18 @@ static void _loop(double t, int f)
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
 
-	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+        evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_nearest_solid_rotate.c

@@ -24,13 +24,13 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+              evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+              evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+              evas_obj_image_smooth_scale_set(0),
-	evas_object_show(o);
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,18 +53,18 @@ static void _loop(double t, int f)
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
 
-	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+        evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_rotate.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+              evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+              evas_obj_size_set(120, 160),
-	evas_object_show(o);
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,18 +51,18 @@ static void _loop(double t, int f)
    for (i = 0; i < (OBNUM / 2); i++)
      {
         w = 120;
-	h = 160;
+        h = 160;
-	x = (win_w / 2) - (w / 2);
+        x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-	y = (win_h / 2) - (h / 2);
+        y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
 
-	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+        evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_map_solid_rotate.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); 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("image.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+	         evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask.c

@@ -23,20 +23,20 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-	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("image.png"), NULL);
+	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+	         evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
 
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_images[i + 1] = o;
-	evas_object_image_file_set(o, build_path("e-logo.png"), NULL);
+	eo_do(o, evas_obj_image_file_set(build_path("e-logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+	         evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
-	evas_object_clip_set(o_images[i],o);
+	eo_do(o_images[i], evas_obj_clip_set(o));
      }
    done = 0;
 }
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,8 +61,8 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
-	evas_object_move(o_images[i + 1], x, y);
+	eo_do(o_images[i + 1], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_10.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("texture.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, win_w * 4, win_h * 4);
+                 evas_obj_image_fill_set(0, 0, win_w * 4, win_h * 4),
-	evas_object_resize(o, win_w * 4, win_h * 4);
+                 evas_obj_size_set(win_w * 4, win_h * 4),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -65,12 +65,12 @@ static void _loop(double t, int f)
 	h = win_h * 4;
 	x = (win_w / 2) - (w / 2);
 	y = (win_h / 2) - (h / 2);
-        evas_map_util_points_populate_from_geometry(m, 
+        evas_map_util_points_populate_from_geometry(m,
                                                     -win_w, -win_h,
                                                     win_w * 4, win_h * 4, 0);
         evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
-        evas_object_map_enable_set(o_images[i], 1);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
-        evas_object_map_set(o_images[i], m);
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_11.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -66,7 +66,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    if (!m) m = evas_map_new(4);
    evas_map_util_points_populate_from_geometry(m,
@@ -74,8 +74,8 @@ static void _loop(double t, int f)
                                                (win_h - 420) / 2,
                                                720, 420, 0);
    evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
-   evas_object_map_enable_set(o_mask, 1);
+   eo_do(o_mask, evas_obj_map_enable_set(1),
-   evas_object_map_set(o_mask, m);
+                 evas_obj_map_set(m));
    FPS_STD(NAME);
 }
 

src/bin/image_mask_12.c

@@ -22,21 +22,21 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_text_add(evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
    o_mask = o;
-   evas_object_text_font_set(o, "Vera-Bold", 150);
+   eo_do(o, evas_obj_text_font_set("Vera-Bold", 150),
-   evas_object_show(o);
+         evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("texture.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 500, 444);
+                 evas_obj_image_fill_set(0, 0, 500, 444),
-	evas_object_resize(o, win_w * 4, win_h * 4);
+                 evas_obj_size_set(win_w * 4, win_h * 4));
-//	evas_object_clip_set(o, o_mask);
+        //	eo_do(o, evas_obj_clip_set(o_mask));
-	evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -45,8 +45,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -67,12 +67,12 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
-   evas_object_text_text_set(o_mask, strs[rnd() % (sizeof(strs) / sizeof(char *))]);
+   eo_do(o_mask, evas_obj_text_text_set(strs[rnd() % (sizeof(strs) / sizeof(char *))]),
-   evas_object_color_set(o_mask, 255, 255, 255, 255);
+                 evas_obj_color_set(255, 255, 255, 255),
-   evas_object_geometry_get(o_mask, NULL, NULL, &w, &h);
+                 evas_obj_size_get(&w, &h),
-   evas_object_move(o_mask, (win_w - w) / 2, (win_h - h) / 2);
+                 evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2));
    FPS_STD(NAME);
 }
 

src/bin/image_mask_13.c

@@ -22,21 +22,21 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_text_add(evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
    o_mask = o;
-   evas_object_text_font_set(o, "Vera-Bold", 150);
+   eo_do(o, evas_obj_text_font_set("Vera-Bold", 150),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; 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("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-        evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask));
      }
    done = 0;
 }
@@ -45,8 +45,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -67,12 +67,12 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
-   evas_object_text_text_set(o_mask, strs[rnd() % (sizeof(strs) / sizeof(char *))]);
+   eo_do(o_mask, evas_obj_text_text_set(strs[rnd() % (sizeof(strs) / sizeof(char *))]),
-   evas_object_color_set(o_mask, 255, 255, 255, 255);
+                 evas_obj_color_set(255, 255, 255, 255),
-   evas_object_geometry_get(o_mask, NULL, NULL, &w, &h);
+                 evas_obj_size_get(&w, &h),
-   evas_object_move(o_mask, (win_w - w) / 2, (win_h - h) / 2);
+                 evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2));
    FPS_STD(NAME);
 }
 

src/bin/image_mask_14.c

@@ -22,25 +22,25 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 1);
+                 evas_obj_image_smooth_scale_set(1),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -68,9 +68,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);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-        evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_15.c

@@ -22,25 +22,25 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-        evas_object_image_smooth_scale_set(o, 0);
+                 evas_obj_image_smooth_scale_set(0),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -68,9 +68,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);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
-        evas_object_resize(o_images[i], w, h);
+                           evas_obj_size_set(w, h),
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_2.c

@@ -23,20 +23,20 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("e-logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("e-logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
 
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i + 1] = o;
+        o_images[i + 1] = o;
-	evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	evas_object_clip_set(o_images[i], o);
+        eo_do(o_images[i], evas_obj_clip_set(o));
      }
    done = 0;
 }
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,8 +61,8 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
-	evas_object_move(o_images[i + 1], x, y);
+	eo_do(o_images[i + 1], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_3.c

@@ -23,20 +23,20 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
 
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i + 1] = o;
+        o_images[i + 1] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
-	evas_object_clip_set(o_images[i], o);
+        eo_do(o_images[i], evas_obj_clip_set(o));
      }
    done = 0;
 }
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,8 +61,8 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
-	evas_object_move(o_images[i + 1], x, y);
+	eo_do(o_images[i + 1], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_4.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -65,7 +65,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_5.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 120, 160);
+            evas_obj_image_fill_set(0, 0, 120, 160),
-   evas_object_resize(o, 120, 160);
+            evas_obj_size_set(120, 160),
-   evas_object_move(o, (win_w - 120) / 2, (win_h - 160) / 2);
+            evas_obj_position_set((win_w - 120) / 2, (win_h - 160) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -65,7 +65,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_6.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120 / 2, 160 / 2);
+                 evas_obj_image_fill_set(0, 0, 120 / 2, 160 / 2),
-	evas_object_resize(o, 120 / 2, 160 / 2);
+                 evas_obj_size_set(120 / 2, 160 / 2),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -65,7 +65,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_7.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 120, 160);
+            evas_obj_image_fill_set(0, 0, 120, 160),
-   evas_object_resize(o, 120, 160);
+            evas_obj_size_set(120, 160),
-   evas_object_move(o, (win_w - 120) / 2, (win_h - 160) / 2);
+            evas_obj_position_set((win_w - 120) / 2, (win_h - 160) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("logo.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 120, 160);
+                 evas_obj_image_fill_set(0, 0, 120, 160),
-	evas_object_resize(o, 120, 160);
+                 evas_obj_size_set(120, 160),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -65,13 +65,13 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW))));
    h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW))));
-   evas_object_image_fill_set(o_mask, 0, 0, w, h);
+   eo_do(o_mask, evas_obj_image_fill_set(0, 0, w, h),
-   evas_object_resize(o_mask, w, h);
+                 evas_obj_size_set(w, h),
-   evas_object_move(o_mask, (win_w - w) / 2, (win_h - h) / 2);
+                 evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2));
    FPS_STD(NAME);
 }
 

src/bin/image_mask_8.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("texture.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 500, 444);
+                 evas_obj_image_fill_set(0, 0, 500, 444),
-	evas_object_resize(o, win_w * 4, win_h * 4);
+                 evas_obj_size_set(win_w * 4, win_h * 4),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_mask_9.c

@@ -22,24 +22,24 @@ static void _setup(void)
 {
    int i;
    Evas_Object *o;
-   
+
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_mask = o;
-   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
+            evas_obj_image_fill_set(0, 0, 720, 420),
-   evas_object_resize(o, 720, 420);
+            evas_obj_size_set(720, 420),
-   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+            evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
-   
+
    for (i = 0; i < 1; i++)
      {
-	o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-	o_images[i] = o;
+        o_images[i] = o;
-	evas_object_image_file_set(o, build_path("texture.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 500, 444);
+                 evas_obj_image_fill_set(0, 0, 500, 444),
-	evas_object_resize(o, win_w * 4, win_h * 4);
+                 evas_obj_size_set(win_w * 4, win_h * 4),
-	evas_object_clip_set(o, o_mask);
+                 evas_obj_clip_set(o_mask),
-	evas_object_show(o);
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
-   evas_object_del(o_mask);
+   eo_del(o_mask);
 }
 
 /* loop - do things */
@@ -66,17 +66,17 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    if (!m) m = evas_map_new(4);
-   
+
-   evas_map_util_points_populate_from_geometry(m, 
+   evas_map_util_points_populate_from_geometry(m,
-                                               (win_w - 720) / 2, 
+                                               (win_w - 720) / 2,
-                                               (win_h - 420) / 2, 
+                                               (win_h - 420) / 2,
                                                720, 420, 0);
    evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
-   evas_object_map_enable_set(o_mask, 1);
+   eo_do(o_mask, evas_obj_map_enable_set(1),
-   evas_object_map_set(o_mask, m);
+                 evas_obj_map_set(m));
    FPS_STD(NAME);
 }
 

src/bin/image_quality_scale.c

@@ -24,12 +24,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; 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("tp.png"), NULL);
+        eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
-	evas_object_image_fill_set(o, 0, 0, 640, 480);
+	         evas_obj_image_fill_set(0, 0, 640, 480),
-	evas_object_resize(o, 640, 480);
+	         evas_obj_size_set(640, 480),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
 	h *= (f / 100.0) * 4.0;
 	x = (win_w / 2) - (w / 2);
 	y = (win_h / 2) - (h / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+	                   evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/poly_blend.c

@@ -19,39 +19,39 @@ static Evas_Object *o_images[OBNUM];
 static void
 poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y)
 {
-   evas_object_polygon_points_clear(o);
+   eo_do(o, evas_obj_polygon_points_clear());
    switch (type % 4)
      {
       case 0: /* triangle */
-	evas_object_polygon_point_add(o, x + 50 , y + 0);
+	eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
-	evas_object_polygon_point_add(o, x + 100, y + 100);
+	         evas_obj_polygon_point_add(x + 100, y + 100),
-	evas_object_polygon_point_add(o, x + 0  , y + 100);
+	         evas_obj_polygon_point_add(x + 0  , y + 100));
 	break;
       case 1: /* square */
-	evas_object_polygon_point_add(o, x + 0  , y + 0);
+	eo_do(o, evas_obj_polygon_point_add(x + 0  , y + 0),
-	evas_object_polygon_point_add(o, x + 100, y + 0);
+	         evas_obj_polygon_point_add(x + 100, y + 0),
-	evas_object_polygon_point_add(o, x + 100, y + 100);
+	         evas_obj_polygon_point_add(x + 100, y + 100),
-	evas_object_polygon_point_add(o, x + 0  , y + 100);
+	         evas_obj_polygon_point_add(x + 0  , y + 100));
 	break;
       case 2: /* hex */
-	evas_object_polygon_point_add(o, x + 50 , y + 0);
+	eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
-	evas_object_polygon_point_add(o, x + 100, y + 30);
+	         evas_obj_polygon_point_add(x + 100, y + 30),
-	evas_object_polygon_point_add(o, x + 100, y + 70);
+	         evas_obj_polygon_point_add(x + 100, y + 70),
-	evas_object_polygon_point_add(o, x + 50 , y + 100);
+	         evas_obj_polygon_point_add(x + 50 , y + 100),
-	evas_object_polygon_point_add(o, x + 0  , y + 70);
+	         evas_obj_polygon_point_add(x + 0  , y + 70),
-	evas_object_polygon_point_add(o, x + 0  , y + 30);
+	         evas_obj_polygon_point_add(x + 0  , y + 30));
 	break;
       case 3: /* star */
-	evas_object_polygon_point_add(o, x + 50 , y + 0);
+	eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
-	evas_object_polygon_point_add(o, x + 60 , y + 40);
+	         evas_obj_polygon_point_add(x + 60 , y + 40),
-	evas_object_polygon_point_add(o, x + 90 , y + 30);
+	         evas_obj_polygon_point_add(x + 90 , y + 30),
-	evas_object_polygon_point_add(o, x + 70 , y + 60);
+	         evas_obj_polygon_point_add(x + 70 , y + 60),
-	evas_object_polygon_point_add(o, x + 90 , y + 100);
+	         evas_obj_polygon_point_add(x + 90 , y + 100),
-	evas_object_polygon_point_add(o, x + 50 , y + 70);
+	         evas_obj_polygon_point_add(x + 50 , y + 70),
-	evas_object_polygon_point_add(o, x + 10 , y + 100);
+	         evas_obj_polygon_point_add(x + 10 , y + 100),
-	evas_object_polygon_point_add(o, x + 30 , y + 60);
+	         evas_obj_polygon_point_add(x + 30 , y + 60),
-	evas_object_polygon_point_add(o, x + 10 , y + 30);
+	         evas_obj_polygon_point_add(x + 10 , y + 30),
-	evas_object_polygon_point_add(o, x + 40 , y + 40);
+	         evas_obj_polygon_point_add(x + 40 , y + 40));
 	break;
       default:
 	break;
@@ -68,15 +68,15 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_polygon_add(evas);
+        o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
+	         evas_obj_visibility_set(EINA_TRUE));
 	poly(o, i, 0, 0);
-	evas_object_show(o);
      }
    done = 0;
 }
@@ -85,7 +85,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -98,12 +98,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
 	o = o_images[i];
-	evas_object_geometry_get(o, NULL, NULL, &w, &h);
+        eo_do(o, evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4);
-	evas_object_move(o, x, y);
+	eo_do(o, evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/proxy_image.c

@@ -22,22 +22,22 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-   evas_object_image_file_set(o, build_path("logo.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 120, 160);
+            evas_obj_image_fill_set(0, 0, 120, 160),
-   evas_object_resize(o, 120, 160);
+            evas_obj_size_set(120, 160),
-   evas_object_show(o);
+            evas_obj_visibility_set(EINA_TRUE));
    src = o;
    o_images[0] = src;
 
    for (i = 1; i < OBNUM; i++)
      {
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_images[i] = o;
-	evas_object_image_source_set(o, src);
+	eo_do(o, evas_obj_image_source_set(src, NULL),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160),
-	evas_object_image_fill_set(o, 0,0,120,160);
+	         evas_obj_image_fill_set(0,0,120,160),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -62,7 +62,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/proxy_image_offscreen.c

@@ -26,21 +26,21 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
-   evas_object_image_file_set(o, build_path("logo.png"), NULL);
+   eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-   evas_object_image_fill_set(o, 0, 0, 120, 160);
+            evas_obj_image_fill_set(0, 0, 120, 160),
-   evas_object_resize(o, 120, 160);
+            evas_obj_size_set(120, 160),
-   evas_object_move(o, -400, -300);
+            evas_obj_position_set(-400, -300));
    src = o;
 
    for (i = 0; i < OBNUM / 2; i++)
      {
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_images[i] = o;
-	evas_object_image_source_set(o, src);
+	eo_do(o, evas_obj_image_source_set(src, NULL),
-	evas_object_resize(o, 120, 160);
+	         evas_obj_size_set(120, 160),
-	evas_object_image_fill_set(o, 0,0,120,160);
+	         evas_obj_image_fill_set(0,0,120,160),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -49,7 +49,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -65,7 +65,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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/proxy_text_fixed.c

@@ -27,30 +27,31 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
      {
-	o = evas_object_text_add(evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	evas_object_text_font_set(o, "Vera-Bold", 20);
+	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-	evas_object_text_text_set(o, "This is a test string");
+	         evas_obj_text_text_set("This is a test string"),
-	evas_object_text_style_set(o, st);
+	         evas_obj_text_style_set(st),
-	evas_object_color_set(o, 255, 255, 255, 255);
+	         evas_obj_color_set(255, 255, 255, 255),
-	evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
+	         evas_obj_text_shadow_color_set(0, 0, 0, 24),
-	evas_object_text_glow_color_set(o, 100, 80, 40, 100);
+	         evas_obj_text_glow_color_set(100, 80, 40, 100),
-	evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
+	         evas_obj_text_glow2_color_set(50, 10, 5, 50),
-	evas_object_text_outline_color_set(o, 0, 0, 0, 255);
+	         evas_obj_text_outline_color_set(0, 0, 0, 255),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
 	st++;
      }
 
    for (  ; i < OBNUM ; i ++)
      {
 	s = o_texts[i % st];
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_texts[i] = o;
-	evas_object_image_source_set(o, s);
+	eo_do(o, evas_obj_image_source_set(s, NULL));
-	evas_object_geometry_get(s, NULL, NULL, &w, &h);
+        /* FIXME s == NULL*/
-	evas_object_resize(o, w, h);
+	eo_do(s, evas_obj_size_get(&w, &h));
-	evas_object_image_fill_set(o, 0, 0, w, h);
+	eo_do(o, evas_obj_size_set(w, h),
-	evas_object_show(o);
+	         evas_obj_image_fill_set(0, 0, w, h),
+	         evas_obj_visibility_set(EINA_TRUE));
      }
 
    done = 0;
@@ -60,7 +61,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -70,12 +71,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+	eo_do(o_texts[i], evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	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)) * (w / 2);
-	evas_object_move(o_texts[i], x, y);
+	eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/proxy_text_random.c

@@ -30,41 +30,39 @@ static void _setup(void)
 	"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
    };
    srnd();
-   o = evas_object_text_add(evas);
+   o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
    o_texts[0] = o;
-   evas_object_text_font_set(o, "Vera-Bold", 20);
+   eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-   evas_object_text_text_set(o, buf);
+   eo_do(o, evas_obj_text_text_set(buf));
-   evas_object_color_set(o, 0, 0, 0, 255);
+   eo_do(o, evas_obj_color_set(0, 0, 0, 255));
-   evas_object_geometry_get(o, NULL, NULL, &w, &h);
+   eo_do(o, evas_obj_size_get(&w, &h));
    x = (win_w / 2) - (w / 2);
    x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
    y = (win_h / 2) - (h / 2);
    y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-   evas_object_move(o, x, y);
+   eo_do(o, evas_obj_position_set(x, y));
-   evas_object_show(o);
+   eo_do(o, evas_obj_visibility_set(EINA_TRUE));
    for (i = 1  ; i < OBNUM ; i ++)
      {
-	o = evas_object_image_add(evas);
+	o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
 	o_texts[i] = o;
-	evas_object_image_source_set(o, o_texts[0]);
+	eo_do(o, evas_obj_image_source_set(o_texts[0], NULL));
-	evas_object_geometry_get(o_texts[0], NULL, NULL, &w, &h);
+	eo_do(o_texts[0], evas_obj_size_get(&w, &h));
-	evas_object_resize(o, w, h);
+	eo_do(o, evas_obj_size_set(w, h),
-	evas_object_image_fill_set(o, 0, 0, w, h);
+	         evas_obj_image_fill_set(0, 0, w, h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-	evas_object_move(o, x, y);
+	eo_do(o, evas_obj_position_set(x, y),
-
+                 evas_obj_visibility_set(EINA_TRUE));
-	evas_object_show(o);
      }
 
-
    done = 0;
 }
 
@@ -72,7 +70,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -90,12 +88,12 @@ static void _loop(double t, int f)
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		   strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-   evas_object_text_text_set(o_texts[0], buf);
+   eo_do(o_texts[0], evas_obj_text_text_set(buf));
-   evas_object_geometry_get(o_texts[0], NULL, NULL, &w, &h);
+   eo_do(o_texts[0], evas_obj_size_get(&w, &h));
    for (i = 1; i < OBNUM; i++)
      {
-        evas_object_resize(o_texts[i],w,h);
+        eo_do(o_texts[i], evas_obj_size_set(w,h));
-        evas_object_image_fill_set(o_texts[i],0,0,w,h);
+        eo_do(o_texts[i], evas_obj_image_fill_set(0,0,w,h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_blend.c

@@ -26,14 +26,14 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_rectangle_add(evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -60,8 +60,8 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_blend_few.c

@@ -29,14 +29,14 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_rectangle_add(evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_blend_pow2.c

@@ -26,15 +26,15 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_rectangle_add(evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,8 +61,8 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_blend_pow2_few.c

@@ -29,15 +29,15 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_rectangle_add(evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_solid.c

@@ -26,14 +26,14 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_rectangle_add(evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -60,8 +60,8 @@ 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);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_solid_few.c

@@ -29,14 +29,14 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = evas_object_rectangle_add(evas);
+	o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	evas_object_color_set(o, r, g, b, a);
+	eo_do(o, evas_obj_color_set(r, g, b, a),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-	evas_object_move(o_images[i], x, y);
+	eo_do(o_images[i], evas_obj_position_set(x, y),
-	evas_object_resize(o_images[i], w, h);
+	                   evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }

src/bin/text_basic.c

@@ -25,12 +25,12 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_text_add(evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	evas_object_text_font_set(o, "Vera-Bold", 20);
+	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-	evas_object_text_text_set(o, "This is a test string");
+	         evas_obj_text_text_set("This is a test string"),
-	evas_object_color_set(o, 0, 0, 0, 255);
+	         evas_obj_color_set(0, 0, 0, 255),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -49,12 +49,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+	eo_do(o_texts[i], evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	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)) * (w / 2);
-	evas_object_move(o_texts[i], x, y);
+	eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/text_change.c

@@ -32,23 +32,23 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_text_add(evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	evas_object_text_font_set(o, "Vera-Bold", 20);
+	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	evas_object_text_text_set(o, buf);
+	eo_do(o, evas_obj_text_text_set(buf),
-	evas_object_color_set(o, 0, 0, 0, 255);
+	         evas_obj_color_set(0, 0, 0, 255),
-	evas_object_geometry_get(o, NULL, NULL, &w, &h);
+	         evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-	evas_object_move(o, x, y);
+	eo_do(o, evas_obj_position_set(x, y),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -57,7 +57,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	evas_object_text_text_set(o_texts[i], buf);
+	eo_do(o_texts[i], evas_obj_text_text_set(buf));
      }
    FPS_STD(NAME);
 }

src/bin/text_styles.c

@@ -27,17 +27,17 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	o = evas_object_text_add(evas);
+	o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	evas_object_text_font_set(o, "Vera-Bold", 20);
+	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-	evas_object_text_text_set(o, "This is a test string");
+	         evas_obj_text_text_set("This is a test string"),
-	evas_object_text_style_set(o, st);
+	         evas_obj_text_style_set(st),
-	evas_object_color_set(o, 255, 255, 255, 255);
+	         evas_obj_color_set(255, 255, 255, 255),
-	evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
+	         evas_obj_text_shadow_color_set(0, 0, 0, 24),
-	evas_object_text_glow_color_set(o, 100, 80, 40, 100);
+	         evas_obj_text_glow_color_set(100, 80, 40, 100),
-	evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
+	         evas_obj_text_glow2_color_set(50, 10, 5, 50),
-	evas_object_text_outline_color_set(o, 0, 0, 0, 255);
+	         evas_obj_text_outline_color_set(0, 0, 0, 255),
-	evas_object_show(o);
+	         evas_obj_visibility_set(EINA_TRUE));
 	st++;
 	if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
      }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+	eo_do(o_texts[i], evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	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)) * (w / 2);
-	evas_object_move(o_texts[i], x, y);
+	eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }