From 1c138b4f3e8b4a0daf0576eade95d805ae5d059f Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 12 Jun 2023 21:47:56 +0100 Subject: [PATCH] Rename function in Footprint wizard to prevent impoper override The ReloadFootprint function now exists in the base class with 1 argument, but this frame already had a similar function with no arguments. Rename this one to RegenerateFootprint to prevent warnings. --- pcbnew/footprint_wizard_frame.h | 4 ++-- pcbnew/footprint_wizard_frame_functions.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pcbnew/footprint_wizard_frame.h b/pcbnew/footprint_wizard_frame.h index 89e35e1d32..ddc26ca558 100644 --- a/pcbnew/footprint_wizard_frame.h +++ b/pcbnew/footprint_wizard_frame.h @@ -126,9 +126,9 @@ private: void SelectFootprintWizard(); /** - * Reload the current footprint. + * Regenerate the current footprint. */ - void ReloadFootprint(); + void RegenerateFootprint(); /** * Display the message generated by the python build footprint script. diff --git a/pcbnew/footprint_wizard_frame_functions.cpp b/pcbnew/footprint_wizard_frame_functions.cpp index 4dc604c773..d6a6101e8c 100644 --- a/pcbnew/footprint_wizard_frame_functions.cpp +++ b/pcbnew/footprint_wizard_frame_functions.cpp @@ -92,7 +92,7 @@ void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos() } -void FOOTPRINT_WIZARD_FRAME::ReloadFootprint() +void FOOTPRINT_WIZARD_FRAME::RegenerateFootprint() { FOOTPRINT_WIZARD* footprintWizard = GetMyWizard(); @@ -183,7 +183,7 @@ void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard() m_wizardDescription.Empty(); } - ReloadFootprint(); + RegenerateFootprint(); Zoom_Automatique( false ); DisplayWizardInfos(); ReCreatePageList(); @@ -208,7 +208,7 @@ void FOOTPRINT_WIZARD_FRAME::DefaultParameters( wxCommandEvent& event ) // Reload ReCreateParameterList(); - ReloadFootprint(); + RegenerateFootprint(); DisplayWizardInfos(); } @@ -255,7 +255,7 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event ) if( !res.IsEmpty() ) wxMessageBox( res ); - ReloadFootprint(); + RegenerateFootprint(); DisplayWizardInfos(); // The python script can have modified some other parameters.