diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp index 2d72a7aa4d..10c3eb2cc4 100644 --- a/bitmap2component/bitmap2cmp_gui.cpp +++ b/bitmap2component/bitmap2cmp_gui.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 1992-2010 jean-pierre.charras - * Copyright (C) 1992-2020 Kicad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -201,7 +201,7 @@ BM2CMP_FRAME::~BM2CMP_FRAME() * This needed for OSX: avoids further OnDraw processing after this * destructor and before the native window is destroyed */ - this->Freeze( ); + Freeze(); } diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp index 63f23f114f..98761cbc6f 100644 --- a/common/dialog_about/dialog_about.cpp +++ b/common/dialog_about/dialog_about.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 Rafael Sokolowski - * Copyright (C) 2017-2020 KiCad Developers, see CHANGELOG.TXT for contributors. + * Copyright (C) 2017-2021 KiCad Developers, see CHANGELOG.TXT for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -398,7 +398,7 @@ void DIALOG_ABOUT::createNotebookHtmlPage( wxNotebook* aParent, const wxString& // to have a unique look background color for HTML pages is set to the default as it is // used for all the other widgets - wxString htmlColor = ( this->GetBackgroundColour() ).GetAsString( wxC2S_HTML_SYNTAX ); + wxString htmlColor = ( GetBackgroundColour() ).GetAsString( wxC2S_HTML_SYNTAX ); wxString textColor = GetForegroundColour().GetAsString( wxC2S_HTML_SYNTAX ); wxString linkColor = wxSystemSettings::GetColour( wxSYS_COLOUR_HOTLIGHT ).GetAsString( wxC2S_HTML_SYNTAX ); @@ -419,7 +419,7 @@ void DIALOG_ABOUT::createNotebookHtmlPage( wxNotebook* aParent, const wxString& // HTML font set to font properties as they are used for widgets to have an unique look // under different platforms with HTML - wxFont font = this->GetFont(); + wxFont font = GetFont(); htmlWindow->SetStandardFonts( font.GetPointSize(), font.GetFaceName(), font.GetFaceName() ); htmlWindow->SetPage( htmlPage ); diff --git a/common/dialogs/panel_setup_severities.cpp b/common/dialogs/panel_setup_severities.cpp index 018acacd4c..f7da221034 100644 --- a/common/dialogs/panel_setup_severities.cpp +++ b/common/dialogs/panel_setup_severities.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -141,8 +141,8 @@ PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent, gridSizer->Fit( scrollWin ); panelSizer->Add( scrollWin, 1, wxEXPAND | wxALL, 5 ); - this->SetSizer( panelSizer ); - this->Layout(); + SetSizer( panelSizer ); + Layout(); panelSizer->Fit( this ); } diff --git a/common/page_layout/ws_data_item.cpp b/common/page_layout/ws_data_item.cpp index c8509c4515..80e526279f 100644 --- a/common/page_layout/ws_data_item.cpp +++ b/common/page_layout/ws_data_item.cpp @@ -2,8 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 1992-2013 Jean-Pierre Charras . - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. - * + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -715,7 +714,7 @@ void WS_DATA_ITEM_TEXT::SetConstrainedTextSize() int linewidth = 0; size_micron.x = KiROUND( m_ConstrainedTextSize.x * FSCALE ); size_micron.y = KiROUND( m_ConstrainedTextSize.y * FSCALE ); - WS_DRAW_ITEM_TEXT dummy( WS_DRAW_ITEM_TEXT( this, 0, this->m_FullText, wxPoint( 0, 0 ), + WS_DRAW_ITEM_TEXT dummy( WS_DRAW_ITEM_TEXT( this, 0, m_FullText, wxPoint( 0, 0 ), size_micron, linewidth, m_Italic, m_Bold ) ); dummy.SetMultilineAllowed( true ); dummy.SetHorizJustify( m_Hjustify ) ; diff --git a/common/settings/json_settings.cpp b/common/settings/json_settings.cpp index a8bc2783be..dc7c0ca366 100644 --- a/common/settings/json_settings.cpp +++ b/common/settings/json_settings.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2020 Jon Evans - * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -424,11 +424,11 @@ OPT JSON_SETTINGS::GetJson( const std::string& aPath ) const { nlohmann::json::json_pointer ptr = PointerFromString( aPath ); - if( this->contains( ptr ) ) + if( contains( ptr ) ) { try { - return OPT{ this->at( ptr ) }; + return OPT{ at( ptr ) }; } catch( ... ) { diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp index 8591d25837..3411f78fd3 100644 --- a/common/tool/tool_manager.cpp +++ b/common/tool/tool_manager.cpp @@ -135,12 +135,12 @@ struct TOOL_MANAGER::TOOL_STATE bool operator==( const TOOL_MANAGER::TOOL_STATE& aRhs ) const { - return aRhs.theTool == this->theTool; + return aRhs.theTool == theTool; } bool operator!=( const TOOL_MANAGER::TOOL_STATE& aRhs ) const { - return aRhs.theTool != this->theTool; + return aRhs.theTool != theTool; } /** diff --git a/common/widgets/bitmap_button.cpp b/common/widgets/bitmap_button.cpp index d0ded923c9..9f98d9ac08 100644 --- a/common/widgets/bitmap_button.cpp +++ b/common/widgets/bitmap_button.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2020 Ian McInerney - * Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2020-2021 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -103,7 +103,7 @@ void BITMAP_BUTTON::OnLeftButtonUp( wxMouseEvent& aEvent ) pEventHandler->CallAfter( [=]() { - wxCommandEvent evt( wxEVT_BUTTON, this->GetId() ); + wxCommandEvent evt( wxEVT_BUTTON, GetId() ); evt.SetEventObject( this ); GetEventHandler()->ProcessEvent( evt ); } ); diff --git a/common/widgets/button_row_panel.cpp b/common/widgets/button_row_panel.cpp index 3b5fae2d45..c34f6ebf24 100644 --- a/common/widgets/button_row_panel.cpp +++ b/common/widgets/button_row_panel.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 1992-2018 Kicad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -42,8 +42,8 @@ BUTTON_ROW_PANEL::BUTTON_ROW_PANEL( wxWindow* aWindow, addButtons( false, aRightBtns ); - this->SetSizer( m_sizer ); - this->Layout(); + SetSizer( m_sizer ); + Layout(); } @@ -73,4 +73,4 @@ void BUTTON_ROW_PANEL::addButtons( bool aLeft, const BTN_DEF_LIST& aDefs ) btn->Bind( wxEVT_COMMAND_BUTTON_CLICKED, def.m_callback ); } -} \ No newline at end of file +} diff --git a/common/widgets/split_button.cpp b/common/widgets/split_button.cpp index 34b659f9ba..d00019d9b5 100644 --- a/common/widgets/split_button.cpp +++ b/common/widgets/split_button.cpp @@ -1,8 +1,9 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors. - * Copyright (C) 2016 Anil8735(https://stackoverflow.com/users/3659387/anil8753) from https://stackoverflow.com/a/37274011 + * Copyright (C) 2016 Anil8735(https://stackoverflow.com/users/3659387/anil8753) + * from https://stackoverflow.com/a/37274011 + * Copyright (C) 2020-2021 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -142,7 +143,7 @@ void SPLIT_BUTTON::OnLeftButtonUp( wxMouseEvent& aEvent ) pEventHandler->CallAfter( [=]() { - wxCommandEvent evt( wxEVT_BUTTON, this->GetId() ); + wxCommandEvent evt( wxEVT_BUTTON, GetId() ); evt.SetEventObject( this ); GetEventHandler()->ProcessEvent( evt ); } ); @@ -255,4 +256,4 @@ bool SPLIT_BUTTON::Enable( bool aEnable ) Refresh(); return aEnable; -} \ No newline at end of file +} diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp index 85a05263ab..76f03d4460 100644 --- a/cvpcb/cvpcb_mainframe.cpp +++ b/cvpcb/cvpcb_mainframe.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2011 Wayne Stambaugh - * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -327,7 +327,7 @@ void CVPCB_MAINFRAME::setupEventHandlers() [this]( wxCommandEvent& ) { // saveAssociations must be run immediately - this->GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociations, true ); + GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociations, true ); } ); // Connect the handlers for the ok/cancel buttons @@ -335,7 +335,7 @@ void CVPCB_MAINFRAME::setupEventHandlers() [this]( wxCommandEvent& ) { // saveAssociations must be run immediately, before running Close( true ) - this->GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociations, true ); + GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociations, true ); Close( true ); }, wxID_OK ); Bind( wxEVT_BUTTON, diff --git a/demos/simulation/sallen_key/sallen_key.kicad_pro b/demos/simulation/sallen_key/sallen_key.kicad_pro index 3c1d2b8254..d59f7569e8 100644 --- a/demos/simulation/sallen_key/sallen_key.kicad_pro +++ b/demos/simulation/sallen_key/sallen_key.kicad_pro @@ -2,25 +2,119 @@ "board": { "design_settings": { "defaults": { - "board_outline_line_width": 0.1, - "copper_line_width": 0.2, + "board_outline_line_width": 0.09999999999999999, + "copper_line_width": 0.19999999999999998, + "copper_text_italic": false, "copper_text_size_h": 1.5, "copper_text_size_v": 1.5, "copper_text_thickness": 0.3, + "copper_text_upright": false, + "courtyard_line_width": 0.049999999999999996, + "dimension_precision": 4, + "dimension_units": 3, + "dimensions": { + "arrow_length": 1270000, + "extension_offset": 500000, + "keep_text_aligned": true, + "suppress_zeroes": false, + "text_position": 0, + "units_format": 1 + }, + "fab_line_width": 0.09999999999999999, + "fab_text_italic": false, + "fab_text_size_h": 1.0, + "fab_text_size_v": 1.0, + "fab_text_thickness": 0.15, + "fab_text_upright": false, "other_line_width": 0.15, + "other_text_italic": false, + "other_text_size_h": 1.0, + "other_text_size_v": 1.0, + "other_text_thickness": 0.15, + "other_text_upright": false, + "pads": { + "drill": 0.762, + "height": 1.524, + "width": 1.524 + }, "silk_line_width": 0.15, + "silk_text_italic": false, "silk_text_size_h": 1.0, "silk_text_size_v": 1.0, - "silk_text_thickness": 0.15 + "silk_text_thickness": 0.15, + "silk_text_upright": false, + "zones": { + "45_degree_only": false, + "min_clearance": 0.508 + } }, "diff_pair_dimensions": [], "drc_exclusions": [], + "meta": { + "version": 1 + }, + "rule_severities": { + "annular_width": "error", + "clearance": "error", + "copper_edge_clearance": "error", + "courtyards_overlap": "error", + "diff_pair_gap_out_of_range": "error", + "diff_pair_uncoupled_length_too_long": "error", + "drill_out_of_range": "error", + "duplicate_footprints": "warning", + "extra_footprint": "warning", + "hole_clearance": "error", + "hole_near_hole": "error", + "invalid_outline": "error", + "item_on_disabled_layer": "error", + "items_not_allowed": "error", + "length_out_of_range": "error", + "malformed_courtyard": "error", + "microvia_drill_out_of_range": "error", + "missing_courtyard": "ignore", + "missing_footprint": "warning", + "net_conflict": "warning", + "npth_inside_courtyard": "ignore", + "padstack": "error", + "pth_inside_courtyard": "ignore", + "shorting_items": "error", + "silk_over_copper": "error", + "silk_overlap": "error", + "skew_out_of_range": "error", + "too_many_vias": "error", + "track_dangling": "warning", + "track_width": "error", + "tracks_crossing": "error", + "unconnected_items": "error", + "unresolved_variable": "error", + "via_dangling": "warning", + "zone_has_empty_net": "error", + "zones_intersect": "error" + }, "rules": { + "allow_blind_buried_vias": false, + "allow_microvias": false, + "max_error": 0.005, + "min_clearance": 0.0, + "min_copper_edge_clearance": 0.01, + "min_hole_clearance": 0.0, + "min_hole_to_hole": 0.25, + "min_microvia_diameter": 0.19999999999999998, + "min_microvia_drill": 0.09999999999999999, + "min_silk_clearance": 0.0, + "min_through_hole_diameter": 0.3, + "min_track_width": 0.19999999999999998, + "min_via_annular_width": 0.049999999999999996, + "min_via_diameter": 0.39999999999999997, "solder_mask_clearance": 0.0, - "solder_mask_min_width": 0.0 + "solder_mask_min_width": 0.0, + "solder_paste_clearance": 0.0, + "solder_paste_margin_ratio": 0.0 }, "track_widths": [], - "via_dimensions": [] + "via_dimensions": [], + "zones_allow_external_fillets": false, + "zones_use_no_outline": true }, "layer_presets": [] }, diff --git a/eeschema/dialogs/dialog_update_from_pcb.cpp b/eeschema/dialogs/dialog_update_from_pcb.cpp index 46db3f3ce6..bacc9e601d 100644 --- a/eeschema/dialogs/dialog_update_from_pcb.cpp +++ b/eeschema/dialogs/dialog_update_from_pcb.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2019 Alexander Shuklin - * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -75,7 +75,7 @@ void DIALOG_UPDATE_FROM_PCB::updateData() { bool successfulRun = false; m_messagePanel->Clear(); - BACK_ANNOTATE backAnno( this->m_frame, + BACK_ANNOTATE backAnno( m_frame, m_messagePanel->Reporter(), m_cbRelinkFootprints->GetValue(), m_cbUpdateFootprints->GetValue(), diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp index 57427b235e..41997be091 100644 --- a/eeschema/hierarch.cpp +++ b/eeschema/hierarch.cpp @@ -148,7 +148,7 @@ HIERARCHY_NAVIG_DLG::~HIERARCHY_NAVIG_DLG() Unbind( wxEVT_TREE_ITEM_ACTIVATED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); Unbind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); m_Tree->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HIERARCHY_TREE::onChar ) ); - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); + Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); } diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp index 293a15079e..2d248aa29f 100644 --- a/pcbnew/board.cpp +++ b/pcbnew/board.cpp @@ -5,7 +5,7 @@ * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2011 Wayne Stambaugh * - * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -868,7 +868,7 @@ BOARD_ITEM* BOARD::GetItem( const KIID& aID ) const void BOARD::FillItemMap( std::map& aMap ) { // the board itself - aMap[ this->m_Uuid ] = this; + aMap[ m_Uuid ] = this; for( TRACK* track : Tracks() ) aMap[ track->m_Uuid ] = track; diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp index 63cdcc6cd0..3532235fc6 100644 --- a/pcbnew/cross-probing.cpp +++ b/pcbnew/cross-probing.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -510,7 +510,7 @@ void PCB_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) NETLIST netlist; STRING_FORMATTER sf; - for( FOOTPRINT* footprint : this->GetBoard()->Footprints() ) + for( FOOTPRINT* footprint : GetBoard()->Footprints() ) { if( footprint->GetAttributes() & FP_BOARD_ONLY ) continue; // Don't add board-only footprints to the netlist diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp index 8f99651596..1566a476f2 100644 --- a/pcbnew/footprint_info_impl.cpp +++ b/pcbnew/footprint_info_impl.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2011 Jean-Pierre Charras, * Copyright (C) 2013-2016 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -258,7 +258,7 @@ bool FOOTPRINT_LIST_IMPL::joinWorkers() threads.emplace_back( [this, &queue_parsed]() { wxString nickname; - while( this->m_queue_out.pop( nickname ) && !m_cancelled ) + while( m_queue_out.pop( nickname ) && !m_cancelled ) { wxArrayString fpnames; diff --git a/pcbnew/pcb_group.cpp b/pcbnew/pcb_group.cpp index 5e0b348574..770c68645b 100644 --- a/pcbnew/pcb_group.cpp +++ b/pcbnew/pcb_group.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2020 Joshua Redstone redstone at gmail.com - * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -153,7 +153,7 @@ PCB_GROUP* PCB_GROUP::DeepClone() const PCB_GROUP* PCB_GROUP::DeepDuplicate() const { - PCB_GROUP* newGroup = static_cast( this->Duplicate() ); + PCB_GROUP* newGroup = static_cast( Duplicate() ); newGroup->m_items.clear(); for( BOARD_ITEM* member : m_items ) diff --git a/pcbnew/swig/pcbnew_action_plugins.cpp b/pcbnew/swig/pcbnew_action_plugins.cpp index 09b1b9047d..c93ab5b4e0 100644 --- a/pcbnew/swig/pcbnew_action_plugins.cpp +++ b/pcbnew/swig/pcbnew_action_plugins.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2017-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -36,7 +36,7 @@ PYTHON_ACTION_PLUGIN::PYTHON_ACTION_PLUGIN( PyObject* aAction ) { PyLOCK lock; - this->m_PyAction = aAction; + m_PyAction = aAction; Py_XINCREF( aAction ); } @@ -45,7 +45,7 @@ PYTHON_ACTION_PLUGIN::~PYTHON_ACTION_PLUGIN() { PyLOCK lock; - Py_XDECREF( this->m_PyAction ); + Py_XDECREF( m_PyAction ); } @@ -55,7 +55,7 @@ PyObject* PYTHON_ACTION_PLUGIN::CallMethod( const char* aMethod, PyObject* aArgl PyErr_Clear(); // pFunc is a new reference to the desired method - PyObject* pFunc = PyObject_GetAttrString( this->m_PyAction, aMethod ); + PyObject* pFunc = PyObject_GetAttrString( m_PyAction, aMethod ); if( pFunc && PyCallable_Check( pFunc ) ) { diff --git a/pcbnew/swig/pcbnew_footprint_wizards.cpp b/pcbnew/swig/pcbnew_footprint_wizards.cpp index 5a6dee1034..d30cfb3aad 100644 --- a/pcbnew/swig/pcbnew_footprint_wizards.cpp +++ b/pcbnew/swig/pcbnew_footprint_wizards.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2013 NBEE Embedded Systems SL, Miguel Angel Ajo - * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2016-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -37,7 +37,7 @@ PYTHON_FOOTPRINT_WIZARD::PYTHON_FOOTPRINT_WIZARD( PyObject* aWizard ) { PyLOCK lock; - this->m_PyWizard = aWizard; + m_PyWizard = aWizard; Py_XINCREF( aWizard ); } @@ -46,7 +46,7 @@ PYTHON_FOOTPRINT_WIZARD::~PYTHON_FOOTPRINT_WIZARD() { PyLOCK lock; - Py_XDECREF( this->m_PyWizard ); + Py_XDECREF( m_PyWizard ); } @@ -56,7 +56,7 @@ PyObject* PYTHON_FOOTPRINT_WIZARD::CallMethod( const char* aMethod, PyObject* aA PyErr_Clear(); // pFunc is a new reference to the desired method - PyObject* pFunc = PyObject_GetAttrString( this->m_PyWizard, aMethod ); + PyObject* pFunc = PyObject_GetAttrString( m_PyWizard, aMethod ); if( pFunc && PyCallable_Check( pFunc ) ) {