haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a compil warning (shadowed var).

This commit is contained in:
jean-pierre charras 2022-05-02 15:25:55 +02:00
parent dfa6b9ed15
commit ece15b6472
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/tools/sch_drawing_tools.cpp
View File

@ -1042,7 +1042,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
KIGFX::VIEW_CONTROLS* controls = getViewControls(); KIGFX::VIEW_CONTROLS* controls = getViewControls();
EE_GRID_HELPER grid( m_toolMgr ); EE_GRID_HELPER grid( m_toolMgr );
bool ignorePrimePosition = false; bool ignorePrimePosition = false;
COMMON_SETTINGS* settings = Pgm().GetCommonSettings(); COMMON_SETTINGS* common_settings = Pgm().GetCommonSettings();
if( m_inTwoClickPlace ) if( m_inTwoClickPlace )
return 0; return 0;
@ -1112,7 +1112,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
{ {
m_toolMgr->PrimeTool( aEvent.Position() ); m_toolMgr->PrimeTool( aEvent.Position() );
} }
else if( settings->m_Input.immediate_actions && !aEvent.IsReactivate() && ( isText else if( common_settings->m_Input.immediate_actions && !aEvent.IsReactivate() && ( isText
|| isGlobalLabel || isGlobalLabel
|| isHierLabel || isHierLabel
|| isClassLabel || isClassLabel
@ -1229,14 +1229,14 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
{ {
// connected net label found -> create the label immediately // connected net label found -> create the label immediately
SCHEMATIC* schematic = getModel<SCHEMATIC>(); SCHEMATIC* schematic = getModel<SCHEMATIC>();
SCHEMATIC_SETTINGS& settings = schematic->Settings(); SCHEMATIC_SETTINGS& sch_settings = schematic->Settings();
SCH_LABEL_BASE* labelItem = nullptr; SCH_LABEL_BASE* labelItem = nullptr;
if( isGlobalLabel ) if( isGlobalLabel )
{ {
labelItem = new SCH_GLOBALLABEL( cursorPos ); labelItem = new SCH_GLOBALLABEL( cursorPos );
labelItem->SetShape( m_lastGlobalLabelShape ); labelItem->SetShape( m_lastGlobalLabelShape );
// make intersheets reference visible based on settings // make intersheets reference visible based on settings
labelItem->GetFields()[0].SetVisible( settings.m_IntersheetRefsShow ); labelItem->GetFields()[0].SetVisible( sch_settings.m_IntersheetRefsShow );
} }
else else
{ {
@ -1248,7 +1248,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
labelItem->SetItalic( m_lastTextItalic ); labelItem->SetItalic( m_lastTextItalic );
labelItem->SetTextSpinStyle( m_lastTextOrientation ); labelItem->SetTextSpinStyle( m_lastTextOrientation );
labelItem->SetTextSize( labelItem->SetTextSize(
wxSize( settings.m_DefaultTextSize, settings.m_DefaultTextSize ) ); wxSize( sch_settings.m_DefaultTextSize, sch_settings.m_DefaultTextSize ) );
labelItem->SetFlags( IS_NEW | IS_MOVING ); labelItem->SetFlags( IS_NEW | IS_MOVING );
labelItem->SetText( netName ); labelItem->SetText( netName );
item = labelItem; item = labelItem;