haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compil warnings ( "multi-line comment" ) and missing override

This commit is contained in:
jean-pierre charras 2021-06-17 08:08:27 +02:00
parent 4c8a4e3d47
commit c35cceca62
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
View File

@ -2482,11 +2482,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
if( testBusHit( wireStart + entrySize( -1, 0 ) ) ) if( testBusHit( wireStart + entrySize( -1, 0 ) ) )
{ {
// there is room to the left of the wire for the bus entry /* there is room to the left of the wire for the bus entry
// | * |
// | * |
// / * /
// ----- * -----
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
@ -2495,11 +2496,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
} }
else if( testBusHit( wireStart + entrySize( 1, 0 ) ) ) else if( testBusHit( wireStart + entrySize( 1, 0 ) ) )
{ {
// there is room to the right of the wire for the bus entry /* there is room to the right of the wire for the bus entry
// | * |
// | * |
// \ * \
// ----- * -----
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
@ -2523,11 +2525,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
if( testBusHit( wireStart + entrySize( -1, 0 ) ) ) if( testBusHit( wireStart + entrySize( -1, 0 ) ) )
{ {
// there is room to the left of the wire for the bus entry /* there is room to the left of the wire for the bus entry
// ----- * -----
// \ * \
// | * |
// | * |
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
@ -2536,11 +2539,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
} }
else if( testBusHit( wireStart + entrySize( 1, 0 ) ) ) else if( testBusHit( wireStart + entrySize( 1, 0 ) ) )
{ {
// there is room to the right of the wire for the bus entry /* there is room to the right of the wire for the bus entry
// ----- * -----
// / * /
// | * |
// | * |
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
@ -2571,11 +2575,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
if( testBusHit( wireEnd + entrySize( -1, 0 ) ) ) if( testBusHit( wireEnd + entrySize( -1, 0 ) ) )
{ {
// there is room to the left of the wire for the bus entry /* there is room to the left of the wire for the bus entry
// | * |
// | * |
// / * /
// ----- * -----
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
@ -2584,11 +2589,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
} }
else if( testBusHit( wireEnd + entrySize( 1, 0 ) ) ) else if( testBusHit( wireEnd + entrySize( 1, 0 ) ) )
{ {
// there is room to the right of the wire for the bus entry /* there is room to the right of the wire for the bus entry
// | * |
// | * |
// \ * \
// ----- * -----
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
@ -2612,11 +2618,12 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
if( testBusHit( wireEnd + entrySize( -1, 0 ) ) ) if( testBusHit( wireEnd + entrySize( -1, 0 ) ) )
{ {
// there is room to the left of the wire for the bus entry /* there is room to the left of the wire for the bus entry
// ----- * -----
// \ * \
// | * |
// | * |
*/
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );

2
kicad/kicad_manager_frame.h
View File

@ -51,7 +51,7 @@ public:
bool canCloseWindow( wxCloseEvent& aCloseEvent ) override; bool canCloseWindow( wxCloseEvent& aCloseEvent ) override;
void doCloseWindow() override; void doCloseWindow() override;
void OnSize( wxSizeEvent& event ); void OnSize( wxSizeEvent& event ) override;
void OnArchiveFiles( wxCommandEvent& event ); void OnArchiveFiles( wxCommandEvent& event );
void OnUnarchiveFiles( wxCommandEvent& event ); void OnUnarchiveFiles( wxCommandEvent& event );