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

EDA_TEXT: rename GetEffectiveShape() to GetEffectiveTextShape() to avoid name aliasing with BOARD_ITEM inteface

This commit is contained in:
Tomasz Wlostowski 2020-08-09 00:36:33 +02:00
parent 35e45c5917
commit 6358995ff8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/eda_text.cpp
View File

@ -617,7 +617,7 @@ void EDA_TEXT::TransformTextShapeToSegmentList( std::vector<wxPoint>& aCornerBuf
} }
std::shared_ptr<SHAPE> EDA_TEXT::GetEffectiveShape( ) const std::shared_ptr<SHAPE> EDA_TEXT::GetEffectiveTextShape( ) const
{ {
std::shared_ptr<SHAPE_COMPOUND> shape ( new SHAPE_COMPOUND ); std::shared_ptr<SHAPE_COMPOUND> shape ( new SHAPE_COMPOUND );
int penWidth = GetEffectiveTextPenWidth(); int penWidth = GetEffectiveTextPenWidth();

2
include/eda_text.h
View File

@ -293,7 +293,7 @@ public:
void TransformBoundingBoxWithClearanceToPolygon( SHAPE_POLY_SET* aCornerBuffer, void TransformBoundingBoxWithClearanceToPolygon( SHAPE_POLY_SET* aCornerBuffer,
int aClearanceValue ) const; int aClearanceValue ) const;
std::shared_ptr<SHAPE> GetEffectiveShape( ) const; std::shared_ptr<SHAPE> GetEffectiveTextShape( ) const;
/** /**
* Test if \a aPoint is within the bounds of this object. * Test if \a aPoint is within the bounds of this object.