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

Unwrap the FROM_UTF8 macro in favor of direct function 

The extern just gets annoying to try to export the func later. We also yeet TO_UTF8 to string_utils.h for parity.
This commit is contained in:
Marek Roszko 2023-09-09 00:10:57 -04:00
parent bd3aca2887
commit 11de95778b
90 changed files with 266 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -227,10 +227,10 @@ bool EDA_3D_CANVAS::initializeOpenGL()
else else
{ {
wxLogTrace( m_logTrace, wxT( "EDA_3D_CANVAS::initializeOpenGL Using GLEW version %s" ), wxLogTrace( m_logTrace, wxT( "EDA_3D_CANVAS::initializeOpenGL Using GLEW version %s" ),
FROM_UTF8( (char*) glewGetString( GLEW_VERSION ) ) ); From_UTF8( (char*) glewGetString( GLEW_VERSION ) ) );
} }
wxString version = FROM_UTF8( (char *) glGetString( GL_VERSION ) ); wxString version = From_UTF8( (char *) glGetString( GL_VERSION ) );
wxLogTrace( m_logTrace, wxT( "EDA_3D_CANVAS::%s OpenGL version string %s." ), wxLogTrace( m_logTrace, wxT( "EDA_3D_CANVAS::%s OpenGL version string %s." ),
__WXFUNCTION__, version ); __WXFUNCTION__, version );

2
3d-viewer/3d_model_viewer/eda_3d_model_viewer.cpp
View File

@ -197,7 +197,7 @@ void EDA_3D_MODEL_VIEWER::ogl_initialize()
else else
{ {
wxLogTrace( m_logTrace, wxT( "EDA_3D_MODEL_VIEWER::ogl_initialize Using GLEW version %s" ), wxLogTrace( m_logTrace, wxT( "EDA_3D_MODEL_VIEWER::ogl_initialize Using GLEW version %s" ),
FROM_UTF8( (char*) glewGetString( GLEW_VERSION ) ) ); From_UTF8( (char*) glewGetString( GLEW_VERSION ) ) );
} }
glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST );

1
common/dialogs/dialog_page_settings.cpp
View File

@ -37,6 +37,7 @@
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <drawing_sheet/ds_data_model.h> #include <drawing_sheet/ds_data_model.h>
#include <drawing_sheet/ds_painter.h> #include <drawing_sheet/ds_painter.h>
#include <string_utils.h>
#include <widgets/std_bitmap_button.h> #include <widgets/std_bitmap_button.h>
#include <wx/valgen.h> #include <wx/valgen.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>

6
common/dialogs/dialog_plugin_options.cpp
View File

@ -30,7 +30,7 @@
#include <widgets/wx_grid.h> #include <widgets/wx_grid.h>
#include <widgets/std_bitmap_button.h> #include <widgets/std_bitmap_button.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <macros.h> #include <string_utils.h>
#define INITIAL_HELP \ #define INITIAL_HELP \
@ -67,7 +67,7 @@ DIALOG_PLUGIN_OPTIONS::DIALOG_PLUGIN_OPTIONS( wxWindow* aParent,
for( STRING_UTF8_MAP::const_iterator it = m_choices.begin(); it != m_choices.end(); for( STRING_UTF8_MAP::const_iterator it = m_choices.begin(); it != m_choices.end();
++it, ++row ) ++it, ++row )
{ {
wxString item = FROM_UTF8( it->first.c_str() ); wxString item = From_UTF8( it->first.c_str() );
m_listbox->InsertItems( 1, &item, row ); m_listbox->InsertItems( 1, &item, row );
} }
@ -113,7 +113,7 @@ bool DIALOG_PLUGIN_OPTIONS::TransferDataToWindow()
for( STRING_UTF8_MAP::const_iterator it = props->begin(); it != props->end(); for( STRING_UTF8_MAP::const_iterator it = props->begin(); it != props->end();
++it, ++row ) ++it, ++row )
{ {
m_grid->SetCellValue( row, 0, FROM_UTF8( it->first.c_str() ) ); m_grid->SetCellValue( row, 0, From_UTF8( it->first.c_str() ) );
m_grid->SetCellValue( row, 1, it->second ); m_grid->SetCellValue( row, 1, it->second );
} }

2
common/dialogs/eda_reorderable_list_dialog.cpp
View File

@ -19,7 +19,7 @@
#include <algorithm> #include <algorithm>
#include <bitmaps.h> #include <bitmaps.h>
#include <macros.h> #include <string_utils.h>
#include <dialogs/eda_reorderable_list_dialog.h> #include <dialogs/eda_reorderable_list_dialog.h>

4
common/drawing_sheet/ds_data_model_io.cpp
View File

@ -26,7 +26,6 @@
#include <string_utils.h> #include <string_utils.h>
#include <locale_io.h> #include <locale_io.h>
#include <macros.h>
#include <math/vector2d.h> #include <math/vector2d.h>
#include <drawing_sheet/ds_painter.h> #include <drawing_sheet/ds_painter.h>
#include <drawing_sheet/ds_data_item.h> #include <drawing_sheet/ds_data_item.h>
@ -34,6 +33,7 @@
#include <drawing_sheet/drawing_sheet_lexer.h> #include <drawing_sheet/drawing_sheet_lexer.h>
#include <drawing_sheet/ds_file_versions.h> #include <drawing_sheet/ds_file_versions.h>
#include <font/font.h> #include <font/font.h>
#include <string_utils.h>
#include <wx/base64.h> #include <wx/base64.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
@ -125,7 +125,7 @@ public:
~DS_DATA_MODEL_STRINGIO() ~DS_DATA_MODEL_STRINGIO()
{ {
*m_output = FROM_UTF8( m_writer->GetString().c_str() ); *m_output = From_UTF8( m_writer->GetString().c_str() );
delete m_writer; delete m_writer;
} }

2
common/drawing_sheet/ds_proxy_undo_item.cpp
View File

@ -26,7 +26,7 @@
#include <drawing_sheet/ds_data_model.h> #include <drawing_sheet/ds_data_model.h>
#include <view/view.h> #include <view/view.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <macros.h> #include <string_utils.h>
using namespace KIGFX; using namespace KIGFX;

4
common/font/fontconfig.cpp
View File

@ -137,7 +137,7 @@ std::string FONTCONFIG::getFamilyStringByLang( FONTCONFIG_PAT& aPat, const wxStr
for( auto const& [key, val] : famStrings ) for( auto const& [key, val] : famStrings )
{ {
if( isLanguageMatch( aDesiredLang, FROM_UTF8( key.c_str() ) ) ) if( isLanguageMatch( aDesiredLang, From_UTF8( key.c_str() ) ) )
{ {
return val; return val;
} }
@ -297,7 +297,7 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string&
FONTCONFIG_PAT patHolder{ font }; FONTCONFIG_PAT patHolder{ font };
std::string theFamily = std::string theFamily =
getFamilyStringByLang( patHolder, FROM_UTF8( aDesiredLang.c_str() ) ); getFamilyStringByLang( patHolder, From_UTF8( aDesiredLang.c_str() ) );
#ifdef __WXMAC__ #ifdef __WXMAC__
// On Mac (at least) some of the font names are in their own language. If // On Mac (at least) some of the font names are in their own language. If

4
common/import_gfx/dxf_import_plugin.cpp
View File

@ -316,8 +316,8 @@ void DXF_IMPORT_PLUGIN::addLayer( const DL_LayerData& aData )
void DXF_IMPORT_PLUGIN::addLinetype( const DL_LinetypeData& data ) void DXF_IMPORT_PLUGIN::addLinetype( const DL_LinetypeData& data )
{ {
#if 0 #if 0
wxString name = FROM_UTF8( data.name.c_str() ); wxString name = From_UTF8( data.name.c_str() );
wxString description = FROM_UTF8( data.description.c_str() ); wxString description = From_UTF8( data.description.c_str() );
#endif #endif
} }

4
common/markup_parser.cpp
View File

@ -21,7 +21,7 @@
#include <markup_parser.h> #include <markup_parser.h>
#include <sstream> #include <sstream>
#include "macros.h" #include <string_utils.h>
using namespace MARKUP; using namespace MARKUP;
@ -65,7 +65,7 @@ std::string NODE::typeString() const
wxString NODE::asWxString() const wxString NODE::asWxString() const
{ {
return FROM_UTF8( string().c_str() ); return From_UTF8( string().c_str() );
} }

3
common/pgm_base.cpp
View File

@ -64,6 +64,7 @@
#include <python_scripting.h> #include <python_scripting.h>
#include <settings/common_settings.h> #include <settings/common_settings.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <string_utils.h>
#include <systemdirsappend.h> #include <systemdirsappend.h>
#include <core/thread_pool.h> #include <core/thread_pool.h>
#include <trace_helpers.h> #include <trace_helpers.h>
@ -945,7 +946,7 @@ void PGM_BASE::HandleException( std::exception_ptr aPtr )
#endif #endif
wxLogError( wxT( "Unhandled exception class: %s what: %s" ), wxLogError( wxT( "Unhandled exception class: %s what: %s" ),
FROM_UTF8( typeid( e ).name() ), FROM_UTF8( e.what() ) ); From_UTF8( typeid( e ).name() ), From_UTF8( e.what() ) );
} }
catch( ... ) catch( ... )
{ {

1
common/plotters/PS_plotter.cpp
View File

@ -30,6 +30,7 @@
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <macros.h> #include <macros.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <string_utils.h>
#include <trigo.h> #include <trigo.h>
#include <plotters/plotters_pslike.h> #include <plotters/plotters_pslike.h>

3
common/reporter.cpp
View File

@ -27,6 +27,7 @@
#include <macros.h> #include <macros.h>
#include <reporter.h> #include <reporter.h>
#include <string_utils.h>
#include <widgets/wx_infobar.h> #include <widgets/wx_infobar.h>
#include <widgets/wx_html_report_panel.h> #include <widgets/wx_html_report_panel.h>
#include <wx/crt.h> #include <wx/crt.h>
@ -36,7 +37,7 @@
REPORTER& REPORTER::Report( const char* aText, SEVERITY aSeverity ) REPORTER& REPORTER::Report( const char* aText, SEVERITY aSeverity )
{ {
Report( FROM_UTF8( aText ) ); Report( From_UTF8( aText ) );
return *this; return *this;
} }

4
common/richio.cpp
View File

@ -109,7 +109,7 @@ std::string StrPrintf( const char* format, ... )
wxString SafeReadFile( const wxString& aFilePath, const wxString& aReadType ) wxString SafeReadFile( const wxString& aFilePath, const wxString& aReadType )
{ {
auto FROM_UTF8_WINE = auto From_UTF8_WINE =
[]( const char* cstring ) []( const char* cstring )
{ {
wxString line = wxString::FromUTF8( cstring ); wxString line = wxString::FromUTF8( cstring );
@ -142,7 +142,7 @@ wxString SafeReadFile( const wxString& aFilePath, const wxString& aReadType )
wxString contents; wxString contents;
while( fileReader.ReadLine() ) while( fileReader.ReadLine() )
contents += FROM_UTF8_WINE( fileReader.Line() ); contents += From_UTF8_WINE( fileReader.Line() );
return contents; return contents;
} }

2
common/search_stack.cpp
View File

@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <macros.h>
#include <search_stack.h> #include <search_stack.h>
#include <string_utils.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/log.h> #include <wx/log.h>

4
common/string_utils.cpp
View File

@ -412,7 +412,7 @@ int ReadDelimitedText( wxString* aDest, const char* aSource )
} }
} }
*aDest = FROM_UTF8( utf8.c_str() ); *aDest = From_UTF8( utf8.c_str() );
return aSource - start; return aSource - start;
} }
@ -1016,7 +1016,7 @@ int GetTrailingInt( const wxString& aStr )
wxString GetIllegalFileNameWxChars() wxString GetIllegalFileNameWxChars()
{ {
return FROM_UTF8( illegalFileNameChars ); return From_UTF8( illegalFileNameChars );
} }

4
common/swig/wx_python_helpers.cpp
View File

@ -28,7 +28,7 @@
*/ */
#include <Python.h> // must be first to avoid wx/python typedef conflicts on msvc #include <Python.h> // must be first to avoid wx/python typedef conflicts on msvc
#include <macros.h> #include <string_utils.h>
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/arrstr.h> #include <wx/arrstr.h>
@ -87,7 +87,7 @@ wxString Py2wxString( PyObject* src )
size_t len = PyUnicode_GET_LENGTH( uni_str ); size_t len = PyUnicode_GET_LENGTH( uni_str );
if( len ) if( len )
result = FROM_UTF8( PyUnicode_AsUTF8( uni_str ) ); result = From_UTF8( PyUnicode_AsUTF8( uni_str ) );
if( must_unref_str ) if( must_unref_str )
{ {

4
common/template_fieldnames.cpp
View File

@ -24,9 +24,9 @@
#include <mutex> #include <mutex>
#include <macros.h>
#include <template_fieldnames.h> #include <template_fieldnames.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <string_utils.h>
using namespace TFIELD_T; using namespace TFIELD_T;
@ -95,7 +95,7 @@ void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
in->NeedSYMBOLorNUMBER(); in->NeedSYMBOLorNUMBER();
m_Name = FROM_UTF8( in->CurText() ); m_Name = From_UTF8( in->CurText() );
in->NeedRIGHT(); // end (name ...) in->NeedRIGHT(); // end (name ...)

2
common/xnode.cpp
View File

@ -24,7 +24,7 @@
#include <xnode.h> #include <xnode.h>
#include <macros.h> #include <string_utils.h>
typedef wxXmlAttribute XATTR; typedef wxXmlAttribute XATTR;

2
cvpcb/auto_associate.cpp
View File

@ -141,7 +141,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
if( *line == 0 ) if( *line == 0 )
continue; continue;
wxString wtext = FROM_UTF8( line ); wxString wtext = From_UTF8( line );
wxString value = GetQuotedText( wtext ); wxString value = GetQuotedText( wtext );
if( value.IsEmpty() ) if( value.IsEmpty() )

2
cvpcb/cvpcb_mainframe.cpp
View File

@ -705,7 +705,7 @@ void CVPCB_MAINFRAME::refreshAfterSymbolSearch( COMPONENT* aSymbol )
// selected footprint. // selected footprint.
if( FindFocus() == m_symbolsListBox || FindFocus() == m_librariesListBox ) if( FindFocus() == m_symbolsListBox || FindFocus() == m_librariesListBox )
{ {
wxString footprintName = FROM_UTF8( aSymbol->GetFPID().Format().c_str() ); wxString footprintName = From_UTF8( aSymbol->GetFPID().Format().c_str() );
m_footprintListBox->SetSelection( m_footprintListBox->GetSelection(), false ); m_footprintListBox->SetSelection( m_footprintListBox->GetSelection(), false );

4
cvpcb/display_footprints_frame.cpp
View File

@ -409,8 +409,8 @@ FOOTPRINT* DISPLAY_FOOTPRINTS_FRAME::GetFootprint( const wxString& aFootprintNam
return nullptr; return nullptr;
} }
wxString libNickname = FROM_UTF8( fpid.GetLibNickname().c_str() ); wxString libNickname = From_UTF8( fpid.GetLibNickname().c_str() );
wxString fpName = FROM_UTF8( fpid.GetLibItemName().c_str() ); wxString fpName = From_UTF8( fpid.GetLibItemName().c_str() );
FP_LIB_TABLE* fpTable = Prj().PcbFootprintLibs(); FP_LIB_TABLE* fpTable = Prj().PcbFootprintLibs();
wxASSERT( fpTable ); wxASSERT( fpTable );

4
cvpcb/readwrite_dlgs.cpp
View File

@ -28,7 +28,7 @@
#include <dialogs/html_message_box.h> #include <dialogs/html_message_box.h>
#include <kiway.h> #include <kiway.h>
#include <lib_id.h> #include <lib_id.h>
#include <macros.h> #include <string_utils.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <fp_conflict_assignment_selector.h> #include <fp_conflict_assignment_selector.h>
@ -268,7 +268,7 @@ bool CVPCB_MAINFRAME::readNetListAndFpFiles( const std::string& aNetlist )
msg = formatSymbolDesc( m_symbolsListBox->GetCount() + 1, msg = formatSymbolDesc( m_symbolsListBox->GetCount() + 1,
component->GetReference(), component->GetReference(),
component->GetValue(), component->GetValue(),
FROM_UTF8( component->GetFPID().Format().c_str() ) ); From_UTF8( component->GetFPID().Format().c_str() ) );
m_symbolsListBox->AppendLine( msg ); m_symbolsListBox->AppendLine( msg );

6
eeschema/cross-probing.cpp
View File

@ -218,7 +218,7 @@ void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
if( !crossProbingSettings.auto_highlight ) if( !crossProbingSettings.auto_highlight )
return; return;
wxString netName = FROM_UTF8( text ); wxString netName = From_UTF8( text );
if( auto sg = Schematic().ConnectionGraph()->FindFirstSubgraphByName( netName ) ) if( auto sg = Schematic().ConnectionGraph()->FindFirstSubgraphByName( netName ) )
m_highlightedConn = sg->GetDriverConnection()->Name(); m_highlightedConn = sg->GetDriverConnection()->Name();
@ -245,7 +245,7 @@ void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
if( strcmp( idcmd, "$PART:" ) != 0 ) if( strcmp( idcmd, "$PART:" ) != 0 )
return; return;
wxString part_ref = FROM_UTF8( text ); wxString part_ref = From_UTF8( text );
/* look for a complement */ /* look for a complement */
idcmd = strtok( nullptr, " \n\r" ); idcmd = strtok( nullptr, " \n\r" );
@ -262,7 +262,7 @@ void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
if( text == nullptr ) if( text == nullptr )
return; return;
wxString msg = FROM_UTF8( text ); wxString msg = From_UTF8( text );
if( strcmp( idcmd, "$REF:" ) == 0 ) if( strcmp( idcmd, "$REF:" ) == 0 )
{ {

4
eeschema/dialogs/panel_template_fieldnames.cpp
View File

@ -29,7 +29,7 @@
#include <template_fieldnames.h> #include <template_fieldnames.h>
#include <grid_tricks.h> #include <grid_tricks.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <macros.h> #include <string_utils.h>
#include <panel_template_fieldnames.h> #include <panel_template_fieldnames.h>
PANEL_TEMPLATE_FIELDNAMES::PANEL_TEMPLATE_FIELDNAMES( wxWindow* aWindow, PANEL_TEMPLATE_FIELDNAMES::PANEL_TEMPLATE_FIELDNAMES( wxWindow* aWindow,
@ -200,7 +200,7 @@ bool PANEL_TEMPLATE_FIELDNAMES::TransferDataFromWindow()
STRING_FORMATTER sf; STRING_FORMATTER sf;
m_templateMgr->Format( &sf, 0, true ); m_templateMgr->Format( &sf, 0, true );
wxString record = FROM_UTF8( sf.GetString().c_str() ); wxString record = From_UTF8( sf.GetString().c_str() );
record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines
record.Replace( wxT(" "), wxT(" "), true ); // double space to single record.Replace( wxT(" "), wxT(" "), true ); // double space to single

1
eeschema/eeschema_jobs_handler.cpp
View File

@ -45,6 +45,7 @@
#include <plotters/plotters_pslike.h> #include <plotters/plotters_pslike.h>
#include <drawing_sheet/ds_data_model.h> #include <drawing_sheet/ds_data_model.h>
#include <reporter.h> #include <reporter.h>
#include <string_utils.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>

2
eeschema/eeschema_settings.cpp
View File

@ -28,7 +28,7 @@
#include <eeschema_settings.h> #include <eeschema_settings.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <symbol_editor_settings.h> #include <symbol_editor_settings.h>
#include <macros.h> #include <string_utils.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <settings/common_settings.h> #include <settings/common_settings.h>
#include <settings/json_settings_internals.h> #include <settings/json_settings_internals.h>

1
eeschema/netlist_exporters/netlist_exporter_spice_model.cpp
View File

@ -25,6 +25,7 @@
#include "netlist_exporter_spice_model.h" #include "netlist_exporter_spice_model.h"
#include <sch_screen.h> #include <sch_screen.h>
#include <sch_label.h> #include <sch_label.h>
#include <string_utils.h>
void NETLIST_EXPORTER_SPICE_MODEL::WriteHead( OUTPUTFORMATTER& aFormatter, void NETLIST_EXPORTER_SPICE_MODEL::WriteHead( OUTPUTFORMATTER& aFormatter,

2
eeschema/sch_plugins/legacy/sch_legacy_lib_plugin_cache.cpp
View File

@ -220,7 +220,7 @@ void SCH_LEGACY_PLUGIN_CACHE::loadDocs()
if( strCompare( "$ENDCMP", line, &line ) ) if( strCompare( "$ENDCMP", line, &line ) )
break; break;
text = FROM_UTF8( line + 2 ); text = From_UTF8( line + 2 );
// Remove spaces at eol, and eol chars: // Remove spaces at eol, and eol chars:
text = text.Trim(); text = text.Trim();

2
eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
View File

@ -1059,7 +1059,7 @@ SCH_TEXT* SCH_LEGACY_PLUGIN::loadText( LINE_READER& aReader )
char* tmp = aReader.ReadLine(); char* tmp = aReader.ReadLine();
tmp = strtok( tmp, "\r\n" ); tmp = strtok( tmp, "\r\n" );
wxString val = FROM_UTF8( tmp ); wxString val = From_UTF8( tmp );
for( ; ; ) for( ; ; )
{ {

6
eeschema/sch_plugins/legacy/sch_legacy_plugin_helpers.cpp
View File

@ -22,7 +22,7 @@
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <macros.h> #include <string_utils.h>
#include <richio.h> #include <richio.h>
#include <config.h> // contains strncasecmp for msvc #include <config.h> // contains strncasecmp for msvc
@ -216,7 +216,7 @@ void parseUnquotedString( wxString& aString, LINE_READER& aReader, const char* a
while( *tmp && !isspace( *tmp ) ) while( *tmp && !isspace( *tmp ) )
utf8 += *tmp++; utf8 += *tmp++;
aString = FROM_UTF8( utf8.c_str() ); aString = From_UTF8( utf8.c_str() );
if( aString.IsEmpty() && !aCanBeEmpty ) if( aString.IsEmpty() && !aCanBeEmpty )
SCH_PARSE_ERROR( _( "expected unquoted string" ), aReader, aCurrentToken ); SCH_PARSE_ERROR( _( "expected unquoted string" ), aReader, aCurrentToken );
@ -293,7 +293,7 @@ void parseQuotedString( wxString& aString, LINE_READER& aReader, const char* aCu
tmp++; tmp++;
} }
aString = FROM_UTF8( utf8.c_str() ); aString = From_UTF8( utf8.c_str() );
if( aString.IsEmpty() && !aCanBeEmpty ) if( aString.IsEmpty() && !aCanBeEmpty )
SCH_PARSE_ERROR( "expected quoted string", aReader, aCurrentToken ); SCH_PARSE_ERROR( "expected quoted string", aReader, aCurrentToken );

18
eeschema/sch_reference_list.cpp
View File

@ -831,7 +831,7 @@ void SCH_REFERENCE::Annotate()
else else
m_ref = TO_UTF8( GetRef() << GetRefNumber() ); m_ref = TO_UTF8( GetRef() << GetRefNumber() );
m_rootSymbol->SetRef( &m_sheetPath, FROM_UTF8( m_ref.c_str() ) ); m_rootSymbol->SetRef( &m_sheetPath, From_UTF8( m_ref.c_str() ) );
m_rootSymbol->SetUnit( m_unit ); m_rootSymbol->SetUnit( m_unit );
m_rootSymbol->SetUnitSelection( &m_sheetPath, m_unit ); m_rootSymbol->SetUnitSelection( &m_sheetPath, m_unit );
} }
@ -952,3 +952,19 @@ wxString SCH_REFERENCE_LIST::Shorthand( std::vector<SCH_REFERENCE> aList,
return retVal; return retVal;
} }
#if defined( DEBUG )
void SCH_REFERENCE_LIST::Show( const char* aPrefix )
{
printf( "%s\n", aPrefix );
for( unsigned i = 0; i < m_flatList.size(); ++i )
{
SCH_REFERENCE& schref = m_flatList[i];
printf( " [%-2d] ref:%-8s num:%-3d lib_part:%s\n", i, schref.m_ref.ToStdString().c_str(),
schref.m_numRef, TO_UTF8( schref.GetLibPart()->GetName() ) );
}
}
#endif

16
eeschema/sch_reference_list.h
View File

@ -560,21 +560,7 @@ public:
std::vector<SCH_SYMBOL_INSTANCE> GetSymbolInstances() const; std::vector<SCH_SYMBOL_INSTANCE> GetSymbolInstances() const;
#if defined(DEBUG) #if defined(DEBUG)
void Show( const char* aPrefix = "" ) void Show( const char* aPrefix = "" );
{
printf( "%s\n", aPrefix );
for( unsigned i=0; i < m_flatList.size(); ++i )
{
SCH_REFERENCE& schref = m_flatList[i];
printf( " [%-2d] ref:%-8s num:%-3d lib_part:%s\n",
i,
schref.m_ref.ToStdString().c_str(),
schref.m_numRef,
TO_UTF8( schref.GetLibPart()->GetName() ) );
}
}
#endif #endif
/** /**

1
eeschema/sch_view.cpp
View File

@ -37,6 +37,7 @@
#include <schematic.h> #include <schematic.h>
#include <sch_base_frame.h> #include <sch_base_frame.h>
#include <sch_edit_frame.h> #include <sch_edit_frame.h>
#include <string_utils.h>
#include "sch_view.h" #include "sch_view.h"

2
eeschema/sim/spice_circuit_model.cpp
View File

@ -24,7 +24,7 @@
*/ */
#include "spice_circuit_model.h" #include "spice_circuit_model.h"
#include <macros.h> // for TO_UTF8 def #include <string_utils.h>
#include <wx/regex.h> #include <wx/regex.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <locale_io.h> #include <locale_io.h>

6
eeschema/tools/assign_footprints.cpp
View File

@ -51,7 +51,7 @@ void SCH_EDITOR_CONTROL::AssignFootprints( const std::string& aChangedSetOfRefer
sheets.GetSymbols( refs, false ); sheets.GetSymbols( refs, false );
DSNLEXER lexer( aChangedSetOfReferences, FROM_UTF8( __func__ ) ); DSNLEXER lexer( aChangedSetOfReferences, From_UTF8( __func__ ) );
PTREE doc; PTREE doc;
try try
@ -150,7 +150,7 @@ bool SCH_EDITOR_CONTROL::processCmpToFootprintLinkFile( const wxString& aFullFil
while( cmpFileReader.ReadLine() ) while( cmpFileReader.ReadLine() )
{ {
buffer = FROM_UTF8( cmpFileReader.Line() ); buffer = From_UTF8( cmpFileReader.Line() );
if( !buffer.StartsWith( wxT( "BeginCmp" ) ) ) if( !buffer.StartsWith( wxT( "BeginCmp" ) ) )
continue; continue;
@ -161,7 +161,7 @@ bool SCH_EDITOR_CONTROL::processCmpToFootprintLinkFile( const wxString& aFullFil
while( cmpFileReader.ReadLine() ) while( cmpFileReader.ReadLine() )
{ {
buffer = FROM_UTF8( cmpFileReader.Line() ); buffer = From_UTF8( cmpFileReader.Line() );
if( buffer.StartsWith( wxT( "EndCmp" ) ) ) if( buffer.StartsWith( wxT( "EndCmp" ) ) )
break; break;

2
eeschema/tools/backannotate.cpp
View File

@ -135,7 +135,7 @@ void BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload )
return UTF8( pt.front().first ); return UTF8( pt.front().first );
}; };
DSNLEXER lexer( aPayload, FROM_UTF8( __func__ ) ); DSNLEXER lexer( aPayload, From_UTF8( __func__ ) );
PTREE doc; PTREE doc;
// NOTE: KiCad's PTREE scanner constructs a property *name* tree, not a property tree. // NOTE: KiCad's PTREE scanner constructs a property *name* tree, not a property tree.

6
gerbview/X2_gerber_attributes.cpp
View File

@ -43,7 +43,7 @@
#include <wx/log.h> #include <wx/log.h>
#include <X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
#include <macros.h> #include <string_utils.h>
X2_ATTRIBUTE::X2_ATTRIBUTE() X2_ATTRIBUTE::X2_ATTRIBUTE()
@ -107,14 +107,14 @@ bool X2_ATTRIBUTE::ParseAttribCmd( FILE* aFile, char *aBuffer, int aBuffSize, ch
break; break;
case '*': // End of block case '*': // End of block
m_Prms.Add( FROM_UTF8( data.c_str() ) ); m_Prms.Add( From_UTF8( data.c_str() ) );
data.clear(); data.clear();
aText++; aText++;
break; break;
case ',': // End of parameter (separator) case ',': // End of parameter (separator)
aText++; aText++;
m_Prms.Add( FROM_UTF8( data.c_str() ) ); m_Prms.Add( From_UTF8( data.c_str() ) );
data.clear(); data.clear();
break; break;

2
gerbview/excellon_read_drill_file.cpp
View File

@ -1045,7 +1045,7 @@ bool EXCELLON_IMAGE::Execute_EXCELLON_G_Command( char*& text )
case DRILL_G_UNKNOWN: case DRILL_G_UNKNOWN:
default: default:
AddMessageToList( wxString::Format( _( "Unknown Excellon G Code: &lt;%s&gt;" ), FROM_UTF8(gcmd) ) ); AddMessageToList( wxString::Format( _( "Unknown Excellon G Code: &lt;%s&gt;" ), From_UTF8(gcmd) ) );
while( *text ) while( *text )
text++; text++;
return false; return false;

1
gerbview/gerbview.cpp
View File

@ -36,6 +36,7 @@
#include <pgm_base.h> #include <pgm_base.h>
#include <richio.h> #include <richio.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <string_utils.h>
#include <dialogs/panel_gerbview_display_options.h> #include <dialogs/panel_gerbview_display_options.h>
#include <dialogs/panel_gerbview_excellon_settings.h> #include <dialogs/panel_gerbview_excellon_settings.h>
#include <dialogs/panel_gerbview_color_settings.h> #include <dialogs/panel_gerbview_color_settings.h>

4
gerbview/job_file_reader.cpp
View File

@ -33,7 +33,7 @@
#include <gerbview.h> #include <gerbview.h>
#include <richio.h> #include <richio.h>
#include <locale_io.h> #include <locale_io.h>
#include <macros.h> #include <string_utils.h>
#include <gerber_file_image.h> #include <gerber_file_image.h>
#include <gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
@ -169,7 +169,7 @@ wxString GERBER_JOBFILE_READER::formatStringFromJSON( const std::string& name )
// to encode unicode chars // to encode unicode chars
// Our json11 library returns in this case a UTF8 sequence. Just convert it to // Our json11 library returns in this case a UTF8 sequence. Just convert it to
// a wxString. // a wxString.
wxString wstr = FROM_UTF8( name.c_str() ); wxString wstr = From_UTF8( name.c_str() );
return wstr; return wstr;
} }

5
gerbview/rs274x.cpp
View File

@ -33,6 +33,7 @@
#include <gerber_file_image.h> #include <gerber_file_image.h>
#include <core/ignore.h> #include <core/ignore.h>
#include <macros.h> #include <macros.h>
#include <string_utils.h>
#include <X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
#include <gbr_metadata.h> #include <gbr_metadata.h>
#include <wx/log.h> #include <wx/log.h>
@ -1032,7 +1033,7 @@ bool GERBER_FILE_IMAGE::ReadApertureMacro( char *aBuff, unsigned int aBuffSize,
else if( !isdigit(*aText) ) // Ill. symbol else if( !isdigit(*aText) ) // Ill. symbol
{ {
msg.Printf( wxT( "RS274X: Aperture Macro \"%s\": ill. symbol, line: \"%s\"" ), msg.Printf( wxT( "RS274X: Aperture Macro \"%s\": ill. symbol, line: \"%s\"" ),
am.m_AmName, FROM_UTF8( aBuff ) ); am.m_AmName, From_UTF8( aBuff ) );
AddMessageToList( msg ); AddMessageToList( msg );
primitive_type = AMP_COMMENT; primitive_type = AMP_COMMENT;
} }
@ -1086,7 +1087,7 @@ bool GERBER_FILE_IMAGE::ReadApertureMacro( char *aBuff, unsigned int aBuffSize,
default: default:
msg.Printf( wxT( "RS274X: Aperture Macro \"%s\": Invalid primitive id code %d, line %d: \"%s\"" ), msg.Printf( wxT( "RS274X: Aperture Macro \"%s\": Invalid primitive id code %d, line %d: \"%s\"" ),
am.m_AmName, primitive_type, m_LineNum, FROM_UTF8( aBuff ) ); am.m_AmName, primitive_type, m_LineNum, From_UTF8( aBuff ) );
AddMessageToList( msg ); AddMessageToList( msg );
return false; return false;
} }

22
include/macros.h
View File

@ -84,17 +84,6 @@
#endif #endif
/**
* Convert a wxString to a UTF8 encoded C string for all wxWidgets build modes.
*
* wxstring is a wxString, not a wxT() or _(). The scope of the return value
* is very limited and volatile, but can be used with printf() style functions well.
*
* @note Trying to convert it to a function is tricky because of the type of the
* parameter!
*/
#define TO_UTF8( wxstring ) ( (const char*) (wxstring).utf8_str() )
/** /**
* Stringifies the given parameter by placing in quotes. * Stringifies the given parameter by placing in quotes.
* *
@ -104,17 +93,6 @@
#define TO_STR2(x) #x #define TO_STR2(x) #x
#define TO_STR(x) TO_STR2(x) #define TO_STR(x) TO_STR2(x)
/**
* Convert an expected UTF8 encoded C string to a wxString.
* If fails, tray to convert using current locale
* If still fails, return an empty wxString
* This macro is obsolete. Replaced by
* wxString From_UTF8( const char* cstring )
* (and also wxString From_UTF8( const std::string& aString ) )
*/
wxString From_UTF8( const char* cstring );
#define FROM_UTF8(x) From_UTF8(x)
#define UNIMPLEMENTED_FOR( type ) \ #define UNIMPLEMENTED_FOR( type ) \
wxFAIL_MSG( wxString::Format( wxT( "%s: unimplemented for %s" ), __FUNCTION__, type ) ) wxFAIL_MSG( wxString::Format( wxT( "%s: unimplemented for %s" ), __FUNCTION__, type ) )

2
include/ptree.h
View File

@ -68,7 +68,7 @@ typedef boost::property_tree::ptree_error PTREE_ERROR;
* *
* static const KEYWORD empty_keywords[1] = {}; * static const KEYWORD empty_keywords[1] = {};
* *
* DSNLEXER lexer( empty_keywords, 0, fp, wxString( FROM_UTF8( argv[1] ) ) ); * DSNLEXER lexer( empty_keywords, 0, fp, wxString( From_UTF8( argv[1] ) ) );
* *
* try * try
* { * {

11
include/string_utils.h
View File

@ -364,6 +364,17 @@ std::string UIDouble2Str( double aValue );
*/ */
std::string FormatDouble2Str( double aValue ); std::string FormatDouble2Str( double aValue );
/**
* Convert a wxString to a UTF8 encoded C string for all wxWidgets build modes.
*
* wxstring is a wxString, not a wxT() or _(). The scope of the return value
* is very limited and volatile, but can be used with printf() style functions well.
*
* @note Trying to convert it to a function is tricky because of the type of the
* parameter!
*/
#define TO_UTF8( wxstring ) ( (const char*) ( wxstring ).utf8_str() )
/** /**
* Convert an expected UTF8 encoded std::string to a wxString. * Convert an expected UTF8 encoded std::string to a wxString.
* If fails, tray to convert using current locale * If fails, tray to convert using current locale

10
kicad/cli/command.cpp
View File

@ -49,7 +49,7 @@ void CLI::COMMAND::PrintHelp()
{ {
std::stringstream ss; std::stringstream ss;
ss << m_argParser; ss << m_argParser;
wxPrintf( FROM_UTF8( ss.str().c_str() ) ); wxPrintf( From_UTF8( ss.str().c_str() ) );
} }
@ -64,17 +64,17 @@ int CLI::COMMAND::Perform( KIWAY& aKiway )
if ( m_hasInputArg ) if ( m_hasInputArg )
{ {
m_argInput = FROM_UTF8( m_argParser.get<std::string>( ARG_INPUT ).c_str() ); m_argInput = From_UTF8( m_argParser.get<std::string>( ARG_INPUT ).c_str() );
} }
if( m_hasOutputArg ) if( m_hasOutputArg )
{ {
m_argOutput = FROM_UTF8( m_argParser.get<std::string>( ARG_OUTPUT ).c_str() ); m_argOutput = From_UTF8( m_argParser.get<std::string>( ARG_OUTPUT ).c_str() );
} }
if( m_hasDrawingSheetArg ) if( m_hasDrawingSheetArg )
{ {
m_argDrawingSheet = FROM_UTF8( m_argParser.get<std::string>( ARG_DRAWING_SHEET ).c_str() ); m_argDrawingSheet = From_UTF8( m_argParser.get<std::string>( ARG_DRAWING_SHEET ).c_str() );
} }
@ -84,7 +84,7 @@ int CLI::COMMAND::Perform( KIWAY& aKiway )
for( const std::string& def : defines ) for( const std::string& def : defines )
{ {
wxString str = FROM_UTF8( def.c_str() ); wxString str = From_UTF8( def.c_str() );
wxArrayString bits; wxArrayString bits;
wxStringSplit( str, bits, wxS( '=' ) ); wxStringSplit( str, bits, wxS( '=' ) );

5
kicad/cli/command_fp_export_svg.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_fp_export_svg.h" #include "jobs/job_fp_export_svg.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <wx/dir.h> #include <wx/dir.h>
@ -65,7 +66,7 @@ int CLI::FP_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
svgJob->m_libraryPath = m_argInput; svgJob->m_libraryPath = m_argInput;
svgJob->m_outputDirectory = m_argOutput; svgJob->m_outputDirectory = m_argOutput;
svgJob->m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE ); svgJob->m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE );
svgJob->m_footprint = FROM_UTF8( m_argParser.get<std::string>( ARG_FOOTPRINT ).c_str() ); svgJob->m_footprint = From_UTF8( m_argParser.get<std::string>( ARG_FOOTPRINT ).c_str() );
svgJob->SetVarOverrides( m_argDefineVars ); svgJob->SetVarOverrides( m_argDefineVars );
if( !wxDir::Exists( svgJob->m_libraryPath ) ) if( !wxDir::Exists( svgJob->m_libraryPath ) )
@ -74,7 +75,7 @@ int CLI::FP_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_INVALID_INPUT_FILE; return EXIT_CODES::ERR_INVALID_INPUT_FILE;
} }
svgJob->m_colorTheme = FROM_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() ); svgJob->m_colorTheme = From_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() );
if( m_selectedLayers.count() > 0 ) if( m_selectedLayers.count() > 0 )
svgJob->m_printMaskLayer = m_selectedLayers; svgJob->m_printMaskLayer = m_selectedLayers;

5
kicad/cli/command_pcb_drc.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_pcb_drc.h" #include "jobs/job_pcb_drc.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -118,7 +119,7 @@ int CLI::PCB_DRC_COMMAND::doPerform( KIWAY& aKiway )
drcJob->m_reportAllTrackErrors = m_argParser.get<bool>( ARG_ALL_TRACK_ERRORS ); drcJob->m_reportAllTrackErrors = m_argParser.get<bool>( ARG_ALL_TRACK_ERRORS );
wxString units = FROM_UTF8( m_argParser.get<std::string>( ARG_UNITS ).c_str() ); wxString units = From_UTF8( m_argParser.get<std::string>( ARG_UNITS ).c_str() );
if( units == wxS( "mm" ) ) if( units == wxS( "mm" ) )
{ {
@ -138,7 +139,7 @@ int CLI::PCB_DRC_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == "report" ) if( format == "report" )
{ {
drcJob->m_format = JOB_PCB_DRC::OUTPUT_FORMAT::REPORT; drcJob->m_format = JOB_PCB_DRC::OUTPUT_FORMAT::REPORT;

11
kicad/cli/command_pcb_export_3d.cpp
View File

@ -22,6 +22,7 @@
#include <cli/exit_codes.h> #include <cli/exit_codes.h>
#include <kiface_base.h> #include <kiface_base.h>
#include <regex> #include <regex>
#include <string_utils.h>
#include <locale_io.h> #include <locale_io.h>
#include <wx/crt.h> #include <wx/crt.h>
@ -169,7 +170,7 @@ int CLI::PCB_EXPORT_3D_COMMAND::doPerform( KIWAY& aKiway )
if( step->m_format == JOB_EXPORT_PCB_3D::FORMAT::UNKNOWN ) if( step->m_format == JOB_EXPORT_PCB_3D::FORMAT::UNKNOWN )
{ {
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == wxS( "step" ) ) if( format == wxS( "step" ) )
step->m_format = JOB_EXPORT_PCB_3D::FORMAT::STEP; step->m_format = JOB_EXPORT_PCB_3D::FORMAT::STEP;
@ -184,7 +185,7 @@ int CLI::PCB_EXPORT_3D_COMMAND::doPerform( KIWAY& aKiway )
if( step->m_format == JOB_EXPORT_PCB_3D::FORMAT::VRML ) if( step->m_format == JOB_EXPORT_PCB_3D::FORMAT::VRML )
{ {
wxString units = FROM_UTF8( m_argParser.get<std::string>( ARG_VRML_UNITS ).c_str() ); wxString units = From_UTF8( m_argParser.get<std::string>( ARG_VRML_UNITS ).c_str() );
if( units == wxS( "in" ) ) if( units == wxS( "in" ) )
step->m_vrmlUnits = JOB_EXPORT_PCB_3D::VRML_UNITS::INCHES; step->m_vrmlUnits = JOB_EXPORT_PCB_3D::VRML_UNITS::INCHES;
@ -200,12 +201,12 @@ int CLI::PCB_EXPORT_3D_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
step->m_vrmlModelDir = FROM_UTF8( m_argParser.get<std::string>( ARG_VRML_MODELS_DIR ).c_str() ); step->m_vrmlModelDir = From_UTF8( m_argParser.get<std::string>( ARG_VRML_MODELS_DIR ).c_str() );
step->m_vrmlRelativePaths = m_argParser.get<bool>( ARG_VRML_MODELS_RELATIVE ); step->m_vrmlRelativePaths = m_argParser.get<bool>( ARG_VRML_MODELS_RELATIVE );
} }
wxString userOrigin = FROM_UTF8( m_argParser.get<std::string>( ARG_USER_ORIGIN ).c_str() ); wxString userOrigin = From_UTF8( m_argParser.get<std::string>( ARG_USER_ORIGIN ).c_str() );
LOCALE_IO dummy; // Switch to "C" locale LOCALE_IO dummy; // Switch to "C" locale
@ -254,7 +255,7 @@ int CLI::PCB_EXPORT_3D_COMMAND::doPerform( KIWAY& aKiway )
if( m_format == JOB_EXPORT_PCB_3D::FORMAT::STEP || m_format == JOB_EXPORT_PCB_3D::FORMAT::GLB ) if( m_format == JOB_EXPORT_PCB_3D::FORMAT::STEP || m_format == JOB_EXPORT_PCB_3D::FORMAT::GLB )
{ {
wxString minDistance = wxString minDistance =
FROM_UTF8( m_argParser.get<std::string>( ARG_MIN_DISTANCE ).c_str() ); From_UTF8( m_argParser.get<std::string>( ARG_MIN_DISTANCE ).c_str() );
if( !minDistance.IsEmpty() ) if( !minDistance.IsEmpty() )
{ {

3
kicad/cli/command_pcb_export_base.cpp
View File

@ -23,6 +23,7 @@
#include <kiface_base.h> #include <kiface_base.h>
#include <bitset> #include <bitset>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <macros.h> #include <macros.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
@ -124,7 +125,7 @@ int CLI::PCB_EXPORT_BASE_COMMAND::doPerform( KIWAY& aKiway )
{ {
if( m_hasLayerArg ) if( m_hasLayerArg )
{ {
wxString layers = FROM_UTF8( m_argParser.get<std::string>( ARG_LAYERS ).c_str() ); wxString layers = From_UTF8( m_argParser.get<std::string>( ARG_LAYERS ).c_str() );
LSET layerMask = convertLayerStringList( layers, m_selectedLayersSet ); LSET layerMask = convertLayerStringList( layers, m_selectedLayersSet );
if( m_requireLayers && layerMask.Seq().size() < 1 ) if( m_requireLayers && layerMask.Seq().size() < 1 )

13
kicad/cli/command_pcb_export_drill.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_pcb_drill.h" #include "jobs/job_export_pcb_drill.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -118,7 +119,7 @@ int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
} }
} }
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == "excellon" ) if( format == "excellon" )
{ {
drillJob->m_format = JOB_EXPORT_PCB_DRILL::DRILL_FORMAT::EXCELLON; drillJob->m_format = JOB_EXPORT_PCB_DRILL::DRILL_FORMAT::EXCELLON;
@ -133,7 +134,7 @@ int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString units = FROM_UTF8( m_argParser.get<std::string>( ARG_EXCELLON_UNITS ).c_str() ); wxString units = From_UTF8( m_argParser.get<std::string>( ARG_EXCELLON_UNITS ).c_str() );
if( units == wxS( "mm" ) ) if( units == wxS( "mm" ) )
{ {
@ -149,7 +150,7 @@ int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString zeroFormat = FROM_UTF8( m_argParser.get<std::string>( ARG_EXCELLON_ZEROS_FORMAT ).c_str() ); wxString zeroFormat = From_UTF8( m_argParser.get<std::string>( ARG_EXCELLON_ZEROS_FORMAT ).c_str() );
if( zeroFormat == wxS( "decimal" ) ) if( zeroFormat == wxS( "decimal" ) )
{ {
@ -174,7 +175,7 @@ int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
} }
wxString drillFormat = wxString drillFormat =
FROM_UTF8( m_argParser.get<std::string>( ARG_EXCELLON_OVAL_FORMAT ).c_str() ); From_UTF8( m_argParser.get<std::string>( ARG_EXCELLON_OVAL_FORMAT ).c_str() );
if( drillFormat == wxS( "route" ) ) if( drillFormat == wxS( "route" ) )
{ {
drillJob->m_excellonOvalDrillRoute = true; drillJob->m_excellonOvalDrillRoute = true;
@ -189,7 +190,7 @@ int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString mapFormat = FROM_UTF8( m_argParser.get<std::string>( ARG_MAP_FORMAT ).c_str() ); wxString mapFormat = From_UTF8( m_argParser.get<std::string>( ARG_MAP_FORMAT ).c_str() );
if( mapFormat == wxS( "pdf" ) ) if( mapFormat == wxS( "pdf" ) )
{ {
@ -217,7 +218,7 @@ int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString origin = FROM_UTF8( m_argParser.get<std::string>( ARG_DRILL_ORIGIN ).c_str() ); wxString origin = From_UTF8( m_argParser.get<std::string>( ARG_DRILL_ORIGIN ).c_str() );
if( origin == wxS( "absolute" ) ) if( origin == wxS( "absolute" ) )
{ {

3
kicad/cli/command_pcb_export_dxf.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_pcb_dxf.h" #include "jobs/job_export_pcb_dxf.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -92,7 +93,7 @@ int CLI::PCB_EXPORT_DXF_COMMAND::doPerform( KIWAY& aKiway )
dxfJob->m_plotGraphicItemsUsingContours = m_argParser.get<bool>( ARG_USE_CONTOURS ); dxfJob->m_plotGraphicItemsUsingContours = m_argParser.get<bool>( ARG_USE_CONTOURS );
dxfJob->m_plotBorderTitleBlocks = m_argParser.get<bool>( ARG_INCLUDE_BORDER_TITLE ); dxfJob->m_plotBorderTitleBlocks = m_argParser.get<bool>( ARG_INCLUDE_BORDER_TITLE );
wxString units = FROM_UTF8( m_argParser.get<std::string>( ARG_OUTPUT_UNITS ).c_str() ); wxString units = From_UTF8( m_argParser.get<std::string>( ARG_OUTPUT_UNITS ).c_str() );
if( units == wxS( "mm" ) ) if( units == wxS( "mm" ) )
{ {

3
kicad/cli/command_pcb_export_gerbers.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_pcb_gerbers.h" #include "jobs/job_export_pcb_gerbers.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -72,7 +73,7 @@ int CLI::PCB_EXPORT_GERBERS_COMMAND::doPerform( KIWAY& aKiway )
if( exitCode != EXIT_CODES::OK ) if( exitCode != EXIT_CODES::OK )
return exitCode; return exitCode;
wxString layers = FROM_UTF8( m_argParser.get<std::string>( ARG_COMMON_LAYERS ).c_str() ); wxString layers = From_UTF8( m_argParser.get<std::string>( ARG_COMMON_LAYERS ).c_str() );
gerberJob->m_layersIncludeOnAll = gerberJob->m_layersIncludeOnAll =
convertLayerStringList( layers, gerberJob->m_layersIncludeOnAllSet ); convertLayerStringList( layers, gerberJob->m_layersIncludeOnAllSet );
gerberJob->m_useBoardPlotParams = m_argParser.get<bool>( ARG_USE_BOARD_PLOT_PARAMS ); gerberJob->m_useBoardPlotParams = m_argParser.get<bool>( ARG_USE_BOARD_PLOT_PARAMS );

3
kicad/cli/command_pcb_export_pdf.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_pcb_pdf.h" #include "jobs/job_export_pcb_pdf.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -111,7 +112,7 @@ int CLI::PCB_EXPORT_PDF_COMMAND::doPerform( KIWAY& aKiway )
pdfJob->m_mirror = m_argParser.get<bool>( ARG_MIRROR ); pdfJob->m_mirror = m_argParser.get<bool>( ARG_MIRROR );
pdfJob->m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE ); pdfJob->m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE );
pdfJob->m_colorTheme = FROM_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() ); pdfJob->m_colorTheme = From_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() );
pdfJob->m_negative = m_argParser.get<bool>( ARG_NEGATIVE ); pdfJob->m_negative = m_argParser.get<bool>( ARG_NEGATIVE );
pdfJob->m_drillShapeOption = m_argParser.get<int>( ARG_DRILL_SHAPE_OPTION ); pdfJob->m_drillShapeOption = m_argParser.get<int>( ARG_DRILL_SHAPE_OPTION );

7
kicad/cli/command_pcb_export_pos.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_pcb_pos.h" #include "jobs/job_export_pcb_pos.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -119,7 +120,7 @@ int CLI::PCB_EXPORT_POS_COMMAND::doPerform( KIWAY& aKiway )
aPosJob->m_excludeDNP = m_argParser.get<bool>( ARG_EXCLUDE_DNP ); aPosJob->m_excludeDNP = m_argParser.get<bool>( ARG_EXCLUDE_DNP );
aPosJob->m_gerberBoardEdge = m_argParser.get<bool>( ARG_GERBER_BOARD_EDGE ); aPosJob->m_gerberBoardEdge = m_argParser.get<bool>( ARG_GERBER_BOARD_EDGE );
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == wxS( "ascii" ) ) if( format == wxS( "ascii" ) )
{ {
aPosJob->m_format = JOB_EXPORT_PCB_POS::FORMAT::ASCII; aPosJob->m_format = JOB_EXPORT_PCB_POS::FORMAT::ASCII;
@ -138,7 +139,7 @@ int CLI::PCB_EXPORT_POS_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString units = FROM_UTF8( m_argParser.get<std::string>( ARG_UNITS ).c_str() ); wxString units = From_UTF8( m_argParser.get<std::string>( ARG_UNITS ).c_str() );
if( units == wxS( "mm" ) ) if( units == wxS( "mm" ) )
{ {
@ -154,7 +155,7 @@ int CLI::PCB_EXPORT_POS_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString side = FROM_UTF8( m_argParser.get<std::string>( ARG_SIDE ).c_str() ); wxString side = From_UTF8( m_argParser.get<std::string>( ARG_SIDE ).c_str() );
if( side == wxS( "both" ) ) if( side == wxS( "both" ) )
{ {

3
kicad/cli/command_pcb_export_svg.cpp
View File

@ -25,6 +25,7 @@
#include "jobs/job_export_pcb_svg.h" #include "jobs/job_export_pcb_svg.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <regex> #include <regex>
#include <wx/crt.h> #include <wx/crt.h>
@ -102,7 +103,7 @@ int CLI::PCB_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
svgJob->m_filename = m_argInput; svgJob->m_filename = m_argInput;
svgJob->m_outputFile = m_argOutput; svgJob->m_outputFile = m_argOutput;
svgJob->m_colorTheme = FROM_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() ); svgJob->m_colorTheme = From_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() );
svgJob->m_plotDrawingSheet = !m_argParser.get<bool>( ARG_EXCLUDE_DRAWING_SHEET ); svgJob->m_plotDrawingSheet = !m_argParser.get<bool>( ARG_EXCLUDE_DRAWING_SHEET );
svgJob->SetVarOverrides( m_argDefineVars ); svgJob->SetVarOverrides( m_argDefineVars );

5
kicad/cli/command_sch_erc.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_sch_erc.h" #include "jobs/job_sch_erc.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -107,7 +108,7 @@ int CLI::SCH_ERC_COMMAND::doPerform( KIWAY& aKiway )
{ {
ercJob->m_severity |= RPT_SEVERITY_EXCLUSION; ercJob->m_severity |= RPT_SEVERITY_EXCLUSION;
} }
wxString units = FROM_UTF8( m_argParser.get<std::string>( ARG_UNITS ).c_str() ); wxString units = From_UTF8( m_argParser.get<std::string>( ARG_UNITS ).c_str() );
if( units == wxS( "mm" ) ) if( units == wxS( "mm" ) )
{ {
@ -127,7 +128,7 @@ int CLI::SCH_ERC_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == "report" ) if( format == "report" )
{ {
ercJob->m_format = JOB_SCH_ERC::OUTPUT_FORMAT::REPORT; ercJob->m_format = JOB_SCH_ERC::OUTPUT_FORMAT::REPORT;

19
kicad/cli/command_sch_export_bom.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_sch_bom.h" #include "jobs/job_export_sch_bom.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <schematic_settings.h> #include <schematic_settings.h>
@ -128,25 +129,25 @@ int CLI::SCH_EXPORT_BOM_COMMAND::doPerform( KIWAY& aKiway )
// Format options // Format options
bomJob->m_fieldDelimiter = bomJob->m_fieldDelimiter =
FROM_UTF8( m_argParser.get<std::string>( ARG_FIELD_DELIMITER ).c_str() ); From_UTF8( m_argParser.get<std::string>( ARG_FIELD_DELIMITER ).c_str() );
bomJob->m_stringDelimiter = bomJob->m_stringDelimiter =
FROM_UTF8( m_argParser.get<std::string>( ARG_STRING_DELIMITER ).c_str() ); From_UTF8( m_argParser.get<std::string>( ARG_STRING_DELIMITER ).c_str() );
bomJob->m_refDelimiter = FROM_UTF8( m_argParser.get<std::string>( ARG_REF_DELIMITER ).c_str() ); bomJob->m_refDelimiter = From_UTF8( m_argParser.get<std::string>( ARG_REF_DELIMITER ).c_str() );
bomJob->m_refRangeDelimiter = bomJob->m_refRangeDelimiter =
FROM_UTF8( m_argParser.get<std::string>( ARG_REF_RANGE_DELIMITER ).c_str() ); From_UTF8( m_argParser.get<std::string>( ARG_REF_RANGE_DELIMITER ).c_str() );
bomJob->m_keepTabs = m_argParser.get<bool>( ARG_KEEP_TABS ); bomJob->m_keepTabs = m_argParser.get<bool>( ARG_KEEP_TABS );
bomJob->m_keepLineBreaks = m_argParser.get<bool>( ARG_KEEP_LINE_BREAKS ); bomJob->m_keepLineBreaks = m_argParser.get<bool>( ARG_KEEP_LINE_BREAKS );
// Output fields options // Output fields options
bomJob->m_fieldsOrdered = bomJob->m_fieldsOrdered =
convertStringList( FROM_UTF8( m_argParser.get<std::string>( ARG_FIELDS ).c_str() ) ); convertStringList( From_UTF8( m_argParser.get<std::string>( ARG_FIELDS ).c_str() ) );
bomJob->m_fieldsLabels = bomJob->m_fieldsLabels =
convertStringList( FROM_UTF8( m_argParser.get<std::string>( ARG_LABELS ).c_str() ) ); convertStringList( From_UTF8( m_argParser.get<std::string>( ARG_LABELS ).c_str() ) );
bomJob->m_fieldsGroupBy = bomJob->m_fieldsGroupBy =
convertStringList( FROM_UTF8( m_argParser.get<std::string>( ARG_GROUP_BY ).c_str() ) ); convertStringList( From_UTF8( m_argParser.get<std::string>( ARG_GROUP_BY ).c_str() ) );
bomJob->m_sortField = FROM_UTF8( m_argParser.get<std::string>( ARG_SORT_FIELD ).c_str() ); bomJob->m_sortField = From_UTF8( m_argParser.get<std::string>( ARG_SORT_FIELD ).c_str() );
bomJob->m_sortAsc = m_argParser.get<bool>( ARG_SORT_ASC ); bomJob->m_sortAsc = m_argParser.get<bool>( ARG_SORT_ASC );
bomJob->m_filterString = FROM_UTF8( m_argParser.get<std::string>( ARG_FILTER ).c_str() ); bomJob->m_filterString = From_UTF8( m_argParser.get<std::string>( ARG_FILTER ).c_str() );
bomJob->m_excludeDNP = m_argParser.get<bool>( ARG_EXCLUDE_DNP ); bomJob->m_excludeDNP = m_argParser.get<bool>( ARG_EXCLUDE_DNP );
if( !wxFile::Exists( bomJob->m_filename ) ) if( !wxFile::Exists( bomJob->m_filename ) )

3
kicad/cli/command_sch_export_netlist.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_export_sch_netlist.h" #include "jobs/job_export_sch_netlist.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -56,7 +57,7 @@ int CLI::SCH_EXPORT_NETLIST_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_INVALID_INPUT_FILE; return EXIT_CODES::ERR_INVALID_INPUT_FILE;
} }
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == "kicadsexpr" ) if( format == "kicadsexpr" )
{ {
netJob->format = JOB_EXPORT_SCH_NETLIST::FORMAT::KICADSEXPR; netJob->format = JOB_EXPORT_SCH_NETLIST::FORMAT::KICADSEXPR;

4
kicad/cli/command_sch_export_plot.cpp
View File

@ -107,7 +107,7 @@ int CLI::SCH_EXPORT_PLOT_COMMAND::doPerform( KIWAY& aKiway )
} }
std::vector<wxString> pages; std::vector<wxString> pages;
wxString pagesStr = FROM_UTF8( m_argParser.get<std::string>( ARG_PAGES ).c_str() ); wxString pagesStr = From_UTF8( m_argParser.get<std::string>( ARG_PAGES ).c_str() );
wxStringTokenizer tokenizer( pagesStr, "," ); wxStringTokenizer tokenizer( pagesStr, "," );
while( tokenizer.HasMoreTokens() ) while( tokenizer.HasMoreTokens() )
{ {
@ -123,7 +123,7 @@ int CLI::SCH_EXPORT_PLOT_COMMAND::doPerform( KIWAY& aKiway )
settings.m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE ); settings.m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE );
settings.m_pageSizeSelect = PAGE_SIZE_AUTO; settings.m_pageSizeSelect = PAGE_SIZE_AUTO;
settings.m_useBackgroundColor = !m_argParser.get<bool>( ARG_NO_BACKGROUND_COLOR ); settings.m_useBackgroundColor = !m_argParser.get<bool>( ARG_NO_BACKGROUND_COLOR );
settings.m_theme = FROM_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() ); settings.m_theme = From_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() );
if( m_outputArgExpectsDir ) if( m_outputArgExpectsDir )
settings.m_outputDirectory = m_argOutput; settings.m_outputDirectory = m_argOutput;
else else

5
kicad/cli/command_sym_export_svg.cpp
View File

@ -23,6 +23,7 @@
#include "jobs/job_sym_export_svg.h" #include "jobs/job_sym_export_svg.h"
#include <kiface_base.h> #include <kiface_base.h>
#include <layer_ids.h> #include <layer_ids.h>
#include <string_utils.h>
#include <wx/crt.h> #include <wx/crt.h>
#include <macros.h> #include <macros.h>
@ -73,7 +74,7 @@ int CLI::SYM_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
svgJob->m_libraryPath = m_argInput; svgJob->m_libraryPath = m_argInput;
svgJob->m_outputDirectory = m_argOutput; svgJob->m_outputDirectory = m_argOutput;
svgJob->m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE ); svgJob->m_blackAndWhite = m_argParser.get<bool>( ARG_BLACKANDWHITE );
svgJob->m_symbol = FROM_UTF8( m_argParser.get<std::string>( ARG_SYMBOL ).c_str() ); svgJob->m_symbol = From_UTF8( m_argParser.get<std::string>( ARG_SYMBOL ).c_str() );
svgJob->m_includeHiddenFields = m_argParser.get<bool>( ARG_INC_HIDDEN_FIELDS ); svgJob->m_includeHiddenFields = m_argParser.get<bool>( ARG_INC_HIDDEN_FIELDS );
svgJob->m_includeHiddenPins = m_argParser.get<bool>( ARG_INC_HIDDEN_PINS ); svgJob->m_includeHiddenPins = m_argParser.get<bool>( ARG_INC_HIDDEN_PINS );
@ -83,7 +84,7 @@ int CLI::SYM_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_INVALID_INPUT_FILE; return EXIT_CODES::ERR_INVALID_INPUT_FILE;
} }
svgJob->m_colorTheme = FROM_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() ); svgJob->m_colorTheme = From_UTF8( m_argParser.get<std::string>( ARG_THEME ).c_str() );
int exitCode = aKiway.ProcessJob( KIWAY::FACE_SCH, svgJob.get() ); int exitCode = aKiway.ProcessJob( KIWAY::FACE_SCH, svgJob.get() );

4
kicad/cli/command_version.cpp
View File

@ -23,7 +23,7 @@
#include <wx/crt.h> #include <wx/crt.h>
#include <build_version.h> #include <build_version.h>
#include <macros.h> #include <string_utils.h>
#include <build_version.h> #include <build_version.h>
#define ARG_FORMAT "--format" #define ARG_FORMAT "--format"
@ -50,7 +50,7 @@ int CLI::VERSION_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::OK; return EXIT_CODES::OK;
} }
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = From_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == wxS( "plain" ) ) if( format == wxS( "plain" ) )
{ {
wxPrintf( "%s\n", GetMajorMinorPatchVersion() ); wxPrintf( "%s\n", GetMajorMinorPatchVersion() );

1
kicad/import_proj.cpp
View File

@ -24,6 +24,7 @@
#include <kiway_player.h> #include <kiway_player.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <macros.h> #include <macros.h>
#include <string_utils.h>
#include <richio.h> #include <richio.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>

6
kicad/kicad_cli.cpp
View File

@ -29,7 +29,7 @@
#include <wx/wxcrtvararg.h> //for wxPrintf #include <wx/wxcrtvararg.h> //for wxPrintf
#include <kiway.h> #include <kiway.h>
#include <macros.h> #include <string_utils.h>
#include <paths.h> #include <paths.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <settings/kicad_settings.h> #include <settings/kicad_settings.h>
@ -276,7 +276,7 @@ static void printHelp( argparse::ArgumentParser& argParser )
{ {
std::stringstream ss; std::stringstream ss;
ss << argParser; ss << argParser;
wxPrintf( FROM_UTF8( ss.str().c_str() ) ); wxPrintf( From_UTF8( ss.str().c_str() ) );
} }
@ -368,7 +368,7 @@ int PGM_KICAD::OnPgmRun()
{ {
std::stringstream ss; std::stringstream ss;
ss << argParser; ss << argParser;
wxPrintf( FROM_UTF8( ss.str().c_str() ) ); wxPrintf( From_UTF8( ss.str().c_str() ) );
return 0; return 0;
} }

1
kicad/project_tree_pane.cpp
View File

@ -41,6 +41,7 @@
#include <kiplatform/environment.h> #include <kiplatform/environment.h>
#include <core/kicad_algo.h> #include <core/kicad_algo.h>
#include <paths.h> #include <paths.h>
#include <string_utils.h>
#include <launch_ext.h> #include <launch_ext.h>
#include <wx/dcclient.h> #include <wx/dcclient.h>
#include <wx/settings.h> #include <wx/settings.h>

4
libs/sexpr/sexpr_parser.cpp
View File

@ -28,7 +28,7 @@
#include <wx/file.h> #include <wx/file.h>
#include <wx/ffile.h> #include <wx/ffile.h>
#include <macros.h> #include <string_utils.h>
namespace SEXPR namespace SEXPR
{ {
@ -62,7 +62,7 @@ namespace SEXPR
// the filename is not always a UTF7 string, so do not use ifstream // the filename is not always a UTF7 string, so do not use ifstream
// that do not work with unicode chars. // that do not work with unicode chars.
wxString fname( FROM_UTF8( aFileName.c_str() ) ); wxString fname( From_UTF8( aFileName.c_str() ) );
wxFFile file( fname, "rb" ); wxFFile file( fname, "rb" );
size_t length = file.Length(); size_t length = file.Length();

1
pagelayout_editor/tools/pl_edit_tool.cpp
View File

@ -34,6 +34,7 @@
#include <confirm.h> #include <confirm.h>
#include <eda_item.h> #include <eda_item.h>
#include <macros.h> #include <macros.h>
#include <string_utils.h>
#include <view/view.h> #include <view/view.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND

2
pcb_calculator/datafile_read_write.cpp
View File

@ -232,7 +232,7 @@ void PCB_CALCULATOR_DATAFILE_PARSER::ParseRegulatorDescr( PCB_CALCULATOR_DATAFIL
// Read name // Read name
token = NextTok(); token = NextTok();
name = FROM_UTF8( CurText() ); name = From_UTF8( CurText() );
while( ( token = NextTok() ) != T_RIGHT ) while( ( token = NextTok() ) != T_RIGHT )
{ {

2
pcbnew/build_BOM_from_board.cpp
View File

@ -164,7 +164,7 @@ void PCB_EDIT_FRAME::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
msg << curEntry->m_Id << wxT( ";\"" ); msg << curEntry->m_Id << wxT( ";\"" );
msg << curEntry->m_Ref << wxT( "\";\"" ); msg << curEntry->m_Ref << wxT( "\";\"" );
msg << FROM_UTF8( curEntry->m_FPID.GetLibItemName().c_str() ) << wxT( "\";" ); msg << From_UTF8( curEntry->m_FPID.GetLibItemName().c_str() ) << wxT( "\";" );
msg << curEntry->m_Count << wxT( ";\"" ); msg << curEntry->m_Count << wxT( ";\"" );
msg << curEntry->m_Val << wxT( "\";;;\n" ); msg << curEntry->m_Val << wxT( "\";;;\n" );
fprintf( fp_bom, "%s", TO_UTF8( msg ) ); fprintf( fp_bom, "%s", TO_UTF8( msg ) );

4
pcbnew/cross-probing.cpp
View File

@ -131,7 +131,7 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
if( !crossProbingSettings.auto_highlight ) if( !crossProbingSettings.auto_highlight )
return; return;
wxString net_name = FROM_UTF8( text ); wxString net_name = From_UTF8( text );
NETINFO_ITEM* netinfo = pcb->FindNet( net_name ); NETINFO_ITEM* netinfo = pcb->FindNet( net_name );
@ -151,7 +151,7 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
if( !crossProbingSettings.auto_highlight ) if( !crossProbingSettings.auto_highlight )
return; return;
wxStringTokenizer netsTok = wxStringTokenizer( FROM_UTF8( text ), wxT( "," ) ); wxStringTokenizer netsTok = wxStringTokenizer( From_UTF8( text ), wxT( "," ) );
bool first = true; bool first = true;
while( netsTok.HasMoreTokens() ) while( netsTok.HasMoreTokens() )

4
pcbnew/dialogs/dialog_exchange_footprints.cpp
View File

@ -101,7 +101,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
if( m_currentFootprint ) if( m_currentFootprint )
{ {
m_newID->AppendText( FROM_UTF8( m_currentFootprint->GetFPID().Format().c_str() ) ); m_newID->AppendText( From_UTF8( m_currentFootprint->GetFPID().Format().c_str() ) );
} }
else else
m_upperSizer->FindItem( m_matchSelected )->Show( false ); m_upperSizer->FindItem( m_matchSelected )->Show( false );
@ -114,7 +114,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
m_specifiedValue->ChangeValue( m_currentFootprint->GetValue() ); m_specifiedValue->ChangeValue( m_currentFootprint->GetValue() );
if( m_currentFootprint ) if( m_currentFootprint )
m_specifiedID->ChangeValue( FROM_UTF8( m_currentFootprint->GetFPID().Format().c_str() ) ); m_specifiedID->ChangeValue( From_UTF8( m_currentFootprint->GetFPID().Format().c_str() ) );
m_specifiedIDBrowseButton->SetBitmap( KiBitmap( BITMAPS::small_library ) ); m_specifiedIDBrowseButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );

4
pcbnew/exporters/export_idf.cpp
View File

@ -649,7 +649,7 @@ bool PCB_EDIT_FRAME::Export_IDF3( BOARD* aPcb, const wxString& aFullFileName,
if( !idfBoard.WriteFile( aFullFileName, idfUnit, false ) ) if( !idfBoard.WriteFile( aFullFileName, idfUnit, false ) )
{ {
wxString msg; wxString msg;
msg << _( "IDF Export Failed:\n" ) << FROM_UTF8( idfBoard.GetError().c_str() ); msg << _( "IDF Export Failed:\n" ) << From_UTF8( idfBoard.GetError().c_str() );
wxMessageBox( msg ); wxMessageBox( msg );
ok = false; ok = false;
@ -666,7 +666,7 @@ bool PCB_EDIT_FRAME::Export_IDF3( BOARD* aPcb, const wxString& aFullFileName,
catch( const std::exception& e ) catch( const std::exception& e )
{ {
wxString msg; wxString msg;
msg << _( "IDF Export Failed:\n" ) << FROM_UTF8( e.what() ); msg << _( "IDF Export Failed:\n" ) << From_UTF8( e.what() );
wxMessageBox( msg ); wxMessageBox( msg );
ok = false; ok = false;
} }

2
pcbnew/exporters/exporter_vrml.cpp
View File

@ -1301,7 +1301,7 @@ bool EXPORTER_PCB_VRML::ExportVRML_File( PROJECT* aProject, wxString *aMessages,
catch( const std::exception& e ) catch( const std::exception& e )
{ {
if( aMessages ) if( aMessages )
*aMessages << _( "VRML Export Failed:\n" ) << FROM_UTF8( e.what() ); *aMessages << _( "VRML Export Failed:\n" ) << From_UTF8( e.what() );
success = false; success = false;
} }

4
pcbnew/exporters/gen_drill_report_files.cpp
View File

@ -316,7 +316,7 @@ bool GENDRILL_WRITER_BASE::genDrillMapFile( const wxString& aFullFileName, PLOT_
snprintf( line, sizeof(line), "%3.3fmm / %2.4f\" ", diameter_in_mm( tool.m_Diameter ), snprintf( line, sizeof(line), "%3.3fmm / %2.4f\" ", diameter_in_mm( tool.m_Diameter ),
diameter_in_inches( tool.m_Diameter ) ); diameter_in_inches( tool.m_Diameter ) );
msg = FROM_UTF8( line ); msg = From_UTF8( line );
// Now list how many holes and ovals are associated with each drill. // Now list how many holes and ovals are associated with each drill.
if( ( tool.m_TotalCount == 1 ) && ( tool.m_OvalCount == 0 ) ) if( ( tool.m_TotalCount == 1 ) && ( tool.m_OvalCount == 0 ) )
@ -331,7 +331,7 @@ bool GENDRILL_WRITER_BASE::genDrillMapFile( const wxString& aFullFileName, PLOT_
snprintf( line, sizeof(line), "(%d holes + %d slots)", tool.m_TotalCount - tool.m_OvalCount, snprintf( line, sizeof(line), "(%d holes + %d slots)", tool.m_TotalCount - tool.m_OvalCount,
tool.m_OvalCount ); tool.m_OvalCount );
msg += FROM_UTF8( line ); msg += From_UTF8( line );
if( tool.m_Hole_NotPlated ) if( tool.m_Hole_NotPlated )
msg += wxT( " (not plated)" ); msg += wxT( " (not plated)" );

4
pcbnew/exporters/gerber_placefile_writer.cpp
View File

@ -162,11 +162,11 @@ int PLACEFILE_GERBER_WRITER::CreatePlaceFile( wxString& aFullFilename, PCB_LAYER
allowUtf8, true ); allowUtf8, true );
// Add component footprint info: // Add component footprint info:
wxString fp_info = FROM_UTF8( footprint->GetFPID().GetLibItemName().c_str() ); wxString fp_info = From_UTF8( footprint->GetFPID().GetLibItemName().c_str() );
pnpAttrib.m_Footprint = ConvertNotAllowedCharsInGerber( fp_info, allowUtf8, true ); pnpAttrib.m_Footprint = ConvertNotAllowedCharsInGerber( fp_info, allowUtf8, true );
// Add footprint lib name: // Add footprint lib name:
fp_info = FROM_UTF8( footprint->GetFPID().GetLibNickname().c_str() ); fp_info = From_UTF8( footprint->GetFPID().GetLibNickname().c_str() );
pnpAttrib.m_LibraryName = ConvertNotAllowedCharsInGerber( fp_info, allowUtf8, true ); pnpAttrib.m_LibraryName = ConvertNotAllowedCharsInGerber( fp_info, allowUtf8, true );
metadata.m_NetlistMetadata.SetExtraData( pnpAttrib.FormatCmpPnPMetadata() ); metadata.m_NetlistMetadata.SetExtraData( pnpAttrib.FormatCmpPnPMetadata() );

4
pcbnew/footprint_edit_frame.cpp
View File

@ -936,7 +936,7 @@ void FOOTPRINT_EDIT_FRAME::UpdateTitle()
if( IsContentModified() ) if( IsContentModified() )
title = wxT( "*" ); title = wxT( "*" );
title += FROM_UTF8( footprint->GetFPID().Format().c_str() ); title += From_UTF8( footprint->GetFPID().Format().c_str() );
if( !writable ) if( !writable )
title += wxS( " " ) + _( "[Read Only]" ); title += wxS( " " ) + _( "[Read Only]" );
@ -947,7 +947,7 @@ void FOOTPRINT_EDIT_FRAME::UpdateTitle()
if( IsContentModified() ) if( IsContentModified() )
title = wxT( "*" ); title = wxT( "*" );
title += FROM_UTF8( footprint->GetFPID().GetLibItemName().c_str() ); title += From_UTF8( footprint->GetFPID().GetLibItemName().c_str() );
title += wxS( " " ) + _( "[Unsaved]" ); title += wxS( " " ) + _( "[Unsaved]" );
} }
else else

40
pcbnew/netlist_reader/kicad_netlist_reader.cpp
View File

@ -23,7 +23,7 @@
*/ */
#include <netlist_lexer.h> // netlist_lexer is common to Eeschema and Pcbnew #include <netlist_lexer.h> // netlist_lexer is common to Eeschema and Pcbnew
#include <macros.h> #include <string_utils.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "pcb_netlist.h" #include "pcb_netlist.h"
@ -203,13 +203,13 @@ void KICAD_NETLIST_PARSER::parseNet()
{ {
case T_code: case T_code:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
code = FROM_UTF8( CurText() ); code = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_name: case T_name:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
name = FROM_UTF8( CurText() ); name = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
@ -229,25 +229,25 @@ void KICAD_NETLIST_PARSER::parseNet()
{ {
case T_ref: case T_ref:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
reference = FROM_UTF8( CurText() ); reference = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_pin: case T_pin:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
pin_number = FROM_UTF8( CurText() ); pin_number = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_pinfunction: case T_pinfunction:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
pin_function = FROM_UTF8( CurText() ); pin_function = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_pintype: case T_pintype:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
pin_type = FROM_UTF8( CurText() ); pin_type = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
@ -323,13 +323,13 @@ void KICAD_NETLIST_PARSER::parseComponent()
{ {
case T_ref: case T_ref:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
ref = FROM_UTF8( CurText() ); ref = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_value: case T_value:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
value = FROM_UTF8( CurText() ); value = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
@ -349,13 +349,13 @@ void KICAD_NETLIST_PARSER::parseComponent()
if( token == T_lib ) if( token == T_lib )
{ {
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
library = FROM_UTF8( CurText() ); library = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
} }
else if( token == T_part ) else if( token == T_part )
{ {
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
name = FROM_UTF8( CurText() ); name = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
} }
else if( token == T_description ) else if( token == T_description )
@ -383,13 +383,13 @@ void KICAD_NETLIST_PARSER::parseComponent()
if( token == T_name ) if( token == T_name )
{ {
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
propName = FROM_UTF8( CurText() ); propName = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
} }
else if( token == T_value ) else if( token == T_value )
{ {
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
propValue = FROM_UTF8( CurText() ); propValue = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
} }
else else
@ -424,7 +424,7 @@ void KICAD_NETLIST_PARSER::parseComponent()
if( token == T_name ) if( token == T_name )
{ {
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
fieldName = FROM_UTF8( CurText() ); fieldName = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
} }
else if( token == T_STRING ) else if( token == T_STRING )
@ -451,7 +451,7 @@ void KICAD_NETLIST_PARSER::parseComponent()
} }
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
path = KIID_PATH( FROM_UTF8( CurText() ) ); path = KIID_PATH( From_UTF8( CurText() ) );
NeedRIGHT(); NeedRIGHT();
NeedRIGHT(); NeedRIGHT();
break; break;
@ -462,7 +462,7 @@ void KICAD_NETLIST_PARSER::parseComponent()
if( token == T_RIGHT ) if( token == T_RIGHT )
break; break;
uuids.emplace_back( FROM_UTF8( CurText() ) ); uuids.emplace_back( From_UTF8( CurText() ) );
} }
break; break;
@ -531,13 +531,13 @@ void KICAD_NETLIST_PARSER::parseLibPartList()
{ {
case T_lib: case T_lib:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
libName = FROM_UTF8( CurText() ); libName = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_part: case T_part:
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
libPartName = FROM_UTF8( CurText() ); libPartName = From_UTF8( CurText() );
NeedRIGHT(); NeedRIGHT();
break; break;
@ -552,7 +552,7 @@ void KICAD_NETLIST_PARSER::parseLibPartList()
Expecting( T_fp ); Expecting( T_fp );
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
footprintFilters.Add( FROM_UTF8( CurText() ) ); footprintFilters.Add( From_UTF8( CurText() ) );
NeedRIGHT(); NeedRIGHT();
} }
break; break;
@ -567,7 +567,7 @@ void KICAD_NETLIST_PARSER::parseLibPartList()
Expecting( T_alias ); Expecting( T_alias );
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
aliases.Add( FROM_UTF8( CurText() ) ); aliases.Add( From_UTF8( CurText() ) );
NeedRIGHT(); NeedRIGHT();
} }
break; break;

18
pcbnew/netlist_reader/legacy_netlist_reader.cpp
View File

@ -116,7 +116,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText )
m_lineReader->Length() ); m_lineReader->Length() );
} }
KIID_PATH path( FROM_UTF8( text ) ); KIID_PATH path( From_UTF8( text ) );
// Read footprint name (second word) // Read footprint name (second word)
if( ( text = strtok( nullptr, " ()\t\n" ) ) == nullptr ) if( ( text = strtok( nullptr, " ()\t\n" ) ) == nullptr )
@ -126,7 +126,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText )
m_lineReader->Length() ); m_lineReader->Length() );
} }
footprintName = FROM_UTF8( text ); footprintName = From_UTF8( text );
// The footprint name will have to be looked up in the *.cmp file. // The footprint name will have to be looked up in the *.cmp file.
if( footprintName == wxT( "$noname" ) ) if( footprintName == wxT( "$noname" ) )
@ -140,7 +140,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText )
m_lineReader->Length() ); m_lineReader->Length() );
} }
reference = FROM_UTF8( text ); reference = From_UTF8( text );
// Read schematic value (forth word) // Read schematic value (forth word)
if( ( text = strtok( nullptr, " ()\t\n" ) ) == nullptr ) if( ( text = strtok( nullptr, " ()\t\n" ) ) == nullptr )
@ -150,13 +150,13 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText )
m_lineReader->Length() ); m_lineReader->Length() );
} }
value = FROM_UTF8( text ); value = From_UTF8( text );
// Read component name (fifth word) {Lib=C} // Read component name (fifth word) {Lib=C}
// This is an optional field (a comment), which does not always exists // This is an optional field (a comment), which does not always exists
if( ( text = strtok( nullptr, " ()\t\n" ) ) != nullptr ) if( ( text = strtok( nullptr, " ()\t\n" ) ) != nullptr )
{ {
name = FROM_UTF8( text ).AfterFirst( wxChar( '=' ) ).BeforeLast( wxChar( '}' ) ); name = From_UTF8( text ).AfterFirst( wxChar( '=' ) ).BeforeLast( wxChar( '}' ) );
} }
LIB_ID fpid; LIB_ID fpid;
@ -187,7 +187,7 @@ void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent )
m_lineReader->Length() ); m_lineReader->Length() );
} }
wxString pinName = FROM_UTF8( p ); wxString pinName = From_UTF8( p );
if( ( p = strtok( nullptr, " ()\t\n" ) ) == nullptr ) if( ( p = strtok( nullptr, " ()\t\n" ) ) == nullptr )
{ {
@ -196,7 +196,7 @@ void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent )
m_lineReader->Length() ); m_lineReader->Length() );
} }
wxString netName = FROM_UTF8( p ); wxString netName = From_UTF8( p );
if( (char) netName[0] == '?' ) // ? indicates no net connected to pin. if( (char) netName[0] == '?' ) // ? indicates no net connected to pin.
netName = wxEmptyString; netName = wxEmptyString;
@ -229,7 +229,7 @@ void LEGACY_NETLIST_READER::loadFootprintFilters()
if( strncasecmp( line, "$component", 10 ) == 0 ) // New component reference found if( strncasecmp( line, "$component", 10 ) == 0 ) // New component reference found
{ {
cmpRef = FROM_UTF8( line + 11 ); cmpRef = From_UTF8( line + 11 );
cmpRef.Trim( true ); cmpRef.Trim( true );
cmpRef.Trim( false ); cmpRef.Trim( false );
@ -248,7 +248,7 @@ void LEGACY_NETLIST_READER::loadFootprintFilters()
else else
{ {
// Add new filter to list // Add new filter to list
wxString fp = FROM_UTF8( line + 1 ); wxString fp = From_UTF8( line + 1 );
fp.Trim( false ); fp.Trim( false );
fp.Trim( true ); fp.Trim( true );
filters.Add( fp ); filters.Add( fp );

6
pcbnew/netlist_reader/netlist_reader.cpp
View File

@ -64,7 +64,7 @@ NETLIST_READER::NETLIST_FILE_T NETLIST_READER::GuessNetlistFileType( LINE_READER
while( aLineReader->ReadLine() ) while( aLineReader->ReadLine() )
{ {
line = FROM_UTF8( aLineReader->Line() ); line = From_UTF8( aLineReader->Line() );
if( reLegacy.Matches( line ) ) if( reLegacy.Matches( line ) )
return LEGACY; return LEGACY;
@ -126,7 +126,7 @@ bool CMP_READER::Load( NETLIST* aNetlist )
while( m_lineReader->ReadLine() ) while( m_lineReader->ReadLine() )
{ {
buffer = FROM_UTF8( m_lineReader->Line() ); buffer = From_UTF8( m_lineReader->Line() );
if( !buffer.StartsWith( wxT( "BeginCmp" ) ) ) if( !buffer.StartsWith( wxT( "BeginCmp" ) ) )
continue; continue;
@ -138,7 +138,7 @@ bool CMP_READER::Load( NETLIST* aNetlist )
while( m_lineReader->ReadLine() ) while( m_lineReader->ReadLine() )
{ {
buffer = FROM_UTF8( m_lineReader->Line() ); buffer = From_UTF8( m_lineReader->Line() );
if( buffer.StartsWith( wxT( "EndCmp" ) ) ) if( buffer.StartsWith( wxT( "EndCmp" ) ) )
break; break;

4
pcbnew/pcb_plot_params.cpp
View File

@ -24,7 +24,7 @@
#include <board_design_settings.h> #include <board_design_settings.h>
#include <charconv> #include <charconv>
#include <layer_ids.h> #include <layer_ids.h>
#include <macros.h> #include <string_utils.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <pcb_plot_params.h> #include <pcb_plot_params.h>
#include <pcb_plot_params_parser.h> #include <pcb_plot_params_parser.h>
@ -644,7 +644,7 @@ void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams )
case T_outputdirectory: case T_outputdirectory:
NeedSYMBOLorNUMBER(); // a dir name can be like a number NeedSYMBOLorNUMBER(); // a dir name can be like a number
aPcbPlotParams->m_outputDirectory = FROM_UTF8( CurText() ); aPcbPlotParams->m_outputDirectory = From_UTF8( CurText() );
break; break;
default: default:

2
pcbnew/plugins/geda/gpcb_plugin.cpp
View File

@ -891,7 +891,7 @@ void GPCB_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames, const wxSt
// the library. // the library.
for( const auto& footprint : m_cache->GetFootprints() ) for( const auto& footprint : m_cache->GetFootprints() )
aFootprintNames.Add( FROM_UTF8( footprint.first.c_str() ) ); aFootprintNames.Add( From_UTF8( footprint.first.c_str() ) );
if( !errorMsg.IsEmpty() && !aBestEfforts ) if( !errorMsg.IsEmpty() && !aBestEfforts )
THROW_IO_ERROR( errorMsg ); THROW_IO_ERROR( errorMsg );

6
pcbnew/plugins/kicad/pcb_parser.cpp
View File

@ -589,7 +589,7 @@ void PCB_PARSER::parseRenderCache( EDA_TEXT* text )
T token; T token;
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
wxString cacheText = FROM_UTF8( CurText() ); wxString cacheText = From_UTF8( CurText() );
EDA_ANGLE cacheAngle( parseDouble( "render cache angle" ), DEGREES_T ); EDA_ANGLE cacheAngle( parseDouble( "render cache angle" ), DEGREES_T );
text->SetupRenderCache( cacheText, cacheAngle ); text->SetupRenderCache( cacheText, cacheAngle );
@ -1430,13 +1430,13 @@ void PCB_PARSER::parseLayer( LAYER* aLayer )
Expecting( "hide, user defined name, or )" ); Expecting( "hide, user defined name, or )" );
} }
aLayer->m_name = FROM_UTF8( name.c_str() ); aLayer->m_name = From_UTF8( name.c_str() );
aLayer->m_type = LAYER::ParseType( type.c_str() ); aLayer->m_type = LAYER::ParseType( type.c_str() );
aLayer->m_number = layer_num; aLayer->m_number = layer_num;
aLayer->m_visible = isVisible; aLayer->m_visible = isVisible;
if( !userName.empty() ) if( !userName.empty() )
aLayer->m_userName = FROM_UTF8( userName.c_str() ); aLayer->m_userName = From_UTF8( userName.c_str() );
// The canonical name will get reset back to the default for copper layer on the next // The canonical name will get reset back to the default for copper layer on the next
// save. The user defined name is now a separate optional layer token from the canonical // save. The user defined name is now a separate optional layer token from the canonical

56
pcbnew/plugins/legacy/legacy_plugin.cpp
View File

@ -786,7 +786,7 @@ void LEGACY_PLUGIN::loadSHEET()
if( sname ) if( sname )
{ {
wxString wname = FROM_UTF8( sname ); wxString wname = From_UTF8( sname );
if( !page.SetType( wname ) ) if( !page.SetType( wname ) )
{ {
@ -826,67 +826,67 @@ void LEGACY_PLUGIN::loadSHEET()
else if( TESTLINE( "Title" ) ) else if( TESTLINE( "Title" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetTitle( FROM_UTF8( buf ) ); tb.SetTitle( From_UTF8( buf ) );
} }
else if( TESTLINE( "Date" ) ) else if( TESTLINE( "Date" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetDate( FROM_UTF8( buf ) ); tb.SetDate( From_UTF8( buf ) );
} }
else if( TESTLINE( "Rev" ) ) else if( TESTLINE( "Rev" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetRevision( FROM_UTF8( buf ) ); tb.SetRevision( From_UTF8( buf ) );
} }
else if( TESTLINE( "Comp" ) ) else if( TESTLINE( "Comp" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetCompany( FROM_UTF8( buf ) ); tb.SetCompany( From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment1" ) ) else if( TESTLINE( "Comment1" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 0, FROM_UTF8( buf ) ); tb.SetComment( 0, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment2" ) ) else if( TESTLINE( "Comment2" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 1, FROM_UTF8( buf ) ); tb.SetComment( 1, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment3" ) ) else if( TESTLINE( "Comment3" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 2, FROM_UTF8( buf ) ); tb.SetComment( 2, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment4" ) ) else if( TESTLINE( "Comment4" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 3, FROM_UTF8( buf ) ); tb.SetComment( 3, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment5" ) ) else if( TESTLINE( "Comment5" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 4, FROM_UTF8( buf ) ); tb.SetComment( 4, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment6" ) ) else if( TESTLINE( "Comment6" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 5, FROM_UTF8( buf ) ); tb.SetComment( 5, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment7" ) ) else if( TESTLINE( "Comment7" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 6, FROM_UTF8( buf ) ); tb.SetComment( 6, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment8" ) ) else if( TESTLINE( "Comment8" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 7, FROM_UTF8( buf ) ); tb.SetComment( 7, From_UTF8( buf ) );
} }
else if( TESTLINE( "Comment9" ) ) else if( TESTLINE( "Comment9" ) )
{ {
ReadDelimitedText( buf, line, sizeof(buf) ); ReadDelimitedText( buf, line, sizeof(buf) );
tb.SetComment( 8, FROM_UTF8( buf ) ); tb.SetComment( 8, From_UTF8( buf ) );
} }
else if( TESTLINE( "$EndSHEETDESCR" ) ) else if( TESTLINE( "$EndSHEETDESCR" ) )
{ {
@ -943,7 +943,7 @@ void LEGACY_PLUGIN::loadSETUP()
if( data ) if( data )
{ {
wxString layerName = FROM_UTF8( data ); wxString layerName = From_UTF8( data );
m_board->SetLayerName( layer_id, layerName ); m_board->SetLayerName( layer_id, layerName );
data = strtok_r( nullptr, delims, &saveptr ); data = strtok_r( nullptr, delims, &saveptr );
@ -1289,7 +1289,7 @@ void LEGACY_PLUGIN::loadFOOTPRINT( FOOTPRINT* aFootprint )
data = strtok_r( line + SZ( "AR" ), delims, (char**) &data ); data = strtok_r( line + SZ( "AR" ), delims, (char**) &data );
if( data ) if( data )
aFootprint->SetPath( KIID_PATH( FROM_UTF8( data ) ) ); aFootprint->SetPath( KIID_PATH( From_UTF8( data ) ) );
} }
else if( TESTLINE( "$SHAPE3D" ) ) else if( TESTLINE( "$SHAPE3D" ) )
{ {
@ -1298,11 +1298,11 @@ void LEGACY_PLUGIN::loadFOOTPRINT( FOOTPRINT* aFootprint )
else if( TESTLINE( "Cd" ) ) else if( TESTLINE( "Cd" ) )
{ {
// e.g. "Cd Double rangee de contacts 2 x 4 pins\r\n" // e.g. "Cd Double rangee de contacts 2 x 4 pins\r\n"
aFootprint->SetLibDescription( FROM_UTF8( StrPurge( line + SZ( "Cd" ) ) ) ); aFootprint->SetLibDescription( From_UTF8( StrPurge( line + SZ( "Cd" ) ) ) );
} }
else if( TESTLINE( "Kw" ) ) // Key words else if( TESTLINE( "Kw" ) ) // Key words
{ {
aFootprint->SetKeywords( FROM_UTF8( StrPurge( line + SZ( "Kw" ) ) ) ); aFootprint->SetKeywords( From_UTF8( StrPurge( line + SZ( "Kw" ) ) ) );
} }
else if( TESTLINE( ".SolderPasteRatio" ) ) else if( TESTLINE( ".SolderPasteRatio" ) )
{ {
@ -1427,7 +1427,7 @@ void LEGACY_PLUGIN::loadPAD( FOOTPRINT* aFootprint )
else else
{ {
// version 2, which is UTF8. // version 2, which is UTF8.
padNumber = FROM_UTF8( mypadnumber ); padNumber = From_UTF8( mypadnumber );
} }
// chances are both were ASCII, but why take chances? // chances are both were ASCII, but why take chances?
@ -1510,7 +1510,7 @@ void LEGACY_PLUGIN::loadPAD( FOOTPRINT* aFootprint )
if( m_board ) if( m_board )
{ {
wxASSERT( m_board->FindNet( getNetCode( netcode ) )->GetNetname() wxASSERT( m_board->FindNet( getNetCode( netcode ) )->GetNetname()
== ConvertToNewOverbarNotation( FROM_UTF8( StrPurge( buf ) ) ) ); == ConvertToNewOverbarNotation( From_UTF8( StrPurge( buf ) ) ) );
} }
} }
else if( TESTLINE( "Po" ) ) // (Po)sition else if( TESTLINE( "Po" ) ) // (Po)sition
@ -1979,7 +1979,7 @@ void LEGACY_PLUGIN::loadNETINFO_ITEM()
if( net == nullptr ) if( net == nullptr )
{ {
net = new NETINFO_ITEM( m_board, ConvertToNewOverbarNotation( FROM_UTF8( buf ) ), net = new NETINFO_ITEM( m_board, ConvertToNewOverbarNotation( From_UTF8( buf ) ),
netCode ); netCode );
} }
else else
@ -2055,12 +2055,12 @@ void LEGACY_PLUGIN::loadPCB_TEXT()
if( TESTLINE( "Te" ) ) // Text line (or first line for multi line texts) if( TESTLINE( "Te" ) ) // Text line (or first line for multi line texts)
{ {
ReadDelimitedText( text, line + SZ( "Te" ), sizeof(text) ); ReadDelimitedText( text, line + SZ( "Te" ), sizeof(text) );
pcbtxt->SetText( ConvertToNewOverbarNotation( FROM_UTF8( text ) ) ); pcbtxt->SetText( ConvertToNewOverbarNotation( From_UTF8( text ) ) );
} }
else if( TESTLINE( "nl" ) ) // next line of the current text else if( TESTLINE( "nl" ) ) // next line of the current text
{ {
ReadDelimitedText( text, line + SZ( "nl" ), sizeof(text) ); ReadDelimitedText( text, line + SZ( "nl" ), sizeof(text) );
pcbtxt->SetText( pcbtxt->GetText() + wxChar( '\n' ) + FROM_UTF8( text ) ); pcbtxt->SetText( pcbtxt->GetText() + wxChar( '\n' ) + From_UTF8( text ) );
} }
else if( TESTLINE( "Po" ) ) else if( TESTLINE( "Po" ) )
{ {
@ -2299,7 +2299,7 @@ void LEGACY_PLUGIN::loadNETCLASS()
{ {
// e.g. "AddNet "V3.3D"\n" // e.g. "AddNet "V3.3D"\n"
ReadDelimitedText( buf, line + SZ( "AddNet" ), sizeof(buf) ); ReadDelimitedText( buf, line + SZ( "AddNet" ), sizeof(buf) );
netname = ConvertToNewOverbarNotation( FROM_UTF8( buf ) ); netname = ConvertToNewOverbarNotation( From_UTF8( buf ) );
m_board->GetDesignSettings().m_NetSettings->m_NetClassPatternAssignments.push_back( m_board->GetDesignSettings().m_NetSettings->m_NetClassPatternAssignments.push_back(
{ {
@ -2340,12 +2340,12 @@ void LEGACY_PLUGIN::loadNETCLASS()
else if( TESTLINE( "Name" ) ) else if( TESTLINE( "Name" ) )
{ {
ReadDelimitedText( buf, line + SZ( "Name" ), sizeof(buf) ); ReadDelimitedText( buf, line + SZ( "Name" ), sizeof(buf) );
nc->SetName( FROM_UTF8( buf ) ); nc->SetName( From_UTF8( buf ) );
} }
else if( TESTLINE( "Desc" ) ) else if( TESTLINE( "Desc" ) )
{ {
ReadDelimitedText( buf, line + SZ( "Desc" ), sizeof(buf) ); ReadDelimitedText( buf, line + SZ( "Desc" ), sizeof(buf) );
nc->SetDescription( FROM_UTF8( buf ) ); nc->SetDescription( From_UTF8( buf ) );
} }
else if( TESTLINE( "$EndNCLASS" ) ) else if( TESTLINE( "$EndNCLASS" ) )
{ {
@ -2695,7 +2695,7 @@ void LEGACY_PLUGIN::loadDIMENSION()
char buf[2048]; char buf[2048];
ReadDelimitedText( buf, line + SZ( "Te" ), sizeof(buf) ); ReadDelimitedText( buf, line + SZ( "Te" ), sizeof(buf) );
dim->SetOverrideText( FROM_UTF8( buf ) ); dim->SetOverrideText( From_UTF8( buf ) );
dim->SetOverrideTextEnabled( true ); dim->SetOverrideTextEnabled( true );
dim->SetUnitsFormat( DIM_UNITS_FORMAT::NO_SUFFIX ); dim->SetUnitsFormat( DIM_UNITS_FORMAT::NO_SUFFIX );
dim->SetAutoUnits(); dim->SetAutoUnits();
@ -3208,7 +3208,7 @@ void LEGACY_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames, const wx
// the library. // the library.
for( const auto& footprint : m_cache->m_footprints ) for( const auto& footprint : m_cache->m_footprints )
aFootprintNames.Add( FROM_UTF8( footprint.first.c_str() ) ); aFootprintNames.Add( From_UTF8( footprint.first.c_str() ) );
if( !errorMsg.IsEmpty() && !aBestEfforts ) if( !errorMsg.IsEmpty() && !aBestEfforts )
THROW_IO_ERROR( errorMsg ); THROW_IO_ERROR( errorMsg );

2
pcbnew/python/scripting/pcbnew_scripting.cpp
View File

@ -93,7 +93,7 @@ static void pcbnewRunPythonMethodWithReturnedString( const char* aMethodName, wx
if( temp_bytes != nullptr ) if( temp_bytes != nullptr )
{ {
str_res = PyBytes_AS_STRING( temp_bytes ); str_res = PyBytes_AS_STRING( temp_bytes );
aNames = FROM_UTF8( str_res ); aNames = From_UTF8( str_res );
Py_DECREF( temp_bytes ); Py_DECREF( temp_bytes );
} }
else else

14
pcbnew/specctra_import_export/specctra_import.cpp
View File

@ -158,7 +158,7 @@ PCB_TRACK* SPECCTRA_DB::makeTRACK( WIRE* wire, PATH* aPath, int aPointIndex, int
if( layerNdx == -1 ) if( layerNdx == -1 )
{ {
THROW_IO_ERROR( wxString::Format( _( "Session file uses invalid layer id '%s'." ), THROW_IO_ERROR( wxString::Format( _( "Session file uses invalid layer id '%s'." ),
FROM_UTF8( aPath->layer_id.c_str() ) ) ); From_UTF8( aPath->layer_id.c_str() ) ) );
} }
PCB_TRACK* track = new PCB_TRACK( m_sessionBoard ); PCB_TRACK* track = new PCB_TRACK( m_sessionBoard );
@ -283,7 +283,7 @@ PCB_VIA* SPECCTRA_DB::makeVIA( WIRE_VIA*aVia, PADSTACK* aPadstack, const POINT&
int layerNdx = findLayerName( circle->layer_id ); int layerNdx = findLayerName( circle->layer_id );
if( layerNdx == -1 ) if( layerNdx == -1 )
{ {
wxString layerName = FROM_UTF8( circle->layer_id.c_str() ); wxString layerName = From_UTF8( circle->layer_id.c_str() );
THROW_IO_ERROR( wxString::Format( _( "Session file uses invalid layer id '%s'" ), THROW_IO_ERROR( wxString::Format( _( "Session file uses invalid layer id '%s'" ),
layerName ) ); layerName ) );
} }
@ -392,7 +392,7 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
{ {
PLACE* place = &places[i]; // '&' even though places[] holds a pointer! PLACE* place = &places[i]; // '&' even though places[] holds a pointer!
wxString reference = FROM_UTF8( place->m_component_id.c_str() ); wxString reference = From_UTF8( place->m_component_id.c_str() );
FOOTPRINT* footprint = aBoard->FindFootprintByReference( reference ); FOOTPRINT* footprint = aBoard->FindFootprintByReference( reference );
if( !footprint ) if( !footprint )
@ -455,7 +455,7 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
// page 143 of spec says wire's net_id is optional // page 143 of spec says wire's net_id is optional
if( net->net_id.size() ) if( net->net_id.size() )
{ {
wxString netName = FROM_UTF8( net->net_id.c_str() ); wxString netName = From_UTF8( net->net_id.c_str() );
NETINFO_ITEM* netinfo = aBoard->FindNet( netName ); NETINFO_ITEM* netinfo = aBoard->FindNet( netName );
if( netinfo ) if( netinfo )
@ -476,7 +476,7 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
* back in as session here. We kept our own zones in the BOARD, so ignore this * back in as session here. We kept our own zones in the BOARD, so ignore this
* so called 'wire'. * so called 'wire'.
wxString netId = FROM_UTF8( wire->net_id.c_str() ); wxString netId = From_UTF8( wire->net_id.c_str() );
THROW_IO_ERROR( wxString::Format( _( "Unsupported wire shape: '%s' for net: '%s'" ), THROW_IO_ERROR( wxString::Format( _( "Unsupported wire shape: '%s' for net: '%s'" ),
DLEX::GetTokenString(shape).GetData(), DLEX::GetTokenString(shape).GetData(),
netId.GetData() ) ); netId.GetData() ) );
@ -504,7 +504,7 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
// page 144 of spec says wire_via's net_id is optional // page 144 of spec says wire_via's net_id is optional
if( net->net_id.size() ) if( net->net_id.size() )
{ {
wxString netName = FROM_UTF8( net->net_id.c_str() ); wxString netName = From_UTF8( net->net_id.c_str() );
NETINFO_ITEM* netvia = aBoard->FindNet( netName ); NETINFO_ITEM* netvia = aBoard->FindNet( netName );
if( netvia ) if( netvia )
@ -524,7 +524,7 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
// in in the session library, even though they may be actually used in the // in in the session library, even though they may be actually used in the
// pre-routed, protected wire_vias. So until that is fixed, create the padstack // pre-routed, protected wire_vias. So until that is fixed, create the padstack
// from its name as a work around. // from its name as a work around.
wxString psid( FROM_UTF8( wire_via->GetPadstackId().c_str() ) ); wxString psid( From_UTF8( wire_via->GetPadstackId().c_str() ) );
THROW_IO_ERROR( wxString::Format( _( "A wire_via refers to missing padstack '%s'." ), THROW_IO_ERROR( wxString::Format( _( "A wire_via refers to missing padstack '%s'." ),
psid ) ); psid ) );

2
pcbnew/specctra_import_export/specctra_test.cpp
View File

@ -55,7 +55,7 @@ int main( int argc, char** argv )
if( argc == 2 ) if( argc == 2 )
{ {
filename = FROM_UTF8( argv[1] ); filename = From_UTF8( argv[1] );
} }
try try

8
qa/qa_utils/test_app_main.cpp
View File

@ -33,7 +33,7 @@
#include <typeinfo> #include <typeinfo>
#include <macros.h> #include <string_utils.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#include <wx/snglinst.h> #include <wx/snglinst.h>
@ -182,7 +182,7 @@ struct APP_TEST : public wxApp
catch( const std::exception& e ) catch( const std::exception& e )
{ {
wxLogError( wxT( "Unhandled exception class: %s what: %s" ), wxLogError( wxT( "Unhandled exception class: %s what: %s" ),
FROM_UTF8( typeid(e).name() ), FROM_UTF8( e.what() ) ); From_UTF8( typeid(e).name() ), From_UTF8( e.what() ) );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {
@ -215,8 +215,8 @@ struct APP_TEST : public wxApp
catch( const std::exception& e ) catch( const std::exception& e )
{ {
wxLogError( wxT( "Unhandled exception class: %s what: %s" ), wxLogError( wxT( "Unhandled exception class: %s what: %s" ),
FROM_UTF8( typeid(e).name() ), From_UTF8( typeid(e).name() ),
FROM_UTF8( e.what() ) ); From_UTF8( e.what() ) );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {

6
scripting/python_scripting.cpp
View File

@ -366,7 +366,7 @@ static void RunPythonMethodWithReturnedString( const char* aMethodName, wxString
if( temp_bytes != nullptr ) if( temp_bytes != nullptr )
{ {
str_res = PyBytes_AS_STRING( temp_bytes ); str_res = PyBytes_AS_STRING( temp_bytes );
aNames = FROM_UTF8( str_res ); aNames = From_UTF8( str_res );
Py_DECREF( temp_bytes ); Py_DECREF( temp_bytes );
} }
else else
@ -452,7 +452,7 @@ wxString PyStringToWx( PyObject* aString )
if( temp_bytes != nullptr ) if( temp_bytes != nullptr )
{ {
str_res = PyBytes_AS_STRING( temp_bytes ); str_res = PyBytes_AS_STRING( temp_bytes );
ret = FROM_UTF8( str_res ); ret = From_UTF8( str_res );
Py_DECREF( temp_bytes ); Py_DECREF( temp_bytes );
} }
else else
@ -485,7 +485,7 @@ wxArrayString PyArrayStringToWx( PyObject* aArrayString )
if( temp_bytes != nullptr ) if( temp_bytes != nullptr )
{ {
str_res = PyBytes_AS_STRING( temp_bytes ); str_res = PyBytes_AS_STRING( temp_bytes );
ret.Add( FROM_UTF8( str_res ), 1 ); ret.Add( From_UTF8( str_res ), 1 );
Py_DECREF( temp_bytes ); Py_DECREF( temp_bytes );
} }
else else

5
thirdparty/markdown2html/markdown2html.cpp vendored
View File

@ -17,8 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <string>
#include <macros.h> #include <macros.h>
#include <string>
#include <string_utils.h>
#include "markdown.h" #include "markdown.h"
#include "html.h" #include "html.h"
@ -43,7 +44,7 @@ void ConvertMarkdown2Html( const wxString& aMarkdownInput, wxString& aHtmlOutput
sd_markdown_free( markdown ); sd_markdown_free( markdown );
std::string out( (char*)ob->data, ob->size ); std::string out( (char*)ob->data, ob->size );
aHtmlOutput = FROM_UTF8( out.data() ); aHtmlOutput = From_UTF8( out.data() );
/* cleanup */ /* cleanup */
bufrelease( ob ); bufrelease( ob );

2
utils/idftools/idf_helpers.h
View File

@ -45,7 +45,7 @@
* *
* NOTE: Taken from KiCad include/macros.h * NOTE: Taken from KiCad include/macros.h
*/ */
static inline wxString FROM_UTF8( const char* cstring ) static inline wxString From_UTF8( const char* cstring )
{ {
wxString line = wxString::FromUTF8( cstring ); wxString line = wxString::FromUTF8( cstring );