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

pcbnew: Clean unused lambda includes

This commit is contained in:
Seth Hillbrand 2019-12-12 05:52:32 -08:00
parent c4d1cebbdd
commit 0e1a274f0c
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pcbnew/menubar_pcb_editor.cpp
View File

@ -245,55 +245,72 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// //
CONDITIONAL_MENU* viewMenu = new CONDITIONAL_MENU( false, selTool ); CONDITIONAL_MENU* viewMenu = new CONDITIONAL_MENU( false, selTool );
auto layersPaletteShownCondition = [ this ] ( const SELECTION& aSel ) { auto layersPaletteShownCondition = [ this ]( const SELECTION &aSel )
{
return LayerManagerShown(); return LayerManagerShown();
}; };
auto microwaveToolbarShownCondition = [ this ] ( const SELECTION& aSel ) { auto microwaveToolbarShownCondition = [ this ]( const SELECTION &aSel )
{
return MicrowaveToolbarShown(); return MicrowaveToolbarShown();
}; };
auto gridShownCondition = [ this ] ( const SELECTION& aSel ) { auto gridShownCondition = [ this ]( const SELECTION &aSel )
{
return IsGridVisible(); return IsGridVisible();
}; };
auto polarCoordsCondition = [ this ] ( const SELECTION& aSel ) { auto polarCoordsCondition = [ this ]( const SELECTION &aSel )
{
return GetShowPolarCoords(); return GetShowPolarCoords();
}; };
auto imperialUnitsCondition = [ this ] ( const SELECTION& aSel ) { auto imperialUnitsCondition = [ this ]( const SELECTION &aSel )
{
return GetUserUnits() == INCHES; return GetUserUnits() == INCHES;
}; };
auto metricUnitsCondition = [ this ] ( const SELECTION& aSel ) { auto metricUnitsCondition = [ this ]( const SELECTION &aSel )
{
return GetUserUnits() == MILLIMETRES; return GetUserUnits() == MILLIMETRES;
}; };
auto fullCrosshairCondition = [ this ] ( const SELECTION& aSel ) { auto fullCrosshairCondition = [ this ]( const SELECTION &aSel )
{
return GetGalDisplayOptions().m_fullscreenCursor; return GetGalDisplayOptions().m_fullscreenCursor;
}; };
auto ratsnestShownCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto ratsnestShownCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return disp_opt.m_ShowGlobalRatsnest; return disp_opt.m_ShowGlobalRatsnest;
}; };
auto curvedRatsnestCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto curvedRatsnestCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return disp_opt.m_DisplayRatsnestLinesCurved; return disp_opt.m_DisplayRatsnestLinesCurved;
}; };
auto boardFlippedCondition = [ this ] ( const SELECTION& aSel ) { auto boardFlippedCondition = [ this ]( const SELECTION &aSel )
{
return GetCanvas()->GetView()->IsMirroredX(); return GetCanvas()->GetView()->IsMirroredX();
}; };
auto zonesFilledCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto zonesFilledCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return disp_opt.m_DisplayZonesMode == 0; return disp_opt.m_DisplayZonesMode == 0;
}; };
auto zonesWireframedCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto zonesWireframedCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return disp_opt.m_DisplayZonesMode == 1; return disp_opt.m_DisplayZonesMode == 1;
}; };
auto zonesOutlinedCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto zonesOutlinedCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return disp_opt.m_DisplayZonesMode == 2; return disp_opt.m_DisplayZonesMode == 2;
}; };
auto sketchTracksCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto sketchTracksCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return !disp_opt.m_DisplayPcbTrackFill; return !disp_opt.m_DisplayPcbTrackFill;
}; };
auto sketchViasCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto sketchViasCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return !disp_opt.m_DisplayViaFill; return !disp_opt.m_DisplayViaFill;
}; };
auto sketchPadsCondition = [ this, disp_opt ] ( const SELECTION& aSel ) { auto sketchPadsCondition = [ disp_opt ]( const SELECTION &aSel )
{
return !disp_opt.m_DisplayPadFill; return !disp_opt.m_DisplayPadFill;
}; };
auto contrastModeCondition = [ this, &disp_opt ] ( const SELECTION& aSel ) { auto contrastModeCondition = [ &disp_opt ]( const SELECTION &aSel )
{
return !disp_opt.m_ContrastModeDisplay; return !disp_opt.m_ContrastModeDisplay;
}; };