cvpcb: Move file extension to common and deprecate a header

common/wildcards_and_files_ext.cpp

@@ -101,6 +101,7 @@ const std::string ComponentFileExtension( "cmp" );
 const std::string GerberFileExtension( "gbr" );
 const std::string GerberJobFileExtension( "gbrjob" );
 const std::string HtmlFileExtension( "html" );
+const std::string EquFileExtension( "equ" );
 
 const std::string LegacyPcbFileExtension( "brd" );
 const std::string KiCadPcbFileExtension( "kicad_pcb" );

cvpcb/auto_associate.cpp

@@ -41,7 +41,6 @@
 #include <macros.h>
 
 #include <auto_associate.h>
-#include <cvpcb.h>
 #include <cvpcb_association.h>
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>

cvpcb/cfg.cpp

@@ -37,7 +37,6 @@
 #include <fp_lib_table.h>
 #include <confirm.h>
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <display_footprints_frame.h>
 

cvpcb/components_listbox.cpp

@@ -28,7 +28,6 @@
 #include <fctsys.h>
 #include <trace_helpers.h>
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
 #include <cvpcb_id.h>

cvpcb/cvpcb.cpp

@@ -27,24 +27,15 @@
  * @file cvpcb.cpp
  */
 
+#include <confirm.h>
 #include <fctsys.h>
-#include <macros.h>
 #include <fp_lib_table.h>
 #include <kiface_i.h>
+#include <macros.h>
 #include <pgm_base.h>
-#include <confirm.h>
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <display_footprints_frame.h>
-#include <cvpcb_id.h>
-
-#include <build_version.h>
-
-#include <wx/snglinst.h>
-
-// Constant string definitions for CvPcb
-const wxString EquFileExtension( wxT( "equ" ) );
 
 
 namespace CV {

cvpcb/cvpcb.h

@@ -1,36 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#ifndef __CVPCB_H__
-#define __CVPCB_H__
-
-// Define print format to display a schematic component line. format:
-// idx reference - value : footprint_id
-#define CMP_FORMAT wxT( "%3d %8s - %16s : %s" )
-
-extern const wxString EquFileExtension;
-extern const wxString EquFilesWildcard;
-
-
-#endif /* __CVPCB_H__ */

cvpcb/cvpcb_mainframe.cpp

@@ -45,7 +45,6 @@
 #include <widgets/progress_reporter.h>
 #include <wx/statline.h>
 
-#include <cvpcb.h>
 #include <cvpcb_association.h>
 #include <cvpcb_id.h>
 #include <cvpcb_mainframe.h>

cvpcb/cvpcb_mainframe.h

@@ -52,6 +52,12 @@ typedef std::vector< CVPCB_ASSOCIATION >       CVPCB_UNDO_REDO_ENTRIES;
 // The undo list is a vector of undo entries
 typedef std::vector< CVPCB_UNDO_REDO_ENTRIES > CVPCB_UNDO_REDO_LIST;
 
+/**
+ * The print format to display a schematic component line.
+ * format: idx reference - value : footprint_id
+ */
+#define CMP_FORMAT wxT( "%3d %8s - %16s : %s" )
+
 /**
  * The CvPcb application main window.
  */

cvpcb/dialogs/dialog_config_equfiles.cpp

@@ -35,9 +35,7 @@
 #include <project.h>            // For PROJECT_VAR_NAME definition
 #include <fp_lib_table.h>       // For KISYSMOD definition
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
-
 #include <dialog_config_equfiles.h>
 #include <wildcards_and_files_ext.h>
 

cvpcb/dialogs/dialog_display_options.cpp

@@ -23,7 +23,6 @@
 
 #include <fctsys.h>
 #include <common.h>
-#include <cvpcb.h>
 #include <display_footprints_frame.h>
 #include <dialog_display_options.h>
 

cvpcb/footprints_listbox.cpp

@@ -34,7 +34,6 @@
 #include <trace_helpers.h>
 #include <wx/wupdlock.h>
 
-#include <cvpcb.h>
 #include <cvpcb_id.h>
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>

cvpcb/library_listbox.cpp

@@ -30,7 +30,6 @@
 #include <macros.h>
 #include <trace_helpers.h>
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
 #include <cvpcb_id.h>

cvpcb/listbox_base.cpp

@@ -29,7 +29,6 @@
 #include <fctsys.h>
 #include <macros.h>
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
 #include <cvpcb_id.h>

cvpcb/readwrite_dlgs.cpp

@@ -36,7 +36,6 @@
 #include <lib_id.h>
 #include <macros.h>
 
-#include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
 #include <fp_conflict_assignment_selector.h>

include/wildcards_and_files_ext.h

@@ -104,6 +104,7 @@ extern const std::string NetlistFileExtension;
 extern const std::string GerberFileExtension;
 extern const std::string GerberJobFileExtension;
 extern const std::string HtmlFileExtension;
+extern const std::string EquFileExtension;
 
 extern const std::string LegacyPcbFileExtension;
 extern const std::string KiCadPcbFileExtension;