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

Remove declaration "using std::unique_ptr" in a header. 

Near useless, and it created swig warning
This commit is contained in:
jean-pierre charras 2020-05-08 09:39:47 +02:00
parent 7c935b1997
commit 07c4689fb4
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/class_board.h
View File

@ -40,8 +40,6 @@
#include <memory> #include <memory>
using std::unique_ptr;
class PCB_BASE_FRAME; class PCB_BASE_FRAME;
class PCB_EDIT_FRAME; class PCB_EDIT_FRAME;
class PCBNEW_SETTINGS; class PCBNEW_SETTINGS;

4
pcbnew/footprint_viewer_frame.cpp
View File

@ -409,7 +409,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateFootprintList()
EDA_COMBINED_MATCHER matcher( term ); EDA_COMBINED_MATCHER matcher( term );
int matches, position; int matches, position;
for( const unique_ptr<FOOTPRINT_INFO>& footprint : fp_info_list->GetList() ) for( const std::unique_ptr<FOOTPRINT_INFO>& footprint : fp_info_list->GetList() )
{ {
wxString search = footprint->GetFootprintName() + " " + footprint->GetSearchText(); wxString search = footprint->GetFootprintName() + " " + footprint->GetSearchText();
bool matched = matcher.Find( search.Lower(), matches, position ); bool matched = matcher.Find( search.Lower(), matches, position );
@ -423,7 +423,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateFootprintList()
} }
} }
for( const unique_ptr<FOOTPRINT_INFO>& footprint : fp_info_list->GetList() ) for( const std::unique_ptr<FOOTPRINT_INFO>& footprint : fp_info_list->GetList() )
{ {
if( !excludes.count( footprint->GetFootprintName() ) ) if( !excludes.count( footprint->GetFootprintName() ) )
m_fpList->Append( footprint->GetFootprintName() ); m_fpList->Append( footprint->GetFootprintName() );

26
pcbnew/import_gfx/graphics_importer_pcbnew.cpp
View File

@ -61,7 +61,7 @@ int GRAPHICS_IMPORTER_PCBNEW::MapLineWidth( double aLineWidth )
void GRAPHICS_IMPORTER_PCBNEW::AddLine( const VECTOR2D& aOrigin, const VECTOR2D& aEnd, double aWidth ) void GRAPHICS_IMPORTER_PCBNEW::AddLine( const VECTOR2D& aOrigin, const VECTOR2D& aEnd, double aWidth )
{ {
unique_ptr<DRAWSEGMENT> line( createDrawing() ); std::unique_ptr<DRAWSEGMENT> line( createDrawing() );
line->SetShape( S_SEGMENT ); line->SetShape( S_SEGMENT );
line->SetLayer( GetLayer() ); line->SetLayer( GetLayer() );
line->SetWidth( MapLineWidth( aWidth ) ); line->SetWidth( MapLineWidth( aWidth ) );
@ -77,7 +77,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddLine( const VECTOR2D& aOrigin, const VECTOR2D&
void GRAPHICS_IMPORTER_PCBNEW::AddCircle( const VECTOR2D& aCenter, double aRadius, double aWidth ) void GRAPHICS_IMPORTER_PCBNEW::AddCircle( const VECTOR2D& aCenter, double aRadius, double aWidth )
{ {
unique_ptr<DRAWSEGMENT> circle( createDrawing() ); std::unique_ptr<DRAWSEGMENT> circle( createDrawing() );
circle->SetShape( S_CIRCLE ); circle->SetShape( S_CIRCLE );
circle->SetLayer( GetLayer() ); circle->SetLayer( GetLayer() );
circle->SetWidth( MapLineWidth( aWidth ) ); circle->SetWidth( MapLineWidth( aWidth ) );
@ -94,7 +94,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddCircle( const VECTOR2D& aCenter, double aRadiu
void GRAPHICS_IMPORTER_PCBNEW::AddArc( const VECTOR2D& aCenter, const VECTOR2D& aStart, void GRAPHICS_IMPORTER_PCBNEW::AddArc( const VECTOR2D& aCenter, const VECTOR2D& aStart,
double aAngle, double aWidth ) double aAngle, double aWidth )
{ {
unique_ptr<DRAWSEGMENT> arc( createDrawing() ); std::unique_ptr<DRAWSEGMENT> arc( createDrawing() );
arc->SetShape( S_ARC ); arc->SetShape( S_ARC );
arc->SetLayer( GetLayer() ); arc->SetLayer( GetLayer() );
arc->SetWidth( MapLineWidth( aWidth ) ); arc->SetWidth( MapLineWidth( aWidth ) );
@ -117,7 +117,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddPolygon( const std::vector< VECTOR2D >& aVerti
for( const VECTOR2D& precisePoint : aVertices ) for( const VECTOR2D& precisePoint : aVertices )
convertedPoints.emplace_back( MapCoordinate( precisePoint ) ); convertedPoints.emplace_back( MapCoordinate( precisePoint ) );
unique_ptr<DRAWSEGMENT> polygon( createDrawing() ); std::unique_ptr<DRAWSEGMENT> polygon( createDrawing() );
polygon->SetShape( S_POLYGON ); polygon->SetShape( S_POLYGON );
polygon->SetLayer( GetLayer() ); polygon->SetLayer( GetLayer() );
polygon->SetPolyPoints( convertedPoints ); polygon->SetPolyPoints( convertedPoints );
@ -134,7 +134,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddText( const VECTOR2D& aOrigin, const wxString&
double aHeight, double aWidth, double aThickness, double aOrientation, double aHeight, double aWidth, double aThickness, double aOrientation,
EDA_TEXT_HJUSTIFY_T aHJustify, EDA_TEXT_VJUSTIFY_T aVJustify ) EDA_TEXT_HJUSTIFY_T aHJustify, EDA_TEXT_VJUSTIFY_T aVJustify )
{ {
unique_ptr<BOARD_ITEM> boardItem; std::unique_ptr<BOARD_ITEM> boardItem;
EDA_TEXT* textItem; EDA_TEXT* textItem;
tie( boardItem, textItem ) = createText(); tie( boardItem, textItem ) = createText();
boardItem->SetLayer( GetLayer() ); boardItem->SetLayer( GetLayer() );
@ -157,7 +157,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddText( const VECTOR2D& aOrigin, const wxString&
void GRAPHICS_IMPORTER_PCBNEW::AddSpline( const VECTOR2D& aStart, const VECTOR2D& BezierControl1, void GRAPHICS_IMPORTER_PCBNEW::AddSpline( const VECTOR2D& aStart, const VECTOR2D& BezierControl1,
const VECTOR2D& BezierControl2, const VECTOR2D& aEnd, double aWidth ) const VECTOR2D& BezierControl2, const VECTOR2D& aEnd, double aWidth )
{ {
unique_ptr<DRAWSEGMENT> spline( createDrawing() ); std::unique_ptr<DRAWSEGMENT> spline( createDrawing() );
spline->SetShape( S_CURVE ); spline->SetShape( S_CURVE );
spline->SetLayer( GetLayer() ); spline->SetLayer( GetLayer() );
spline->SetWidth( MapLineWidth( aWidth ) ); spline->SetWidth( MapLineWidth( aWidth ) );
@ -174,27 +174,27 @@ void GRAPHICS_IMPORTER_PCBNEW::AddSpline( const VECTOR2D& aStart, const VECTOR2D
} }
unique_ptr<DRAWSEGMENT> GRAPHICS_IMPORTER_BOARD::createDrawing() std::unique_ptr<DRAWSEGMENT> GRAPHICS_IMPORTER_BOARD::createDrawing()
{ {
return std::make_unique<DRAWSEGMENT>( m_board ); return std::make_unique<DRAWSEGMENT>( m_board );
} }
std::pair<unique_ptr<BOARD_ITEM>, EDA_TEXT*> GRAPHICS_IMPORTER_BOARD::createText() std::pair<std::unique_ptr<BOARD_ITEM>, EDA_TEXT*> GRAPHICS_IMPORTER_BOARD::createText()
{ {
TEXTE_PCB* text = new TEXTE_PCB( m_board ); TEXTE_PCB* text = new TEXTE_PCB( m_board );
return make_pair( unique_ptr<BOARD_ITEM>( text ), static_cast<EDA_TEXT*>( text ) ); return make_pair( std::unique_ptr<BOARD_ITEM>( text ), static_cast<EDA_TEXT*>( text ) );
} }
unique_ptr<DRAWSEGMENT> GRAPHICS_IMPORTER_MODULE::createDrawing() std::unique_ptr<DRAWSEGMENT> GRAPHICS_IMPORTER_MODULE::createDrawing()
{ {
return unique_ptr<DRAWSEGMENT>( new EDGE_MODULE( m_module ) ); return std::unique_ptr<DRAWSEGMENT>( new EDGE_MODULE( m_module ) );
} }
std::pair<unique_ptr<BOARD_ITEM>, EDA_TEXT*> GRAPHICS_IMPORTER_MODULE::createText() std::pair<std::unique_ptr<BOARD_ITEM>, EDA_TEXT*> GRAPHICS_IMPORTER_MODULE::createText()
{ {
TEXTE_MODULE* text = new TEXTE_MODULE( m_module ); TEXTE_MODULE* text = new TEXTE_MODULE( m_module );
return make_pair( unique_ptr<BOARD_ITEM>( text ), static_cast<EDA_TEXT*>( text ) ); return make_pair( std::unique_ptr<BOARD_ITEM>( text ), static_cast<EDA_TEXT*>( text ) );
} }