From ad088db6d2d36f9c6667cc0b350f4692d82e8c78 Mon Sep 17 00:00:00 2001 From: Simon Richter Date: Sun, 25 Sep 2016 19:06:49 +0200 Subject: [PATCH] Add more "override" markers. --- bitmap2component/bitmap2cmp_gui.cpp | 4 +- common/single_top.cpp | 6 +- cvpcb/class_DisplayFootprintsFrame.h | 6 +- cvpcb/cvpcb.cpp | 4 +- cvpcb/cvpcb_mainframe.h | 8 +- .../dialogs/fp_conflict_assignment_selector.h | 4 +- eeschema/class_libentry.h | 8 +- eeschema/class_sch_screen.h | 4 +- .../dialog_edit_component_in_schematic.cpp | 2 +- eeschema/dialogs/dialog_edit_label.cpp | 2 +- eeschema/dialogs/dialog_edit_one_field.h | 6 +- .../dialogs/dialog_lib_edit_pin_table.cpp | 14 ++-- eeschema/dialogs/dialog_lib_new_component.h | 4 +- .../dialogs/dialog_print_using_printer.cpp | 4 +- eeschema/eeschema.cpp | 4 +- eeschema/lib_arc.h | 16 ++-- eeschema/lib_bezier.h | 14 ++-- eeschema/lib_circle.h | 16 ++-- eeschema/lib_draw_item.h | 6 +- eeschema/lib_field.h | 16 ++-- eeschema/lib_pin.h | 14 ++-- eeschema/lib_polyline.h | 16 ++-- eeschema/lib_rectangle.h | 16 ++-- eeschema/lib_text.h | 16 ++-- eeschema/libeditframe.h | 4 +- .../netlist_exporter_kicad.h | 2 +- eeschema/project_rescue.cpp | 22 ++--- eeschema/sch_base_frame.h | 22 ++--- eeschema/sch_bitmap.h | 18 ++--- eeschema/sch_bus_entry.h | 22 ++--- eeschema/sch_component.h | 24 +++--- eeschema/sch_field.h | 16 ++-- eeschema/sch_item_struct.h | 4 +- eeschema/sch_junction.h | 22 ++--- eeschema/sch_legacy_plugin.h | 18 ++--- eeschema/sch_line.h | 12 +-- eeschema/sch_marker.h | 20 ++--- eeschema/sch_no_connect.h | 20 ++--- eeschema/sch_sheet.h | 40 +++++----- eeschema/sch_text.h | 64 +++++++-------- eeschema/sch_validators.h | 2 +- eeschema/schframe.h | 8 +- gerbview/class_excellon.h | 2 +- gerbview/class_gerber_draw_item.h | 6 +- .../dialogs/dialog_print_using_printer.cpp | 2 +- gerbview/gerbview.cpp | 4 +- gerbview/gerbview_frame.h | 28 +++---- include/geometry/shape_circle.h | 10 +-- include/geometry/shape_convex.h | 10 +-- include/geometry/shape_rect.h | 8 +- include/geometry/shape_segment.h | 12 +-- include/wxBasePcbFrame.h | 2 +- kicad/kicad.h | 6 +- .../dialogs/dialogs_for_printing.cpp | 4 +- pagelayout_editor/pl_editor.cpp | 4 +- pagelayout_editor/pl_editor_frame.h | 28 +++---- pagelayout_editor/pl_editor_undo_redo.cpp | 4 +- pcb_calculator/pcb_calculator.cpp | 4 +- pcb_calculator/regulators_funct.cpp | 2 +- pcbnew/block.cpp | 4 +- pcbnew/class_edge_mod.h | 8 +- pcbnew/dialogs/dialog_cleaning_options.h | 4 +- pcbnew/dialogs/dialog_create_array.h | 12 +-- pcbnew/dialogs/dialog_design_rules.h | 4 +- pcbnew/dialogs/dialog_drclistbox.h | 20 ++--- .../dialog_edit_module_for_BoardEditor.h | 6 +- .../dialogs/dialog_edit_module_for_Modedit.h | 6 +- pcbnew/dialogs/dialog_edit_module_text.h | 2 +- pcbnew/dialogs/dialog_export_vrml.cpp | 2 +- pcbnew/dialogs/dialog_fp_lib_table.cpp | 42 +++++----- pcbnew/dialogs/dialog_fp_plugin_options.cpp | 20 ++--- pcbnew/dialogs/dialog_get_footprint_by_name.h | 2 +- pcbnew/dialogs/dialog_global_deletion.h | 4 +- .../dialog_global_edit_tracks_and_vias.h | 2 +- .../dialog_global_modules_fields_edition.cpp | 2 +- .../dialog_graphic_item_properties.cpp | 2 +- pcbnew/dialogs/dialog_graphic_items_options.h | 2 +- pcbnew/dialogs/dialog_modedit_options.cpp | 2 +- pcbnew/dialogs/dialog_netlist.h | 2 +- pcbnew/dialogs/dialog_pcb_text_properties.cpp | 2 +- pcbnew/dialogs/dialog_print_for_modedit.cpp | 2 +- pcbnew/dialogs/dialog_print_using_printer.cpp | 4 +- pcbnew/dialogs/dialog_set_grid.cpp | 2 +- pcbnew/dialogs/dialog_track_via_properties.h | 2 +- pcbnew/eagle_plugin.h | 4 +- pcbnew/edit.cpp | 12 +-- pcbnew/footprint_wizard_frame.h | 12 +-- pcbnew/github/github_plugin.h | 8 +- pcbnew/github/html_link_parser.h | 6 +- pcbnew/gpcb_plugin.h | 10 +-- pcbnew/import_dxf/dialog_dxf_import.h | 2 +- pcbnew/import_dxf/dxf2brd_items.h | 80 +++++++++---------- pcbnew/kicad_plugin.h | 12 +-- pcbnew/legacy_plugin.h | 10 +-- pcbnew/module_editor_frame.h | 16 ++-- pcbnew/modview_frame.h | 10 +-- pcbnew/pcad2kicadpcb_plugin/pcad_plugin.h | 2 +- pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h | 2 +- pcbnew/pcad2kicadpcb_plugin/pcb_pad.h | 2 +- pcbnew/pcad2kicadpcb_plugin/pcb_plane.h | 2 +- pcbnew/pcad2kicadpcb_plugin/pcb_via.h | 2 +- pcbnew/pcad2kicadpcb_plugin/pcb_via_shape.h | 2 +- pcbnew/pcbnew.cpp | 4 +- pcbnew/printout_controler.h | 2 +- pcbnew/router/pns_diff_pair.h | 2 +- pcbnew/router/pns_diff_pair_placer.h | 6 +- pcbnew/router/pns_joint.h | 2 +- pcbnew/router/pns_kicad_iface.cpp | 2 +- pcbnew/router/pns_line.h | 2 +- pcbnew/router/pns_line_placer.h | 8 +- pcbnew/router/pns_meander_placer.h | 2 +- pcbnew/router/pns_node.cpp | 4 +- pcbnew/router/pns_segment.h | 8 +- pcbnew/router/pns_shove.h | 2 +- pcbnew/router/pns_solid.h | 6 +- pcbnew/router/pns_via.h | 6 +- pcbnew/router/pns_walkaround.h | 2 +- pcbnew/router/router_preview_item.h | 4 +- pcbnew/sel_layer.cpp | 8 +- pcbnew/tools/bright_box.h | 8 +- pcbnew/tools/edit_points.h | 14 ++-- pcbnew/tools/edit_tool.cpp | 16 ++-- pcbnew/tools/picker_tool.h | 2 +- pcbnew/tools/selection_area.h | 4 +- plugins/ldr/3d/pluginldr3D.h | 2 +- 125 files changed, 578 insertions(+), 578 deletions(-) diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp index c514aa1095..bab981c0a7 100644 --- a/bitmap2component/bitmap2cmp_gui.cpp +++ b/bitmap2component/bitmap2cmp_gui.cpp @@ -670,7 +670,7 @@ static struct IFACE : public KIFACE_I { bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { return new BM2CMP_FRAME( aKiway, aParent ); } @@ -686,7 +686,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/common/single_top.cpp b/common/single_top.cpp index 2911ff2e12..38ed55f899 100644 --- a/common/single_top.cpp +++ b/common/single_top.cpp @@ -121,7 +121,7 @@ struct APP_SINGLE_TOP : public wxApp } #endif - bool OnInit() // overload wxApp virtual + bool OnInit() override { try { @@ -147,7 +147,7 @@ struct APP_SINGLE_TOP : public wxApp return false; } - int OnExit() // overload wxApp virtual + int OnExit() override { // Fixes segfault when wxPython scripting is enabled. #if defined( KICAD_SCRIPTING_WXPYTHON ) @@ -156,7 +156,7 @@ struct APP_SINGLE_TOP : public wxApp return wxApp::OnExit(); } - int OnRun() // overload wxApp virtual + int OnRun() override { int ret = -1; diff --git a/cvpcb/class_DisplayFootprintsFrame.h b/cvpcb/class_DisplayFootprintsFrame.h index cd8bba6b0d..94d495ce79 100644 --- a/cvpcb/class_DisplayFootprintsFrame.h +++ b/cvpcb/class_DisplayFootprintsFrame.h @@ -97,7 +97,7 @@ public: MODULE* Get_Module( const wxString& CmpName ); ///> @copydoc EDA_DRAW_FRAME::GetHotKeyDescription() - EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const { return NULL; } + EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const override { return NULL; } void Process_Settings( wxCommandEvent& event ); @@ -112,7 +112,7 @@ public: */ virtual void SaveCopyInUndoList( BOARD_ITEM* aItemToCopy, UNDO_REDO_T aTypeCommand = UR_UNSPECIFIED, - const wxPoint& aTransformPoint = wxPoint( 0, 0 ) ) + const wxPoint& aTransformPoint = wxPoint( 0, 0 ) ) override { } @@ -128,7 +128,7 @@ public: */ virtual void SaveCopyInUndoList( const PICKED_ITEMS_LIST& aItemsList, UNDO_REDO_T aTypeCommand, - const wxPoint& aTransformPoint = wxPoint( 0, 0 ) ) + const wxPoint& aTransformPoint = wxPoint( 0, 0 ) ) override { // currently: do nothing in CvPcb. } diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp index 9e3ee826a1..b40dc0137d 100644 --- a/cvpcb/cvpcb.cpp +++ b/cvpcb/cvpcb.cpp @@ -69,7 +69,7 @@ static struct IFACE : public KIFACE_I void OnKifaceEnd() override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { switch( aClassId ) { @@ -98,7 +98,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/cvpcb/cvpcb_mainframe.h b/cvpcb/cvpcb_mainframe.h index d9895d818d..eb405403e1 100644 --- a/cvpcb/cvpcb_mainframe.h +++ b/cvpcb/cvpcb_mainframe.h @@ -86,9 +86,9 @@ protected: public: ~CVPCB_MAINFRAME(); - bool OpenProjectFiles( const std::vector& aFileSet, int aCtl=0 ); // overload KIWAY_PLAYER + bool OpenProjectFiles( const std::vector& aFileSet, int aCtl=0 ) override; - void KiwayMailIn( KIWAY_EXPRESS& aEvent ); // override virtual from KIWAY_PLAYER + void KiwayMailIn( KIWAY_EXPRESS& aEvent ) override; /** * @return a pointer on the Footprint Viewer frame, if exists, or NULL @@ -212,9 +212,9 @@ public: */ void SaveProjectFile(); - void LoadSettings( wxConfigBase* aCfg ); // override virtual + void LoadSettings( wxConfigBase* aCfg ) override; - void SaveSettings( wxConfigBase* aCfg ); // override virtual + void SaveSettings( wxConfigBase* aCfg ) override; /** * Function DisplayStatus diff --git a/cvpcb/dialogs/fp_conflict_assignment_selector.h b/cvpcb/dialogs/fp_conflict_assignment_selector.h index aa5ca7f49c..87ce9ad74f 100644 --- a/cvpcb/dialogs/fp_conflict_assignment_selector.h +++ b/cvpcb/dialogs/fp_conflict_assignment_selector.h @@ -71,8 +71,8 @@ class DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR : public DIALOG_FP_CONFLICT_ASSIGNM void OnItemClicked( wxMouseEvent& event ) override; - void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } - void OnOKClick( wxCommandEvent& event ) { EndModal( wxID_OK ); } + void OnCancelClick( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } + void OnOKClick( wxCommandEvent& event ) override { EndModal( wxID_OK ); } void recalculateColumns(); diff --git a/eeschema/class_libentry.h b/eeschema/class_libentry.h index e51788129a..4cf35356eb 100644 --- a/eeschema/class_libentry.h +++ b/eeschema/class_libentry.h @@ -95,7 +95,7 @@ public: virtual ~LIB_ALIAS(); - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "LIB_ALIAS" ); } @@ -164,7 +164,7 @@ public: bool operator==( const LIB_ALIAS* aAlias ) const { return this == aAlias; } #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif }; @@ -228,7 +228,7 @@ public: return m_me; } - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "LIB_PART" ); } @@ -755,7 +755,7 @@ public: bool operator==( const LIB_PART* aPart ) const { return this == aPart; } #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif }; diff --git a/eeschema/class_sch_screen.h b/eeschema/class_sch_screen.h index 328937908b..43f07c0d0a 100644 --- a/eeschema/class_sch_screen.h +++ b/eeschema/class_sch_screen.h @@ -106,7 +106,7 @@ public: ~SCH_SCREEN(); - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "SCH_SCREEN" ); } @@ -521,7 +521,7 @@ public: int UpdatePickList(); #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // overload + void Show( int nestLevel, std::ostream& os ) const override; #endif }; diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp index e288fe8921..fcb93de9d6 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp @@ -130,7 +130,7 @@ private: void showButtonHandler( wxCommandEvent& event ) override; void OnTestChipName( wxCommandEvent& event ) override; void OnSelectChipName( wxCommandEvent& event ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { TransferDataToWindow(); diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index bf62ac3e85..64d77714d5 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -51,7 +51,7 @@ class DIALOG_LABEL_EDITOR : public DIALOG_LABEL_EDITOR_BASE public: DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* parent, SCH_TEXT* aTextItem ); - void SetTitle( const wxString& aTitle ) // OVERRIDE wxTopLevelWindow::SetTitle + void SetTitle( const wxString& aTitle ) override { // This class is shared for numerous tasks: a couple of // single line labels and multi-line text fields. diff --git a/eeschema/dialogs/dialog_edit_one_field.h b/eeschema/dialogs/dialog_edit_one_field.h index 714fc96ac5..4bfd55ab9d 100644 --- a/eeschema/dialogs/dialog_edit_one_field.h +++ b/eeschema/dialogs/dialog_edit_one_field.h @@ -79,7 +79,7 @@ protected: /// @todo Update DIALOG_SHIM to handle this transparently so no matter what mode the /// dialogs is shown, everything is handled without this ugliness. - void OnOkClick( wxCommandEvent& aEvent ) + void OnOkClick( wxCommandEvent& aEvent ) override { if( IsQuasiModal() ) EndQuasiModal( wxID_OK ); @@ -87,7 +87,7 @@ protected: EndDialog( wxID_OK ); } - void OnCancelClick( wxCommandEvent& event ) + void OnCancelClick( wxCommandEvent& event ) override { if( IsQuasiModal() ) EndQuasiModal( wxID_CANCEL ); @@ -95,7 +95,7 @@ protected: EndDialog( wxID_CANCEL ); } - void OnCloseDialog( wxCloseEvent& aEvent ) + void OnCloseDialog( wxCloseEvent& aEvent ) override { if( IsQuasiModal() ) EndQuasiModal( wxID_CANCEL ); diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp index 4a299d4042..f087ac5579 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp @@ -60,7 +60,7 @@ public: virtual int Compare( const wxDataViewItem& lhs, const wxDataViewItem& rhs, unsigned int col, - bool ascending ) const; + bool ascending ) const override; void SetGroupingColumn( int aCol ); void CalculateGrouping(); @@ -120,9 +120,9 @@ public: virtual void GetValue( wxVariant& aValue, unsigned int aCol ) const override; virtual wxString GetString( unsigned int aCol ) const override; - virtual wxDataViewItem GetParent() const { return wxDataViewItem(); } - virtual bool IsContainer() const { return true; } - virtual unsigned int GetChildren( wxDataViewItemArray& aItems ) const + virtual wxDataViewItem GetParent() const override { return wxDataViewItem(); } + virtual bool IsContainer() const override { return true; } + virtual unsigned int GetChildren( wxDataViewItemArray& aItems ) const override { /// @todo C++11 for( std::list::const_iterator i = m_Members.begin(); i != m_Members.end(); ++i ) @@ -148,9 +148,9 @@ public: virtual void GetValue( wxVariant& aValue, unsigned int aCol ) const override; virtual wxString GetString( unsigned int aCol ) const override; - virtual wxDataViewItem GetParent() const { return wxDataViewItem( m_Group ); } - virtual bool IsContainer() const { return false; } - virtual unsigned int GetChildren( wxDataViewItemArray& ) const { return 0; } + virtual wxDataViewItem GetParent() const override { return wxDataViewItem( m_Group ); } + virtual bool IsContainer() const override { return false; } + virtual unsigned int GetChildren( wxDataViewItemArray& ) const override { return 0; } void SetGroup( Group* aGroup ) { m_Group = aGroup; } diff --git a/eeschema/dialogs/dialog_lib_new_component.h b/eeschema/dialogs/dialog_lib_new_component.h index b8b9619fdf..c8cad091eb 100644 --- a/eeschema/dialogs/dialog_lib_new_component.h +++ b/eeschema/dialogs/dialog_lib_new_component.h @@ -39,8 +39,8 @@ public: /** Constructor */ DIALOG_LIB_NEW_COMPONENT( wxWindow* parent ); - void SetName( const wxString& name ) { m_textName->SetValue( name ); } - wxString GetName( void ) const { return m_textName->GetValue(); } + void SetName( const wxString& name ) override { m_textName->SetValue( name ); } + wxString GetName( void ) const override { return m_textName->GetValue(); } void SetReference( const wxString& reference ) { diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp index a28020eb47..f89b039101 100644 --- a/eeschema/dialogs/dialog_print_using_printer.cpp +++ b/eeschema/dialogs/dialog_print_using_printer.cpp @@ -62,7 +62,7 @@ private: void OnPageSetup( wxCommandEvent& event ) override; void OnPrintPreview( wxCommandEvent& event ) override; void OnPrintButtonClick( wxCommandEvent& event ) override; - void OnButtonCancelClick( wxCommandEvent& event ) { Close(); } + void OnButtonCancelClick( wxCommandEvent& event ) override { Close(); } void initDialog(); void GetPrintOptions(); @@ -107,7 +107,7 @@ public: { } - bool Show( bool show ) // overload + bool Show( bool show ) override { bool ret; diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index c95f9e4961..7f21b165fc 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -69,7 +69,7 @@ static struct IFACE : public KIFACE_I void OnKifaceEnd() override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { switch( aClassId ) { @@ -126,7 +126,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/eeschema/lib_arc.h b/eeschema/lib_arc.h index 5f66f90c4f..a59fb03f93 100644 --- a/eeschema/lib_arc.h +++ b/eeschema/lib_arc.h @@ -62,7 +62,7 @@ class LIB_ARC : public LIB_ITEM */ void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; /** * Draw the graphics when the arc is being edited. @@ -90,7 +90,7 @@ public: ~LIB_ARC() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_ARC" ); } @@ -104,7 +104,7 @@ public: bool HitTest( const wxPoint& aPosition, int aThreshold, const TRANSFORM& aTransform ) const override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; @@ -122,7 +122,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -131,11 +131,11 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Width; } + int GetWidth() const override { return m_Width; } - void SetWidth( int aWidth ) { m_Width = aWidth; } + void SetWidth( int aWidth ) override { m_Width = aWidth; } void SetRadius( int aRadius ) { m_Radius = aRadius; } @@ -155,7 +155,7 @@ public: wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_arc_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_arc_xpm; } EDA_ITEM* Clone() const override; diff --git a/eeschema/lib_bezier.h b/eeschema/lib_bezier.h index fd7ed5e7de..0d923af762 100644 --- a/eeschema/lib_bezier.h +++ b/eeschema/lib_bezier.h @@ -44,7 +44,7 @@ class LIB_BEZIER : public LIB_ITEM void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; public: LIB_BEZIER( LIB_PART * aParent ); @@ -53,7 +53,7 @@ public: ~LIB_BEZIER() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_BEZIER" ); } @@ -76,13 +76,13 @@ public: bool HitTest( const wxPoint& aPosRef, int aThreshold, const TRANSFORM& aTransform ) const override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; bool Inside( EDA_RECT& aRect ) const override; void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_PolyPoints[0]; } + wxPoint GetPosition() const override { return m_PolyPoints[0]; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -91,11 +91,11 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Width; } + int GetWidth() const override { return m_Width; } - void SetWidth( int aWidth ) { m_Width = aWidth; } + void SetWidth( int aWidth ) override { m_Width = aWidth; } int GetPenSize( ) const override; diff --git a/eeschema/lib_circle.h b/eeschema/lib_circle.h index 71f6110be3..0dab47e3ee 100644 --- a/eeschema/lib_circle.h +++ b/eeschema/lib_circle.h @@ -40,7 +40,7 @@ class LIB_CIRCLE : public LIB_ITEM void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; void calcEdit( const wxPoint& aPosition ) override; @@ -51,7 +51,7 @@ public: ~LIB_CIRCLE() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_CIRCLE" ); } @@ -67,7 +67,7 @@ public: int GetPenSize( ) const override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; @@ -83,7 +83,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -92,11 +92,11 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Width; } + int GetWidth() const override { return m_Width; } - void SetWidth( int aWidth ) { m_Width = aWidth; } + void SetWidth( int aWidth ) override { m_Width = aWidth; } void SetRadius( int aRadius ) { m_Radius = aRadius; } @@ -104,7 +104,7 @@ public: wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_circle_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_circle_xpm; } EDA_ITEM* Clone() const override; diff --git a/eeschema/lib_draw_item.h b/eeschema/lib_draw_item.h index c214ad67b1..bb4f6c0a8a 100644 --- a/eeschema/lib_draw_item.h +++ b/eeschema/lib_draw_item.h @@ -243,7 +243,7 @@ public: return (LIB_PART *)m_Parent; } - virtual bool HitTest( const wxPoint& aPosition ) const + virtual bool HitTest( const wxPoint& aPosition ) const override { return EDA_ITEM::HitTest( aPosition ); } @@ -261,7 +261,7 @@ public: /** * @return the boundary box for this, in library coordinates */ - virtual const EDA_RECT GetBoundingBox() const { return EDA_ITEM::GetBoundingBox(); } + virtual const EDA_RECT GetBoundingBox() const override { return EDA_ITEM::GetBoundingBox(); } /** * Function GetMsgPanelInfo @@ -420,7 +420,7 @@ public: FILL_T GetFillMode() const { return m_Fill; } #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif private: diff --git a/eeschema/lib_field.h b/eeschema/lib_field.h index ac40014e51..c1f89b14b7 100644 --- a/eeschema/lib_field.h +++ b/eeschema/lib_field.h @@ -75,7 +75,7 @@ class LIB_FIELD : public LIB_ITEM, public EDA_TEXT */ void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; /** * Calculate the new circle at \a aPosition when editing. @@ -96,7 +96,7 @@ public: ~LIB_FIELD(); - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_FIELD" ); } @@ -170,7 +170,7 @@ public: return (m_Attributs & TEXT_NO_VISIBLE) == 0 ? true : false; } - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; @@ -239,7 +239,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -248,15 +248,15 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Thickness; } + int GetWidth() const override { return m_Thickness; } - void SetWidth( int aWidth ) { m_Thickness = aWidth; } + void SetWidth( int aWidth ) override { m_Thickness = aWidth; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return move_field_xpm; } + BITMAP_DEF GetMenuImage() const override { return move_field_xpm; } EDA_ITEM* Clone() const override; diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h index 25f966d010..fd09e34b6e 100644 --- a/eeschema/lib_pin.h +++ b/eeschema/lib_pin.h @@ -90,7 +90,7 @@ class LIB_PIN : public LIB_ITEM */ void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; public: LIB_PIN( LIB_PART* aParent ); @@ -99,13 +99,13 @@ public: ~LIB_PIN() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_PIN" ); } #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // virtual override + void Show( int nestLevel, std::ostream& os ) const override; #endif bool Save( OUTPUTFORMATTER& aFormatter ) override; @@ -121,7 +121,7 @@ public: bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override; /* Cannot use a default parameter here as it will not be compatible with the virtual. */ - const EDA_RECT GetBoundingBox() const { return GetBoundingBox( false ); } + const EDA_RECT GetBoundingBox() const override { return GetBoundingBox( false ); } /** * Function GetBoundingBox @@ -446,7 +446,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_position; } + wxPoint GetPosition() const override { return m_position; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -455,9 +455,9 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_width; } + int GetWidth() const override { return m_width; } void SetWidth( int aWidth ) override; diff --git a/eeschema/lib_polyline.h b/eeschema/lib_polyline.h index 1bbfe3525e..5b137a0592 100644 --- a/eeschema/lib_polyline.h +++ b/eeschema/lib_polyline.h @@ -41,7 +41,7 @@ class LIB_POLYLINE : public LIB_ITEM void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; void calcEdit( const wxPoint& aPosition ) override; @@ -52,7 +52,7 @@ public: ~LIB_POLYLINE() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_POLYLINE" ); } @@ -78,7 +78,7 @@ public: bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; int GetPenSize( ) const override; @@ -96,7 +96,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_PolyPoints[0]; } + wxPoint GetPosition() const override { return m_PolyPoints[0]; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -105,15 +105,15 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Width; } + int GetWidth() const override { return m_Width; } - void SetWidth( int aWidth ) { m_Width = aWidth; } + void SetWidth( int aWidth ) override { m_Width = aWidth; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_polygon_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_polygon_xpm; } EDA_ITEM* Clone() const override; diff --git a/eeschema/lib_rectangle.h b/eeschema/lib_rectangle.h index 23865f84f6..8e549d25c7 100644 --- a/eeschema/lib_rectangle.h +++ b/eeschema/lib_rectangle.h @@ -43,7 +43,7 @@ class LIB_RECTANGLE : public LIB_ITEM void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; void calcEdit( const wxPoint& aPosition ) override; @@ -54,7 +54,7 @@ public: ~LIB_RECTANGLE() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_RECTANGLE" ); } @@ -71,7 +71,7 @@ public: int GetPenSize( ) const override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; @@ -87,7 +87,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -96,11 +96,11 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Width; } + int GetWidth() const override { return m_Width; } - void SetWidth( int aWidth ) { m_Width = aWidth; } + void SetWidth( int aWidth ) override { m_Width = aWidth; } void SetEnd( const wxPoint& aEnd ) { m_End = aEnd; } @@ -108,7 +108,7 @@ public: wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_rectangle_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_rectangle_xpm; } EDA_ITEM* Clone() const override; diff --git a/eeschema/lib_text.h b/eeschema/lib_text.h index c943df89cf..c85c746dea 100644 --- a/eeschema/lib_text.h +++ b/eeschema/lib_text.h @@ -50,7 +50,7 @@ class LIB_TEXT : public LIB_ITEM, public EDA_TEXT void drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; void calcEdit( const wxPoint& aPosition ) override; @@ -61,7 +61,7 @@ public: ~LIB_TEXT() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "LIB_TEXT" ); } @@ -96,7 +96,7 @@ public: void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; - const EDA_RECT GetBoundingBox() const; // virtual + const EDA_RECT GetBoundingBox() const override; void Rotate() override; @@ -112,7 +112,7 @@ public: void Move( const wxPoint& aPosition ) override; - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } void MirrorHorizontal( const wxPoint& aCenter ) override; @@ -121,15 +121,15 @@ public: void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override; void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ); + const TRANSFORM& aTransform ) override; - int GetWidth() const { return m_Thickness; } + int GetWidth() const override { return m_Thickness; } - void SetWidth( int aWidth ) { m_Thickness = aWidth; } + void SetWidth( int aWidth ) override { m_Thickness = aWidth; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_text_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_text_xpm; } EDA_ITEM* Clone() const override; diff --git a/eeschema/libeditframe.h b/eeschema/libeditframe.h index c920551eba..36ff2a35f9 100644 --- a/eeschema/libeditframe.h +++ b/eeschema/libeditframe.h @@ -321,7 +321,7 @@ public: void CreateOptionToolbar(); void OnLeftClick( wxDC* DC, const wxPoint& MousePos ) override; bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu ) override; - double BestZoom(); // Returns the best zoom + double BestZoom() override; // Returns the best zoom void OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) override; ///> @copydoc EDA_DRAW_FRAME::GetHotKeyDescription() @@ -668,7 +668,7 @@ public: * @param aData = a pointer on an auxiliary data (not always used, NULL if not used) */ virtual void PrintPage( wxDC* aDC, LSET aPrintMask, - bool aPrintMirrorMode, void* aData = NULL ); + bool aPrintMirrorMode, void* aData = NULL ) override; /** * Function SVG_PlotComponent diff --git a/eeschema/netlist_exporters/netlist_exporter_kicad.h b/eeschema/netlist_exporters/netlist_exporter_kicad.h index 433d12c4f0..a9912cac2d 100644 --- a/eeschema/netlist_exporters/netlist_exporter_kicad.h +++ b/eeschema/netlist_exporters/netlist_exporter_kicad.h @@ -47,7 +47,7 @@ public: * Function WriteNetlist * writes to specified output file */ - bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ); // OVERRIDE + bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) override; /** * Function Format diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp index 39179b555f..6e0bfc14f4 100644 --- a/eeschema/project_rescue.cpp +++ b/eeschema/project_rescue.cpp @@ -285,17 +285,17 @@ public: RESCUE_CASE_CANDIDATE() { m_lib_candidate = NULL; } - virtual wxString GetRequestedName() const { return m_requested_name; } - virtual wxString GetNewName() const { return m_new_name; } - virtual LIB_PART* GetLibCandidate() const { return m_lib_candidate; } - virtual wxString GetActionDescription() const + virtual wxString GetRequestedName() const override { return m_requested_name; } + virtual wxString GetNewName() const override { return m_new_name; } + virtual LIB_PART* GetLibCandidate() const override { return m_lib_candidate; } + virtual wxString GetActionDescription() const override { wxString action; action.Printf( _( "Rename to %s" ), m_new_name ); return action; } - virtual bool PerformAction( RESCUER* aRescuer ) + virtual bool PerformAction( RESCUER* aRescuer ) override { for( SCH_COMPONENT* each_component : *aRescuer->GetComponents() ) { @@ -378,11 +378,11 @@ public: RESCUE_CACHE_CANDIDATE() : m_cache_candidate( NULL ), m_lib_candidate( NULL ) {} - virtual wxString GetRequestedName() const { return m_requested_name; } - virtual wxString GetNewName() const { return m_new_name; } - virtual LIB_PART* GetCacheCandidate() const { return m_cache_candidate; } - virtual LIB_PART* GetLibCandidate() const { return m_lib_candidate; } - virtual wxString GetActionDescription() const + virtual wxString GetRequestedName() const override { return m_requested_name; } + virtual wxString GetNewName() const override { return m_new_name; } + virtual LIB_PART* GetCacheCandidate() const override { return m_cache_candidate; } + virtual LIB_PART* GetLibCandidate() const override { return m_lib_candidate; } + virtual wxString GetActionDescription() const override { wxString action; action.Printf( _( "Rescue %s as %s" ), m_requested_name, m_new_name ); @@ -408,7 +408,7 @@ public: m_rescue_lib = std::move( rescue_lib ); } - virtual bool PerformAction( RESCUER* aRescuer ) + virtual bool PerformAction( RESCUER* aRescuer ) override { LIB_PART new_part( *m_cache_candidate, m_rescue_lib.get() ); new_part.SetName( m_new_name ); diff --git a/eeschema/sch_base_frame.h b/eeschema/sch_base_frame.h index 8ad2bad53b..fe95ebe683 100644 --- a/eeschema/sch_base_frame.h +++ b/eeschema/sch_base_frame.h @@ -61,7 +61,7 @@ public: const wxPoint& aPosition, const wxSize& aSize, long aStyle, const wxString & aFrameName ); - SCH_SCREEN* GetScreen() const; // overload EDA_DRAW_FRAME + SCH_SCREEN* GetScreen() const override; /** * @return the increment value of the position of an item @@ -98,29 +98,29 @@ public: */ const wxString GetZoomLevelIndicator() const override; - void SetPageSettings( const PAGE_INFO& aPageSettings ); // overload EDA_DRAW_FRAME - const PAGE_INFO& GetPageSettings () const; // overload EDA_DRAW_FRAME - const wxSize GetPageSizeIU() const; // overload EDA_DRAW_FRAME + void SetPageSettings( const PAGE_INFO& aPageSettings ) override; + const PAGE_INFO& GetPageSettings () const override; + const wxSize GetPageSizeIU() const override; - const wxPoint& GetAuxOrigin() const; // overload EDA_DRAW_FRAME - void SetAuxOrigin( const wxPoint& aPosition ); // overload EDA_DRAW_FRAME + const wxPoint& GetAuxOrigin() const override; + void SetAuxOrigin( const wxPoint& aPosition ) override; - const wxPoint& GetGridOrigin() const // overload EDA_DRAW_FRAME + const wxPoint& GetGridOrigin() const override { static wxPoint zero; return zero; } - void SetGridOrigin( const wxPoint& aPoint ) {} // overload EDA_DRAW_FRAME + void SetGridOrigin( const wxPoint& aPoint ) override {} // Virtual from EDA_DRAW_FRAME // the background color of the draw canvas: EDA_COLOR_T GetDrawBgColor() const override; void SetDrawBgColor( EDA_COLOR_T aColor) override; - const TITLE_BLOCK& GetTitleBlock() const; // overload EDA_DRAW_FRAME - void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ); // overload EDA_DRAW_FRAME + const TITLE_BLOCK& GetTitleBlock() const override; + void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ) override; - void UpdateStatusBar(); // overload EDA_DRAW_FRAME + void UpdateStatusBar() override; /** * Function SelectComponentFromLib diff --git a/eeschema/sch_bitmap.h b/eeschema/sch_bitmap.h index dd429c7e5f..e92b9dc0a5 100644 --- a/eeschema/sch_bitmap.h +++ b/eeschema/sch_bitmap.h @@ -82,7 +82,7 @@ public: } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_BITMAP" ); } @@ -94,12 +94,12 @@ public: */ wxSize GetSize() const; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void SwapData( SCH_ITEM* aItem ) override; void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; /** * Function ReadImageFile @@ -114,7 +114,7 @@ public: bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override; - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_pos += aMoveVector; } @@ -128,13 +128,13 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - wxString GetSelectMenuText() const { return wxString( _( "Image" ) ); } + wxString GetSelectMenuText() const override { return wxString( _( "Image" ) ); } - BITMAP_DEF GetMenuImage() const { return image_xpm; } + BITMAP_DEF GetMenuImage() const override { return image_xpm; } - wxPoint GetPosition() const { return m_pos; } + wxPoint GetPosition() const override { return m_pos; } - void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; } + void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; @@ -145,7 +145,7 @@ public: EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif }; diff --git a/eeschema/sch_bus_entry.h b/eeschema/sch_bus_entry.h index aff3b18751..678762c78c 100644 --- a/eeschema/sch_bus_entry.h +++ b/eeschema/sch_bus_entry.h @@ -60,7 +60,7 @@ public: * and false for items moved with no reference to anchor * @return false for a bus entry */ - bool IsMovableFromAnchorPoint() { return false; } + bool IsMovableFromAnchorPoint() override { return false; } wxPoint m_End() const; @@ -83,13 +83,13 @@ public: void SwapData( SCH_ITEM* aItem ) override; void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; static bool Load( LINE_READER& aLine, wxString& aErrorMsg, SCH_ITEM **out ); - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_pos += aMoveVector; } @@ -109,15 +109,15 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override; - BITMAP_DEF GetMenuImage() const { return add_entry_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_entry_xpm; } - wxPoint GetPosition() const { return m_pos; } + wxPoint GetPosition() const override { return m_pos; } - void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; } + void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; @@ -126,7 +126,7 @@ public: void Plot( PLOTTER* aPlotter ) override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif }; @@ -142,7 +142,7 @@ public: ~SCH_BUS_WIRE_ENTRY() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_BUS_WIRE_ENTRY" ); } @@ -168,7 +168,7 @@ public: ~SCH_BUS_BUS_ENTRY() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_BUS_BUS_ENTRY" ); } diff --git a/eeschema/sch_component.h b/eeschema/sch_component.h index 3f261fc435..47e7c14d28 100644 --- a/eeschema/sch_component.h +++ b/eeschema/sch_component.h @@ -141,7 +141,7 @@ public: ~SCH_COMPONENT() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_COMPONENT" ); } @@ -156,7 +156,7 @@ public: * items which can be large (hierarchical sheets, compoments) * @return false for a componant */ - bool IsMovableFromAnchorPoint() { return false; } + bool IsMovableFromAnchorPoint() override { return false; } void SetPartName( const wxString& aName, PART_LIBS* aLibs=NULL ); const wxString& GetPartName() const { return m_part_name; } @@ -265,7 +265,7 @@ public: */ void SetTimeStamp( time_t aNewTimeStamp ); - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; /** * Function GetBodyBoundingBox @@ -376,7 +376,7 @@ public: * Virtual function, from the base class SCH_ITEM::Draw */ void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override { Draw( aPanel, aDC, aOffset, aDrawMode, aColor, true ); } @@ -448,7 +448,7 @@ public: // Geometric transforms (used in block operations): - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { if( aMoveVector == wxPoint( 0, 0 ) ) return; @@ -502,7 +502,7 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } /** * @return true if the component is in netlist @@ -527,10 +527,10 @@ public: wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_component_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_component_xpm; } void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, - SCH_SHEET_PATH* aSheetPath ); + SCH_SHEET_PATH* aSheetPath ) override; bool operator <( const SCH_ITEM& aItem ) const override; @@ -539,11 +539,11 @@ public: SCH_ITEM& operator=( const SCH_ITEM& aItem ); - bool IsReplaceable() const { return true; } + bool IsReplaceable() const override { return true; } - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } - void SetPosition( const wxPoint& aPosition ) { Move( aPosition - m_Pos ); } + void SetPosition( const wxPoint& aPosition ) override { Move( aPosition - m_Pos ); } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; @@ -554,7 +554,7 @@ public: EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif private: diff --git a/eeschema/sch_field.h b/eeschema/sch_field.h index 4c1972a19f..455837707c 100644 --- a/eeschema/sch_field.h +++ b/eeschema/sch_field.h @@ -67,7 +67,7 @@ public: ~SCH_FIELD(); - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_FIELD" ); } @@ -100,7 +100,7 @@ public: void Place( SCH_EDIT_FRAME* frame, wxDC* DC ); - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; /** * Function IsHorizJustifyFlipped @@ -142,13 +142,13 @@ public: } void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; bool Save( FILE* aFile ) const override; // Geometric transforms (used in block operations): - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_Pos += aMoveVector; } @@ -163,7 +163,7 @@ public: * when the parent component is mirrored. This function is only needed by the * pure function of the master class. */ - void MirrorX( int aXaxis_position ) + void MirrorX( int aXaxis_position ) override { } @@ -174,7 +174,7 @@ public: * when the parent component is mirrored. This function is only needed by the * pure function of the master class. */ - void MirrorY( int aYaxis_position ) + void MirrorY( int aYaxis_position ) override { } @@ -186,7 +186,7 @@ public: BITMAP_DEF GetMenuImage() const override; - bool IsReplaceable() const { return true; } + bool IsReplaceable() const override { return true; } wxPoint GetLibPosition() const { return m_Pos; } @@ -203,7 +203,7 @@ public: EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif }; diff --git a/eeschema/sch_item_struct.h b/eeschema/sch_item_struct.h index c53f40ae30..10e083de35 100644 --- a/eeschema/sch_item_struct.h +++ b/eeschema/sch_item_struct.h @@ -128,7 +128,7 @@ public: ~SCH_ITEM(); - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "SCH_ITEM" ); } @@ -314,7 +314,7 @@ public: bool IsConnected( const wxPoint& aPoint ) const; /** @copydoc EDA_ITEM::HitTest(const wxPoint&) */ - virtual bool HitTest( const wxPoint& aPosition ) const + virtual bool HitTest( const wxPoint& aPosition ) const override { return HitTest( aPosition, 0 ); } diff --git a/eeschema/sch_junction.h b/eeschema/sch_junction.h index eb62725de5..6fbb1f8e2d 100644 --- a/eeschema/sch_junction.h +++ b/eeschema/sch_junction.h @@ -45,7 +45,7 @@ public: ~SCH_JUNCTION() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_JUNCTION" ); } @@ -55,16 +55,16 @@ public: void SwapData( SCH_ITEM* aItem ) override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; bool Save( FILE* aFile ) const override; bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override; - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_pos += aMoveVector; } @@ -79,30 +79,30 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override; - wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); } + wxString GetSelectMenuText() const override { return wxString( _( "Junction" ) ); } - BITMAP_DEF GetMenuImage() const { return add_junction_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_junction_xpm; } void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override; - wxPoint GetPosition() const { return m_pos; } + wxPoint GetPosition() const override { return m_pos; } - void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; } + void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; bool HitTest( const EDA_RECT& aRect, bool aContained = false, - int aAccuracy = 0 ) const; + int aAccuracy = 0 ) const override; void Plot( PLOTTER* aPlotter ) override; EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif private: diff --git a/eeschema/sch_legacy_plugin.h b/eeschema/sch_legacy_plugin.h index 40d80dcca4..d65b6f1af5 100644 --- a/eeschema/sch_legacy_plugin.h +++ b/eeschema/sch_legacy_plugin.h @@ -65,36 +65,36 @@ public: SCH_LEGACY_PLUGIN(); virtual ~SCH_LEGACY_PLUGIN() {} - const wxString GetName() const + const wxString GetName() const override { return wxT( "Eeschema-Legacy" ); } - const wxString GetFileExtension() const + const wxString GetFileExtension() const override { return wxT( "sch" ); } SCH_SHEET* Load( const wxString& aFileName, KIWAY* aKiway, - SCH_SHEET* aAppendToMe = NULL, const PROPERTIES* aProperties = NULL ); + SCH_SHEET* aAppendToMe = NULL, const PROPERTIES* aProperties = NULL ) override; void Save( const wxString& aFileName, SCH_SCREEN* aScreen, KIWAY* aKiway, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void Format( SCH_SCREEN* aScreen ); void EnumerateSymbolLib( wxArrayString& aAliasNameList, const wxString& aLibraryPath, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; LIB_ALIAS* LoadSymbol( const wxString& aLibraryPath, const wxString& aAliasName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void SaveSymbol( const wxString& aLibraryPath, const LIB_PART* aSymbol, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void DeleteAlias( const wxString& aLibraryPath, const wxString& aAliasName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; // Temporary for testing using PART_LIB instead of SCH_PLUGIN. - void TransferCache( PART_LIB& aTarget ); + void TransferCache( PART_LIB& aTarget ) override; private: void loadHierarchy( SCH_SHEET* aSheet ); diff --git a/eeschema/sch_line.h b/eeschema/sch_line.h index e89a45e344..9c4937b793 100644 --- a/eeschema/sch_line.h +++ b/eeschema/sch_line.h @@ -56,7 +56,7 @@ public: SCH_LINE* Next() const { return (SCH_LINE*) Pnext; } SCH_LINE* Back() const { return (SCH_LINE*) Pback; } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_LINE" ); } @@ -76,7 +76,7 @@ public: void SetEndPoint( const wxPoint& aPosition ) { m_end = aPosition; } - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; /** * Function GetLength @@ -85,7 +85,7 @@ public: double GetLength() const; void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; bool Save( FILE* aFile ) const override; @@ -117,7 +117,7 @@ public: bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override; - bool IsDangling() const { return m_startIsDangling || m_endIsDangling; } + bool IsDangling() const override { return m_startIsDangling || m_endIsDangling; } bool IsSelectStateChanged( const wxRect& aRect ) override; @@ -133,7 +133,7 @@ public: bool operator <( const SCH_ITEM& aItem ) const override; - wxPoint GetPosition() const { return m_start; } + wxPoint GetPosition() const override { return m_start; } void SetPosition( const wxPoint& aPosition ) override; @@ -146,7 +146,7 @@ public: EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif private: diff --git a/eeschema/sch_marker.h b/eeschema/sch_marker.h index 7c5f3d271e..08da741902 100644 --- a/eeschema/sch_marker.h +++ b/eeschema/sch_marker.h @@ -47,15 +47,15 @@ public: // Do not create a copy constructor. The one generated by the compiler is adequate. - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_MARKER" ); } void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDraw_mode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDraw_mode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; - void Plot( PLOTTER* aPlotter ) + void Plot( PLOTTER* aPlotter ) override { // SCH_MARKERs should not be plotted. However, SCH_ITEM will fail an // assertion if we do not confirm this by locally implementing a no-op @@ -65,11 +65,11 @@ public: bool Save( FILE* aFile ) const override; - EDA_RECT const GetBoundingBox() const; // Virtual + EDA_RECT const GetBoundingBox() const override; // Geometric transforms (used in block operations): - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_Pos += aMoveVector; } @@ -97,20 +97,20 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - wxString GetSelectMenuText() const { return wxString( _( "ERC Marker" ) ); } + wxString GetSelectMenuText() const override { return wxString( _( "ERC Marker" ) ); } - BITMAP_DEF GetMenuImage() const { return erc_xpm; } + BITMAP_DEF GetMenuImage() const override { return erc_xpm; } - wxPoint GetPosition() const { return m_Pos; } + wxPoint GetPosition() const override { return m_Pos; } - void SetPosition( const wxPoint& aPosition ) { m_Pos = aPosition; } + void SetPosition( const wxPoint& aPosition ) override { m_Pos = aPosition; } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif }; diff --git a/eeschema/sch_no_connect.h b/eeschema/sch_no_connect.h index 0b5fe62955..ca83720b0a 100644 --- a/eeschema/sch_no_connect.h +++ b/eeschema/sch_no_connect.h @@ -46,7 +46,7 @@ public: ~SCH_NO_CONNECT() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_NO_CONNECT" ); } @@ -56,7 +56,7 @@ public: void SwapData( SCH_ITEM* aItem ) override; void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; bool Save( FILE* aFile ) const override; @@ -64,11 +64,11 @@ public: void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; // Geometric transforms (used in block operations): - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_pos += aMoveVector; } @@ -81,19 +81,19 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override; - wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); } + wxString GetSelectMenuText() const override { return wxString( _( "No Connect" ) ); } - BITMAP_DEF GetMenuImage() const { return noconn_xpm; } + BITMAP_DEF GetMenuImage() const override { return noconn_xpm; } void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override; - wxPoint GetPosition() const { return m_pos; } + wxPoint GetPosition() const override { return m_pos; } - void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; } + void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; @@ -104,7 +104,7 @@ public: EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif private: diff --git a/eeschema/sch_sheet.h b/eeschema/sch_sheet.h index 1f67d773c4..26fc914764 100644 --- a/eeschema/sch_sheet.h +++ b/eeschema/sch_sheet.h @@ -97,7 +97,7 @@ public: ~SCH_SHEET_PIN() { } - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_SHEET_PIN" ); } @@ -110,10 +110,10 @@ public: * and false for items moved with no reference to anchor (usually large items) * @return true for a hierarchical sheet pin */ - bool IsMovableFromAnchorPoint() { return true; } + bool IsMovableFromAnchorPoint() override { return true; } void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; /** * Function CreateGraphicShape (virtual) @@ -165,12 +165,12 @@ public: bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif // Geometric transforms (used in block operations): - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_Pos += aMoveVector; } @@ -183,22 +183,22 @@ public: bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override; - bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) + bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) override { return EDA_ITEM::Replace( aSearchData, m_Text ); } - bool IsReplaceable() const { return true; } + bool IsReplaceable() const override { return true; } void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_hierar_pin_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_hierar_pin_xpm; } - void SetPosition( const wxPoint& aPosition ) { ConstrainOnEdge( aPosition ); } + void SetPosition( const wxPoint& aPosition ) override { ConstrainOnEdge( aPosition ); } bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; @@ -256,7 +256,7 @@ public: ~SCH_SHEET(); - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_SHEET" ); } @@ -269,7 +269,7 @@ public: * items which can be large (hierarchical sheets, compoments) * @return false for a hierarchical sheet */ - bool IsMovableFromAnchorPoint() { return false; } + bool IsMovableFromAnchorPoint() override { return false; } wxString GetName() const { return m_name; } @@ -429,7 +429,7 @@ public: int GetPenSize() const override; void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); + GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ) override; EDA_RECT const GetBoundingBox() const override; @@ -515,7 +515,7 @@ public: // Geometric transforms (used in block operations): - void Move( const wxPoint& aMoveVector ) + void Move( const wxPoint& aMoveVector ) override { m_pos += aMoveVector; @@ -535,7 +535,7 @@ public: bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) override; - bool IsReplaceable() const { return true; } + bool IsReplaceable() const override { return true; } /** * Resize this sheet to aSize and adjust all of the labels accordingly. @@ -564,7 +564,7 @@ public: bool IsSelectStateChanged( const wxRect& aRect ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override; @@ -572,14 +572,14 @@ public: wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_hierarchical_subsheet_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_hierarchical_subsheet_xpm; } void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, - SCH_SHEET_PATH* aSheetPath ); + SCH_SHEET_PATH* aSheetPath ) override; SCH_ITEM& operator=( const SCH_ITEM& aSheet ); - wxPoint GetPosition() const { return m_pos; } + wxPoint GetPosition() const override { return m_pos; } void SetPosition( const wxPoint& aPosition ) override; @@ -592,7 +592,7 @@ public: EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif protected: diff --git a/eeschema/sch_text.h b/eeschema/sch_text.h index 8e66ae2ccf..228ddf999c 100644 --- a/eeschema/sch_text.h +++ b/eeschema/sch_text.h @@ -90,7 +90,7 @@ public: ~SCH_TEXT() { } - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "SCH_TEXT" ); } @@ -133,7 +133,7 @@ public: virtual wxPoint GetSchematicTextOffset() const; virtual void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, - GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ); + GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ) override; /** * Function CreateGraphicShape @@ -159,7 +159,7 @@ public: // Geometric transforms (used in block operations): - virtual void Move( const wxPoint& aMoveVector ) + virtual void Move( const wxPoint& aMoveVector ) override { m_Pos += aMoveVector; } @@ -172,40 +172,40 @@ public: virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override; - virtual bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) + virtual bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) override { return EDA_ITEM::Replace( aSearchData, m_Text ); } - virtual bool IsReplaceable() const { return true; } + virtual bool IsReplaceable() const override { return true; } virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override; virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override; - virtual bool IsDangling() const { return m_isDangling; } + virtual bool IsDangling() const override { return m_isDangling; } virtual bool IsSelectStateChanged( const wxRect& aRect ) override; virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override; - virtual bool CanIncrementLabel() const { return true; } + virtual bool CanIncrementLabel() const override { return true; } virtual wxString GetSelectMenuText() const override; - virtual BITMAP_DEF GetMenuImage() const { return add_text_xpm; } + virtual BITMAP_DEF GetMenuImage() const override { return add_text_xpm; } virtual void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, - SCH_SHEET_PATH* aSheetPath ); + SCH_SHEET_PATH* aSheetPath ) override; - virtual wxPoint GetPosition() const { return m_Pos; } + virtual wxPoint GetPosition() const override { return m_Pos; } - virtual void SetPosition( const wxPoint& aPosition ) { m_Pos = aPosition; } + virtual void SetPosition( const wxPoint& aPosition ) override { m_Pos = aPosition; } virtual bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; virtual bool HitTest( const EDA_RECT& aRect, bool aContained = false, - int aAccuracy = 0 ) const; + int aAccuracy = 0 ) const override; virtual void Plot( PLOTTER* aPlotter ) override; @@ -214,7 +214,7 @@ public: void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif }; @@ -229,9 +229,9 @@ public: ~SCH_LABEL() { } void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, - GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ); + GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ) override; - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_LABEL" ); } @@ -244,24 +244,24 @@ public: void Rotate( wxPoint aPosition ) override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; bool Save( FILE* aFile ) const override; bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_line_label_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_line_label_xpm; } - bool IsReplaceable() const { return true; } + bool IsReplaceable() const override { return true; } EDA_ITEM* Clone() const override; private: - bool doIsConnected( const wxPoint& aPosition ) const { return m_Pos == aPosition; } + bool doIsConnected( const wxPoint& aPosition ) const override { return m_Pos == aPosition; } }; @@ -275,9 +275,9 @@ public: ~SCH_GLOBALLABEL() { } void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, - GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ); + GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ) override; - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_GLOBALLABEL" ); } @@ -290,7 +290,7 @@ public: bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void CreateGraphicShape( std::vector & aPoints, const wxPoint& aPos ) override; @@ -300,16 +300,16 @@ public: void Rotate( wxPoint aPosition ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_glabel_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_glabel_xpm; } EDA_ITEM* Clone() const override; private: - bool doIsConnected( const wxPoint& aPosition ) const { return m_Pos == aPosition; } + bool doIsConnected( const wxPoint& aPosition ) const override { return m_Pos == aPosition; } }; @@ -325,9 +325,9 @@ public: ~SCH_HIERLABEL() { } void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, - GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ); + GR_DRAWMODE draw_mode, EDA_COLOR_T Color = UNSPECIFIED_COLOR ) override; - wxString GetClass() const + wxString GetClass() const override { return wxT( "SCH_HIERLABEL" ); } @@ -342,7 +342,7 @@ public: bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override; - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; void MirrorY( int aYaxis_position ) override; @@ -350,16 +350,16 @@ public: void Rotate( wxPoint aPosition ) override; - bool IsConnectable() const { return true; } + bool IsConnectable() const override { return true; } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return add_hierarchical_label_xpm; } + BITMAP_DEF GetMenuImage() const override { return add_hierarchical_label_xpm; } EDA_ITEM* Clone() const override; private: - bool doIsConnected( const wxPoint& aPosition ) const { return m_Pos == aPosition; } + bool doIsConnected( const wxPoint& aPosition ) const override { return m_Pos == aPosition; } }; #endif /* CLASS_TEXT_LABEL_H */ diff --git a/eeschema/sch_validators.h b/eeschema/sch_validators.h index 32583e7369..f1df8a0dc5 100644 --- a/eeschema/sch_validators.h +++ b/eeschema/sch_validators.h @@ -54,7 +54,7 @@ public: SCH_FIELD_VALIDATOR( const SCH_FIELD_VALIDATOR& aValidator ); - virtual wxObject* Clone() const { return new SCH_FIELD_VALIDATOR( *this ); } + virtual wxObject* Clone() const override { return new SCH_FIELD_VALIDATOR( *this ); } /** * Function Validate diff --git a/eeschema/schframe.h b/eeschema/schframe.h index a5e31ded22..a75ff84d57 100644 --- a/eeschema/schframe.h +++ b/eeschema/schframe.h @@ -232,7 +232,7 @@ public: SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ); ~SCH_EDIT_FRAME(); - SCH_SCREEN* GetScreen() const; // overload SCH_BASE_FRAME + SCH_SCREEN* GetScreen() const override; void OnCloseWindow( wxCloseEvent& Event ); @@ -397,7 +397,7 @@ public: */ virtual void ExecuteRemoteCommand( const char* cmdline ) override; - void KiwayMailIn( KIWAY_EXPRESS& aEvent ); // override virtual from KIWAY_PLAYER + void KiwayMailIn( KIWAY_EXPRESS& aEvent ) override; void OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) override; void OnLeftDClick( wxDC* aDC, const wxPoint& aPosition ) override; @@ -680,7 +680,7 @@ public: */ void OnSaveProject( wxCommandEvent& aEvent ); - bool OpenProjectFiles( const std::vector& aFileSet, int aCtl = 0 ); // virtual from KIWAY_PLAYER + bool OpenProjectFiles( const std::vector& aFileSet, int aCtl = 0 ) override; /** * Function AppendOneEEProject @@ -1341,7 +1341,7 @@ public: * @param aData = a pointer on an auxiliary data (not always used, NULL if not used) */ virtual void PrintPage( wxDC* aDC, LSET aPrintMask, - bool aPrintMirrorMode, void* aData = NULL ); + bool aPrintMirrorMode, void* aData = NULL ) override; void SetSimulatorCommand( const wxString& aCommand ) { m_simulatorCommand = aCommand; } diff --git a/gerbview/class_excellon.h b/gerbview/class_excellon.h index a881bb25aa..d60f7cab17 100644 --- a/gerbview/class_excellon.h +++ b/gerbview/class_excellon.h @@ -107,7 +107,7 @@ public: EXCELLON_IMAGE( int layer ) : ~EXCELLON_IMAGE() {}; - virtual void ResetDefaultValues() + virtual void ResetDefaultValues() override { GERBER_FILE_IMAGE::ResetDefaultValues(); SelectUnits( false ); diff --git a/gerbview/class_gerber_draw_item.h b/gerbview/class_gerber_draw_item.h index d27d5f46ec..a64e0be44e 100644 --- a/gerbview/class_gerber_draw_item.h +++ b/gerbview/class_gerber_draw_item.h @@ -203,7 +203,7 @@ public: */ D_CODE* GetDcodeDescr(); - const EDA_RECT GetBoundingBox() const; // Virtual + const EDA_RECT GetBoundingBox() const override; /* Display on screen: */ void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, @@ -253,7 +253,7 @@ public: * returns the class name. * @return wxString */ - wxString GetClass() const + wxString GetClass() const override { return wxT( "GERBER_DRAW_ITEM" ); } @@ -281,7 +281,7 @@ public: delete this; } #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const; // override + void Show( int nestLevel, std::ostream& os ) const override; #endif }; diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp index 26713b0748..7922f41835 100644 --- a/gerbview/dialogs/dialog_print_using_printer.cpp +++ b/gerbview/dialogs/dialog_print_using_printer.cpp @@ -86,7 +86,7 @@ private: void OnPrintButtonClick( wxCommandEvent& event ) override; void OnScaleSelectionClick( wxCommandEvent& event ) override; - void OnButtonCloseClick( wxCommandEvent& event ) { Close(); } + void OnButtonCloseClick( wxCommandEvent& event ) override { Close(); } void SetPrintParameters(); void InitValues(); diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp index c2acfe5c7b..6d183351bc 100644 --- a/gerbview/gerbview.cpp +++ b/gerbview/gerbview.cpp @@ -65,7 +65,7 @@ static struct IFACE : public KIFACE_I void OnKifaceEnd() override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { switch( aClassId ) { @@ -94,7 +94,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h index 0db70eb71b..2cd5b2af5c 100644 --- a/gerbview/gerbview_frame.h +++ b/gerbview/gerbview_frame.h @@ -104,21 +104,21 @@ public: */ EDA_RECT GetGerberLayoutBoundingBox(); - void SetPageSettings( const PAGE_INFO& aPageSettings ); // overload - const PAGE_INFO& GetPageSettings() const; // overload - const wxSize GetPageSizeIU() const; // overload + void SetPageSettings( const PAGE_INFO& aPageSettings ) override; + const PAGE_INFO& GetPageSettings() const override; + const wxSize GetPageSizeIU() const override; - const wxPoint& GetAuxOrigin() const; // overload - void SetAuxOrigin( const wxPoint& aPoint ); // overload + const wxPoint& GetAuxOrigin() const override; + void SetAuxOrigin( const wxPoint& aPoint ) override; - const wxPoint& GetGridOrigin() const { return m_grid_origin; } // overload - void SetGridOrigin( const wxPoint& aPoint ) // overload + const wxPoint& GetGridOrigin() const override { return m_grid_origin; } + void SetGridOrigin( const wxPoint& aPoint ) override { m_grid_origin = aPoint; } - const TITLE_BLOCK& GetTitleBlock() const; // overload - void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ); // overload + const TITLE_BLOCK& GetTitleBlock() const override; + void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ) override; /** * Function SetCurItem @@ -203,7 +203,7 @@ public: void OnCloseWindow( wxCloseEvent& Event ); - bool OpenProjectFiles( const std::vector& aFileSet, int aCtl ); // overload KIWAY_PLAYER + bool OpenProjectFiles( const std::vector& aFileSet, int aCtl ) override; // Virtual basic functions: void RedrawActiveWindow( wxDC* DC, bool EraseBg ) override; @@ -459,11 +459,11 @@ public: */ PARAM_CFG_ARRAY& GetConfigurationSettings( void ); - void LoadSettings( wxConfigBase* aCfg ); // override virtual + void LoadSettings( wxConfigBase* aCfg ) override; - void SaveSettings( wxConfigBase* aCfg ); // override virtual + void SaveSettings( wxConfigBase* aCfg ) override; - void ShowChangedLanguage(); // override EDA_BASE_FRAME virtual + void ShowChangedLanguage() override; void Process_Special_Functions( wxCommandEvent& event ); void OnSelectOptionToolbar( wxCommandEvent& event ); @@ -657,7 +657,7 @@ public: * @param aData = a pointer on an auxiliary data (not always used, NULL if not used) */ virtual void PrintPage( wxDC* aDC, LSET aPrintMasklayer, bool aPrintMirrorMode, - void* aData = NULL ); + void* aData = NULL ) override; DECLARE_EVENT_TABLE() }; diff --git a/include/geometry/shape_circle.h b/include/geometry/shape_circle.h index a915ef97ce..d210856912 100644 --- a/include/geometry/shape_circle.h +++ b/include/geometry/shape_circle.h @@ -47,19 +47,19 @@ public: ~SHAPE_CIRCLE() {} - SHAPE* Clone() const + SHAPE* Clone() const override { return new SHAPE_CIRCLE( *this ); } - const BOX2I BBox( int aClearance = 0 ) const + const BOX2I BBox( int aClearance = 0 ) const override { const VECTOR2I rc( m_radius + aClearance, m_radius + aClearance ); return BOX2I( m_center - rc, rc * 2 ); } - bool Collide( const SEG& aSeg, int aClearance = 0 ) const + bool Collide( const SEG& aSeg, int aClearance = 0 ) const override { int rc = aClearance + m_radius; @@ -86,12 +86,12 @@ public: return m_center; } - void Move( const VECTOR2I& aVector ) + void Move( const VECTOR2I& aVector ) override { m_center += aVector; } - bool IsSolid() const + bool IsSolid() const override { return true; } diff --git a/include/geometry/shape_convex.h b/include/geometry/shape_convex.h index 308a1b3147..104c3ef1f8 100644 --- a/include/geometry/shape_convex.h +++ b/include/geometry/shape_convex.h @@ -56,7 +56,7 @@ public: SHAPE( SH_CONVEX ), m_points( aOther.m_points ) {} - SHAPE* Clone() const + SHAPE* Clone() const override { return new SHAPE_CONVEX( *this ); } @@ -71,7 +71,7 @@ public: } /// @copydoc SHAPE::BBox() - const BOX2I BBox( int aClearance = 0 ) const + const BOX2I BBox( int aClearance = 0 ) const override { return m_points.BBox( aClearance ); } @@ -166,17 +166,17 @@ public: } /// @copydoc SHAPE::Collide() - bool Collide( const SEG& aSeg, int aClearance = 0 ) const + bool Collide( const SEG& aSeg, int aClearance = 0 ) const override { return m_points.Collide( aSeg, aClearance ); } - void Move( const VECTOR2I& aVector ) + void Move( const VECTOR2I& aVector ) override { m_points.Move( aVector ); } - bool IsSolid() const + bool IsSolid() const override { return true; } diff --git a/include/geometry/shape_rect.h b/include/geometry/shape_rect.h index 09673b54ed..0ce3d2fbc5 100644 --- a/include/geometry/shape_rect.h +++ b/include/geometry/shape_rect.h @@ -64,13 +64,13 @@ public: m_h( aOther.m_h ) {}; - SHAPE* Clone() const + SHAPE* Clone() const override { return new SHAPE_RECT( *this ); } /// @copydoc SHAPE::BBox() - const BOX2I BBox( int aClearance = 0 ) const + const BOX2I BBox( int aClearance = 0 ) const override { BOX2I bbox( VECTOR2I( m_p0.x - aClearance, m_p0.y - aClearance ), VECTOR2I( m_w + 2 * aClearance, m_h + 2 * aClearance ) ); @@ -132,12 +132,12 @@ public: return m_h; } - void Move( const VECTOR2I& aVector ) + void Move( const VECTOR2I& aVector ) override { m_p0 += aVector; } - bool IsSolid() const + bool IsSolid() const override { return true; } diff --git a/include/geometry/shape_segment.h b/include/geometry/shape_segment.h index 71ed5b17c4..50fa87cdc8 100644 --- a/include/geometry/shape_segment.h +++ b/include/geometry/shape_segment.h @@ -42,22 +42,22 @@ public: ~SHAPE_SEGMENT() {}; - SHAPE* Clone() const + SHAPE* Clone() const override { return new SHAPE_SEGMENT( m_seg, m_width ); } - const BOX2I BBox( int aClearance = 0 ) const + const BOX2I BBox( int aClearance = 0 ) const override { return BOX2I( m_seg.A, m_seg.B - m_seg.A ).Inflate( aClearance + ( m_width + 1 ) / 2 ); } - bool Collide( const SEG& aSeg, int aClearance = 0 ) const + bool Collide( const SEG& aSeg, int aClearance = 0 ) const override { return m_seg.Distance( aSeg ) < ( m_width + 1 ) / 2 + aClearance; } - bool Collide( const VECTOR2I& aP, int aClearance = 0 ) const + bool Collide( const VECTOR2I& aP, int aClearance = 0 ) const override { return m_seg.Distance( aP ) < ( m_width + 1 ) / 2 + aClearance; } @@ -82,12 +82,12 @@ public: return m_width; } - bool IsSolid() const + bool IsSolid() const override { return true; } - void Move( const VECTOR2I& aVector ) + void Move( const VECTOR2I& aVector ) override { m_seg.A += aVector; m_seg.B += aVector; diff --git a/include/wxBasePcbFrame.h b/include/wxBasePcbFrame.h index a93fb0aa79..521a22423c 100644 --- a/include/wxBasePcbFrame.h +++ b/include/wxBasePcbFrame.h @@ -196,7 +196,7 @@ public: virtual void SetToolID( int aId, int aCursor, const wxString& aToolMsg ) override; virtual void UpdateStatusBar() override; - PCB_SCREEN* GetScreen() const { return (PCB_SCREEN*) EDA_DRAW_FRAME::GetScreen(); } + PCB_SCREEN* GetScreen() const override { return (PCB_SCREEN*) EDA_DRAW_FRAME::GetScreen(); } /** * Function BestZoom diff --git a/kicad/kicad.h b/kicad/kicad.h index ab04f31624..c430875b9a 100644 --- a/kicad/kicad.h +++ b/kicad/kicad.h @@ -278,11 +278,11 @@ public: private: - wxConfigBase* config(); // override EDA_BASE_FRAME virtual + wxConfigBase* config() override; - const SEARCH_STACK& sys_search(); // override EDA_BASE_FRAME virtual + const SEARCH_STACK& sys_search() override; - wxString help_name(); // override EDA_BASE_FRAME virtual + wxString help_name() override; TREE_PROJECT_FRAME* m_LeftWin; LAUNCHER_PANEL* m_Launcher; diff --git a/pagelayout_editor/dialogs/dialogs_for_printing.cpp b/pagelayout_editor/dialogs/dialogs_for_printing.cpp index f04a8e11c8..7a4f5f2620 100644 --- a/pagelayout_editor/dialogs/dialogs_for_printing.cpp +++ b/pagelayout_editor/dialogs/dialogs_for_printing.cpp @@ -56,7 +56,7 @@ public: } bool OnPrintPage( int aPageNum ) override; - bool HasPage( int aPageNum ) { return ( aPageNum <= 2 ); } + bool HasPage( int aPageNum ) override { return ( aPageNum <= 2 ); } void GetPageInfo( int* minPage, int* maxPage, int* selPageFrom, int* selPageTo ) override; void DrawPage( int aPageNum ); }; @@ -77,7 +77,7 @@ public: m_parent = aParent; } - bool Show( bool show ) // overload + bool Show( bool show ) override { bool ret; diff --git a/pagelayout_editor/pl_editor.cpp b/pagelayout_editor/pl_editor.cpp index 479b0721b5..4171714bc4 100644 --- a/pagelayout_editor/pl_editor.cpp +++ b/pagelayout_editor/pl_editor.cpp @@ -55,7 +55,7 @@ static struct IFACE : public KIFACE_I void OnKifaceEnd() override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { switch( aClassId ) { @@ -84,7 +84,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/pagelayout_editor/pl_editor_frame.h b/pagelayout_editor/pl_editor_frame.h index bcb4bbd035..b1f82b5c7d 100644 --- a/pagelayout_editor/pl_editor_frame.h +++ b/pagelayout_editor/pl_editor_frame.h @@ -77,7 +77,7 @@ public: PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ); ~PL_EDITOR_FRAME(); - bool OpenProjectFiles( const std::vector& aFileSet, int aCtl ); // overload KIWAY_PLAYER + bool OpenProjectFiles( const std::vector& aFileSet, int aCtl ) override; /** * Function LoadPageLayoutDescrFile @@ -108,8 +108,8 @@ public: void ReCreateHToolbar() override; void SetPageSettings(const PAGE_INFO&) override; - const PAGE_INFO& GetPageSettings () const; // overload EDA_DRAW_FRAME - const wxSize GetPageSizeIU() const; // overload EDA_DRAW_FRAME + const PAGE_INFO& GetPageSettings () const override; + const wxSize GetPageSizeIU() const override; /** * Function GetZoomLevelIndicator @@ -119,31 +119,31 @@ public: */ const wxString GetZoomLevelIndicator() const override; - PL_EDITOR_SCREEN* GetScreen() const // overload EDA_DRAW_FRAME + PL_EDITOR_SCREEN* GetScreen() const override { return (PL_EDITOR_SCREEN*) EDA_DRAW_FRAME::GetScreen(); } - const wxPoint& GetAuxOrigin() const // overload EDA_DRAW_FRAME + const wxPoint& GetAuxOrigin() const override { static wxPoint dummy; // ( 0,0 ); return dummy; } - void SetAuxOrigin( const wxPoint& aPosition ) {} // overload EDA_DRAW_FRAME + void SetAuxOrigin( const wxPoint& aPosition ) override {} - const wxPoint& GetGridOrigin() const // overload EDA_DRAW_FRAME + const wxPoint& GetGridOrigin() const override { return m_grid_origin; } - void SetGridOrigin( const wxPoint& aPoint ) // overload EDA_DRAW_FRAME + void SetGridOrigin( const wxPoint& aPoint ) override { m_grid_origin = aPoint; } - const TITLE_BLOCK& GetTitleBlock() const; // overload EDA_DRAW_FRAME - void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ); // overload EDA_DRAW_FRAME + const TITLE_BLOCK& GetTitleBlock() const override; + void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ) override; - void UpdateStatusBar(); // overload EDA_DRAW_FRAME + void UpdateStatusBar() override; /** * Must be called to initialize parameters when a new page layout @@ -205,9 +205,9 @@ public: */ PARAM_CFG_ARRAY& GetConfigurationSettings( void ); - void LoadSettings( wxConfigBase* aCfg ); // override virtual + void LoadSettings( wxConfigBase* aCfg ) override; - void SaveSettings( wxConfigBase* aCfg ); // override virtual + void SaveSettings( wxConfigBase* aCfg ) override; void Process_Special_Functions( wxCommandEvent& event ); void OnSelectOptionToolbar( wxCommandEvent& event ); @@ -315,7 +315,7 @@ public: * @param aData = a pointer on an auxiliary data (not always used, NULL if not used) */ virtual void PrintPage( wxDC* aDC, LSET aPrintMasklayer, - bool aPrintMirrorMode, void * aData ); + bool aPrintMirrorMode, void * aData ) override; void OnFileHistory( wxCommandEvent& event ); diff --git a/pagelayout_editor/pl_editor_undo_redo.cpp b/pagelayout_editor/pl_editor_undo_redo.cpp index de00b81cad..387ffb2e3f 100644 --- a/pagelayout_editor/pl_editor_undo_redo.cpp +++ b/pagelayout_editor/pl_editor_undo_redo.cpp @@ -55,13 +55,13 @@ public: // Required to keep compiler happy on debug builds. #if defined(DEBUG) - virtual void Show( int nestLevel, std::ostream& os ) const {} + virtual void Show( int nestLevel, std::ostream& os ) const override {} #endif /** Get class name * @return string "PL_ITEM_LAYOUT" */ - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "PL_ITEM_LAYOUT" ); } diff --git a/pcb_calculator/pcb_calculator.cpp b/pcb_calculator/pcb_calculator.cpp index 70854bc52c..50a19b1119 100644 --- a/pcb_calculator/pcb_calculator.cpp +++ b/pcb_calculator/pcb_calculator.cpp @@ -59,7 +59,7 @@ static struct IFACE : public KIFACE_I void OnKifaceEnd() override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { return new PCB_CALCULATOR_FRAME( aKiway, aParent ); } @@ -75,7 +75,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/pcb_calculator/regulators_funct.cpp b/pcb_calculator/regulators_funct.cpp index 6c28fbcc7c..b1c776f1ef 100644 --- a/pcb_calculator/regulators_funct.cpp +++ b/pcb_calculator/regulators_funct.cpp @@ -86,7 +86,7 @@ public: /** * called when the current regulator type is changed */ - void OnRegTypeSelection( wxCommandEvent& event ) + void OnRegTypeSelection( wxCommandEvent& event ) override { UpdateDialog(); } diff --git a/pcbnew/block.cpp b/pcbnew/block.cpp index 7d8fbb4edf..1ef9e819f8 100644 --- a/pcbnew/block.cpp +++ b/pcbnew/block.cpp @@ -103,11 +103,11 @@ public: private: void ExecuteCommand( wxCommandEvent& event ) override; - void OnCancel( wxCommandEvent& event ) + void OnCancel( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } - void checkBoxClicked( wxCommandEvent& aEvent ) + void checkBoxClicked( wxCommandEvent& aEvent ) override { if( m_Include_Modules->GetValue() ) m_IncludeLockedModules->Enable(); diff --git a/pcbnew/class_edge_mod.h b/pcbnew/class_edge_mod.h index 658828609c..d3b9d2089a 100644 --- a/pcbnew/class_edge_mod.h +++ b/pcbnew/class_edge_mod.h @@ -111,24 +111,24 @@ public: /* drawing functions */ void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, - GR_DRAWMODE aDrawMode, const wxPoint& offset = ZeroOffset ); + GR_DRAWMODE aDrawMode, const wxPoint& offset = ZeroOffset ) override; void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override; - wxString GetClass() const + wxString GetClass() const override { return wxT( "MGRAPHIC" ); } wxString GetSelectMenuText() const override; - BITMAP_DEF GetMenuImage() const { return show_mod_edge_xpm; } + BITMAP_DEF GetMenuImage() const override { return show_mod_edge_xpm; } EDA_ITEM* Clone() const override; #if defined(DEBUG) - void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override + void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } #endif wxPoint m_Start0; // Start point or center, relative to module origin, orient 0. diff --git a/pcbnew/dialogs/dialog_cleaning_options.h b/pcbnew/dialogs/dialog_cleaning_options.h index 0aaef4d21e..56bf29686c 100644 --- a/pcbnew/dialogs/dialog_cleaning_options.h +++ b/pcbnew/dialogs/dialog_cleaning_options.h @@ -43,11 +43,11 @@ public: } private: - void OnCancelClick( wxCommandEvent& event ) + void OnCancelClick( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } - void OnOKClick( wxCommandEvent& event ) + void OnOKClick( wxCommandEvent& event ) override { GetOpts( ); EndModal( wxID_OK ); diff --git a/pcbnew/dialogs/dialog_create_array.h b/pcbnew/dialogs/dialog_create_array.h index c79a2d049f..b63bb2d74f 100644 --- a/pcbnew/dialogs/dialog_create_array.h +++ b/pcbnew/dialogs/dialog_create_array.h @@ -284,9 +284,9 @@ public: int m_numberingOffsetX, m_numberingOffsetY; ARRAY_NUMBERING_TYPE_T m_priAxisNumType, m_secAxisNumType; - void TransformItem( int n, BOARD_ITEM* item, const wxPoint& rotPoint ) const; // override virtual - int GetArraySize() const; // override virtual - wxString GetItemNumber( int n ) const; // override virtual + void TransformItem( int n, BOARD_ITEM* item, const wxPoint& rotPoint ) const override; + int GetArraySize() const override; + wxString GetItemNumber( int n ) const override; private: wxPoint getGridCoords( int n ) const; @@ -310,9 +310,9 @@ private: ARRAY_NUMBERING_TYPE_T m_numberingType; long m_numberingOffset; - void TransformItem( int n, BOARD_ITEM* item, const wxPoint& rotPoint ) const; // override virtual - int GetArraySize() const; // override virtual - wxString GetItemNumber( int n ) const; // override virtual + void TransformItem( int n, BOARD_ITEM* item, const wxPoint& rotPoint ) const override; + int GetArraySize() const override; + wxString GetItemNumber( int n ) const override; }; // Constructor and destructor diff --git a/pcbnew/dialogs/dialog_design_rules.h b/pcbnew/dialogs/dialog_design_rules.h index 31efcec890..3b5fb18bc0 100644 --- a/pcbnew/dialogs/dialog_design_rules.h +++ b/pcbnew/dialogs/dialog_design_rules.h @@ -84,8 +84,8 @@ private: std::vector m_TracksWidthList; private: - void OnNetClassesNameLeftClick( wxGridEvent& event ){ event.Skip(); } - void OnNetClassesNameRightClick( wxGridEvent& event ){ event.Skip(); } + void OnNetClassesNameLeftClick( wxGridEvent& event ) override { event.Skip(); } + void OnNetClassesNameRightClick( wxGridEvent& event ) override { event.Skip(); } void OnAddNetclassClick( wxCommandEvent& event ) override; void OnRemoveNetclassClick( wxCommandEvent& event ) override; diff --git a/pcbnew/dialogs/dialog_drclistbox.h b/pcbnew/dialogs/dialog_drclistbox.h index 9df603b995..8fc031be0b 100644 --- a/pcbnew/dialogs/dialog_drclistbox.h +++ b/pcbnew/dialogs/dialog_drclistbox.h @@ -71,13 +71,13 @@ public: //-------------------------------------------- - void DeleteAllItems() + void DeleteAllItems() override { m_board->DeleteMARKERs(); } - const DRC_ITEM* GetItem( int aIndex ) + const DRC_ITEM* GetItem( int aIndex ) override { const MARKER_PCB* marker = m_board->GetMARKER( aIndex ); if( marker ) @@ -85,7 +85,7 @@ public: return NULL; } - void DeleteItem( int aIndex ) + void DeleteItem( int aIndex ) override { MARKER_PCB* marker = m_board->GetMARKER( aIndex ); if( marker ) @@ -97,7 +97,7 @@ public: * Function GetCount * returns the number of items in the list. */ - int GetCount() + int GetCount() override { return m_board->GetMARKERCount(); } @@ -131,7 +131,7 @@ public: //-------------------------------------------- - void DeleteAllItems() + void DeleteAllItems() override { if( m_vector ) { @@ -143,7 +143,7 @@ public: } - const DRC_ITEM* GetItem( int aIndex ) + const DRC_ITEM* GetItem( int aIndex ) override { if( m_vector && (unsigned)aIndex < m_vector->size() ) { @@ -153,7 +153,7 @@ public: return NULL; } - void DeleteItem( int aIndex ) + void DeleteItem( int aIndex ) override { if( m_vector && (unsigned)aIndex < m_vector->size() ) { @@ -167,7 +167,7 @@ public: * Function GetCount * returns the number of items in the list. */ - int GetCount() + int GetCount() override { if( m_vector ) { @@ -244,7 +244,7 @@ public: * @param n An index into the list. * @return wxString - the simple html text to show in the listbox. */ - wxString OnGetItem( size_t n ) const + wxString OnGetItem( size_t n ) const override { if( m_list ) { @@ -262,7 +262,7 @@ public: * @param n An index into the list. * @return wxString - the simple html text to show in the listbox. */ - wxString OnGetItemMarkup( size_t n ) const + wxString OnGetItemMarkup( size_t n ) const override { return OnGetItem( n ); } diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h index 039ae364e9..7d73947ab0 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h @@ -76,12 +76,12 @@ private: void OnEditReference( wxCommandEvent& event ) override; void On3DShapeSelection( wxCommandEvent& event ); void On3DShapeNameSelected( wxCommandEvent& event ) override; - void Edit3DShapeFilename( wxCommandEvent& event ) + void Edit3DShapeFilename( wxCommandEvent& event ) override { Edit3DShapeFileName(); } void Remove3DShape( wxCommandEvent& event ) override; - void Add3DShape( wxCommandEvent& event ) + void Add3DShape( wxCommandEvent& event ) override { BrowseAndAdd3DShapeFile(); } @@ -90,7 +90,7 @@ private: void ModuleOrientEvent( wxCommandEvent& event ) override; void Cfg3DPath( wxCommandEvent& event ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h index f40162e533..00b908e36c 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.h +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h @@ -62,12 +62,12 @@ private: void OnEditReference( wxCommandEvent& event ) override; void On3DShapeSelection( wxCommandEvent& event ); void On3DShapeNameSelected( wxCommandEvent& event ) override; - void Add3DShape( wxCommandEvent& event ) + void Add3DShape( wxCommandEvent& event ) override { BrowseAndAdd3DShapeFile(); } void Remove3DShape( wxCommandEvent& event ) override; - void Edit3DShapeFilename( wxCommandEvent& event ) + void Edit3DShapeFilename( wxCommandEvent& event ) override { Edit3DShapeFileName(); } @@ -75,7 +75,7 @@ private: void OnOkClick( wxCommandEvent& event ) override; void Cfg3DPath( wxCommandEvent& event ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_edit_module_text.h b/pcbnew/dialogs/dialog_edit_module_text.h index 340fe758a1..6cce19aa94 100644 --- a/pcbnew/dialogs/dialog_edit_module_text.h +++ b/pcbnew/dialogs/dialog_edit_module_text.h @@ -55,7 +55,7 @@ protected: private: void ModuleOrientEvent( wxCommandEvent& event ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp index c2165b94bc..9d64068ea6 100644 --- a/pcbnew/dialogs/dialog_export_vrml.cpp +++ b/pcbnew/dialogs/dialog_export_vrml.cpp @@ -165,7 +165,7 @@ public: event.Enable( m_cbCopyFiles->GetValue() ); } - virtual void OnFileChanged( wxFileDirPickerEvent& event ) + virtual void OnFileChanged( wxFileDirPickerEvent& event ) override { // Clicking on file picker button changes the focus to the file picker button which // is not the behavior we want. Set the focus back to the OK button so the next enter diff --git a/pcbnew/dialogs/dialog_fp_lib_table.cpp b/pcbnew/dialogs/dialog_fp_lib_table.cpp index 9c76b99e3b..1a7e8a9c64 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table.cpp +++ b/pcbnew/dialogs/dialog_fp_lib_table.cpp @@ -81,10 +81,10 @@ public: //------------------------------------------------ - int GetNumberRows() { return rows.size(); } - int GetNumberCols() { return COL_COUNT; } + int GetNumberRows() override { return rows.size(); } + int GetNumberCols() override { return COL_COUNT; } - wxString GetValue( int aRow, int aCol ) + wxString GetValue( int aRow, int aCol ) override { if( unsigned( aRow ) < rows.size() ) { @@ -105,7 +105,7 @@ public: return wxEmptyString; } - void SetValue( int aRow, int aCol, const wxString &aValue ) + void SetValue( int aRow, int aCol, const wxString &aValue ) override { if( unsigned( aRow ) < rows.size() ) { @@ -122,12 +122,12 @@ public: } } - bool IsEmptyCell( int aRow, int aCol ) + bool IsEmptyCell( int aRow, int aCol ) override { return !GetValue( aRow, aCol ); } - bool InsertRows( size_t aPos = 0, size_t aNumRows = 1 ) + bool InsertRows( size_t aPos = 0, size_t aNumRows = 1 ) override { if( aPos < rows.size() ) { @@ -149,7 +149,7 @@ public: return false; } - bool AppendRows( size_t aNumRows = 1 ) + bool AppendRows( size_t aNumRows = 1 ) override { // do not modify aNumRows, original value needed for wxGridTableMessage below for( int i = aNumRows; i; --i ) @@ -167,7 +167,7 @@ public: return true; } - bool DeleteRows( size_t aPos, size_t aNumRows ) + bool DeleteRows( size_t aPos, size_t aNumRows ) override { // aPos may be a large positive, e.g. size_t(-1), and the sum of // aPos+aNumRows may wrap here, so both ends of the range are tested. @@ -191,13 +191,13 @@ public: return false; } - void Clear() + void Clear() override { rows.clear(); nickIndex.clear(); } - wxString GetColLabelValue( int aCol ) + wxString GetColLabelValue( int aCol ) override { switch( aCol ) { @@ -228,7 +228,7 @@ protected: /// handle specialized clipboard text, with leading "(fp_lib_table", OR /// spreadsheet formatted text. - virtual void paste_text( const wxString& cb_text ) + virtual void paste_text( const wxString& cb_text ) override { FP_TBL_MODEL* tbl = (FP_TBL_MODEL*) m_grid->GetTable(); @@ -501,7 +501,7 @@ private: //--------------------------------------- - void onKeyDown( wxKeyEvent& ev ) + void onKeyDown( wxKeyEvent& ev ) override { #if 0 // send the key to the current grid @@ -513,13 +513,13 @@ private: #endif } - void pageChangedHandler( wxAuiNotebookEvent& event ) + void pageChangedHandler( wxAuiNotebookEvent& event ) override { m_pageNdx = m_auinotebook->GetSelection(); m_cur_grid = ( m_pageNdx == 0 ) ? m_global_grid : m_project_grid; } - void appendRowHandler( wxCommandEvent& event ) + void appendRowHandler( wxCommandEvent& event ) override { if( m_cur_grid->AppendRows( 1 ) ) { @@ -532,7 +532,7 @@ private: } } - void deleteRowHandler( wxCommandEvent& event ) + void deleteRowHandler( wxCommandEvent& event ) override { #if 1 int currRow = getCursorRow(); @@ -569,7 +569,7 @@ private: #endif } - void moveUpHandler( wxCommandEvent& event ) + void moveUpHandler( wxCommandEvent& event ) override { int curRow = getCursorRow(); if( curRow >= 1 ) @@ -601,7 +601,7 @@ private: } } - void moveDownHandler( wxCommandEvent& event ) + void moveDownHandler( wxCommandEvent& event ) override { FP_TBL_MODEL* tbl = cur_model(); @@ -633,7 +633,7 @@ private: } } - void optionsEditor( wxCommandEvent& event ) + void optionsEditor( wxCommandEvent& event ) override { FP_TBL_MODEL* tbl = cur_model(); @@ -667,17 +667,17 @@ private: void OnClickLibraryWizard( wxCommandEvent& event ) override; - void onCancelButtonClick( wxCommandEvent& event ) + void onCancelButtonClick( wxCommandEvent& event ) override { EndModal( 0 ); } - void onCancelCaptionButtonClick( wxCloseEvent& event ) + void onCancelCaptionButtonClick( wxCloseEvent& event ) override { EndModal( 0 ); } - void onOKButtonClick( wxCommandEvent& event ) + void onOKButtonClick( wxCommandEvent& event ) override { int dialogRet = 0; diff --git a/pcbnew/dialogs/dialog_fp_plugin_options.cpp b/pcbnew/dialogs/dialog_fp_plugin_options.cpp index 316ce5afa1..f54f33b702 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options.cpp +++ b/pcbnew/dialogs/dialog_fp_plugin_options.cpp @@ -253,7 +253,7 @@ private: //----------------------------------------------------------- - void onListBoxItemSelected( wxCommandEvent& event ) + void onListBoxItemSelected( wxCommandEvent& event ) override { // change the help text based on the m_listbox selection: if( event.IsSelection() ) @@ -274,22 +274,22 @@ private: } } - void onListBoxItemDoubleClicked( wxCommandEvent& event ) + void onListBoxItemDoubleClicked( wxCommandEvent& event ) override { appendOption(); } - void onAppendOption( wxCommandEvent& event ) + void onAppendOption( wxCommandEvent& event ) override { appendOption(); } - void onAppendRow( wxMouseEvent& event ) + void onAppendRow( wxMouseEvent& event ) override { appendRow(); } - void onDeleteRow( wxMouseEvent& event ) + void onDeleteRow( wxMouseEvent& event ) override { int rowCount = m_grid->GetNumberRows(); int curRow = getCursorRow(); @@ -303,7 +303,7 @@ private: } } - void onMoveUp( wxMouseEvent& event ) + void onMoveUp( wxMouseEvent& event ) override { int curRow = getCursorRow(); if( curRow >= 1 ) @@ -336,7 +336,7 @@ private: } } - void onMoveDown( wxMouseEvent& event ) + void onMoveDown( wxMouseEvent& event ) override { int curRow = getCursorRow(); if( curRow + 1 < m_grid->GetNumberRows() ) @@ -368,17 +368,17 @@ private: } } - void onCancelButtonClick( wxCommandEvent& event ) + void onCancelButtonClick( wxCommandEvent& event ) override { abort(); } - void onCancelCaptionButtonClick( wxCloseEvent& event ) + void onCancelCaptionButtonClick( wxCloseEvent& event ) override { abort(); } - void onOKButtonClick( wxCommandEvent& event ) + void onOKButtonClick( wxCommandEvent& event ) override { saveColSizes(); diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name.h b/pcbnew/dialogs/dialog_get_footprint_by_name.h index 2f4bbf347f..24cd1d986e 100644 --- a/pcbnew/dialogs/dialog_get_footprint_by_name.h +++ b/pcbnew/dialogs/dialog_get_footprint_by_name.h @@ -57,7 +57,7 @@ public: private: // Called when selecting an item from the item list - void OnSelectFootprint( wxCommandEvent& aEvent ) + void OnSelectFootprint( wxCommandEvent& aEvent ) override { if( m_choiceFpList->GetSelection() >= 0 ) m_SearchTextCtrl->SetValue( diff --git a/pcbnew/dialogs/dialog_global_deletion.h b/pcbnew/dialogs/dialog_global_deletion.h index 87f2ecbdd4..8a3e8bb8af 100644 --- a/pcbnew/dialogs/dialog_global_deletion.h +++ b/pcbnew/dialogs/dialog_global_deletion.h @@ -36,13 +36,13 @@ private: PCB_EDIT_FRAME* m_Parent; LAYER_NUM m_currentLayer; - void OnOkClick( wxCommandEvent& event ) + void OnOkClick( wxCommandEvent& event ) override { AcceptPcbDelete(); EndModal(wxID_OK); } - void OnCancelClick( wxCommandEvent& event ) + void OnCancelClick( wxCommandEvent& event ) override { EndModal(wxID_CANCEL); } diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h index 532fd1f5be..4071e91066 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h @@ -43,7 +43,7 @@ public: ~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS() {}; // Virtual event handlers, overided here - void OnSelectionClick( wxCommandEvent& event ){ m_OptionID = event.GetId(); } + void OnSelectionClick( wxCommandEvent& event ) override { m_OptionID = event.GetId(); } void OnOkClick( wxCommandEvent& event ) override; void OnCancelClick( wxCommandEvent& event ) override; void MyInit(); diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp index afa084b7ee..c72c08aa01 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp @@ -73,7 +73,7 @@ private: // event handlers void OnOKClick( wxCommandEvent& event ) override; - void OnCancelClick( wxCommandEvent& event ) + void OnCancelClick( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp index e156493191..7928218557 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp @@ -74,7 +74,7 @@ private: bool TransferDataFromWindow() override; void OnLayerChoice( wxCommandEvent& event ); - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_graphic_items_options.h b/pcbnew/dialogs/dialog_graphic_items_options.h index b29c590de5..0e44d5d29a 100644 --- a/pcbnew/dialogs/dialog_graphic_items_options.h +++ b/pcbnew/dialogs/dialog_graphic_items_options.h @@ -50,7 +50,7 @@ private: void OnOkClick( wxCommandEvent& event ) override; void OnCancelClick( wxCommandEvent& event ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_modedit_options.cpp b/pcbnew/dialogs/dialog_modedit_options.cpp index 5e39370e05..b637db008d 100644 --- a/pcbnew/dialogs/dialog_modedit_options.cpp +++ b/pcbnew/dialogs/dialog_modedit_options.cpp @@ -44,7 +44,7 @@ public: DIALOG_MODEDIT_OPTIONS( FOOTPRINT_EDIT_FRAME* aParent ); private: - void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } + void OnCancelClick( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } void OnOkClick( wxCommandEvent& event ) override; void initValues( ); diff --git a/pcbnew/dialogs/dialog_netlist.h b/pcbnew/dialogs/dialog_netlist.h index 85c26fd266..c0bf1a74ea 100644 --- a/pcbnew/dialogs/dialog_netlist.h +++ b/pcbnew/dialogs/dialog_netlist.h @@ -84,7 +84,7 @@ private: void OnCompileRatsnestClick( wxCommandEvent& event ) override; void OnCancelClick( wxCommandEvent& event ) override; void OnSaveMessagesToFile( wxCommandEvent& aEvent ) override; - void OnClickSilentMode( wxCommandEvent& event ) + void OnClickSilentMode( wxCommandEvent& event ) override { m_silentMode = m_checkBoxSilentMode->GetValue(); } diff --git a/pcbnew/dialogs/dialog_pcb_text_properties.cpp b/pcbnew/dialogs/dialog_pcb_text_properties.cpp index ae1bc63515..73aaf22520 100644 --- a/pcbnew/dialogs/dialog_pcb_text_properties.cpp +++ b/pcbnew/dialogs/dialog_pcb_text_properties.cpp @@ -67,7 +67,7 @@ private: bool TransferDataFromWindow() override; // Virtual event handler - virtual void OnInitDlg( wxInitDialogEvent& event ) + virtual void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_print_for_modedit.cpp b/pcbnew/dialogs/dialog_print_for_modedit.cpp index 686409448d..9f4194881c 100644 --- a/pcbnew/dialogs/dialog_print_for_modedit.cpp +++ b/pcbnew/dialogs/dialog_print_for_modedit.cpp @@ -69,7 +69,7 @@ private: /// Called on activate Print button void OnPrintButtonClick( wxCommandEvent& event ) override; - void OnButtonCancelClick( wxCommandEvent& event ) { Close(); } + void OnButtonCancelClick( wxCommandEvent& event ) override { Close(); } void OnInitDlg( wxInitDialogEvent& event ) { diff --git a/pcbnew/dialogs/dialog_print_using_printer.cpp b/pcbnew/dialogs/dialog_print_using_printer.cpp index 1b4637f0c1..93f1eb4284 100644 --- a/pcbnew/dialogs/dialog_print_using_printer.cpp +++ b/pcbnew/dialogs/dialog_print_using_printer.cpp @@ -92,9 +92,9 @@ private: void OnPrintButtonClick( wxCommandEvent& event ) override; void OnScaleSelectionClick( wxCommandEvent& event ) override; - void OnButtonCancelClick( wxCommandEvent& event ) { Close(); } + void OnButtonCancelClick( wxCommandEvent& event ) override { Close(); } - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp index df972847cd..ec0e5dc14b 100644 --- a/pcbnew/dialogs/dialog_set_grid.cpp +++ b/pcbnew/dialogs/dialog_set_grid.cpp @@ -63,7 +63,7 @@ public: private: void OnResetGridOrgClick( wxCommandEvent& event ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/dialogs/dialog_track_via_properties.h b/pcbnew/dialogs/dialog_track_via_properties.h index 9418d84d3f..7cc85d63b9 100644 --- a/pcbnew/dialogs/dialog_track_via_properties.h +++ b/pcbnew/dialogs/dialog_track_via_properties.h @@ -47,7 +47,7 @@ private: void onCancelClick( wxCommandEvent& aEvent ) override; void onOkClick( wxCommandEvent& aEvent ) override; - void OnInitDlg( wxInitDialogEvent& event ) + void OnInitDlg( wxInitDialogEvent& event ) override { // Call the default wxDialog handler of a wxInitDialogEvent TransferDataToWindow(); diff --git a/pcbnew/eagle_plugin.h b/pcbnew/eagle_plugin.h index cf5f5b1560..99a667fbd9 100644 --- a/pcbnew/eagle_plugin.h +++ b/pcbnew/eagle_plugin.h @@ -88,9 +88,9 @@ public: wxArrayString FootprintEnumerate( const wxString& aLibraryPath, const PROPERTIES* aProperties = NULL) override; MODULE* FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; - bool IsFootprintLibWritable( const wxString& aLibraryPath ) + bool IsFootprintLibWritable( const wxString& aLibraryPath ) override { return false; // until someone writes others like FootprintSave(), etc. } diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index 01c92e8fa8..471da31496 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -1618,34 +1618,34 @@ public: private: - int getNumberOfItemsToArray() const //override + int getNumberOfItemsToArray() const override { // only handle single items return (m_item != NULL) ? 1 : 0; } - BOARD_ITEM* getNthItemToArray( int n ) const //override + BOARD_ITEM* getNthItemToArray( int n ) const override { wxASSERT_MSG( n == 0, "Legacy array tool can only handle a single item" ); return m_item; } - BOARD* getBoard() const //override + BOARD* getBoard() const override { return m_parent.GetBoard(); } - MODULE* getModule() const //override + MODULE* getModule() const override { return dynamic_cast( m_item->GetParent() ); } - wxPoint getRotationCentre() const //override + wxPoint getRotationCentre() const override { return m_item->GetCenter(); } - void finalise() // override + void finalise() override { m_parent.GetCanvas()->Refresh(); } diff --git a/pcbnew/footprint_wizard_frame.h b/pcbnew/footprint_wizard_frame.h index 0c817b1223..97fabe166d 100644 --- a/pcbnew/footprint_wizard_frame.h +++ b/pcbnew/footprint_wizard_frame.h @@ -153,11 +153,11 @@ private: bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 ) override; - void LoadSettings( wxConfigBase* aCfg ); // override virtual - void SaveSettings( wxConfigBase* aCfg ); // override virtual + void LoadSettings( wxConfigBase* aCfg ) override; + void SaveSettings( wxConfigBase* aCfg ) override; ///> @copydoc EDA_DRAW_FRAME::GetHotKeyDescription() - EDA_HOTKEY* GetHotKeyDescription( int ) const { return NULL; } + EDA_HOTKEY* GetHotKeyDescription( int ) const override { return NULL; } /** * Function OnActivate @@ -195,9 +195,9 @@ private: * Virtual functions, not used here, but needed by PCB_BASE_FRAME * (virtual pure functions ) */ - void OnLeftDClick( wxDC*, const wxPoint& ) {} - void SaveCopyInUndoList( BOARD_ITEM*, UNDO_REDO_T, const wxPoint& ) {} - void SaveCopyInUndoList( const PICKED_ITEMS_LIST&, UNDO_REDO_T, const wxPoint& ) {} + void OnLeftDClick( wxDC*, const wxPoint& ) override {} + void SaveCopyInUndoList( BOARD_ITEM*, UNDO_REDO_T, const wxPoint& ) override {} + void SaveCopyInUndoList( const PICKED_ITEMS_LIST&, UNDO_REDO_T, const wxPoint& ) override {} DECLARE_EVENT_TABLE() diff --git a/pcbnew/github/github_plugin.h b/pcbnew/github/github_plugin.h index ad19c32728..f795a9f66f 100644 --- a/pcbnew/github/github_plugin.h +++ b/pcbnew/github/github_plugin.h @@ -168,16 +168,16 @@ public: const wxString GetFileExtension() const override; wxArrayString FootprintEnumerate( const wxString& aLibraryPath, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; MODULE* FootprintLoad( const wxString& aLibraryPath, - const wxString& aFootprintName, const PROPERTIES* aProperties ); + const wxString& aFootprintName, const PROPERTIES* aProperties ) override; void FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; bool IsFootprintLibWritable( const wxString& aLibraryPath ) override; diff --git a/pcbnew/github/html_link_parser.h b/pcbnew/github/html_link_parser.h index 0abe739405..713375dc2b 100644 --- a/pcbnew/github/html_link_parser.h +++ b/pcbnew/github/html_link_parser.h @@ -60,7 +60,7 @@ public: { } - wxString GetSupportedTags() + wxString GetSupportedTags() override { return "A"; } @@ -95,12 +95,12 @@ public: } // virtual pure from wxHtmlParser, do nothing here, but needed. - void AddText( const wxString& aText ){} + void AddText( const wxString& aText ) override {} // Our "AddText" used to store selected text (the url link) void AddString( const wxString& aText ); - wxObject* GetProduct() + wxObject* GetProduct() override { return NULL; } diff --git a/pcbnew/gpcb_plugin.h b/pcbnew/gpcb_plugin.h index 405f309897..7d7f782531 100644 --- a/pcbnew/gpcb_plugin.h +++ b/pcbnew/gpcb_plugin.h @@ -52,24 +52,24 @@ public: //-------------------------------------------------------------- - const wxString PluginName() const + const wxString PluginName() const override { return wxT( "Geda PCB" ); } - const wxString GetFileExtension() const + const wxString GetFileExtension() const override { return wxT( "fp" ); } wxArrayString FootprintEnumerate( const wxString& aLibraryPath, - const PROPERTIES* aProperties = NULL); + const PROPERTIES* aProperties = NULL) override; MODULE* FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; bool FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES* aProperties = NULL ) override; diff --git a/pcbnew/import_dxf/dialog_dxf_import.h b/pcbnew/import_dxf/dialog_dxf_import.h index d5550c76b5..cb7a849528 100644 --- a/pcbnew/import_dxf/dialog_dxf_import.h +++ b/pcbnew/import_dxf/dialog_dxf_import.h @@ -55,7 +55,7 @@ private: static LAYER_NUM m_layer; // Virtual event handlers - void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + void OnCancelClick( wxCommandEvent& event ) override { event.Skip(); } void OnOKClick( wxCommandEvent& event ) override; void OnBrowseDxfFiles( wxCommandEvent& event ) override; void OriginOptionOnUpdateUI( wxUpdateUIEvent& event ) override; diff --git a/pcbnew/import_dxf/dxf2brd_items.h b/pcbnew/import_dxf/dxf2brd_items.h index 5159ef7c94..6156474af0 100644 --- a/pcbnew/import_dxf/dxf2brd_items.h +++ b/pcbnew/import_dxf/dxf2brd_items.h @@ -107,70 +107,70 @@ private: // is read in dxf file // Depending of the application, they can do something or not virtual void addHeader( const DRW_Header* aData ) override; - virtual void addLType( const DRW_LType& aData ) {} + virtual void addLType( const DRW_LType& aData ) override {} virtual void addLayer( const DRW_Layer& aData ) override; - virtual void addDimStyle( const DRW_Dimstyle& aData ) {} - virtual void addBlock( const DRW_Block& aData ) {} - virtual void endBlock() {} - virtual void addPoint( const DRW_Point& aData ) {} + virtual void addDimStyle( const DRW_Dimstyle& aData ) override {} + virtual void addBlock( const DRW_Block& aData ) override {} + virtual void endBlock() override {} + virtual void addPoint( const DRW_Point& aData ) override {} virtual void addLine( const DRW_Line& aData) override; - virtual void addRay( const DRW_Ray& aData ) {} - virtual void addXline( const DRW_Xline& aData ) {} + virtual void addRay( const DRW_Ray& aData ) override {} + virtual void addXline( const DRW_Xline& aData ) override {} virtual void addCircle( const DRW_Circle& aData ) override; virtual void addArc( const DRW_Arc& aData ) override; - virtual void addEllipse( const DRW_Ellipse& aData ) {} + virtual void addEllipse( const DRW_Ellipse& aData ) override {} virtual void addLWPolyline( const DRW_LWPolyline& aData ) override; virtual void addText( const DRW_Text& aData ) override; virtual void addPolyline( const DRW_Polyline& aData ) override; - virtual void addSpline( const DRW_Spline* aData ) {} - virtual void addKnot( const DRW_Entity&) {} - virtual void addInsert( const DRW_Insert& aData ){} - virtual void addTrace( const DRW_Trace& aData ){} - virtual void addSolid( const DRW_Solid& aData ){} + virtual void addSpline( const DRW_Spline* aData ) override {} + virtual void addKnot( const DRW_Entity&) override {} + virtual void addInsert( const DRW_Insert& aData ) override {} + virtual void addTrace( const DRW_Trace& aData ) override {} + virtual void addSolid( const DRW_Solid& aData ) override {} virtual void addMText( const DRW_MText& aData) override; - virtual void addDimAlign( const DRW_DimAligned* aData ) {} - virtual void addDimLinear( const DRW_DimLinear* aData ) {} - virtual void addDimRadial( const DRW_DimRadial* aData ) {} - virtual void addDimDiametric( const DRW_DimDiametric* aData ) {} - virtual void addDimAngular( const DRW_DimAngular* aData ) {} - virtual void addDimAngular3P( const DRW_DimAngular3p* aData ) {} - virtual void addDimOrdinate( const DRW_DimOrdinate* aData ) {} - virtual void addLeader( const DRW_Leader* aData ) {} - virtual void addHatch( const DRW_Hatch* aData ) {} - virtual void addImage( const DRW_Image* aData ) {} - virtual void linkImage( const DRW_ImageDef* aData ) {} + virtual void addDimAlign( const DRW_DimAligned* aData ) override {} + virtual void addDimLinear( const DRW_DimLinear* aData ) override {} + virtual void addDimRadial( const DRW_DimRadial* aData ) override {} + virtual void addDimDiametric( const DRW_DimDiametric* aData ) override {} + virtual void addDimAngular( const DRW_DimAngular* aData ) override {} + virtual void addDimAngular3P( const DRW_DimAngular3p* aData ) override {} + virtual void addDimOrdinate( const DRW_DimOrdinate* aData ) override {} + virtual void addLeader( const DRW_Leader* aData ) override {} + virtual void addHatch( const DRW_Hatch* aData ) override {} + virtual void addImage( const DRW_Image* aData ) override {} + virtual void linkImage( const DRW_ImageDef* aData ) override {} - virtual void add3dFace( const DRW_3Dface& aData ) {} - virtual void addComment( const char*) {} + virtual void add3dFace( const DRW_3Dface& aData ) override {} + virtual void addComment( const char*) override {} - virtual void addVport( const DRW_Vport& aData ) {} + virtual void addVport( const DRW_Vport& aData ) override {} virtual void addTextStyle( const DRW_Textstyle& aData ) override; - virtual void addViewport( const DRW_Viewport& aData ) {} + virtual void addViewport( const DRW_Viewport& aData ) override {} - virtual void setBlock( const int aHandle ) {} + virtual void setBlock( const int aHandle ) override {} static wxString toDxfString( const wxString& aStr ); static wxString toNativeString( const wxString& aData ); // These functions are not used in Kicad. // But because they are virtual pure in DRW_Interface, they should be defined - virtual void writeTextstyles() {} - virtual void writeVports() {} - virtual void writeHeader( DRW_Header& aData ) {} - virtual void writeEntities() {} - virtual void writeLTypes() {} - virtual void writeLayers() {} - virtual void writeBlockRecords() {} - virtual void writeBlocks() {} - virtual void writeDimstyles() {} + virtual void writeTextstyles() override {} + virtual void writeVports() override {} + virtual void writeHeader( DRW_Header& aData ) override {} + virtual void writeEntities() override {} + virtual void writeLTypes() override {} + virtual void writeLayers() override {} + virtual void writeBlockRecords() override {} + virtual void writeBlocks() override {} + virtual void writeDimstyles() override {} void writeLine(); void writeMtext(); - virtual void addAppId( const DRW_AppId& data ) {} - virtual void writeAppId() {} + virtual void addAppId( const DRW_AppId& data ) override {} + virtual void writeAppId() override {} }; #endif // FILTERDXFRW_H diff --git a/pcbnew/kicad_plugin.h b/pcbnew/kicad_plugin.h index e66e64d2d3..60bfe1b51e 100644 --- a/pcbnew/kicad_plugin.h +++ b/pcbnew/kicad_plugin.h @@ -91,12 +91,12 @@ public: //-------------------------------------------------------------- - const wxString PluginName() const + const wxString PluginName() const override { return wxT( "KiCad" ); } - const wxString GetFileExtension() const + const wxString GetFileExtension() const override { // Would have used wildcards_and_files_ext.cpp's KiCadPcbFileExtension, // but to be pure, a plugin should not assume that it will always be linked @@ -106,18 +106,18 @@ public: } void Save( const wxString& aFileName, BOARD* aBoard, - const PROPERTIES* aProperties = NULL ); // overload + const PROPERTIES* aProperties = NULL ) override; BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, const PROPERTIES* aProperties = NULL ) override; wxArrayString FootprintEnumerate( const wxString& aLibraryPath, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; MODULE* FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; void FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName, const PROPERTIES* aProperties = NULL ) override; diff --git a/pcbnew/legacy_plugin.h b/pcbnew/legacy_plugin.h index 176fc7da42..1e0ebd315d 100644 --- a/pcbnew/legacy_plugin.h +++ b/pcbnew/legacy_plugin.h @@ -71,24 +71,24 @@ public: //--------------------------------------------------- - const wxString PluginName() const + const wxString PluginName() const override { return wxT( "KiCad-Legacy" ); } - const wxString GetFileExtension() const + const wxString GetFileExtension() const override { return wxT( "brd" ); } BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; wxArrayString FootprintEnumerate( const wxString& aLibraryPath, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; MODULE* FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; bool FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES* aProperties = NULL ) override; diff --git a/pcbnew/module_editor_frame.h b/pcbnew/module_editor_frame.h index cf29051c29..eee7155169 100644 --- a/pcbnew/module_editor_frame.h +++ b/pcbnew/module_editor_frame.h @@ -57,14 +57,14 @@ public: ///> @copydoc PCB_BASE_FRAME::GetModel() BOARD_ITEM_CONTAINER* GetModel() const override; - BOARD_DESIGN_SETTINGS& GetDesignSettings() const; // overload PCB_BASE_FRAME, get parent's - void SetDesignSettings( const BOARD_DESIGN_SETTINGS& aSettings ); // overload + BOARD_DESIGN_SETTINGS& GetDesignSettings() const override; + void SetDesignSettings( const BOARD_DESIGN_SETTINGS& aSettings ) override; - const PCB_PLOT_PARAMS& GetPlotSettings() const; // overload PCB_BASE_FRAME, get parent's - void SetPlotSettings( const PCB_PLOT_PARAMS& aSettings ); // overload + const PCB_PLOT_PARAMS& GetPlotSettings() const override; + void SetPlotSettings( const PCB_PLOT_PARAMS& aSettings ) override; - void LoadSettings( wxConfigBase* aCfg ); // Virtual - void SaveSettings( wxConfigBase* aCfg ); // Virtual + void LoadSettings( wxConfigBase* aCfg ) override; + void SaveSettings( wxConfigBase* aCfg ) override; /** * Function GetConfigurationSettings @@ -233,7 +233,7 @@ public: * @param aData = a pointer on an auxiliary data (NULL if not used) */ virtual void PrintPage( wxDC* aDC, LSET aPrintMaskLayer, bool aPrintMirrorMode, - void * aData = NULL); + void * aData = NULL) override; // BOARD handling @@ -504,7 +504,7 @@ private: * Duplicate the item under the cursor * @param aIncrement increment the number of pad (if that is what is selected) */ - void duplicateItems( bool aIncrement ); //override + void duplicateItems( bool aIncrement ) override; }; #endif // MODULE_EDITOR_FRAME_H_ diff --git a/pcbnew/modview_frame.h b/pcbnew/modview_frame.h index 79ce20ae8c..ca347af875 100644 --- a/pcbnew/modview_frame.h +++ b/pcbnew/modview_frame.h @@ -119,8 +119,8 @@ private: */ bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL ) override; - void LoadSettings( wxConfigBase* aCfg ); // override virtual - void SaveSettings( wxConfigBase* aCfg ); // override virtual + void LoadSettings( wxConfigBase* aCfg ) override; + void SaveSettings( wxConfigBase* aCfg ) override; /** * Function OnActivate @@ -173,9 +173,9 @@ private: * Virtual functions, not used here, but needed by PCB_BASE_FRAME * (virtual pure functions ) */ - void OnLeftDClick( wxDC*, const wxPoint& ) {} - void SaveCopyInUndoList( BOARD_ITEM*, UNDO_REDO_T, const wxPoint& ) {} - void SaveCopyInUndoList( const PICKED_ITEMS_LIST&, UNDO_REDO_T, const wxPoint &) {} + void OnLeftDClick( wxDC*, const wxPoint& ) override {} + void SaveCopyInUndoList( BOARD_ITEM*, UNDO_REDO_T, const wxPoint& ) override {} + void SaveCopyInUndoList( const PICKED_ITEMS_LIST&, UNDO_REDO_T, const wxPoint &) override {} void updateView(); diff --git a/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.h b/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.h index 38bfe2b00f..c28f900698 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.h @@ -43,7 +43,7 @@ public: BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, - const PROPERTIES* aProperties = NULL ); + const PROPERTIES* aProperties = NULL ) override; const wxString GetFileExtension() const override; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h b/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h index 209b75f727..5de462efcf 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h @@ -46,7 +46,7 @@ public: virtual bool Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, wxString aActualConversion, - wxStatusBar* aStatusBar ); + wxStatusBar* aStatusBar ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h b/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h index 6af4e8fd99..87e9fccf81 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h @@ -51,7 +51,7 @@ public: virtual void Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, wxString aActualConversion ); - virtual void Flip(); + virtual void Flip() override; void AddToModule( MODULE* aModule, int aRotation, bool aEncapsulatedPad ); void AddToBoard() override; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h b/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h index 6ace28b407..95fbab4f3c 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h @@ -45,7 +45,7 @@ public: virtual bool Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, wxString aActualConversion, - wxStatusBar* aStatusBar ); + wxStatusBar* aStatusBar ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_via.h b/pcbnew/pcad2kicadpcb_plugin/pcb_via.h index 05b5c3a79a..d29ac7d8f8 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_via.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_via.h @@ -46,7 +46,7 @@ public: virtual void Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion ); + wxString aActualConversion ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_via_shape.h b/pcbnew/pcad2kicadpcb_plugin/pcb_via_shape.h index d12fa62a87..9eb222d020 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_via_shape.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_via_shape.h @@ -44,7 +44,7 @@ public: virtual void Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion ); + wxString aActualConversion ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index ae983d89b3..8979cb2589 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -108,7 +108,7 @@ static struct IFACE : public KIFACE_I void OnKifaceEnd() override; - wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) + wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) override { wxWindow* frame = NULL; @@ -163,7 +163,7 @@ static struct IFACE : public KIFACE_I * * @return void* - and must be cast into the know type. */ - void* IfaceOrAddress( int aDataId ) + void* IfaceOrAddress( int aDataId ) override { return NULL; } diff --git a/pcbnew/printout_controler.h b/pcbnew/printout_controler.h index 221012f9c8..fcc6c194d1 100644 --- a/pcbnew/printout_controler.h +++ b/pcbnew/printout_controler.h @@ -113,7 +113,7 @@ public: bool OnPrintPage( int aPage ) override; - bool HasPage( int aPage ) // do not test page num + bool HasPage( int aPage ) override { if( aPage <= m_PrintParams.m_PageCount ) return true; diff --git a/pcbnew/router/pns_diff_pair.h b/pcbnew/router/pns_diff_pair.h index 535026d4f8..be074ffc11 100644 --- a/pcbnew/router/pns_diff_pair.h +++ b/pcbnew/router/pns_diff_pair.h @@ -357,7 +357,7 @@ public: return aItem && DIFF_PAIR_T == aItem->Kind(); } - DIFF_PAIR* Clone() const { assert( false ); return NULL; } + DIFF_PAIR* Clone() const override { assert( false ); return NULL; } static DIFF_PAIR* AssembleDp( LINE *aLine ); diff --git a/pcbnew/router/pns_diff_pair_placer.h b/pcbnew/router/pns_diff_pair_placer.h index e56bf81111..cafb386926 100644 --- a/pcbnew/router/pns_diff_pair_placer.h +++ b/pcbnew/router/pns_diff_pair_placer.h @@ -113,7 +113,7 @@ public: * Returns the current end of the line being placed. It may not be equal * to the cursor position due to collisions. */ - const VECTOR2I& CurrentEnd() const + const VECTOR2I& CurrentEnd() const override { return m_currentEnd; } @@ -130,7 +130,7 @@ public: * * Returns the layer of currently routed track. */ - int CurrentLayer() const + int CurrentLayer() const override { return m_currentLayer; } @@ -158,7 +158,7 @@ public: */ void UpdateSizes( const SIZES_SETTINGS& aSizes ) override; - bool IsPlacingVia() const { return m_placingVia; } + bool IsPlacingVia() const override { return m_placingVia; } void SetOrthoMode( bool aOrthoMode ) override; diff --git a/pcbnew/router/pns_joint.h b/pcbnew/router/pns_joint.h index 1927ffdd7c..359e9f92fe 100644 --- a/pcbnew/router/pns_joint.h +++ b/pcbnew/router/pns_joint.h @@ -77,7 +77,7 @@ public: m_locked = aB.m_locked; } - ITEM* Clone( ) const + ITEM* Clone( ) const override { assert( false ); return NULL; diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp index 3e965ef98e..78aa147b4b 100644 --- a/pcbnew/router/pns_kicad_iface.cpp +++ b/pcbnew/router/pns_kicad_iface.cpp @@ -69,7 +69,7 @@ public: virtual int Clearance( const PNS::ITEM* aA, const PNS::ITEM* aB ) override; virtual void OverrideClearance( bool aEnable, int aNetA = 0, int aNetB = 0, int aClearance = 0 ) override; - virtual void UseDpGap( bool aUseDpGap ) { m_useDpGap = aUseDpGap; } + virtual void UseDpGap( bool aUseDpGap ) override { m_useDpGap = aUseDpGap; } virtual int DpCoupledNet( int aNet ) override; virtual int DpNetPolarity( int aNet ) override; virtual bool DpNetPair( PNS::ITEM* aItem, int& aNetP, int& aNetN ) override; diff --git a/pcbnew/router/pns_line.h b/pcbnew/router/pns_line.h index 9dc3507c19..872dcde0b4 100644 --- a/pcbnew/router/pns_line.h +++ b/pcbnew/router/pns_line.h @@ -108,7 +108,7 @@ public: } ///> Returns the shape of the line - const SHAPE* Shape() const + const SHAPE* Shape() const override { return &m_line; } diff --git a/pcbnew/router/pns_line_placer.h b/pcbnew/router/pns_line_placer.h index e813a42c20..b29ecb23e8 100644 --- a/pcbnew/router/pns_line_placer.h +++ b/pcbnew/router/pns_line_placer.h @@ -133,7 +133,7 @@ public: * Returns the current end of the line being placed. It may not be equal * to the cursor position due to collisions. */ - const VECTOR2I& CurrentEnd() const + const VECTOR2I& CurrentEnd() const override { return m_currentEnd; } @@ -143,7 +143,7 @@ public: * * Returns the net code of currently routed track. */ - const std::vector CurrentNets() const + const std::vector CurrentNets() const override { return std::vector( 1, m_currentNet ); } @@ -153,7 +153,7 @@ public: * * Returns the layer of currently routed track. */ - int CurrentLayer() const + int CurrentLayer() const override { return m_currentLayer; } @@ -183,7 +183,7 @@ public: void SetOrthoMode( bool aOrthoMode ) override; - bool IsPlacingVia() const { return m_placingVia; } + bool IsPlacingVia() const override { return m_placingVia; } void GetModifiedNets( std::vector& aNets ) const override; diff --git a/pcbnew/router/pns_meander_placer.h b/pcbnew/router/pns_meander_placer.h index f14e022d62..4b7a0b376f 100644 --- a/pcbnew/router/pns_meander_placer.h +++ b/pcbnew/router/pns_meander_placer.h @@ -71,7 +71,7 @@ public: const VECTOR2I& CurrentEnd() const override; /// @copydoc PLACEMENT_ALGO::CurrentNets() - const std::vector CurrentNets() const + const std::vector CurrentNets() const override { return std::vector (1, m_originLine.Net() ); } diff --git a/pcbnew/router/pns_node.cpp b/pcbnew/router/pns_node.cpp index 6aec9b22fe..6614408a3b 100644 --- a/pcbnew/router/pns_node.cpp +++ b/pcbnew/router/pns_node.cpp @@ -221,7 +221,7 @@ struct NODE::DEFAULT_OBSTACLE_VISITOR : public OBSTACLE_VISITOR m_limitCount = aLimit; } - bool operator()( ITEM* aCandidate ) + bool operator()( ITEM* aCandidate ) override { if( !aCandidate->OfKind( m_kindMask ) ) return true; @@ -489,7 +489,7 @@ struct HIT_VISITOR : public OBSTACLE_VISITOR m_items( aTab ), m_point( aPoint ) {} - bool operator()( ITEM* aItem ) + bool operator()( ITEM* aItem ) override { SHAPE_CIRCLE cp( m_point, 0 ); diff --git a/pcbnew/router/pns_segment.h b/pcbnew/router/pns_segment.h index 1049e5d422..d07229c8f5 100644 --- a/pcbnew/router/pns_segment.h +++ b/pcbnew/router/pns_segment.h @@ -65,7 +65,7 @@ public: SEGMENT* Clone() const override; - const SHAPE* Shape() const + const SHAPE* Shape() const override { return static_cast( &m_seg ); } @@ -75,7 +75,7 @@ public: SetLayers( LAYER_RANGE( aLayer ) ); } - int Layer() const + int Layer() const override { return Layers().Start(); } @@ -113,7 +113,7 @@ public: const SHAPE_LINE_CHAIN Hull( int aClearance, int aWalkaroundThickness ) const override; - virtual VECTOR2I Anchor( int n ) const + virtual VECTOR2I Anchor( int n ) const override { if( n == 0 ) return m_seg.GetSeg().A; @@ -121,7 +121,7 @@ public: return m_seg.GetSeg().B; } - virtual int AnchorCount() const + virtual int AnchorCount() const override { return 2; } diff --git a/pcbnew/router/pns_shove.h b/pcbnew/router/pns_shove.h index c25c993fa5..abcd6d64b4 100644 --- a/pcbnew/router/pns_shove.h +++ b/pcbnew/router/pns_shove.h @@ -59,7 +59,7 @@ public: SHOVE( NODE* aWorld, ROUTER* aRouter ); ~SHOVE(); - virtual LOGGER* Logger() + virtual LOGGER* Logger() override { return &m_logger; } diff --git a/pcbnew/router/pns_solid.h b/pcbnew/router/pns_solid.h index 68b6f057e2..a4d4a7d848 100644 --- a/pcbnew/router/pns_solid.h +++ b/pcbnew/router/pns_solid.h @@ -59,7 +59,7 @@ public: ITEM* Clone() const override; - const SHAPE* Shape() const { return m_shape; } + const SHAPE* Shape() const override { return m_shape; } const SHAPE_LINE_CHAIN Hull( int aClearance = 0, int aWalkaroundThickness = 0 ) const override; @@ -81,12 +81,12 @@ public: m_pos = aCenter; } - virtual VECTOR2I Anchor( int aN ) const + virtual VECTOR2I Anchor( int aN ) const override { return m_pos; } - virtual int AnchorCount() const + virtual int AnchorCount() const override { return 1; } diff --git a/pcbnew/router/pns_via.h b/pcbnew/router/pns_via.h index 79eaa09d4a..8bb002837a 100644 --- a/pcbnew/router/pns_via.h +++ b/pcbnew/router/pns_via.h @@ -133,7 +133,7 @@ public: bool aSolidsOnly = true, int aMaxIterations = 10 ); - const SHAPE* Shape() const + const SHAPE* Shape() const override { return &m_shape; } @@ -142,12 +142,12 @@ public: const SHAPE_LINE_CHAIN Hull( int aClearance = 0, int aWalkaroundThickness = 0 ) const override; - virtual VECTOR2I Anchor( int n ) const + virtual VECTOR2I Anchor( int n ) const override { return m_pos; } - virtual int AnchorCount() const + virtual int AnchorCount() const override { return 1; } diff --git a/pcbnew/router/pns_walkaround.h b/pcbnew/router/pns_walkaround.h index ff6087d314..1524c07325 100644 --- a/pcbnew/router/pns_walkaround.h +++ b/pcbnew/router/pns_walkaround.h @@ -121,7 +121,7 @@ public: WALKAROUND_STATUS Route( const LINE& aInitialPath, LINE& aWalkPath, bool aOptimize = true ); - virtual LOGGER* Logger() + virtual LOGGER* Logger() override { return &m_logger; } diff --git a/pcbnew/router/router_preview_item.h b/pcbnew/router/router_preview_item.h index d24243cdb2..3dd6da9b94 100644 --- a/pcbnew/router/router_preview_item.h +++ b/pcbnew/router/router_preview_item.h @@ -84,7 +84,7 @@ public: /** Get class name * @return string "ROUTER_PREVIEW_ITEM" */ - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "ROUTER_PREVIEW_ITEM" ); } @@ -93,7 +93,7 @@ public: virtual void ViewDraw( int aLayer, KIGFX::GAL* aGal ) const override; - virtual void ViewGetLayers( int aLayers[], int& aCount ) const + virtual void ViewGetLayers( int aLayers[], int& aCount ) const override { aLayers[0] = m_layer; aCount = 1; diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp index 0d56cc5dec..44fad09c6d 100644 --- a/pcbnew/sel_layer.cpp +++ b/pcbnew/sel_layer.cpp @@ -52,20 +52,20 @@ protected: BOARD* m_brd; // Returns true if the layer id is enabled (i.e. is it should be displayed) - bool IsLayerEnabled( LAYER_NUM aLayer ) const + bool IsLayerEnabled( LAYER_NUM aLayer ) const override { return m_brd->IsLayerEnabled( LAYER_ID( aLayer ) ); } // Returns a color index from the layer id // Virtual function - EDA_COLOR_T GetLayerColor( LAYER_NUM aLayer ) const + EDA_COLOR_T GetLayerColor( LAYER_NUM aLayer ) const override { return m_brd->GetLayerColor( ToLAYER_ID( aLayer ) ); } // Returns the name of the layer id - wxString GetLayerName( LAYER_NUM aLayer ) const // overrides LAYER_SELECTOR + wxString GetLayerName( LAYER_NUM aLayer ) const override { return m_brd->GetLayerName( ToLAYER_ID( aLayer ) ); } @@ -272,7 +272,7 @@ private: EndModal( wxID_OK ); } - void OnCancelClick( wxCommandEvent& event ) + void OnCancelClick( wxCommandEvent& event ) override { EndModal( wxID_CANCEL ); } diff --git a/pcbnew/tools/bright_box.h b/pcbnew/tools/bright_box.h index 44c448e7ad..035c46b6e5 100644 --- a/pcbnew/tools/bright_box.h +++ b/pcbnew/tools/bright_box.h @@ -42,21 +42,21 @@ public: BRIGHT_BOX( BOARD_ITEM* aItem ); ~BRIGHT_BOX() {}; - virtual const BOX2I ViewBBox() const + virtual const BOX2I ViewBBox() const override { return m_item->ViewBBox(); } void ViewDraw( int aLayer, KIGFX::GAL* aGal ) const override; - void ViewGetLayers( int aLayers[], int& aCount ) const + void ViewGetLayers( int aLayers[], int& aCount ) const override { aLayers[0] = ITEM_GAL_LAYER( GP_OVERLAY ); aCount = 1; } #if defined(DEBUG) - void Show( int x, std::ostream& st ) const + void Show( int x, std::ostream& st ) const override { } #endif @@ -64,7 +64,7 @@ public: /** Get class name * @return string "BRIGHT_BOX" */ - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "BRIGHT_BOX" ); } diff --git a/pcbnew/tools/edit_points.h b/pcbnew/tools/edit_points.h index 3ff87f6565..ec134d1e95 100644 --- a/pcbnew/tools/edit_points.h +++ b/pcbnew/tools/edit_points.h @@ -201,13 +201,13 @@ public: } ///> @copydoc EDIT_POINT::GetPosition() - virtual VECTOR2I GetPosition() const + virtual VECTOR2I GetPosition() const override { return ( m_origin.GetPosition() + m_end.GetPosition() ) / 2; } ///> @copydoc EDIT_POINT::GetPosition() - virtual void SetPosition( const VECTOR2I& aPosition ) + virtual void SetPosition( const VECTOR2I& aPosition ) override { VECTOR2I difference = aPosition - GetPosition(); @@ -216,7 +216,7 @@ public: } ///> @copydoc EDIT_POINT::ApplyConstraint() - virtual void ApplyConstraint() + virtual void ApplyConstraint() override { m_origin.ApplyConstraint(); m_end.ApplyConstraint(); @@ -492,7 +492,7 @@ public: } ///> @copydoc VIEW_ITEM::ViewBBox() - virtual const BOX2I ViewBBox() const + virtual const BOX2I ViewBBox() const override { return m_parent->ViewBBox(); } @@ -501,14 +501,14 @@ public: virtual void ViewDraw( int aLayer, KIGFX::GAL* aGal ) const override; ///> @copydoc VIEW_ITEM::ViewGetLayers() - virtual void ViewGetLayers( int aLayers[], int& aCount ) const + virtual void ViewGetLayers( int aLayers[], int& aCount ) const override { aCount = 1; aLayers[0] = ITEM_GAL_LAYER( GP_OVERLAY ); } #if defined(DEBUG) - void Show( int x, std::ostream& st ) const + void Show( int x, std::ostream& st ) const override { } #endif @@ -516,7 +516,7 @@ public: /** Get class name * @return string "EDIT_POINTS" */ - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "EDIT_POINTS" ); } diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index 880ee1cc41..8253c78b24 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -613,46 +613,46 @@ public: private: - int getNumberOfItemsToArray() const //override + int getNumberOfItemsToArray() const override { // only handle single items return m_selection.Size(); } - BOARD_ITEM* getNthItemToArray( int n ) const //override + BOARD_ITEM* getNthItemToArray( int n ) const override { return m_selection.Item( n ); } - BOARD* getBoard() const //override + BOARD* getBoard() const override { return m_parent.GetBoard(); } - MODULE* getModule() const //override + MODULE* getModule() const override { // Remember this is valid and used only in the module editor. // in board editor, the parent of items is usually the board. return m_editModules ? m_parent.GetBoard()->m_Modules.GetFirst() : NULL; } - wxPoint getRotationCentre() const //override + wxPoint getRotationCentre() const override { const VECTOR2I rp = m_selection.GetCenter(); return wxPoint( rp.x, rp.y ); } - void prePushAction( BOARD_ITEM* new_item ) // override + void prePushAction( BOARD_ITEM* new_item ) override { m_parent.GetToolManager()->RunAction( COMMON_ACTIONS::unselectItem, true, new_item ); } - void postPushAction( BOARD_ITEM* new_item ) //override + void postPushAction( BOARD_ITEM* new_item ) override { } - void finalise() // override + void finalise() override { } diff --git a/pcbnew/tools/picker_tool.h b/pcbnew/tools/picker_tool.h index e0afc27917..2d459da880 100644 --- a/pcbnew/tools/picker_tool.h +++ b/pcbnew/tools/picker_tool.h @@ -42,7 +42,7 @@ public: typedef boost::function CLICK_HANDLER; ///> @copydoc TOOL_INTERACTIVE::Reset() - void Reset( RESET_REASON aReason ) {} + void Reset( RESET_REASON aReason ) override {} ///> Main event loop. int Main( const TOOL_EVENT& aEvent ); diff --git a/pcbnew/tools/selection_area.h b/pcbnew/tools/selection_area.h index 67b0503ac1..be84537f77 100644 --- a/pcbnew/tools/selection_area.h +++ b/pcbnew/tools/selection_area.h @@ -64,7 +64,7 @@ public: } #if defined(DEBUG) - void Show( int x, std::ostream& st ) const + void Show( int x, std::ostream& st ) const override { } #endif @@ -72,7 +72,7 @@ public: /** Get class name * @return string "SELECTION_AREA" */ - virtual wxString GetClass() const + virtual wxString GetClass() const override { return wxT( "SELECTION_AREA" ); } diff --git a/plugins/ldr/3d/pluginldr3D.h b/plugins/ldr/3d/pluginldr3D.h index b7793296a7..83407ae91d 100644 --- a/plugins/ldr/3d/pluginldr3D.h +++ b/plugins/ldr/3d/pluginldr3D.h @@ -70,7 +70,7 @@ public: void Close( void ) override; void GetLoaderVersion( unsigned char* Major, unsigned char* Minor, - unsigned char* Revision, unsigned char* Patch ) const; + unsigned char* Revision, unsigned char* Patch ) const override; // these functions are shadows of the 3D Plugin functions from 3d_plugin.h