From 0ff32d20cd230ce48412aab7f4876bad811b074d Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 22 Jan 2023 09:41:33 -0500 Subject: [PATCH] wxS more things --- common/advanced_config.cpp | 22 +- common/dialog_about/AboutDialog_main.cpp | 198 +++++++++--------- common/dialog_about/dialog_about.cpp | 4 +- common/drawing_sheet/drawing_sheet_parser.cpp | 6 +- common/drawing_sheet/ds_data_item.cpp | 2 +- common/eda_base_frame.cpp | 44 ++-- common/eda_pattern_match.cpp | 2 +- common/executable_names.cpp | 28 +-- common/font/fontconfig.cpp | 2 +- common/fp_lib_table.cpp | 4 +- common/gl_context_mgr.cpp | 4 +- common/grid_tricks.cpp | 2 +- common/plotters/GERBER_plotter.cpp | 4 +- common/project.cpp | 2 +- common/settings/app_settings.cpp | 74 +++---- common/settings/color_settings.cpp | 2 +- common/settings/common_settings.cpp | 68 +++--- common/settings/kicad_settings.cpp | 2 +- common/settings/settings_manager.cpp | 10 +- eeschema/files-io.cpp | 4 +- .../sch_plugins/kicad/sch_sexpr_plugin.cpp | 2 +- .../sch_plugins/legacy/sch_legacy_plugin.cpp | 2 +- eeschema/symbol_editor/symbol_editor.cpp | 4 +- .../symbol_editor/symbol_editor_settings.cpp | 2 +- pcbnew/files.cpp | 2 +- pcbnew/python/scripting/pcbnew_scripting.cpp | 2 +- scripting/python_scripting.cpp | 6 +- 27 files changed, 252 insertions(+), 252 deletions(-) diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp index 0ffac5c418..7698a32ae6 100644 --- a/common/advanced_config.cpp +++ b/common/advanced_config.cpp @@ -212,7 +212,7 @@ static const wxChar V3D_RayTracing[] = wxT( "G_3DV_RayTracing" ); */ wxString dumpParamCfg( const PARAM_CFG& aParam ) { - wxString s = aParam.m_Ident + ": "; + wxString s = aParam.m_Ident + wxS( ": " ); /* * This implementation is rather simplistic, but it is @@ -235,9 +235,9 @@ wxString dumpParamCfg( const PARAM_CFG& aParam ) s << *static_cast( aParam ).m_Pt_param; break; case paramcfg_id::PARAM_BOOL: - s << ( *static_cast( aParam ).m_Pt_param ? "true" : "false" ); + s << ( *static_cast( aParam ).m_Pt_param ? wxS( "true" ) : wxS( "false" ) ); break; - default: s << "Unsupported PARAM_CFG variant: " << aParam.m_Type; + default: s << wxS( "Unsupported PARAM_CFG variant: " ) << aParam.m_Type; } return s; @@ -267,14 +267,14 @@ static void dumpCfg( const std::vector& aArray ) */ static wxFileName getAdvancedCfgFilename() { - const static wxString cfg_filename{ "kicad_advanced" }; + const static wxString cfg_filename{ wxS( "kicad_advanced" ) }; return wxFileName( SETTINGS_MANAGER::GetUserSettingsPath(), cfg_filename ); } ADVANCED_CFG::ADVANCED_CFG() { - wxLogTrace( AdvancedConfigMask, "Init advanced config" ); + wxLogTrace( AdvancedConfigMask, wxS( "Init advanced config" ) ); // Init defaults - this is done in case the config doesn't exist, // then the values will remain as set here. @@ -342,7 +342,7 @@ void ADVANCED_CFG::loadFromConfigFile() if( !k_advanced.FileExists() ) { - wxLogTrace( AdvancedConfigMask, "File does not exist %s", k_advanced.GetFullPath() ); + wxLogTrace( AdvancedConfigMask, wxS( "File does not exist %s" ), k_advanced.GetFullPath() ); // load the defaults wxConfig emptyConfig; @@ -351,9 +351,9 @@ void ADVANCED_CFG::loadFromConfigFile() return; } - wxLogTrace( AdvancedConfigMask, "Loading advanced config from: %s", k_advanced.GetFullPath() ); + wxLogTrace( AdvancedConfigMask, wxS( "Loading advanced config from: %s" ), k_advanced.GetFullPath() ); - wxFileConfig file_cfg( "", "", k_advanced.GetFullPath() ); + wxFileConfig file_cfg( wxS( "" ), wxS( "" ), k_advanced.GetFullPath() ); loadSettings( file_cfg ); } @@ -467,8 +467,8 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg ) // Special case for trace mask setting...we just grab them and set them immediately // Because we even use wxLogTrace inside of advanced config - wxString traceMasks = ""; - configParams.push_back( new PARAM_CFG_WXSTRING( true, AC_KEYS::TraceMasks, &traceMasks, "" ) ); + wxString traceMasks; + configParams.push_back( new PARAM_CFG_WXSTRING( true, AC_KEYS::TraceMasks, &traceMasks, wxS( "" ) ) ); configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowPropertiesPanel, &m_ShowPropertiesPanel, false ) ); @@ -477,7 +477,7 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg ) wxConfigLoadSetups( &aCfg, configParams ); // Now actually set the trace masks - wxStringTokenizer traceMaskTokenizer( traceMasks, "," ); + wxStringTokenizer traceMaskTokenizer( traceMasks, wxS( "," ) ); while( traceMaskTokenizer.HasMoreTokens() ) { diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 2c64946fa6..854ae0fd42 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -131,16 +131,16 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf description << wxT( "
    " ); description << wxT( "
  • " ) << _( "The official KiCad website - " ) - << HtmlHyperlink( "http://www.kicad.org" ) + << HtmlHyperlink( wxS( "http://www.kicad.org" ) ) << wxT( "
    • " ); description << wxT( "
  • " ) << _( "Developer website - " ) - << HtmlHyperlink( "https://go.kicad.org/dev" ) + << HtmlHyperlink( wxS( "https://go.kicad.org/dev" ) ) << wxT( "
    • " ); description << wxT( "
  • " ) << _("Official KiCad library repositories - " ) - << HtmlHyperlink( "https://go.kicad.org/libraries" ) + << HtmlHyperlink( wxS( "https://go.kicad.org/libraries" ) ) << wxT( "
    • " ); description << wxT( "

" ); @@ -153,7 +153,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf description << wxT( "
    " ); description << wxT( "
  • " ) << _( "Report or examine bugs - " ) - << HtmlHyperlink( "https://go.kicad.org/bugs" ) + << HtmlHyperlink( wxS( "https://go.kicad.org/bugs" ) ) << wxT( "
    • " ); description << wxT( "

" ); @@ -164,7 +164,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf description << wxT( "
    " ); description << wxT( "
  • " ) << _( "KiCad forum - " ) - << HtmlHyperlink( "https://go.kicad.org/forum" ) + << HtmlHyperlink( wxS( "https://go.kicad.org/forum" ) ) << wxT( "
    • " ); description << wxT( "

" ); @@ -178,7 +178,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf << wxT( "
" ) << HtmlNewline( 4 ) << _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 ) - << HtmlHyperlink( "http://www.gnu.org/licenses", + << HtmlHyperlink( wxS( "http://www.gnu.org/licenses" ), _( "GNU General Public License (GPL) version 3 or any later version" ) ) << wxT( "
" ); @@ -541,343 +541,343 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Martin Kratoška" ), wxEmptyString, wxEmptyString, - "Czech (CS)" ) ); + wxS( "Czech (CS)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Radek Kuznik" ), wxEmptyString, wxEmptyString, - "Czech (CS)" ) ); + wxS( "Czech (CS)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Roman Ondráček" ), wxEmptyString, wxEmptyString, - "Czech (CS)" ) ); + wxS( "Czech (CS)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Jan Straka" ), wxEmptyString, wxEmptyString, - "Czech (CS)" ) ); + wxS( "Czech (CS)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Jan Vykydal" ), wxEmptyString, wxEmptyString, - "Czech (CS)" ) ); - aInfo.AddTranslator( new CONTRIBUTOR( "Jonathan Haas", + wxS( "Czech (CS)" ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Jonathan Haas" ), wxEmptyString, wxEmptyString, - "German (DE)" ) ); + wxS( "German (DE)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Mark Hämmerling" ), wxEmptyString, wxEmptyString, - "German (DE)" ) ); + wxS( "German (DE)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Mathias Neumann" ), wxEmptyString, wxEmptyString, - "German (DE)" ) ); + wxS( "German (DE)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Dominik Wernberger" ), wxEmptyString, wxEmptyString, - "German (DE)" ) ); + wxS( "German (DE)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Manolis Stefanis" ), wxEmptyString, wxEmptyString, - "Greek (el_GR)" ) ); + wxS( "Greek (el_GR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Athanasios Vlastos" ), wxEmptyString, wxEmptyString, - "Greek (el_GR)" ) ); + wxS( "Greek (el_GR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Milonas Kostas" ), wxEmptyString, wxEmptyString, - "Greek (el_GR)" ) ); + wxS( "Greek (el_GR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Michail Misirlis" ), wxEmptyString, wxEmptyString, - "Greek (el_GR)" ) ); + wxS( "Greek (el_GR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Adolfo Jayme Barrientos" ), wxEmptyString, wxEmptyString, - "Spanish (ES)" ) ); + wxS( "Spanish (ES)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Roberto Fernandez Bautista" ), wxEmptyString, wxEmptyString, - "Spanish (ES)" ) ); + wxS( "Spanish (ES)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Augusto Fraga Giachero" ), wxEmptyString, wxEmptyString, - "Spanish (ES)" ) ); - aInfo.AddTranslator( new CONTRIBUTOR( "Pedro Martin del Valle", + wxS( "Spanish (ES)" ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Pedro Martin del Valle" ), wxEmptyString, wxEmptyString, - "Spanish (ES)" ) ); + wxS( "Spanish (ES)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Iñigo Figuero" ), wxEmptyString, wxEmptyString, - "Spanish (ES)" ) ); + wxS( "Spanish (ES)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Iñigo Zuluaga" ), wxEmptyString, wxEmptyString, - "Spanish (ES)" ) ); + wxS( "Spanish (ES)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Ulices Avila Hernandez" ), wxEmptyString, wxEmptyString, - "Spanish - Latin American (ES)" ) ); + wxS( "Spanish - Latin American (ES)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Vesa Solonen" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Alex Gellen" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "J. Lavoie" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Purkka Koodari" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Ola Rinta-Koski" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Riku Viitanen" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Simo Mattila" ), wxEmptyString, wxEmptyString, - "Finnish (FI)" ) ); + wxS( "Finnish (FI)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Jean-Pierre Charras" ), wxEmptyString, wxEmptyString, - "French (FR)" ) ); + wxS( "French (FR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Marco Ciampa" ), wxEmptyString, wxEmptyString, - "Italian (IT)" ) ); + wxS( "Italian (IT)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Hiroshi Tokita" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Kenta Yonekura" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Ji Yoon Choi" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Hidemichi Gotou" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Kaoru Zenyouji" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Kinichiro Inoguchi" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Norio Suzuki" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "starfort-jp" ), wxEmptyString, wxEmptyString, - "Japanese (JA)" ) ); + wxS( "Japanese (JA)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "킴슨김랑기" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Ji Yoon Choi" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "jeongsuAn" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "이상수" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "jehunseo" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Uibeom Jung" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "박준언" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "방준영" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "박기정" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "hokim" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "강명구" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "서범기" ), wxEmptyString, wxEmptyString, - "Korean (KO)" ) ); + wxS( "Korean (KO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Arend-Jan van Hilten" ), wxEmptyString, wxEmptyString, - "Dutch (NL)" ) ); + wxS( "Dutch (NL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "CJ van der Hoeven" ), wxEmptyString, wxEmptyString, - "Dutch (NL)" ) ); + wxS( "Dutch (NL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Pim Jansen" ), wxEmptyString, wxEmptyString, - "Dutch (NL)" ) ); + wxS( "Dutch (NL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Allan Nordhøy" ), wxEmptyString, wxEmptyString, - "Norwegian (NO)" ) ); + wxS( "Norwegian (NO)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Mateusz Skowroński" ), wxEmptyString, wxEmptyString, - "Polish (PL)" ) ); + wxS( "Polish (PL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Kerusey Karyu" ), wxEmptyString, wxEmptyString, - "Polish (PL)" ) ); + wxS( "Polish (PL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Mark Roszko" ), wxEmptyString, wxEmptyString, - "Polish (PL)" ) ); + wxS( "Polish (PL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "ZbeeGin" ), wxEmptyString, wxEmptyString, - "Polish (PL)" ) ); + wxS( "Polish (PL)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Augusto Fraga Giachero" ), wxEmptyString, wxEmptyString, - "Brazilian Portuguese (PT_BR)" ) ); + wxS( "Brazilian Portuguese (PT_BR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Wellington Terumi Uemura" ), wxEmptyString, wxEmptyString, - "Brazilian Portuguese (PT_BR)" ) ); + wxS( "Brazilian Portuguese (PT_BR)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Augusto Fraga Giachero" ), wxEmptyString, wxEmptyString, - "Portuguese (PT)" ) ); + wxS( "Portuguese (PT)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Renie Marquet" ), wxEmptyString, wxEmptyString, - "Portuguese (PT)" ) ); + wxS( "Portuguese (PT)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Rafael Silva" ), wxEmptyString, wxEmptyString, - "Portuguese (PT)" ) ); + wxS( "Portuguese (PT)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Igor Plyatov" ), wxEmptyString, wxEmptyString, - "Russian (RU)" ) ); + wxS( "Russian (RU)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Дмитрий Дёмин" ), wxEmptyString, wxEmptyString, - "Russian (RU)" ) ); + wxS( "Russian (RU)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Andrey Fedorushkov" ), wxEmptyString, wxEmptyString, - "Russian (RU)" ) ); + wxS( "Russian (RU)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Eldar Khayrullin" ), wxEmptyString, wxEmptyString, - "Russian (RU)" ) ); + wxS( "Russian (RU)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Konstantin Baranovskiy" ), wxEmptyString, wxEmptyString, - "Russian (RU)" ) ); + wxS( "Russian (RU)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Axel Henriksson" ), wxEmptyString, wxEmptyString, - "Swedish (SV)" ) ); + wxS( "Swedish (SV)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Richard Jonsson" ), wxEmptyString, wxEmptyString, - "Swedish (SV)" ) ); + wxS( "Swedish (SV)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Allan Nordhøy" ), wxEmptyString, wxEmptyString, - "Swedish (SV)" ) ); + wxS( "Swedish (SV)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Boonchai Kingrungped" ), wxEmptyString, wxEmptyString, - "Thai (TH)" ) ); + wxS( "Thai (TH)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Liu Guang" ), wxEmptyString, wxEmptyString, - "Simplified Chinese (zh_CN)" ) ); + wxS( "Simplified Chinese (zh_CN)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Taotieren" ), wxEmptyString, wxEmptyString, - "Simplified Chinese (zh_CN)" ) ); + wxS( "Simplified Chinese (zh_CN)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Dingzhong Chen" ), wxEmptyString, wxEmptyString, - "Simplified Chinese (zh_CN)" ) ); + wxS( "Simplified Chinese (zh_CN)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "David Chen" ), wxEmptyString, wxEmptyString, - "Simplified Chinese (zh_CN)" ) ); + wxS( "Simplified Chinese (zh_CN)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Rigo Ligo" ), wxEmptyString, wxEmptyString, - "Simplified Chinese (zh_CN)" ) ); + wxS( "Simplified Chinese (zh_CN)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Tian Yunhao" ), wxEmptyString, wxEmptyString, - "Simplified Chinese (zh_CN)" ) ); + wxS( "Simplified Chinese (zh_CN)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "David Chen" ), wxEmptyString, wxEmptyString, - "Traditional Chinese (zh_TW)" ) ); + wxS( "Traditional Chinese (zh_TW)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "kai chiao chuang" ), wxEmptyString, wxEmptyString, - "Traditional Chinese (zh_TW)" ) ); + wxS( "Traditional Chinese (zh_TW)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Taotieren" ), wxEmptyString, wxEmptyString, - "Traditional Chinese (zh_TW)" ) ); + wxS( "Traditional Chinese (zh_TW)" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Remy Halvick" ), wxEmptyString, wxEmptyString, - "Other" ) ); + wxS( "Other" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "David J S Briscoe" ), wxEmptyString, wxEmptyString, - "Other" ) ); + wxS( "Other" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Dominique Laigle" ), wxEmptyString, wxEmptyString, - "Other" ) ); + wxS( "Other" ) ) ); aInfo.AddTranslator( new CONTRIBUTOR( wxS( "Paul Burke" ), wxEmptyString, wxEmptyString, - "Other" ) ); + wxS( "Other" ) ) ); // Program credits for library team @@ -916,32 +916,32 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf #define MODELS_3D_CONTRIBUTION _( "3D models by" ) aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "Scripts by Maui" ), - "https://github.com/easyw", - "https://gitlab.com/kicad/libraries/kicad-packages3D-generator", + wxS( "https://github.com/easyw" ), + wxS( "https://gitlab.com/kicad/libraries/kicad-packages3D-generator" ), MODELS_3D_CONTRIBUTION, aInfo.CreateKiBitmap( BITMAPS::three_d ) ) ); aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "GitLab contributors" ), wxEmptyString, - "https://gitlab.com/kicad/libraries/kicad-packages3D/-/graphs/master", + wxS( "https://gitlab.com/kicad/libraries/kicad-packages3D/-/graphs/master" ), MODELS_3D_CONTRIBUTION, aInfo.CreateKiBitmap( BITMAPS::three_d ) ) ); #define SYMBOL_LIB_CONTRIBUTION _( "Symbols by" ) aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "GitLab contributors" ), wxEmptyString, - "https://gitlab.com/kicad/libraries/kicad-symbols/-/graphs/v7", + wxS( "https://gitlab.com/kicad/libraries/kicad-symbols/-/graphs/v7" ), SYMBOL_LIB_CONTRIBUTION, aInfo.CreateKiBitmap( BITMAPS::add_component ) ) ); #define FOOTPRINT_LIB_CONTRIBUTION _( "Footprints by" ) aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "Scripts by Thomas Pointhuber" ), wxEmptyString, - "https://gitlab.com/kicad/libraries/kicad-footprint-generator", + wxS( "https://gitlab.com/kicad/libraries/kicad-footprint-generator" ), FOOTPRINT_LIB_CONTRIBUTION, aInfo.CreateKiBitmap( BITMAPS::module ) ) ); aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "GitLab contributors" ), wxEmptyString, - "https://gitlab.com/kicad/libraries/kicad-footprints/-/graphs/master", + wxS( "https://gitlab.com/kicad/libraries/kicad-footprints/-/graphs/master" ), FOOTPRINT_LIB_CONTRIBUTION, aInfo.CreateKiBitmap( BITMAPS::module ) ) ); @@ -955,7 +955,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf wxEmptyString, wxEmptyString, ICON_CONTRIBUTION ) ); - aInfo.AddArtist( new CONTRIBUTOR( "Fabrizio Tappero", + aInfo.AddArtist( new CONTRIBUTOR( wxS( "Fabrizio Tappero" ), wxEmptyString, wxEmptyString, ICON_CONTRIBUTION ) ); diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp index e8fd8bd9c9..4a7fbcd902 100644 --- a/common/dialog_about/dialog_about.cpp +++ b/common/dialog_about/dialog_about.cpp @@ -93,7 +93,7 @@ DIALOG_ABOUT::DIALOG_ABOUT( EDA_BASE_FRAME *aParent, ABOUT_APP_INFO& aAppInfo ) m_untranslatedTitleName = aParent->GetUntranslatedAboutTitle(); m_staticTextAppTitle->SetLabel( m_titleName ); m_staticTextCopyright->SetLabel( m_info.GetCopyright() ); - m_staticTextBuildVersion->SetLabel( "Version: " + m_info.GetBuildVersion() ); + m_staticTextBuildVersion->SetLabel( wxS( "Version: " ) + m_info.GetBuildVersion() ); m_staticTextLibVersion->SetLabel( m_info.GetLibVersion() ); SetTitle( wxString::Format( _( "About %s" ), m_titleName ) ); @@ -232,7 +232,7 @@ void DIALOG_ABOUT::createNotebookPageByCategory( wxNotebook* aParent, const wxSt // Of course the padding is different depending on the platform so we adjust the // padding accordingly. #if defined( __WXGTK__ ) - padding += " "; + padding += wxS( " " ); #endif wxPanel* outerPanel = new wxPanel( aParent ); wxBoxSizer* outerSizer = new wxBoxSizer( wxVERTICAL ); diff --git a/common/drawing_sheet/drawing_sheet_parser.cpp b/common/drawing_sheet/drawing_sheet_parser.cpp index 5a89b3d333..fa1467eaab 100644 --- a/common/drawing_sheet/drawing_sheet_parser.cpp +++ b/common/drawing_sheet/drawing_sheet_parser.cpp @@ -900,7 +900,7 @@ void DS_DATA_MODEL::SetPageLayout( const char* aPageLayout, bool Append, const w } catch( const std::bad_alloc& ) { - wxLogMessage( "Memory exhaustion reading drawing sheet" ); + wxLogMessage( wxS( "Memory exhaustion reading drawing sheet" ) ); } } @@ -925,7 +925,7 @@ bool DS_DATA_MODEL::LoadDrawingSheet( const wxString& aFullFileName, bool Append } } - wxFFile wksFile( fullFileName, "rb" ); + wxFFile wksFile( fullFileName, wxS( "rb" ) ); if( ! wksFile.IsOpened() ) { @@ -965,7 +965,7 @@ bool DS_DATA_MODEL::LoadDrawingSheet( const wxString& aFullFileName, bool Append } catch( const std::bad_alloc& ) { - wxLogMessage( "Memory exhaustion reading drawing sheet" ); + wxLogMessage( wxS( "Memory exhaustion reading drawing sheet" ) ); return false; } } diff --git a/common/drawing_sheet/ds_data_item.cpp b/common/drawing_sheet/ds_data_item.cpp index c04fec2758..abbeab5d8b 100644 --- a/common/drawing_sheet/ds_data_item.cpp +++ b/common/drawing_sheet/ds_data_item.cpp @@ -115,7 +115,7 @@ void DS_DATA_ITEM::SyncDrawItems( DS_DRAW_ITEM_LIST* aCollector, KIGFX::VIEW* aV item = new DS_DRAW_ITEM_RECT( this, j, GetStartPosUi( j ), GetEndPosUi( j ), pensize ); else { - wxFAIL_MSG( "Unknown drawing sheet item type" ); + wxFAIL_MSG( wxS( "Unknown drawing sheet item type" ) ); continue; } diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp index 1111765423..1fd1d4c9bf 100644 --- a/common/eda_base_frame.cpp +++ b/common/eda_base_frame.cpp @@ -180,7 +180,7 @@ wxWindow* EDA_BASE_FRAME::findQuasiModalDialog() // so we have to look for it separately. if( m_ident == FRAME_SCH ) { - wxWindow* cvpcb = wxWindow::FindWindowByName( "CvpcbFrame" ); + wxWindow* cvpcb = wxWindow::FindWindowByName( wxS( "CvpcbFrame" ) ); if( cvpcb ) return cvpcb; @@ -323,7 +323,7 @@ bool EDA_BASE_FRAME::doAutoSave() void EDA_BASE_FRAME::OnCharHook( wxKeyEvent& aKeyEvent ) { - wxLogTrace( kicadTraceKeyEvent, "EDA_BASE_FRAME::OnCharHook %s", dump( aKeyEvent ) ); + wxLogTrace( kicadTraceKeyEvent, wxS( "EDA_BASE_FRAME::OnCharHook %s" ), dump( aKeyEvent ) ); // Key events can be filtered here. // Currently no filtering is made. @@ -537,7 +537,7 @@ void EDA_BASE_FRAME::OnSize( wxSizeEvent& aEvent ) if( m_displayIndex >= 0 && currentDisplay >= 0 && currentDisplay != m_displayIndex ) { - wxLogTrace( traceDisplayLocation, "OnSize: current display changed %d to %d", + wxLogTrace( traceDisplayLocation, wxS( "OnSize: current display changed %d to %d" ), m_displayIndex, currentDisplay ); m_displayIndex = currentDisplay; ensureWindowIsOnScreen(); @@ -571,7 +571,7 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState ) m_frameSize.x = aState.size_x; m_frameSize.y = aState.size_y; - wxLogTrace( traceDisplayLocation, "Config position (%d, %d) with size (%d, %d)", + wxLogTrace( traceDisplayLocation, wxS( "Config position (%d, %d) with size (%d, %d)" ), m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y ); // Ensure minimum size is set if the stored config was zero-initialized @@ -580,15 +580,15 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState ) m_frameSize = defaultSize( m_ident ); wasDefault = true; - wxLogTrace( traceDisplayLocation, "Using minimum size (%d, %d)", + wxLogTrace( traceDisplayLocation, wxS( "Using minimum size (%d, %d)" ), m_frameSize.x, m_frameSize.y ); } - wxLogTrace( traceDisplayLocation, "Number of displays: %d", wxDisplay::GetCount() ); + wxLogTrace( traceDisplayLocation, wxS( "Number of displays: %d" ), wxDisplay::GetCount() ); if( aState.display >= wxDisplay::GetCount() ) { - wxLogTrace( traceDisplayLocation, "Previous display not found" ); + wxLogTrace( traceDisplayLocation, wxS( "Previous display not found" ) ); // If it isn't attached, use the first display // Warning wxDisplay has 2 ctor variants. the parameter needs a type: @@ -624,11 +624,11 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState ) upperLeft.y > yLimBottom ) { m_framePos = wxDefaultPosition; - wxLogTrace( traceDisplayLocation, "Resetting to default position" ); + wxLogTrace( traceDisplayLocation, wxS( "Resetting to default position" ) ); } } - wxLogTrace( traceDisplayLocation, "Final window position (%d, %d) with size (%d, %d)", + wxLogTrace( traceDisplayLocation, wxS( "Final window position (%d, %d) with size (%d, %d)" ), m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y ); SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y ); @@ -636,7 +636,7 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState ) // Center the window if we reset to default if( m_framePos.x == -1 ) { - wxLogTrace( traceDisplayLocation, "Centering window" ); + wxLogTrace( traceDisplayLocation, wxS( "Centering window" ) ); Center(); m_framePos = GetPosition(); } @@ -648,7 +648,7 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState ) // Maximize if we were maximized before if( aState.maximized || ( wasDefault && m_maximizeByDefault ) ) { - wxLogTrace( traceDisplayLocation, "Maximizing window" ); + wxLogTrace( traceDisplayLocation, wxS( "Maximizing window" ) ); Maximize(); } @@ -664,13 +664,13 @@ void EDA_BASE_FRAME::ensureWindowIsOnScreen() wxSize size = GetWindowSize(); wxLogTrace( traceDisplayLocation, - "ensureWindowIsOnScreen: clientArea (%d, %d) w %d h %d", clientSize.x, clientSize.y, + wxS( "ensureWindowIsOnScreen: clientArea (%d, %d) w %d h %d" ), clientSize.x, clientSize.y, clientSize.width, clientSize.height ); if( pos.y < clientSize.y ) { wxLogTrace( traceDisplayLocation, - "ensureWindowIsOnScreen: y pos %d below minimum, setting to %d", pos.y, + wxS( "ensureWindowIsOnScreen: y pos %d below minimum, setting to %d" ), pos.y, clientSize.y ); pos.y = clientSize.y; } @@ -678,7 +678,7 @@ void EDA_BASE_FRAME::ensureWindowIsOnScreen() if( pos.x < clientSize.x ) { wxLogTrace( traceDisplayLocation, - "ensureWindowIsOnScreen: x pos %d is off the client rect, setting to %d", pos.x, + wxS( "ensureWindowIsOnScreen: x pos %d is off the client rect, setting to %d" ), pos.x, clientSize.x ); pos.x = clientSize.x; } @@ -687,7 +687,7 @@ void EDA_BASE_FRAME::ensureWindowIsOnScreen() { int newWidth = clientSize.width - ( pos.x - clientSize.x ); wxLogTrace( traceDisplayLocation, - "ensureWindowIsOnScreen: effective width %d above available %d, setting to %d", + wxS( "ensureWindowIsOnScreen: effective width %d above available %d, setting to %d" ), pos.x + size.x, clientSize.width, newWidth ); size.x = newWidth; } @@ -696,12 +696,12 @@ void EDA_BASE_FRAME::ensureWindowIsOnScreen() { int newHeight = clientSize.height - ( pos.y - clientSize.y ); wxLogTrace( traceDisplayLocation, - "ensureWindowIsOnScreen: effective height %d above available %d, setting to %d", + wxS( "ensureWindowIsOnScreen: effective height %d above available %d, setting to %d" ), pos.y + size.y, clientSize.height, newHeight ); size.y = newHeight; } - wxLogTrace( traceDisplayLocation, "Updating window position (%d, %d) with size (%d, %d)", + wxLogTrace( traceDisplayLocation, wxS( "Updating window position (%d, %d) with size (%d, %d)" ), pos.x, pos.y, size.x, size.y ); SetSize( pos.x, pos.y, size.x, size.y ); @@ -743,9 +743,9 @@ void EDA_BASE_FRAME::SaveWindowSettings( WINDOW_SETTINGS* aCfg ) aCfg->state.maximized = IsMaximized(); aCfg->state.display = wxDisplay::GetFromWindow( this ); - wxLogTrace( traceDisplayLocation, "Saving window maximized: %s", - IsMaximized() ? "true" : "false" ); - wxLogTrace( traceDisplayLocation, "Saving config position (%d, %d) with size (%d, %d)", + wxLogTrace( traceDisplayLocation, wxS( "Saving window maximized: %s" ), + IsMaximized() ? wxS( "true" ) : wxS( "false" ) ); + wxLogTrace( traceDisplayLocation, wxS( "Saving config position (%d, %d) with size (%d, %d)" ), m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y ); // Once this is fully implemented, wxAuiManager will be used to maintain @@ -838,7 +838,7 @@ void EDA_BASE_FRAME::CreateInfoBar() #else m_infoBar = new WX_INFOBAR( this, &m_auimgr ); - m_auimgr.AddPane( m_infoBar, EDA_PANE().InfoBar().Name( "InfoBar" ).Top().Layer(1) ); + m_auimgr.AddPane( m_infoBar, EDA_PANE().InfoBar().Name( wxS( "InfoBar" ) ).Top().Layer(1) ); #endif } @@ -853,7 +853,7 @@ void EDA_BASE_FRAME::FinishAUIInitialization() m_auimgr.Update(); // We don't want the infobar displayed right away - m_auimgr.GetPane( "InfoBar" ).Hide(); + m_auimgr.GetPane( wxS( "InfoBar" ) ).Hide(); m_auimgr.Update(); #endif } diff --git a/common/eda_pattern_match.cpp b/common/eda_pattern_match.cpp index cdc08ffe92..e1c4f3d222 100644 --- a/common/eda_pattern_match.cpp +++ b/common/eda_pattern_match.cpp @@ -209,7 +209,7 @@ bool EDA_PATTERN_MATCH_WILDCARD_EXPLICIT::SetPattern( const wxString& aPattern ) } else if( to_replace.Find( c ) != wxNOT_FOUND ) { - regex += "\\"; + regex += wxS( "\\" ); regex += c; } else diff --git a/common/executable_names.cpp b/common/executable_names.cpp index 8a4f6f090e..077c15d5c1 100644 --- a/common/executable_names.cpp +++ b/common/executable_names.cpp @@ -27,19 +27,19 @@ #include #ifdef __WINDOWS__ -const wxString CVPCB_EXE ( "cvpcb.exe" ); -const wxString PCBNEW_EXE ( "pcbnew.exe" ); -const wxString EESCHEMA_EXE ( "eeschema.exe" ); -const wxString GERBVIEW_EXE ( "gerbview.exe" ); -const wxString BITMAPCONVERTER_EXE ( "bitmap2component.exe" ); -const wxString PCB_CALCULATOR_EXE ( "pcb_calculator.exe" ); -const wxString PL_EDITOR_EXE ( "pl_editor.exe" ); +const wxString CVPCB_EXE ( wxS( "cvpcb.exe" ) ); +const wxString PCBNEW_EXE ( wxS( "pcbnew.exe" ) ); +const wxString EESCHEMA_EXE ( wxS( "eeschema.exe" ) ); +const wxString GERBVIEW_EXE ( wxS( "gerbview.exe" ) ); +const wxString BITMAPCONVERTER_EXE ( wxS( "bitmap2component.exe" ) ); +const wxString PCB_CALCULATOR_EXE ( wxS( "pcb_calculator.exe" ) ); +const wxString PL_EDITOR_EXE ( wxS( "pl_editor.exe" ) ); #else -const wxString CVPCB_EXE ( "cvpcb" ); -const wxString PCBNEW_EXE ( "pcbnew" ); -const wxString EESCHEMA_EXE ( "eeschema" ); -const wxString GERBVIEW_EXE ( "gerbview" ); -const wxString BITMAPCONVERTER_EXE ( "bitmap2component" ); -const wxString PCB_CALCULATOR_EXE ( "pcb_calculator" ); -const wxString PL_EDITOR_EXE ( "pl_editor" ); +const wxString CVPCB_EXE ( wxS( "cvpcb" ) ); +const wxString PCBNEW_EXE ( wxS( "pcbnew" ) ); +const wxString EESCHEMA_EXE ( wxS( "eeschema" ) ); +const wxString GERBVIEW_EXE ( wxS( "gerbview" ) ); +const wxString BITMAPCONVERTER_EXE ( wxS( "bitmap2component" ) ); +const wxString PCB_CALCULATOR_EXE ( wxS( "pcb_calculator" ) ); +const wxString PL_EDITOR_EXE ( wxS( "pl_editor" ) ); #endif diff --git a/common/font/fontconfig.cpp b/common/font/fontconfig.cpp index bc0ebe5787..ecd84bcd75 100644 --- a/common/font/fontconfig.cpp +++ b/common/font/fontconfig.cpp @@ -183,7 +183,7 @@ void FONTCONFIG::ListFonts( std::vector& aFonts ) } else { - wxLogTrace( traceFonts, "Font '%s' language '%s' not supported by OS.", + wxLogTrace( traceFonts, wxS( "Font '%s' language '%s' not supported by OS." ), theFamily, langWxStr ); } diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp index cd4cfc6f70..7d14f54284 100644 --- a/common/fp_lib_table.cpp +++ b/common/fp_lib_table.cpp @@ -489,7 +489,7 @@ public: m_path_prefix( aPath ), m_lib_prefix( aPrefix ) { - wxFileName f( aPath, "" ); + wxFileName f( aPath, wxS( "" ) ); m_prefix_dir_count = f.GetDirCount(); } @@ -590,7 +590,7 @@ bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable ) { // Scan for libraries in PCM packages directory - wxFileName d( packagesPath, "" ); + wxFileName d( packagesPath, wxS( "" ) ); d.AppendDir( wxS( "footprints" ) ); if( d.DirExists() ) diff --git a/common/gl_context_mgr.cpp b/common/gl_context_mgr.cpp index fe52cf4ed5..2ab554777b 100644 --- a/common/gl_context_mgr.cpp +++ b/common/gl_context_mgr.cpp @@ -115,8 +115,8 @@ void GL_CONTEXT_MANAGER::UnlockCtx( wxGLContext* aContext ) } else { - wxFAIL_MSG( wxString::Format( "Trying to unlock GL context mutex from " - "a wrong context: aContext %p m_glCtx %p", aContext, m_glCtx ) ); + wxFAIL_MSG( wxString::Format( wxS( "Trying to unlock GL context mutex from " + "a wrong context: aContext %p m_glCtx %p" ), aContext, m_glCtx ) ); } } diff --git a/common/grid_tricks.cpp b/common/grid_tricks.cpp index e23fda9e70..9661904e26 100644 --- a/common/grid_tricks.cpp +++ b/common/grid_tricks.cpp @@ -233,7 +233,7 @@ void GRID_TRICKS::onGridMotion( wxMouseEvent& aEvent ) // Empty tooltip if the cell doesn't exist or the column doesn't have tooltips if( ( col == wxNOT_FOUND ) || ( row == wxNOT_FOUND ) || !m_tooltipEnabled[col] ) { - m_grid->GetGridWindow()->SetToolTip( "" ); + m_grid->GetGridWindow()->SetToolTip( wxS( "" ) ); return; } diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp index 5a5b5e43f0..8c3d9a95c9 100644 --- a/common/plotters/GERBER_plotter.cpp +++ b/common/plotters/GERBER_plotter.cpp @@ -1648,7 +1648,7 @@ void GERBER_PLOTTER::plotRoundRectAsRegion( const VECTOR2I& aRectCenter, const V #if 0 // For test only: if( last_pt != first_pt ) - wxLogMessage( "first pt %d %d last pt %d %d", + wxLogMessage( wxS( "first pt %d %d last pt %d %d" ), first_pt.x, first_pt.y, last_pt.x, last_pt.y ); #endif @@ -1857,7 +1857,7 @@ void GERBER_PLOTTER::FlashPadChamferRoundRect( const VECTOR2I& aShapePos, const break; default: - wxLogMessage( "FlashPadChamferRoundRect(): Unexpected number of corners (%d)", + wxLogMessage( wxS( "FlashPadChamferRoundRect(): Unexpected number of corners (%d)" ), (int)cornerList.size() ); break; } diff --git a/common/project.cpp b/common/project.cpp index f0549b5ae5..2e517ad781 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -223,7 +223,7 @@ const wxString PROJECT::libTableName( const wxString& aLibTableName ) const * until the project file being edited is saved. It is then moved to the correct * file in the folder where the project file is saved. */ - fn.SetName( "prj-" + aLibTableName ); + fn.SetName( wxS( "prj-" ) + aLibTableName ); } else // normal path. { diff --git a/common/settings/app_settings.cpp b/common/settings/app_settings.cpp index 711dce7911..d968714570 100644 --- a/common/settings/app_settings.cpp +++ b/common/settings/app_settings.cpp @@ -55,7 +55,7 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV &m_FindReplace.search_and_replace, false ) ); m_params.emplace_back( new PARAM( "find_replace.find_string", - &m_FindReplace.find_string, "" ) ); + &m_FindReplace.find_string, wxS( "" ) ) ); m_params.emplace_back( new PARAM_LIST( "find_replace.find_history", &m_FindReplace.find_history, {} ) ); @@ -120,7 +120,7 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV &m_Printing.use_theme, false ) ); m_params.emplace_back( new PARAM( "printing.color_theme", - &m_Printing.color_theme, "" ) ); + &m_Printing.color_theme, wxS( "" ) ) ); m_params.emplace_back( new PARAM( "printing.title_block", &m_Printing.title_block, false ) ); @@ -147,7 +147,7 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV &m_System.last_imperial_units, static_cast( EDA_UNITS::INCHES ) ) ); m_params.emplace_back( new PARAM( "appearance.color_theme", - &m_ColorTheme, "_builtin_default" ) ); + &m_ColorTheme, wxS( "_builtin_default" ) ) ); addParamsForWindow( &m_Window, "window" ); @@ -294,14 +294,14 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std: &aWindow->state.maximized, false ) ); m_params.emplace_back( new PARAM( aJsonPath + ".mru_path", - &aWindow->mru_path, "" ) ); + &aWindow->mru_path, wxS( "" ) ) ); m_params.emplace_back( new PARAM( aJsonPath + ".size_x", &aWindow->state.size_x, 0 ) ); m_params.emplace_back( new PARAM( aJsonPath + ".size_y", &aWindow->state.size_y, 0 ) ); m_params.emplace_back( new PARAM( aJsonPath + ".perspective", - &aWindow->perspective, "" ) ); + &aWindow->perspective, wxS( "" ) ) ); m_params.emplace_back( new PARAM( aJsonPath + ".pos_x", &aWindow->state.pos_x, 0 ) ); @@ -317,14 +317,14 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std: int defaultGridIdx; - if( m_filename == "pl_editor" ) + if( m_filename == wxS( "pl_editor" ) ) { defaultGridIdx = 1; m_params.emplace_back( new PARAM_LIST( aJsonPath + ".grid.sizes", &aWindow->grid.sizes, DefaultGridSizeList() ) ); } - else if( m_filename == "eeschema" || m_filename == "symbol_editor" ) + else if( m_filename == wxS( "eeschema" ) || m_filename == wxS( "symbol_editor" ) ) { defaultGridIdx = 1; @@ -378,40 +378,40 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std: const std::vector APP_SETTINGS_BASE::DefaultGridSizeList() const { - if( m_filename == "eeschema" || m_filename == "symbol_editor" ) + if( m_filename == wxS( "eeschema" ) || m_filename == wxS( "symbol_editor" ) ) { - return { "100 mil", - "50 mil", - "25 mil", - "10 mil", - "5 mil", - "2 mil", - "1 mil" }; + return { wxS( "100 mil" ), + wxS( "50 mil" ), + wxS( "25 mil" ), + wxS( "10 mil" ), + wxS( "5 mil" ), + wxS( "2 mil" ), + wxS( "1 mil" ) }; } else { - return { "1000 mil", - "500 mil", - "250 mil", - "200 mil", - "100 mil", - "50 mil", - "25 mil", - "20 mil", - "10 mil", - "5 mil", - "2 mil", - "1 mil", - "5.0 mm", - "2.5 mm", - "1.0 mm", - "0.5 mm", - "0.25 mm", - "0.2 mm", - "0.1 mm", - "0.05 mm", - "0.025 mm", - "0.01 mm" }; + return { wxS( "1000 mil" ), + wxS( "500 mil" ), + wxS( "250 mil" ), + wxS( "200 mil" ), + wxS( "100 mil" ), + wxS( "50 mil" ), + wxS( "25 mil" ), + wxS( "20 mil" ), + wxS( "10 mil" ), + wxS( "5 mil" ), + wxS( "2 mil" ), + wxS( "1 mil" ), + wxS( "5.0 mm" ), + wxS( "2.5 mm" ), + wxS( "1.0 mm" ), + wxS( "0.5 mm" ), + wxS( "0.25 mm" ), + wxS( "0.2 mm" ), + wxS( "0.1 mm" ), + wxS( "0.05 mm" ), + wxS( "0.025 mm" ), + wxS( "0.01 mm" ) }; } } diff --git a/common/settings/color_settings.cpp b/common/settings/color_settings.cpp index 85a6465215..d5a752de8c 100644 --- a/common/settings/color_settings.cpp +++ b/common/settings/color_settings.cpp @@ -41,7 +41,7 @@ COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath ) if( aAbsolutePath ) SetLocation( SETTINGS_LOC::NONE ); - m_params.emplace_back( new PARAM( "meta.name", &m_displayName, "KiCad Default" ) ); + m_params.emplace_back( new PARAM( "meta.name", &m_displayName, wxS( "KiCad Default" ) ) ); m_params.emplace_back( new PARAM( "schematic.override_item_colors", &m_overrideSchItemColors, false ) ); diff --git a/common/settings/common_settings.cpp b/common/settings/common_settings.cpp index 7684b1cd0d..770ba6e02b 100644 --- a/common/settings/common_settings.cpp +++ b/common/settings/common_settings.cpp @@ -150,7 +150,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() : if( var.IsDefault() ) { wxLogTrace( traceEnvVars, - "COMMON_SETTINGS: Env var %s skipping save (default)", + wxS( "COMMON_SETTINGS: Env var %s skipping save (default)" ), var.GetKey() ); continue; } @@ -164,7 +164,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() : if( var.GetDefinedInSettings() ) { wxLogTrace( traceEnvVars, - "COMMON_SETTINGS: Env var %s was overridden externally, " + wxS( "COMMON_SETTINGS: Env var %s was overridden externally, " ) "saving previously-loaded value %s", var.GetKey(), var.GetSettingsValue() ); value = var.GetSettingsValue(); @@ -172,14 +172,14 @@ COMMON_SETTINGS::COMMON_SETTINGS() : else { wxLogTrace( traceEnvVars, - "COMMON_SETTINGS: Env var %s skipping save (external)", + wxS( "COMMON_SETTINGS: Env var %s skipping save (external)" ), var.GetKey() ); continue; } } wxLogTrace( traceEnvVars, - "COMMON_SETTINGS: Saving env var %s = %s", + wxS( "COMMON_SETTINGS: Saving env var %s = %s" ), var.GetKey(), value); std::string key( var.GetKey().ToUTF8() ); @@ -202,7 +202,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() : { if( m_Env.vars[key].GetDefinedExternally() ) { - wxLogTrace( traceEnvVars, "COMMON_SETTINGS: %s is defined externally", + wxLogTrace( traceEnvVars, wxS( "COMMON_SETTINGS: %s is defined externally" ), key ); m_Env.vars[key].SetDefinedInSettings(); m_Env.vars[key].SetSettingsValue( val ); @@ -210,14 +210,14 @@ COMMON_SETTINGS::COMMON_SETTINGS() : } else { - wxLogTrace( traceEnvVars, "COMMON_SETTINGS: Updating %s: %s -> %s", + wxLogTrace( traceEnvVars, wxS( "COMMON_SETTINGS: Updating %s: %s -> %s"), key, m_Env.vars[key].GetValue(), val ); m_Env.vars[key].SetValue( val ); } } else { - wxLogTrace( traceEnvVars, "COMMON_SETTINGS: Loaded new var: %s = %s", + wxLogTrace( traceEnvVars, wxS( "COMMON_SETTINGS: Loaded new var: %s = %s" ), key, val ); m_Env.vars[key] = ENV_VAR_ITEM( key, val ); } @@ -295,26 +295,26 @@ COMMON_SETTINGS::COMMON_SETTINGS() : #ifdef __WXMAC__ m_params.emplace_back( new PARAM( "system.text_editor", - &m_System.text_editor, "/usr/bin/open -e" ) ); + &m_System.text_editor, wxS( "/usr/bin/open -e" ) ) ); #else m_params.emplace_back( new PARAM( "system.text_editor", - &m_System.text_editor, "" ) ); + &m_System.text_editor, wxS( "" ) ) ); #endif m_params.emplace_back( new PARAM( "system.file_history_size", &m_System.file_history_size, 9 ) ); m_params.emplace_back( new PARAM( "system.language", - &m_System.language, "Default" ) ); + &m_System.language, wxS( "Default" ) ) ); m_params.emplace_back( new PARAM( "system.pdf_viewer_name", - &m_System.pdf_viewer_name, "" ) ); + &m_System.pdf_viewer_name, wxS( "" ) ) ); m_params.emplace_back( new PARAM( "system.use_system_pdf_viewer", &m_System.use_system_pdf_viewer, true ) ); m_params.emplace_back( new PARAM( "system.working_dir", - &m_System.working_dir, "" ) ); + &m_System.working_dir, wxS( "" ) ) ); m_params.emplace_back( new PARAM( "system.clear_3d_cache_interval", &m_System.clear_3d_cache_interval, 30 ) ); @@ -425,14 +425,14 @@ bool COMMON_SETTINGS::migrateSchema2to3() wxFileName cfgpath; cfgpath.AssignDir( SETTINGS_MANAGER::GetUserSettingsPath() ); cfgpath.AppendDir( wxT( "3d" ) ); - cfgpath.SetFullName( "3Dresolver.cfg" ); + cfgpath.SetFullName( wxS( "3Dresolver.cfg" ) ); cfgpath.MakeAbsolute(); std::vector legacyPaths; readLegacy3DResolverCfg( cfgpath.GetFullPath(), legacyPaths ); // env variables have a limited allowed character set for names - wxRegEx nonValidCharsRegex( "[^A-Z0-9_]+", wxRE_ADVANCED ); + wxRegEx nonValidCharsRegex( wxS( "[^A-Z0-9_]+" ), wxRE_ADVANCED ); for( const LEGACY_3D_SEARCH_PATH& path : legacyPaths ) { @@ -452,7 +452,7 @@ bool COMMON_SETTINGS::migrateSchema2to3() if( !m_Env.vars.count( key ) ) { - wxLogTrace( traceEnvVars, "COMMON_SETTINGS: Loaded new var: %s = %s", key, val ); + wxLogTrace( traceEnvVars, wxS( "COMMON_SETTINGS: Loaded new var: %s = %s" ), key, val ); m_Env.vars[key] = ENV_VAR_ITEM( key, val ); } } @@ -560,12 +560,12 @@ void COMMON_SETTINGS::InitializeEnvironment() m_Env.vars[aKey].SetValue( envValue ); m_Env.vars[aKey].SetDefinedExternally(); wxLogTrace( traceEnvVars, - "InitializeEnvironment: Entry %s defined externally as %s", aKey, + wxS( "InitializeEnvironment: Entry %s defined externally as %s" ), aKey, envValue ); } else { - wxLogTrace( traceEnvVars, "InitializeEnvironment: Setting entry %s to default %s", + wxLogTrace( traceEnvVars, wxS( "InitializeEnvironment: Setting entry %s to default %s" ), aKey, aDefault ); } }; @@ -623,9 +623,9 @@ bool COMMON_SETTINGS::readLegacy3DResolverCfg( const wxString& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "Could not open configuration file"; + wxString errmsg = wxS( "Could not open configuration file" ); ostr << " * " << errmsg.ToUTF8() << " '" << cfgname.ToUTF8() << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } @@ -668,9 +668,9 @@ bool COMMON_SETTINGS::readLegacy3DResolverCfg( const wxString& // Don't add KICAD6_3DMODEL_DIR, one of its legacy equivalents, or KIPRJMOD from a // config file. They're system variables are are defined at runtime. - if( al.m_Alias == "${KICAD6_3DMODEL_DIR}" || al.m_Alias == "${KIPRJMOD}" - || al.m_Alias == "$(KIPRJMOD)" || al.m_Alias == "${KISYS3DMOD}" - || al.m_Alias == "$(KISYS3DMOD)" ) + if( al.m_Alias == wxS( "${KICAD6_3DMODEL_DIR}" ) || al.m_Alias == wxS( "${KIPRJMOD}" ) + || al.m_Alias == wxS( "$(KIPRJMOD)" ) || al.m_Alias == wxS( "${KISYS3DMOD}" ) + || al.m_Alias == wxS( "$(KISYS3DMOD)" ) ) { continue; } @@ -699,9 +699,9 @@ bool COMMON_SETTINGS::getLegacy3DHollerith( const std::string& aString, size_t& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "bad Hollerith string on line"; + wxString errmsg = wxS( "bad Hollerith string on line" ); ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } @@ -712,9 +712,9 @@ bool COMMON_SETTINGS::getLegacy3DHollerith( const std::string& aString, size_t& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "missing opening quote mark in config file"; + wxString errmsg = wxS( "missing opening quote mark in config file" ); ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } @@ -725,9 +725,9 @@ bool COMMON_SETTINGS::getLegacy3DHollerith( const std::string& aString, size_t& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "invalid entry (unexpected end of line)"; + wxString errmsg = wxS( "invalid entry (unexpected end of line)" ); ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } @@ -741,9 +741,9 @@ bool COMMON_SETTINGS::getLegacy3DHollerith( const std::string& aString, size_t& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "bad Hollerith string on line"; + wxString errmsg = wxS( "bad Hollerith string on line" ); ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } @@ -757,9 +757,9 @@ bool COMMON_SETTINGS::getLegacy3DHollerith( const std::string& aString, size_t& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "invalid entry (unexpected end of line)"; + wxString errmsg = wxS( "invalid entry (unexpected end of line)" ); ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } @@ -774,9 +774,9 @@ bool COMMON_SETTINGS::getLegacy3DHollerith( const std::string& aString, size_t& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = "missing closing quote mark in config file"; + wxString errmsg = wxS( "missing closing quote mark in config file" ); ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; - wxLogTrace( traceSettings, "%s\n", ostr.str().c_str() ); + wxLogTrace( traceSettings, wxS( "%s\n" ), ostr.str().c_str() ); return false; } diff --git a/common/settings/kicad_settings.cpp b/common/settings/kicad_settings.cpp index a9a1084407..2aaac76da8 100644 --- a/common/settings/kicad_settings.cpp +++ b/common/settings/kicad_settings.cpp @@ -86,7 +86,7 @@ KICAD_SETTINGS::KICAD_SETTINGS() : m_params.emplace_back( new PARAM( "pcm.lib_auto_remove", &m_PcmLibAutoRemove, true ) ); - m_params.emplace_back( new PARAM( "pcm.lib_prefix", &m_PcmLibPrefix, "PCM_" ) ); + m_params.emplace_back( new PARAM( "pcm.lib_prefix", &m_PcmLibPrefix, wxS( "PCM_" ) ) ); } diff --git a/common/settings/settings_manager.cpp b/common/settings/settings_manager.cpp index 78ee2da3f5..35d343db6c 100644 --- a/common/settings/settings_manager.cpp +++ b/common/settings/settings_manager.cpp @@ -206,7 +206,7 @@ COLOR_SETTINGS* SETTINGS_MANAGER::loadColorSettingsByName( const wxString& aName { wxLogTrace( traceSettings, wxT( "Attempting to load color theme %s" ), aName ); - wxFileName fn( GetColorSettingsPath(), aName, "json" ); + wxFileName fn( GetColorSettingsPath(), aName, wxS( "json" ) ); if( !fn.IsOk() || !fn.Exists() ) { @@ -465,8 +465,8 @@ public: wxFileName dir( dirPath ); // Whitelist of directories to migrate - if( dir.GetName() == "colors" || - dir.GetName() == "3d" ) + if( dir.GetName() == wxS( "colors" ) || + dir.GetName() == wxS( "3d" ) ) { wxString path = dir.GetPath(); @@ -500,8 +500,8 @@ bool SETTINGS_MANAGER::MigrateIfNeeded() if( path.DirExists() ) { wxFileName common = path; - common.SetName( "kicad_common" ); - common.SetExt( "json" ); + common.SetName( wxS( "kicad_common" ) ); + common.SetExt( wxS( "json" ) ); if( common.Exists() ) { diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 6db913297a..b1e34bebb1 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -691,10 +691,10 @@ bool SCH_EDIT_FRAME::saveSchematicFile( SCH_SHEET* aSheet, const wxString& aSave if( !IsWritable( schematicFileName ) ) return false; - wxString tempFile = wxFileName::CreateTempFileName( "eeschema" ); + wxString tempFile = wxFileName::CreateTempFileName( wxS( "eeschema" ) ); // Save - wxLogTrace( traceAutoSave, "Saving file " + schematicFileName.GetFullPath() ); + wxLogTrace( traceAutoSave, wxS( "Saving file " ) + schematicFileName.GetFullPath() ); if( m_infoBar->GetMessageType() == WX_INFOBAR::MESSAGE_TYPE::OUTDATED_SAVE ) m_infoBar->Dismiss(); diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp index 9dc205408d..8555d74d14 100644 --- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp +++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp @@ -1587,7 +1587,7 @@ bool SCH_SEXPR_PLUGIN::CheckHeader( const wxString& aFileName ) firstline = tempFile.GetFirstLine(); tempFile.Close(); - return firstline.StartsWith( "EESchema" ); + return firstline.StartsWith( wxS( "EESchema" ) ); } diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp index d9292613e0..6fafe624ce 100644 --- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp +++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp @@ -2236,7 +2236,7 @@ bool SCH_LEGACY_PLUGIN::CheckHeader( const wxString& aFileName ) firstline = tempFile.GetFirstLine(); tempFile.Close(); - return firstline.StartsWith( "EESchema" ); + return firstline.StartsWith( wxS( "EESchema" ) ); } diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp index 08cf60ee69..82a282dedd 100644 --- a/eeschema/symbol_editor/symbol_editor.cpp +++ b/eeschema/symbol_editor/symbol_editor.cpp @@ -848,7 +848,7 @@ void SYMBOL_EDIT_FRAME::DuplicateSymbol( bool aFromClipboard ) clipboard->GetData( data ); wxString symbolSource = data.GetText(); - std::unique_ptr reader = std::make_unique( TO_UTF8( symbolSource ), "Clipboard" ); + std::unique_ptr reader = std::make_unique( TO_UTF8( symbolSource ), wxS( "Clipboard" ) ); LIB_SYMBOL* newSymbol = nullptr; do @@ -859,7 +859,7 @@ void SYMBOL_EDIT_FRAME::DuplicateSymbol( bool aFromClipboard ) } catch( IO_ERROR& e ) { - wxLogMessage( "Can not paste: %s", e.Problem() ); + wxLogMessage( wxS( "Can not paste: %s" ), e.Problem() ); break; } diff --git a/eeschema/symbol_editor/symbol_editor_settings.cpp b/eeschema/symbol_editor/symbol_editor_settings.cpp index a976fc3828..87a71029e0 100644 --- a/eeschema/symbol_editor/symbol_editor_settings.cpp +++ b/eeschema/symbol_editor/symbol_editor_settings.cpp @@ -44,7 +44,7 @@ SYMBOL_EDITOR_SETTINGS::SYMBOL_EDITOR_SETTINGS() : m_UseEeschemaColorSettings = true;; // Init settings: - SetLegacyFilename( "eeschema" ); + SetLegacyFilename( wxS( "eeschema" ) ); m_params.emplace_back( new PARAM( "defaults.line_width", &m_Defaults.line_width, 0 ) ); diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index b47a5e8304..6da3c98733 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -1077,7 +1077,7 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool addToHistory, GetBoard()->SynchronizeNetsAndNetClasses( false ); } - wxString tempFile = wxFileName::CreateTempFileName( "pcbnew" ); + wxString tempFile = wxFileName::CreateTempFileName( wxS( "pcbnew" ) ); wxString upperTxt; wxString lowerTxt; diff --git a/pcbnew/python/scripting/pcbnew_scripting.cpp b/pcbnew/python/scripting/pcbnew_scripting.cpp index 696babfaa6..0126bfbf7c 100644 --- a/pcbnew/python/scripting/pcbnew_scripting.cpp +++ b/pcbnew/python/scripting/pcbnew_scripting.cpp @@ -98,7 +98,7 @@ static void pcbnewRunPythonMethodWithReturnedString( const char* aMethodName, wx } else { - wxLogMessage( "cannot encode Unicode python string" ); + wxLogMessage( wxS( "cannot encode Unicode python string" ) ); } } else diff --git a/scripting/python_scripting.cpp b/scripting/python_scripting.cpp index ab352817d0..50e8aac7ca 100644 --- a/scripting/python_scripting.cpp +++ b/scripting/python_scripting.cpp @@ -339,7 +339,7 @@ static void RunPythonMethodWithReturnedString( const char* aMethodName, wxString } else { - wxLogMessage( "cannot encode Unicode python string" ); + wxLogMessage( wxS( "cannot encode Unicode python string" ) ); } } else @@ -425,7 +425,7 @@ wxString PyStringToWx( PyObject* aString ) } else { - wxLogMessage( "cannot encode Unicode python string" ); + wxLogMessage( wxS( "cannot encode Unicode python string" ) ); } return ret; @@ -458,7 +458,7 @@ wxArrayString PyArrayStringToWx( PyObject* aArrayString ) } else { - wxLogMessage( "cannot encode Unicode python string" ); + wxLogMessage( wxS( "cannot encode Unicode python string" ) ); } } }