diff options
author | David Walter Seikel | 2015-03-22 18:37:52 +1000 |
---|---|---|
committer | David Walter Seikel | 2015-03-22 18:37:52 +1000 |
commit | 637c3429abb382adb724134e06ff97d54551582f (patch) | |
tree | 00736d7b65e35892d871e0698be71a56dae797e9 | |
parent | Comment out markers around commented out code. (diff) | |
download | SledjHamr-637c3429abb382adb724134e06ff97d54551582f.zip SledjHamr-637c3429abb382adb724134e06ff97d54551582f.tar.gz SledjHamr-637c3429abb382adb724134e06ff97d54551582f.tar.bz2 SledjHamr-637c3429abb382adb724134e06ff97d54551582f.tar.xz |
We don't need no stinkin' eo_unrefs. Anymore. Though leave them there, in case they change their mind again.
-rw-r--r-- | src/extantz/ephysics_demo.c | 4 | ||||
-rw-r--r-- | src/extantz/extantz.c | 2 | ||||
-rw-r--r-- | src/extantz/files.c | 12 | ||||
-rw-r--r-- | src/extantz/scenri.c | 4 | ||||
-rw-r--r-- | src/extantz/woMan.c | 2 | ||||
-rw-r--r-- | 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) | |||
46 | ephysics_body_linear_velocity_set(box_body1, -150, 20, 0); | 46 | ephysics_body_linear_velocity_set(box_body1, -150, 20, 0); |
47 | ephysics_body_angular_velocity_set(box_body1, 0, 0, 36); | 47 | ephysics_body_angular_velocity_set(box_body1, 0, 0, 36); |
48 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); | 48 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); |
49 | eo_unref(box1); | 49 | // eo_unref(box1); |
50 | 50 | ||
51 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); | 51 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); |
52 | box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, | 52 | box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, |
@@ -63,7 +63,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) | |||
63 | ephysics_body_linear_velocity_set(box_body2, 800, -600, 0); | 63 | ephysics_body_linear_velocity_set(box_body2, 800, -600, 0); |
64 | ephysics_body_angular_velocity_set(box_body2, 0, 0, 360); | 64 | ephysics_body_angular_velocity_set(box_body2, 0, 0, 360); |
65 | ephysics_body_sleeping_threshold_set(box_body2, 0.1, 0.1); | 65 | ephysics_body_sleeping_threshold_set(box_body2, 0.1, 0.1); |
66 | eo_unref(box2); | 66 | // eo_unref(box2); |
67 | 67 | ||
68 | ephysics_world_gravity_set(world, 0, 0, 0); | 68 | ephysics_world_gravity_set(world, 0, 0, 0); |
69 | 69 | ||
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) | |||
732 | ecore_animator_del(ourGlobals.animator); | 732 | ecore_animator_del(ourGlobals.animator); |
733 | Evas_3D_Demo_fini(&ourGlobals); | 733 | Evas_3D_Demo_fini(&ourGlobals); |
734 | scenriDel(ourGlobals.scene); | 734 | scenriDel(ourGlobals.scene); |
735 | eo_unref(ourGlobals.tb); | 735 | // eo_unref(ourGlobals.tb); |
736 | winFangDel(ourGlobals.mainWindow); | 736 | winFangDel(ourGlobals.mainWindow); |
737 | } | 737 | } |
738 | 738 | ||
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 | |||
197 | ); | 197 | ); |
198 | elm_object_text_set(hoversel, "sorting"); | 198 | elm_object_text_set(hoversel, "sorting"); |
199 | elm_box_pack_end(vbox, hoversel); | 199 | elm_box_pack_end(vbox, hoversel); |
200 | eo_unref(hoversel); | 200 | // eo_unref(hoversel); |
201 | 201 | ||
202 | hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, | 202 | hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, |
203 | elm_obj_hoversel_hover_parent_set(me->win), | 203 | elm_obj_hoversel_hover_parent_set(me->win), |
@@ -212,7 +212,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
212 | elm_box_pack_end(vbox, hoversel); | 212 | elm_box_pack_end(vbox, hoversel); |
213 | // Make sure it starts off as small, works around "hitting grid mode before hitting size not showing anything" bug. | 213 | // Make sure it starts off as small, works around "hitting grid mode before hitting size not showing anything" bug. |
214 | _small_icon_clicked(fs, hoversel, NULL); | 214 | _small_icon_clicked(fs, hoversel, NULL); |
215 | eo_unref(hoversel); | 215 | // eo_unref(hoversel); |
216 | 216 | ||
217 | 217 | ||
218 | bt = eo_add(ELM_CHECK_CLASS, vbox, | 218 | bt = eo_add(ELM_CHECK_CLASS, vbox, |
@@ -222,7 +222,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
222 | elm_object_text_set(bt, "hidden"); | 222 | elm_object_text_set(bt, "hidden"); |
223 | evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); | 223 | evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); |
224 | elm_box_pack_end(vbox, bt); | 224 | elm_box_pack_end(vbox, bt); |
225 | eo_unref(bt); | 225 | // eo_unref(bt); |
226 | 226 | ||
227 | rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, | 227 | rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, |
228 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), | 228 | 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 | |||
253 | elm_object_text_set(bt, "OK"); | 253 | elm_object_text_set(bt, "OK"); |
254 | evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); | 254 | evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); |
255 | elm_box_pack_end(vbox, bt); | 255 | elm_box_pack_end(vbox, bt); |
256 | eo_unref(bt); | 256 | // eo_unref(bt); |
257 | 257 | ||
258 | bt = eo_add(ELM_BUTTON_CLASS, me->win, | 258 | bt = eo_add(ELM_BUTTON_CLASS, me->win, |
259 | evas_obj_visibility_set(EINA_TRUE) | 259 | evas_obj_visibility_set(EINA_TRUE) |
@@ -261,11 +261,11 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
261 | elm_object_text_set(bt, "CANCEL"); | 261 | elm_object_text_set(bt, "CANCEL"); |
262 | evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); | 262 | evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); |
263 | elm_box_pack_end(vbox, bt); | 263 | elm_box_pack_end(vbox, bt); |
264 | eo_unref(bt); | 264 | // eo_unref(bt); |
265 | 265 | ||
266 | elm_layout_box_append(me->win, WF_BOX, vbox); | 266 | elm_layout_box_append(me->win, WF_BOX, vbox); |
267 | evas_object_show(vbox); | 267 | evas_object_show(vbox); |
268 | eo_unref(vbox); | 268 | // eo_unref(vbox); |
269 | winFangCalcMinSize(me); | 269 | winFangCalcMinSize(me); |
270 | 270 | ||
271 | winFangHide(me); | 271 | 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) | |||
477 | free(scene->move); | 477 | free(scene->move); |
478 | // eo_unref(scene->camera_node); | 478 | // eo_unref(scene->camera_node); |
479 | 479 | ||
480 | eo_unref(scene->image); | 480 | // eo_unref(scene->image); |
481 | eo_unref(scene->scene); | 481 | // eo_unref(scene->scene); |
482 | // eo_unref(scene->root_node); | 482 | // eo_unref(scene->root_node); |
483 | free(scene); | 483 | free(scene); |
484 | } | 484 | } |
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) | |||
280 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. | 280 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. |
281 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); | 281 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); |
282 | elm_layout_box_append(me->win, WF_BOX, bt); | 282 | elm_layout_box_append(me->win, WF_BOX, bt); |
283 | eo_unref(bt); | 283 | // eo_unref(bt); |
284 | 284 | ||
285 | winFangCalcMinSize(me); | 285 | winFangCalcMinSize(me); |
286 | 286 | ||
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 | |||
238 | ); | 238 | ); |
239 | elm_object_part_content_set(result->layout, WF_UNDERLAY, obj); | 239 | elm_object_part_content_set(result->layout, WF_UNDERLAY, obj); |
240 | evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result); | 240 | evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result); |
241 | eo_unref(obj); | 241 | // eo_unref(obj); |
242 | 242 | ||
243 | // Create corner handles. | 243 | // Create corner handles. |
244 | snprintf(buf, sizeof(buf), "%s/pt.png", prefix_data_get()); | 244 | 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 | |||
257 | evas_obj_visibility_set(EINA_TRUE) | 257 | evas_obj_visibility_set(EINA_TRUE) |
258 | ); | 258 | ); |
259 | evas_object_event_callback_add(result->hand[i], EVAS_CALLBACK_MOUSE_MOVE, _onHandleMove, result); | 259 | evas_object_event_callback_add(result->hand[i], EVAS_CALLBACK_MOUSE_MOVE, _onHandleMove, result); |
260 | eo_unref(result->hand[i]); | 260 | // eo_unref(result->hand[i]); |
261 | } | 261 | } |
262 | 262 | ||
263 | result->title = eo_add(ELM_LABEL_CLASS, result->layout, | 263 | 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 | |||
268 | elm_object_style_set(result->title, "marker"); | 268 | elm_object_style_set(result->title, "marker"); |
269 | elm_object_text_set(result->title, title); | 269 | elm_object_text_set(result->title, title); |
270 | elm_object_part_content_set(result->layout, WF_TITLE, result->title); | 270 | elm_object_part_content_set(result->layout, WF_TITLE, result->title); |
271 | eo_unref(result->title); | 271 | // eo_unref(result->title); |
272 | } | 272 | } |
273 | 273 | ||
274 | result->grid = eo_add(ELM_GRID_CLASS, result->layout, | 274 | 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 | |||
286 | if (result->parent) | 286 | if (result->parent) |
287 | { | 287 | { |
288 | #if 0 | 288 | #if 0 |
289 | // EPysics enable the window. | 289 | // EPhysics enable the window. |
290 | if (world) | 290 | if (world) |
291 | { | 291 | { |
292 | result->body = ephysics_body_box_add(world); | 292 | result->body = ephysics_body_box_add(world); |
@@ -340,9 +340,9 @@ void winFangDel(winFang *win) | |||
340 | 340 | ||
341 | if (!win) return; | 341 | if (!win) return; |
342 | 342 | ||
343 | if (win->bg) eo_unref(win->bg); | 343 | // if (win->bg) eo_unref(win->bg); |
344 | if (win->grid) eo_unref(win->grid); | 344 | // if (win->grid) eo_unref(win->grid); |
345 | if (win->layout) eo_unref(win->layout); | 345 | // if (win->layout) eo_unref(win->layout); |
346 | EINA_CLIST_FOR_EACH_ENTRY_SAFE(wf, wf2, &win->winFangs, winFang, node) | 346 | EINA_CLIST_FOR_EACH_ENTRY_SAFE(wf, wf2, &win->winFangs, winFang, node) |
347 | { | 347 | { |
348 | winFangDel(wf); | 348 | winFangDel(wf); |
@@ -456,7 +456,7 @@ void widgetDel(Widget *wid) | |||
456 | // The bug is that editable entry widgets cause the app to hang on exit. | 456 | // The bug is that editable entry widgets cause the app to hang on exit. |
457 | if (strcmp(WT_ENTRY, wid->type) == 0) | 457 | if (strcmp(WT_ENTRY, wid->type) == 0) |
458 | elm_entry_editable_set(wid->obj, EINA_FALSE); | 458 | elm_entry_editable_set(wid->obj, EINA_FALSE); |
459 | eo_unref(wid->obj); | 459 | // eo_unref(wid->obj); |
460 | free(wid); | 460 | free(wid); |
461 | } | 461 | } |
462 | } | 462 | } |