Kick the wildcards and file exts into a static class, export it from kicommon

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -714,8 +714,8 @@ void EDA_3D_VIEWER_FRAME::takeScreenshot( wxCommandEvent& event )
     if( event.GetId() != ID_TOOL_SCREENCOPY_TOCLIBBOARD )
     {
         // Remember path between saves during this session only.
-        const wxString wildcard = fmt_is_jpeg ? JpegFileWildcard() : PngFileWildcard();
-        const wxString ext = fmt_is_jpeg ? JpegFileExtension : PngFileExtension;
+        const wxString wildcard = fmt_is_jpeg ? FILEEXT::JpegFileWildcard() : FILEEXT::PngFileWildcard();
+        const wxString ext = fmt_is_jpeg ? FILEEXT::JpegFileExtension : FILEEXT::PngFileExtension;
 
         // First time path is set to the project path.
         if( !m_defaultSaveScreenshotFileName.IsOk() )

bitmap2component/bitmap2cmp_frame.cpp

@@ -438,14 +438,14 @@ void BITMAP2CMP_FRAME::ExportDrawingSheetFormat()
         path = ::wxGetCwd();
 
     wxFileDialog fileDlg( this, _( "Create Drawing Sheet File" ), path, wxEmptyString,
-                          DrawingSheetFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                          FILEEXT::DrawingSheetFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
     int          diag = fileDlg.ShowModal();
 
     if( diag != wxID_OK )
         return;
 
     fn = fileDlg.GetPath();
-    fn.SetExt( DrawingSheetFileExtension );
+    fn.SetExt( FILEEXT::DrawingSheetFileExtension );
     m_convertedFileName = fn.GetFullPath();
 
     FILE*    outfile;
@@ -475,7 +475,7 @@ void BITMAP2CMP_FRAME::ExportPostScriptFormat()
         path = ::wxGetCwd();
 
     wxFileDialog fileDlg( this, _( "Create PostScript File" ), path, wxEmptyString,
-                          PSFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                          FILEEXT::PSFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( fileDlg.ShowModal() != wxID_OK )
         return;
@@ -511,12 +511,13 @@ void BITMAP2CMP_FRAME::ExportEeschemaFormat()
         path = ::wxGetCwd();
 
     wxFileDialog fileDlg( this, _( "Create Symbol Library" ), path, wxEmptyString,
-                          KiCadSymbolLibFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                          FILEEXT::KiCadSymbolLibFileWildcard(),
+                          wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( fileDlg.ShowModal() != wxID_OK )
         return;
 
-    fn = EnsureFileExtension( fileDlg.GetPath(), KiCadSymbolLibFileExtension );
+    fn = EnsureFileExtension( fileDlg.GetPath(), FILEEXT::KiCadSymbolLibFileExtension );
     m_convertedFileName = fn.GetFullPath();
 
     FILE*    outfile = wxFopen( m_convertedFileName, wxT( "w" ) );
@@ -545,12 +546,13 @@ void BITMAP2CMP_FRAME::ExportPcbnewFormat()
         path = m_mruPath;
 
     wxFileDialog fileDlg( this, _( "Create Footprint Library" ), path, wxEmptyString,
-                          KiCadFootprintLibFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                          FILEEXT::KiCadFootprintLibFileWildcard(),
+                          wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( fileDlg.ShowModal() != wxID_OK )
         return;
 
-    fn = EnsureFileExtension( fileDlg.GetPath(), KiCadFootprintFileExtension );
+    fn = EnsureFileExtension( fileDlg.GetPath(), FILEEXT::KiCadFootprintFileExtension );
     m_convertedFileName = fn.GetFullPath();
 
     FILE* outfile = wxFopen( m_convertedFileName, wxT( "w" ) );

common/CMakeLists.txt

@@ -119,6 +119,7 @@ set( KICOMMON_SRCS
     richio.cpp
     string_utils.cpp
     trace_helpers.cpp
+    wildcards_and_files_ext.cpp
     wx_filename.cpp
 
     io/kicad/kicad_io_utils.cpp    # needed by richio
@@ -509,7 +510,6 @@ set( COMMON_SRCS
     title_block.cpp
     undo_redo_container.cpp
     validators.cpp
-    wildcards_and_files_ext.cpp
     drawing_sheet/ds_painter.cpp
     xnode.cpp
     view/wx_view_controls.cpp

common/database/database_lib_settings.cpp

@@ -168,5 +168,5 @@ DATABASE_LIB_SETTINGS::DATABASE_LIB_SETTINGS( const std::string& aFilename ) :
 
 wxString DATABASE_LIB_SETTINGS::getFileExt() const
 {
-    return DatabaseLibraryFileExtension;
+    return FILEEXT::DatabaseLibraryFileExtension;
 }

common/dialogs/dialog_page_settings.cpp

@@ -793,7 +793,8 @@ void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
 
     // Display a file picker dialog
     wxFileDialog fileDialog( this, _( "Drawing Sheet File" ), path, name,
-                             DrawingSheetFileWildcard(), wxFD_DEFAULT_STYLE|wxFD_FILE_MUST_EXIST );
+                             FILEEXT::DrawingSheetFileWildcard(),
+                             wxFD_DEFAULT_STYLE | wxFD_FILE_MUST_EXIST );
 
     if( fileDialog.ShowModal() != wxID_OK )
         return;

common/dialogs/panel_hotkeys_editor.cpp

@@ -199,8 +199,8 @@ void PANEL_HOTKEYS_EDITOR::OnFilterSearch( wxCommandEvent& aEvent )
 void PANEL_HOTKEYS_EDITOR::ImportHotKeys()
 {
     wxString filename = wxFileSelector( _( "Import Hotkeys File:" ), m_frame->GetMruPath(),
-                                        wxEmptyString, HotkeyFileExtension,
-                                        HotkeyFileWildcard(), wxFD_OPEN, this );
+                                        wxEmptyString, FILEEXT::HotkeyFileExtension,
+                                        FILEEXT::HotkeyFileWildcard(), wxFD_OPEN, this );
 
     if( filename.IsEmpty() )
         return;
@@ -229,7 +229,7 @@ void PANEL_HOTKEYS_EDITOR::ImportHotKeys()
 void PANEL_HOTKEYS_EDITOR::dumpHotkeys()
 {
     wxString filename = wxFileSelector( wxT( "Hotkeys File" ), m_frame->GetMruPath(),
-                                        wxEmptyString, TextFileExtension, TextFileWildcard(),
+                                        wxEmptyString, FILEEXT::TextFileExtension, FILEEXT::TextFileWildcard(),
                                         wxFD_SAVE, this );
 
     if( filename.IsEmpty() )

common/eda_base_frame.cpp

@@ -1248,8 +1248,8 @@ void EDA_BASE_FRAME::OnDropFiles( wxDropFilesEvent& aEvent )
         wxString         ext = fn.GetExt();
 
         // Alias all gerber files as GerberFileExtension
-        if( IsGerberFileExtension( ext ) )
-            ext = GerberFileExtension;
+        if( FILEEXT::IsGerberFileExtension( ext ) )
+            ext = FILEEXT::GerberFileExtension;
 
         if( m_acceptedExts.find( ext.ToStdString() ) != m_acceptedExts.end() )
             m_AcceptedFiles.emplace_back( fn );

common/hotkeys_basic.cpp

@@ -356,7 +356,7 @@ void ReadHotKeyConfig( const wxString&                             aFileName,
     if( fileName.IsEmpty() )
     {
         wxFileName fn( wxS( "user" ) );
-        fn.SetExt( HotkeyFileExtension );
+        fn.SetExt( FILEEXT::HotkeyFileExtension );
         fn.SetPath( PATHS::GetUserSettingsPath() );
         fileName = fn.GetFullPath();
     }
@@ -411,7 +411,7 @@ int WriteHotKeyConfig( const std::vector<TOOL_ACTION*>& aActions )
     std::map<std::string, std::pair<int, int>> hotkeys;
     wxFileName fn( "user" );
 
-    fn.SetExt( HotkeyFileExtension );
+    fn.SetExt( FILEEXT::HotkeyFileExtension );
     fn.SetPath( PATHS::GetUserSettingsPath() );
 
     // Read the existing config (all hotkeys)
@@ -458,7 +458,7 @@ int ReadLegacyHotkeyConfigFile( const wxString& aFilename, std::map<std::string,
 {
     wxFileName fn( aFilename );
 
-    fn.SetExt( HotkeyFileExtension );
+    fn.SetExt( FILEEXT::HotkeyFileExtension );
     fn.SetPath( PATHS::GetUserSettingsPath() );
 
     if( !wxFile::Exists( fn.GetFullPath() ) )

common/http_lib/http_lib_settings.cpp

@@ -47,5 +47,5 @@ HTTP_LIB_SETTINGS::HTTP_LIB_SETTINGS( const std::string& aFilename ) :
 
 wxString HTTP_LIB_SETTINGS::getFileExt() const
 {
-    return HTTPLibraryFileExtension;
+    return FILEEXT::HTTPLibraryFileExtension;
 }

common/project.cpp

@@ -121,7 +121,7 @@ void PROJECT::setProjectFullName( const wxString& aFullPathAndName )
 
         wxASSERT( m_project_name.IsAbsolute() );
 
-        wxASSERT( m_project_name.GetExt() == ProjectFileExtension );
+        wxASSERT( m_project_name.GetExt() == FILEEXT::ProjectFileExtension );
 
         // until multiple projects are in play, set an environment variable for the
         // the project pointer.

common/project/project_file.cpp

@@ -585,7 +585,7 @@ bool PROJECT_FILE::SaveToFile( const wxString& aDirectory, bool aForce )
 {
     wxASSERT( m_project );
 
-    Set( "meta.filename", m_project->GetProjectName() + "." + ProjectFileExtension );
+    Set( "meta.filename", m_project->GetProjectName() + "." + FILEEXT::ProjectFileExtension );
 
     return JSON_SETTINGS::SaveToFile( aDirectory, aForce );
 }
@@ -597,7 +597,7 @@ bool PROJECT_FILE::SaveAs( const wxString& aDirectory, const wxString& aFile )
     wxString   oldProjectName = oldFilename.GetName();
     wxString   oldProjectPath = oldFilename.GetPath();
 
-    Set( "meta.filename", aFile + "." + ProjectFileExtension );
+    Set( "meta.filename", aFile + "." + FILEEXT::ProjectFileExtension );
     SetFilename( aFile );
 
     auto updatePath =
@@ -638,13 +638,13 @@ bool PROJECT_FILE::SaveAs( const wxString& aDirectory, const wxString& aFile )
 
 wxString PROJECT_FILE::getFileExt() const
 {
-    return ProjectFileExtension;
+    return FILEEXT::ProjectFileExtension;
 }
 
 
 wxString PROJECT_FILE::getLegacyFileExt() const
 {
-    return LegacyProjectFileExtension;
+    return FILEEXT::LegacyProjectFileExtension;
 }
 
 

common/project/project_local_settings.cpp

@@ -352,7 +352,7 @@ bool PROJECT_LOCAL_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce
 {
     wxASSERT( m_project );
 
-    Set( "meta.filename", m_project->GetProjectName() + "." + ProjectLocalSettingsFileExtension );
+    Set( "meta.filename", m_project->GetProjectName() + "." + FILEEXT::ProjectLocalSettingsFileExtension );
 
     return JSON_SETTINGS::SaveToFile( aDirectory, aForce );
 }
@@ -360,7 +360,7 @@ bool PROJECT_LOCAL_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce
 
 bool PROJECT_LOCAL_SETTINGS::SaveAs( const wxString& aDirectory, const wxString& aFile )
 {
-    Set( "meta.filename", aFile + "." + ProjectLocalSettingsFileExtension );
+    Set( "meta.filename", aFile + "." + FILEEXT::ProjectLocalSettingsFileExtension );
     SetFilename( aFile );
 
     return JSON_SETTINGS::SaveToFile( aDirectory, true );

common/settings/settings_manager.cpp

@@ -853,8 +853,8 @@ bool SETTINGS_MANAGER::LoadProject( const wxString& aFullPath, bool aSetActive )
     // Normalize path to new format even if migrating from a legacy file
     wxFileName path( aFullPath );
 
-    if( path.GetExt() == LegacyProjectFileExtension )
-        path.SetExt( ProjectFileExtension );
+    if( path.GetExt() == FILEEXT::LegacyProjectFileExtension )
+        path.SetExt( FILEEXT::ProjectFileExtension );
 
     wxString fullPath = path.GetFullPath();
 
@@ -1166,7 +1166,7 @@ bool SETTINGS_MANAGER::BackupProject( REPORTER& aReporter ) const
     wxFileName target;
     target.SetPath( GetProjectBackupsPath() );
     target.SetName( fileName );
-    target.SetExt( ArchiveFileExtension );
+    target.SetExt( FILEEXT::ArchiveFileExtension );
 
     if( !target.DirExists() && !wxMkdir( target.GetPath() ) )
     {

common/widgets/wx_html_report_panel.cpp

@@ -366,7 +366,7 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event )
         fn = m_reportFileName;
 
     wxFileDialog dlg( this, _( "Save Report File" ), fn.GetPath(), fn.GetFullName(),
-                      TextFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                      FILEEXT::TextFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( dlg.ShowModal() != wxID_OK )
         return;

common/wildcards_and_files_ext.cpp

@@ -122,84 +122,84 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts )
     return files_filter;
 }
 
-const std::string BackupFileSuffix( "-bak" );
-const std::string LockFilePrefix( "~" );
-const std::string LockFileExtension( "lck" );
+const std::string FILEEXT::BackupFileSuffix( "-bak" );
+const std::string FILEEXT::LockFilePrefix( "~" );
+const std::string FILEEXT::LockFileExtension( "lck" );
 
-const std::string KiCadSymbolLibFileExtension( "kicad_sym" );
-const std::string SchematicSymbolFileExtension( "sym" );
-const std::string LegacySymbolLibFileExtension( "lib" );
-const std::string LegacySymbolDocumentFileExtension( "dcm" );
+const std::string FILEEXT::KiCadSymbolLibFileExtension( "kicad_sym" );
+const std::string FILEEXT::SchematicSymbolFileExtension( "sym" );
+const std::string FILEEXT::LegacySymbolLibFileExtension( "lib" );
+const std::string FILEEXT::LegacySymbolDocumentFileExtension( "dcm" );
 
-const std::string VrmlFileExtension( "wrl" );
+const std::string FILEEXT::VrmlFileExtension( "wrl" );
 
-const std::string ProjectFileExtension( "kicad_pro" );
-const std::string LegacyProjectFileExtension( "pro" );
-const std::string ProjectLocalSettingsFileExtension( "kicad_prl" );
-const std::string LegacySchematicFileExtension( "sch" );
-const std::string CadstarSchematicFileExtension( "csa" );
-const std::string CadstarPartsLibraryFileExtension( "lib" );
-const std::string KiCadSchematicFileExtension( "kicad_sch" );
-const std::string SpiceFileExtension( "cir" );
-const std::string CadstarNetlistFileExtension( "frp" );
-const std::string OrCadPcb2NetlistFileExtension( "net" );
-const std::string NetlistFileExtension( "net" );
-const std::string AllegroNetlistFileExtension( "txt" );
-const std::string FootprintAssignmentFileExtension( "cmp" );
-const std::string GerberFileExtension( "gbr" );
-const std::string GerberJobFileExtension( "gbrjob" );
-const std::string HtmlFileExtension( "html" );
-const std::string EquFileExtension( "equ" );
-const std::string HotkeyFileExtension( "hotkeys" );
-const std::string DatabaseLibraryFileExtension( "kicad_dbl" );
-const std::string HTTPLibraryFileExtension( "kicad_httplib" );
+const std::string FILEEXT::ProjectFileExtension( "kicad_pro" );
+const std::string FILEEXT::LegacyProjectFileExtension( "pro" );
+const std::string FILEEXT::ProjectLocalSettingsFileExtension( "kicad_prl" );
+const std::string FILEEXT::LegacySchematicFileExtension( "sch" );
+const std::string FILEEXT::CadstarSchematicFileExtension( "csa" );
+const std::string FILEEXT::CadstarPartsLibraryFileExtension( "lib" );
+const std::string FILEEXT::KiCadSchematicFileExtension( "kicad_sch" );
+const std::string FILEEXT::SpiceFileExtension( "cir" );
+const std::string FILEEXT::CadstarNetlistFileExtension( "frp" );
+const std::string FILEEXT::OrCadPcb2NetlistFileExtension( "net" );
+const std::string FILEEXT::NetlistFileExtension( "net" );
+const std::string FILEEXT::AllegroNetlistFileExtension( "txt" );
+const std::string FILEEXT::FootprintAssignmentFileExtension( "cmp" );
+const std::string FILEEXT::GerberFileExtension( "gbr" );
+const std::string FILEEXT::GerberJobFileExtension( "gbrjob" );
+const std::string FILEEXT::HtmlFileExtension( "html" );
+const std::string FILEEXT::EquFileExtension( "equ" );
+const std::string FILEEXT::HotkeyFileExtension( "hotkeys" );
+const std::string FILEEXT::DatabaseLibraryFileExtension( "kicad_dbl" );
+const std::string FILEEXT::HTTPLibraryFileExtension( "kicad_httplib" );
 
-const std::string ArchiveFileExtension( "zip" );
+const std::string FILEEXT::ArchiveFileExtension( "zip" );
 
-const std::string LegacyPcbFileExtension( "brd" );
-const std::string EaglePcbFileExtension( "brd" );
-const std::string CadstarPcbFileExtension( "cpa" );
-const std::string KiCadPcbFileExtension( "kicad_pcb" );
-const std::string DrawingSheetFileExtension( "kicad_wks" );
-const std::string DesignRulesFileExtension( "kicad_dru" );
+const std::string FILEEXT::LegacyPcbFileExtension( "brd" );
+const std::string FILEEXT::EaglePcbFileExtension( "brd" );
+const std::string FILEEXT::CadstarPcbFileExtension( "cpa" );
+const std::string FILEEXT::KiCadPcbFileExtension( "kicad_pcb" );
+const std::string FILEEXT::DrawingSheetFileExtension( "kicad_wks" );
+const std::string FILEEXT::DesignRulesFileExtension( "kicad_dru" );
 
-const std::string PdfFileExtension( "pdf" );
-const std::string MacrosFileExtension( "mcr" );
-const std::string DrillFileExtension( "drl" );
-const std::string SVGFileExtension( "svg" );
-const std::string ReportFileExtension( "rpt" );
-const std::string FootprintPlaceFileExtension( "pos" );
+const std::string FILEEXT::PdfFileExtension( "pdf" );
+const std::string FILEEXT::MacrosFileExtension( "mcr" );
+const std::string FILEEXT::DrillFileExtension( "drl" );
+const std::string FILEEXT::SVGFileExtension( "svg" );
+const std::string FILEEXT::ReportFileExtension( "rpt" );
+const std::string FILEEXT::FootprintPlaceFileExtension( "pos" );
 
-const std::string KiCadFootprintLibPathExtension( "pretty" );   // this is a directory
-const std::string LegacyFootprintLibPathExtension( "mod" );     // this is a file
-const std::string AltiumFootprintLibPathExtension( "PcbLib" );  // this is a file
-const std::string CadstarFootprintLibPathExtension( "cpa" );    // this is a file
-const std::string EagleFootprintLibPathExtension( "lbr" );      // this is a file
-const std::string GedaPcbFootprintLibFileExtension( "fp" );     // this is a file
+const std::string FILEEXT::KiCadFootprintLibPathExtension( "pretty" ); // this is a directory
+const std::string FILEEXT::LegacyFootprintLibPathExtension( "mod" );   // this is a file
+const std::string FILEEXT::AltiumFootprintLibPathExtension( "PcbLib" ); // this is a file
+const std::string FILEEXT::CadstarFootprintLibPathExtension( "cpa" );   // this is a file
+const std::string FILEEXT::EagleFootprintLibPathExtension( "lbr" );     // this is a file
+const std::string FILEEXT::GedaPcbFootprintLibFileExtension( "fp" );    // this is a file
 
-const std::string KiCadFootprintFileExtension( "kicad_mod" );
-const std::string SpecctraDsnFileExtension( "dsn" );
-const std::string SpecctraSessionFileExtension( "ses" );
-const std::string IpcD356FileExtension( "d356" );
-const std::string Ipc2581FileExtension( "xml" );
-const std::string WorkbookFileExtension( "wbk" );
+const std::string FILEEXT::KiCadFootprintFileExtension( "kicad_mod" );
+const std::string FILEEXT::SpecctraDsnFileExtension( "dsn" );
+const std::string FILEEXT::SpecctraSessionFileExtension( "ses" );
+const std::string FILEEXT::IpcD356FileExtension( "d356" );
+const std::string FILEEXT::Ipc2581FileExtension( "xml" );
+const std::string FILEEXT::WorkbookFileExtension( "wbk" );
 
-const std::string PngFileExtension( "png" );
-const std::string JpegFileExtension( "jpg" );
-const std::string TextFileExtension( "txt" );
-const std::string MarkdownFileExtension( "md" );
-const std::string CsvFileExtension( "csv" );
-const std::string XmlFileExtension( "xml" );
-const std::string JsonFileExtension( "json" );
+const std::string FILEEXT::PngFileExtension( "png" );
+const std::string FILEEXT::JpegFileExtension( "jpg" );
+const std::string FILEEXT::TextFileExtension( "txt" );
+const std::string FILEEXT::MarkdownFileExtension( "md" );
+const std::string FILEEXT::CsvFileExtension( "csv" );
+const std::string FILEEXT::XmlFileExtension( "xml" );
+const std::string FILEEXT::JsonFileExtension( "json" );
 
-const std::string StepFileExtension( "step" );
-const std::string StepFileAbrvExtension( "stp" );
-const std::string GltfBinaryFileExtension( "glb" );
+const std::string FILEEXT::StepFileExtension( "step" );
+const std::string FILEEXT::StepFileAbrvExtension( "stp" );
+const std::string FILEEXT::GltfBinaryFileExtension( "glb" );
 
-const wxString GerberFileExtensionsRegex( "(gbr|gko|pho|(g[tb][alops])|(gm?\\d\\d*)|(gp[tb]))" );
+const wxString FILEEXT::GerberFileExtensionsRegex( "(gbr|gko|pho|(g[tb][alops])|(gm?\\d\\d*)|(gp[tb]))" );
 
 
-bool IsGerberFileExtension( const wxString& ext )
+bool FILEEXT::IsGerberFileExtension( const wxString& ext )
 {
     static wxRegEx gerberRE( GerberFileExtensionsRegex, wxRE_ICASE );
 
@@ -207,125 +207,125 @@ bool IsGerberFileExtension( const wxString& ext )
 }
 
 
-wxString AllFilesWildcard()
+wxString FILEEXT::AllFilesWildcard()
 {
     return _( "All files" ) + AddFileExtListToFilter( {} );
 }
 
 
-wxString KiCadSymbolLibFileWildcard()
+wxString FILEEXT::KiCadSymbolLibFileWildcard()
 {
     return _( "KiCad symbol library files" )
             + AddFileExtListToFilter( { KiCadSymbolLibFileExtension } );
 }
 
 
-wxString ProjectFileWildcard()
+wxString FILEEXT::ProjectFileWildcard()
 {
     return _( "KiCad project files" ) + AddFileExtListToFilter( { ProjectFileExtension } );
 }
 
 
-wxString LegacyProjectFileWildcard()
+wxString FILEEXT::LegacyProjectFileWildcard()
 {
     return _( "KiCad legacy project files" )
             + AddFileExtListToFilter( { LegacyProjectFileExtension } );
 }
 
 
-wxString AllProjectFilesWildcard()
+wxString FILEEXT::AllProjectFilesWildcard()
 {
     return _( "All KiCad project files" )
             + AddFileExtListToFilter( { ProjectFileExtension, LegacyProjectFileExtension } );
 }
 
 
-wxString AllSchematicFilesWildcard()
+wxString FILEEXT::AllSchematicFilesWildcard()
 {
     return _( "All KiCad schematic files" )
             + AddFileExtListToFilter( { KiCadSchematicFileExtension, LegacySchematicFileExtension } );
 }
 
 
-wxString LegacySchematicFileWildcard()
+wxString FILEEXT::LegacySchematicFileWildcard()
 {
     return _( "KiCad legacy schematic files" )
             + AddFileExtListToFilter( { LegacySchematicFileExtension } );
 }
 
 
-wxString KiCadSchematicFileWildcard()
+wxString FILEEXT::KiCadSchematicFileWildcard()
 {
     return _( "KiCad s-expression schematic files" )
             + AddFileExtListToFilter( { KiCadSchematicFileExtension } );
 }
 
 
-wxString CadstarArchiveFilesWildcard()
+wxString FILEEXT::CadstarArchiveFilesWildcard()
 {
     return _( "CADSTAR Archive files" ) + AddFileExtListToFilter( { "csa", "cpa" } );
 }
 
 
-wxString EagleFilesWildcard()
+wxString FILEEXT::EagleFilesWildcard()
 {
     return _( "Eagle XML files" ) + AddFileExtListToFilter( { "sch", "brd" } );
 }
 
 
-wxString OrCadPcb2NetlistFileWildcard()
+wxString FILEEXT::OrCadPcb2NetlistFileWildcard()
 {
     return _( "OrcadPCB2 netlist files" )
             + AddFileExtListToFilter( { OrCadPcb2NetlistFileExtension } );
 }
 
 
-wxString NetlistFileWildcard()
+wxString FILEEXT::NetlistFileWildcard()
 {
     return _( "KiCad netlist files" ) + AddFileExtListToFilter( { "net" } );
 }
 
 
-wxString AllegroNetlistFileWildcard()
+wxString FILEEXT::AllegroNetlistFileWildcard()
 {
     return _( "Allegro netlist files" )
             + AddFileExtListToFilter( { AllegroNetlistFileExtension } );
 }
 
 
-wxString EasyEdaArchiveWildcard()
+wxString FILEEXT::EasyEdaArchiveWildcard()
 {
     return _( "EasyEDA (JLCEDA) Std backup archive" ) + AddFileExtListToFilter( { "zip" } );
 }
 
 
-wxString EasyEdaProFileWildcard()
+wxString FILEEXT::EasyEdaProFileWildcard()
 {
     return _( "EasyEDA (JLCEDA) Pro files" ) + AddFileExtListToFilter( { "epro", "zip" } );
 }
 
 
-wxString PcbFileWildcard()
+wxString FILEEXT::PcbFileWildcard()
 {
     return _( "KiCad printed circuit board files" )
            + AddFileExtListToFilter( { KiCadPcbFileExtension } );
 }
 
 
-wxString KiCadFootprintLibFileWildcard()
+wxString FILEEXT::KiCadFootprintLibFileWildcard()
 {
     return _( "KiCad footprint files" ) + AddFileExtListToFilter( { KiCadFootprintFileExtension } );
 }
 
 
-wxString KiCadFootprintLibPathWildcard()
+wxString FILEEXT::KiCadFootprintLibPathWildcard()
 {
     return _( "KiCad footprint library paths" )
             + AddFileExtListToFilter( { KiCadFootprintLibPathExtension } );
 }
 
 
-wxString DrawingSheetFileWildcard()
+wxString FILEEXT::DrawingSheetFileWildcard()
 {
     return _( "Drawing sheet files" )
             + AddFileExtListToFilter( { DrawingSheetFileExtension } );
@@ -333,7 +333,7 @@ wxString DrawingSheetFileWildcard()
 
 
 // Wildcard for cvpcb symbol to footprint link file
-wxString FootprintAssignmentFileWildcard()
+wxString FILEEXT::FootprintAssignmentFileWildcard()
 {
     return _( "KiCad symbol footprint link files" )
             + AddFileExtListToFilter( { FootprintAssignmentFileExtension } );
@@ -341,180 +341,180 @@ wxString FootprintAssignmentFileWildcard()
 
 
 // Wildcard for reports and fabrication documents
-wxString DrillFileWildcard()
+wxString FILEEXT::DrillFileWildcard()
 {
     return _( "Drill files" )
             + AddFileExtListToFilter( { DrillFileExtension, "nc", "xnc", "txt" } );
 }
 
 
-wxString SVGFileWildcard()
+wxString FILEEXT::SVGFileWildcard()
 {
     return _( "SVG files" ) + AddFileExtListToFilter( { SVGFileExtension } );
 }
 
 
-wxString HtmlFileWildcard()
+wxString FILEEXT::HtmlFileWildcard()
 {
     return _( "HTML files" ) + AddFileExtListToFilter( { "htm", "html" } );
 }
 
 
-wxString CsvFileWildcard()
+wxString FILEEXT::CsvFileWildcard()
 {
     return _( "CSV Files" ) + AddFileExtListToFilter( { CsvFileExtension } );
 }
 
 
-wxString PdfFileWildcard()
+wxString FILEEXT::PdfFileWildcard()
 {
     return _( "Portable document format files" ) + AddFileExtListToFilter( { "pdf" } );
 }
 
 
-wxString PSFileWildcard()
+wxString FILEEXT::PSFileWildcard()
 {
     return _( "PostScript files" ) + AddFileExtListToFilter( { "ps" } );
 }
 
 
-wxString JsonFileWildcard()
+wxString FILEEXT::JsonFileWildcard()
 {
     return _( "Json files" ) + AddFileExtListToFilter( { JsonFileExtension } );
 }
 
 
-wxString ReportFileWildcard()
+wxString FILEEXT::ReportFileWildcard()
 {
     return _( "Report files" ) + AddFileExtListToFilter( { ReportFileExtension } );
 }
 
 
-wxString FootprintPlaceFileWildcard()
+wxString FILEEXT::FootprintPlaceFileWildcard()
 {
     return _( "Component placement files" ) + AddFileExtListToFilter( { "pos" } );
 }
 
 
-wxString Shapes3DFileWildcard()
+wxString FILEEXT::Shapes3DFileWildcard()
 {
     return _( "VRML and X3D files" ) + AddFileExtListToFilter( { "wrl", "x3d" } );
 }
 
 
-wxString IDF3DFileWildcard()
+wxString FILEEXT::IDF3DFileWildcard()
 {
     return _( "IDFv3 footprint files" ) + AddFileExtListToFilter( { "idf" } );
 }
 
 
-wxString TextFileWildcard()
+wxString FILEEXT::TextFileWildcard()
 {
     return _( "Text files" ) + AddFileExtListToFilter( { "txt" } );
 }
 
 
-wxString ModLegacyExportFileWildcard()
+wxString FILEEXT::ModLegacyExportFileWildcard()
 {
     return _( "Legacy footprint export files" ) + AddFileExtListToFilter( { "emp" } );
 }
 
 
-wxString ErcFileWildcard()
+wxString FILEEXT::ErcFileWildcard()
 {
     return _( "Electrical rule check file" ) + AddFileExtListToFilter( { "erc" } );
 }
 
 
-wxString SpiceLibraryFileWildcard()
+wxString FILEEXT::SpiceLibraryFileWildcard()
 {
     return _( "Spice library file" ) + AddFileExtListToFilter( { "lib", "mod" } );
 }
 
 
-wxString SpiceNetlistFileWildcard()
+wxString FILEEXT::SpiceNetlistFileWildcard()
 {
     return _( "SPICE netlist file" ) + AddFileExtListToFilter( { "cir" } );
 }
 
 
-wxString CadstarNetlistFileWildcard()
+wxString FILEEXT::CadstarNetlistFileWildcard()
 {
     return _( "CadStar netlist file" ) + AddFileExtListToFilter( { "frp" } );
 }
 
 
-wxString EquFileWildcard()
+wxString FILEEXT::EquFileWildcard()
 {
     return _( "Symbol footprint association files" ) + AddFileExtListToFilter( { "equ" } );
 }
 
 
-wxString ZipFileWildcard()
+wxString FILEEXT::ZipFileWildcard()
 {
     return _( "Zip file" ) + AddFileExtListToFilter( { "zip" } );
 }
 
 
-wxString GencadFileWildcard()
+wxString FILEEXT::GencadFileWildcard()
 {
     return _( "GenCAD 1.4 board files" ) + AddFileExtListToFilter( { "cad" } );
 }
 
 
-wxString DxfFileWildcard()
+wxString FILEEXT::DxfFileWildcard()
 {
     return _( "DXF Files" ) + AddFileExtListToFilter( { "dxf" } );
 }
 
 
-wxString GerberJobFileWildcard()
+wxString FILEEXT::GerberJobFileWildcard()
 {
     return _( "Gerber job file" ) + AddFileExtListToFilter( { GerberJobFileExtension } );
 }
 
 
-wxString SpecctraDsnFileWildcard()
+wxString FILEEXT::SpecctraDsnFileWildcard()
 {
     return _( "Specctra DSN file" )
             + AddFileExtListToFilter( { SpecctraDsnFileExtension } );
 }
 
 
-wxString SpecctraSessionFileWildcard()
+wxString FILEEXT::SpecctraSessionFileWildcard()
 {
     return _( "Specctra Session file" )
             + AddFileExtListToFilter( { SpecctraSessionFileExtension } );
 }
 
 
-wxString IpcD356FileWildcard()
+wxString FILEEXT::IpcD356FileWildcard()
 {
     return _( "IPC-D-356 Test Files" )
             + AddFileExtListToFilter( { IpcD356FileExtension } );
 }
 
 
-wxString WorkbookFileWildcard()
+wxString FILEEXT::WorkbookFileWildcard()
 {
     return _( "Workbook file" )
             + AddFileExtListToFilter( { WorkbookFileExtension } );
 }
 
 
-wxString PngFileWildcard()
+wxString FILEEXT::PngFileWildcard()
 {
     return _( "PNG file" ) + AddFileExtListToFilter( { "png" } );
 }
 
 
-wxString JpegFileWildcard()
+wxString FILEEXT::JpegFileWildcard()
 {
     return _( "Jpeg file" ) + AddFileExtListToFilter( { "jpg", "jpeg" } );
 }
 
 
-wxString HotkeyFileWildcard()
+wxString FILEEXT::HotkeyFileWildcard()
 {
     return _( "Hotkey file" ) + AddFileExtListToFilter( { HotkeyFileExtension } );
 }

cvpcb/dialogs/dialog_config_equfiles.cpp

@@ -208,7 +208,7 @@ void DIALOG_CONFIG_EQUFILES::OnAddFiles( wxCommandEvent& event )
     wxString   libpath = m_gridEnvVars->GetCellValue( wxGridCellCoords( row, 1 ) );
 
     wxFileDialog dlg( this, _( "Footprint Association File" ), libpath, wxEmptyString,
-                      EquFileWildcard(), wxFD_DEFAULT_STYLE | wxFD_MULTIPLE );
+                      FILEEXT::EquFileWildcard(), wxFD_DEFAULT_STYLE | wxFD_MULTIPLE );
 
     if( dlg.ShowModal() != wxID_OK )
         return;

eeschema/dialogs/dialog_erc.cpp

@@ -880,10 +880,10 @@ void DIALOG_ERC::deleteAllMarkers( bool aIncludeExclusions )
 
 void DIALOG_ERC::OnSaveReport( wxCommandEvent& aEvent )
 {
-    wxFileName fn( wxS( "ERC." ) + ReportFileExtension );
+    wxFileName fn( wxS( "ERC." ) + FILEEXT::ReportFileExtension );
 
     wxFileDialog dlg( this, _( "Save Report File" ), Prj().GetProjectPath(), fn.GetFullName(),
-                      ReportFileWildcard() + wxS( "|" ) + JsonFileWildcard(),
+                      FILEEXT::ReportFileWildcard() + wxS( "|" ) + FILEEXT::JsonFileWildcard(),
                       wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( dlg.ShowModal() != wxID_OK )
@@ -892,7 +892,7 @@ void DIALOG_ERC::OnSaveReport( wxCommandEvent& aEvent )
     fn = dlg.GetPath();
 
     if( fn.GetExt().IsEmpty() )
-        fn.SetExt( ReportFileExtension );
+        fn.SetExt( FILEEXT::ReportFileExtension );
 
     if( !fn.IsAbsolute() )
     {
@@ -903,7 +903,7 @@ void DIALOG_ERC::OnSaveReport( wxCommandEvent& aEvent )
     ERC_REPORT reportWriter( &m_parent->Schematic(), m_parent->GetUserUnits() );
 
     bool success = false;
-    if( fn.GetExt() == JsonFileExtension )
+    if( fn.GetExt() == FILEEXT::JsonFileExtension )
         success = reportWriter.WriteJsonReport( fn.GetFullPath() );
     else
         success = reportWriter.WriteTextReport( fn.GetFullPath() );

eeschema/dialogs/dialog_export_netlist.cpp

@@ -523,7 +523,7 @@ bool DIALOG_EXPORT_NETLIST::TransferDataFromWindow()
 
     if( runExternalSpiceCommand )
     {
-        fn.SetExt( SpiceFileExtension );
+        fn.SetExt( FILEEXT::SpiceFileExtension );
         fullpath = fn.GetFullPath();
     }
     else
@@ -647,32 +647,32 @@ bool DIALOG_EXPORT_NETLIST::FilenamePrms( NETLIST_TYPE_ID aType, wxString * aExt
     switch( aType )
     {
     case NET_TYPE_SPICE:
-        fileExt = SpiceFileExtension;
-        fileWildcard = SpiceNetlistFileWildcard();
+        fileExt = FILEEXT::SpiceFileExtension;
+        fileWildcard = FILEEXT::SpiceNetlistFileWildcard();
         break;
 
     case NET_TYPE_CADSTAR:
-        fileExt = CadstarNetlistFileExtension;
-        fileWildcard = CadstarNetlistFileWildcard();
+        fileExt = FILEEXT::CadstarNetlistFileExtension;
+        fileWildcard = FILEEXT::CadstarNetlistFileWildcard();
         break;
 
     case NET_TYPE_ORCADPCB2:
-        fileExt = OrCadPcb2NetlistFileExtension;
-        fileWildcard = OrCadPcb2NetlistFileWildcard();
+        fileExt = FILEEXT::OrCadPcb2NetlistFileExtension;
+        fileWildcard = FILEEXT::OrCadPcb2NetlistFileWildcard();
         break;
 
     case NET_TYPE_PCBNEW:
-        fileExt = NetlistFileExtension;
-        fileWildcard = NetlistFileWildcard();
+        fileExt = FILEEXT::NetlistFileExtension;
+        fileWildcard = FILEEXT::NetlistFileWildcard();
         break;
 
     case NET_TYPE_ALLEGRO:
-        fileExt = AllegroNetlistFileExtension;
-        fileWildcard = AllegroNetlistFileWildcard();
+        fileExt = FILEEXT::AllegroNetlistFileExtension;
+        fileWildcard = FILEEXT::AllegroNetlistFileWildcard();
         break;
 
     default:    // custom, NET_TYPE_CUSTOM1 and greater
-        fileWildcard = AllFilesWildcard();
+        fileWildcard = FILEEXT::AllFilesWildcard();
         ret = false;
     }
 

eeschema/dialogs/dialog_field_properties.cpp

@@ -364,7 +364,7 @@ bool DIALOG_FIELD_PROPERTIES::TransferDataFromWindow()
     }
     else if( m_fieldId == SHEETFILENAME_V )
     {
-        m_text = EnsureFileExtension( m_text, KiCadSchematicFileExtension );
+        m_text = EnsureFileExtension( m_text, FILEEXT::KiCadSchematicFileExtension );
     }
 
     m_position = VECTOR2I( m_posX.GetValue(), m_posY.GetValue() );

eeschema/dialogs/dialog_sch_import_settings.cpp

@@ -55,10 +55,11 @@ bool DIALOG_SCH_IMPORT_SETTINGS::TransferDataToWindow()
 void DIALOG_SCH_IMPORT_SETTINGS::OnBrowseClicked( wxCommandEvent& event )
 {
     wxFileName fn = m_frame->Schematic().Root().GetFileName();
-    fn.SetExt( ProjectFileExtension );
+    fn.SetExt( FILEEXT::ProjectFileExtension );
 
     wxFileDialog dlg( this, _( "Import Settings From" ), fn.GetPath(), fn.GetFullName(),
-                      ProjectFileWildcard(), wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR );
+                      FILEEXT::ProjectFileWildcard(),
+                      wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR );
 
     if( dlg.ShowModal() == wxID_OK )
         m_filePathCtrl->SetValue( dlg.GetPath() );

eeschema/dialogs/dialog_sheet_properties.cpp

@@ -273,7 +273,7 @@ bool DIALOG_SHEET_PROPERTIES::TransferDataFromWindow()
 
     // Ensure the filename extension is OK.  (In normal use will be caught by grid validators,
     // but unedited data from existing files can be bad.)
-    sheetFileName = EnsureFileExtension( sheetFileName, KiCadSchematicFileExtension );
+    sheetFileName = EnsureFileExtension( sheetFileName, FILEEXT::KiCadSchematicFileExtension );
 
     wxFileName fn( sheetFileName );
     wxString newRelativeFilename = fn.GetFullPath();
@@ -416,7 +416,8 @@ bool DIALOG_SHEET_PROPERTIES::TransferDataFromWindow()
 bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilename )
 {
     wxString   msg;
-    wxFileName sheetFileName( EnsureFileExtension( aNewFilename, KiCadSchematicFileExtension ) );
+    wxFileName sheetFileName(
+            EnsureFileExtension( aNewFilename, FILEEXT::KiCadSchematicFileExtension ) );
 
     // Sheet file names are relative to the path of the current sheet.  This allows for
     // nesting of schematic files in subfolders.  Screen file names are always absolute.

eeschema/dialogs/dialog_symbol_fields_table.cpp

@@ -1192,10 +1192,10 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnOutputFileBrowseClicked( wxCommandEvent& even
 
     // Calculate the export filename
     wxFileName fn( Prj().AbsolutePath( m_parent->Schematic().GetFileName() ) );
-    fn.SetExt( CsvFileExtension );
+    fn.SetExt( FILEEXT::CsvFileExtension );
 
     wxFileDialog saveDlg( this, _( "Bill of Materials Output File" ), path, fn.GetFullName(),
-                          CsvFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+                          FILEEXT::CsvFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( saveDlg.ShowModal() == wxID_CANCEL )
         return;

eeschema/dialogs/dialog_symbol_remap.cpp

@@ -453,7 +453,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
         // Back up the cache library.
         srcFileName.SetPath( Prj().GetProjectPath() );
         srcFileName.SetName( Prj().GetProjectName() + wxS( "-cache" ) );
-        srcFileName.SetExt( LegacySymbolLibFileExtension );
+        srcFileName.SetExt( FILEEXT::LegacySymbolLibFileExtension );
 
         destFileName = srcFileName;
         destFileName.SetName( destFileName.GetName() + timeStamp );
@@ -488,7 +488,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
         }
 
         // Back up the rescue symbol library document file if it exists.
-        srcFileName.SetExt( LegacySymbolDocumentFileExtension );
+        srcFileName.SetExt( FILEEXT::LegacySymbolDocumentFileExtension );
         destFileName.SetExt( srcFileName.GetExt() );
 
         tmp.Printf( _( "Backing up file '%s' to '%s'." ),

eeschema/dialogs/panel_sym_lib_table.cpp

@@ -410,7 +410,7 @@ bool PANEL_SYM_LIB_TABLE::allowAutomaticPluginTypeSelection( wxString& aLibraryP
 
     // Currently, only the extension .lib is common to legacy libraries and Cadstar libraries
     // so return false in this case
-    if( ext == LegacySymbolLibFileExtension )
+    if( ext == FILEEXT::LegacySymbolLibFileExtension )
         return false;
 
     return true;

eeschema/eeschema.cpp

@@ -489,10 +489,10 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
 
     destFile.SetPath( destPath );
 
-    if( ext == LegacySchematicFileExtension ||
-        ext == LegacySchematicFileExtension + BackupFileSuffix ||
-        ext == KiCadSchematicFileExtension ||
-        ext == KiCadSchematicFileExtension + BackupFileSuffix )
+    if( ext == FILEEXT::LegacySchematicFileExtension
+        || ext == FILEEXT::LegacySchematicFileExtension + FILEEXT::BackupFileSuffix
+        || ext == FILEEXT::KiCadSchematicFileExtension
+        || ext == FILEEXT::KiCadSchematicFileExtension + FILEEXT::BackupFileSuffix )
     {
         if( destFile.GetName() == aProjectName )
         {
@@ -522,13 +522,14 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
 
         KiCopyFile( aSrcFilePath, destFile.GetFullPath(), aErrors );
     }
-    else if( ext == SchematicSymbolFileExtension )
+    else if( ext == FILEEXT::SchematicSymbolFileExtension )
     {
         // Symbols are not project-specific.  Keep their source names.
         KiCopyFile( aSrcFilePath, destFile.GetFullPath(), aErrors );
     }
-    else if( ext == LegacySymbolLibFileExtension || ext == LegacySymbolDocumentFileExtension ||
-             ext == KiCadSymbolLibFileExtension )
+    else if( ext == FILEEXT::LegacySymbolLibFileExtension
+             || ext == FILEEXT::LegacySymbolDocumentFileExtension
+             || ext == FILEEXT::KiCadSymbolLibFileExtension )
     {
         if( destFile.GetName() == aProjectName + wxS( "-cache" ) )
             destFile.SetName( aNewProjectName + wxS( "-cache" ) );
@@ -538,7 +539,7 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
 
         KiCopyFile( aSrcFilePath, destFile.GetFullPath(), aErrors );
     }
-    else if( ext == NetlistFileExtension )
+    else if( ext == FILEEXT::NetlistFileExtension )
     {
         bool success = false;