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

Fix some compile warnings

This commit is contained in:
Ian McInerney 2020-05-06 01:46:09 +01:00
parent aa9e74493f
commit 2148c593d6
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/class_libentry.h
View File

@ -141,6 +141,13 @@ public:
PART_SPTR SharedPtr() { return m_me; } PART_SPTR SharedPtr() { return m_me; }
private:
// We create a different set parent function for this class, so we hide
// the inherited one.
using EDA_ITEM::SetParent;
public:
void SetParent( LIB_PART* aParent = nullptr ); void SetParent( LIB_PART* aParent = nullptr );
PART_REF& GetParent() { return m_parent; } PART_REF& GetParent() { return m_parent; }

2
eeschema/sch_component.h
View File

@ -52,7 +52,7 @@
#include <symbol_lib_table.h> #include <symbol_lib_table.h>
#include <transform.h> #include <transform.h>
class COMPONENT_SELECTION; struct COMPONENT_SELECTION;
class SCH_SCREEN; class SCH_SCREEN;
class LIB_ITEM; class LIB_ITEM;
class LIB_PIN; class LIB_PIN;

8
pcbnew/eagle_plugin.cpp
View File

@ -1529,7 +1529,7 @@ void EAGLE_PLUGIN::packagePad( MODULE* aModule, wxXmlNode* aTree )
// this is thru hole technology here, no SMDs // this is thru hole technology here, no SMDs
EPAD e( aTree ); EPAD e( aTree );
int shape = EPAD::UNDEF; int shape = EPAD::UNDEF;
int drillz = e.drill.ToPcbUnits(); int eagleDrillz = e.drill.ToPcbUnits();
D_PAD* pad = new D_PAD( aModule ); D_PAD* pad = new D_PAD( aModule );
aModule->Add( pad ); aModule->Add( pad );
@ -1542,11 +1542,11 @@ void EAGLE_PLUGIN::packagePad( MODULE* aModule, wxXmlNode* aTree )
else if( aModule->GetLayer() == B_Cu && m_rules->psBottom != EPAD::UNDEF ) else if( aModule->GetLayer() == B_Cu && m_rules->psBottom != EPAD::UNDEF )
shape = m_rules->psBottom; shape = m_rules->psBottom;
pad->SetDrillSize( wxSize( drillz, drillz ) ); pad->SetDrillSize( wxSize( eagleDrillz, eagleDrillz ) );
pad->SetLayerSet( LSET::AllCuMask() ); pad->SetLayerSet( LSET::AllCuMask() );
if( drillz < m_min_hole ) if( eagleDrillz < m_min_hole )
m_min_hole = drillz; m_min_hole = eagleDrillz;
// Solder mask // Solder mask
if( !e.stop || *e.stop == true ) // enabled by default if( !e.stop || *e.stop == true ) // enabled by default