From 86e6b8bc5ba8e7939a18e14fe9e37d80d2699fe8 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 25 Sep 2014 10:31:35 +0100 Subject: [PATCH] Eo: Get rid of eo_add_custom. This has been deprecated for a while and is now completely dropped. --- src/bin/test_application_server.c | 4 ++-- src/bin/test_task_switcher.c | 2 +- src/examples/evas3d_map_example.c | 10 +++++----- src/examples/evas3d_object_on_button_example.c | 8 ++++---- src/examples/evas3d_scene_on_button_example.c | 8 ++++---- src/lib/elm_app_client.c | 13 ++----------- src/lib/elm_app_client.eo | 1 - src/lib/elm_app_server.c | 11 +---------- src/lib/elm_app_server.eo | 1 - src/lib/elm_win.c | 7 +++---- 10 files changed, 22 insertions(+), 43 deletions(-) diff --git a/src/bin/test_application_server.c b/src/bin/test_application_server.c index 05bffda..126a285 100644 --- a/src/bin/test_application_server.c +++ b/src/bin/test_application_server.c @@ -100,7 +100,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED, return NULL; } - view = eo_add_custom(ELM_APP_SERVER_VIEW_CLASS, app_server, + view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_constructor(NULL)); eo_do(view, id = elm_app_server_view_id_get()); @@ -142,7 +142,7 @@ test_application_server_common(const char *pkg) Elm_App_Server_View *view; Elm_App_Server *server; - server = eo_add_custom(ELM_APP_SERVER_CLASS, NULL, + server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(pkg, _create_view_cb)); eo_do(server, elm_app_server_title_set(pkg), views_iter = elm_app_server_views_get(), diff --git a/src/bin/test_task_switcher.c b/src/bin/test_task_switcher.c index e6858c8..93bbe55 100644 --- a/src/bin/test_task_switcher.c +++ b/src/bin/test_task_switcher.c @@ -304,7 +304,7 @@ _app_open(const char *package) return; } - app = eo_add_custom(ELM_APP_CLIENT_CLASS, NULL, + app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(package)); eo_do(app, eo_event_callback_add(ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, diff --git a/src/examples/evas3d_map_example.c b/src/examples/evas3d_map_example.c index eab1afb..2236187 100644 --- a/src/examples/evas3d_map_example.c +++ b/src/examples/evas3d_map_example.c @@ -901,7 +901,7 @@ skybox_setup(void) evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0), evas_3d_material_shininess_set(50.0)); - skybox_mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, + skybox_mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); eo_do(root_node, evas_3d_node_member_add(skybox_mesh_node)); eo_do(skybox_mesh_node, evas_3d_node_mesh_add(skybox_mesh)); @@ -961,7 +961,7 @@ camera_setup(void) camera_right_vec.y = 0.0; camera_right_vec.z = 0.0; - camera_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, + camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); eo_do(camera_node, evas_3d_node_camera_set(camera), @@ -980,7 +980,7 @@ light_setup(void) evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), evas_3d_light_specular_set(0.2, 0.2, 0.2, 1.0)); - light_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, + light_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); eo_do(light_node, evas_3d_node_light_set(light), @@ -1042,7 +1042,7 @@ mesh_setup(void) evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0), evas_3d_material_shininess_set(50.0)); - mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, + mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); eo_do(root_node, evas_3d_node_member_add(mesh_node)); eo_do(mesh_node, evas_3d_node_mesh_add(mesh)); @@ -1215,7 +1215,7 @@ elm_main(int argc, char **argv) scene = eo_add(EVAS_3D_SCENE_CLASS, evas); /* Add a root node for the scene. */ - root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, + root_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); skybox_setup(); diff --git a/src/examples/evas3d_object_on_button_example.c b/src/examples/evas3d_object_on_button_example.c index 14bd97d..0f97f8a 100644 --- a/src/examples/evas3d_object_on_button_example.c +++ b/src/examples/evas3d_object_on_button_example.c @@ -163,7 +163,7 @@ _camera_setup(Scene_Data *data) evas_3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0)); data->camera_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); eo_do(data->camera_node, evas_3d_node_camera_set(data->camera), @@ -183,7 +183,7 @@ _light_setup(Scene_Data *data) evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); data->light_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); eo_do(data->light_node, evas_3d_node_light_set(data->light), @@ -239,7 +239,7 @@ _mesh_setup(Scene_Data *data) evas_3d_mesh_frame_material_set(0, data->material)); data->mesh_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); @@ -254,7 +254,7 @@ _scene_setup(Scene_Data *data) evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); data->root_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); _camera_setup(data); diff --git a/src/examples/evas3d_scene_on_button_example.c b/src/examples/evas3d_scene_on_button_example.c index 19990e7..9662cc5 100644 --- a/src/examples/evas3d_scene_on_button_example.c +++ b/src/examples/evas3d_scene_on_button_example.c @@ -127,7 +127,7 @@ _camera_setup(Scene_Data *data) evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); data->camera_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); eo_do(data->camera_node, evas_3d_node_camera_set(data->camera), @@ -147,7 +147,7 @@ _light_setup(Scene_Data *data) evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); data->light_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); eo_do(data->light_node, evas_3d_node_light_set(data->light), @@ -201,7 +201,7 @@ _mesh_setup(Scene_Data *data) evas_3d_mesh_frame_material_set(0, data->material)); data->mesh_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); @@ -216,7 +216,7 @@ _scene_setup(Scene_Data *data) evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); data->root_node = - eo_add_custom(EVAS_3D_NODE_CLASS, evas, + eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); _camera_setup(data); diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c index d4085d1..c5bb560 100644 --- a/src/lib/elm_app_client.c +++ b/src/lib/elm_app_client.c @@ -37,7 +37,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli if (view) continue; - view = eo_add_custom(ELM_APP_CLIENT_VIEW_CLASS, eo, + view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_constructor(obj_path)); eina_hash_add(data->views, obj_path, view); if (!loading_list) @@ -162,8 +162,6 @@ _elm_app_client_constructor(Eo *eo, Elm_App_Client_Data *data, const char *pkg) EINA_SAFETY_ON_NULL_GOTO(pkg, error); - eo_do_super(eo, MY_CLASS, eo_constructor()); - data->views = eina_hash_string_small_new(NULL); path = _dbus_package_to_path(pkg); @@ -221,7 +219,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) view = eina_hash_find(cdata->views, view_path); if (!view) { - view = eo_add_custom(ELM_APP_CLIENT_VIEW_CLASS, eo, + view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_constructor(view_path)); eina_hash_add(cdata->views, view_path, view); eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED, @@ -308,13 +306,6 @@ _elm_app_client_view_open_cancel(Eo *eo EINA_UNUSED, Elm_App_Client_Data *_pd EI } EOLIAN static void -_elm_app_client_eo_base_constructor(Eo *obj, Elm_App_Client_Data *_pd EINA_UNUSED) -{ - eo_error_set(obj); - ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME); -} - -EOLIAN static void _elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data) { Eldbus_Object *obj; diff --git a/src/lib/elm_app_client.eo b/src/lib/elm_app_client.eo index d54264a..c2b4bdd 100644 --- a/src/lib/elm_app_client.eo +++ b/src/lib/elm_app_client.eo @@ -51,7 +51,6 @@ class Elm_App_Client (Eo.Base) } } implements { - Eo.Base.constructor; Eo.Base.destructor; } constructors { diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c index 4acc022..e5dc559 100644 --- a/src/lib/elm_app_server.c +++ b/src/lib/elm_app_server.c @@ -205,8 +205,6 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg, EINA_SAFETY_ON_NULL_GOTO(data->create_view_cb, error); EINA_SAFETY_ON_TRUE_GOTO(!pkg, error); - eo_do_super(obj, MY_CLASS, eo_constructor()); - data->views = eina_hash_string_small_new(NULL); data->PID = getpid(); data->title = eina_stringshare_add(""); @@ -257,7 +255,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg, new_events = elm_app_server_view_props_new_events_get(view_eet_props); progress = elm_app_server_view_props_progress_get(view_eet_props); - view = eo_add_custom(ELM_APP_SERVER_VIEW_CLASS, obj, + view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_constructor(view_id)); if (!view) continue; @@ -446,11 +444,4 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data) eo_do_super(obj, MY_CLASS, eo_destructor()); } -EOLIAN static void -_elm_app_server_eo_base_constructor(Eo *obj, Elm_App_Server_Data *_pd EINA_UNUSED) -{ - eo_error_set(obj); - ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME); -} - #include "elm_app_server.eo.c" diff --git a/src/lib/elm_app_server.eo b/src/lib/elm_app_server.eo index bd7748e..a15ebca 100644 --- a/src/lib/elm_app_server.eo +++ b/src/lib/elm_app_server.eo @@ -89,7 +89,6 @@ class Elm_App_Server (Eo.Base) } } implements { - Eo.Base.constructor; Eo.Base.destructor; } constructors { diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index e3b0565..54d1853 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -2864,7 +2864,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) { - Evas_Object *obj = eo_add_custom(MY_CLASS, parent, elm_obj_win_constructor(name, type)); + Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_constructor(name, type)); eo_unref(obj); return obj; } @@ -3505,10 +3505,9 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t } EOLIAN static void -_elm_win_eo_base_constructor(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED) +_elm_win_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Win_Data *_pd EINA_UNUSED) { - eo_error_set(obj); - ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME); + /* Do nothing. */ } EOLIAN static Elm_Win_Type -- 2.7.4