6 files changed, 32 insertions, 32 deletions

diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c
index a7d7c7b..2ff589b 100644
--- a/src/extantz/ephysics_demo.c
+++ b/src/extantz/ephysics_demo.c
@@ -34,9 +34,9 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals)
   sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME);
   box1 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win,
     efl_file_set(buf, "blue-cube"),
-    evas_obj_size_set(70, 70),
-    evas_obj_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_size_set(70, 70),
+    efl_gfx_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200),
+    efl_gfx_visible_set(EINA_TRUE)
   );
 
   box_body1 = ephysics_body_box_add(world);
@@ -51,9 +51,9 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals)
   sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME);
   box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win,
     efl_file_set(buf, "purple-cube"),
-    evas_obj_size_set(70, 70),
-    evas_obj_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_size_set(70, 70),
+    efl_gfx_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200),
+    efl_gfx_visible_set(EINA_TRUE)
   );
 
   box_body2 = ephysics_body_box_add(world);
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index b96346a..6b18eaf 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -267,10 +267,10 @@ static void _on_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA
   GLData *gld = &ourGlobals->gld;
   Evas_Coord h;
 
-  eo_do(ourGlobals->win, evas_obj_size_get(&ourGlobals->win_w, &ourGlobals->win_h));
+  eo_do(ourGlobals->win, efl_gfx_size_get(&ourGlobals->win_w, &ourGlobals->win_h));
   eo_do(ourGlobals->tb,
     evas_obj_size_hint_min_get(NULL, &h),
-    evas_obj_size_set(ourGlobals->win_w, h)
+    efl_gfx_size_set(ourGlobals->win_w, h)
     );
   // Stop internal windows going under the toolbar.
   evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h);
@@ -496,7 +496,7 @@ static void makeMainMenu(globals *ourGlobals)
         evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0),
         evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
         elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU),
-        evas_obj_position_set(0, 0),
+        efl_gfx_position_set(0, 0),
         elm_obj_toolbar_align_set(0.0)
         );
     ourGlobals->tb = tb;
@@ -684,14 +684,14 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
     elm_obj_image_fill_outside_set(EINA_TRUE),
     efl_file_set(buf, NULL),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
   );
   elm_win_resize_object_add(ourGlobals.mainWindow->win, ourGlobals.mainWindow->bg);
 #else
   snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get());
   eo_do(ourGlobals.mainWindow->bg,
     elm_obj_image_file_set(buf, NULL),
-    evas_obj_color_set(255, 255, 255, 255)
+    efl_gfx_color_set(255, 255, 255, 255)
   );
 #endif
 
diff --git a/src/extantz/files.c b/src/extantz/files.c
index aee02a0..a6742c2 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -193,7 +193,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
     elm_obj_hoversel_item_add("size(desc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_SIZE_DESC),
     elm_obj_hoversel_item_add("time(asc)",  NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC),
     elm_obj_hoversel_item_add("time(desc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
     );
   elm_object_text_set(hoversel, "sorting");
   elm_box_pack_end(vbox, hoversel);
@@ -206,7 +206,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
     elm_obj_hoversel_item_add("small",  NULL, ELM_ICON_NONE, _small_icon_clicked,  fs),
     elm_obj_hoversel_item_add("medium", NULL, ELM_ICON_NONE, _middle_icon_clicked, fs),
     elm_obj_hoversel_item_add("big",    NULL, ELM_ICON_NONE, _big_icon_clicked,    fs),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
     );
   elm_object_text_set(hoversel, "size");
   elm_box_pack_end(vbox, hoversel);
@@ -217,7 +217,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
 
   bt = eo_add(ELM_CHECK_CLASS, vbox,
     elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
     );
   elm_object_text_set(bt, "hidden");
   evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs);
@@ -226,7 +226,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
 
   rdg = rd = eo_add(ELM_RADIO_CLASS, vbox,
     elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
     );
   elm_object_text_set(rd, "grid");
   elm_box_pack_end(vbox, rd);
@@ -237,7 +237,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
 
   rd = eo_add(ELM_RADIO_CLASS, vbox,
     elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
     );
   elm_radio_group_add(rd, rdg);
   elm_object_text_set(rd, "list");
@@ -248,7 +248,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   //eo_unref(rdg);
 
   bt = eo_add(ELM_BUTTON_CLASS, me->win,
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
   );
   elm_object_text_set(bt, "OK");
   evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me);
@@ -256,7 +256,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
 //  eo_unref(bt);
 
   bt = eo_add(ELM_BUTTON_CLASS, me->win,
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
   );
   elm_object_text_set(bt, "CANCEL");
   evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me);
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c
index 1e7831d..0b72b20 100644
--- a/src/extantz/scenri.c
+++ b/src/extantz/scenri.c
@@ -355,7 +355,7 @@ Scene_Data *scenriAdd(Evas_Object *win)
   int w, h;
 
   evas = evas_object_evas_get(win);
-  eo_do(win, evas_obj_size_get(&w, &h));
+  eo_do(win, efl_gfx_size_get(&w, &h));
   scene = calloc(1, sizeof(Scene_Data));
   scene->evas = evas;
   eina_clist_init(&(scene->stuffs));
@@ -376,7 +376,7 @@ Scene_Data *scenriAdd(Evas_Object *win)
   scene->image = eo_add(ELM_IMAGE_CLASS, win,
     evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
     elm_obj_image_fill_outside_set(EINA_TRUE),
-    evas_obj_visibility_set(EINA_TRUE),
+    efl_gfx_visible_set(EINA_TRUE),
     temp = elm_obj_image_object_get()
   );
   elm_object_tooltip_text_set(scene->image, "");
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 2f6e9a5..42b31fc 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -275,7 +275,7 @@ winFang *woMan_add(globals *ourGlobals)
 //              evas_obj_text_set("Login"),
                 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
                 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0),
-                evas_obj_visibility_set(EINA_TRUE)
+                efl_gfx_visible_set(EINA_TRUE)
         );
     elm_object_text_set(bt, "Login");           // No eo interface for this that I can find.
 //    evas_object_smart_callback_add(bt, "clicked", NULL, NULL);
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index 1aaa7bd..b07e3f6 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -212,11 +212,11 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
 
   snprintf(buf, sizeof(buf), "%s/winFang.edj", prefix_data_get());
   result->layout = eo_add(ELM_LAYOUT_CLASS, obj,
-    evas_obj_size_set(w, h),
-    evas_obj_position_set(x, y),
+    efl_gfx_size_set(w, h),
+    efl_gfx_position_set(x, y),
     evas_obj_name_set(WF_LAYOUT),
     efl_file_set(buf, WF_LAYOUT),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
   );
   result->e = evas_object_evas_get(result->layout);
 
@@ -233,8 +233,8 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
         evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
         evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
         evas_obj_name_set(WF_UNDERLAY),
-        evas_obj_color_set(0, 0, 0, 0),
-        evas_obj_visibility_set(EINA_TRUE)
+        efl_gfx_color_set(0, 0, 0, 0),
+        efl_gfx_visible_set(EINA_TRUE)
       );
     elm_object_part_content_set(result->layout, WF_UNDERLAY, obj);
     evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result);
@@ -252,9 +252,9 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
       result->hand[i] = eo_add(EVAS_IMAGE_CLASS, result->e,
         evas_obj_image_filled_set(EINA_TRUE),
         efl_file_set(buf, NULL),
-        evas_obj_size_set(31, 31),
-        evas_obj_position_set(cx - 15, cy - 15),
-        evas_obj_visibility_set(EINA_TRUE)
+        efl_gfx_size_set(31, 31),
+        efl_gfx_position_set(cx - 15, cy - 15),
+        efl_gfx_visible_set(EINA_TRUE)
       );
       evas_object_event_callback_add(result->hand[i], EVAS_CALLBACK_MOUSE_MOVE, _onHandleMove, result);
 //      eo_unref(result->hand[i]);
@@ -263,7 +263,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
     result->title = eo_add(ELM_LABEL_CLASS, result->layout,
         evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
         evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
-        evas_obj_visibility_set(EINA_TRUE)
+        efl_gfx_visible_set(EINA_TRUE)
       );
     elm_object_style_set(result->title, "marker");
     elm_object_text_set(result->title, title);
@@ -277,7 +277,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
     evas_obj_name_set(WF_SWALLOW),
     // TODO - Actually, this should be minus the size of the title stuff.
     elm_obj_grid_size_set(result->w, result->h),
-    evas_obj_visibility_set(EINA_TRUE)
+    efl_gfx_visible_set(EINA_TRUE)
   );
   elm_object_part_content_set(result->layout, WF_SWALLOW, result->grid);
 
@@ -410,7 +410,7 @@ Widget *widgetAdd(winFang *win, char *type , char *title, int x, int y, int w, i
     result->obj = eo_add(klass, win->win,
       evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
       evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
-      evas_obj_visibility_set(EINA_TRUE),
+      efl_gfx_visible_set(EINA_TRUE),
       eo_key_data_set("Widget", result, NULL)
     );