Fix compilation - use eo_unref and buffer map

Remove eo api usage for TEXT and LINE objects.
This is a very quickly made patch, in order to test. Expedite
tests might need to be fixed up a little bit more if we use eo_halt.

Running expedite spews out TONS of errors.

src/bin/about.c

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

src/bin/image_blend_border.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_border_recolor.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_fade_pow2_unscaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_fade_unscaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_many_smooth_same_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_same_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_nearest_solid_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1_few.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1_many.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude1_very_many.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2_few.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2_many.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude2_very_many.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3_few.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3_many.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_occlude3_very_many.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_same_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_smooth_solid_scaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_border.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_fade_pow2_unscaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_fade_unscaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_middle_border.c

@@ -27,7 +27,7 @@ static void _setup(void)
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         efl_image_border_set(o, 6, 6, 6, 6);
-        efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+        efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
         efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_middle_unscaled.c

@@ -29,7 +29,7 @@ static void _setup(void)
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_image_border_set(o, 43, 48, 48, 83);
-        efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+        efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
         efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_solid_unscaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_blend_unscaled.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_crossfade.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_data_argb.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */
@@ -55,6 +55,7 @@ static void _loop(double t, int f)
    for (i = 0; i < 1; i++)
      {
         unsigned int *data, *p;
+        int length;
 
         w = 640;
         h = 480;
@@ -63,7 +64,15 @@ static void _loop(double t, int f)
         efl_gfx_position_set(o_images[i], x, y);
         efl_gfx_size_set(o_images[i], w, h);
         efl_gfx_fill_set(o_images[i], 0, 0, w, h);
-        data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL);
+        data = efl_gfx_buffer_map(o_images[i], &length,
+                                  EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
+                                  0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888,
+                                  &st);
+        if (!data)
+          {
+             fprintf(stderr, "ERROR: Failed to map image!\n");
+           continue;
+          }
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)
@@ -75,7 +84,7 @@ static void _loop(double t, int f)
                }
              p += (st - w);
           }
-        efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888);
+        efl_gfx_buffer_unmap(o_images[i], data, length);
         efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);

src/bin/image_data_argb_alpha.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */
@@ -55,7 +55,7 @@ static void _loop(double t, int f)
    for (i = 0; i < 1; i++)
      {
         unsigned int *data, *p;
-        int a, r, g, b;
+        int a, r, g, b, length;
 
         w = 640;
         h = 480;
@@ -64,7 +64,15 @@ static void _loop(double t, int f)
         efl_gfx_position_set(o_images[i], x, y);
         efl_gfx_size_set(o_images[i], w, h);
         efl_gfx_fill_set(o_images[i], 0, 0, w, h);
-        data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL);
+        data = efl_gfx_buffer_map(o_images[i], &length,
+                                  EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
+                                  0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888,
+                                  &st);
+        if (!data)
+          {
+             fprintf(stderr, "ERROR: Failed to map image!\n");
+             continue;
+          }
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)
@@ -87,7 +95,7 @@ static void _loop(double t, int f)
                }
              p += (st - w);
           }
-        efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888);
+        efl_gfx_buffer_unmap(o_images[i], data, length);
         efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h);
      }
    FPS_STD(NAME);

src/bin/image_data_ycbcr601pl.c

@@ -27,8 +27,6 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        unsigned int length;
-
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -79,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++) eo_unref(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,8 +27,6 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        unsigned int length;
-
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -65,7 +63,10 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL);
+        efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
+        free(yp);
+        free(up);
+        free(vp);
      }
    done = 0;
 }
@@ -74,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++) eo_unref(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */

src/bin/image_data_ycbcr601pl_map_solid_rotate.c

@@ -27,8 +27,6 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        unsigned int length;
-
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -64,7 +62,10 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL);
+        efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
+        free(yp);
+        free(up);
+        free(vp);
      }
    done = 0;
 }
@@ -73,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++) eo_unref(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */

src/bin/image_data_ycbcr601pl_wide_stride.c

@@ -27,8 +27,6 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        unsigned int length;
-
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
@@ -64,8 +62,11 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL);
+        efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL);
         efl_gfx_buffer_update_add(o_images[i], 0, 0, 320, 480);
+        free(yp);
+        free(up);
+        free(vp);
      }
    done = 0;
 }
@@ -74,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++) eo_unref(o_images[i]);
    /* free(yp); */
    /* free(up); */
    /* free(vp); */
@@ -88,7 +89,6 @@ static void _loop(double t, int f)
    for (i = 0; i < 1; i++)
      {
         unsigned char **data, **lp;
-        int stride;
 
         w = 640;
 	h = 480;

src/bin/image_map_3d_1.c

@@ -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++) eo_unref(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_2.c

@@ -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++) eo_unref(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_3.c

@@ -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++) eo_unref(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_4.c

@@ -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++) eo_unref(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_5.c

@@ -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++) eo_unref(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_6.c

@@ -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++) eo_unref(c->side[i].o);
    free(c);
 }
 

src/bin/image_map_3d_flow.c

@@ -56,8 +56,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < CNUM; i++)
      {
-        eo_del(o_images[i]);
+        eo_unref(o_images[i]);
-        eo_del(o_reflec[i]);
+        eo_unref(o_reflec[i]);
      }
 }
 

src/bin/image_map_color_alpha_nearest_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_alpha_nearest_solid_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_alpha_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_alpha_solid_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_nearest_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_nearest_solid_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_color_solid_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_nearest_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_nearest_solid_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_map_solid_rotate.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask_10.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_11.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_12.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_13.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_2.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask_3.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/image_mask_4.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_5.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_6.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_7.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_8.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_mask_9.c

@@ -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++) eo_unref(o_images[i]);
-   eo_del(o_mask);
+   eo_unref(o_mask);
 }
 
 /* loop - do things */

src/bin/image_quality_scale.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/line_blend.c

@@ -26,14 +26,14 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-        o = eo_add(EVAS_LINE_CLASS, evas);
+        o = evas_object_line_add(evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
 	efl_gfx_color_set(o, r, g, b, a);
-	evas_obj_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2));
+        evas_object_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2));
 	efl_gfx_visible_set(o, EINA_TRUE);
 
         
@@ -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++) eo_unref(o_images[i]);
 }
 
 #define PI (double) 3.141592654
@@ -87,11 +87,11 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         o = o_images[i];
-        evas_obj_line_xy_get(o, &ox1, &oy1, &ox2, &oy2);
+        evas_object_line_xy_get(o, &ox1, &oy1, &ox2, &oy2);
              
         _rotate_point(&ox1, &oy1, i);
         _rotate_point(&ox2, &oy2, i);
-        evas_obj_line_xy_set(o, ox1, oy1, ox2, oy2);
+        evas_object_line_xy_set(o, ox1, oy1, ox2, oy2);
      }
    FPS_STD(NAME);
 }

src/bin/poly_blend.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/proxy_image.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/proxy_image_offscreen.c

@@ -49,7 +49,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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/proxy_text_fixed.c

@@ -27,16 +27,16 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
      {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = evas_object_text_add(evas);
 	o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 20);
         efl_text_set(o, "This is a test string");
-        evas_obj_text_style_set(o, st);
+        evas_object_text_style_set(o, st);
         efl_gfx_color_set(o, 255, 255, 255, 255);
-        evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+        evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
-        evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
+        evas_object_text_glow_color_set(o, 100, 80, 40, 100);
-        evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
+        evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
-        evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
+        evas_object_text_outline_color_set(o, 0, 0, 0, 255);
         efl_gfx_visible_set(o, EINA_TRUE);
 	st++;
      }
@@ -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++) eo_unref(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/proxy_text_random.c

@@ -30,7 +30,7 @@ static void _setup(void)
 	"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
    };
    srnd();
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = evas_object_text_add(evas);
    o_texts[0] = o;
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
@@ -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++) eo_unref(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend_few.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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend_pow2.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_blend_pow2_few.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_solid.c

@@ -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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/rect_solid_few.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++) eo_unref(o_images[i]);
 }
 
 /* loop - do things */

src/bin/snapshot_widgets_file_icons.c

@@ -62,13 +62,13 @@ static void _setup(void)
         efl_gfx_position_set(o, x + 8, y);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = evas_object_text_add(evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
-        evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
+        evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
         efl_gfx_color_set(o, 255, 255, 255, 255);
-        evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+        evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
         efl_gfx_visible_set(o, EINA_TRUE);
         efl_gfx_size_get(o, &tw, &th);
         cent = ICON_SIZE + 16 - tw / 2;
@@ -102,10 +102,10 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
+        eo_unref(o_images[i]);
-        eo_del(o_texts[i]);
+        eo_unref(o_texts[i]);
      }
-   eo_del(o_snap);
+   eo_unref(o_snap);
 }
 
 /* loop - do things */

src/bin/text_basic.c

@@ -25,7 +25,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = evas_object_text_add(evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 20);
         efl_text_set(o, "This is a test string");
@@ -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++) eo_unref(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/text_change.c

@@ -32,7 +32,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = evas_object_text_add(evas);
 	o_texts[i] = o;
 	efl_text_properties_font_set(o, "Vera-Bold", 20);
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
@@ -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++) eo_unref(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/text_styles.c

@@ -27,16 +27,16 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = evas_object_text_add(evas);
 	o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 20);
         efl_text_set(o, "This is a test string");
-        evas_obj_text_style_set(o, st);
+        evas_object_text_style_set(o, st);
         efl_gfx_color_set(o, 255, 255, 255, 255);
-        evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+        evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
-        evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
+        evas_object_text_glow_color_set(o, 100, 80, 40, 100);
-        evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
+        evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
-        evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
+        evas_object_text_outline_color_set(o, 0, 0, 0, 255);
         efl_gfx_visible_set(o, 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++) eo_del(o_texts[i]);
+   for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]);
 }
 
 /* loop - do things */

src/bin/text_styles_different_strings.c

@@ -34,7 +34,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	o = eo_add(EVAS_TEXT_CLASS, evas);
+	o = evas_object_text_add(evas);
 	o_texts[i] = o;
 	efl_text_properties_font_set(o, "Vera-Bold", 20);
 	snprintf(buf, sizeof(buf), "%s %s %s %s.",
@@ -43,12 +43,12 @@ static void _setup(void)
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
 	efl_text_set(o, buf);
-	evas_obj_text_style_set(o, st);
+	evas_object_text_style_set(o, st);
 	efl_gfx_color_set(o, 255, 255, 255, 255);
-	evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+	evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
-	evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
+	evas_object_text_glow_color_set(o, 100, 80, 40, 100);
-	evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
+	evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
-	evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
+	evas_object_text_outline_color_set(o, 0, 0, 0, 255);
 	efl_gfx_visible_set(o, EINA_TRUE);
 	st++;
 	if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
@@ -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++) eo_unref(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);
+   eo_unref(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);
+   eo_unref(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);
+   eo_unref(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);
+   eo_unref(o_text);
    o_text = NULL;
 }
 

src/bin/ui.c

@@ -409,7 +409,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_wallpaper = o;
 
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = evas_object_text_add(evas);
    efl_text_properties_font_set(o, "Vera-Bold", 10);
    efl_text_set(o, "EXPEDITE");
    efl_gfx_stack_layer_set(o, 100);
@@ -422,7 +422,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_title = o;
 
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = evas_object_text_add(evas);
    efl_text_properties_font_set(o, "Vera", 9);
    efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
    efl_gfx_stack_layer_set(o, 100);
@@ -467,7 +467,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_image_border_set(o, 7, 7, 7, 7);
    o_menu_text_sel = o;
 
-   o = eo_add(EVAS_TEXT_CLASS, evas);
+   o = evas_object_text_add(evas);
    efl_text_properties_font_set(o, "Vera", 10);
    efl_text_set(o, "");
    efl_gfx_color_set(o, 0, 0, 0, 100);

src/bin/vg_basic_circle.c

@@ -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++) eo_unref(o_shapes[i]);
 }
 
 /* loop - do things */

src/bin/vg_basic_gradient.c

@@ -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++) eo_unref(o_shapes[i]);
 }
 
 /* loop - do things */

src/bin/vg_basic_rect.c

@@ -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++) eo_unref(o_shapes[i]);
 }
 
 /* loop - do things */

src/bin/vg_scaled.c

@@ -67,7 +67,7 @@ static void _cleanup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_del(o_objects[i]);
+        eo_unref(o_objects[i]);
         o_objects[i] = NULL;
      }
 }

src/bin/widgets_file_icons.c

@@ -53,13 +53,13 @@ static void _setup(void)
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o = evas_object_text_add(evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
-        evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
+        evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
         efl_gfx_color_set(o, 255, 255, 255, 255);
-        evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+        evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
         efl_gfx_visible_set(o, EINA_TRUE);
      }
    done = 0;
@@ -71,8 +71,8 @@ static void _cleanup(void)
    int i;
    for (i = 0; i < NUM; i++)
      {
-        eo_del(o_images[i]);
+        eo_unref(o_images[i]);
-        eo_del(o_texts[i]);
+        eo_unref(o_texts[i]);
      }
 }