AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 00:21:31 +00:00
Files Issues Releases Activity

Add more "override" markers.

Browse Source
This commit is contained in:
Simon Richter 2016-09-25 19:06:49 +02:00 committed by Wayne Stambaugh
parent ff41c8f7cb
commit ad088db6d2
125 changed files with 578 additions and 578 deletions
bitmap2component
bitmap2cmp_gui.cpp
common
single_top.cpp
cvpcb
class_DisplayFootprintsFrame.hcvpcb.cppcvpcb_mainframe.h
dialogs
fp_conflict_assignment_selector.h
eeschema
class_libentry.hclass_sch_screen.h
dialogs
dialog_edit_component_in_schematic.cppdialog_edit_label.cppdialog_edit_one_field.hdialog_lib_edit_pin_table.cppdialog_lib_new_component.hdialog_print_using_printer.cpp
eeschema.cpplib_arc.hlib_bezier.hlib_circle.hlib_draw_item.hlib_field.hlib_pin.hlib_polyline.hlib_rectangle.hlib_text.hlibeditframe.h
netlist_exporters
netlist_exporter_kicad.h
project_rescue.cppsch_base_frame.hsch_bitmap.hsch_bus_entry.hsch_component.hsch_field.hsch_item_struct.hsch_junction.hsch_legacy_plugin.hsch_line.hsch_marker.hsch_no_connect.hsch_sheet.hsch_text.hsch_validators.hschframe.h
gerbview
class_excellon.hclass_gerber_draw_item.h
dialogs
dialog_print_using_printer.cpp
gerbview.cppgerbview_frame.h
include
geometry
shape_circle.hshape_convex.hshape_rect.hshape_segment.h
wxBasePcbFrame.h
kicad
kicad.h
pagelayout_editor
dialogs
dialogs_for_printing.cpp
pl_editor.cpppl_editor_frame.hpl_editor_undo_redo.cpp
pcb_calculator
pcb_calculator.cppregulators_funct.cpp
pcbnew
block.cppclass_edge_mod.h
dialogs
dialog_cleaning_options.hdialog_create_array.hdialog_design_rules.hdialog_drclistbox.hdialog_edit_module_for_BoardEditor.hdialog_edit_module_for_Modedit.hdialog_edit_module_text.hdialog_export_vrml.cppdialog_fp_lib_table.cppdialog_fp_plugin_options.cppdialog_get_footprint_by_name.hdialog_global_deletion.hdialog_global_edit_tracks_and_vias.hdialog_global_modules_fields_edition.cppdialog_graphic_item_properties.cppdialog_graphic_items_options.hdialog_modedit_options.cppdialog_netlist.hdialog_pcb_text_properties.cppdialog_print_for_modedit.cppdialog_print_using_printer.cppdialog_set_grid.cppdialog_track_via_properties.h
eagle_plugin.hedit.cppfootprint_wizard_frame.h
github
github_plugin.hhtml_link_parser.h
gpcb_plugin.h
import_dxf
dialog_dxf_import.hdxf2brd_items.h
kicad_plugin.hlegacy_plugin.hmodule_editor_frame.hmodview_frame.h
pcad2kicadpcb_plugin
pcad_plugin.hpcb_copper_pour.hpcb_pad.hpcb_plane.hpcb_via.hpcb_via_shape.h
pcbnew.cppprintout_controler.h
router
pns_diff_pair.hpns_diff_pair_placer.hpns_joint.hpns_kicad_iface.cpppns_line.hpns_line_placer.hpns_meander_placer.hpns_node.cpppns_segment.hpns_shove.hpns_solid.hpns_via.hpns_walkaround.hrouter_preview_item.h
sel_layer.cpp
tools
bright_box.hedit_points.hedit_tool.cpppicker_tool.hselection_area.h
plugins/ldr/3d
pluginldr3D.h

4
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -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;
}

6
common/single_top.cpp
View File

@ -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;

6
cvpcb/class_DisplayFootprintsFrame.h
View File

@ -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.
}

4
cvpcb/cvpcb.cpp
View File

@ -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;
}

8
cvpcb/cvpcb_mainframe.h
View File

@ -86,9 +86,9 @@ protected:
public:
~CVPCB_MAINFRAME();
bool OpenProjectFiles( const std::vector<wxString>& aFileSet, int aCtl=0 ); // overload KIWAY_PLAYER
bool OpenProjectFiles( const std::vector<wxString>& 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

4
cvpcb/dialogs/fp_conflict_assignment_selector.h
View File

@ -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();

8
eeschema/class_libentry.h
View File

@ -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
};

4
eeschema/class_sch_screen.h
View File

@ -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
};

2
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
View File

@ -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();

2
eeschema/dialogs/dialog_edit_label.cpp
View File

@ -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.

6
eeschema/dialogs/dialog_edit_one_field.h
View File

@ -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 );

14
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View File

@ -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<Pin*>::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; }

4
eeschema/dialogs/dialog_lib_new_component.h
View File

@ -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 )
{

4
eeschema/dialogs/dialog_print_using_printer.cpp
View File

@ -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;

4
eeschema/eeschema.cpp
View File

@ -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;
}

16
eeschema/lib_arc.h
View File

@ -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;

14
eeschema/lib_bezier.h
View File

@ -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;

16
eeschema/lib_circle.h
View File

@ -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;

6
eeschema/lib_draw_item.h
View File

@ -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:

16
eeschema/lib_field.h
View File

@ -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;

14
eeschema/lib_pin.h
View File

@ -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;

16
eeschema/lib_polyline.h
View File

@ -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;

16
eeschema/lib_rectangle.h
View File

@ -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;

16
eeschema/lib_text.h
View File

@ -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;

4
eeschema/libeditframe.h
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More