From af2c52cf0a2cabcba24b3e7da05fdecd66e64f70 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Fri, 12 Apr 2024 23:06:23 -0400 Subject: [PATCH] Remove wxT() that gets fed to ostream in boost and causes compile error --- qa/tests/eeschema/test_sch_netclass.cpp | 4 ++-- qa/tests/pcbnew/pcb_io/altium/test_altium_pcblib_import.cpp | 2 +- qa/tests/pcbnew/pcb_io/cadstar/test_cadstar_footprints.cpp | 2 +- qa/tests/pcbnew/pcb_io/eagle/test_eagle_lbr_import.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qa/tests/eeschema/test_sch_netclass.cpp b/qa/tests/eeschema/test_sch_netclass.cpp index 8ec41742c3..582f10063f 100644 --- a/qa/tests/eeschema/test_sch_netclass.cpp +++ b/qa/tests/eeschema/test_sch_netclass.cpp @@ -44,9 +44,9 @@ BOOST_AUTO_TEST_CASE( TestSubsheetNetclass ) wxString name = label->GetText(); if( name == wxT( "B" ) || name == wxT( "D" ) ) - BOOST_CHECK_EQUAL( label->GetEffectiveNetClass( &path )->GetName(), wxT( "net_02" ) ); + BOOST_CHECK_EQUAL( label->GetEffectiveNetClass( &path )->GetName(), "net_02" ); else - BOOST_CHECK_EQUAL( label->GetEffectiveNetClass( &path )->GetName(), wxT( "net_01" ) ); + BOOST_CHECK_EQUAL( label->GetEffectiveNetClass( &path )->GetName(), "net_01" ); } } diff --git a/qa/tests/pcbnew/pcb_io/altium/test_altium_pcblib_import.cpp b/qa/tests/pcbnew/pcb_io/altium/test_altium_pcblib_import.cpp index 8f8cc26be7..85e5274fba 100644 --- a/qa/tests/pcbnew/pcb_io/altium/test_altium_pcblib_import.cpp +++ b/qa/tests/pcbnew/pcb_io/altium/test_altium_pcblib_import.cpp @@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE( AltiumPcbLibImport ) false, nullptr ); BOOST_CHECK( altiumFp ); - BOOST_CHECK_EQUAL( wxT( "REF**" ), altiumFp->GetReference() ); + BOOST_CHECK_EQUAL( "REF**", altiumFp->GetReference() ); BOOST_CHECK_EQUAL( footprintName, altiumFp->GetValue() ); FOOTPRINT* kicadFp = kicadPlugin.FootprintLoad( kicadLibraryPath, footprintName, diff --git a/qa/tests/pcbnew/pcb_io/cadstar/test_cadstar_footprints.cpp b/qa/tests/pcbnew/pcb_io/cadstar/test_cadstar_footprints.cpp index 79b994cb5d..6428f82200 100644 --- a/qa/tests/pcbnew/pcb_io/cadstar/test_cadstar_footprints.cpp +++ b/qa/tests/pcbnew/pcb_io/cadstar/test_cadstar_footprints.cpp @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE( CadstarFootprintImport ) false, nullptr ); BOOST_CHECK( eagleFp ); - BOOST_CHECK_EQUAL( wxT( "REF**" ), eagleFp->GetReference() ); + BOOST_CHECK_EQUAL( "REF**", eagleFp->GetReference() ); BOOST_CHECK_EQUAL( footprintName, eagleFp->GetValue() ); FOOTPRINT* kicadFp = diff --git a/qa/tests/pcbnew/pcb_io/eagle/test_eagle_lbr_import.cpp b/qa/tests/pcbnew/pcb_io/eagle/test_eagle_lbr_import.cpp index ac49667b01..3e0fb20831 100644 --- a/qa/tests/pcbnew/pcb_io/eagle/test_eagle_lbr_import.cpp +++ b/qa/tests/pcbnew/pcb_io/eagle/test_eagle_lbr_import.cpp @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE( EagleLbrLibImport ) false, nullptr ); BOOST_CHECK( eagleFp ); - BOOST_CHECK_EQUAL( wxT( "REF**" ), eagleFp->GetReference() ); + BOOST_CHECK_EQUAL( "REF**", eagleFp->GetReference() ); BOOST_CHECK_EQUAL( footprintName, eagleFp->GetValue() ); FOOTPRINT* kicadFp = kicadPlugin.FootprintLoad( kicadLibraryPath, footprintName,