dlist cleanups, start of edit component in schematic rework

3d-viewer/3d_class.cpp

 /////////////////////////////////////////////////////////////////////////////
+
 // Name:        3d_class.cpp
 /////////////////////////////////////////////////////////////////////////////
 
@@ -25,7 +26,7 @@ S3D_Vertex::S3D_Vertex()
 
 
 /**************************************************************************/
-S3D_Material::S3D_Material( Struct3D_Master * father, const wxString & name ):
+S3D_Material::S3D_Material( Struct3D_Master* father, const wxString& name ) :
     EDA_BaseStruct( father, NOT_USED )
 /**************************************************************************/
 {
@@ -37,24 +38,26 @@ S3D_Material::S3D_Material( Struct3D_Master * father, const wxString & name ):
     m_Name = name;
 }
 
+
 /***********************************/
 void S3D_Material::SetMaterial()
 /***********************************/
 {
-    glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
-	glColor4f(m_DiffuseColor.x * m_AmbientIntensity,
+    glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
+    glColor4f( m_DiffuseColor.x * m_AmbientIntensity,
         m_DiffuseColor.y * m_AmbientIntensity,
         m_DiffuseColor.z * m_AmbientIntensity,
         1.0 - m_Transparency );
 #if 0
-	glColorMaterial(GL_FRONT_AND_BACK,GL_SPECULAR);
-	glColor3f(m_SpecularColor.x, m_SpecularColor.y,m_SpecularColor.z);
+    glColorMaterial( GL_FRONT_AND_BACK, GL_SPECULAR );
+    glColor3f( m_SpecularColor.x, m_SpecularColor.y, m_SpecularColor.z );
 #endif
-    glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
+    glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
 }
 
+
 /****************************************************/
-void Struct3D_Master::Copy(Struct3D_Master * pattern)
+void Struct3D_Master::Copy( Struct3D_Master* pattern )
 /****************************************************/
 {
     m_Shape3DName = pattern->m_Shape3DName;
@@ -65,8 +68,9 @@ void Struct3D_Master::Copy(Struct3D_Master * pattern)
     m_Materials   = NULL;
 }
 
+
 /***************************************************************/
-Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather):
+Struct3D_Master::Struct3D_Master( EDA_BaseStruct* StructFather ) :
     EDA_BaseStruct( StructFather, NOT_USED )
 /***************************************************************/
 {
@@ -80,26 +84,25 @@ Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather):
 Struct3D_Master:: ~Struct3D_Master()
 /***************************************/
 {
-Struct3D_Shape * next;
-S3D_Material * nextmat;
+    Struct3D_Shape* next;
+    S3D_Material*   nextmat;
 
     for( ; m_3D_Drawings != NULL; m_3D_Drawings = next )
     {
-		next = (Struct3D_Shape *) m_3D_Drawings->Pnext;
+        next = m_3D_Drawings->Next();
         delete m_3D_Drawings;
     }
 
     for( ; m_Materials != NULL;  m_Materials = nextmat )
     {
-		nextmat = (S3D_Material *)  m_Materials->Pnext;
+        nextmat = m_Materials->Next();
         delete m_Materials;
     }
 }
 
 
-
 /***************************************************************/
-Struct3D_Shape::Struct3D_Shape(EDA_BaseStruct * StructFather):
+Struct3D_Shape::Struct3D_Shape( EDA_BaseStruct* StructFather ) :
     EDA_BaseStruct( StructFather, NOT_USED )
 /***************************************************************/
 {
@@ -116,4 +119,3 @@ Struct3D_Shape:: ~Struct3D_Shape()
     delete m_3D_Coord;
     delete m_3D_CoordIndex;
 }
-

3d-viewer/3d_draw.cpp

@@ -214,7 +214,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
 
     /* draw graphic items */
     EDA_BaseStruct* PtStruct;
-    for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Pnext )
+    for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Next() )
     {
         switch( PtStruct->Type() )
         {
@@ -466,7 +466,7 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
     /* Draw pads */
     glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
     glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis
-    for( ; pad != NULL; pad = (D_PAD*) pad->Pnext )
+    for( ; pad != NULL; pad = pad->Next() )
     {
         pad->Draw3D( glcanvas );
     }
@@ -477,9 +477,11 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
     if( g_Parm_3D_Visu.m_Draw3DModule )
     {
         glPushMatrix();
+
         glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale,
             -m_Pos.y * g_Parm_3D_Visu.m_BoardScale,
             g_Parm_3D_Visu.m_LayerZcoord[m_Layer] );
+
         if( m_Orient )
         {
             glRotatef( (double) m_Orient / 10, 0.0, 0.0, 1.0 );
@@ -491,7 +493,7 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
         }
         DataScale3D = g_Parm_3D_Visu.m_BoardScale * UNITS3D_TO_UNITSPCB;
 
-        for( ; Struct3D != NULL; Struct3D = (Struct3D_Master*) Struct3D->Pnext )
+        for( ; Struct3D != NULL; Struct3D = Struct3D->Next() )
         {
             if( !Struct3D->m_Shape3DName.IsEmpty() )
             {
@@ -507,7 +509,7 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
     {
         EDA_BaseStruct* Struct = m_Drawings;
         glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis
-        for( ; Struct != NULL; Struct = Struct->Pnext )
+        for( ; Struct != NULL; Struct = Struct->Next() )
         {
             switch( Struct->Type() )
             {

3d-viewer/3d_read_mesh.cpp

@@ -108,8 +108,7 @@ int Struct3D_Master:: ReadMaterial( FILE* file, int* LineNum )
     mat_name = CONV_FROM_UTF8( text );
     if( stricmp( command, "USE" ) == 0 )
     {
-        for( material = m_Materials; material != NULL;
-             material = (S3D_Material*) material->Pnext )
+        for( material = m_Materials;  material;  material = material->Next() )
         {
             if( material->m_Name == mat_name )
             {
@@ -126,8 +125,8 @@ int Struct3D_Master:: ReadMaterial( FILE* file, int* LineNum )
     {
         material = new S3D_Material( this, mat_name );
 
-        material->Pnext = m_Materials;
-        m_Materials = material;
+        Insert( material );
+
         while( GetLine( file, line, LineNum, 512 ) )
         {
             text = strtok( line, " \t\n\r" );

3d-viewer/3d_struct.h

-	/********************************************************/
-	/*	3d_struct.h :  definition des structures de donnees */
-	/*  pour la representation 3D des modules               */
-	/********************************************************/
+/********************************************************/
+/*	3d_struct.h :  definition des structures de donnees */
+/*  pour la representation 3D des modules               */
+/********************************************************/
 
 #ifndef STRUCT_3D_H
 #define STRUCT_3D_H
@@ -9,7 +9,7 @@
 #include "base_struct.h"
 
 /* 3D modeler units -> PCB units conversion scale:
-	1 "3D unit modeler" = 1 unit wings3d = 2,54 mm = 0.1 inch */
+  * 1 "3D unit modeler" = 1 unit wings3d = 2,54 mm = 0.1 inch */
 #define UNITS3D_TO_UNITSPCB 1000
 
 
@@ -21,8 +21,7 @@ class S3D_Color		/* This is a 3D color (R, G, G) 3 floats range 0 to 1.0*/
 public:
     double m_Red, m_Green, m_Blue;
 public:
-	S3D_Color()
-	{
+    S3D_Color() {
         m_Red = m_Green = m_Blue = 0;
     }
 };
@@ -35,7 +34,7 @@ public:
     S3D_Vertex();
 };
 
-class S3D_Material: public EDA_BaseStruct		/* openGL "material" data*/
+class S3D_Material : public EDA_BaseStruct       /* openGL "material" data*/
 {
 public:
     wxString   m_Name;
@@ -47,12 +46,17 @@ public:
     float      m_Shininess;
 
 public:
-	S3D_Material(Struct3D_Master * father, const wxString & name);
+    S3D_Material( Struct3D_Master * father, const wxString &name );
+
+    S3D_Material* Next() const { return (S3D_Material*) Pnext; }
+    S3D_Material* Back() const { return (S3D_Material*) Pback; }
+
     void SetMaterial();
 };
 
+
 /*******************************************/
-class Struct3D_Master: public EDA_BaseStruct
+class Struct3D_Master : public EDA_BaseStruct
 /*******************************************/
 /* Master structure for a 3D item description */
 {
@@ -61,76 +65,87 @@ public:
     S3D_Vertex      m_MatScale;
     S3D_Vertex      m_MatRotation;
     S3D_Vertex      m_MatPosition;
-	Struct3D_Shape * m_3D_Drawings;
-	S3D_Material *m_Materials;
+    Struct3D_Shape* m_3D_Drawings;
+    S3D_Material*   m_Materials;
 
 public:
 
-	Struct3D_Master(EDA_BaseStruct * StructFather);
+    Struct3D_Master( EDA_BaseStruct * StructFather );
     ~Struct3D_Master();
 
-	void Copy(Struct3D_Master * pattern);
-	int ReadData();
-	int ReadMaterial(FILE * file, int *LineNum);
-	int ReadChildren(FILE * file, int *LineNum);
-	int ReadShape(FILE * file, int *LineNum);
-	int ReadAppearance(FILE * file, int *LineNum);
-	int ReadGeometry(FILE * file, int *LineNum);
-	void Set_Object_Coords(S3D_Vertex * coord, int nbcoord );
+    Struct3D_Master* Next() const { return (Struct3D_Master*) Pnext; }
+    Struct3D_Master* Back() const { return (Struct3D_Master*) Pback; }
+
+    void Insert( S3D_Material* aMaterial )
+    {
+        aMaterial->SetNext( m_Materials );
+        m_Materials = aMaterial;
+    }
 
+    void    Copy( Struct3D_Master* pattern );
+    int     ReadData();
+    int     ReadMaterial( FILE* file, int* LineNum );
+    int     ReadChildren( FILE* file, int* LineNum );
+    int     ReadShape( FILE* file, int* LineNum );
+    int     ReadAppearance( FILE* file, int* LineNum );
+    int     ReadGeometry( FILE* file, int* LineNum );
+    void    Set_Object_Coords( S3D_Vertex* coord, int nbcoord );
 };
 
 
 /*********************************************/
-class Struct3D_Shape: public EDA_BaseStruct
+class Struct3D_Shape : public EDA_BaseStruct
 /*********************************************/
 /* decrit une forme complexe 3D */
 {
 public:
-	S3D_Vertex * m_3D_Coord;
-	int * m_3D_CoordIndex;
+    S3D_Vertex* m_3D_Coord;
+    int*        m_3D_CoordIndex;
     int         m_3D_Points;
 
 public:
 
-	Struct3D_Shape(EDA_BaseStruct * StructFather);
+    Struct3D_Shape( EDA_BaseStruct * StructFather );
     ~Struct3D_Shape();
 
-	int ReadData(FILE * file, int *LineNum);
-};
+    Struct3D_Shape* Next() const { return (Struct3D_Shape*) Pnext; }
+    Struct3D_Shape* Back() const { return (Struct3D_Shape*) Pback; }
 
+    int ReadData( FILE* file, int* LineNum );
+};
 
 
 /*****************************************************************/
 /* Classe pour afficher et editer un Vertex (triplet de valeurs),*/
 /* en INCHES ou MM ou sans unites								 */
 /*****************************************************************/
+
 /* internal_unit is the internal unit number by inch:
-	- 1000 for EESchema
-	- 10000 for PcbNew
-*/
+  * - 1000 for EESchema
+  * - 10000 for PcbNew
+ */
 class WinEDA_VertexCtrl
 {
 private:
     int           m_Units;
     int           m_Internal_Unit;
-	wxTextCtrl * m_XValueCtrl, * m_YValueCtrl, * m_ZValueCtrl;
-	wxStaticText * m_Text;
+    wxTextCtrl*   m_XValueCtrl, * m_YValueCtrl, * m_ZValueCtrl;
+    wxStaticText* m_Text;
 
 public:
+
     // Constructor and destructor
-	WinEDA_VertexCtrl(wxWindow *parent, const wxString & title,
+    WinEDA_VertexCtrl( wxWindow * parent, const wxString &title,
         wxBoxSizer * BoxSizer,
-						int units, int internal_unit);
+        int units, int internal_unit );
 
     ~WinEDA_VertexCtrl();
 
     S3D_Vertex  GetValue();
-	void SetValue(S3D_Vertex vertex);
-	void Enable(bool enbl);
-	void SetToolTip(const wxString & text);
+    void        SetValue( S3D_Vertex vertex );
+    void        Enable( bool enbl );
+    void        SetToolTip( const wxString& text );
 };
 
 
-
 #endif /* STRUCT_3D_H */

change_log.txt

@@ -5,6 +5,30 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2008-Nov-23 UPDATE Dick Hollenbeck <dick@softplc.com>
+================================================================================
++all
+  + Made _protected_ EDA_BaseStruct's:
+    EDA_BaseStruct* Pnext;              /* Linked list: Link (next struct) */
+    EDA_BaseStruct* Pback;              /* Linked list: Link (previous struct) */
+    EDA_BaseStruct* m_Parent;           /* Linked list: Link (parent struct) */
+    EDA_BaseStruct* m_Son;              /* Linked list: Link (son struct) */
+  + Split TRACK::Draw() out for SEGVIA
+  + Added dlist.h & dlist.cpp for DLIST<> template.  All the _inline_ list manipulation
+    code throughout the package is rediculous.  I don't mind list traversal, only
+    list manipulation.  DLIST<> templates can be used to consolidate reliable
+    list manipulation operations and get this code out of the mainline.
+    These functions are shared/inherited for any derivation, so only one copy exists
+    in the final program image.  To use, simply declare e.g. DLIST<D_PAD> or similar.
+    See dlist.h, template class DLIST for function comments.
+  + added EDA_BaseStruct::m_List to assist in debugging list manipulation functions.
++eeschema
+    Started on the edit component in schematic editor.  It is not complete and
+    breaks the usefulness of the editor at this moment.  Do not build this version
+    if you want to fully use eeschema.  I will get something working in another day,
+    even if it is the old editor.
+
+
 2008-Nov-22 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 ++pcbnew

common/CMakeLists.txt

@@ -16,6 +16,7 @@ set(COMMON_SRCS
     copy_to_clipboard.cpp
     dcsvg.cpp
     displlst.cpp
+    dlist.cpp
     drawtxt.cpp
     edaappl.cpp
     eda_dde.cpp

common/base_screen.cpp

@@ -446,14 +446,14 @@ void BASE_SCREEN::ClearUndoRedoList()
 
     while( m_UndoList )
     {
-        nextitem = m_UndoList->Pnext;
+        nextitem = m_UndoList->Next();
         delete m_UndoList;
         m_UndoList = nextitem;
     }
 
     while( m_RedoList )
     {
-        nextitem = m_RedoList->Pnext;
+        nextitem = m_RedoList->Next();
         delete m_RedoList;
         m_RedoList = nextitem;
     }
@@ -469,32 +469,33 @@ void BASE_SCREEN::AddItemToUndoList( EDA_BaseStruct* newitem )
  */
 {
     int             ii;
-    EDA_BaseStruct* item, * nextitem;
+    EDA_BaseStruct* item;
+    EDA_BaseStruct* nextitem;
 
     if( newitem == NULL )
         return;
 
-    newitem->Pnext = m_UndoList;
+    newitem->SetNext( m_UndoList );
     m_UndoList = newitem;
 
     /* Free first items, if count max reached */
     for( ii = 0, item = m_UndoList; ii < m_UndoRedoCountMax; ii++ )
     {
-        if( item->Pnext == NULL )
+        if( item->Next() == NULL )
             return;
-        item = item->Pnext;
+        item = item->Next();
     }
 
     if( item == NULL )
         return;
 
-    nextitem    = item->Pnext;
-    item->Pnext = NULL; // Set end of chain
+    nextitem    = item->Next();
+    item->SetNext( NULL ); // Set end of chain
 
     // Delete the extra  items
     for( item = nextitem; item != NULL; item = nextitem )
     {
-        nextitem = item->Pnext;
+        nextitem = item->Next();
         delete item;
     }
 }
@@ -510,26 +511,26 @@ void BASE_SCREEN::AddItemToRedoList( EDA_BaseStruct* newitem )
     if( newitem == NULL )
         return;
 
-    newitem->Pnext = m_RedoList;
+    newitem->SetNext( m_RedoList );
     m_RedoList = newitem;
     /* Free first items, if count max reached */
     for( ii = 0, item = m_RedoList; ii < m_UndoRedoCountMax; ii++ )
     {
-        if( item->Pnext == NULL )
+        if( item->Next() == NULL )
             break;
-        item = item->Pnext;
+        item = item->Next();
     }
 
     if( item == NULL )
         return;
 
-    nextitem    = item->Pnext;
-    item->Pnext = NULL; // Set end of chain
+    nextitem    = item->Next();
+    item->SetNext( NULL );      // Set end of chain
 
     // Delete the extra items
     for( item = nextitem; item != NULL; item = nextitem )
     {
-        nextitem = item->Pnext;
+        nextitem = item->Next();
         delete item;
     }
 }
@@ -542,7 +543,7 @@ EDA_BaseStruct* BASE_SCREEN::GetItemFromUndoList()
     EDA_BaseStruct* item = m_UndoList;
 
     if( item )
-        m_UndoList = item->Pnext;
+        m_UndoList = item->Next();
     return item;
 }
 
@@ -554,7 +555,7 @@ EDA_BaseStruct* BASE_SCREEN::GetItemFromRedoList()
     EDA_BaseStruct* item = m_RedoList;
 
     if( item )
-        m_RedoList = item->Pnext;
+        m_RedoList = item->Next();
     return item;
 }
 

common/base_struct.cpp

@@ -43,15 +43,16 @@ void EDA_BaseStruct::InitVars()
 /********************************************/
 {
     m_StructType = TYPE_NOT_INIT;
-    Pnext       = NULL; /* Linked list: Link (next struct)  */
-    Pback       = NULL; /* Linked list: Link (previous struct) */
-    m_Parent    = NULL; /* Linked list: Link (parent struct) */
-    m_Son       = NULL; /* Linked list: Link (son struct) */
-    m_Image     = NULL; /* Link to an image copy for undelete or abort command */
-    m_Flags     = 0;    /* flags for editions and other */
+    Pnext       = NULL;     // Linked list: Link (next struct)
+    Pback       = NULL;     // Linked list: Link (previous struct)
+    m_Parent    = NULL;     // Linked list: Link (parent struct)
+    m_Son       = NULL;     // Linked list: Link (son struct)
+    m_List      = NULL;     // I am not on any list yet
+    m_Image     = NULL;     // Link to an image copy for undelete or abort command
+    m_Flags     = 0;        // flags for editions and other
     m_TimeStamp = 0;        // Time stamp used for logical links
     m_Status    = 0;
-    m_Selected  = 0;    /* Used by block commands, and selective editing */
+    m_Selected  = 0;        // Used by block commands, and selective editing
 }
 
 

common/block_commande.cpp

@@ -254,7 +254,7 @@ void InitBlockLocateDatas( WinEDA_DrawPanel* Panel, const wxPoint& startpos )
     screen->BlockLocate.m_State = STATE_BLOCK_INIT;
     screen->BlockLocate.SetOrigin( startpos );
     screen->BlockLocate.SetSize( wxSize( 0, 0 ) );
-    screen->BlockLocate.Pnext = NULL;
+    screen->BlockLocate.SetNext( NULL );
     screen->BlockLocate.m_BlockDrawStruct = NULL;
     Panel->ManageCurseur = DrawAndSizingBlockOutlines;
     Panel->ForceCloseManageCurseur = AbortBlockCurrentCommand;

common/dlist.cpp

@@ -128,7 +128,7 @@ void DHEAD::Insert( EDA_BaseStruct* aNewElement, EDA_BaseStruct* aAfterMe )
 
 void DHEAD::Remove( EDA_BaseStruct* aElement )
 {
-    wxASSERT( aElement )
+    wxASSERT( aElement );
     wxASSERT( aElement->GetList() == this );
 
     if( aElement->Next() )

common/makefile.include

@@ -13,6 +13,7 @@ OBJECTS= \
         common_plot_functions.o\
         common_plotPS_functions.o\
         common_plotHPGL_functions.o\
+        dlist.o \
         hotkeys_basic.o\
         drawtxt.o \
         about_kicad.o\

eeschema/CMakeLists.txt

@@ -36,7 +36,8 @@ set(EESCHEMA_SRCS
 #   dialog_cmp_graphic_properties.cpp
     dialog_create_component.cpp
 #   dialog_edit_component_in_lib.cpp
-#   dialog_edit_component_in_schematic.cpp
+    dialog_edit_component_in_schematic_fbp.cpp
+    dialog_edit_component_in_schematic.cpp
 #   dialog_edit_label.cpp
     dialog_eeschema_config.cpp
     dialog_erc.cpp

eeschema/annotate.cpp

@@ -64,7 +64,7 @@ void ReAnnotatePowerSymbolsOnly( void )
         sheet = SheetList.GetNext() )
     {
         EDA_BaseStruct* DrawList = sheet->LastDrawList();
-        for( ; DrawList != NULL; DrawList = DrawList->Pnext )
+        for( ; DrawList != NULL; DrawList = DrawList->Next() )
         {
             if( DrawList->Type() != TYPE_SCH_COMPONENT )
                 continue;
@@ -207,7 +207,7 @@ void WinEDA_SchematicFrame::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedr
     while( screen )
     {
         strct = screen->EEDrawList;
-        for( ; strct; strct = strct->Pnext )
+        for( ; strct; strct = strct->Next() )
         {
             if( strct->Type() == TYPE_SCH_COMPONENT )
             {
@@ -348,7 +348,7 @@ int ListeComposants( CmpListStruct* BaseListeCmp, DrawSheetPath* sheet )
     SCH_COMPONENT*          DrawLibItem;
     EDA_LibComponentStruct* Entry;
 
-    for(  ; DrawList;   DrawList = DrawList->Pnext )
+    for(  ; DrawList;   DrawList = DrawList->Next() )
     {
         if( DrawList->Type() == TYPE_SCH_COMPONENT )
         {

eeschema/block_libedit.cpp

@@ -517,7 +517,7 @@ void CopyMarkedItems( EDA_LibComponentStruct* LibEntry, wxPoint offset )
         item->m_Selected = 0;
         LibEDA_BaseStruct* newitem = CopyDrawEntryStruct( NULL, item );
         newitem->m_Selected = IS_SELECTED;
-        newitem->Pnext = LibEntry->m_Drawings;
+        newitem->SetNext( LibEntry->m_Drawings );
         LibEntry->m_Drawings = newitem;
     }
 

eeschema/build_BOM.cpp

@@ -301,7 +301,7 @@ int BuildComponentsListFromSchematic( ListComponent* aList )
 
             itemCount++;
             DrawLibItem = (SCH_COMPONENT*) SchItem;
-            DrawLibItem->m_Parent = sheet->LastScreen();
+            DrawLibItem->SetParent( sheet->LastScreen() );
             if( aList )
             {
                 aList->m_Comp      = DrawLibItem;
@@ -376,7 +376,7 @@ static int GenListeGLabels( ListLabel* list )
                             list++;
                         }
                         itemCount++;
-                    SheetLabel = (Hierarchical_PIN_Sheet_Struct*) (SheetLabel->Pnext);
+                        SheetLabel = SheetLabel->Next();
                     }
                 }
                 break;
@@ -384,7 +384,7 @@ static int GenListeGLabels( ListLabel* list )
             default:
                 break;
             }
-            DrawList = DrawList->Pnext;
+            DrawList = DrawList->Next();
         }
     }
 
@@ -750,13 +750,13 @@ int WinEDA_Build_BOM_Frame::PrintComponentsListByRef( FILE* f,
             if( CompactForm )
             {
                 fprintf( f, "%c%s", s_ExportSeparatorSymbol, CONV_TO_UTF8( msg ) );
-                msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*)DrawLibItem->m_Parent, DrawLibItem->m_Pos );
+                msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*)DrawLibItem->GetParent(), DrawLibItem->m_Pos );
                 fprintf( f, "%c%s)", s_ExportSeparatorSymbol, CONV_TO_UTF8( msg ) );
             }
             else
             {
                 fprintf( f, "   (Sheet %s)", CONV_TO_UTF8( msg ) );
-                msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*)DrawLibItem->m_Parent, DrawLibItem->m_Pos );
+                msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*)DrawLibItem->GetParent(), DrawLibItem->m_Pos );
                 fprintf( f, "   (loc %s)", CONV_TO_UTF8( msg ) );
             }
         }
@@ -837,7 +837,7 @@ int WinEDA_Build_BOM_Frame::PrintComponentsListByVal( FILE* f,
         {
             msg = aList[ii].m_SheetList.PathHumanReadable();
             fprintf( f, "   (Sheet %s)", CONV_TO_UTF8( msg ) );
-            msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*)DrawLibItem->m_Parent, DrawLibItem->m_Pos );
+            msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*)DrawLibItem->GetParent(), DrawLibItem->m_Pos );
             fprintf( f, "   (loc %s)", CONV_TO_UTF8( msg ) );
         }
 

eeschema/bus-wire-junction.cpp

@@ -50,7 +50,7 @@ SCH_ITEM* SCH_SCREEN::ExtractWires( bool CreateCopy )
         case DRAW_JUNCTION_STRUCT_TYPE:
         case DRAW_SEGMENT_STRUCT_TYPE:
             RemoveFromDrawList( item );
-            item->Pnext = List;
+            item->SetNext( List );
             List = item;
             if( CreateCopy )
             {
@@ -58,7 +58,7 @@ SCH_ITEM* SCH_SCREEN::ExtractWires( bool CreateCopy )
                     new_item = ( (DrawJunctionStruct*) item )->GenCopy();
                 else
                     new_item = ( (EDA_DrawLineStruct*) item )->GenCopy();
-                new_item->Pnext = EEDrawList;
+                new_item->SetNext( EEDrawList );
                 EEDrawList = new_item;
             }
             break;
@@ -79,7 +79,8 @@ static void RestoreOldWires( SCH_SCREEN* screen )
 /* Replace the wires in screen->EEDrawList by s_OldWiresList wires.
  */
 {
-    SCH_ITEM* item, * next_item;
+    SCH_ITEM* item;
+    SCH_ITEM* next_item;
 
     for( item = screen->EEDrawList; item != NULL; item = next_item )
     {
@@ -101,7 +102,8 @@ static void RestoreOldWires( SCH_SCREEN* screen )
     while( s_OldWiresList )
     {
         next_item = s_OldWiresList->Next();
-        s_OldWiresList->Pnext = screen->EEDrawList,
+
+        s_OldWiresList->SetNext( screen->EEDrawList );
         screen->EEDrawList    = s_OldWiresList;
         s_OldWiresList = next_item;
     }
@@ -166,8 +168,8 @@ void WinEDA_SchematicFrame::BeginSegment( wxDC* DC, int type )
         {
             nextsegment = newsegment->GenCopy();
             nextsegment->m_Flags = IS_NEW;
-            newsegment->Pnext    = nextsegment;
-            nextsegment->Pback   = newsegment;
+            newsegment->SetNext( nextsegment );
+            nextsegment->SetBack( newsegment );
         }
         GetScreen()->SetCurItem( newsegment );
         DrawPanel->ManageCurseur = Segment_in_Ghost;
@@ -176,7 +178,7 @@ void WinEDA_SchematicFrame::BeginSegment( wxDC* DC, int type )
     }
     else    /* Trace en cours: Placement d'un point supplementaire */
     {
-        nextsegment = (EDA_DrawLineStruct*) oldsegment->Pnext;
+        nextsegment = oldsegment->Next();
         if( !g_HVLines )
         { /* if only one segment is needed and the current is has len = 0, do not create a new one*/
             if( oldsegment->IsNull() )
@@ -198,7 +200,7 @@ void WinEDA_SchematicFrame::BeginSegment( wxDC* DC, int type )
         }
 
         /* Placement en liste generale */
-        oldsegment->Pnext = GetScreen()->EEDrawList;
+        oldsegment->SetNext( GetScreen()->EEDrawList );
         GetScreen()->EEDrawList = oldsegment;
         DrawPanel->CursorOff( DC );     // Erase schematic cursor
         RedrawOneStruct( DrawPanel, DC, oldsegment, GR_DEFAULT_DRAWMODE );
@@ -209,10 +211,10 @@ void WinEDA_SchematicFrame::BeginSegment( wxDC* DC, int type )
         {
             newsegment = nextsegment->GenCopy();
             nextsegment->m_Start = newsegment->m_End;
-            nextsegment->Pnext   = NULL;
-            nextsegment->Pback   = newsegment;
-            newsegment->Pnext    = nextsegment;
-            newsegment->Pback    = NULL;
+            nextsegment->SetNext( NULL );
+            nextsegment->SetBack( newsegment );
+            newsegment->SetNext( nextsegment );
+            newsegment->SetBack( NULL );
         }
         else
         {
@@ -256,16 +258,16 @@ void WinEDA_SchematicFrame::EndSegment( wxDC* DC )
     lastsegment = firstsegment;
     while( lastsegment )
     {
-        EDA_DrawLineStruct* nextsegment = (EDA_DrawLineStruct*) lastsegment->Pnext;
+        EDA_DrawLineStruct* nextsegment = lastsegment->Next();
         if( lastsegment->IsNull() )
         {
-            EDA_DrawLineStruct* previous_segment = (EDA_DrawLineStruct*) lastsegment->Pback;
+            EDA_DrawLineStruct* previous_segment = lastsegment->Back();
             if( firstsegment == lastsegment )
                 firstsegment = nextsegment;
             if( nextsegment )
-                nextsegment->Pback = NULL;
+                nextsegment->SetBack( NULL );
             if( previous_segment )
-                previous_segment->Pnext = nextsegment;
+                previous_segment->SetNext( nextsegment );
             delete lastsegment;
         }
         lastsegment = nextsegment;
@@ -276,8 +278,8 @@ void WinEDA_SchematicFrame::EndSegment( wxDC* DC )
     while( segment )
     {
         lastsegment = segment;
-        segment = (EDA_DrawLineStruct*) segment->Pnext;
-        lastsegment->Pnext      = GetScreen()->EEDrawList;
+        segment = segment->Next();
+        lastsegment->SetNext( GetScreen()->EEDrawList );
         GetScreen()->EEDrawList = lastsegment;
     }
 
@@ -311,7 +313,7 @@ void WinEDA_SchematicFrame::EndSegment( wxDC* DC )
                 g_ItemToRepeat = segment;
         }
         segment->m_Flags = 0;
-        segment = (EDA_DrawLineStruct*) segment->Pnext;
+        segment = segment->Next();
     }
 
     // Automatic place of a junction on the end point, if needed
@@ -348,7 +350,7 @@ void WinEDA_SchematicFrame::EndSegment( wxDC* DC )
             break;
         }
 
-        item = item->Pnext;
+        item = item->Next();
     }
 
 
@@ -386,7 +388,7 @@ static void Segment_in_Ghost( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
         {
             if( !segment->IsNull() )  // Redraw if segment lengtht != 0
                 RedrawOneStruct( panel, DC, segment, g_XorMode, color );
-            segment = (EDA_DrawLineStruct*) segment->Pnext;
+            segment = segment->Next();
         }
     }
 
@@ -403,7 +405,7 @@ static void Segment_in_Ghost( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
     {
         if( !segment->IsNull() )  // Redraw if segment lengtht != 0
             RedrawOneStruct( panel, DC, segment, g_XorMode, color );
-        segment = (EDA_DrawLineStruct*) segment->Pnext;
+        segment = segment->Next();
     }
 }
 
@@ -416,7 +418,7 @@ static void ComputeBreakPoint( EDA_DrawLineStruct* segment, const wxPoint& new_p
  *  with the 2 segments kept H or V only
  */
 {
-    EDA_DrawLineStruct* nextsegment     = (EDA_DrawLineStruct*) segment->Pnext;
+    EDA_DrawLineStruct* nextsegment     = segment->Next();
     wxPoint             middle_position = new_pos;
 
     if( nextsegment == NULL )
@@ -543,7 +545,7 @@ DrawJunctionStruct* WinEDA_SchematicFrame::CreateNewJunctionStruct(
     RedrawOneStruct( DrawPanel, DC, NewJunction, GR_DEFAULT_DRAWMODE );
     DrawPanel->CursorOn( DC );      // Display schematic cursor
 
-    NewJunction->Pnext      = GetScreen()->EEDrawList;
+    NewJunction->SetNext( GetScreen()->EEDrawList );
     GetScreen()->EEDrawList = NewJunction;
     GetScreen()->SetModify();
     if( PutInUndoList )
@@ -568,7 +570,7 @@ DrawNoConnectStruct* WinEDA_SchematicFrame::CreateNewNoConnectStruct( wxDC* DC )
     RedrawOneStruct( DrawPanel, DC, NewNoConnect, GR_DEFAULT_DRAWMODE );
     DrawPanel->CursorOn( DC );      // Display schematic cursor
 
-    NewNoConnect->Pnext     = GetScreen()->EEDrawList;
+    NewNoConnect->SetNext( GetScreen()->EEDrawList );
     GetScreen()->EEDrawList = NewNoConnect;
     GetScreen()->SetModify();
     SaveCopyInUndoList( NewNoConnect, IS_NEW );
@@ -729,7 +731,7 @@ void WinEDA_SchematicFrame::RepeatDrawItem( wxDC* DC )
 
     if( g_ItemToRepeat )
     {
-        g_ItemToRepeat->Pnext   = GetScreen()->EEDrawList;
+        g_ItemToRepeat->SetNext( GetScreen()->EEDrawList );
         GetScreen()->EEDrawList = g_ItemToRepeat;
         TestDanglingEnds( GetScreen()->EEDrawList, NULL );
         RedrawOneStruct( DrawPanel, DC, g_ItemToRepeat, GR_DEFAULT_DRAWMODE );

eeschema/class_drawsheet.cpp

@@ -146,7 +146,7 @@ DrawSheetStruct* DrawSheetStruct::GenCopy()
 
 
     newitem->m_Size      = m_Size;
-    newitem->m_Parent    = m_Parent;
+    newitem->SetParent( m_Parent );
     newitem->m_TimeStamp = GetTimeStamp();
 
     newitem->m_FileName      = m_FileName;
@@ -161,15 +161,15 @@ DrawSheetStruct* DrawSheetStruct::GenCopy()
     if( label )
     {
         Slabel = newitem->m_Label = label->GenCopy();
-        Slabel->m_Parent = newitem;
+        Slabel->SetParent( newitem );
         label = label->Next();
     }
 
     while( label )
     {
-        Slabel->Pnext = label->GenCopy();
-        Slabel = (Hierarchical_PIN_Sheet_Struct*) Slabel->Pnext;
-        Slabel->m_Parent = newitem;
+        Slabel->SetNext( label->GenCopy() );
+        Slabel = Slabel->Next();
+        Slabel->SetParent( newitem );
         label = label->Next();
     }
 
@@ -202,14 +202,14 @@ void DrawSheetStruct::SwapData( DrawSheetStruct* copyitem )
     Hierarchical_PIN_Sheet_Struct* label = m_Label;
     while( label )
     {
-        label->m_Parent = this;
+        label->SetParent( this );
         label = label->Next();
     }
 
     label = copyitem->m_Label;
     while( label )
     {
-        label->m_Parent = copyitem;
+        label->SetParent( copyitem );
         label = label->Next();
     }
 }
@@ -257,13 +257,15 @@ void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* aFrame, bool aRedraw
 
         EDA_BaseStruct* DrawStruct = m_AssociatedScreen->EEDrawList;
         SCH_HIERLABEL*  HLabel = NULL;
-        for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )
+        for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Next() )
         {
             if( DrawStruct->Type() != TYPE_SCH_HIERLABEL )
                 continue;
+
             HLabel = (SCH_HIERLABEL*) DrawStruct;
             if( Pinsheet->m_Text.CmpNoCase( HLabel->m_Text ) == 0 )
                 break; // Found!
+
             HLabel = NULL;
         }
 
@@ -375,7 +377,7 @@ int DrawSheetStruct::ComponentCount()
     if( m_AssociatedScreen )
     {
         EDA_BaseStruct* bs;
-        for( bs = m_AssociatedScreen->EEDrawList; bs != NULL; bs = bs->Pnext )
+        for( bs = m_AssociatedScreen->EEDrawList; bs != NULL; bs = bs->Next() )
         {
             if( bs->Type() == TYPE_SCH_COMPONENT )
             {
@@ -416,7 +418,7 @@ bool DrawSheetStruct::SearchHierarchy( wxString filename, SCH_SCREEN** screen )
                 if( ss->SearchHierarchy( filename, screen ) )
                     return true;
             }
-            strct = strct->Pnext;
+            strct = strct->Next();
         }
     }
     return false;
@@ -446,7 +448,7 @@ bool DrawSheetStruct::LocatePathOfScreen( SCH_SCREEN* screen, DrawSheetPath* lis
                 if( ss->LocatePathOfScreen( screen, list ) )
                     return true;
             }
-            strct = strct->Pnext;
+            strct = strct->Next();
         }
 
         list->Pop();
@@ -488,7 +490,7 @@ bool DrawSheetStruct::Load( WinEDA_SchematicFrame* frame )
                         if( !sheetstruct->Load( frame ) )
                             success = false;
                     }
-                    bs = bs->Pnext;
+                    bs = bs->Next();
                 }
             }
         }
@@ -506,7 +508,7 @@ int DrawSheetStruct::CountSheets()
     if( m_AssociatedScreen )
     {
         EDA_BaseStruct* strct = m_AssociatedScreen->EEDrawList;
-        for( ; strct; strct = strct->Pnext )
+        for( ; strct; strct = strct->Next() )
         {
             if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
             {
@@ -787,7 +789,7 @@ void DrawSheetPath::UpdateAllScreenReferences()
             component->GetField(REFERENCE)->m_Text = component->GetRef( this );
             component->m_Multi = component->GetUnitSelection( this );
         }
-        t = t->Pnext;
+        t = t->Next();
     }
 }
 

eeschema/class_library.cpp

@@ -196,7 +196,8 @@ EDA_LibComponentStruct::~EDA_LibComponentStruct()
     field = Fields; Fields = NULL;
     while( field )
     {
-        TempField = field; field = (LibDrawField*) field->Pnext;
+        TempField = field;
+        field = field->Next();
         SAFE_DELETE( TempField );
     }
 

eeschema/class_screen.cpp

@@ -28,7 +28,7 @@ void SetStructFather( EDA_BaseStruct* Struct, BASE_SCREEN* Screen )
     case DRAW_SHEET_STRUCT_TYPE:
     case DRAW_MARKER_STRUCT_TYPE:
     case DRAW_NOCONNECT_STRUCT_TYPE:
-        Struct->m_Parent = Screen;
+        Struct->SetParent( Screen );
         break;
 
     case DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE:
@@ -138,9 +138,9 @@ void SCH_SCREEN::RemoveFromDrawList( SCH_ITEM * DrawStruct )
         EDA_BaseStruct* DrawList = EEDrawList;
         while( DrawList && DrawList->Next() )
         {
-            if( DrawList->Pnext == DrawStruct )
+            if( DrawList->Next() == DrawStruct )
             {
-                DrawList->Pnext = DrawList->Pnext->Pnext;
+                DrawList->SetNext( DrawList->Next()->Next() );
                 break;
             }
             DrawList = DrawList->Next();
@@ -170,7 +170,7 @@ bool SCH_SCREEN::CheckIfOnDrawList( SCH_ITEM* st )
 void SCH_SCREEN::AddToDrawList( SCH_ITEM* st )
 /**************************************************************/
 { //simple function to add to the head of the drawlist.
-    st->Pnext  = EEDrawList;
+    st->SetNext( EEDrawList );
     EEDrawList = st;
 }
 
@@ -262,7 +262,7 @@ void EDA_ScreenList::BuildScreenList( EDA_BaseStruct* s )
             {
                 BuildScreenList( strct );
             }
-            strct = strct->Pnext;
+            strct = strct->Next();
         }
     }
 }
@@ -335,7 +335,7 @@ void EDA_SheetList::BuildSheetList( DrawSheetStruct* sheet )
                 DrawSheetStruct* sht = (DrawSheetStruct*) strct;
                 BuildSheetList( sht );
             }
-            strct = strct->Pnext;
+            strct = strct->Next();
         }
     }
     m_currList.Pop();

eeschema/classes_body_items.h

@@ -193,10 +193,15 @@ public:
 public:
     LibDrawPin();
     ~LibDrawPin() { }
+
+    LibDrawPin* Next() const { return (LibDrawPin*) Pnext; }
+    LibDrawPin* Back() const { return (LibDrawPin*) Pback; }
+
     virtual wxString GetClass() const
     {
         return wxT( "LibDrawPin" );
     }
+
     /**
      * Function Save
      * writes the data structures for this object out to a FILE in "*.brd" format.
@@ -451,8 +456,8 @@ public:
 
 public:
 
-    LibDrawField*   Next() { return (LibDrawField*) Pnext; }
-    LibDrawField*   Prev() { return (LibDrawField*) Pback; }
+    LibDrawField*   Next() const { return (LibDrawField*) Pnext; }
+    LibDrawField*   Back() const { return (LibDrawField*) Pback; }
 
 
     LibDrawField( int idfield = 2 );

eeschema/cleanup.cpp

@@ -167,14 +167,14 @@ DrawPickedStruct* BreakSegment( SCH_SCREEN* screen,
                 wrapper->m_PickedStruct = segment->GenCopy();
                 wrapper->m_Image = segment;
                 wrapper->m_PickedStruct->m_Image = segment;
-                wrapper->Pnext = List;
+                wrapper->SetNext( List );
                 List = wrapper;
             }
             NewSegment = segment->GenCopy();
             NewSegment->m_Start = breakpoint;
             segment->m_End    = NewSegment->m_Start;
-            NewSegment->Pnext = segment->Pnext;
-            segment->Pnext    = NewSegment;
+            NewSegment->SetNext( segment->Next() );
+            segment->SetNext( NewSegment );
             DrawList = NewSegment;
             if( PutInUndoList )
             {
@@ -182,7 +182,7 @@ DrawPickedStruct* BreakSegment( SCH_SCREEN* screen,
 
                 wrapper->m_Flags = IS_NEW;
                 wrapper->m_Image = NewSegment;
-                wrapper->Pnext   = List;
+                wrapper->SetNext( List );
                 List = wrapper;
             }
             break;
@@ -196,7 +196,7 @@ DrawPickedStruct* BreakSegment( SCH_SCREEN* screen,
             break;
         }
 
-        DrawList = DrawList->Pnext;
+        DrawList = DrawList->Next();
     }
 
     return List;

eeschema/component_class.cpp

@@ -72,10 +72,10 @@ SCH_COMPONENT::SCH_COMPONENT( const SCH_COMPONENT& aTemplate ) :
     Pnext = NULL;
     m_Son = NULL;
 
-    // Re-parent the fields, which before this were aTemplate's parent
+    // Re-parent the fields, which before this had aTemplate as parent
     for( int i=0; i<GetFieldCount();  ++i )
     {
-        GetField( i )->m_Parent = this;
+        GetField( i )->SetParent( this );
     }
 }
 
@@ -424,11 +424,11 @@ void SCH_COMPONENT::SwapData( SCH_COMPONENT* copyitem )
     // (after swap(), m_Parent member does not point to the right parent):
     for( int ii = 0; ii < copyitem->GetFieldCount();  ++ii )
     {
-       copyitem->GetField(ii)->m_Parent = copyitem;
+       copyitem->GetField(ii)->SetParent( copyitem );
     }
     for( int ii = 0; ii < GetFieldCount();  ++ii )
     {
-       GetField(ii)->m_Parent = this;
+       GetField(ii)->SetParent( this );
     }
 
 }

eeschema/component_class.h

@@ -39,7 +39,11 @@ struct Error
     }
 };
 
-/* Fields identifiers */
+
+/**
+ * Enum NumFieldType
+ * is the numbered set of all fields a SCH_COMPONENT can hold
+ */
 enum  NumFieldType {
     REFERENCE = 0,          ///< Field Reference of part, i.e. "IC21"
     VALUE,                  ///< Field Value of part, i.e. "3.3K"
@@ -59,31 +63,36 @@ enum  NumFieldType {
 };
 
 
+/// A container for several SCH_CMP_FIELD items
+typedef std::vector<SCH_CMP_FIELD>  SCH_CMP_FIELDS;
+
+
 /**
  * Class SCH_COMPONENT
  * describes a real schematic component
  */
 class SCH_COMPONENT : public SCH_ITEM
 {
+    friend class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC;
+
 public:
-    int               m_Multi; /* In multi unit chip - which unit to draw. */
+    int               m_Multi;          ///< In multi unit chip - which unit to draw.
 
     wxPoint           m_Pos;
 
-    wxString          m_ChipName;  /* Key to look for in the library, i.e. "74LS00". */
+    wxString          m_ChipName;       ///< Key to look for in the library, i.e. "74LS00".
+
     wxString          m_PrefixString;   /* C, R, U, Q etc - the first character which typically indicates what the component is.
                                          * determined, upon placement, from the library component.
-                                         * determined, upon file load, by the first non-digits in the reference fields. */
+                                         * determined, upon file load, by the first non-digits in the reference fields.
+                                         */
 
     int               m_Convert;                    /* Handle mutiple shape (for instance De Morgan conversion) */
     int               m_Transform[2][2];            /* The rotation/mirror transformation matrix. */
 
 private:
 
-/** how many fields are fixed, or automatic and pre-made in the SCH_COMPONENT class */
-
-    typedef std::vector<SCH_CMP_FIELD>  SCH_CMP_FIELDS;
-    SCH_CMP_FIELDS    m_Fields;
+    SCH_CMP_FIELDS    m_Fields;         ///< variable length list of fields
 
 
     /* Hierarchical references.
@@ -200,14 +209,16 @@ public:
 
     void                    Place( WinEDA_SchematicFrame* frame, wxDC* DC );
 
-
-    //returns a unique ID, in the form of a path.
+    // returns a unique ID, in the form of a path.
     wxString                GetPath( DrawSheetPath* sheet );
-    //returns the reference, for the given sheet path.
 
+    /**
+     * Function GetRef
+     * returns the reference, for the given sheet path.
+     */
     const wxString          GetRef( DrawSheetPath* sheet );
 
-    //Set the reference, for the given sheet path.
+    // Set the reference, for the given sheet path.
     void                    SetRef( DrawSheetPath* sheet, const wxString& ref );
 
     /**

eeschema/controle.cpp

@@ -54,7 +54,7 @@ SCH_ITEM * WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( bool Includ
     {
     case DRAW_PART_TEXT_STRUCT_TYPE:
     case COMPONENT_FIELD_DRAW_TYPE:
-        LibItem = (SCH_COMPONENT*) DrawStruct->m_Parent;
+        LibItem = (SCH_COMPONENT*) DrawStruct->GetParent();
         SendMessageToPCBNEW( DrawStruct,LibItem );
         break;
 
@@ -168,7 +168,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
     if( DrawStruct )
     {
         SCH_CMP_FIELD* Field = (SCH_CMP_FIELD*) DrawStruct;
-        LibItem = (SCH_COMPONENT*) Field->m_Parent;
+        LibItem = (SCH_COMPONENT*) Field->GetParent();
         LibItem->Display_Infos( this );
 
         return DrawStruct;

eeschema/dangling_ends.cpp

@@ -314,7 +314,7 @@ DanglingEndHandle* RebuildEndList( EDA_BaseStruct* DrawList )
     DanglingEndHandle* StartList = NULL, * item, * lastitem = NULL;
     EDA_BaseStruct* DrawItem;
 
-    for( DrawItem = DrawList; DrawItem != NULL; DrawItem = DrawItem->Pnext )
+    for( DrawItem = DrawList; DrawItem != NULL; DrawItem = DrawItem->Next() )
     {
         switch( DrawItem->Type() )
         {

eeschema/delete.cpp

@@ -147,7 +147,7 @@ void WinEDA_SchematicFrame::DeleteConnection( wxDC* DC, bool DeleteFullConnectio
         /* Put this structure in the picked list: */
         PickedItem = new DrawPickedStruct( DelStruct );
 
-        PickedItem->Pnext = PickedList;
+        PickedItem->SetNext( PickedList );
         PickedList = PickedItem;
         DelStruct  = DelStruct->Next();
         screen->EEDrawList = DelStruct;
@@ -194,7 +194,7 @@ void WinEDA_SchematicFrame::DeleteConnection( wxDC* DC, bool DeleteFullConnectio
             EDA_BaseStruct* removed_struct;
             for( removed_struct = GetScreen()->EEDrawList;
                  removed_struct != NULL;
-                 removed_struct = removed_struct->Pnext )
+                 removed_struct = removed_struct->Next() )
             {
                 if( (removed_struct->m_Flags & STRUCT_DELETED) == 0 )
                     continue;
@@ -214,7 +214,7 @@ void WinEDA_SchematicFrame::DeleteConnection( wxDC* DC, bool DeleteFullConnectio
               * and now is not connected, the wire can be deleted */
             for( removed_struct = GetScreen()->EEDrawList;
                  removed_struct != NULL;
-                 removed_struct = removed_struct->Pnext )
+                 removed_struct = removed_struct->Next() )
             {
                 if( (removed_struct->m_Flags & STRUCT_DELETED) == 0 )
                     continue;
@@ -236,7 +236,7 @@ void WinEDA_SchematicFrame::DeleteConnection( wxDC* DC, bool DeleteFullConnectio
                 /* Put this structure in the picked list: */
                 PickedItem = new DrawPickedStruct( DelStruct );
 
-                PickedItem->Pnext = PickedList;
+                PickedItem->SetNext( PickedList );
                 PickedList = PickedItem;
                 DelStruct  = GetScreen()->EEDrawList;
             }
@@ -264,7 +264,7 @@ void WinEDA_SchematicFrame::DeleteConnection( wxDC* DC, bool DeleteFullConnectio
                     /* Put this structure in the picked list: */
                     PickedItem = new DrawPickedStruct( DelStruct );
 
-                    PickedItem->Pnext = PickedList;
+                    PickedItem->SetNext( PickedList );
                     PickedList = PickedItem;
                 }
                 #undef JUNCTION
@@ -292,7 +292,7 @@ void WinEDA_SchematicFrame::DeleteConnection( wxDC* DC, bool DeleteFullConnectio
                 /* Put this structure in the picked list: */
                 PickedItem = new DrawPickedStruct( DelStruct );
 
-                PickedItem->Pnext = PickedList;
+                PickedItem->SetNext( PickedList );
                 PickedList = PickedItem;
             }
         }
@@ -398,7 +398,7 @@ void EraseStruct( SCH_ITEM* DrawStruct, SCH_SCREEN* Screen )
           * accessible par la liste globale directement */
         //this structure has a sheet attached, which we must find.
         DrawList = Screen->EEDrawList;
-        for( ; DrawList != NULL; DrawList = DrawList->Pnext )
+        for( ; DrawList != NULL; DrawList = DrawList->Next() )
         {
             if( DrawList->Type() != DRAW_SHEET_STRUCT_TYPE )
                 continue;
@@ -411,19 +411,19 @@ void EraseStruct( SCH_ITEM* DrawStruct, SCH_SCREEN* Screen )
             if( SheetLabel == (Hierarchical_PIN_Sheet_Struct*) DrawStruct )
             {
                 ( (DrawSheetStruct*) DrawList )->m_Label =
-                    (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Pnext;
+                    (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Next();
 
                 SAFE_DELETE( DrawStruct );
                 return;
             }
             else
             {
-                while( SheetLabel->Pnext ) /* Examen de la liste dependante */
+                while( SheetLabel->Next() ) /* Examen de la liste dependante */
                 {
-                    NextLabel = (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Pnext;
+                    NextLabel = (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Next();
                     if( NextLabel == (Hierarchical_PIN_Sheet_Struct*) DrawStruct )
                     {
-                        SheetLabel->Pnext = (EDA_BaseStruct*) NextLabel->Pnext;
+                        SheetLabel->SetNext( (EDA_BaseStruct*) NextLabel->Next() );
                         SAFE_DELETE( DrawStruct );
                         return;
                     }
@@ -448,18 +448,18 @@ void EraseStruct( SCH_ITEM* DrawStruct, SCH_SCREEN* Screen )
             else
             {
                 DrawList = Screen->EEDrawList;
-                while( DrawList && DrawList->Pnext )
+                while( DrawList && DrawList->Next() )
                 {
-                    if( DrawList->Pnext == PickedList->m_PickedStruct )
+                    if( DrawList->Next() == PickedList->m_PickedStruct )
                     {
-                        DrawList->Pnext = DrawList->Pnext->Pnext;
+                        DrawList->SetNext( DrawList->Next()->Next() );
                         SAFE_DELETE( DrawStruct );
                         return;
                     }
-                    DrawList = DrawList->Pnext;
+                    DrawList = DrawList->Next();
                 }
             }
-            PickedList = (DrawPickedStruct*) PickedList->Pnext;
+            PickedList = (DrawPickedStruct*) PickedList->Next();
         }
     }
     else    // structure usuelle */
@@ -472,15 +472,15 @@ void EraseStruct( SCH_ITEM* DrawStruct, SCH_SCREEN* Screen )
         else
         {
             DrawList = Screen->EEDrawList;
-            while( DrawList && DrawList->Pnext )
+            while( DrawList && DrawList->Next() )
             {
-                if( DrawList->Pnext == DrawStruct )
+                if( DrawList->Next() == DrawStruct )
                 {
-                    DrawList->Pnext = DrawStruct->Pnext;
+                    DrawList->SetNext( DrawStruct->Next() );
                     SAFE_DELETE( DrawStruct );
                     return;
                 }
-                DrawList = DrawList->Pnext;
+                DrawList = DrawList->Next();
             }
         }
     }
@@ -557,9 +557,9 @@ void DeleteOneLibraryDrawStruct( WinEDA_DrawPanel* panel, wxDC* DC,
         {
             while( PreviousDrawItem )
             {
-                if( PreviousDrawItem->Pnext == DrawItem )
+                if( PreviousDrawItem->Next() == DrawItem )
                 {
-                    PreviousDrawItem->Pnext = DrawItem->Pnext;
+                    PreviousDrawItem->SetNext( DrawItem->Next() );
                     SAFE_DELETE( DrawItem );
                     break;
                 }

eeschema/delsheet.cpp

-	/*******************************************************/
-	/* delsheet.cpp  Routine d'effacement d'une hierarchie */
-	/*******************************************************/
+/*******************************************************/
+/* delsheet.cpp  Routine d'effacement d'une hierarchie */
+/*******************************************************/
 
 #include "fctsys.h"
 #include "gr_basic.h"
@@ -14,88 +14,97 @@
 
 
 /**************************************************************************/
-void DeleteSubHierarchy(DrawSheetStruct * FirstSheet, bool confirm_deletion)
+void DeleteSubHierarchy( DrawSheetStruct* FirstSheet, bool confirm_deletion )
 /**************************************************************************/
 
 /*  Free (delete) all schematic data (include the sub hierarchy sheets )
-	for the hierarchical sheet FirstSheet
-	FirstSheet is not deleted.
-*/
+  * for the hierarchical sheet FirstSheet
+  * FirstSheet is not deleted.
+ */
 {
-EDA_BaseStruct *DrawStruct;
-EDA_BaseStruct *EEDrawList;
-WinEDA_SchematicFrame * frame = g_EDA_Appl->m_SchematicFrame;
-wxString msg;
+    EDA_BaseStruct*        DrawStruct;
+    EDA_BaseStruct*        EEDrawList;
+    WinEDA_SchematicFrame* frame = g_EDA_Appl->m_SchematicFrame;
+    wxString msg;
 
-	if( FirstSheet == NULL ) return;
+    if( FirstSheet == NULL )
+        return;
 
-	if( FirstSheet->Type() != DRAW_SHEET_STRUCT_TYPE)
+    if( FirstSheet->Type() != DRAW_SHEET_STRUCT_TYPE )
     {
-		DisplayError(NULL,
-				wxT("DeleteSubHierarchy error(): NOT a Sheet"));
+        DisplayError( NULL,
+            wxT( "DeleteSubHierarchy error(): NOT a Sheet" ) );
         return;
     }
 
     /* effacement du sous schema correspondant */
     if( FirstSheet->m_AssociatedScreen->IsModify() && confirm_deletion )
     {
-		msg.Printf( _("Sheet %s (file %s) modified. Save it?"),
+        msg.Printf( _( "Sheet %s (file %s) modified. Save it?" ),
             FirstSheet->m_SheetName.GetData(),
-					FirstSheet->GetFileName().GetData());
-		if( IsOK(NULL, msg) )
+            FirstSheet->GetFileName().GetData() );
+        if( IsOK( NULL, msg ) )
         {
-			frame->SaveEEFile(FirstSheet->m_AssociatedScreen, FILE_SAVE_AS);
+            frame->SaveEEFile( FirstSheet->m_AssociatedScreen, FILE_SAVE_AS );
         }
     }
 
     /* free the sub hierarchy */
-	if(FirstSheet->m_AssociatedScreen){
+    if( FirstSheet->m_AssociatedScreen )
+    {
         EEDrawList = FirstSheet->m_AssociatedScreen->EEDrawList;
-		while (EEDrawList != NULL)
+        while( EEDrawList != NULL )
         {
             DrawStruct = EEDrawList;
-			EEDrawList = EEDrawList->Pnext;
-			if( DrawStruct->Type() == DRAW_SHEET_STRUCT_TYPE)
+            EEDrawList = EEDrawList->Next();
+            if( DrawStruct->Type() == DRAW_SHEET_STRUCT_TYPE )
             {
-				DeleteSubHierarchy((DrawSheetStruct *) DrawStruct, confirm_deletion);
+                DeleteSubHierarchy( (DrawSheetStruct*) DrawStruct, confirm_deletion );
             }
         }
+
         /* Effacement des elements de la feuille courante */
         FirstSheet->m_AssociatedScreen->FreeDrawList();
     }
 }
 
+
 /*********************************************************************/
+
 //void ClearDrawList(EDA_BaseStruct *DrawList, bool confirm_deletion)
 /********************************************************************/
 /* free the draw list DrawList and the subhierarchies */
-//this is redundant -- use FreeDrawList, a member of SCH_SCREEN
-/*
-{
-EDA_BaseStruct *DrawStruct;
-
-	while (DrawList != NULL)
-	{
-		DrawStruct = DrawList;
-		DrawList = DrawList->Pnext;
 
-		if( DrawStruct->Type() == DRAW_SHEET_STRUCT_TYPE)
-		{
-			DeleteSubHierarchy((DrawSheetStruct*) DrawStruct, confirm_deletion);
-		}
+//this is redundant -- use FreeDrawList, a member of SCH_SCREEN
 
-		delete DrawStruct;
-	}
-}
-*/
+/*
+  * {
+  * EDA_BaseStruct *DrawStruct;
+ *
+  * while (DrawList != NULL)
+  * {
+  *     DrawStruct = DrawList;
+  *     DrawList = DrawList->Pnext;
+ *
+  *     if( DrawStruct->Type() == DRAW_SHEET_STRUCT_TYPE)
+  *     {
+  *         DeleteSubHierarchy((DrawSheetStruct*) DrawStruct, confirm_deletion);
+  *     }
+ *
+  *     delete DrawStruct;
+  * }
+  * }
+ */
 /********************************************************************/
-bool ClearProjectDrawList(SCH_SCREEN * screen, bool confirm_deletion)
+bool ClearProjectDrawList( SCH_SCREEN* screen, bool confirm_deletion )
 /********************************************************************/
+
 /* free the draw list screen->EEDrawList and the subhierarchies
-	clear the screen datas (filenames ..)
-*/
+  * clear the screen datas (filenames ..)
+ */
 {
-	if ( screen == NULL ) return(TRUE);
+    if( screen == NULL )
+        return TRUE;
 
     screen->FreeDrawList();
 
@@ -112,4 +121,3 @@ bool ClearProjectDrawList(SCH_SCREEN * screen, bool confirm_deletion)
 
     return TRUE;
 }
-

eeschema/dialog_edit_component_in_schematic.h

-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog_edit_component_in_schematic.h
-// Purpose:
-// Author:      jean-pierre Charras
-// Modified by:
-// Created:     03/03/2006 15:02:54
-// RCS-ID:
-// Copyright:   License GNU
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// Generated by DialogBlocks (unregistered), 03/03/2006 15:02:54
-
-#ifndef _DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_H_
-#define _DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_H_
-
-/*!
- * Includes
- */
 
-////@begin includes
-#include "wx/notebook.h"
-////@end includes
+#ifndef __dialog_edit_component_in_schematic__
+#define __dialog_edit_component_in_schematic__
 
-/*!
- * Forward declarations
- */
 
-////@begin forward declarations
-class wxBoxSizer;
-class wxNotebook;
-////@end forward declarations
+#include "dialog_edit_component_in_schematic_fbp.h"
 
-/*!
- * Control identifiers
+/**
+ * class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC
+ * is hand coded and implements DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP which is maintained by
+ * wxFormBuilder.  Do not auto-generate this class or file, it is hand coded.
  */
+class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC : public DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP
+{
+    WinEDA_SchematicFrame*  m_Parent;
+    SCH_COMPONENT*          m_Cmp;
+    EDA_LibComponentStruct* m_LibEntry;
 
-////@begin control identifiers
-#define ID_DIALOG 10000
-#define ID_SCHEDIT_NOTEBOOK 10001
-#define ID_PANEL_BASIC 10002
-#define ID_RADIOBOX_UNIT 10004
-#define ID_RADIOBOX_ORIENT 10005
-#define ID_RADIOBOX_MIRROR 10007
-#define ID_CHECKBOX 10008
-#define ID_TEXTCTRL 10009
-#define ID_PANEL_FIELD 10003
-#define ID_CHECKBOX_SHOW_FILED 10010
-#define ID_CHECKBOX_FILED_ORIENT 10011
-#define ID_RESTORE_CMP_DEFAULTS 10006
-#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE _("Component Properties")
-#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * Compatibility
- */
+    /// a copy of the edited component's SCH_CMP_FIELDs
+    SCH_CMP_FIELDS          m_FieldBuf;
 
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
+    void setSelectedFieldNdx( int aFieldNdx );
 
-/*!
- * WinEDA_ComponentPropertiesFrame class declaration
+    int getSelectedFieldNdx();
+
+
+    /**
+     * Function CopyDataToPanel
+     * sets the values displayed on the panel according to
+     * the current field number
      */
+    void copyDataToPanel();
 
-class WinEDA_ComponentPropertiesFrame: public wxDialog
-{
-    DECLARE_DYNAMIC_CLASS( WinEDA_ComponentPropertiesFrame )
-    DECLARE_EVENT_TABLE()
+
+    void fillTableModel();
+
+protected:
+
+    // Handlers for DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP events.
+//    void OnGridCellLeftClick( wxGridEvent& event );
 
 public:
-    /// Constructors
-    WinEDA_ComponentPropertiesFrame( );
-    WinEDA_ComponentPropertiesFrame( WinEDA_SchematicFrame* parent,
-        SCH_COMPONENT * cmp,
-        wxWindowID id = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin WinEDA_ComponentPropertiesFrame event handler declarations
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
-    void OnCancelClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RESTORE_CMP_DEFAULTS
-    void OnRestoreCmpDefaultsClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
-    void OnOkClick( wxCommandEvent& event );
-
-////@end WinEDA_ComponentPropertiesFrame event handler declarations
-
-////@begin WinEDA_ComponentPropertiesFrame member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end WinEDA_ComponentPropertiesFrame member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-    void InitBuffers();
-    void BuildPanelBasic();
-    void BuildPanelFields();
-    void ComponentPropertiesAccept(wxCommandEvent& event);
-    void SetInitCmp( wxCommandEvent& event );
-    void CopyDataToPanelField();
-    void CopyPanelFieldToData();
-    void SelectNewField(wxCommandEvent& event);
-
-////@begin WinEDA_ComponentPropertiesFrame member variables
-    wxBoxSizer* m_GeneralBoxSizer;
-    wxNotebook* m_NoteBook;
-    wxPanel* m_PanelBasic;
-    wxRadioBox* m_SelectUnit;
-    wxRadioBox* m_OrientUnit;
-    wxRadioBox* m_MirrorUnit;
-    wxStaticText* m_MsgPartLocked;
-    wxCheckBox* m_ConvertButt;
-    wxTextCtrl* m_RefInLib;
-    wxPanel* m_PanelField;
-    wxCheckBox* m_ShowFieldTextCtrl;
-    wxCheckBox* m_VorientFieldText;
-    wxBoxSizer* m_FieldDatasBoxSizer;
-    wxBoxSizer* m_FieldSelectionBoxSizer;
-    wxButton* m_btClose;
-////@end WinEDA_ComponentPropertiesFrame member variables
-
-    WinEDA_SchematicFrame * m_Parent;
-    SCH_COMPONENT * m_Cmp;
-    EDA_LibComponentStruct * m_LibEntry;
-    int m_CurrentFieldId;
-
-    wxRadioBox * m_FieldSelection;
-    WinEDA_GraphicTextCtrl * m_FieldTextCtrl;
-    WinEDA_EnterText * m_FieldNameCtrl;
-    WinEDA_PositionCtrl * m_FieldPositionCtrl;
-    wxString m_FieldText[NUMBER_OF_FIELDS];
-    wxString m_FieldName[NUMBER_OF_FIELDS];
-    wxPoint m_FieldPosition[NUMBER_OF_FIELDS];
-    int m_FieldSize[NUMBER_OF_FIELDS];
-    int m_FieldFlags[NUMBER_OF_FIELDS];
-    int m_FieldOrient[NUMBER_OF_FIELDS];
+    /** Constructor */
+    DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow* parent );
+
+    /**
+     * Function InitBuffers
+     * sets up to edit the given component.
+     * @param aComponent The component to edit.
+     */
+    void InitBuffers( SCH_COMPONENT* aComponent );
+
 };
 
-#endif
-    // _DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_H_
+#endif // __dialog_edit_component_in_schematic__

eeschema/edit_component_in_lib.cpp

@@ -191,7 +191,7 @@ void WinEDA_PartPropertiesFrame::InitBuffers()
     while( Field )
     {
         CopyFieldDataToBuffer( Field );
-        Field = (LibDrawField*) Field->Pnext;
+        Field = Field->Next();
     }
 }
 
@@ -753,7 +753,7 @@ void WinEDA_PartPropertiesFrame::PartPropertiesAccept( wxCommandEvent& event )
         LibDrawField* NextField, * previousField = NULL;
         while( Field )
         {
-            NextField = (LibDrawField*) Field->Pnext;
+            NextField = Field->Next();
             if( Field->m_FieldId == ii )
             {
                 CopyBufferToFieldData( Field );
@@ -765,7 +765,7 @@ void WinEDA_PartPropertiesFrame::PartPropertiesAccept( wxCommandEvent& event )
                     {
                         SAFE_DELETE( Field );
                         if( previousField )
-                            previousField->Pnext = NextField;
+                            previousField->SetNext( NextField );
                         else
                             CurrentLibEntry->Fields = NextField;
                     }
@@ -789,7 +789,7 @@ void WinEDA_PartPropertiesFrame::PartPropertiesAccept( wxCommandEvent& event )
                 Field = new LibDrawField( ii );
 
                 CopyBufferToFieldData( Field );
-                Field->Pnext = CurrentLibEntry->Fields;
+                Field->SetNext( CurrentLibEntry->Fields );
                 CurrentLibEntry->Fields = Field;
             }
         }
@@ -805,7 +805,7 @@ void WinEDA_PartPropertiesFrame::PartPropertiesAccept( wxCommandEvent& event )
             if( Field->m_FieldId >= FIELD1 )
                 if( Field->m_Text.IsEmpty() )
                     Field->m_Text = wxT( "~" );
-            Field = (LibDrawField*) Field->Pnext;
+            Field = Field->Next();
         }
     }
 
@@ -1043,7 +1043,7 @@ bool WinEDA_PartPropertiesFrame::ChangeNbUnitsPerPackage( int MaxUnit )
                 for( ii = OldNumUnits + 1; ii <= MaxUnit; ii++ )
                 {
                     NextDrawItem = CopyDrawEntryStruct( this, DrawItem );
-                    NextDrawItem->Pnext = CurrentLibEntry->m_Drawings;
+                    NextDrawItem->SetNext( CurrentLibEntry->m_Drawings );
                     CurrentLibEntry->m_Drawings = NextDrawItem;
                     NextDrawItem->m_Unit = ii;
                 }
@@ -1090,7 +1090,7 @@ bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
                     }
                 }
                 NextDrawItem = CopyDrawEntryStruct( this, DrawItem );
-                NextDrawItem->Pnext = CurrentLibEntry->m_Drawings;
+                NextDrawItem->SetNext( CurrentLibEntry->m_Drawings );
                 CurrentLibEntry->m_Drawings = NextDrawItem;
                 NextDrawItem->m_Convert = 2;
             }

eeschema/edit_label.cpp

@@ -378,7 +378,7 @@ void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text,
     /* add the new text in linked list if old text is in list */
     if( (flags & IS_NEW) == 0 )
     {
-        newtext->Pnext = GetScreen()->EEDrawList;
+        newtext->SetNext( GetScreen()->EEDrawList );
         GetScreen()->EEDrawList = newtext;
         GetScreen()->SetModify();
     }

eeschema/eelibs_draw_components.cpp

@@ -78,7 +78,7 @@ void CreateDummyCmp()
     Text->m_Text   = wxT( "??" );
 
     DummyCmp->m_Drawings = Square;
-    Square->Pnext = Text;
+    Square->SetNext( Text );
 }
 
 
@@ -153,7 +153,7 @@ void DrawLibEntry( WinEDA_DrawPanel* panel, wxDC* DC,
     if( (LibEntry->m_Name.m_Flags & IS_MOVED) == 0 )
        LibEntry->m_Name.Draw( panel, DC, aOffset, color, DrawMode, NULL, TransMat );
 
-    for( Field = LibEntry->Fields; Field != NULL; Field = (LibDrawField*) Field->Pnext )
+    for( Field = LibEntry->Fields; Field != NULL; Field = Field->Next() )
     {
         if( Field->m_Text.IsEmpty() )
             return;

eeschema/eelibs_read_libraryfiles.cpp

@@ -803,7 +803,8 @@ static LibEDA_BaseStruct* GetDrawEntry( WinEDA_DrawFrame* frame, FILE* f, char*
                 Head = Tail = New;
             else
             {
-                Tail->Pnext = New; Tail = New;
+                Tail->SetNext( New );
+                Tail = New;
             }
         }
     }
@@ -935,7 +936,7 @@ static bool GetLibEntryField( EDA_LibComponentStruct* LibEntry, char* line )
 
         Field = new LibDrawField( NumOfField );
 
-        Field->Pnext     = LibEntry->Fields;
+        Field->SetNext( LibEntry->Fields );
         LibEntry->Fields = Field;
         break;
     }
@@ -1154,7 +1155,7 @@ void EDA_LibComponentStruct::SortDrawItems()
     Bufentry   = BufentryBase;
     for( ii = 0; ii < nbitems; ii++ )
     {
-        (*Bufentry)->Pnext = *(Bufentry + 1);
+        (*Bufentry)->SetNext( *(Bufentry + 1) );
         Bufentry++;
     }
 

eeschema/erc.cpp

@@ -428,7 +428,7 @@ void WinEDA_ErcFrame::DelERCMarkers( wxCommandEvent& event )
 
     // Delete markers for the current screen
     DrawStruct = m_Parent->GetScreen()->EEDrawList;
-    for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )
+    for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Next() )
     {
         if( DrawStruct->Type() != DRAW_MARKER_STRUCT_TYPE )
             continue;
@@ -533,7 +533,7 @@ static void Diagnose( WinEDA_DrawPanel* panel, wxDC* DC,
     Marker->m_Type      = MARQ_ERC;
     Marker->m_MarkFlags = WAR;
     screen = NetItemRef->m_SheetList.LastScreen();
-    Marker->Pnext      = screen->EEDrawList;
+    Marker->SetNext( screen->EEDrawList );
     screen->EEDrawList = Marker;
     g_EESchemaVar.NbErrorErc++;
     g_EESchemaVar.NbWarningErc++;
@@ -741,7 +741,7 @@ static bool WriteDiagnosticERC( const wxString& FullFileName )
         fprintf( OutErc, "%s", CONV_TO_UTF8( msg ) );
 
         DrawStruct = Sheet->LastDrawList();
-        for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )
+        for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Next() )
         {
             if( DrawStruct->Type() != DRAW_MARKER_STRUCT_TYPE )
                 continue;

eeschema/files-io.cpp

@@ -216,7 +216,7 @@ SCH_SCREEN* WinEDA_SchematicFrame::CreateNewScreen(
         NewScreen->m_Company = OldScreen->m_Company;
     NewScreen->m_TimeStamp = TimeStamp;
 
-    NewScreen->Pback = OldScreen;
+    NewScreen->SetBack( OldScreen );
 
     return NewScreen;
 }

eeschema/getpart.cpp

@@ -218,7 +218,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
     DrawLibItem->GetField( REFERENCE )->m_VJustify  = Entry->m_Prefix.m_VJustify;
 
     /* Init des autres champs si predefinis dans la librairie */
-    for( Field = Entry->Fields; Field != NULL; Field = (LibDrawField*) Field->Pnext )
+    for( Field = Entry->Fields; Field != NULL; Field = Field->Next() )
     {
         if( Field->m_Text.IsEmpty() && Field->m_Name.IsEmpty() )
             continue;

eeschema/hierarch.cpp

@@ -233,7 +233,7 @@ void WinEDA_HierFrame::BuildSheetList( DrawSheetPath* list,
             m_Tree->Expand( menu );
             list->Pop();
         }
-        bs = bs->Pnext;
+        bs = bs->Next();
     }
 
     maxposx -= m_Tree->GetIndent();

eeschema/libedit_undo_redo.cpp

-	/********************************************/
-	/*  library editor: undo and redo functions */
-	/********************************************/
+/********************************************/
+/*  library editor: undo and redo functions */
+/********************************************/
 
 #include "fctsys.h"
 #include "gr_basic.h"
@@ -15,44 +15,47 @@
 
 
 /*************************************************************************/
-void WinEDA_LibeditFrame::SaveCopyInUndoList(EDA_BaseStruct * ItemToCopy,
-	int unused_flag)
+void WinEDA_LibeditFrame::SaveCopyInUndoList( EDA_BaseStruct* ItemToCopy,
+                                              int             unused_flag )
 /*************************************************************************/
 {
-EDA_BaseStruct * item;
-EDA_LibComponentStruct * CopyItem;
+    EDA_BaseStruct*         item;
+    EDA_LibComponentStruct* CopyItem;
 
-	CopyItem = CopyLibEntryStruct ( this, (EDA_LibComponentStruct *) ItemToCopy);
-	GetScreen()->AddItemToUndoList((EDA_BaseStruct *)CopyItem);
+    CopyItem = CopyLibEntryStruct( this, (EDA_LibComponentStruct*) ItemToCopy );
+    GetScreen()->AddItemToUndoList( (EDA_BaseStruct*) CopyItem );
     /* Clear current flags (which can be temporary set by a current edit command) */
-	for ( item = CopyItem->m_Drawings; item != NULL; item = item->Pnext )
+    for( item = CopyItem->m_Drawings; item != NULL; item = item->Next() )
         item->m_Flags = 0;
 
-
     /* Clear redo list, because after new save there is no redo to do */
-	while ( GetScreen()->m_RedoList )
+    while( GetScreen()->m_RedoList )
     {
-		item = GetScreen()->m_RedoList->Pnext;
-		delete (GetScreen()->m_RedoList);
+        item = GetScreen()->m_RedoList->Next();
+        delete( GetScreen()->m_RedoList );
         GetScreen()->m_RedoList = item;
     }
 }
 
+
 /******************************************************/
 bool WinEDA_LibeditFrame::GetComponentFromRedoList()
 /******************************************************/
+
 /* Redo the last edition:
-	- Place the current edited library component in undo list
-	- Get old version of the current edited library component
+  * - Place the current edited library component in undo list
+  * - Get old version of the current edited library component
  *  @return FALSE if nothing done, else TRUE
-*/
+ */
 {
-	if ( GetScreen()->m_RedoList == NULL ) return FALSE;
+    if( GetScreen()->m_RedoList == NULL )
+        return FALSE;
 
-	GetScreen()->AddItemToUndoList((EDA_BaseStruct *)CurrentLibEntry);
+    GetScreen()->AddItemToUndoList( (EDA_BaseStruct*) CurrentLibEntry );
     CurrentLibEntry =
-		(EDA_LibComponentStruct *) GetScreen()->GetItemFromRedoList();
-	if ( CurrentLibEntry ) CurrentLibEntry->Pnext = NULL;
+        (EDA_LibComponentStruct*) GetScreen()->GetItemFromRedoList();
+    if( CurrentLibEntry )
+        CurrentLibEntry->SetNext( NULL );
     CurrentDrawItem = NULL;
     GetScreen()->SetModify();
     ReCreateHToolbar();
@@ -61,22 +64,26 @@ bool WinEDA_LibeditFrame::GetComponentFromRedoList()
     return TRUE;
 }
 
+
 /******************************************************/
 bool WinEDA_LibeditFrame::GetComponentFromUndoList()
 /******************************************************/
+
 /* Undo the last edition:
-	- Place the current edited library component in Redo list
-	- Get old version of the current edited library component
+  * - Place the current edited library component in Redo list
+  * - Get old version of the current edited library component
  *  @return FALSE if nothing done, else TRUE
-*/
+ */
 {
-	if ( GetScreen()->m_UndoList == NULL ) return FALSE;
+    if( GetScreen()->m_UndoList == NULL )
+        return FALSE;
 
-	GetScreen()->AddItemToRedoList((EDA_BaseStruct *)CurrentLibEntry);
+    GetScreen()->AddItemToRedoList( (EDA_BaseStruct*) CurrentLibEntry );
     CurrentLibEntry =
-		(EDA_LibComponentStruct *) GetScreen()->GetItemFromUndoList();
+        (EDA_LibComponentStruct*) GetScreen()->GetItemFromUndoList();
 
-	if ( CurrentLibEntry ) CurrentLibEntry->Pnext = NULL;
+    if( CurrentLibEntry )
+        CurrentLibEntry->SetNext( NULL );
     CurrentDrawItem = NULL;
     GetScreen()->SetModify();
     ReCreateHToolbar();

eeschema/load_one_schematic_file.cpp

@@ -212,7 +212,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
 
             if( !Failed )
             {
-                SegmentStruct->Pnext = screen->EEDrawList;
+                SegmentStruct->SetNext( screen->EEDrawList );
                 screen->EEDrawList   = SegmentStruct;
             }
             break;
@@ -251,7 +251,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
             {
                 RaccordStruct->m_Size.x -= RaccordStruct->m_Pos.x;
                 RaccordStruct->m_Size.y -= RaccordStruct->m_Pos.y;
-                RaccordStruct->Pnext = screen->EEDrawList;
+                RaccordStruct->SetNext( screen->EEDrawList );
                 screen->EEDrawList   = RaccordStruct;
             }
             break;
@@ -294,7 +294,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
 
             if( !Failed )
             {
-                PolylineStruct->Pnext = screen->EEDrawList;
+                PolylineStruct->SetNext( screen->EEDrawList );
                 screen->EEDrawList    = PolylineStruct;
             }
             break;
@@ -314,7 +314,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
             }
             else
             {
-                ConnectionStruct->Pnext = screen->EEDrawList;
+                ConnectionStruct->SetNext( screen->EEDrawList );
                 screen->EEDrawList = ConnectionStruct;
             }
             break;
@@ -331,7 +331,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
             {
                 NoConnectStruct = new DrawNoConnectStruct( pos );
 
-                NoConnectStruct->Pnext = screen->EEDrawList;
+                NoConnectStruct->SetNext( screen->EEDrawList );
                 screen->EEDrawList = NoConnectStruct;
             }
             break;
@@ -362,7 +362,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
                     sscanf( text + 3, "%X", &ii );
                     MarkerStruct->m_MarkFlags = ii;
                 }
-                MarkerStruct->Pnext = screen->EEDrawList;
+                MarkerStruct->SetNext( screen->EEDrawList );
                 screen->EEDrawList  = MarkerStruct;
             }
             break;
@@ -452,7 +452,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
                 }
                 if( Struct )
                 {
-                    Struct->Pnext      = screen->EEDrawList;
+                    Struct->SetNext( screen->EEDrawList );
                     screen->EEDrawList = Struct;
                 }
             }
@@ -480,7 +480,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
     {
         Pnext = screen->EEDrawList;
         screen->EEDrawList = screen->EEDrawList->Next();
-        Pnext->Pnext = Phead;
+        Pnext->SetNext( Phead );
         Phead = Pnext;
     }
 
@@ -825,9 +825,9 @@ static int ReadPartDescr( wxWindow* frame, char* Line, FILE* f,
 
     if( !Failed )
     {
-        component->Pnext    = Window->EEDrawList;
+        component->SetNext( Window->EEDrawList );
         Window->EEDrawList = component;
-        component->m_Parent = Window;
+        component->SetParent( Window );
     }
 
     return Failed;   /* Fin lecture 1 composant */
@@ -965,7 +965,7 @@ static int ReadSheetDescr( wxWindow* frame, char* Line, FILE* f, BASE_SCREEN* Wi
             if( SheetStruct->m_Label == NULL )
                 OldSheetLabel = SheetStruct->m_Label = SheetLabelStruct;
             else
-                OldSheetLabel->Pnext = (EDA_BaseStruct*) SheetLabelStruct;
+                OldSheetLabel->SetNext( (EDA_BaseStruct*) SheetLabelStruct );
             OldSheetLabel = SheetLabelStruct;
 
             /* Lecture des coordonnees */
@@ -1017,9 +1017,9 @@ static int ReadSheetDescr( wxWindow* frame, char* Line, FILE* f, BASE_SCREEN* Wi
     }
     if( !Failed )
     {
-        SheetStruct->Pnext    = Window->EEDrawList;
+        SheetStruct->SetNext( Window->EEDrawList );
         Window->EEDrawList    = SheetStruct;
-        SheetStruct->m_Parent = Window;
+        SheetStruct->SetParent( Window );
     }
     return Failed;   /* Fin lecture 1 composant */
 }

eeschema/locate.cpp

@@ -165,12 +165,12 @@ SCH_ITEM* PickStruct( EDA_Rect& block, BASE_SCREEN* screen, int SearchMask )
             /* Put this structure in the picked list: */
             PickedItem = new DrawPickedStruct( DrawStruct );
 
-            PickedItem->Pnext = PickedList;
+            PickedItem->SetNext( PickedList );
             PickedList = PickedItem;
         }
     }
 
-    if( PickedList && PickedList->Pnext == NULL )
+    if( PickedList && PickedList->Next() == NULL )
     {
         /* Only one item was picked - convert to scalar form (no list): */
         PickedItem = PickedList;
@@ -1192,7 +1192,7 @@ Hierarchical_PIN_Sheet_Struct* LocateSheetLabel( DrawSheetStruct* Sheet, const w
            && (pos.x <= maxx)
            && (pos.x >= minx) )
             return SheetLabel;
-        SheetLabel = (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Pnext;
+        SheetLabel = SheetLabel->Next();
     }
 
     return NULL;

eeschema/netform.cpp

@@ -289,7 +289,7 @@ void Write_GENERIC_NetList( WinEDA_SchematicFrame* frame,
 
     for( sheet = SheetList.GetFirst(); sheet != NULL; sheet = SheetList.GetNext() )
     {
-        for( SchItem = sheet->LastDrawList(); SchItem != NULL; SchItem = SchItem->Pnext )
+        for( SchItem = sheet->LastDrawList(); SchItem != NULL; SchItem = SchItem->Next() )
         {
             SchItem = Component = FindNextComponentAndCreatPinList( SchItem, sheet );
 
@@ -413,7 +413,7 @@ static void WriteNetListPspice( WinEDA_SchematicFrame* frame, FILE* f,
 
     for( sheet = SheetList.GetFirst(); sheet != NULL; sheet = SheetList.GetNext() )
     {
-        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Pnext )
+        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Next() )
         {
             wxChar ident;
             if( DrawList->Type() != TYPE_SCH_TEXT )
@@ -467,7 +467,7 @@ static void WriteNetListPspice( WinEDA_SchematicFrame* frame, FILE* f,
     ClearUsedFlags();  /* Reset the flags FlagControlMulti in all schematic files*/
     for( sheet = SheetList.GetFirst(); sheet != NULL; sheet = SheetList.GetNext() )
     {
-        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Pnext )
+        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Next() )
         {
             DrawList = Component = FindNextComponentAndCreatPinList( DrawList, sheet );
             if( Component == NULL )
@@ -556,7 +556,7 @@ static void WriteNetListPCBNEW( WinEDA_SchematicFrame* frame, FILE* f, bool with
 
     for( sheet = SheetList.GetFirst(); sheet != NULL; sheet = SheetList.GetNext() )
     {
-        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Pnext )
+        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Next() )
         {
             DrawList = Component = FindNextComponentAndCreatPinList( DrawList, sheet );
             if( Component == NULL )
@@ -771,7 +771,7 @@ static void FindAllsInstancesOfComponent( SCH_COMPONENT*          Component_in,
 
     for( sheet = SheetList.GetFirst(); sheet != NULL; sheet = SheetList.GetNext() )
     {
-        for( SchItem = sheet->LastDrawList(); SchItem; SchItem = SchItem->Pnext )
+        for( SchItem = sheet->LastDrawList(); SchItem; SchItem = SchItem->Next() )
         {
             if( SchItem->Type() != TYPE_SCH_COMPONENT )
                 continue;
@@ -960,7 +960,7 @@ static void WriteNetListCADSTAR( WinEDA_SchematicFrame* frame, FILE* f )
 
     for( sheet = SheetList.GetFirst(); sheet != NULL; sheet = SheetList.GetNext() )
     {
-        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Pnext )
+        for( DrawList = sheet->LastDrawList(); DrawList != NULL; DrawList = DrawList->Next() )
         {
             DrawList = Component = FindNextComponentAndCreatPinList( DrawList, sheet );
             if( Component == NULL )

eeschema/netlist.cpp

@@ -489,7 +489,7 @@ static int ListeObjetConnection( DrawSheetPath* sheetlist, ObjetNetListStruct* O
     DrawSheetPath                  list;
 
     DrawList = sheetlist->LastScreen()->EEDrawList;
-    for( ; DrawList;  DrawList = DrawList->Pnext )
+    for( ; DrawList;  DrawList = DrawList->Next() )
     {
         switch( DrawList->Type() )
         {
@@ -678,7 +678,7 @@ static int ListeObjetConnection( DrawSheetPath* sheetlist, ObjetNetListStruct* O
             list.Push( STRUCT );
             SheetLabel = STRUCT->m_Label;
             for( ; SheetLabel != NULL;
-                 SheetLabel = (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Pnext )
+                 SheetLabel = SheetLabel->Next() )
             {
                 ii = IsBusLabel( SheetLabel->m_Text );
                 if( ObjNet )

eeschema/pinedit.cpp

@@ -135,7 +135,7 @@ void WinEDA_LibeditFrame::InitEditOnePin()
 
     /* Marquage des pins a traiter,Si edition d'une pin non deja selectionnee */
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -200,7 +200,7 @@ void WinEDA_LibeditFrame::PlacePin( wxDC* DC )
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
 
     // Tst for an other pin in same new position:
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -239,7 +239,7 @@ void WinEDA_LibeditFrame::PlacePin( wxDC* DC )
 
     /* Put linked pins in new position, and clear flags */
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -276,7 +276,7 @@ void WinEDA_PinPropertiesFrame::SetPinOrient( int neworient )
     RefPin->m_Orient = neworient;
 
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->m_Flags == 0 )
             continue;
@@ -302,7 +302,7 @@ void WinEDA_LibeditFrame::StartMovePin( wxDC* DC )
 
     /* Marquage des pins a traiter */
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         Pin->m_Flags = 0;
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
@@ -381,7 +381,7 @@ void WinEDA_PinPropertiesFrame::SetPinShape( int newshape )
         CurrentPin->Display_Infos_DrawEntry( m_Parent );
 
         Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-        for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+        for( ; Pin != NULL; Pin = Pin->Next() )
         {
             if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
                 continue;
@@ -414,7 +414,7 @@ void WinEDA_PinPropertiesFrame::SetPinType( int newtype )
     m_Parent->GetScreen()->SetModify();
 
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -450,7 +450,7 @@ void WinEDA_PinPropertiesFrame::SetPinName( const wxString& newname, int newsize
 
     /* Traitement des autres pins */
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -492,7 +492,7 @@ void WinEDA_PinPropertiesFrame::SetPinNum( const wxString& newnum, int newsize )
     m_Parent->GetScreen()->SetModify();
 
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -539,7 +539,8 @@ void WinEDA_LibeditFrame::DeletePin( wxDC*                   DC,
         {
             if( DrawItem->Type() != COMPONENT_PIN_DRAW_TYPE )
             {
-                DrawItem = DrawItem->Next(); continue;
+                DrawItem = DrawItem->Next();
+                continue;
             }
             Pin      = (LibDrawPin*) DrawItem;
             DrawItem = DrawItem->Next();
@@ -602,7 +603,7 @@ void WinEDA_LibeditFrame::CreatePin( wxDC* DC )
     else
         CurrentPin->m_Attributs &= ~PINNOTDRAW;
 
-    CurrentPin->Pnext = CurrentLibEntry->m_Drawings;
+    CurrentPin->SetNext( CurrentLibEntry->m_Drawings );
     CurrentLibEntry->m_Drawings = CurrentPin;
     CurrentLibEntry->SortDrawItems();
 
@@ -725,7 +726,7 @@ void WinEDA_PinPropertiesFrame::SetAttributsPin( bool draw,
             CurrentPin->m_Attributs &= ~PINNOTDRAW;
 
         Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-        for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+        for( ; Pin != NULL; Pin = Pin->Next() )
         {
             if( Pin->m_Flags == 0 )
                 continue;
@@ -765,7 +766,7 @@ void WinEDA_PinPropertiesFrame::NewSizePin( int newsize )
     if( g_EditPinByPinIsOn == FALSE )
     {
         Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-        for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+        for( ; Pin != NULL; Pin = Pin->Next() )
         {
             if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
                 continue;
@@ -805,7 +806,7 @@ static void CreateImagePins( LibDrawPin* Pin )
             NewPin->m_Convert = 1;
         else
             NewPin->m_Convert = 2;
-        NewPin->Pnext = CurrentLibEntry->m_Drawings;
+        NewPin->SetNext( CurrentLibEntry->m_Drawings );
         CurrentLibEntry->m_Drawings = NewPin;
     }
 
@@ -821,7 +822,7 @@ static void CreateImagePins( LibDrawPin* Pin )
         if( CurrentConvert != 0 )
             NewPin->m_Convert = 1;
         NewPin->m_Unit = ii;
-        NewPin->Pnext  = CurrentLibEntry->m_Drawings;
+        NewPin->SetNext( CurrentLibEntry->m_Drawings );
         CurrentLibEntry->m_Drawings = NewPin;
 
         /* Creation pour la representation "Convert" */
@@ -832,7 +833,7 @@ static void CreateImagePins( LibDrawPin* Pin )
         NewPin->m_Convert = 2;
         if( Pin->m_Unit != 0 )
             NewPin->m_Unit = ii;
-        NewPin->Pnext = CurrentLibEntry->m_Drawings;
+        NewPin->SetNext( CurrentLibEntry->m_Drawings );
         CurrentLibEntry->m_Drawings = NewPin;
     }
 }
@@ -861,7 +862,7 @@ void WinEDA_LibeditFrame::GlobalSetPins( wxDC* DC,
     GetScreen()->SetModify();
 
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() != COMPONENT_PIN_DRAW_TYPE )
             continue;
@@ -911,7 +912,7 @@ void WinEDA_LibeditFrame::RepeatPinItem( wxDC* DC, LibDrawPin* SourcePin )
         return;
 
     Pin = SourcePin->GenCopy();
-    Pin->Pnext = CurrentLibEntry->m_Drawings;
+    Pin->SetNext( CurrentLibEntry->m_Drawings );
     CurrentLibEntry->m_Drawings = Pin;
     Pin->m_Flags = IS_NEW;
 
@@ -961,7 +962,8 @@ bool WinEDA_LibeditFrame::TestPins( EDA_LibComponentStruct* LibEntry )
 // Test des pins ( duplicates...)
 {
     int             nb_pins, ii, error;
-    LibDrawPin* Pin, ** PinList;
+    LibDrawPin*     Pin;
+    LibDrawPin**    PinList;
     wxString        msg;
 
     if( CurrentLibEntry == NULL )
@@ -969,7 +971,7 @@ bool WinEDA_LibeditFrame::TestPins( EDA_LibComponentStruct* LibEntry )
 
     // Construction de la liste des pins:
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( nb_pins = 0; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( nb_pins = 0; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() == COMPONENT_PIN_DRAW_TYPE )
             nb_pins++;
@@ -977,7 +979,7 @@ bool WinEDA_LibeditFrame::TestPins( EDA_LibComponentStruct* LibEntry )
 
     PinList = (LibDrawPin**) MyZMalloc( (nb_pins + 1) * sizeof(LibDrawPin*) );
     Pin = (LibDrawPin*) CurrentLibEntry->m_Drawings;
-    for( ii = 0; Pin != NULL; Pin = (LibDrawPin*) Pin->Pnext )
+    for( ii = 0; Pin != NULL; Pin = Pin->Next() )
     {
         if( Pin->Type() == COMPONENT_PIN_DRAW_TYPE )
             PinList[ii++] = Pin;
@@ -993,23 +995,29 @@ bool WinEDA_LibeditFrame::TestPins( EDA_LibComponentStruct* LibEntry )
         wxString    aux_msg, StringPinNum;
         LibDrawPin* curr_pin = PinList[ii];
         Pin = PinList[ii - 1];
+
         if( Pin->m_PinNum != curr_pin->m_PinNum )
             continue;
+
         if( Pin->m_Convert != curr_pin->m_Convert )
             continue;
+
         if( Pin->m_Unit != curr_pin->m_Unit )
             continue;
+
         error++;
         curr_pin->ReturnPinStringNum( StringPinNum );
         msg.Printf( _( "Duplicate Pin %4.4s (Pin %s loc %d, %d, and Pin %s loc %d, %d)" ),
             StringPinNum.GetData(),
             curr_pin->m_PinName.GetData(), curr_pin->m_Pos.x, -curr_pin->m_Pos.y,
             Pin->m_PinName.GetData(), Pin->m_Pos.x, -Pin->m_Pos.y );
+
         if( CurrentLibEntry->m_UnitCount > 1 )
         {
             aux_msg.Printf( _( "  Part %d" ), curr_pin->m_Unit );
             msg += aux_msg;
         }
+
         if( g_AsDeMorgan )
         {
             if( curr_pin->m_Convert )
@@ -1017,6 +1025,7 @@ bool WinEDA_LibeditFrame::TestPins( EDA_LibComponentStruct* LibEntry )
             else
                 msg += _( "  Normal" );
         }
+
         DisplayError( this, msg );
     }
 

eeschema/plot.cpp

@@ -772,20 +772,26 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
 
     Move_Plume( Struct->m_Pos, 'U' );
     pos = Struct->m_Pos; pos.x += Struct->m_Size.x;
+
     Move_Plume( pos, 'D' );
     pos.y += Struct->m_Size.y;
+
     Move_Plume( pos, 'D' );
     pos = Struct->m_Pos; pos.y += Struct->m_Size.y;
+
     Move_Plume( pos, 'D' );
     Move_Plume( Struct->m_Pos, 'D' );
+
     Plume( 'U' );
 
     /* Trace des textes : SheetName */
     Text = Struct->m_SheetName;
     size = wxSize( Struct->m_SheetNameSize, Struct->m_SheetNameSize );
     pos  = Struct->m_Pos; pos.y -= 4;
+
     if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
         SetColorMapPS( ReturnLayerColor( LAYER_SHEETNAME ) );
+
     PlotGraphicText( g_PlotFormat, pos, txtcolor,
                      Text, TEXT_ORIENT_HORIZ, size,
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM );
@@ -793,8 +799,10 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
     /* Trace des textes : FileName */
     Text = Struct->GetFileName();
     size = wxSize( Struct->m_FileNameSize, Struct->m_FileNameSize );
+
     if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
         SetColorMapPS( ReturnLayerColor( LAYER_SHEETFILENAME ) );
+
     PlotGraphicText( g_PlotFormat,
                      wxPoint( Struct->m_Pos.x, Struct->m_Pos.y + Struct->m_Size.y + 4 ),
                      txtcolor,
@@ -805,9 +813,10 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
     SheetLabelStruct = Struct->m_Label;
     if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
         SetColorMapPS( ReturnLayerColor( Struct->m_Layer ) );
+
     while( SheetLabelStruct != NULL )
     {
         PlotSheetLabelStruct( SheetLabelStruct );
-        SheetLabelStruct = (Hierarchical_PIN_Sheet_Struct*) (SheetLabelStruct->Pnext);
+        SheetLabelStruct = SheetLabelStruct->Next();
     }
 }

eeschema/plothpgl.cpp

@@ -572,7 +572,7 @@ void WinEDA_PlotHPGLFrame::Plot_Schematic_HPGL( int Select_PlotAll, int HPGL_She
         InitPlotParametresHPGL( PlotOffset, g_PlotScaleX, g_PlotScaleY );
         Plot_1_Page_HPGL( PlotFileName, screen );
         SetLocaleTo_Default( );
-        screen = (BASE_SCREEN*) screen->Pnext;
+        screen = screen->Next();
         if( Select_PlotAll == FALSE )
             break;
     }
@@ -721,7 +721,7 @@ void WinEDA_PlotHPGLFrame::Plot_1_Page_HPGL( const wxString& FullFileName,
         }
 
         Plume( 'U' );
-        DrawList = DrawList->Pnext;
+        DrawList = DrawList->Next();
     }
 
     /* fin */

eeschema/plotps.cpp

@@ -401,7 +401,7 @@ void WinEDA_PlotPSFrame::CreatePSFile( int AllPages, int pagesize )
 
         PlotOneSheetPS( PlotFileName, screen, RealSheet, BBox, plot_offset );
 
-        screen = (BASE_SCREEN*) screen->Pnext;
+        screen = screen->Next();
 
         if( AllPages == FALSE )
             break;

eeschema/program.h

@@ -80,6 +80,9 @@ public:
     EDA_DrawLineStruct( const wxPoint& pos, int layer );
     ~EDA_DrawLineStruct() { }
 
+    EDA_DrawLineStruct* Next() const { return (EDA_DrawLineStruct*) Pnext; }
+    EDA_DrawLineStruct* Back() const { return (EDA_DrawLineStruct*) Pback; }
+
     virtual wxString GetClass() const
     {
         return wxT( "EDA_DrawLine" );

eeschema/savelib.cpp

@@ -310,10 +310,10 @@ EDA_LibComponentStruct* CopyLibEntryStruct( wxWindow* frame, EDA_LibComponentStr
 
     /* Copie des champs */
     for( OldField = OldEntry->Fields; OldField != NULL;
-         OldField = (LibDrawField*) OldField->Pnext )
+         OldField = (LibDrawField*) OldField->Next() )
     {
         NewField = OldField->GenCopy();
-        NewField->Pnext   = NewStruct->Fields;
+        NewField->SetNext( NewStruct->Fields );
         NewStruct->Fields = NewField;
     }
 
@@ -330,10 +330,10 @@ EDA_LibComponentStruct* CopyLibEntryStruct( wxWindow* frame, EDA_LibComponentStr
             if( LastItem == NULL )
                 NewStruct->m_Drawings = NewDrawings;
             else
-                LastItem->Pnext = NewDrawings;
+                LastItem->SetNext( NewDrawings );
 
             LastItem = NewDrawings;
-            NewDrawings->Pnext = NULL;
+            NewDrawings->SetNext( NULL );
         }
         else	// Should nevers occurs, just in case...
         {       // CopyDrawEntryStruct() was not able to duplicate the type of OldDrawings
@@ -395,7 +395,7 @@ bool EDA_LibComponentStruct::Save( FILE* aFile )
     m_Name.Save( aFile );
 
     for( Field = Fields; Field!= NULL;
-         Field = (LibDrawField*) Field->Pnext )
+         Field = (LibDrawField*) Field->Next() )
     {
         if( Field->m_Text.IsEmpty() && Field->m_Name.IsEmpty() )
             continue;

eeschema/schematic_undo_redo.cpp

@@ -217,7 +217,9 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( SCH_ITEM * ItemToCopy,
             break;
 
         case IS_CHANGED:        /* Create a copy of schematic */
-            NewList->m_Son = CopyItem = DuplicateStruct( ItemToCopy );
+            CopyItem = DuplicateStruct( ItemToCopy );
+            NewList->SetSon( CopyItem );
+
             if( ItemToCopy->Type() == DRAW_PICK_ITEM_STRUCT_TYPE )
             {
                 DrawPickedStruct* PickedList = (DrawPickedStruct*) CopyItem;
@@ -239,7 +241,7 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( SCH_ITEM * ItemToCopy,
         case IS_NEW:
             if( ItemToCopy->Type() == DRAW_PICK_ITEM_STRUCT_TYPE )
             {
-                NewList->m_Son = ItemToCopy;
+                NewList->SetSon( ItemToCopy );
                 DrawPickedStruct* PickedList = (DrawPickedStruct*) ItemToCopy;
                 while( PickedList )
                 {
@@ -258,11 +260,11 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( SCH_ITEM * ItemToCopy,
 
         case IS_NEW | IS_CHANGED:
         case IS_WIRE_IMAGE:
-            NewList->m_Son = ItemToCopy;
+            NewList->SetSon( ItemToCopy );
             break;
 
         case IS_DELETED:
-            NewList->m_Son      = ItemToCopy;
+            NewList->SetSon( ItemToCopy );
             ItemToCopy->m_Flags = flag_type_command;
             if( ItemToCopy->Type() == DRAW_PICK_ITEM_STRUCT_TYPE )
             {
@@ -327,7 +329,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
  *  Put data pointed by List in the previous state, i.e. the state memorised by List
  */
 {
-    SCH_ITEM*   FirstItem = (SCH_ITEM*) List->m_Son;
+    SCH_ITEM*   FirstItem = (SCH_ITEM*) List->GetSon();
     SCH_ITEM*   item;
     DrawPickedStruct* PickedList;
 
@@ -374,7 +376,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
             FirstItem = (SCH_ITEM*)List->m_Image;
             ( (SCH_SCREEN*) GetScreen() )->RemoveFromDrawList( FirstItem );
             FirstItem->m_Flags = IS_DELETED;
-            List->m_Son = FirstItem;
+            List->SetSon( FirstItem );
         }
         break;
 
@@ -386,7 +388,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
             while( PickedList )
             {
                 item = PickedList->m_PickedStruct;
-                item->Pnext = GetScreen()->EEDrawList;
+                item->SetNext( GetScreen()->EEDrawList );
                 GetScreen()->EEDrawList = item;
                 item->m_Flags = 0;
                 PickedList->m_PickedStruct = NULL;
@@ -397,21 +399,21 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
         }
         else
         {
-            FirstItem->Pnext = GetScreen()->EEDrawList;
+            FirstItem->SetNext( GetScreen()->EEDrawList );
             GetScreen()->EEDrawList = FirstItem;
             FirstItem->m_Flags = 0;
-            List->m_Image = List->m_Son;
-            List->m_Son   = NULL;
+            List->m_Image = List->GetSon();
+            List->SetSon( NULL );
         }
         break;
 
     case IS_WIRE_IMAGE:
         /* Exchange the current wires and the oild wires */
-        List->m_Son = ( (SCH_SCREEN*) GetScreen() )->ExtractWires( FALSE );
+        List->SetSon( ( (SCH_SCREEN*) GetScreen() )->ExtractWires( FALSE ) );
         while( FirstItem )
         {
             SCH_ITEM* nextitem = FirstItem->Next();
-            FirstItem->Pnext = GetScreen()->EEDrawList;
+            FirstItem->SetNext( GetScreen()->EEDrawList );
             GetScreen()->EEDrawList = FirstItem;
             FirstItem->m_Flags = 0;
             FirstItem = nextitem;
@@ -445,7 +447,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
 
             case IS_DELETED:
                 item = PickedList->m_PickedStruct;
-                item->Pnext = GetScreen()->EEDrawList;
+                item->SetNext( GetScreen()->EEDrawList );
                 GetScreen()->EEDrawList = item;
                 item->m_Flags = 0;
                 PickedList->m_PickedStruct = NULL;
@@ -513,8 +515,8 @@ void SCH_SCREEN::ClearUndoORRedoList( EDA_BaseStruct* List )
 
     for( ; List != NULL; List = nextitem )
     {
-        nextitem  = List->Pnext;
-        FirstItem = List->m_Son;
+        nextitem  = List->Next();
+        FirstItem = List->GetSon();
         CmdType   = List->m_Flags;
 
         SAFE_DELETE( List );
@@ -571,7 +573,7 @@ void SCH_SCREEN::ClearUndoORRedoList( EDA_BaseStruct* List )
             {
                 while( FirstItem )
                 {
-                    EDA_BaseStruct* nextitem = FirstItem->Pnext;
+                    EDA_BaseStruct* nextitem = FirstItem->Next();
                     delete          FirstItem;
                     FirstItem = nextitem;
                 }
@@ -638,24 +640,25 @@ void SCH_SCREEN::AddItemToUndoList( EDA_BaseStruct* newitem )
         return;
 
     if( m_UndoList )
-        m_UndoList->Pback = newitem;
-    newitem->Pnext = m_UndoList;
-    newitem->Pback = NULL;
+        m_UndoList->SetBack( newitem );
+
+    newitem->SetNext( m_UndoList );
+    newitem->SetBack( NULL );
     m_UndoList = newitem;
 
     /* Free oldest items, if count max reached */
     for( ii = 0, item = m_UndoList; ii < m_UndoRedoCountMax; ii++ )
     {
-        if( item->Pnext == NULL )
+        if( item->Next() == NULL )
             return;
-        item = item->Pnext;
+        item = item->Next();
     }
 
     if( item == NULL )
         return;
 
-    nextitem    = item->Pnext;
-    item->Pnext = NULL; // Set end of chain
+    nextitem    = item->Next();
+    item->SetNext( NULL ); // Set end of chain
 
     // Delete the extra  items
     ClearUndoORRedoList( nextitem );
@@ -672,22 +675,23 @@ void SCH_SCREEN::AddItemToRedoList( EDA_BaseStruct* newitem )
     if( newitem == NULL )
         return;
 
-    newitem->Pback = NULL;
-    newitem->Pnext = m_RedoList;
+    newitem->SetBack( NULL );
+    newitem->SetNext( m_RedoList );
     m_RedoList = newitem;
+
     /* Free first items, if count max reached */
     for( ii = 0, item = m_RedoList; ii < m_UndoRedoCountMax; ii++ )
     {
-        if( item->Pnext == NULL )
+        if( item->Next() == NULL )
             break;
-        item = item->Pnext;
+        item = item->Next();
     }
 
     if( item == NULL )
         return;
 
-    nextitem    = item->Pnext;
-    item->Pnext = NULL; // Set end of chain
+    nextitem    = item->Next();
+    item->SetNext( NULL ); // Set end of chain
 
     // Delete the extra items
     ClearUndoORRedoList( nextitem );

eeschema/schframe.cpp

@@ -140,6 +140,10 @@ WinEDA_SchematicFrame::WinEDA_SchematicFrame( wxWindow* father,
     m_Draw_Grid      = g_ShowGrid;      // TRUE to show a grid
     m_Draw_Sheet_Ref = TRUE;            // TRUE to show sheet references
     m_CurrentSheet   = new DrawSheetPath();
+    m_CurrentField   = NULL;
+    m_Multiflag      = 0;
+    m_TextFieldSize  = DEFAULT_SIZE_TEXT;
+
 
     CreateScreens();
 

eeschema/sheet.cpp

@@ -348,7 +348,7 @@ DrawSheetStruct* WinEDA_SchematicFrame::CreateSheet( wxDC* DC )
 
     Sheet->m_Flags     = IS_NEW | IS_RESIZED;
     Sheet->m_TimeStamp = GetTimeStamp();
-    Sheet->m_Parent    = GetScreen();
+    Sheet->SetParent( GetScreen() );
     Sheet->m_AssociatedScreen = NULL;
     s_SheetMindx = SHEET_MIN_WIDTH;
     s_SheetMindy = SHEET_MIN_HEIGHT;
@@ -401,7 +401,7 @@ void WinEDA_SchematicFrame::ReSizeSheet( DrawSheetStruct* Sheet, wxDC* DC )
             (int) ( (sheetlabel->GetLength() +
                      1) * sheetlabel->m_Size.x ) );
         s_SheetMindy = MAX( s_SheetMindy, sheetlabel->m_Pos.y - Sheet->m_Pos.y );
-        sheetlabel   = (Hierarchical_PIN_Sheet_Struct*) sheetlabel->Pnext;
+        sheetlabel   = sheetlabel->Next();
     }
 
     DrawPanel->ManageCurseur = DeplaceSheet;
@@ -457,7 +457,7 @@ static void DeplaceSheet( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
         {
             if( SheetLabel->m_Edge )
                 SheetLabel->m_Pos.x = Sheet->m_Pos.x + Sheet->m_Size.x;
-            SheetLabel = (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Pnext;
+            SheetLabel = SheetLabel->Next();
         }
     }
     else             /* Move Sheet */

eeschema/sheetlab.cpp

@@ -171,7 +171,7 @@ static void ExitPinSheet( WinEDA_DrawPanel* Panel, wxDC* DC )
  */
 void Hierarchical_PIN_Sheet_Struct::Place( WinEDA_SchematicFrame* frame, wxDC* DC )
 {
-    DrawSheetStruct* Sheet = (DrawSheetStruct*) m_Parent;
+    DrawSheetStruct* Sheet = (DrawSheetStruct*) GetParent();
 
     if( m_Flags & IS_NEW )  /* ajout a la liste des structures */
     {
@@ -182,12 +182,12 @@ void Hierarchical_PIN_Sheet_Struct::Place( WinEDA_SchematicFrame* frame, wxDC* D
             Hierarchical_PIN_Sheet_Struct* pinsheet = Sheet->m_Label;
             while( pinsheet )
             {
-                if( pinsheet->Pnext == NULL )
+                if( pinsheet->Next() == NULL )
                 {
-                    pinsheet->Pnext = this;
+                    pinsheet->SetNext( this );
                     break;
                 }
-                pinsheet = (Hierarchical_PIN_Sheet_Struct*) pinsheet->Pnext;
+                pinsheet = pinsheet->Next();
             }
         }
     }
@@ -242,7 +242,7 @@ static void Move_PinSheet( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
     if( SheetLabel == NULL )
         return;
 
-    DrawSheetStruct* Sheet = (DrawSheetStruct*) SheetLabel->m_Parent;
+    DrawSheetStruct* Sheet = (DrawSheetStruct*) SheetLabel->GetParent();
 
     if( Sheet == NULL )
         return;
@@ -362,7 +362,7 @@ Hierarchical_PIN_Sheet_Struct* WinEDA_SchematicFrame::Import_PinSheet( DrawSheet
     if(!Sheet->m_AssociatedScreen) return NULL;
     DrawStruct = Sheet->m_AssociatedScreen->EEDrawList;
     HLabel = NULL;
-    for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )
+    for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Next() )
     {
         if( DrawStruct->Type() != TYPE_SCH_HIERLABEL )
             continue;
@@ -370,7 +370,7 @@ Hierarchical_PIN_Sheet_Struct* WinEDA_SchematicFrame::Import_PinSheet( DrawSheet
 
         /* Ici un G-Label a ete trouve: y a t-il un SheetLabel correspondant */
         SheetLabel = Sheet->m_Label;
-        for( ; SheetLabel != NULL; SheetLabel = (Hierarchical_PIN_Sheet_Struct*) SheetLabel->Pnext )
+        for( ; SheetLabel != NULL; SheetLabel = SheetLabel->Next() )
         {
             if( SheetLabel->m_Text.CmpNoCase( HLabel->m_Text ) == 0 )
             {
@@ -419,7 +419,7 @@ void WinEDA_SchematicFrame::DeleteSheetLabel( bool aRedraw,
  *  si aRedraw == true, effacement a l'ecran du dessin
  */
 {
-    DrawSheetStruct* parent = (DrawSheetStruct*) aSheetLabelToDel->m_Parent;
+    DrawSheetStruct* parent = (DrawSheetStruct*) aSheetLabelToDel->GetParent();
 
     wxASSERT( parent );
     wxASSERT( parent->Type() == DRAW_SHEET_STRUCT_TYPE );
@@ -438,7 +438,7 @@ void WinEDA_SchematicFrame::DeleteSheetLabel( bool aRedraw,
         if( label == aSheetLabelToDel )
         {
             if( prev )
-                prev->Pnext = label->Next();
+                prev->SetNext( label->Next() );
             else
                 parent->m_Label = label->Next();
 

eeschema/symbdraw.cpp

@@ -664,7 +664,7 @@ void WinEDA_LibeditFrame::EndDrawGraphicItem( wxDC* DC )
     if( CurrentDrawItem->m_Flags & IS_NEW )
     {
         SaveCopyInUndoList( CurrentLibEntry );
-        CurrentDrawItem->Pnext      = CurrentLibEntry->m_Drawings;
+        CurrentDrawItem->SetNext( CurrentLibEntry->m_Drawings );
         CurrentLibEntry->m_Drawings = CurrentDrawItem;
 
         switch( CurrentDrawItem->Type() )

eeschema/symbedit.cpp

@@ -103,9 +103,9 @@ void WinEDA_LibeditFrame::LoadOneSymbol( wxDC* DC )
             DrawEntry->m_Flags    = IS_NEW;
             DrawEntry->m_Selected = IS_SELECTED;
 
-            if( DrawEntry->Pnext == NULL )
+            if( DrawEntry->Next() == NULL )
             {   /* Fin de liste trouvee */
-                DrawEntry->Pnext = CurrentLibEntry->m_Drawings;
+                DrawEntry->SetNext( CurrentLibEntry->m_Drawings );
                 CurrentLibEntry->m_Drawings = LibEntry->m_Drawings;
                 LibEntry->m_Drawings = NULL;
                 break;
@@ -235,7 +235,7 @@ void SuppressDuplicateDrawItem( EDA_LibComponentStruct* LibEntry )
     DEntryRef = LibEntry->m_Drawings;
     while( DEntryRef )
     {
-        if( DEntryRef->Pnext == NULL )
+        if( DEntryRef->Next() == NULL )
             return;
         DEntryCompare = DEntryRef->Next();
         if( DEntryCompare == NULL )

gerbview/deltrack.cpp

@@ -59,7 +59,7 @@ TRACK* WinEDA_GerberFrame::Delete_Segment( wxDC* DC, TRACK* Track )
         {
             // modification du trace
             Track = g_CurrentTrackSegment;
-            g_CurrentTrackSegment = (TRACK*) g_CurrentTrackSegment->Pback;
+            g_CurrentTrackSegment = g_CurrentTrackSegment->Back();
 
             delete Track;
 
@@ -68,12 +68,12 @@ TRACK* WinEDA_GerberFrame::Delete_Segment( wxDC* DC, TRACK* Track )
             if( g_TrackSegmentCount && (g_CurrentTrackSegment->Type() == TYPEVIA) )
             {
                 Track = g_CurrentTrackSegment;
-                g_CurrentTrackSegment = (TRACK*) g_CurrentTrackSegment->Pback;
+                g_CurrentTrackSegment = g_CurrentTrackSegment->Back();
                 delete Track;
                 g_TrackSegmentCount--;
             }
             if( g_CurrentTrackSegment )
-                g_CurrentTrackSegment->Pnext = NULL;
+                g_CurrentTrackSegment->SetNext( NULL );
 
             Affiche_Status_Box();
 

gerbview/export_to_pcbnew.cpp

@@ -161,7 +161,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
             drawitem->m_Start = track->m_Start;
             drawitem->m_End   = track->m_End;
             drawitem->m_Width = track->m_Width;
-            drawitem->Pnext   = pcb->m_Drawings;
+            drawitem->SetNext( pcb->m_Drawings );
             pcb->m_Drawings   = drawitem;
         }
         else

gerbview/lay2plot.cpp

@@ -19,8 +19,8 @@ void Print_PcbItems(BOARD * Pcb, wxDC *DC, int drawmode, int printmasklayer)
 /*******************************************************************************/
 /* routine de trace du pcb, avec selection des couches */
 {
-DISPLAY_OPTIONS save_opt;
-TRACK * pt_piste;
+    DISPLAY_OPTIONS save_opt;
+    TRACK * pt_piste;
 
     save_opt = DisplayOpt;
     DisplayOpt.DisplayPadFill = FILLED;
@@ -34,7 +34,7 @@ TRACK * pt_piste;
 
     /* trace des pistes */
     pt_piste = Pcb->m_Track;
-	for ( ; pt_piste != NULL ; pt_piste = (TRACK*) pt_piste->Pnext )
+    for( ; pt_piste != NULL ; pt_piste = pt_piste->Next() )
     {
 //		if( (printmasklayer & ReturnMaskLayer(pt_piste) ) == 0 ) continue;
         Trace_Segment(NULL, DC, pt_piste, drawmode);

gerbview/locate.cpp

@@ -59,7 +59,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
             Track = TrackLocate;
             if( TrackLocate->Type() == TYPEVIA )
                 break;
-            TrackLocate = (TRACK*) TrackLocate->Pnext;
+            TrackLocate = TrackLocate->Next();
         }
 
         Track->Display_Infos( this );
@@ -185,7 +185,7 @@ TRACK* Locate_Pistes( TRACK* start_adresse, wxPoint ref, int Layer )
     TRACK* Track;               /* pointeur sur les pistes */
     int    l_piste;             /* demi-largeur de la piste */
 
-    for( Track = start_adresse; Track != NULL; Track = (TRACK*) Track->Pnext )
+    for( Track = start_adresse; Track != NULL; Track = Track->Next() )
     {
         if( Track->GetState( BUSY | DELETED ) )
             continue;
@@ -249,7 +249,7 @@ TRACK* Locate_Zone( TRACK* start_adresse, wxPoint ref, int layer )
     TRACK* Zone;                /* pointeur sur les pistes */
     int    l_segm;              /* demi-largeur de la piste */
 
-    for( Zone = start_adresse; Zone != NULL; Zone = (TRACK*) Zone->Pnext )
+    for( Zone = start_adresse; Zone != NULL; Zone = Zone->Next() )
     {
         /* calcul des coordonnees du segment teste */
         l_segm = Zone->m_Width >> 1;                        /* l_piste = demi largeur piste */
@@ -287,7 +287,7 @@ TEXTE_PCB* Locate_Texte_Pcb( TEXTE_PCB* pt_txt_pcb, int typeloc )
 
     SET_REF_POS( ref );
     PtStruct = (EDA_BaseStruct*) pt_txt_pcb;
-    for( ; PtStruct != NULL; PtStruct = PtStruct->Pnext )
+    for( ; PtStruct != NULL; PtStruct = PtStruct->Next() )
     {
         if( PtStruct->Type() != TYPETEXTE )
             continue;

gerbview/rs274d.cpp

@@ -817,8 +817,8 @@ bool GERBER::Execute_DCODE_Command( WinEDA_GerberFrame* frame, wxDC* DC,
 
             last = (SEGZONE*) frame->m_Pcb->m_Zone;
             if( last )
-                while( last->Pnext )
-                    last = (SEGZONE*) last->Pnext;
+                while( last->Next() )
+                    last = (SEGZONE*) last->Next();
 
             edge_poly->Insert( frame->m_Pcb, last );
 

gerbview/trpiste.cpp

@@ -38,7 +38,7 @@ void Draw_Track_Buffer( WinEDA_DrawPanel* panel, wxDC* DC, BOARD* Pcb, int draw_
         dcode_hightlight = gerber->m_Selected_Tool;
 
     Track = Pcb->m_Track;
-    for( ; Track != NULL; Track = (TRACK*) Track->Pnext )
+    for( ; Track != NULL; Track = Track->Next() )
     {
         if( printmasklayer != -1 )
             if( (Track->ReturnMaskLayer() & printmasklayer) == 0 )
@@ -226,7 +226,7 @@ void Affiche_DCodes_Pistes( WinEDA_DrawPanel* panel, wxDC* DC, BOARD* Pcb, int d
 
     GRSetDrawMode( DC, drawmode );
     track = Pcb->m_Track;
-    for( ; track != NULL; track = (TRACK*) track->Pnext )
+    for( ; track != NULL; track = track->Next() )
     {
         if( (track->m_Shape == S_ARC)
            || (track->m_Shape == S_CIRCLE)

gerbview/undelete.cpp

@@ -101,8 +101,11 @@ BOARD_ITEM* SaveItemEfface( BOARD_ITEM* PtItem, int nbitems )
             PtStruct->SetState( DELETED, ON );
             if( nbitems <= 1 )
                 NextS = NULL;                       /* fin de chaine */
-            PtStruct->Pnext = NextS;
-            PtStruct->Pback = Back; Back = PtStruct;
+
+            PtStruct->SetNext( NextS );
+            PtStruct->SetBack( Back );
+            Back = PtStruct;
+
             if( NextS == NULL )
                 break;
         }

include/board_item_struct.h

@@ -183,14 +183,18 @@ public:
 };
 
 
-class BOARD_CONNECTED_ITEM: public BOARD_ITEM
+class BOARD_CONNECTED_ITEM : public BOARD_ITEM
 {
 protected:
     int         m_NetCode;          // Net number
+
     int         m_Subnet;           /* In rastnest routines : for the current net,
-                                     *  block number (number common to the current connected items found) */
+                                     *  block number (number common to the current connected items found)
+                                     */
+
     int         m_ZoneSubnet;   	   // variable used in rastnest computations : for the current net,
                                     // handle block number in zone connection
+
 public:
     BOARD_CONNECTED_ITEM( BOARD_ITEM* StructFather, KICAD_T idtype );
     BOARD_CONNECTED_ITEM( const BOARD_CONNECTED_ITEM& src );

include/drawpanel_wxstruct.h

@@ -269,6 +269,10 @@ public:
     BASE_SCREEN( int idscreen, KICAD_T aType = SCREEN_STRUCT_TYPE );
     ~BASE_SCREEN();
 
+    BASE_SCREEN* Next() const { return (BASE_SCREEN*) Pnext; }
+    BASE_SCREEN* Back() const { return (BASE_SCREEN*) Pback; }
+
+
     /**
      * Function setCurItem
      * sets the currently selected object, m_CurrentItem.