From 637c3429abb382adb724134e06ff97d54551582f Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 22 Mar 2015 18:37:52 +1000 Subject: We don't need no stinkin' eo_unrefs. Anymore. Though leave them there, in case they change their mind again. --- src/extantz/ephysics_demo.c | 4 ++-- src/extantz/extantz.c | 2 +- src/extantz/files.c | 12 ++++++------ src/extantz/scenri.c | 4 ++-- src/extantz/woMan.c | 2 +- src/libraries/winFang.c | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c index 7ba1fc8..a7d7c7b 100644 --- a/src/extantz/ephysics_demo.c +++ b/src/extantz/ephysics_demo.c @@ -46,7 +46,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) ephysics_body_linear_velocity_set(box_body1, -150, 20, 0); ephysics_body_angular_velocity_set(box_body1, 0, 0, 36); ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); - eo_unref(box1); +// eo_unref(box1); sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, @@ -63,7 +63,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) ephysics_body_linear_velocity_set(box_body2, 800, -600, 0); ephysics_body_angular_velocity_set(box_body2, 0, 0, 360); ephysics_body_sleeping_threshold_set(box_body2, 0.1, 0.1); - eo_unref(box2); +// eo_unref(box2); ephysics_world_gravity_set(world, 0, 0, 0); diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 833e67e..4a40137 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -732,7 +732,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) ecore_animator_del(ourGlobals.animator); Evas_3D_Demo_fini(&ourGlobals); scenriDel(ourGlobals.scene); - eo_unref(ourGlobals.tb); +// eo_unref(ourGlobals.tb); winFangDel(ourGlobals.mainWindow); } diff --git a/src/extantz/files.c b/src/extantz/files.c index 3d5d3d3..189822d 100644 --- a/src/extantz/files.c +++ b/src/extantz/files.c @@ -197,7 +197,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa ); elm_object_text_set(hoversel, "sorting"); elm_box_pack_end(vbox, hoversel); - eo_unref(hoversel); +// eo_unref(hoversel); hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, elm_obj_hoversel_hover_parent_set(me->win), @@ -212,7 +212,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa elm_box_pack_end(vbox, hoversel); // Make sure it starts off as small, works around "hitting grid mode before hitting size not showing anything" bug. _small_icon_clicked(fs, hoversel, NULL); - eo_unref(hoversel); +// eo_unref(hoversel); bt = eo_add(ELM_CHECK_CLASS, vbox, @@ -222,7 +222,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa elm_object_text_set(bt, "hidden"); evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); elm_box_pack_end(vbox, bt); - eo_unref(bt); +// eo_unref(bt); rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), @@ -253,7 +253,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa elm_object_text_set(bt, "OK"); evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); elm_box_pack_end(vbox, bt); - eo_unref(bt); +// eo_unref(bt); bt = eo_add(ELM_BUTTON_CLASS, me->win, evas_obj_visibility_set(EINA_TRUE) @@ -261,11 +261,11 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa elm_object_text_set(bt, "CANCEL"); evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); elm_box_pack_end(vbox, bt); - eo_unref(bt); +// eo_unref(bt); elm_layout_box_append(me->win, WF_BOX, vbox); evas_object_show(vbox); - eo_unref(vbox); +// eo_unref(vbox); winFangCalcMinSize(me); winFangHide(me); diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c index e6462a0..1e7831d 100644 --- a/src/extantz/scenri.c +++ b/src/extantz/scenri.c @@ -477,8 +477,8 @@ void scenriDel(Scene_Data *scene) free(scene->move); // eo_unref(scene->camera_node); - eo_unref(scene->image); - eo_unref(scene->scene); +// eo_unref(scene->image); +// eo_unref(scene->scene); // eo_unref(scene->root_node); free(scene); } diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index a6f6717..2f6e9a5 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c @@ -280,7 +280,7 @@ winFang *woMan_add(globals *ourGlobals) elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); elm_layout_box_append(me->win, WF_BOX, bt); - eo_unref(bt); +// eo_unref(bt); winFangCalcMinSize(me); diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c index 8bcfe3a..1aaa7bd 100644 --- a/src/libraries/winFang.c +++ b/src/libraries/winFang.c @@ -238,7 +238,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch ); elm_object_part_content_set(result->layout, WF_UNDERLAY, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result); - eo_unref(obj); +// eo_unref(obj); // Create corner handles. snprintf(buf, sizeof(buf), "%s/pt.png", prefix_data_get()); @@ -257,7 +257,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch evas_obj_visibility_set(EINA_TRUE) ); evas_object_event_callback_add(result->hand[i], EVAS_CALLBACK_MOUSE_MOVE, _onHandleMove, result); - eo_unref(result->hand[i]); +// eo_unref(result->hand[i]); } result->title = eo_add(ELM_LABEL_CLASS, result->layout, @@ -268,7 +268,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch elm_object_style_set(result->title, "marker"); elm_object_text_set(result->title, title); elm_object_part_content_set(result->layout, WF_TITLE, result->title); - eo_unref(result->title); +// eo_unref(result->title); } result->grid = eo_add(ELM_GRID_CLASS, result->layout, @@ -286,7 +286,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch if (result->parent) { #if 0 - // EPysics enable the window. + // EPhysics enable the window. if (world) { result->body = ephysics_body_box_add(world); @@ -340,9 +340,9 @@ void winFangDel(winFang *win) if (!win) return; - if (win->bg) eo_unref(win->bg); - if (win->grid) eo_unref(win->grid); - if (win->layout) eo_unref(win->layout); +// if (win->bg) eo_unref(win->bg); +// if (win->grid) eo_unref(win->grid); +// if (win->layout) eo_unref(win->layout); EINA_CLIST_FOR_EACH_ENTRY_SAFE(wf, wf2, &win->winFangs, winFang, node) { winFangDel(wf); @@ -456,7 +456,7 @@ void widgetDel(Widget *wid) // The bug is that editable entry widgets cause the app to hang on exit. if (strcmp(WT_ENTRY, wid->type) == 0) elm_entry_editable_set(wid->obj, EINA_FALSE); - eo_unref(wid->obj); +// eo_unref(wid->obj); free(wid); } } -- cgit v1.1