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

Fix more places where casts into RunAction were happening

This commit is contained in:
Ian McInerney 2022-09-29 00:57:21 +01:00
parent 8f3d159905
commit 07cc85e76c
7 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_grid_settings.cpp
View File

@ -130,7 +130,7 @@ bool DIALOG_GRID_SETTINGS::TransferDataFromWindow()
mgr->ResetTools( TOOL_BASE::REDRAW ); mgr->ResetTools( TOOL_BASE::REDRAW );
// Notify GAL // Notify GAL
mgr->RunAction( ACTIONS::gridPreset, true, static_cast<intptr_t>( gridCfg.last_size_idx ) ); mgr->RunAction( ACTIONS::gridPreset, true, gridCfg.last_size_idx );
mgr->RunAction( ACTIONS::gridSetOrigin, true, new VECTOR2D( m_parent->GetGridOrigin() ) ); mgr->RunAction( ACTIONS::gridSetOrigin, true, new VECTOR2D( m_parent->GetGridOrigin() ) );
m_parent->UpdateGridSelectBox(); m_parent->UpdateGridSelectBox();

10
pcbnew/cross-probing.cpp
View File

@ -192,9 +192,9 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
bbox = footprint->GetBoundingBox( true, false ); // No invisible text in bbox calc bbox = footprint->GetBoundingBox( true, false ); // No invisible text in bbox calc
if( pad ) if( pad )
m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, (void*) pad ); m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, pad );
else else
m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, (void*) footprint ); m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, footprint );
} }
else if( netcode > 0 || multiHighlight ) else if( netcode > 0 || multiHighlight )
{ {
@ -645,13 +645,11 @@ void PCB_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
if( selectConnections ) if( selectConnections )
{ {
GetToolManager()->RunAction( PCB_ACTIONS::syncSelectionWithNets, true, GetToolManager()->RunAction( PCB_ACTIONS::syncSelectionWithNets, true, &items );
static_cast<void*>( &items ) );
} }
else else
{ {
GetToolManager()->RunAction( PCB_ACTIONS::syncSelection, true, GetToolManager()->RunAction( PCB_ACTIONS::syncSelection, true, &items );
static_cast<void*>( &items ) );
} }
// Update 3D viewer highlighting // Update 3D viewer highlighting

4
pcbnew/router/router_tool.cpp
View File

@ -1038,7 +1038,7 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
// Otherwise it is one of the router-specific via commands // Otherwise it is one of the router-specific via commands
if( targetLayer == UNDEFINED_LAYER ) if( targetLayer == UNDEFINED_LAYER )
{ {
const int actViaFlags = aEvent.Parameter<int>(); const int actViaFlags = static_cast<int>( aEvent.Parameter<VIA_ACTION_FLAGS>() );
selectLayer = actViaFlags & VIA_ACTION_FLAGS::SELECT_LAYER; selectLayer = actViaFlags & VIA_ACTION_FLAGS::SELECT_LAYER;
viaType = getViaTypeFromFlags( actViaFlags ); viaType = getViaTypeFromFlags( actViaFlags );
@ -2234,7 +2234,7 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
p = controls()->GetCursorPosition(); p = controls()->GetCursorPosition();
} }
int dragMode = aEvent.Parameter<int64_t> (); int dragMode = aEvent.Parameter<int> ();
bool dragStarted = m_router->StartDragging( p, itemsToDrag, dragMode ); bool dragStarted = m_router->StartDragging( p, itemsToDrag, dragMode );

4
pcbnew/tools/board_editor_control.cpp
View File

@ -1481,7 +1481,7 @@ int BOARD_EDITOR_CONTROL::AssignNetclass( const TOOL_EVENT& aEvent )
}, },
true /* prompt user regarding locked items */ ); true /* prompt user regarding locked items */ );
intptr_t netCode = -1; int netCode = -1;
wxString netName; wxString netName;
for( EDA_ITEM* item : selection ) for( EDA_ITEM* item : selection )
@ -1503,7 +1503,7 @@ int BOARD_EDITOR_CONTROL::AssignNetclass( const TOOL_EVENT& aEvent )
} }
selectionTool->ClearSelection(); selectionTool->ClearSelection();
m_toolMgr->RunAction( PCB_ACTIONS::selectNet, true, (void*) netCode ); m_toolMgr->RunAction( PCB_ACTIONS::selectNet, true, netCode );
canvas()->ForceRefresh(); canvas()->ForceRefresh();
DIALOG_ASSIGN_NETCLASS dlg( m_frame, netName, board()->GetNetClassAssignmentCandidates(), DIALOG_ASSIGN_NETCLASS dlg( m_frame, netName, board()->GetNetClassAssignmentCandidates(),

2
pcbnew/tools/board_inspection_tool.cpp
View File

@ -1519,7 +1519,7 @@ int BOARD_INSPECTION_TOOL::HighlightItem( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
if( item ) if( item )
m_toolMgr->RunAction( PCB_ACTIONS::selectItem, true, (void*) item ); m_toolMgr->RunAction( PCB_ACTIONS::selectItem, true, item );
} }
m_frame->m_probingSchToPcb = false; m_frame->m_probingSchToPcb = false;

5
pcbnew/tools/edit_tool.cpp
View File

@ -283,7 +283,7 @@ int EDIT_TOOL::GetAndPlace( const TOOL_EVENT& aEvent )
if( fp ) if( fp )
{ {
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
m_toolMgr->RunAction( PCB_ACTIONS::selectItem, true, (void*) fp ); m_toolMgr->RunAction( PCB_ACTIONS::selectItem, true, fp );
selectionTool->GetSelection().SetReferencePoint( fp->GetPosition() ); selectionTool->GetSelection().SetReferencePoint( fp->GetPosition() );
m_toolMgr->RunAction( PCB_ACTIONS::move, false ); m_toolMgr->RunAction( PCB_ACTIONS::move, false );
@ -314,8 +314,7 @@ bool EDIT_TOOL::invokeInlineRouter( int aDragMode )
if( theRouter->CanInlineDrag( aDragMode ) ) if( theRouter->CanInlineDrag( aDragMode ) )
{ {
m_toolMgr->RunAction( PCB_ACTIONS::routerInlineDrag, true, m_toolMgr->RunAction( PCB_ACTIONS::routerInlineDrag, true, aDragMode );
static_cast<intptr_t>( aDragMode ) );
return true; return true;
} }

3
pcbnew/widgets/appearance_controls.cpp
View File

@ -3194,8 +3194,7 @@ void APPEARANCE_CONTROLS::onNetclassContextMenu( wxCommandEvent& aEvent )
runOnNetsOfClass( m_contextMenuNetclass, runOnNetsOfClass( m_contextMenuNetclass,
[&]( NETINFO_ITEM* aItem ) [&]( NETINFO_ITEM* aItem )
{ {
toolMgr->RunAction( action, true, toolMgr->RunAction( action, true, aItem->GetNetCode() );
static_cast<intptr_t>( aItem->GetNetCode() ) );
} ); } );
} }
break; break;