move to EFL 1.14 interfaces.

src/bin/about.c

@@ -9,9 +9,9 @@ _setup(void)
    Evas_Textblock_Style *st;
 
    o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
-   eo_do(o, evas_obj_position_set(10, 40),
-         evas_obj_size_set(win_w - 20, win_h - 50),
-         evas_obj_visibility_set(EINA_TRUE));
+   eo_do(o, efl_gfx_position_set(10, 40),
+         efl_gfx_size_set(win_w - 20, win_h - 50),
+         efl_gfx_visible_set(EINA_TRUE));
    st = evas_textblock_style_new();
    evas_textblock_style_set
      (st,

src/bin/image_blend_border.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("bar.png"), NULL),
               evas_obj_image_border_set(6, 6, 6, 6),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_border_recolor.c

@@ -27,9 +27,9 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("pan.png"), NULL),
-              evas_obj_color_set(64, 64, 64, 255),
+              efl_gfx_color_set(64, 64, 64, 255),
               evas_obj_image_border_set(3, 3, 3, 3),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -57,9 +57,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_fade_pow2_unscaled.c

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

src/bin/image_blend_fade_unscaled.c

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

src/bin/image_blend_many_smooth_same_scaled.c

@@ -33,9 +33,9 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
               efl_image_smooth_scale_set(1),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h),
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -54,12 +54,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < MANYNUM; i++)
      {
-        eo_do(o_images[i],  evas_obj_size_get(&w, &h));
+        eo_do(o_images[i],  efl_gfx_size_get(&w, &h));
         x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], efl_gfx_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_same_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
               efl_image_smooth_scale_set(0),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
               efl_image_smooth_scale_set(0),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
               efl_image_smooth_scale_set(0),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_nearest_solid_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
               efl_image_smooth_scale_set(0),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_occlude1.c

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

src/bin/image_blend_occlude1_few.c

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

src/bin/image_blend_occlude1_many.c

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

src/bin/image_blend_occlude1_very_many.c

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

src/bin/image_blend_occlude2.c

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

src/bin/image_blend_occlude2_few.c

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

src/bin/image_blend_occlude2_many.c

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

src/bin/image_blend_occlude2_very_many.c

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

src/bin/image_blend_occlude3.c

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

src/bin/image_blend_occlude3_few.c

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

src/bin/image_blend_occlude3_many.c

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

src/bin/image_blend_occlude3_very_many.c

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

src/bin/image_blend_smooth_same_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
               efl_image_smooth_scale_set(1),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
               efl_image_smooth_scale_set(1),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
               efl_image_smooth_scale_set(1),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_smooth_solid_scaled.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
               efl_image_smooth_scale_set(1),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_border.c

@@ -28,7 +28,7 @@ static void _setup(void)
         eo_do(o,
               efl_file_set(build_path("frame.png"), NULL),
               evas_obj_image_border_set(8, 8, 8, 8),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_fade_pow2_unscaled.c

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

src/bin/image_blend_solid_fade_unscaled.c

@@ -29,12 +29,12 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
-              evas_obj_image_fill_set(0, 0, 120, 160),
-              evas_obj_size_set(120, 160));
+              efl_gfx_fill_set(0, 0, 120, 160),
+              efl_gfx_size_set(120, 160));
         a = rnd()&0xff;
         eo_do(o,
-              evas_obj_color_set(a, a, a, a),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_color_set(a, a, a, a),
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], efl_gfx_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_middle_border.c

@@ -29,7 +29,7 @@ static void _setup(void)
               efl_file_set(build_path("bar.png"), NULL),
               evas_obj_image_border_set(6, 6, 6, 6),
               evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -57,9 +57,9 @@ static void _loop(double t, int f)
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h));
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_middle_unscaled.c

@@ -27,11 +27,11 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_fill_set(0, 0, 120, 160),
-              evas_obj_size_set(120, 160),
+              efl_gfx_fill_set(0, 0, 120, 160),
+              efl_gfx_size_set(120, 160),
               evas_obj_image_border_set(43, 48, 48, 83),
               evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,7 +56,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], efl_gfx_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_solid_unscaled.c

@@ -27,9 +27,9 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("image.png"), NULL),
-              evas_obj_image_fill_set(0, 0, 120, 160),
-              evas_obj_size_set(120, 160),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_fill_set(0, 0, 120, 160),
+              efl_gfx_size_set(120, 160),
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -54,7 +54,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], efl_gfx_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_blend_unscaled.c

@@ -27,9 +27,9 @@ static void _setup(void)
         o_images[i] = o;
         eo_do(o,
               efl_file_set(build_path("logo.png"), NULL),
-              evas_obj_image_fill_set(0, 0, 120, 160),
-              evas_obj_size_set(120, 160),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_fill_set(0, 0, 120, 160),
+              efl_gfx_size_set(120, 160),
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -54,7 +54,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], efl_gfx_position_set(x, y));
      }
    FPS_STD(NAME);
 }

src/bin/image_crossfade.c

@@ -26,17 +26,17 @@ static void _setup(void)
    o_images[0] = o;
    eo_do(o,
          efl_file_set(build_path("im1.png"), NULL),
-         evas_obj_image_fill_set(0, 0, 720, 420),
-         evas_obj_size_set(720, 420),
-         evas_obj_visibility_set(EINA_TRUE));
+         efl_gfx_fill_set(0, 0, 720, 420),
+         efl_gfx_size_set(720, 420),
+         efl_gfx_visible_set(EINA_TRUE));
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
    eo_do(o,
          efl_file_set(build_path("im2.png"), NULL),
-         evas_obj_image_fill_set(0, 0, 720, 420),
-         evas_obj_size_set(720, 420),
-         evas_obj_visibility_set(EINA_TRUE));
+         efl_gfx_fill_set(0, 0, 720, 420),
+         efl_gfx_size_set(720, 420),
+         efl_gfx_visible_set(EINA_TRUE));
 
    done = 0;
 }
@@ -55,7 +55,7 @@ static void _loop(double t, int f)
 
    a = f & 0x1f;
    a = ((a << 3) | (a >> 2)) & 0xff;
-   eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
+   eo_do(o_images[1], efl_gfx_color_set(a, a, a, a));
    FPS_STD(NAME);
 }
 

src/bin/image_data_argb.c

@@ -29,11 +29,11 @@ static void _setup(void)
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
-              evas_obj_image_size_set(640, 480),
+              efl_gfx_view_size_set(640, 480),
               evas_obj_image_alpha_set(0),
-              evas_obj_image_fill_set(0, 0, 640, 480),
-              evas_obj_size_set(640, 480),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_fill_set(0, 0, 640, 480),
+              efl_gfx_size_set(640, 480),
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -59,9 +59,9 @@ static void _loop(double t, int f)
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h),
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h),
               data = evas_obj_image_data_get(1),
               st = evas_obj_image_stride_get());
         st = st >> 2;

src/bin/image_data_argb_alpha.c

@@ -29,11 +29,11 @@ static void _setup(void)
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
-              evas_obj_image_size_set(640, 480),
+              efl_gfx_view_size_set(640, 480),
               evas_obj_image_alpha_set(1),
-              evas_obj_image_fill_set(0, 0, 640, 480),
-              evas_obj_size_set(640, 480),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_fill_set(0, 0, 640, 480),
+              efl_gfx_size_set(640, 480),
+              efl_gfx_visible_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -59,9 +59,9 @@ static void _loop(double t, int f)
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h),
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h),
               data = evas_obj_image_data_get(1),
               st = evas_obj_image_stride_get());
         st = st >> 2;

src/bin/image_data_ycbcr601pl.c

@@ -32,11 +32,11 @@ static void _setup(void)
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-              evas_obj_image_size_set(640, 480),
+              efl_gfx_view_size_set(640, 480),
               evas_obj_image_alpha_set(0),
-              evas_obj_image_fill_set(0, 0, 640, 480),
-              evas_obj_size_set(640, 480),
-              evas_obj_visibility_set(EINA_TRUE));
+              efl_gfx_fill_set(0, 0, 640, 480),
+              efl_gfx_size_set(640, 480),
+              efl_gfx_visible_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
@@ -92,9 +92,9 @@ static void _loop(double t, int f)
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
         eo_do(o_images[i],
-              evas_obj_position_set(x, y),
-              evas_obj_size_set(w, h),
-              evas_obj_image_fill_set(0, 0, w, h),
+              efl_gfx_position_set(x, y),
+              efl_gfx_size_set(w, h),
+              efl_gfx_fill_set(0, 0, w, h),
               evas_obj_image_data_update_add( 0, 0, 640, 480));
      }
    FPS_STD(NAME);

src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c

@@ -32,12 +32,12 @@ static void _setup(void)
         eo_do(o,
               evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-