Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4775) +++ trunk/src/action_helper.c (revision 4776) @@ -75,8 +75,8 @@ break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: - *x = ((TextTypePtr) ptr2)->X; - *y = ((TextTypePtr) ptr2)->Y; + *x = ((pcb_text_t *) ptr2)->X; + *y = ((pcb_text_t *) ptr2)->Y; break; case PCB_TYPE_ELEMENT: *x = ((pcb_element_t *) ptr2)->MarkX; @@ -728,7 +728,7 @@ hid_actionl("Report", "Object", NULL); } else if (type != PCB_TYPE_NONE) { - TextTypePtr thing = (TextTypePtr) ptr3; + pcb_text_t *thing = (pcb_text_t *) ptr3; TOGGLE_FLAG(PCB_FLAG_LOCK, thing); if (TEST_FLAG(PCB_FLAG_LOCK, thing) && TEST_FLAG(PCB_FLAG_SELECTED, thing)) { @@ -928,7 +928,7 @@ if ((string = gui->prompt_for(_("Enter text:"), "")) != NULL) { if (strlen(string) > 0) { - TextTypePtr text; + pcb_text_t *text; int flag = PCB_FLAG_CLEARLINE; if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(solder_silk_layer)) @@ -1078,7 +1078,7 @@ case PCB_MODE_PASTE_BUFFER: { - TextType estr[MAX_ELEMENTNAMES]; + pcb_text_t estr[MAX_ELEMENTNAMES]; pcb_element_t *e = 0; if (gui->shift_is_pressed()) { @@ -1089,7 +1089,7 @@ if (e) { int i; - memcpy(estr, e->Name, MAX_ELEMENTNAMES * sizeof(TextType)); + memcpy(estr, e->Name, MAX_ELEMENTNAMES * sizeof(pcb_text_t)); for (i = 0; i < MAX_ELEMENTNAMES; ++i) estr[i].TextString = estr[i].TextString ? pcb_strdup(estr[i].TextString) : NULL; RemoveElement(e); @@ -1111,7 +1111,7 @@ if (i == save_n) EraseElementName(e); r_delete_entry(PCB->Data->name_tree[i], (pcb_box_t *) & (e->Name[i])); - memcpy(&(e->Name[i]), &(estr[i]), sizeof(TextType)); + memcpy(&(e->Name[i]), &(estr[i]), sizeof(pcb_text_t)); e->Name[i].Element = e; SetTextBoundingBox(&PCB->Font, &(e->Name[i])); r_insert_entry(PCB->Data->name_tree[i], (pcb_box_t *) & (e->Name[i]), 0); Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4775) +++ trunk/src/change.c (revision 4776) @@ -1223,7 +1223,7 @@ break; case PCB_TYPE_TEXT: - name = gui->prompt_for(_("Enter text:"), EMPTY(((TextTypePtr) Ptr2)->TextString)); + name = gui->prompt_for(_("Enter text:"), EMPTY(((pcb_text_t *) Ptr2)->TextString)); break; case PCB_TYPE_ELEMENT: Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4775) +++ trunk/src/crosshair.c (revision 4776) @@ -439,7 +439,7 @@ } case PCB_TYPE_TEXT: { - TextTypePtr text = (TextTypePtr) Crosshair.AttachedObject.Ptr2; + pcb_text_t *text = (pcb_text_t *) Crosshair.AttachedObject.Ptr2; pcb_box_t *box = &text->BoundingBox; gui->draw_rect(Crosshair.GC, box->X1 + dx, box->Y1 + dy, box->X2 + dx, box->Y2 + dy); break; Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4775) +++ trunk/src/data.c (revision 4776) @@ -218,7 +218,7 @@ list_map0(&layer->Line, pcb_line_t, RemoveFreeLine); list_map0(&layer->Arc, pcb_arc_t, RemoveFreeArc); - list_map0(&layer->Text, TextType, RemoveFreeText); + list_map0(&layer->Text, pcb_text_t, RemoveFreeText); POLYGON_LOOP(layer); { FreePolygonMemory(polygon); @@ -296,7 +296,7 @@ box.X2 = MAX(box.X2, element->BoundingBox.X2); box.Y2 = MAX(box.Y2, element->BoundingBox.Y2); { - TextTypePtr text = &NAMEONPCB_TEXT(element); + pcb_text_t *text = &NAMEONPCB_TEXT(element); box.X1 = MIN(box.X1, text->BoundingBox.X1); box.Y1 = MIN(box.Y1, text->BoundingBox.Y1); box.X2 = MAX(box.X2, text->BoundingBox.X2); Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 4775) +++ trunk/src/data.h (revision 4776) @@ -91,7 +91,7 @@ typedef int (*pcb_layer_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter); typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line); typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc); -typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text); +typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text); typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_polygon_t *poly); /* element callbacks */ @@ -98,7 +98,7 @@ typedef int (*pcb_element_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, int enter); typedef void (*pcb_eline_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_line_t *line); typedef void (*pcb_earc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_arc_t *arc); -typedef void (*pcb_etext_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, TextType *text); +typedef void (*pcb_etext_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_text_t *text); typedef void (*pcb_epin_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pin_t *pin); typedef void (*pcb_epad_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pad_t *pad); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4775) +++ trunk/src/draw.c (revision 4776) @@ -500,7 +500,7 @@ break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: - EraseText((pcb_layer_t *) lptr, (TextTypePtr) ptr); + EraseText((pcb_layer_t *) lptr, (pcb_text_t *) ptr); break; case PCB_TYPE_POLYGON: ErasePolygon((pcb_polygon_t *) ptr); @@ -543,7 +543,7 @@ break; case PCB_TYPE_TEXT: if (((pcb_layer_t *) ptr1)->On) - DrawText((pcb_layer_t *) ptr1, (TextTypePtr) ptr2); + DrawText((pcb_layer_t *) ptr1, (pcb_text_t *) ptr2); break; case PCB_TYPE_POLYGON: if (((pcb_layer_t *) ptr1)->On) Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4775) +++ trunk/src/global_typedefs.h (revision 4776) @@ -45,7 +45,7 @@ typedef struct pcb_rtree_s pcb_rtree_t; typedef struct pcb_ratspatch_line_s pcb_ratspatch_line_t; typedef struct pcb_element_s pcb_element_t; -typedef struct pcb_text_s TextType, *TextTypePtr; +typedef struct pcb_text_s pcb_text_t; typedef struct plug_io_s plug_io_t; Index: trunk/src/obj_any.h =================================================================== --- trunk/src/obj_any.h (revision 4775) +++ trunk/src/obj_any.h (revision 4776) @@ -80,7 +80,7 @@ AnyObjectType *anyobj; pcb_point_t *point; pcb_line_t *line; - TextType *text; + pcb_text_t *text; pcb_polygon_t *polygon; pcb_arc_t *arc; pcb_rat_t *rat; Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4775) +++ trunk/src/obj_elem.c (revision 4776) @@ -645,7 +645,7 @@ /* creates a new textobject as part of an element copies the values to the appropriate text object */ -void AddTextToElement(TextTypePtr Text, pcb_font_t *PCBFont, Coord X, Coord Y, +void AddTextToElement(pcb_text_t *Text, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, char *TextString, int Scale, FlagType Flags) { free(Text->TextString); @@ -1682,7 +1682,7 @@ r_dir_t draw_element_name_callback(const pcb_box_t * b, void *cl) { - TextTypePtr text = (TextTypePtr) b; + pcb_text_t *text = (pcb_text_t *) b; pcb_element_t *element = (pcb_element_t *) text->Element; int *side = cl; Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 4775) +++ trunk/src/obj_elem.h (revision 4776) @@ -39,7 +39,7 @@ struct pcb_element_s { ANYOBJECTFIELDS; - TextType Name[MAX_ELEMENTNAMES]; /* the elements names: description text, name on PCB second, value third - see NAME_INDEX() below */ + pcb_text_t Name[MAX_ELEMENTNAMES]; /* the elements names: description text, name on PCB second, value third - see NAME_INDEX() below */ Coord MarkX, MarkY; /* position mark */ pinlist_t Pin; padlist_t Pad; @@ -86,7 +86,7 @@ pcb_line_t *CreateNewLineInElement(pcb_element_t *Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); -void AddTextToElement(TextTypePtr Text, pcb_font_t *PCBFont, Coord X, Coord Y, +void AddTextToElement(pcb_text_t *Text, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, char *TextString, int Scale, FlagType Flags); @@ -123,7 +123,7 @@ #define ELEMENTTEXT_LOOP(element) do { \ pcb_cardinal_t n; \ - TextTypePtr text; \ + pcb_text_t *text; \ for (n = MAX_ELEMENTNAMES-1; n != -1; n--) \ { \ text = &(element)->Name[n] Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4775) +++ trunk/src/obj_pad.c (revision 4776) @@ -300,7 +300,7 @@ { pcb_box_t box; pcb_bool vert; - TextType text; + pcb_text_t text; char buff[128]; const char *pn; Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 4775) +++ trunk/src/obj_pinvia.c (revision 4776) @@ -805,7 +805,7 @@ { pcb_box_t box; pcb_bool vert; - TextType text; + pcb_text_t text; char buff[128]; const char *pn; Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4775) +++ trunk/src/obj_text.c (revision 4776) @@ -48,17 +48,17 @@ /*** allocation ***/ /* get next slot for a text object, allocates memory if necessary */ -TextTypePtr GetTextMemory(pcb_layer_t * layer) +pcb_text_t *GetTextMemory(pcb_layer_t * layer) { - TextType *new_obj; + pcb_text_t *new_obj; - new_obj = calloc(sizeof(TextType), 1); + new_obj = calloc(sizeof(pcb_text_t), 1); textlist_append(&layer->Text, new_obj); return new_obj; } -void RemoveFreeText(TextType * data) +void RemoveFreeText(pcb_text_t * data) { textlist_remove(data); free(data); @@ -67,9 +67,9 @@ /*** utility ***/ /* creates a new text on a layer */ -TextTypePtr CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags) +pcb_text_t *CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags) { - TextType *text; + pcb_text_t *text; if (TextString == NULL) return NULL; @@ -93,7 +93,7 @@ return (text); } -void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, pcb_font_t *PCBFont) +void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont) { /* calculate size of the bounding box */ SetTextBoundingBox(PCBFont, text); @@ -104,7 +104,7 @@ } /* creates the bounding box of a text object */ -void SetTextBoundingBox(pcb_font_t *FontPtr, TextTypePtr Text) +void SetTextBoundingBox(pcb_font_t *FontPtr, pcb_text_t *Text) { SymbolTypePtr symbol = FontPtr->Symbol; unsigned char *s = (unsigned char *) Text->TextString; @@ -217,7 +217,7 @@ /*** ops ***/ /* copies a text to buffer */ -void *AddTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *AddTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; @@ -225,7 +225,7 @@ } /* moves a text to buffer without allocating memory for the name */ -void *MoveTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text) +void *MoveTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; @@ -243,7 +243,7 @@ } /* changes the scaling factor of a text object */ -void *ChangeTextSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *ChangeTextSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { int value = ctx->chgsize.absolute ? PCB_COORD_TO_MIL(ctx->chgsize.absolute) : Text->Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); @@ -267,7 +267,7 @@ /* sets data of a text object and calculates bounding box; memory must have already been allocated the one for the new string is allocated */ -void *ChangeTextName(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *ChangeTextName(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { char *old = Text->TextString; @@ -287,7 +287,7 @@ } /* changes the clearance flag of a text */ -void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { if (TEST_FLAG(PCB_FLAG_LOCK, Text)) return (NULL); @@ -307,7 +307,7 @@ } /* sets the clearance flag of a text */ -void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { if (TEST_FLAG(PCB_FLAG_LOCK, Text) || TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) return (NULL); @@ -315,7 +315,7 @@ } /* clears the clearance flag of a text */ -void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { if (TEST_FLAG(PCB_FLAG_LOCK, Text) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) return (NULL); @@ -323,9 +323,9 @@ } /* copies a text */ -void *CopyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *CopyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { - TextTypePtr text; + pcb_text_t *text; text = CreateNewText(Layer, &PCB->Font, Text->X + ctx->copy.DeltaX, Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, MaskFlags(Text->Flags, PCB_FLAG_FOUND)); @@ -335,7 +335,7 @@ } /* moves a text object */ -void *MoveText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *MoveText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); @@ -353,7 +353,7 @@ } /* moves a text object between layers; lowlevel routines */ -void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, TextType * text, pcb_layer_t * Destination) +void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_text_t * text, pcb_layer_t * Destination) { RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Source, text); r_delete_entry(Source->text_tree, (pcb_box_t *) text); @@ -377,7 +377,7 @@ } /* moves a text object between layers */ -void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text) +void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text) { if (TEST_FLAG(PCB_FLAG_LOCK, text)) { Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); @@ -397,7 +397,7 @@ } /* destroys a text from a layer */ -void *DestroyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *DestroyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { free(Text->TextString); r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); @@ -408,7 +408,7 @@ } /* removes a text from a layer */ -void *RemoveText_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *RemoveText_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { /* erase from screen */ if (Layer->On) { @@ -421,7 +421,7 @@ return NULL; } -void *RemoveText(pcb_layer_t *Layer, TextTypePtr Text) +void *RemoveText(pcb_layer_t *Layer, pcb_text_t *Text) { pcb_opctx_t ctx; @@ -434,7 +434,7 @@ /* rotates a text in 90 degree steps; only the bounding box is rotated, text rotation itself is done by the drawing routines */ -void RotateTextLowLevel(TextTypePtr Text, Coord X, Coord Y, unsigned Number) +void RotateTextLowLevel(pcb_text_t *Text, Coord X, Coord Y, unsigned Number) { pcb_uint8_t number; @@ -450,7 +450,7 @@ } /* rotates a text object and redraws it */ -void *RotateText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) +void *RotateText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { EraseText(Layer, Text); RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); @@ -468,7 +468,7 @@ /* --------------------------------------------------------------------------- * lowlevel drawing routine for text objects */ -void DrawTextLowLevel(TextTypePtr Text, Coord min_line_width) +void DrawTextLowLevel(pcb_text_t *Text, Coord min_line_width) { Coord x = 0; unsigned char *string = (unsigned char *) Text->TextString; @@ -544,7 +544,7 @@ r_dir_t draw_text_callback(const pcb_box_t * b, void *cl) { pcb_layer_t *layer = cl; - TextType *text = (TextType *) b; + pcb_text_t *text = (pcb_text_t *) b; int min_silk_line; if (TEST_FLAG(PCB_FLAG_SELECTED, text)) @@ -560,12 +560,12 @@ } /* erases a text on a layer */ -void EraseText(pcb_layer_t *Layer, TextTypePtr Text) +void EraseText(pcb_layer_t *Layer, pcb_text_t *Text) { pcb_draw_invalidate(Text); } -void DrawText(pcb_layer_t *Layer, TextTypePtr Text) +void DrawText(pcb_layer_t *Layer, pcb_text_t *Text) { pcb_draw_invalidate(Text); } Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 4775) +++ trunk/src/obj_text.h (revision 4776) @@ -42,17 +42,17 @@ }; -TextTypePtr GetTextMemory(pcb_layer_t * layer); -void RemoveFreeText(TextType * data); +pcb_text_t *GetTextMemory(pcb_layer_t * layer); +void RemoveFreeText(pcb_text_t * data); -TextTypePtr CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags); +pcb_text_t *CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, pcb_font_t *PCBFont); +void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont); -void SetTextBoundingBox(pcb_font_t *FontPtr, TextTypePtr Text); -void *RemoveText(pcb_layer_t *Layer, TextTypePtr Text); -void RotateTextLowLevel(TextTypePtr Text, Coord X, Coord Y, unsigned Number); +void SetTextBoundingBox(pcb_font_t *FontPtr, pcb_text_t *Text); +void *RemoveText(pcb_layer_t *Layer, pcb_text_t *Text); +void RotateTextLowLevel(pcb_text_t *Text, Coord X, Coord Y, unsigned Number); #define MOVE_TEXT_LOWLEVEL(t,dx,dy) \ { \ @@ -65,7 +65,7 @@ #define TEXT_IS_VISIBLE(b, l, t) ((l)->On) #define TEXT_LOOP(layer) do { \ - TextType *text; \ + pcb_text_t *text; \ gdl_iterator_t __it__; \ linelist_foreach(&(layer)->Text, &__it__, text) { Index: trunk/src/obj_text_draw.h =================================================================== --- trunk/src/obj_text_draw.h (revision 4775) +++ trunk/src/obj_text_draw.h (revision 4776) @@ -32,6 +32,6 @@ r_dir_t draw_text_callback(const pcb_box_t * b, void *cl); #endif -void DrawTextLowLevel(TextTypePtr Text, Coord min_line_width); -void EraseText(pcb_layer_t *Layer, TextTypePtr Text); -void DrawText(pcb_layer_t *Layer, TextTypePtr Text); +void DrawTextLowLevel(pcb_text_t *Text, Coord min_line_width); +void EraseText(pcb_layer_t *Layer, pcb_text_t *Text); +void DrawText(pcb_layer_t *Layer, pcb_text_t *Text); Index: trunk/src/obj_text_list.h =================================================================== --- trunk/src/obj_text_list.h (revision 4775) +++ trunk/src/obj_text_list.h (revision 4776) @@ -28,7 +28,7 @@ /* List of Text */ #define TDL(x) textlist_ ## x #define TDL_LIST_T textlist_t -#define TDL_ITEM_T TextType +#define TDL_ITEM_T pcb_text_t #define TDL_FIELD link #define TDL_SIZE_T size_t #define TDL_FUNC Index: trunk/src/obj_text_op.h =================================================================== --- trunk/src/obj_text_op.h (revision 4775) +++ trunk/src/obj_text_op.h (revision 4776) @@ -28,17 +28,17 @@ #include "operation.h" -void *AddTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *MoveTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text); -void *ChangeTextSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *ChangeTextName(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *CopyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *MoveText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, TextType * text, pcb_layer_t * Destination); -void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text); -void *DestroyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *RemoveText_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); -void *RotateText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *AddTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *MoveTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text); +void *ChangeTextSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *ChangeTextName(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *CopyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *MoveText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_text_t * text, pcb_layer_t * Destination); +void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text); +void *DestroyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *RemoveText_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); +void *RotateText(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 4775) +++ trunk/src/operation.h (revision 4776) @@ -111,7 +111,7 @@ /* pointer to low-level operation (copy, move and rotate) functions */ typedef struct { void *(*Line)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *); - void *(*Text)(pcb_opctx_t *ctx, pcb_layer_t *, TextTypePtr); + void *(*Text)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_text_t *); void *(*Polygon)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_polygon_t *); void *(*Via)(pcb_opctx_t *ctx, pcb_pin_t *); void *(*Element)(pcb_opctx_t *ctx, pcb_element_t *); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4775) +++ trunk/src/polygon.c (revision 4776) @@ -818,7 +818,7 @@ return Subtract(np, p, pcb_true); } -static int SubtractText(TextType * text, pcb_polygon_t * p) +static int SubtractText(pcb_text_t * text, pcb_polygon_t * p) { POLYAREA *np; const pcb_box_t *b = &text->BoundingBox; @@ -973,7 +973,7 @@ static r_dir_t text_sub_callback(const pcb_box_t * b, void *cl) { - TextTypePtr text = (TextTypePtr) b; + pcb_text_t *text = (pcb_text_t *) b; struct cpInfo *info = (struct cpInfo *) cl; pcb_polygon_t *polygon; @@ -1136,7 +1136,7 @@ return 1; } -static int UnsubtractText(TextType * text, pcb_layer_t * l, pcb_polygon_t * p) +static int UnsubtractText(pcb_text_t * text, pcb_layer_t * l, pcb_polygon_t * p) { POLYAREA *np; @@ -1416,7 +1416,7 @@ Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_TEXT: - SubtractText((TextTypePtr) ptr2, Polygon); + SubtractText((pcb_text_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; } @@ -1440,7 +1440,7 @@ UnsubtractPad((pcb_pad_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_TEXT: - UnsubtractText((TextTypePtr) ptr2, Layer, Polygon); + UnsubtractText((pcb_text_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; } return R_DIR_NOT_FOUND; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4775) +++ trunk/src/search.c (revision 4776) @@ -56,12 +56,12 @@ static pcb_bool SearchLineByLocation(int, pcb_layer_t **, pcb_line_t **, pcb_line_t **); static pcb_bool SearchArcByLocation(int, pcb_layer_t **, pcb_arc_t **, pcb_arc_t **); static pcb_bool SearchRatLineByLocation(int, pcb_rat_t **, pcb_rat_t **, pcb_rat_t **); -static pcb_bool SearchTextByLocation(int, pcb_layer_t **, TextTypePtr *, TextTypePtr *); +static pcb_bool SearchTextByLocation(int, pcb_layer_t **, pcb_text_t **, pcb_text_t **); static pcb_bool SearchPolygonByLocation(int, pcb_layer_t **, pcb_polygon_t **, pcb_polygon_t **); static pcb_bool SearchPinByLocation(int, pcb_element_t **, pcb_pin_t **, pcb_pin_t **); static pcb_bool SearchPadByLocation(int, pcb_element_t **, pcb_pad_t **, pcb_pad_t **, pcb_bool); static pcb_bool SearchViaByLocation(int, pcb_pin_t **, pcb_pin_t **, pcb_pin_t **); -static pcb_bool SearchElementNameByLocation(int, pcb_element_t **, TextTypePtr *, TextTypePtr *, pcb_bool); +static pcb_bool SearchElementNameByLocation(int, pcb_element_t **, pcb_text_t **, pcb_text_t **, pcb_bool); static pcb_bool SearchLinePointByLocation(int, pcb_layer_t **, pcb_line_t **, pcb_point_t **); static pcb_bool SearchPointByLocation(int, pcb_layer_t **, pcb_polygon_t **, pcb_point_t **); static pcb_bool SearchElementByLocation(int, pcb_element_t **, pcb_element_t **, pcb_element_t **, pcb_bool); @@ -288,7 +288,7 @@ static r_dir_t text_callback(const pcb_box_t * box, void *cl) { - TextTypePtr text = (TextTypePtr) box; + pcb_text_t *text = (pcb_text_t *) box; struct ans_info *i = (struct ans_info *) cl; if (TEST_FLAG(i->locked, text)) @@ -304,7 +304,7 @@ /* --------------------------------------------------------------------------- * searches text on the SearchLayer */ -static pcb_bool SearchTextByLocation(int locked, pcb_layer_t ** Layer, TextTypePtr * Text, TextTypePtr * Dummy) +static pcb_bool SearchTextByLocation(int locked, pcb_layer_t ** Layer, pcb_text_t ** Text, pcb_text_t ** Dummy) { struct ans_info info; @@ -430,7 +430,7 @@ static r_dir_t name_callback(const pcb_box_t * box, void *cl) { - TextTypePtr text = (TextTypePtr) box; + pcb_text_t *text = (pcb_text_t *) box; struct ans_info *i = (struct ans_info *) cl; pcb_element_t *element = (pcb_element_t *) text->Element; double newarea; @@ -456,7 +456,7 @@ * the search starts with the last element and goes back to the beginning */ static pcb_bool -SearchElementNameByLocation(int locked, pcb_element_t ** Element, TextTypePtr * Text, TextTypePtr * Dummy, pcb_bool BackToo) +SearchElementNameByLocation(int locked, pcb_element_t ** Element, pcb_text_t ** Text, pcb_text_t ** Dummy, pcb_bool BackToo) { struct ans_info info; @@ -1011,8 +1011,8 @@ HigherAvail = PCB_TYPE_PAD; if (!HigherAvail && Type & PCB_TYPE_ELEMENT_NAME && - SearchElementNameByLocation(locked, (pcb_element_t **) pr1, (TextTypePtr *) pr2, (TextTypePtr *) pr3, pcb_false)) { - pcb_box_t *box = &((TextTypePtr) r2)->BoundingBox; + SearchElementNameByLocation(locked, (pcb_element_t **) pr1, (pcb_text_t **) pr2, (pcb_text_t **) pr3, pcb_false)) { + pcb_box_t *box = &((pcb_text_t *) r2)->BoundingBox; HigherBound = (double) (box->X2 - box->X1) * (double) (box->Y2 - box->Y1); HigherAvail = PCB_TYPE_ELEMENT_NAME; } @@ -1054,7 +1054,7 @@ return (PCB_TYPE_ARC); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_TEXT - && SearchTextByLocation(locked, (pcb_layer_t **) Result1, (TextTypePtr *) Result2, (TextTypePtr *) Result3)) + && SearchTextByLocation(locked, (pcb_layer_t **) Result1, (pcb_text_t **) Result2, (pcb_text_t **) Result3)) return (PCB_TYPE_TEXT); if (Type & PCB_TYPE_POLYGON && @@ -1110,7 +1110,7 @@ return (PCB_TYPE_PAD); if (Type & PCB_TYPE_ELEMENT_NAME && - SearchElementNameByLocation(locked, (pcb_element_t **) Result1, (TextTypePtr *) Result2, (TextTypePtr *) Result3, pcb_true)) + SearchElementNameByLocation(locked, (pcb_element_t **) Result1, (pcb_text_t **) Result2, (pcb_text_t **) Result3, pcb_true)) return (PCB_TYPE_ELEMENT_NAME); if (Type & PCB_TYPE_ELEMENT && Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4775) +++ trunk/src/select.c (revision 4776) @@ -159,7 +159,7 @@ case PCB_TYPE_TEXT: { - TextType *text = (TextTypePtr) ptr2; + pcb_text_t *text = (pcb_text_t *) ptr2; layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_TEXT, ptr1, ptr2, ptr2); @@ -504,7 +504,7 @@ case PCB_TYPE_TEXT: if (F->Text) - return (F->Text(ctx, (pcb_layer_t *) Ptr1, (TextTypePtr) Ptr2)); + return (F->Text(ctx, (pcb_layer_t *) Ptr1, (pcb_text_t *) Ptr2)); break; case PCB_TYPE_POLYGON: Index: trunk/src/stub_draw_fab.c =================================================================== --- trunk/src/stub_draw_fab.c (revision 4775) +++ trunk/src/stub_draw_fab.c (revision 4776) @@ -35,7 +35,7 @@ void dummy_DrawFab(hidGC gc) { - TextType t; + pcb_text_t t; t.X = 0; t.Y = 0; t.TextString = "Can't render the fab layer: the draw_fab plugin is not compiled and/or not loaded"; Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4775) +++ trunk/src/undo.c (revision 4776) @@ -1413,7 +1413,7 @@ break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: - undo->Data.Size = ((TextTypePtr) ptr2)->Scale; + undo->Data.Size = ((pcb_text_t *) ptr2)->Scale; break; case PCB_TYPE_PAD: undo->Data.Size = ((pcb_pad_t *) ptr2)->Thickness; Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 4775) +++ trunk/src_plugins/autocrop/autocrop.c (revision 4776) @@ -117,7 +117,7 @@ return Polygon; } -static void *MyMoveTextLowLevel(pcb_layer_t * Layer, TextType * Text, Coord dx, Coord dy) +static void *MyMoveTextLowLevel(pcb_layer_t * Layer, pcb_text_t * Text, Coord dx, Coord dy) { if (Layer) r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4775) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4776) @@ -758,7 +758,7 @@ return rb; } -static void AddText(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, TextTypePtr text, RouteStyleType * style) +static void AddText(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, pcb_text_t *text, RouteStyleType * style) { AddIrregularObstacle(layergroupboxes, text->BoundingBox.X1, text->BoundingBox.Y1, Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 4775) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 4776) @@ -100,7 +100,7 @@ /* this macro produces a function in X or Y that switches on 'point' */ #define COORD(DIR) \ static inline Coord \ -coord ## DIR(TextType *text, int point) \ +coord ## DIR(pcb_text_t *text, int point) \ { \ switch (point) { \ case K_Lefts: \ @@ -123,7 +123,7 @@ /*! * Return the text coordinate associated with the given internal point. */ - static Coord coord(TextType * text, int dir, int point) + static Coord coord(pcb_text_t * text, int dir, int point) { if (dir == K_X) return coordX(text, point); @@ -132,7 +132,7 @@ } static struct text_by_pos { - TextType *text; + pcb_text_t *text; Coord pos; Coord width; int type; @@ -169,7 +169,7 @@ dir = dir == K_X ? K_Y : K_X; /* see above */ ELEMENT_LOOP(PCB->Data); { - TextType *text; + pcb_text_t *text; text = &(element)->Name[NAME_INDEX()]; if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) continue; @@ -190,7 +190,7 @@ nsel = 0; ELEMENT_LOOP(PCB->Data); { - TextType *text; + pcb_text_t *text; text = &(element)->Name[NAME_INDEX()]; if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) continue; @@ -361,7 +361,7 @@ /* selected text part of an element */ ELEMENT_LOOP(PCB->Data); { - TextType *text; + pcb_text_t *text; text = &(element)->Name[NAME_INDEX()]; if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) continue; @@ -546,7 +546,7 @@ /* subtract all the "widths" from the slack */ for (i = 0; i < ntexts_by_pos; ++i) { - TextType *text = texts_by_pos[i].text; + pcb_text_t *text = texts_by_pos[i].text; /* coord doesn't care if I mix Lefts/Tops */ w = texts_by_pos[i].width = coord(text, dir, K_Rights) - coord(text, dir, K_Lefts); @@ -561,7 +561,7 @@ } /* move all selected texts to the new coordinate */ for (i = 0; i < ntexts_by_pos; ++i) { - TextType *text = texts_by_pos[i].text; + pcb_text_t *text = texts_by_pos[i].text; int type = texts_by_pos[i].type; Coord p, q, dp, dx, dy; Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 4775) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 4776) @@ -66,7 +66,7 @@ { char tmp[512]; int w = 0, i; - TextType t; + pcb_text_t t; va_list a; pcb_font_t *font = &PCB->Font; va_start(a, fmt); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4775) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4776) @@ -82,7 +82,7 @@ layout_object_mask_t type; union { pcb_line_t *l; - TextType *t; + pcb_text_t *t; pcb_polygon_t *p; pcb_arc_t *a; pcb_pin_t *v; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4775) +++ trunk/src_plugins/io_kicad/write.c (revision 4776) @@ -688,7 +688,7 @@ int localFlag; gdl_iterator_t it; - TextType *text; + pcb_text_t *text; pcb_cardinal_t currentLayer = number; /* write information about non empty layers */ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4775) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4776) @@ -652,7 +652,7 @@ int localFlag; gdl_iterator_t it; - TextType *text; + pcb_text_t *text; pcb_cardinal_t currentLayer = number; /* write information about non empty layers */ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4775) +++ trunk/src_plugins/io_lihata/read.c (revision 4776) @@ -490,7 +490,7 @@ static int parse_pcb_text(pcb_layer_t *ly, pcb_element_t *el, lht_node_t *obj) { - TextType *text; + pcb_text_t *text; lht_node_t *role; int tmp; Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4775) +++ trunk/src_plugins/io_lihata/write.c (revision 4776) @@ -353,7 +353,7 @@ return obj; } -static lht_node_t *build_pcb_text(const char *role, TextType *text) +static lht_node_t *build_pcb_text(const char *role, pcb_text_t *text) { char buff[128]; lht_node_t *obj; @@ -424,7 +424,7 @@ pcb_line_t *li; pcb_arc_t *ar; pcb_polygon_t *po; - TextType *tx; + pcb_text_t *tx; char tmp[16]; int added = 0; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4775) +++ trunk/src_plugins/io_pcb/file.c (revision 4776) @@ -441,7 +441,7 @@ gdl_iterator_t it; pcb_line_t *line; pcb_arc_t *arc; - TextType *text; + pcb_text_t *text; pcb_polygon_t *polygon; /* write information about non empty layers */ Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 4775) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 4776) @@ -190,7 +190,7 @@ break; } if (parent != NULL) { - TextType *name; + pcb_text_t *name; name = &parent->Name[1]; if ((name->TextString == NULL) || (*name->TextString == '\0')) sprintf(s, "%s #%ld \\nof #%ld", typ, n->to->ID, parent->ID); Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4775) +++ trunk/src_plugins/propedit/propsel.c (revision 4776) @@ -109,7 +109,7 @@ map_attr(ctx, &arc->Attributes); } -static void map_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) +static void map_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text) { map_chk_skip(ctx, text); map_add_prop(ctx, "p/text/scale", int, text->Scale); @@ -138,7 +138,7 @@ map_attr(ctx, &arc->Attributes); } -static void map_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, TextType *text) +static void map_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_text_t *text) { map_chk_skip(ctx, text); map_text_cb(ctx, pcb, NULL, text); @@ -268,7 +268,7 @@ ChangeObjectAngle(PCB_TYPE_ARC, layer, arc, NULL, 1, st->d, st->d_absolute)) DONE; } -static void set_text_cb_any(void *ctx, pcb_board_t *pcb, int type, void *layer_or_element, TextType *text) +static void set_text_cb_any(void *ctx, pcb_board_t *pcb, int type, void *layer_or_element, pcb_text_t *text) { set_ctx_t *st = (set_ctx_t *)ctx; const char *pn = st->name + 7; @@ -305,7 +305,7 @@ } } -static void set_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) +static void set_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text) { set_text_cb_any(ctx, pcb, PCB_TYPE_TEXT, layer, text); } @@ -347,7 +347,7 @@ } } -static void set_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, TextType *text) +static void set_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_text_t *text) { set_text_cb_any(ctx, pcb, PCB_TYPE_ELEMENT_NAME, element, text); } @@ -498,7 +498,7 @@ del_attr(ctx, &arc->Attributes); } -static void del_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) +static void del_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text) { map_chk_skip(ctx, text); del_attr(ctx, &text->Attributes); @@ -522,7 +522,7 @@ del_attr(ctx, &arc->Attributes); } -static void del_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, TextType *text) +static void del_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_text_t *text) { map_chk_skip(ctx, text); del_attr(ctx, &text->Attributes); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4775) +++ trunk/src_plugins/puller/puller.c (revision 4776) @@ -1533,7 +1533,7 @@ static r_dir_t gp_text_cb(const pcb_box_t * b, void *cb) { - const TextTypePtr t = (TextTypePtr) b; + const pcb_text_t *t = (pcb_text_t *) b; /* FIXME: drop in the actual text-line endpoints later. */ gp_point(t->BoundingBox.X1, t->BoundingBox.Y1, 0, 0); gp_point(t->BoundingBox.X1, t->BoundingBox.Y2, 0, 0); Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4775) +++ trunk/src_plugins/query/query_access.c (revision 4776) @@ -59,7 +59,7 @@ APPEND(ctx, PCB_OBJ_ARC, arc, PCB_PARENT_LAYER, layer); } -static void list_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) +static void list_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text) { APPEND(ctx, PCB_OBJ_TEXT, text, PCB_PARENT_LAYER, layer); } @@ -86,7 +86,7 @@ APPEND(ctx, PCB_OBJ_EARC, arc, PCB_PARENT_ELEMENT, element); } -static void list_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, TextType *text) +static void list_etext_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_text_t *text) { APPEND(ctx, PCB_OBJ_ETEXT, text, PCB_PARENT_ELEMENT, element); } @@ -381,7 +381,7 @@ static int field_text(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - TextType *t = obj->data.text; + pcb_text_t *t = obj->data.text; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); @@ -594,7 +594,7 @@ static int field_etext(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - TextType *t = obj->data.text; + pcb_text_t *t = obj->data.text; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4775) +++ trunk/src_plugins/report/report.c (revision 4776) @@ -413,7 +413,7 @@ case PCB_TYPE_ELEMENT_NAME: { char laynum[32]; - TextTypePtr text; + pcb_text_t *text; #ifndef NDEBUG if (gui->shift_is_pressed()) { __r_dump_tree(PCB->Data->name_tree[NAME_INDEX()]->root, 0); @@ -420,7 +420,7 @@ return 0; } #endif - text = (TextTypePtr) ptr2; + text = (pcb_text_t *) ptr2; if (type == PCB_TYPE_TEXT) sprintf(laynum, "It is on layer %d.", GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1));