6 files changed, 34 insertions, 34 deletions

diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c
index a86cad2..23bc125 100644
--- a/src/extantz/ephysics_demo.c
+++ b/src/extantz/ephysics_demo.c
@@ -32,7 +32,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals)
   ephysics_body_friction_set(boundary, 0);
 
   sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME);
-  box1 = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win,
+  box1 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win,
     elm_obj_image_file_set(buf, "blue-cube"),
     evas_obj_size_set(70, 70),
     evas_obj_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200),
@@ -49,7 +49,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals)
   eo_unref(box1);
 
   sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME);
-  box2 = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win,
+  box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win,
     elm_obj_image_file_set(buf, "purple-cube"),
     evas_obj_size_set(70, 70),
     evas_obj_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200),
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 7c90b8a..98669ea 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -482,7 +482,7 @@ static void makeMainMenu(globals *ourGlobals)
     Elm_Object_Item *tb_it;
 
     // A toolbar thingy.
-    tb = eo_add(ELM_OBJ_TOOLBAR_CLASS, ourGlobals->win,
+    tb = eo_add(ELM_TOOLBAR_CLASS, ourGlobals->win,
         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),
@@ -670,7 +670,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
   // Override the background image
 #if 1
   snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get());
-  ourGlobals.mainWindow->bg = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals.mainWindow->win,
+  ourGlobals.mainWindow->bg = eo_add(ELM_IMAGE_CLASS, ourGlobals.mainWindow->win,
     evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
     elm_obj_image_fill_outside_set(EINA_TRUE),
     elm_obj_image_file_set(buf, NULL),
diff --git a/src/extantz/files.c b/src/extantz/files.c
index 666842b..3d5d3d3 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -176,13 +176,13 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   // Call back for double click or Enter pressed on file.
   evas_object_smart_callback_add(fs, "activated", my_fileselector_activated, me);
 
-  vbox = eo_add(ELM_OBJ_BOX_CLASS, me->win,
+  vbox = eo_add(ELM_BOX_CLASS, me->win,
     elm_obj_box_homogeneous_set(EINA_FALSE),
     elm_obj_box_horizontal_set(EINA_TRUE),
     evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL)
   );
 
-  hoversel = eo_add(ELM_OBJ_HOVERSEL_CLASS, vbox,
+  hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox,
     elm_obj_hoversel_hover_parent_set(me->win),
     eo_key_data_set("fileselector", fs, NULL),
     elm_obj_hoversel_item_add("name(asc)",  NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_FILENAME_ASC),
@@ -199,7 +199,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   elm_box_pack_end(vbox, hoversel);
   eo_unref(hoversel);
 
-  hoversel = eo_add(ELM_OBJ_HOVERSEL_CLASS, vbox,
+  hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox,
     elm_obj_hoversel_hover_parent_set(me->win),
     eo_key_data_set("fileselector", fs, NULL),
     elm_obj_hoversel_item_add("tiny",   NULL, ELM_ICON_NONE, _tiny_icon_clicked,   fs),
@@ -215,7 +215,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   eo_unref(hoversel);
 
 
-  bt = eo_add(ELM_OBJ_CHECK_CLASS, vbox,
+  bt = eo_add(ELM_CHECK_CLASS, vbox,
     elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)),
     evas_obj_visibility_set(EINA_TRUE)
     );
@@ -224,7 +224,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   elm_box_pack_end(vbox, bt);
   eo_unref(bt);
 
-  rdg = rd = eo_add(ELM_OBJ_RADIO_CLASS, vbox,
+  rdg = rd = eo_add(ELM_RADIO_CLASS, vbox,
     elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID),
     evas_obj_visibility_set(EINA_TRUE)
     );
@@ -235,7 +235,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   _mode_changed_cb(fs, rd, NULL);
   eo_unref(rd);
 
-  rd = eo_add(ELM_OBJ_RADIO_CLASS, vbox,
+  rd = eo_add(ELM_RADIO_CLASS, vbox,
     elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST),
     evas_obj_visibility_set(EINA_TRUE)
     );
@@ -247,7 +247,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   // No need to unref this, it's taken care of already.
   //eo_unref(rdg);
 
-  bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win,
+  bt = eo_add(ELM_BUTTON_CLASS, me->win,
     evas_obj_visibility_set(EINA_TRUE)
   );
   elm_object_text_set(bt, "OK");
@@ -255,7 +255,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   elm_box_pack_end(vbox, bt);
   eo_unref(bt);
 
-  bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win,
+  bt = eo_add(ELM_BUTTON_CLASS, me->win,
     evas_obj_visibility_set(EINA_TRUE)
   );
   elm_object_text_set(bt, "CANCEL");
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c
index 2a02996..42a7987 100644
--- a/src/extantz/scenri.c
+++ b/src/extantz/scenri.c
@@ -373,7 +373,7 @@ Scene_Data *scenriAdd(Evas_Object *win)
   // Any colour or texture applied to this window gets applied to the scene, including transparency.
   // Interestingly enough, the position and size of the render seems to NOT depend on the position and size of this image?
   // Note that we can't reuse the windows background image, Evas_3D needs both images.
-  scene->image = eo_add(ELM_OBJ_IMAGE_CLASS, 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),
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 09e7e2d..a6f6717 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -271,7 +271,7 @@ winFang *woMan_add(globals *ourGlobals)
     tab = gridList;                             tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it);
     elm_layout_box_append(me->win, WF_BOX, nf);
 
-    bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win,
+    bt = eo_add(ELM_BUTTON_CLASS, me->win,
 //              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),
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index 9319a18..0176a1b 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -211,7 +211,7 @@ 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_OBJ_LAYOUT_CLASS, obj,
+  result->layout = eo_add(ELM_LAYOUT_CLASS, obj,
     evas_obj_size_set(w, h),
     evas_obj_position_set(x, y),
     evas_obj_name_set(WF_LAYOUT),
@@ -229,7 +229,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
 
     // Something to catch clicks on the background, for moving the window.
     // Coz Elm is uncooperative with this sort of thing, so we need to stick in a rectangle.
-    obj = eo_add(EVAS_OBJ_RECTANGLE_CLASS, result->layout,
+    obj = eo_add(EVAS_RECTANGLE_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_name_set(WF_UNDERLAY),
@@ -249,7 +249,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
            if (i == 1)   cx += result->w;
       else if (i == 2)  {cx += result->w;  cy += result->h;}
       else if (i == 3)   cy += result->h;
-      result->hand[i] = eo_add(EVAS_OBJ_IMAGE_CLASS, result->e,
+      result->hand[i] = eo_add(EVAS_IMAGE_CLASS, result->e,
         evas_obj_image_filled_set(EINA_TRUE),
         evas_obj_image_file_set(buf, NULL),
         evas_obj_size_set(31, 31),
@@ -260,7 +260,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
       eo_unref(result->hand[i]);
     }
 
-    result->title = eo_add(ELM_OBJ_LABEL_CLASS, result->layout,
+    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)
@@ -271,7 +271,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
     eo_unref(result->title);
   }
 
-  result->grid = eo_add(ELM_OBJ_GRID_CLASS, result->layout,
+  result->grid = eo_add(ELM_GRID_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_name_set(WF_SWALLOW),
@@ -373,21 +373,21 @@ Widget *widgetAdd(winFang *win, char *type , char *title, int x, int y, int w, i
   if (NULL == widgetClasses[0].name)
   {
     i = 0;
-    widgetClasses[i].name = WT_CHECK;   widgetClasses[i++].klass =      ELM_OBJ_CHECK_CLASS;
-    widgetClasses[i].name = WT_BOX;     widgetClasses[i++].klass =      ELM_OBJ_BOX_CLASS;
-    widgetClasses[i].name = WT_BUTTON;  widgetClasses[i++].klass =      ELM_OBJ_BUTTON_CLASS;
-    widgetClasses[i].name = WT_ENTRY;   widgetClasses[i++].klass =      ELM_OBJ_ENTRY_CLASS;
-    widgetClasses[i].name = WT_FILES;   widgetClasses[i++].klass =      ELM_OBJ_FILESELECTOR_CLASS;
-    widgetClasses[i].name = WT_GRID;    widgetClasses[i++].klass =      ELM_OBJ_GRID_CLASS;
-    widgetClasses[i].name = WT_HOVER;   widgetClasses[i++].klass =      ELM_OBJ_HOVERSEL_CLASS;
-    widgetClasses[i].name = WT_IMAGE;   widgetClasses[i++].klass =      ELM_OBJ_IMAGE_CLASS;
-    widgetClasses[i].name = WT_LABEL;   widgetClasses[i++].klass =      ELM_OBJ_LABEL_CLASS;
-    widgetClasses[i].name = WT_LAYOUT;  widgetClasses[i++].klass =      ELM_OBJ_LAYOUT_CLASS;
-    widgetClasses[i].name = WT_RADIO;   widgetClasses[i++].klass =      ELM_OBJ_RADIO_CLASS;
-    widgetClasses[i].name = WT_RECT;    widgetClasses[i++].klass =      EVAS_OBJ_RECTANGLE_CLASS;
-    widgetClasses[i].name = WT_TEXT;    widgetClasses[i++].klass =      EVAS_OBJ_TEXT_CLASS;
-    widgetClasses[i].name = WT_TEXTBOX; widgetClasses[i++].klass =      ELM_OBJ_ENTRY_CLASS;
-    widgetClasses[i].name = WT_TOOLBAR; widgetClasses[i++].klass =      ELM_OBJ_TOOLBAR_CLASS;
+    widgetClasses[i].name = WT_CHECK;   widgetClasses[i++].klass =      ELM_CHECK_CLASS;
+    widgetClasses[i].name = WT_BOX;     widgetClasses[i++].klass =      ELM_BOX_CLASS;
+    widgetClasses[i].name = WT_BUTTON;  widgetClasses[i++].klass =      ELM_BUTTON_CLASS;
+    widgetClasses[i].name = WT_ENTRY;   widgetClasses[i++].klass =      ELM_ENTRY_CLASS;
+    widgetClasses[i].name = WT_FILES;   widgetClasses[i++].klass =      ELM_FILESELECTOR_CLASS;
+    widgetClasses[i].name = WT_GRID;    widgetClasses[i++].klass =      ELM_GRID_CLASS;
+    widgetClasses[i].name = WT_HOVER;   widgetClasses[i++].klass =      ELM_HOVERSEL_CLASS;
+    widgetClasses[i].name = WT_IMAGE;   widgetClasses[i++].klass =      ELM_IMAGE_CLASS;
+    widgetClasses[i].name = WT_LABEL;   widgetClasses[i++].klass =      ELM_LABEL_CLASS;
+    widgetClasses[i].name = WT_LAYOUT;  widgetClasses[i++].klass =      ELM_LAYOUT_CLASS;
+    widgetClasses[i].name = WT_RADIO;   widgetClasses[i++].klass =      ELM_RADIO_CLASS;
+    widgetClasses[i].name = WT_RECT;    widgetClasses[i++].klass =      EVAS_RECTANGLE_CLASS;
+    widgetClasses[i].name = WT_TEXT;    widgetClasses[i++].klass =      EVAS_TEXT_CLASS;
+    widgetClasses[i].name = WT_TEXTBOX; widgetClasses[i++].klass =      ELM_ENTRY_CLASS;
+    widgetClasses[i].name = WT_TOOLBAR; widgetClasses[i++].klass =      ELM_TOOLBAR_CLASS;
   }
 
   for (i = 0; i < ARRAY_LENGTH(widgetClasses); i++)