Removed function as s_delete() does the same thing.
---
gschem/src/o_delete.c | 2 +-
libgeda/include/prototype.h | 1 -
libgeda/src/o_complex_basic.c | 24 ------------------------
3 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/gschem/src/o_delete.c b/gschem/src/o_delete.c
index df45421..e482d03 100644
--- a/gschem/src/o_delete.c
+++ b/gschem/src/o_delete.c
@@ -126,7 +126,7 @@ void o_delete_complex(GSCHEM_TOPLEVEL *w_current, OBJECT
*obj)
other_objects = s_conn_return_complex_others(other_objects, obj);
- o_complex_delete(toplevel, obj);
+ s_delete(toplevel, obj);
/*! \todo special case hack no return_tail. why? */
o_cue_undraw_list(w_current, other_objects);
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 0fb548c..1f6743e 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -201,7 +201,6 @@ void o_complex_free_filename(TOPLEVEL *toplevel);
void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT
*object);
OBJECT *o_complex_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT
*o_current);
OBJECT *o_complex_copy_embedded(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT
*o_current);
-void o_complex_delete(TOPLEVEL *toplevel, OBJECT *delete);
void o_complex_set_color(OBJECT *prim_objs, int color);
void o_complex_set_color_single(OBJECT *o_current, int color);
void o_complex_set_color_save(OBJECT *complex, int color);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index a4fb831..7ee9d69 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -929,30 +929,6 @@ OBJECT *o_complex_copy_embedded(TOPLEVEL *toplevel, OBJECT
*list_tail,
* \par Function Description
*
*/
-void o_complex_delete(TOPLEVEL *toplevel, OBJECT *delete)
-{
- g_return_if_fail(delete != NULL);
-
- /* first remove complex pointer */
- if (delete->complex) {
- if (delete->complex->prim_objs) {
- s_delete_list_fromstart(toplevel,
- delete->complex->prim_objs);
- }
- delete->complex->prim_objs = NULL;
- }
-
- /* then remove the actual node */
- s_delete(toplevel, delete);
- delete = NULL;
- toplevel->page_current->object_tail = (OBJECT *)
- return_tail(toplevel->page_current->object_head);
-}
-
-/*! \brief
- * \par Function Description
- *
- */
void o_complex_set_color(OBJECT *prim_objs, int color)
{
OBJECT *o_current=NULL;
--
1.5.6
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
