realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compil warnings (some due to declarations colliding with a Windows header)

Browse Source
This commit is contained in:
jean-pierre charras 2025-08-03 15:59:05 +02:00
parent 7102b2d5e5
commit e1c56c71ef
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/io/cadstar/cadstar_archive_objects.h
View File

@ -30,7 +30,7 @@
enum class CADSTAR_PIN_TYPE
{
UNCOMMITTED, ///< Uncommitted pin (default)
INPUT, ///< Input pin
PIN_INPUT, ///< Input pin
OUTPUT_OR, ///< Output pin OR tieable
OUTPUT_NOT_OR, ///< Output pin not OR tieable
OUTPUT_NOT_NORM_OR, ///< Output pin not normally OR tieable

8
common/io/cadstar/cadstar_archive_parser.cpp
View File

@ -444,7 +444,7 @@ void CADSTAR_ARCHIVE_PARSER::VERTEX::Parse( XNODE* aNode, PARSER_CONTEXT* aConte
if( aNodeName == wxT( "PT" ) )
{
Type = VERTEX_TYPE::POINT;
Type = VERTEX_TYPE::VT_POINT;
Center.x = UNDEFINED_VALUE;
Center.y = UNDEFINED_VALUE;
End.Parse( aNode, aContext );
@ -486,7 +486,7 @@ void CADSTAR_ARCHIVE_PARSER::VERTEX::AppendToChain( SHAPE_LINE_CHAIN* aChainToAp
const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
int aAccuracy ) const
{
if( Type == VERTEX_TYPE::POINT )
if( Type == VERTEX_TYPE::VT_POINT )
{
aChainToAppendTo->Append( aCadstarToKicadPointCallback( End ) );
return;
@ -504,7 +504,7 @@ void CADSTAR_ARCHIVE_PARSER::VERTEX::AppendToChain( SHAPE_LINE_CHAIN* aChainToAp
SHAPE_ARC CADSTAR_ARCHIVE_PARSER::VERTEX::BuildArc( const VECTOR2I& aPrevPoint,
const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback ) const
{
wxCHECK_MSG( Type != VERTEX_TYPE::POINT, SHAPE_ARC(),
wxCHECK_MSG( Type != VERTEX_TYPE::VT_POINT, SHAPE_ARC(),
"Can't build an arc for a straight segment!" );
VECTOR2I startPoint = aPrevPoint;
@ -1791,7 +1791,7 @@ CADSTAR_PIN_TYPE CADSTAR_ARCHIVE_PARSER::PART::GetPinType( XNODE* aNode )
wxString pinTypeStr = GetXmlAttributeIDString( aNode, 0 );
std::map<wxString, CADSTAR_PIN_TYPE> pinTypeMap = {
{ wxT( "INPUT" ), CADSTAR_PIN_TYPE::INPUT },
{ wxT( "INPUT" ), CADSTAR_PIN_TYPE::PIN_INPUT },
{ wxT( "OUTPUT_OR" ), CADSTAR_PIN_TYPE::OUTPUT_OR },
{ wxT( "OUTPUT_NOT_OR" ), CADSTAR_PIN_TYPE::OUTPUT_NOT_OR },
{ wxT( "OUTPUT_NOT_NORM_OR" ), CADSTAR_PIN_TYPE::OUTPUT_NOT_NORM_OR },

4
common/io/cadstar/cadstar_archive_parser.h
View File

@ -429,7 +429,7 @@ public:
enum class VERTEX_TYPE
{
POINT,
VT_POINT,
CLOCKWISE_ARC,
CLOCKWISE_SEMICIRCLE,
ANTICLOCKWISE_ARC,
@ -442,7 +442,7 @@ public:
*/
struct VERTEX : PARSER
{
VERTEX( VERTEX_TYPE aType = VERTEX_TYPE::POINT, POINT aEnd = POINT(), POINT aCenter = POINT() ) :
VERTEX( VERTEX_TYPE aType = VERTEX_TYPE::VT_POINT, POINT aEnd = POINT(), POINT aCenter = POINT() ) :
Type( aType ),
End( aEnd ),
Center( aCenter )

2
common/io/cadstar/cadstar_parts_lib_parser.cpp
View File

@ -499,7 +499,7 @@ struct CADSTAR_LIB_PARSER_ACTION<PIN_TYPE>
// with special meaning
static const std::map<std::string, CADSTAR_PIN_TYPE> tokenToPinType = {
{ "U", CADSTAR_PIN_TYPE::UNCOMMITTED },
{ "I", CADSTAR_PIN_TYPE::INPUT },
{ "I", CADSTAR_PIN_TYPE::PIN_INPUT },
{ "N", CADSTAR_PIN_TYPE::OUTPUT_NOT_OR },
{ "Y", CADSTAR_PIN_TYPE::OUTPUT_OR },
{ "Q", CADSTAR_PIN_TYPE::OUTPUT_NOT_NORM_OR },

2
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -1128,7 +1128,7 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnBtnCreateJumperPinGroup( wxCommandEvent& aE
{
group << m_listAvailablePins->GetString( idx );
if( ++i < (int) selections.Count() )
if( ++i < selections.Count() )
group << ", ";
}

10
eeschema/sch_io/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -1990,7 +1990,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadLibrarySymbolShapeVertices( const std::vect
const VERTEX* prev = &aCadstarVertices.at( 0 );
const VERTEX* cur;
wxASSERT_MSG( prev->Type == VERTEX_TYPE::POINT, "First vertex should always be a point." );
wxASSERT_MSG( prev->Type == VERTEX_TYPE::VT_POINT, "First vertex should always be a point." );
for( size_t i = 1; i < aCadstarVertices.size(); i++ )
{
@ -2015,7 +2015,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadLibrarySymbolShapeVertices( const std::vect
switch( cur->Type )
{
case VERTEX_TYPE::POINT:
case VERTEX_TYPE::VT_POINT:
shape = new SCH_SHAPE( SHAPE_T::POLY, LAYER_DEVICE );
shape->AddPoint( startPoint );
shape->AddPoint( endPoint );
@ -2378,7 +2378,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadShapeVertices( const std::vector<VERTEX>& a
const VERTEX* prev = &aCadstarVertices.at( 0 );
const VERTEX* cur;
wxASSERT_MSG( prev->Type == VERTEX_TYPE::POINT,
wxASSERT_MSG( prev->Type == VERTEX_TYPE::VT_POINT,
"First vertex should always be a point vertex" );
auto pointTransform =
@ -2411,7 +2411,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadShapeVertices( const std::vector<VERTEX>& a
break;
}
case VERTEX_TYPE::POINT:
case VERTEX_TYPE::VT_POINT:
{
SCH_LINE* segment = new SCH_LINE();
@ -2842,7 +2842,7 @@ ELECTRICAL_PINTYPE CADSTAR_SCH_ARCHIVE_LOADER::getKiCadPinType( const CADSTAR_PI
switch( aPinType )
{
case CADSTAR_PIN_TYPE::UNCOMMITTED: return ELECTRICAL_PINTYPE::PT_PASSIVE;
case CADSTAR_PIN_TYPE::INPUT: return ELECTRICAL_PINTYPE::PT_INPUT;
case CADSTAR_PIN_TYPE::PIN_INPUT: return ELECTRICAL_PINTYPE::PT_INPUT;
case CADSTAR_PIN_TYPE::OUTPUT_OR: return ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR;
case CADSTAR_PIN_TYPE::OUTPUT_NOT_OR: return ELECTRICAL_PINTYPE::PT_OUTPUT;
case CADSTAR_PIN_TYPE::OUTPUT_NOT_NORM_OR: return ELECTRICAL_PINTYPE::PT_OUTPUT;

2
pcbnew/pcb_io/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -2945,7 +2945,7 @@ PCB_SHAPE* CADSTAR_PCB_ARCHIVE_LOADER::getShapeFromVertex( const POINT& aCadstar
switch( aCadstarVertex.Type )
{
case VERTEX_TYPE::POINT:
case VERTEX_TYPE::VT_POINT:
shape = new PCB_SHAPE( aContainer, SHAPE_T::SEGMENT );
shape->SetStart( startPoint );