From 8bae52d1c36408d74a8c2210d97dabb2837fbeb9 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 14 Nov 2020 14:29:11 +0000 Subject: [PATCH] Correct naming conventions. --- eeschema/sch_bitmap.cpp | 4 +-- eeschema/sch_bus_entry.cpp | 8 ++--- eeschema/sch_component.cpp | 2 +- eeschema/sch_field.cpp | 4 +-- eeschema/sch_iref.cpp | 2 +- eeschema/sch_item.cpp | 4 +-- eeschema/sch_item.h | 8 ++--- eeschema/sch_junction.cpp | 4 +-- eeschema/sch_line.cpp | 36 +++++++++---------- eeschema/sch_line.h | 6 ++-- eeschema/sch_sheet.cpp | 4 +-- eeschema/sch_sheet_pin.cpp | 2 +- eeschema/sch_text.cpp | 18 +++++----- include/class_board_item.h | 12 +++---- pcbnew/board.cpp | 24 ++++++------- pcbnew/board.h | 5 ++- pcbnew/class_board_item.cpp | 6 ++-- pcbnew/dimension.cpp | 4 +-- pcbnew/footprint.cpp | 8 ++--- pcbnew/fp_shape.cpp | 2 +- pcbnew/fp_shape.h | 2 +- pcbnew/fp_text.cpp | 4 +-- pcbnew/pcb_shape.cpp | 2 +- pcbnew/pcb_shape.h | 2 +- pcbnew/pcb_target.cpp | 4 +-- pcbnew/plugins/legacy/legacy_plugin.cpp | 4 +-- pcbnew/track.cpp | 48 ++++++++++++------------- pcbnew/track.h | 45 ++++++++++++----------- pcbnew/zone.cpp | 10 +++--- 29 files changed, 141 insertions(+), 143 deletions(-) diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp index 3ae79c7926..e3847401ce 100644 --- a/eeschema/sch_bitmap.cpp +++ b/eeschema/sch_bitmap.cpp @@ -44,7 +44,7 @@ SCH_BITMAP::SCH_BITMAP( const wxPoint& pos ) : SCH_ITEM( NULL, SCH_BITMAP_T ) { m_pos = pos; - m_Layer = LAYER_NOTES; // used only to draw/plot a rectangle, + m_layer = LAYER_NOTES; // used only to draw/plot a rectangle, // when a bitmap cannot be drawn or plotted m_image = new BITMAP_BASE(); } @@ -54,7 +54,7 @@ SCH_BITMAP::SCH_BITMAP( const SCH_BITMAP& aSchBitmap ) : SCH_ITEM( aSchBitmap ) { m_pos = aSchBitmap.m_pos; - m_Layer = aSchBitmap.m_Layer; + m_layer = aSchBitmap.m_layer; m_image = new BITMAP_BASE( *aSchBitmap.m_image ); } diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp index 4ce6c9246c..01091d2d62 100644 --- a/eeschema/sch_bus_entry.cpp +++ b/eeschema/sch_bus_entry.cpp @@ -53,7 +53,7 @@ SCH_BUS_ENTRY_BASE::SCH_BUS_ENTRY_BASE( KICAD_T aType, const wxPoint& pos, bool SCH_BUS_WIRE_ENTRY::SCH_BUS_WIRE_ENTRY( const wxPoint& pos, bool aFlipY ) : SCH_BUS_ENTRY_BASE( SCH_BUS_WIRE_ENTRY_T, pos, aFlipY ) { - m_Layer = LAYER_WIRE; + m_layer = LAYER_WIRE; m_connected_bus_item = nullptr; } @@ -61,7 +61,7 @@ SCH_BUS_WIRE_ENTRY::SCH_BUS_WIRE_ENTRY( const wxPoint& pos, bool aFlipY ) : SCH_BUS_BUS_ENTRY::SCH_BUS_BUS_ENTRY( const wxPoint& pos, bool aFlipY ) : SCH_BUS_ENTRY_BASE( SCH_BUS_BUS_ENTRY_T, pos, aFlipY ) { - m_Layer = LAYER_BUS; + m_layer = LAYER_BUS; m_connected_bus_items[0] = nullptr; m_connected_bus_items[1] = nullptr; } @@ -198,7 +198,7 @@ void SCH_BUS_ENTRY_BASE::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffs { wxDC* DC = aSettings->GetPrintDC(); COLOR4D color = ( GetStrokeColor() == COLOR4D::UNSPECIFIED ) ? - aSettings->GetLayerColor( m_Layer ) : GetStrokeColor(); + aSettings->GetLayerColor( m_layer ) : GetStrokeColor(); int penWidth = ( GetPenWidth() == 0 ) ? aSettings->GetDefaultPenWidth() : GetPenWidth(); GRLine( nullptr, DC, m_pos.x + aOffset.x, m_pos.y + aOffset.y, GetEnd().x + aOffset.x, @@ -393,7 +393,7 @@ void SCH_BUS_ENTRY_BASE::Plot( PLOTTER* aPlotter ) auto* settings = static_cast( aPlotter->RenderSettings() ); COLOR4D color = ( GetStrokeColor() == COLOR4D::UNSPECIFIED ) ? - settings->GetLayerColor( m_Layer ) : GetStrokeColor(); + settings->GetLayerColor( m_layer ) : GetStrokeColor(); int penWidth = ( GetPenWidth() == 0 ) ? settings->GetDefaultPenWidth() : GetPenWidth(); penWidth = std::max( penWidth, settings->GetMinPenWidth() ); diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp index 8530bd69d8..6e9e3ac042 100644 --- a/eeschema/sch_component.cpp +++ b/eeschema/sch_component.cpp @@ -1234,7 +1234,7 @@ void SCH_COMPONENT::Show( int nestLevel, std::ostream& os ) const << " ref=\"" << TO_UTF8( GetField( 0 )->GetName() ) << '"' << " chipName=\"" << GetLibId().Format() << '"' << m_Pos - << " layer=\"" << m_Layer + << " layer=\"" << m_layer << '"' << ">\n"; // skip the reference, it's been output already. diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index 6c205aff54..52582c9637 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -185,7 +185,7 @@ int SCH_FIELD::GetPenWidth() const void SCH_FIELD::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) { wxDC* DC = aSettings->GetPrintDC(); - COLOR4D color = aSettings->GetLayerColor( IsForceVisible() ? LAYER_HIDDEN : m_Layer ); + COLOR4D color = aSettings->GetLayerColor( IsForceVisible() ? LAYER_HIDDEN : m_layer ); int orient; wxPoint textpos; int penWidth = GetEffectiveTextPenWidth( aSettings->GetDefaultPenWidth() ); @@ -241,7 +241,7 @@ void SCH_FIELD::SwapData( SCH_ITEM* aItem ) SCH_FIELD* item = (SCH_FIELD*) aItem; - std::swap( m_Layer, item->m_Layer ); + std::swap( m_layer, item->m_layer ); SwapText( *item ); SwapEffects( *item ); } diff --git a/eeschema/sch_iref.cpp b/eeschema/sch_iref.cpp index 1882f7f022..3b389de25e 100644 --- a/eeschema/sch_iref.cpp +++ b/eeschema/sch_iref.cpp @@ -32,7 +32,7 @@ SCH_IREF::SCH_IREF( const wxPoint& pos, const wxString& text, SCH_GLOBALLABEL* aParent ) : SCH_TEXT( pos, text, SCH_IREF_T ) { - m_Layer = LAYER_GLOBLABEL; + m_layer = LAYER_GLOBLABEL; m_parentLabel = aParent; SetMultilineAllowed( false ); m_screen = nullptr; diff --git a/eeschema/sch_item.cpp b/eeschema/sch_item.cpp index f6bb8d8750..52def894ac 100644 --- a/eeschema/sch_item.cpp +++ b/eeschema/sch_item.cpp @@ -47,7 +47,7 @@ SCH_ITEM::SCH_ITEM( EDA_ITEM* aParent, KICAD_T aType ) : EDA_ITEM( aParent, aType ) { - m_Layer = LAYER_WIRE; // It's only a default, in fact + m_layer = LAYER_WIRE; // It's only a default, in fact m_fieldsAutoplaced = FIELDS_AUTOPLACED_NO; m_connectivity_dirty = true; } @@ -56,7 +56,7 @@ SCH_ITEM::SCH_ITEM( EDA_ITEM* aParent, KICAD_T aType ) : SCH_ITEM::SCH_ITEM( const SCH_ITEM& aItem ) : EDA_ITEM( aItem ) { - m_Layer = aItem.m_Layer; + m_layer = aItem.m_layer; m_fieldsAutoplaced = aItem.m_fieldsAutoplaced; m_connectivity_dirty = true; } diff --git a/eeschema/sch_item.h b/eeschema/sch_item.h index 167c0ba7b1..c784571cd5 100644 --- a/eeschema/sch_item.h +++ b/eeschema/sch_item.h @@ -196,7 +196,7 @@ class SCH_ITEM : public EDA_ITEM friend class CONNECTION_GRAPH; protected: - SCH_LAYER_ID m_Layer; + SCH_LAYER_ID m_layer; EDA_ITEMS m_connections; // List of items connected to this item. FIELDS_AUTOPLACED m_fieldsAutoplaced; // indicates status of field autoplacement wxPoint m_storedPos; // a temporary variable used in some move commands @@ -276,14 +276,14 @@ public: /** * Return the layer this item is on. */ - SCH_LAYER_ID GetLayer() const { return m_Layer; } + SCH_LAYER_ID GetLayer() const { return m_layer; } /** * Set the layer this item is on. * * @param aLayer The layer number. */ - void SetLayer( SCH_LAYER_ID aLayer ) { m_Layer = aLayer; } + void SetLayer( SCH_LAYER_ID aLayer ) { m_layer = aLayer; } /** * Return the layers the item is drawn on (which may be more than its "home" layer) @@ -369,7 +369,7 @@ public: virtual bool IsDangling() const { return false; } - virtual bool CanConnect( const SCH_ITEM* aItem ) const { return m_Layer == aItem->GetLayer(); } + virtual bool CanConnect( const SCH_ITEM* aItem ) const { return m_layer == aItem->GetLayer(); } /** * @return true if the schematic item can connect to another schematic item. diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp index 8a96ce75d4..8ad20df4ff 100644 --- a/eeschema/sch_junction.cpp +++ b/eeschema/sch_junction.cpp @@ -45,7 +45,7 @@ SCH_JUNCTION::SCH_JUNCTION( const wxPoint& aPosition, int aDiameter, SCH_LAYER_I m_pos = aPosition; m_color = COLOR4D::UNSPECIFIED; m_diameter = aDiameter; - m_Layer = aLayer; + m_layer = aLayer; } @@ -70,7 +70,7 @@ void SCH_JUNCTION::SwapData( SCH_ITEM* aItem ) void SCH_JUNCTION::ViewGetLayers( int aLayers[], int& aCount ) const { aCount = 2; - aLayers[0] = m_Layer; + aLayers[0] = m_layer; aLayers[1] = LAYER_SELECTION_SHADOWS; } diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index c6c95051f7..3b4492611a 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -45,9 +45,9 @@ SCH_LINE::SCH_LINE( const wxPoint& pos, int layer ) : switch( layer ) { - default: m_Layer = LAYER_NOTES; break; - case LAYER_WIRE: m_Layer = LAYER_WIRE; break; - case LAYER_BUS: m_Layer = LAYER_BUS; break; + default: m_layer = LAYER_NOTES; break; + case LAYER_WIRE: m_layer = LAYER_WIRE; break; + case LAYER_BUS: m_layer = LAYER_BUS; break; } } @@ -141,7 +141,7 @@ void SCH_LINE::MoveEnd( const wxPoint& aOffset ) void SCH_LINE::Show( int nestLevel, std::ostream& os ) const { NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() - << " layer=\"" << m_Layer << '"' + << " layer=\"" << m_layer << '"' << " startIsDangling=\"" << m_startIsDangling << '"' << " endIsDangling=\"" << m_endIsDangling << '"' << ">" @@ -156,7 +156,7 @@ void SCH_LINE::Show( int nestLevel, std::ostream& os ) const void SCH_LINE::ViewGetLayers( int aLayers[], int& aCount ) const { aCount = 2; - aLayers[0] = m_Layer; + aLayers[0] = m_layer; aLayers[1] = LAYER_SELECTION_SHADOWS; } @@ -276,7 +276,7 @@ int SCH_LINE::GetPenWidth() const { NETCLASSPTR netclass = NetClass(); - switch ( m_Layer ) + switch ( m_layer ) { default: if( m_stroke.GetWidth() > 0 ) @@ -578,7 +578,7 @@ bool SCH_LINE::UpdateDanglingState( std::vector& aItemList, bool SCH_LINE::IsConnectable() const { - if( m_Layer == LAYER_WIRE || m_Layer == LAYER_BUS ) + if( m_layer == LAYER_WIRE || m_layer == LAYER_BUS ) return true; return false; @@ -587,7 +587,7 @@ bool SCH_LINE::IsConnectable() const bool SCH_LINE::CanConnect( const SCH_ITEM* aItem ) const { - if( m_Layer == LAYER_WIRE ) + if( m_layer == LAYER_WIRE ) { switch( aItem->Type() ) { @@ -605,7 +605,7 @@ bool SCH_LINE::CanConnect( const SCH_ITEM* aItem ) const break; } } - else if( m_Layer == LAYER_BUS ) + else if( m_layer == LAYER_BUS ) { switch( aItem->Type() ) { @@ -622,7 +622,7 @@ bool SCH_LINE::CanConnect( const SCH_ITEM* aItem ) const } } - return aItem->GetLayer() == m_Layer; + return aItem->GetLayer() == m_layer; } @@ -648,7 +648,7 @@ wxString SCH_LINE::GetSelectMenuText( EDA_UNITS aUnits ) const if( m_start.x == m_end.x ) { - switch( m_Layer ) + switch( m_layer ) { case LAYER_WIRE: txtfmt = _( "Vertical Wire, length %s" ); break; case LAYER_BUS: txtfmt = _( "Vertical Bus, length %s" ); break; @@ -657,7 +657,7 @@ wxString SCH_LINE::GetSelectMenuText( EDA_UNITS aUnits ) const } else if( m_start.y == m_end.y ) { - switch( m_Layer ) + switch( m_layer ) { case LAYER_WIRE: txtfmt = _( "Horizontal Wire, length %s" ); break; case LAYER_BUS: txtfmt = _( "Horizontal Bus, length %s" ); break; @@ -666,7 +666,7 @@ wxString SCH_LINE::GetSelectMenuText( EDA_UNITS aUnits ) const } else { - switch( m_Layer ) + switch( m_layer ) { case LAYER_WIRE: txtfmt = _( "Wire, length %s" ); break; case LAYER_BUS: txtfmt = _( "Bus, length %s" ); break; @@ -681,9 +681,9 @@ wxString SCH_LINE::GetSelectMenuText( EDA_UNITS aUnits ) const BITMAP_DEF SCH_LINE::GetMenuImage() const { - if( m_Layer == LAYER_NOTES ) + if( m_layer == LAYER_NOTES ) return add_dashed_line_xpm; - else if( m_Layer == LAYER_WIRE ) + else if( m_layer == LAYER_WIRE ) return add_line_xpm; return add_bus_xpm; @@ -746,7 +746,7 @@ void SCH_LINE::SwapData( SCH_ITEM* aItem ) { SCH_LINE* item = (SCH_LINE*) aItem; - std::swap( m_Layer, item->m_Layer ); + std::swap( m_layer, item->m_layer ); std::swap( m_start, item->m_start ); std::swap( m_end, item->m_end ); @@ -758,7 +758,7 @@ void SCH_LINE::SwapData( SCH_ITEM* aItem ) bool SCH_LINE::doIsConnected( const wxPoint& aPosition ) const { - if( m_Layer != LAYER_WIRE && m_Layer != LAYER_BUS ) + if( m_layer != LAYER_WIRE && m_layer != LAYER_BUS ) return false; return IsEndPoint( aPosition ); @@ -776,7 +776,7 @@ void SCH_LINE::Plot( PLOTTER* aPlotter ) aPlotter->SetColor( color ); - switch( m_Layer ) + switch( m_layer ) { case LAYER_WIRE: penWidth = settings->m_DefaultWireThickness; break; case LAYER_BUS: penWidth = settings->m_DefaultBusThickness; break; diff --git a/eeschema/sch_line.h b/eeschema/sch_line.h index acc85334ae..e9bd273474 100644 --- a/eeschema/sch_line.h +++ b/eeschema/sch_line.h @@ -73,11 +73,11 @@ public: for( const KICAD_T* p = aScanTypes; *p != EOT; ++p ) { - if( *p == SCH_LINE_LOCATE_WIRE_T && m_Layer == LAYER_WIRE ) + if( *p == SCH_LINE_LOCATE_WIRE_T && m_layer == LAYER_WIRE ) return true; - else if ( *p == SCH_LINE_LOCATE_BUS_T && m_Layer == LAYER_BUS ) + else if ( *p == SCH_LINE_LOCATE_BUS_T && m_layer == LAYER_BUS ) return true; - else if ( *p == SCH_LINE_LOCATE_GRAPHIC_LINE_T && m_Layer == LAYER_NOTES ) + else if ( *p == SCH_LINE_LOCATE_GRAPHIC_LINE_T && m_layer == LAYER_NOTES ) return true; } diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp index 6801cb5b35..3737697ee5 100644 --- a/eeschema/sch_sheet.cpp +++ b/eeschema/sch_sheet.cpp @@ -70,7 +70,7 @@ const wxString SCH_SHEET::GetDefaultFieldName( int aFieldNdx ) SCH_SHEET::SCH_SHEET( EDA_ITEM* aParent, const wxPoint& pos ) : SCH_ITEM( aParent, SCH_SHEET_T ) { - m_Layer = LAYER_SHEET; + m_layer = LAYER_SHEET; m_pos = pos; m_size = wxSize( Mils2iu( MIN_SHEET_WIDTH ), Mils2iu( MIN_SHEET_HEIGHT ) ); m_screen = NULL; @@ -101,7 +101,7 @@ SCH_SHEET::SCH_SHEET( const SCH_SHEET& aSheet ) : { m_pos = aSheet.m_pos; m_size = aSheet.m_size; - m_Layer = aSheet.m_Layer; + m_layer = aSheet.m_layer; const_cast( m_Uuid ) = aSheet.m_Uuid; m_fields = aSheet.m_fields; m_fieldsAutoplaced = aSheet.m_fieldsAutoplaced; diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp index 9862418c88..d5e87106be 100644 --- a/eeschema/sch_sheet_pin.cpp +++ b/eeschema/sch_sheet_pin.cpp @@ -43,7 +43,7 @@ SCH_SHEET_PIN::SCH_SHEET_PIN( SCH_SHEET* parent, const wxPoint& pos, const wxStr { SetParent( parent ); wxASSERT( parent ); - m_Layer = LAYER_SHEETLABEL; + m_layer = LAYER_SHEETLABEL; SetTextPos( pos ); diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index e4f2f79e6b..2a40fd9b00 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -126,7 +126,7 @@ SCH_TEXT::SCH_TEXT( const wxPoint& pos, const wxString& text, KICAD_T aType ) : m_connectionType( CONNECTION_TYPE::NONE ), m_spin_style( LABEL_SPIN_STYLE::LEFT ) { - m_Layer = LAYER_NOTES; + m_layer = LAYER_NOTES; SetTextPos( pos ); SetMultilineAllowed( true ); @@ -274,7 +274,7 @@ void SCH_TEXT::SwapData( SCH_ITEM* aItem ) { SCH_TEXT* item = (SCH_TEXT*) aItem; - std::swap( m_Layer, item->m_Layer ); + std::swap( m_layer, item->m_layer ); std::swap( m_shape, item->m_shape ); std::swap( m_isDangling, item->m_isDangling ); @@ -324,7 +324,7 @@ int SCH_TEXT::GetPenWidth() const void SCH_TEXT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) { - COLOR4D color = aSettings->GetLayerColor( m_Layer ); + COLOR4D color = aSettings->GetLayerColor( m_layer ); wxPoint text_offset = aOffset + GetSchematicTextOffset( aSettings ); EDA_TEXT::Print( aSettings, text_offset, color ); @@ -697,7 +697,7 @@ void SCH_TEXT::Show( int nestLevel, std::ostream& os ) const wxString s = GetClass(); NestedSpace( nestLevel, os ) << '<' << s.Lower().mb_str() - << " layer=\"" << m_Layer << '"' + << " layer=\"" << m_layer << '"' << " shape=\"" << static_cast( m_shape ) << '"' << " dangling=\"" << m_isDangling << '"' << '>' @@ -711,7 +711,7 @@ void SCH_TEXT::Show( int nestLevel, std::ostream& os ) const SCH_LABEL::SCH_LABEL( const wxPoint& pos, const wxString& text ) : SCH_TEXT( pos, text, SCH_LABEL_T ) { - m_Layer = LAYER_LOCLABEL; + m_layer = LAYER_LOCLABEL; m_shape = PINSHEETLABEL_SHAPE::PS_INPUT; m_isDangling = true; SetMultilineAllowed( false ); @@ -808,7 +808,7 @@ BITMAP_DEF SCH_LABEL::GetMenuImage() const SCH_GLOBALLABEL::SCH_GLOBALLABEL( const wxPoint& pos, const wxString& text ) : SCH_TEXT( pos, text, SCH_GLOBAL_LABEL_T ) { - m_Layer = LAYER_GLOBLABEL; + m_layer = LAYER_GLOBLABEL; m_shape = PINSHEETLABEL_SHAPE::PS_BIDI; m_isDangling = true; m_iref = nullptr; @@ -899,7 +899,7 @@ void SCH_GLOBALLABEL::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset static std::vector Poly; wxDC* DC = aSettings->GetPrintDC(); - COLOR4D color = aSettings->GetLayerColor( m_Layer ); + COLOR4D color = aSettings->GetLayerColor( m_layer ); int penWidth = std::max( GetPenWidth(), aSettings->GetDefaultPenWidth() ); wxPoint text_offset = aOffset + GetSchematicTextOffset( aSettings ); @@ -1052,7 +1052,7 @@ BITMAP_DEF SCH_GLOBALLABEL::GetMenuImage() const SCH_HIERLABEL::SCH_HIERLABEL( const wxPoint& pos, const wxString& text, KICAD_T aType ) : SCH_TEXT( pos, text, aType ) { - m_Layer = LAYER_HIERLABEL; + m_layer = LAYER_HIERLABEL; m_shape = PINSHEETLABEL_SHAPE::PS_INPUT; m_isDangling = true; SetMultilineAllowed( false ); @@ -1115,7 +1115,7 @@ void SCH_HIERLABEL::Print( RENDER_SETTINGS* aSettings, const wxPoint& offset ) wxDC* DC = aSettings->GetPrintDC(); SCH_CONNECTION* conn = Connection(); bool isBus = conn && conn->IsBus(); - COLOR4D color = aSettings->GetLayerColor( isBus ? LAYER_BUS : m_Layer ); + COLOR4D color = aSettings->GetLayerColor( isBus ? LAYER_BUS : m_layer ); int penWidth = std::max( GetPenWidth(), aSettings->GetDefaultPenWidth() ); wxPoint textOffset = offset + GetSchematicTextOffset( aSettings ); diff --git a/include/class_board_item.h b/include/class_board_item.h index 1a3efcc784..32fe241151 100644 --- a/include/class_board_item.h +++ b/include/class_board_item.h @@ -91,13 +91,13 @@ static inline wxString PCB_SHAPE_TYPE_T_asString( PCB_SHAPE_TYPE_T a ) class BOARD_ITEM : public EDA_ITEM { protected: - PCB_LAYER_ID m_Layer; + PCB_LAYER_ID m_layer; PCB_GROUP* m_group; public: BOARD_ITEM( BOARD_ITEM* aParent, KICAD_T idtype ) : EDA_ITEM( aParent, idtype ), - m_Layer( F_Cu ), + m_layer( F_Cu ), m_group( nullptr ) { } @@ -187,13 +187,13 @@ public: * Function GetLayer * returns the primary layer this item is on. */ - virtual PCB_LAYER_ID GetLayer() const { return m_Layer; } + virtual PCB_LAYER_ID GetLayer() const { return m_layer; } /** * Function GetLayerSet * returns a std::bitset of all layers on which the item physically resides. */ - virtual LSET GetLayerSet() const { return LSET( m_Layer ); } + virtual LSET GetLayerSet() const { return LSET( m_layer ); } virtual void SetLayerSet( LSET aLayers ) { wxFAIL_MSG( "Attempted to SetLayerSet() on a single-layer object." ); @@ -210,7 +210,7 @@ public: */ virtual void SetLayer( PCB_LAYER_ID aLayer ) { - m_Layer = aLayer; + m_layer = aLayer; } /** @@ -243,7 +243,7 @@ public: */ virtual bool IsOnLayer( PCB_LAYER_ID aLayer ) const { - return m_Layer == aLayer; + return m_layer == aLayer; } /** diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp index f28e65f020..ce88c3dfe6 100644 --- a/pcbnew/board.cpp +++ b/pcbnew/board.cpp @@ -72,12 +72,12 @@ BOARD::BOARD() : for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer ) { - m_Layer[layer].m_name = GetStandardLayerName( ToLAYER_ID( layer ) ); + m_layers[layer].m_name = GetStandardLayerName( ToLAYER_ID( layer ) ); if( IsCopperLayer( layer ) ) - m_Layer[layer].m_type = LT_SIGNAL; + m_layers[layer].m_type = LT_SIGNAL; else - m_Layer[layer].m_type = LT_UNDEFINED; + m_layers[layer].m_type = LT_UNDEFINED; } BOARD_DESIGN_SETTINGS& bds = GetDesignSettings(); @@ -296,9 +296,9 @@ TRACKS BOARD::TracksInNet( int aNetCode ) bool BOARD::SetLayerDescr( PCB_LAYER_ID aIndex, const LAYER& aLayer ) { - if( unsigned( aIndex ) < arrayDim( m_Layer ) ) + if( unsigned( aIndex ) < arrayDim( m_layers ) ) { - m_Layer[ aIndex ] = aLayer; + m_layers[ aIndex ] = aLayer; return true; } @@ -312,8 +312,8 @@ const PCB_LAYER_ID BOARD::GetLayerID( const wxString& aLayerName ) const // Check the BOARD physical layer names. for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer ) { - if ( ( m_Layer[ layer ].m_name == aLayerName ) - || ( m_Layer[ layer ].m_userName == aLayerName ) ) + if ( ( m_layers[ layer ].m_name == aLayerName ) + || ( m_layers[ layer ].m_userName == aLayerName ) ) return ToLAYER_ID( layer ); } @@ -336,8 +336,8 @@ const wxString BOARD::GetLayerName( PCB_LAYER_ID aLayer ) const // Standard names were set in BOARD::BOARD() but they may be over-ridden by // BOARD::SetLayerName(). For copper layers, return the user defined layer name, // if it was set. Otherwise return the Standard English layer name. - if( !m_Layer[aLayer].m_userName.IsEmpty() ) - return m_Layer[aLayer].m_userName; + if( !m_layers[aLayer].m_userName.IsEmpty() ) + return m_layers[aLayer].m_userName; } return GetStandardLayerName( aLayer ); @@ -354,7 +354,7 @@ bool BOARD::SetLayerName( PCB_LAYER_ID aLayer, const wxString& aLayerName ) if( IsLayerEnabled( aLayer ) ) { - m_Layer[aLayer].m_userName = aLayerName; + m_layers[aLayer].m_userName = aLayerName; return true; } @@ -370,7 +370,7 @@ LAYER_T BOARD::GetLayerType( PCB_LAYER_ID aLayer ) const //@@IMB: The original test was broken due to the discontinuity // in the layer sequence. if( IsLayerEnabled( aLayer ) ) - return m_Layer[aLayer].m_type; + return m_layers[aLayer].m_type; return LT_SIGNAL; } @@ -385,7 +385,7 @@ bool BOARD::SetLayerType( PCB_LAYER_ID aLayer, LAYER_T aLayerType ) // in the layer sequence. if( IsLayerEnabled( aLayer ) ) { - m_Layer[aLayer].m_type = aLayerType; + m_layers[aLayer].m_type = aLayerType; return true; } diff --git a/pcbnew/board.h b/pcbnew/board.h index 51b0369e51..e68f7e5c0b 100644 --- a/pcbnew/board.h +++ b/pcbnew/board.h @@ -199,9 +199,8 @@ private: GROUPS m_groups; ZONES m_zones; - LAYER m_Layer[PCB_LAYER_ID_COUNT]; + LAYER m_layers[PCB_LAYER_ID_COUNT]; - // if true m_highLight_NetCode is used HIGH_LIGHT_INFO m_highLight; // current high light data HIGH_LIGHT_INFO m_highLightPrevious; // a previously stored high light data @@ -227,7 +226,7 @@ private: */ std::unique_ptr m_designSettings; - NETINFO_LIST m_NetInfo; // net info list (name, design constraints .. + NETINFO_LIST m_NetInfo; // net info list (name, design constraints... std::vector m_listeners; diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp index e6b23e9055..384339f395 100644 --- a/pcbnew/class_board_item.cpp +++ b/pcbnew/class_board_item.cpp @@ -62,10 +62,10 @@ wxString BOARD_ITEM::GetLayerName() const BOARD* board = GetBoard(); if( board ) - return board->GetLayerName( m_Layer ); + return board->GetLayerName( m_layer ); // If no parent, return standard name - return BOARD::GetStandardLayerName( m_Layer ); + return BOARD::GetStandardLayerName( m_layer ); } @@ -106,7 +106,7 @@ void BOARD_ITEM::ViewGetLayers( int aLayers[], int& aCount ) const { // Basic fallback aCount = 1; - aLayers[0] = m_Layer; + aLayers[0] = m_layer; } diff --git a/pcbnew/dimension.cpp b/pcbnew/dimension.cpp index 8828b34cde..955529301f 100644 --- a/pcbnew/dimension.cpp +++ b/pcbnew/dimension.cpp @@ -54,7 +54,7 @@ DIMENSION_BASE::DIMENSION_BASE( BOARD_ITEM* aParent, KICAD_T aType ) : m_text( aParent ), m_measuredValue( 0 ) { - m_Layer = Dwgs_User; + m_layer = Dwgs_User; } @@ -211,7 +211,7 @@ const wxString DIMENSION_BASE::GetText() const void DIMENSION_BASE::SetLayer( PCB_LAYER_ID aLayer ) { - m_Layer = aLayer; + m_layer = aLayer; m_text.SetLayer( aLayer ); } diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp index 62ffebd5b7..beffb5726f 100644 --- a/pcbnew/footprint.cpp +++ b/pcbnew/footprint.cpp @@ -44,7 +44,7 @@ FOOTPRINT::FOOTPRINT( BOARD* parent ) : m_initial_comments( 0 ) { m_attributes = 0; - m_Layer = F_Cu; + m_layer = F_Cu; m_orient = 0; m_fpStatus = FP_PADS_are_LOCKED; m_arflag = 0; @@ -1120,7 +1120,7 @@ void FOOTPRINT::ViewGetLayers( int aLayers[], int& aCount ) const aCount = 2; aLayers[0] = LAYER_ANCHOR; - switch( m_Layer ) + switch( m_layer ) { default: wxASSERT_MSG( false, "Illegal layer" ); // do you really have footprints placed on @@ -1163,8 +1163,8 @@ void FOOTPRINT::ViewGetLayers( int aLayers[], int& aCount ) const double FOOTPRINT::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const { - int layer = ( m_Layer == F_Cu ) ? LAYER_MOD_FR : - ( m_Layer == B_Cu ) ? LAYER_MOD_BK : LAYER_ANCHOR; + int layer = ( m_layer == F_Cu ) ? LAYER_MOD_FR : + ( m_layer == B_Cu ) ? LAYER_MOD_BK : LAYER_ANCHOR; // Currently this is only pertinent for the anchor layer; everything else is drawn from the // children. diff --git a/pcbnew/fp_shape.cpp b/pcbnew/fp_shape.cpp index e9e6f49bb4..a8c7a3f05b 100644 --- a/pcbnew/fp_shape.cpp +++ b/pcbnew/fp_shape.cpp @@ -40,7 +40,7 @@ FP_SHAPE::FP_SHAPE( FOOTPRINT* parent, PCB_SHAPE_TYPE_T aShape ) : { m_shape = aShape; m_angle = 0; - m_Layer = F_SilkS; + m_layer = F_SilkS; } diff --git a/pcbnew/fp_shape.h b/pcbnew/fp_shape.h index 440e169136..dd3af60928 100644 --- a/pcbnew/fp_shape.h +++ b/pcbnew/fp_shape.h @@ -61,7 +61,7 @@ public: if( *p == PCB_LOCATE_GRAPHIC_T ) return true; else if( *p == PCB_LOCATE_BOARD_EDGE_T ) - return m_Layer == Edge_Cuts; + return m_layer == Edge_Cuts; } return false; diff --git a/pcbnew/fp_text.cpp b/pcbnew/fp_text.cpp index fac0fe5e48..b92ed85a22 100644 --- a/pcbnew/fp_text.cpp +++ b/pcbnew/fp_text.cpp @@ -408,10 +408,10 @@ double FP_TEXT::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const if( IsParentFlipped() && !aView->IsLayerVisible( LAYER_MOD_BK ) ) return HIDE; - if( IsFrontLayer( m_Layer ) && !aView->IsLayerVisible( LAYER_MOD_TEXT_FR ) ) + if( IsFrontLayer( m_layer ) && !aView->IsLayerVisible( LAYER_MOD_TEXT_FR ) ) return HIDE; - if( IsBackLayer( m_Layer ) && !aView->IsLayerVisible( LAYER_MOD_TEXT_BK ) ) + if( IsBackLayer( m_layer ) && !aView->IsLayerVisible( LAYER_MOD_TEXT_BK ) ) return HIDE; // Other layers are shown without any conditions diff --git a/pcbnew/pcb_shape.cpp b/pcbnew/pcb_shape.cpp index 52d188e536..35f3345bcb 100644 --- a/pcbnew/pcb_shape.cpp +++ b/pcbnew/pcb_shape.cpp @@ -1222,7 +1222,7 @@ void PCB_SHAPE::SwapData( BOARD_ITEM* aImage ) std::swap( m_bezierC2, image->m_bezierC2 ); std::swap( m_bezierPoints, image->m_bezierPoints ); std::swap( m_poly, image->m_poly ); - std::swap( m_Layer, image->m_Layer ); + std::swap( m_layer, image->m_layer ); std::swap( m_Flags, image->m_Flags ); std::swap( m_Status, image->m_Status ); std::swap( m_Parent, image->m_Parent ); diff --git a/pcbnew/pcb_shape.h b/pcbnew/pcb_shape.h index 832339edfc..7e296f842d 100644 --- a/pcbnew/pcb_shape.h +++ b/pcbnew/pcb_shape.h @@ -85,7 +85,7 @@ public: if( *p == PCB_LOCATE_GRAPHIC_T ) return true; else if( *p == PCB_LOCATE_BOARD_EDGE_T ) - return m_Layer == Edge_Cuts; + return m_layer == Edge_Cuts; } return false; diff --git a/pcbnew/pcb_target.cpp b/pcbnew/pcb_target.cpp index 65e4d6ce6b..3e8ae0e923 100644 --- a/pcbnew/pcb_target.cpp +++ b/pcbnew/pcb_target.cpp @@ -40,7 +40,7 @@ PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent ) : m_Shape = 0; m_Size = Millimeter2iu( 5 ); // Gives a decent size m_Width = Millimeter2iu( DEFAULT_COPPER_LINE_WIDTH ); - m_Layer = Edge_Cuts; // a target is on all layers + m_layer = Edge_Cuts; // a target is on all layers } PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent, int aShape, PCB_LAYER_ID aLayer, @@ -48,7 +48,7 @@ PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent, int aShape, PCB_LAYER_ID aLayer, BOARD_ITEM( aParent, PCB_TARGET_T ) { m_Shape = aShape; - m_Layer = aLayer; + m_layer = aLayer; m_Pos = aPos; m_Size = aSize; m_Width = aWidth; diff --git a/pcbnew/plugins/legacy/legacy_plugin.cpp b/pcbnew/plugins/legacy/legacy_plugin.cpp index a8225df4ae..00700cb78b 100644 --- a/pcbnew/plugins/legacy/legacy_plugin.cpp +++ b/pcbnew/plugins/legacy/legacy_plugin.cpp @@ -1741,8 +1741,8 @@ void LEGACY_PLUGIN::loadFP_SHAPE( FOOTPRINT* aFootprint ) } // Check for a reasonable layer: - // m_Layer must be >= FIRST_NON_COPPER_LAYER, but because microwave footprints - // can use the copper layers m_Layer < FIRST_NON_COPPER_LAYER is allowed. + // layer must be >= FIRST_NON_COPPER_LAYER, but because microwave footprints can use the + // copper layers, layer < FIRST_NON_COPPER_LAYER is allowed. if( layer < FIRST_LAYER || layer > LAST_NON_COPPER_LAYER ) layer = SILKSCREEN_N_FRONT; diff --git a/pcbnew/track.cpp b/pcbnew/track.cpp index 58f8cecb92..430ad4827b 100644 --- a/pcbnew/track.cpp +++ b/pcbnew/track.cpp @@ -63,10 +63,10 @@ VIA::VIA( BOARD_ITEM* aParent ) : TRACK( aParent, PCB_VIA_T ) { SetViaType( VIATYPE::THROUGH ); - m_BottomLayer = B_Cu; + m_bottomLayer = B_Cu; SetDrillDefault(); - m_RemoveUnconnectedLayer = false; - m_KeepTopBottomLayer = true; + m_removeUnconnectedLayer = false; + m_keepTopBottomLayer = true; } @@ -169,8 +169,8 @@ int VIA::GetMinAnnulus( PCB_LAYER_ID aLayer, wxString* aSource ) const int VIA::GetDrillValue() const { - if( m_Drill > 0 ) // Use the specific value. - return m_Drill; + if( m_drill > 0 ) // Use the specific value. + return m_drill; // Use the default value from the Netclass NETCLASS* netclass = GetNetClass(); @@ -369,10 +369,10 @@ LSET VIA::GetLayerSet() const LSET layermask; - wxASSERT( m_Layer <= m_BottomLayer ); + wxASSERT( m_layer <= m_bottomLayer ); // PCB_LAYER_IDs are numbered from front to back, this is top to bottom. - for( LAYER_NUM id = m_Layer; id <= m_BottomLayer; ++id ) + for( LAYER_NUM id = m_layer; id <= m_bottomLayer; ++id ) { layermask.set( id ); } @@ -389,11 +389,11 @@ void VIA::SetLayerSet( LSET aLayerSet ) { if( first ) { - m_Layer = layer; + m_layer = layer; first = false; } - m_BottomLayer = layer; + m_bottomLayer = layer; } } @@ -401,21 +401,21 @@ void VIA::SetLayerSet( LSET aLayerSet ) void VIA::SetLayerPair( PCB_LAYER_ID aTopLayer, PCB_LAYER_ID aBottomLayer ) { - m_Layer = aTopLayer; - m_BottomLayer = aBottomLayer; + m_layer = aTopLayer; + m_bottomLayer = aBottomLayer; SanitizeLayers(); } void VIA::SetTopLayer( PCB_LAYER_ID aLayer ) { - m_Layer = aLayer; + m_layer = aLayer; } void VIA::SetBottomLayer( PCB_LAYER_ID aLayer ) { - m_BottomLayer = aLayer; + m_bottomLayer = aLayer; } @@ -426,8 +426,8 @@ void VIA::LayerPair( PCB_LAYER_ID* top_layer, PCB_LAYER_ID* bottom_layer ) const if( GetViaType() != VIATYPE::THROUGH ) { - b_layer = m_BottomLayer; - t_layer = m_Layer; + b_layer = m_bottomLayer; + t_layer = m_layer; if( b_layer < t_layer ) std::swap( b_layer, t_layer ); @@ -443,13 +443,13 @@ void VIA::LayerPair( PCB_LAYER_ID* top_layer, PCB_LAYER_ID* bottom_layer ) const PCB_LAYER_ID VIA::TopLayer() const { - return m_Layer; + return m_layer; } PCB_LAYER_ID VIA::BottomLayer() const { - return m_BottomLayer; + return m_bottomLayer; } @@ -457,12 +457,12 @@ void VIA::SanitizeLayers() { if( GetViaType() == VIATYPE::THROUGH ) { - m_Layer = F_Cu; - m_BottomLayer = B_Cu; + m_layer = F_Cu; + m_bottomLayer = B_Cu; } - if( m_BottomLayer < m_Layer ) - std::swap( m_BottomLayer, m_Layer ); + if( m_bottomLayer < m_layer ) + std::swap( m_bottomLayer, m_layer ); } @@ -492,10 +492,10 @@ bool VIA::FlashLayer( int aLayer ) const if( !IsOnLayer( static_cast( aLayer ) ) ) return false; - if( !m_RemoveUnconnectedLayer ) + if( !m_removeUnconnectedLayer ) return true; - if( m_KeepTopBottomLayer && ( aLayer == m_Layer || aLayer == m_BottomLayer ) ) + if( m_keepTopBottomLayer && ( aLayer == m_layer || aLayer == m_bottomLayer ) ) return true; return board->GetConnectivity()->IsConnectedOnLayer( this, static_cast( aLayer ), @@ -582,7 +582,7 @@ double VIA::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const // Draw blind/buried/microvias only if at least one of the layers crossed is enabeld. if( aView->IsLayerVisible( LAYER_VIAS ) ) { - if( !onVisibleLayer && m_ViaType != VIATYPE::THROUGH ) + if( !onVisibleLayer && m_viaType != VIATYPE::THROUGH ) return HIDE; return aView->IsLayerVisible( LAYER_VIAS ) ? 0.0 : HIDE; diff --git a/pcbnew/track.h b/pcbnew/track.h index be58d1a7d2..d4beb01f89 100644 --- a/pcbnew/track.h +++ b/pcbnew/track.h @@ -370,19 +370,19 @@ public: for( const KICAD_T* p = aScanTypes; *p != EOT; ++p ) { - if( *p == PCB_LOCATE_STDVIA_T && m_ViaType == VIATYPE::THROUGH ) + if( *p == PCB_LOCATE_STDVIA_T && m_viaType == VIATYPE::THROUGH ) return true; - else if( *p == PCB_LOCATE_UVIA_T && m_ViaType == VIATYPE::MICROVIA ) + else if( *p == PCB_LOCATE_UVIA_T && m_viaType == VIATYPE::MICROVIA ) return true; - else if( *p == PCB_LOCATE_BBVIA_T && m_ViaType == VIATYPE::BLIND_BURIED ) + else if( *p == PCB_LOCATE_BBVIA_T && m_viaType == VIATYPE::BLIND_BURIED ) return true; } return false; } - VIATYPE GetViaType() const { return m_ViaType; } - void SetViaType( VIATYPE aViaType ) { m_ViaType = aViaType; } + VIATYPE GetViaType() const { return m_viaType; } + void SetViaType( VIATYPE aViaType ) { m_viaType = aViaType; } bool IsOnLayer( PCB_LAYER_ID aLayer ) const override; @@ -391,8 +391,7 @@ public: /** * Function SetLayerPair - * For a via m_Layer contains the top layer, the other layer is in - * m_BottomLayer + * For a via m_layer contains the top layer, the other layer is in m_bottomLayer * @param aTopLayer = first layer connected by the via * @param aBottomLayer = last layer connected by the via */ @@ -455,14 +454,14 @@ public: * Sets the unconnected removal property. If true, the copper is removed on zone fill * or when specifically requested when the via is not connected on a layer. */ - void SetRemoveUnconnected( bool aSet ) { m_RemoveUnconnectedLayer = aSet; } - bool GetRemoveUnconnected() const { return m_RemoveUnconnectedLayer; } + void SetRemoveUnconnected( bool aSet ) { m_removeUnconnectedLayer = aSet; } + bool GetRemoveUnconnected() const { return m_removeUnconnectedLayer; } /** * Sets whether we keep the top and bottom connections even if they are not connected */ - void SetKeepTopBottom( bool aSet ) { m_KeepTopBottomLayer = aSet; } - bool GetKeepTopBottom() const { return m_KeepTopBottomLayer; } + void SetKeepTopBottom( bool aSet ) { m_keepTopBottomLayer = aSet; } + bool GetKeepTopBottom() const { return m_keepTopBottomLayer; } /** * Checks to see whether the via should have a pad on the specific layer @@ -483,14 +482,14 @@ public: * sets the drill value for vias. * @param aDrill is the new drill diameter */ - void SetDrill( int aDrill ) { m_Drill = aDrill; } + void SetDrill( int aDrill ) { m_drill = aDrill; } /** * Function GetDrill * returns the local drill setting for this VIA. If you want the calculated value, * use GetDrillValue() instead. */ - int GetDrill() const { return m_Drill; } + int GetDrill() const { return m_drill; } /** * Function GetDrillValue @@ -504,32 +503,32 @@ public: * Function SetDrillDefault * sets the drill value for vias to the default value #UNDEFINED_DRILL_DIAMETER. */ - void SetDrillDefault() { m_Drill = UNDEFINED_DRILL_DIAMETER; } + void SetDrillDefault() { m_drill = UNDEFINED_DRILL_DIAMETER; } /** * Function IsDrillDefault * @return true if the drill value is default value (-1) */ - bool IsDrillDefault() const { return m_Drill <= 0; } + bool IsDrillDefault() const { return m_drill <= 0; } - virtual void SwapData( BOARD_ITEM* aImage ) override; + void SwapData( BOARD_ITEM* aImage ) override; // @copydoc BOARD_ITEM::GetEffectiveShape - virtual std::shared_ptr GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER ) const override; + std::shared_ptr GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER ) const override; protected: wxString LayerMaskDescribe() const override; private: - /// The bottom layer of the via (the top layer is in m_Layer) - PCB_LAYER_ID m_BottomLayer; + /// The bottom layer of the via (the top layer is in m_layer) + PCB_LAYER_ID m_bottomLayer; - VIATYPE m_ViaType; // Type of via + VIATYPE m_viaType; ///< through, blind/buried or micro - int m_Drill; // for vias: via drill (- 1 for default value) + int m_drill; ///< for vias: via drill (- 1 for default value) - bool m_RemoveUnconnectedLayer; ///< Remove unconnected copper on a via - bool m_KeepTopBottomLayer; ///< Keep the top and bottom annular rings + bool m_removeUnconnectedLayer; ///< Remove unconnected copper on a via + bool m_keepTopBottomLayer; ///< Keep the top and bottom annular rings }; diff --git a/pcbnew/zone.cpp b/pcbnew/zone.cpp index c5921ac8c1..f16e0e36c0 100644 --- a/pcbnew/zone.cpp +++ b/pcbnew/zone.cpp @@ -235,7 +235,7 @@ void ZONE::SetLayer( PCB_LAYER_ID aLayer ) { SetLayerSet( LSET( aLayer ) ); - m_Layer = aLayer; + m_layer = aLayer; } @@ -277,10 +277,10 @@ void ZONE::SetLayerSet( LSET aLayerSet ) // Set the single layer parameter. For zones that can be on many layers, this parameter // is arbitrary at best, but some code still uses it. // Priority is F_Cu then B_Cu then to the first selected layer - m_Layer = aLayerSet.Seq()[0]; + m_layer = aLayerSet.Seq()[0]; - if( m_Layer != F_Cu && aLayerSet[B_Cu] ) - m_Layer = B_Cu; + if( m_layer != F_Cu && aLayerSet[B_Cu] ) + m_layer = B_Cu; } @@ -634,7 +634,7 @@ void ZONE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector& msg.Printf( wxT( "%d" ), (int) m_borderHatchLines.size() ); aList.emplace_back( MSG_PANEL_ITEM( _( "HatchBorder Lines" ), msg, BLUE ) ); - PCB_LAYER_ID layer = m_Layer; + PCB_LAYER_ID layer = m_layer; // NOTE: This brings in dependence on PCB_EDIT_FRAME to the qa tests, which isn't ideal. // TODO: Figure out a way for items to know the active layer without the whole edit frame?