From 2f7094b352387b195484351c42c13f45f0b97e52 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 24 Aug 2020 01:51:23 +0100 Subject: [PATCH] Cleanup some unused variables * Make the app progress indicator only have the indeterminate state when the taskbar indicator is used (causes an uused variable warning on wx<3.1) * Remove unused dry run variable in pcb_netlist.h * Remove unused forceDropAnnotations from the paste special dialog since the dialog only controls keeping them. --- common/widgets/app_progress_dialog.cpp | 10 ++++++---- eeschema/dialogs/dialog_paste_special.cpp | 5 ++--- eeschema/dialogs/dialog_paste_special.h | 3 +-- eeschema/erc.cpp | 4 ++-- eeschema/tools/sch_editor_control.cpp | 10 +++------- include/widgets/app_progress_dialog.h | 6 +++--- pcbnew/netlist_reader/pcb_netlist.h | 5 ----- 7 files changed, 17 insertions(+), 26 deletions(-) diff --git a/common/widgets/app_progress_dialog.cpp b/common/widgets/app_progress_dialog.cpp index 96877afd71..8a6fa0fcbb 100644 --- a/common/widgets/app_progress_dialog.cpp +++ b/common/widgets/app_progress_dialog.cpp @@ -21,18 +21,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include APP_PROGRESS_DIALOG::APP_PROGRESS_DIALOG( const wxString& aTitle, const wxString& aMessage, int aMaximum, wxWindow* aParent, bool aIndeterminateTaskBarStatus, int aStyle ) - : wxProgressDialog( aTitle, aMessage, aMaximum, aParent, aStyle ), + : wxProgressDialog( aTitle, aMessage, aMaximum, aParent, aStyle ) #if wxCHECK_VERSION( 3, 1, 0 ) + , m_appProgressIndicator( aParent, aMaximum ), -#endif m_indeterminateTaskBarStatus( aIndeterminateTaskBarStatus ) +#endif + { #if wxCHECK_VERSION( 3, 1, 0 ) if( m_indeterminateTaskBarStatus ) @@ -53,4 +55,4 @@ bool APP_PROGRESS_DIALOG::Update( int aValue, const wxString& aNewMsg, bool* aSk #endif return wxProgressDialog::Update( aValue, aNewMsg, aSkip ); -} \ No newline at end of file +} diff --git a/eeschema/dialogs/dialog_paste_special.cpp b/eeschema/dialogs/dialog_paste_special.cpp index ff05627080..5f321c98a7 100644 --- a/eeschema/dialogs/dialog_paste_special.cpp +++ b/eeschema/dialogs/dialog_paste_special.cpp @@ -27,10 +27,9 @@ static bool g_keepAnnotations = true; -DIALOG_PASTE_SPECIAL::DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeep, bool* aDrop ) : +DIALOG_PASTE_SPECIAL::DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeep ) : DIALOG_PASTE_SPECIAL_BASE( parent ), - m_keep( aKeep ), - m_drop( aDrop ) + m_keep( aKeep ) { // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); diff --git a/eeschema/dialogs/dialog_paste_special.h b/eeschema/dialogs/dialog_paste_special.h index 404ae1f58d..6b94e6a0d1 100644 --- a/eeschema/dialogs/dialog_paste_special.h +++ b/eeschema/dialogs/dialog_paste_special.h @@ -36,14 +36,13 @@ class DIALOG_PASTE_SPECIAL : public DIALOG_PASTE_SPECIAL_BASE { public: - DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeepAnnotations, bool* aDropAnnotations ); + DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeepAnnotations ); bool TransferDataToWindow() override; bool TransferDataFromWindow() override; private: bool* m_keep; - bool* m_drop; }; #endif // DIALOG_PASTE_SPECIAL_H diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp index 4117ada39d..5e098fefd9 100644 --- a/eeschema/erc.cpp +++ b/eeschema/erc.cpp @@ -192,9 +192,9 @@ void ERC_TESTER::TestTextVars( KIGFX::WS_PROXY_VIEW_ITEM* aWorksheet ) } else if( item->Type() == SCH_SHEET_T ) { - SCH_SHEET* sheet = static_cast( item ); + SCH_SHEET* subSheet = static_cast( item ); - for( SCH_FIELD& field : sheet->GetFields() ) + for( SCH_FIELD& field : subSheet->GetFields() ) { if( unresolved( field.GetShownText() ) ) { diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp index eed211faeb..103ea0eb2b 100644 --- a/eeschema/tools/sch_editor_control.cpp +++ b/eeschema/tools/sch_editor_control.cpp @@ -1330,20 +1330,16 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent ) } bool forceKeepAnnotations = false; - bool forceDropAnnotations = true; - bool dropAnnotations = false; + bool dropAnnotations = true; if( aEvent.IsAction( &ACTIONS::pasteSpecial ) ) { - DIALOG_PASTE_SPECIAL dlg( m_frame, &forceKeepAnnotations, &forceDropAnnotations ); + DIALOG_PASTE_SPECIAL dlg( m_frame, &forceKeepAnnotations ); if( dlg.ShowModal() == wxID_CANCEL ) return 0; } - if( forceDropAnnotations ) - dropAnnotations = true; - // SCH_SEXP_PLUGIN added the items to the paste screen, but not to the view or anything // else. Pull them back out to start with. // @@ -1481,7 +1477,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent ) // reference default value and takes the latest displayed value existingScreen->EnsureAlternateReferencesExist(); - if( forceDropAnnotations || dropSheetAnnotations ) + if( dropSheetAnnotations ) existingScreen->ClearAnnotation( &sheetpath ); } else diff --git a/include/widgets/app_progress_dialog.h b/include/widgets/app_progress_dialog.h index 1ceb17e3e0..01c31a8cc7 100644 --- a/include/widgets/app_progress_dialog.h +++ b/include/widgets/app_progress_dialog.h @@ -39,15 +39,15 @@ public: wxWindow* aParent = NULL, bool aIndeterminateTaskBarStatus = false, int aStyle = wxPD_APP_MODAL | wxPD_AUTO_HIDE ); - virtual bool Update( - int aValue, const wxString& aNewMsg = wxEmptyString, bool* aSkip = NULL ) override; + virtual bool Update( int aValue, const wxString& aNewMsg = wxEmptyString, + bool* aSkip = NULL ) override; private: #if wxCHECK_VERSION( 3, 1, 0 ) wxAppProgressIndicator m_appProgressIndicator; -#endif bool m_indeterminateTaskBarStatus; +#endif }; #endif diff --git a/pcbnew/netlist_reader/pcb_netlist.h b/pcbnew/netlist_reader/pcb_netlist.h index 7a07be5a56..28d10d1f0a 100644 --- a/pcbnew/netlist_reader/pcb_netlist.h +++ b/pcbnew/netlist_reader/pcb_netlist.h @@ -198,10 +198,6 @@ class NETLIST /// Remove footprints from #BOARD not found in netlist when true. bool m_deleteExtraFootprints; - /// Do not actually make any changes. Only report changes to #BOARD from netlist - /// when true. - bool m_isDryRun; - /// Find component by time stamp if true or reference designator if false. bool m_findByTimeStamp; @@ -211,7 +207,6 @@ class NETLIST public: NETLIST() : m_deleteExtraFootprints( false ), - m_isDryRun( false ), m_findByTimeStamp( false ), m_replaceFootprints( false ) {