fix eo break.

Its api are still unstable. make it work again.

src/bin/about.c

@@ -49,7 +49,7 @@ _setup(void)
 static void
 _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
    o_text = NULL;
 }
 

src/bin/image_blend_border.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         efl_image_border_set(o, 6, 6, 6, 6);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_border_recolor.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_color_set(o, 64, 64, 64, 255);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_fade_pow2_unscaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_fade_unscaled.c

@@ -24,7 +24,7 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
         efl_file_set(o, build_path("logo.png"), NULL);
@@ -40,7 +40,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_many_smooth_same_scaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < MANYNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < MANYNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_same_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_solid_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1.c

@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1_few.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1_many.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1_very_many.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2.c

@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2_few.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2_many.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2_very_many.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3.c

@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -50,7 +50,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3_few.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3_many.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3_very_many.c

@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
@@ -53,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_same_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_solid_scaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_border.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("frame.png"), NULL);
         efl_image_border_set(o, 8, 8, 8, 8);
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_fade_pow2_unscaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_fade_unscaled.c

@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_middle_border.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         efl_image_border_set(o, 6, 6, 6, 6);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_middle_unscaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_unscaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_unscaled.c

@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_crossfade.c

@@ -22,14 +22,14 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
    efl_file_set(o, build_path("im1.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
    efl_gfx_size_set(o, 720, 420);
    efl_gfx_visible_set(o, EINA_TRUE);
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
    efl_file_set(o, build_path("im2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 2; i++) eo_del(o_images[i]);
+   for (i = 0; i < 2; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_data_argb.c

@@ -27,7 +27,7 @@ static void _setup(void)
    pixels = malloc(sizeof (int) * 640 * 480);
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_data_argb_alpha.c

@@ -27,7 +27,7 @@ static void _setup(void)
    pixels = malloc(sizeof (int) * 640 * 480);
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 1);
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_data_ycbcr601pl.c

@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -77,7 +77,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    // FIXME: the object is not destroyed anymore so we can't free the data
    /* free(yp); */
    /* free(up); */

src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c

@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */

src/bin/image_data_ycbcr601pl_map_solid_rotate.c

@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */

src/bin/image_data_ycbcr601pl_wide_stride.c

@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         efl_gfx_buffer_alpha_set(o, 0);
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */

src/bin/image_map_3d_1.c

@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_2.c

@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -169,7 +169,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_3.c

@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -163,7 +163,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_4.c

@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -161,7 +161,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_5.c

@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_6.c

@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -168,7 +168,7 @@ _cube_free(Cube *c)
 {
    int i;
 
-   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
+   for (i = 0; i < 6; i++) efl_del(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_flow.c

@@ -29,7 +29,7 @@ static void _setup(void)
      {
         char buf[256];
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -38,7 +38,7 @@ static void _setup(void)
         efl_image_smooth_scale_set(o, 0);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -56,8 +56,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < CNUM; i++)
      {
-        eo_del(o_images[i]);
+        efl_del(o_images[i]);
-        eo_del(o_reflec[i]);
+        efl_del(o_reflec[i]);
      }
 }
 

src/bin/image_map_color_alpha_nearest_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_alpha_nearest_solid_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_alpha_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_alpha_solid_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_nearest_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_nearest_solid_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_solid_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_nearest_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_nearest_solid_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
 	efl_file_set(o, build_path("logo.png"), NULL);
 	efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_solid_rotate.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
+   for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask.c

@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("e-logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask_10.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_11.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_12.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_13.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -49,8 +49,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_2.c

@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask_3.c

@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask_4.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_5.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_6.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_7.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_8.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 500, 444);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_9.c

@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 500, 444);
@@ -48,8 +48,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
-   eo_del(o_mask);
+   efl_del(o_mask);
 }
 
 /* loop - do things */

src/bin/image_quality_scale.c

@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
 	efl_file_set(o, build_path("tp.png"), NULL);
 	efl_gfx_fill_set(o, 0, 0, 640, 480);
@@ -38,7 +38,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) eo_del(o_images[i]);
+   for (i = 0; i < 1; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/line_blend.c

@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 #define PI (double) 3.141592654

src/bin/poly_blend.c

@@ -68,7 +68,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-        o = eo_add(EFL_CANVAS_POLYGON_CLASS, evas);
+        o = efl_add(EFL_CANVAS_POLYGON_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
@@ -85,7 +85,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/proxy_image.c

@@ -22,7 +22,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_file_set(o, build_path("logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
    efl_gfx_size_set(o, 120, 160);
@@ -32,7 +32,7 @@ static void _setup(void)
 
    for (i = 1; i < OBNUM; i++)
      {
-        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_images[i] = o;
         efl_canvas_proxy_source_set(o, src);
         efl_gfx_size_set(o, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/proxy_text_fixed.c

@@ -45,7 +45,7 @@ static void _setup(void)
    for (  ; i < OBNUM ; i ++)
      {
         s = o_texts[i % st];
-        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_texts[i] = o;
         efl_canvas_proxy_source_set(o, s);
         /* FIXME s == NULL*/
@@ -62,7 +62,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/proxy_text_random.c

@@ -50,7 +50,7 @@ static void _setup(void)
    efl_gfx_visible_set(o, EINA_TRUE);
    for (i = 1  ; i < OBNUM ; i ++)
      {
-        o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+        o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
         o_texts[i] = o;
         efl_canvas_proxy_source_set(o, o_texts[0]);
 	efl_gfx_size_get(o_texts[0], &w, &h);
@@ -71,7 +71,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend_few.c

@@ -29,7 +29,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend_pow2.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend_pow2_few.c

@@ -29,7 +29,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_solid.c

@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_solid_few.c

@@ -29,7 +29,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+	o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
@@ -45,7 +45,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */

src/bin/snapshot_widgets_file_icons.c

@@ -54,7 +54,7 @@ static void _setup(void)
      {
         Evas_Coord tw, th, cent;
 
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -85,7 +85,7 @@ static void _setup(void)
       "blur { 5, dst = a, color = '#ff0' }"
      ;
 
-   o = eo_add(EFL_CANVAS_SNAPSHOT_CLASS, evas);
+   o = efl_add(EFL_CANVAS_SNAPSHOT_CLASS, evas);
    o_snap = o;
    efl_gfx_visible_set(o, EINA_TRUE);
    efl_gfx_position_set(o, 50, 50);
@@ -102,10 +102,10 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
+        efl_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_texts[i]);
      }
-   eo_del(o_snap);
+   efl_del(o_snap);
 }
 
 /* loop - do things */

src/bin/text_basic.c

@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/text_change.c

@@ -57,7 +57,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/text_styles.c

@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/text_styles_different_strings.c

@@ -60,7 +60,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/textblock_auto_align.c

@@ -58,7 +58,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
 }
 
 /* loop - do things */

src/bin/textblock_basic.c

@@ -119,7 +119,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
 }
 
 /* loop - do things */

src/bin/textblock_intl.c

@@ -90,7 +90,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
 }
 
 /* loop - do things */

src/bin/textblock_text_append.c

@@ -102,7 +102,7 @@ static void _setup(void)
 /* cleanup */
 static void _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
    o_text = NULL;
 }
 

src/bin/ui.c

@@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test,
    Menu_Item *mi;
 
    mi = malloc(sizeof(Menu_Item));
-   mi->o_icon = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_file_set(mi->o_icon, build_path(icon), NULL);
    efl_gfx_size_set(mi->o_icon, 32, 32);
    efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32);
@@ -376,11 +376,11 @@ _ui_menu_item_full_add(Eina_Bool test,
 
 #define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func)
 
-EO_CALLBACKS_ARRAY_DEFINE(ui_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(ui_callbacks,
-                          { EFL_EVENT_KEY_DOWN, _ui_key },
+                           { EFL_EVENT_KEY_DOWN, _ui_key },
-                          { EFL_EVENT_POINTER_DOWN, _ui_mouse_down },
+                           { EFL_EVENT_POINTER_DOWN, _ui_mouse_down },
-                          { EFL_EVENT_POINTER_UP, _ui_mouse_up },
+                           { EFL_EVENT_POINTER_UP, _ui_mouse_up },
-                          { EFL_EVENT_POINTER_MOVE, _ui_mouse_move });
+                           { EFL_EVENT_POINTER_MOVE, _ui_mouse_move });
 
 void
 ui_setup(unsigned int ui_w, unsigned int ui_h)
@@ -391,17 +391,17 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    win_w = ui_w;
    win_h = ui_h;
 
-   o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_gfx_size_set(o, win_w, win_h);
    efl_gfx_color_set(o, 0, 0, 0, 0);
    efl_gfx_stack_layer_set(o, 1000);
    evas_object_focus_set(o, 1);
    efl_gfx_visible_set(o, EINA_TRUE);
-   eo_event_callback_array_add(o, ui_callbacks(), NULL);
+   efl_event_callback_array_add(o, ui_callbacks(), NULL);
    o_bg = o;
 
-   o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_gfx_size_set(o, win_w, win_h);
    efl_gfx_color_set(o, 255, 255, 255, 255);
@@ -435,7 +435,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_byline = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2));
    efl_file_set(o, build_path("e-logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -445,21 +445,21 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_menu_logo = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, win_w - 128, - 128);
    efl_gfx_fill_set(o, 0, 0, 256, 256);
    efl_gfx_size_set(o, 256, 256);
    efl_gfx_visible_set(o, EINA_TRUE);
    o_menu_icon = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_file_set(o, build_path("icon_sel.png"), NULL);
    efl_gfx_size_set(o, 48, 48);
    efl_gfx_fill_set(o, 0, 0, 48, 48);
    o_menu_icon_sel = o;
 
-   o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+   o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_file_set(o, build_path("text_sel.png"), NULL);
    efl_gfx_size_set(o, 96, 32);

src/bin/vg_basic_circle.c

@@ -30,7 +30,7 @@ static void _setup(void)
         Eo *vector;
         double r = 35, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, r * 2 + stroke_w * 2, r * 2 + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        circle = eo_add(EFL_VG_SHAPE_CLASS, root);
+        circle = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_circle(circle, r + stroke_w, r + stroke_w, r);
         efl_gfx_shape_stroke_width_set(circle, stroke_w);
         efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128);
@@ -52,7 +52,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
 }
 
 /* loop - do things */

src/bin/vg_basic_gradient.c

@@ -36,7 +36,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         efl_gfx_gradient_stop_set(gradient, stops, 3);
         efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
         efl_gfx_gradient_linear_start_set(gradient, 10, 10);
         efl_gfx_gradient_linear_end_set(gradient, 50, 50);
 
-        rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+        rect = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_vg_shape_fill_set(rect, gradient);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
@@ -65,7 +65,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
 }
 
 /* loop - do things */

src/bin/vg_basic_rect.c

@@ -30,7 +30,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+        rect = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
         efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
@@ -52,7 +52,7 @@ static void _cleanup(void)
 {
    unsigned int i;
 
-   for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
 }
 
 /* loop - do things */

src/bin/vg_scaled.c

@@ -36,7 +36,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        vector = eo_add(EVAS_VG_CLASS, evas);
+        vector = efl_add(EVAS_VG_CLASS, evas);
         o_objects[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
 
         root = evas_object_vg_root_node_get(vector);
 
-        o_gradient[i] = gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        o_gradient[i] = gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         efl_gfx_gradient_stop_set(gradient, stops, 3);
         efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
         efl_gfx_gradient_linear_start_set(gradient, 10, 10);
         efl_gfx_gradient_linear_end_set(gradient, 50, 50);
 
-        o_shapes[i] = rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+        o_shapes[i] = rect = efl_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_vg_shape_fill_set(rect, gradient);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
@@ -67,7 +67,7 @@ static void _cleanup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_del(o_objects[i]);
+        efl_del(o_objects[i]);
         o_objects[i] = NULL;
      }
 }

src/bin/widgets_file_icons.c

@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -71,8 +71,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
+        efl_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_texts[i]);
      }
 }
 

src/bin/widgets_file_icons_2.c

@@ -46,7 +46,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
+        efl_del(o_images[i]);
-        eo_del(o_texts[i]);
+        efl_del(o_texts[i]);
      }
 }