Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 16258) +++ trunk/src/change.c (revision 16259) @@ -119,7 +119,7 @@ }; static pcb_opfunc_t ChangeNameFunctions = { - pcb_lineop_change_name, + NULL, pcb_textop_change_name, NULL, NULL, @@ -756,10 +756,6 @@ } switch (Type) { - case PCB_OBJ_LINE: - name = pcb_gui->prompt_for(_("Linename:"), PCB_EMPTY(((pcb_line_t *) Ptr2)->Number)); - break; - case PCB_OBJ_TEXT: name = pcb_gui->prompt_for(_("Enter text:"), PCB_EMPTY(((pcb_text_t *) Ptr2)->TextString)); break; Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 16258) +++ trunk/src/layer.c (revision 16259) @@ -128,12 +128,6 @@ free(text->TextString); } PCB_END_LOOP; - PCB_LINE_LOOP(layer); - { - if (line->Number) - free(line->Number); - } - PCB_END_LOOP; list_map0(&layer->Line, pcb_line_t, pcb_line_free); list_map0(&layer->Arc, pcb_arc_t, pcb_arc_free); Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 16258) +++ trunk/src/obj_line.c (revision 16259) @@ -237,8 +237,6 @@ if (dst == NULL) return NULL; pcb_attribute_copy_all(&dst->Attributes, &src->Attributes); - if (src->Number != NULL) - dst->Number = pcb_strdup(src->Number); return dst; } @@ -452,16 +450,6 @@ return NULL; } -/* changes the name of a line */ -void *pcb_lineop_change_name(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) -{ - char *old = Line->Number; - - Layer = Layer; - Line->Number = ctx->chgname.new_name; - return old; -} - /* changes the clearance flag of a line */ void *pcb_lineop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { @@ -713,7 +701,6 @@ void *pcb_lineop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); - free(Line->Number); pcb_line_free(Line); return NULL; Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 16258) +++ trunk/src/obj_line.h (revision 16259) @@ -36,7 +36,6 @@ struct pcb_line_s { /* holds information about one line */ PCB_ANYLINEFIELDS; - char *Number; gdl_elem_t link; /* a line is in a list: either on a layer or in an element */ }; Index: trunk/src/obj_line_op.h =================================================================== --- trunk/src/obj_line_op.h (revision 16258) +++ trunk/src/obj_line_op.h (revision 16259) @@ -33,7 +33,6 @@ void *pcb_lineop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); -void *pcb_lineop_change_name(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 16258) +++ trunk/src/route.c (revision 16259) @@ -442,7 +442,6 @@ int i; int applied = 0; - char * number = (apply_to_line ? apply_to_line->Number : NULL); for( i=0;isize;i++) { pcb_route_object_t const * p_obj = &p_route->objects[i]; @@ -503,8 +502,6 @@ p_route->clearance, p_route->flags ); if(line) { - if(number) - line->Number = pcb_strdup(number); pcb_added_lines++; pcb_obj_add_attribs(line, PCB->pen_attr); pcb_line_invalidate_draw(layer, line); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 16258) +++ trunk/src_plugins/report/report.c (revision 16259) @@ -208,13 +208,13 @@ "It is on layer %d\n" "and has name \"%s\".\n" "%s" - "%s%s%s", USER_UNITMASK, + "%s%s", USER_UNITMASK, line->ID, pcb_strflg_f2s(line->Flags, PCB_OBJ_LINE, NULL), line->Point1.X, line->Point1.Y, line->Point1.ID, line->Point2.X, line->Point2.Y, line->Point2.ID, line->Thickness, line->Clearance / 2, pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), - PCB_UNKNOWN(line->Number), gen_locked(line), gen_term(line)); + gen_locked(line), gen_term(line)); break; } case PCB_OBJ_RAT: