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

more cleanup about removing useless include

This commit is contained in:
jean-pierre charras 2020-10-02 18:31:19 +02:00
parent 1258abef07
commit 36bc44e6d7
25 changed files with 20 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/base_screen.cpp
View File

@ -26,7 +26,6 @@
#include <base_screen.h> #include <base_screen.h>
#include <base_struct.h> #include <base_struct.h>
#include <fctsys.h>
#include <trace_helpers.h> #include <trace_helpers.h>

3
common/base_struct.cpp
View File

@ -28,10 +28,7 @@
#include <deque> #include <deque>
#include <fctsys.h>
#include <trigo.h> #include <trigo.h>
#include <common.h>
#include <macros.h>
#include <base_screen.h> #include <base_screen.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <trace_helpers.h> #include <trace_helpers.h>

3
common/build_version.cpp
View File

@ -23,7 +23,8 @@
*/ */
// Date for KiCad build version // Date for KiCad build version
#include <fctsys.h> #include <wx/wx.h>
#include <config.h>
#include <boost/version.hpp> #include <boost/version.hpp>
// kicad_curl.h must be included before wx headers, to avoid // kicad_curl.h must be included before wx headers, to avoid

6
common/eda_dde.cpp
View File

@ -26,12 +26,12 @@
* @file eda_dde.cpp * @file eda_dde.cpp
*/ */
#include <fctsys.h> //#include <fctsys.h>
#include <eda_dde.h> #include <eda_dde.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <id.h> #include <id.h>
#include <common.h> //#include <common.h>
#include <macros.h> //#include <macros.h>
static const wxString HOSTNAME( wxT( "localhost" ) ); static const wxString HOSTNAME( wxT( "localhost" ) );

4
common/eda_doc.cpp
View File

@ -26,9 +26,7 @@
* @file eda_doc.cpp * @file eda_doc.cpp
*/ */
#include <fctsys.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <common.h>
#include <confirm.h> #include <confirm.h>
#include <gestfich.h> #include <gestfich.h>
#include <settings/common_settings.h> #include <settings/common_settings.h>
@ -37,7 +35,7 @@
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/uri.h> #include <wx/uri.h>
#include <macros.h> #include <wx/filedlg.h>
void PGM_BASE::ReadPdfBrowserInfos() void PGM_BASE::ReadPdfBrowserInfos()

1
common/eda_draw_frame.cpp
View File

@ -28,7 +28,6 @@
#include <confirm.h> #include <confirm.h>
#include <dialog_shim.h> #include <dialog_shim.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <fctsys.h>
#include <filehistory.h> #include <filehistory.h>
#include <id.h> #include <id.h>
#include <kiface_i.h> #include <kiface_i.h>

3
common/eda_size_ctrl.cpp
View File

@ -21,11 +21,10 @@
* or you may write to the Free Software Foundation, Inc., * or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h> //#include <fctsys.h>
#include <eda_base_frame.h> #include <eda_base_frame.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
#include <base_units.h> #include <base_units.h>
#include <macros.h>
/********************************************************/ /********************************************************/

3
common/footprint_info.cpp
View File

@ -28,8 +28,6 @@
* and their documentation (comments and keywords) * and their documentation (comments and keywords)
*/ */
#include <common.h>
#include <fctsys.h>
#include <footprint_info.h> #include <footprint_info.h>
#include <fp_lib_table.h> #include <fp_lib_table.h>
#include <html_messagebox.h> #include <html_messagebox.h>
@ -37,7 +35,6 @@
#include <kiface_ids.h> #include <kiface_ids.h>
#include <kiway.h> #include <kiway.h>
#include <lib_id.h> #include <lib_id.h>
#include <macros.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <thread> #include <thread>
#include <utility> #include <utility>

1
common/fp_lib_table.cpp
View File

@ -24,7 +24,6 @@
*/ */
#include <fctsys.h>
#include <kiface_i.h> #include <kiface_i.h>
#include <footprint_info.h> #include <footprint_info.h>
#include <lib_id.h> #include <lib_id.h>

3
common/gbr_metadata.cpp
View File

@ -27,8 +27,9 @@
* @brief helper functions to handle the gerber metadata in files, * @brief helper functions to handle the gerber metadata in files,
* related to the netlist info and aperture attribute. * related to the netlist info and aperture attribute.
*/ */
#include <wx/string.h>
#include <wx/datetime.h>
#include <fctsys.h>
#include <gbr_metadata.h> #include <gbr_metadata.h>
#include <utf8.h> #include <utf8.h>

7
common/gestfich.cpp
View File

@ -27,16 +27,15 @@
* @file gestfich.cpp * @file gestfich.cpp
* @brief Functions for file management * @brief Functions for file management
*/ */
#include <fctsys.h> #include <fctsys.h>
#include <wx/mimetype.h> #include <wx/mimetype.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/dir.h> #include <wx/dir.h>
#include <wx/filedlg.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <confirm.h> #include <confirm.h>
#include <common.h>
#include <macros.h>
#include <gestfich.h> #include <gestfich.h>
void AddDelimiterString( wxString& string ) void AddDelimiterString( wxString& string )

2
common/grid_tricks.cpp
View File

@ -22,8 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h>
#include <grid_tricks.h> #include <grid_tricks.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/clipbrd.h> #include <wx/clipbrd.h>

15
common/hotkeys_basic.cpp
View File

@ -23,16 +23,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h>
#include <kiface_i.h> #include <kiface_i.h>
#include <hotkeys_basic.h> #include <hotkeys_basic.h>
#include <id.h> #include <id.h>
#include <confirm.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <gestfich.h>
#include <eda_base_frame.h> #include <eda_base_frame.h>
#include <macros.h>
#include <menus_helpers.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
@ -298,7 +293,7 @@ int KeyCodeFromKeyName( const wxString& keyname )
} }
/* /*
* DisplayHotkeyList * DisplayHotkeyList
* Displays the hotkeys registered with the given tool manager. * Displays the hotkeys registered with the given tool manager.
*/ */
@ -318,7 +313,7 @@ void ReadHotKeyConfig( wxString fileName, std::map<std::string, int>& aHotKeys )
fn.SetPath( SETTINGS_MANAGER::GetUserSettingsPath() ); fn.SetPath( SETTINGS_MANAGER::GetUserSettingsPath() );
fileName = fn.GetFullPath(); fileName = fn.GetFullPath();
} }
if( !wxFile::Exists( fileName ) ) if( !wxFile::Exists( fileName ) )
return; return;
@ -356,7 +351,7 @@ int WriteHotKeyConfig( const std::map<std::string, TOOL_ACTION*>& aActionMap )
// Read the existing config (all hotkeys) // Read the existing config (all hotkeys)
// //
ReadHotKeyConfig( fn.GetFullPath(), hotkeys ); ReadHotKeyConfig( fn.GetFullPath(), hotkeys );
// Overlay the current app's hotkey definitions onto the map // Overlay the current app's hotkey definitions onto the map
// //
for( const auto& ii : aActionMap ) for( const auto& ii : aActionMap )
@ -365,7 +360,7 @@ int WriteHotKeyConfig( const std::map<std::string, TOOL_ACTION*>& aActionMap )
// Write entire hotkey set // Write entire hotkey set
// //
wxFile file( fn.GetFullPath(), wxFile::OpenMode::write ); wxFile file( fn.GetFullPath(), wxFile::OpenMode::write );
for( const auto& ii : hotkeys ) for( const auto& ii : hotkeys )
file.Write( wxString::Format( "%s\t%s\n", ii.first, KeyNameFromKeyCode( ii.second ) ) ); file.Write( wxString::Format( "%s\t%s\n", ii.first, KeyNameFromKeyCode( ii.second ) ) );
@ -401,7 +396,7 @@ int ReadLegacyHotkeyConfigFile( const wxString& aFilename, std::map<std::string,
return 0; return 0;
wxFile cfgfile( fn.GetFullPath() ); wxFile cfgfile( fn.GetFullPath() );
if( !cfgfile.IsOpened() ) // There is a problem to open file if( !cfgfile.IsOpened() ) // There is a problem to open file
return 0; return 0;

3
common/html_messagebox.cpp
View File

@ -22,10 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h>
#include <html_messagebox.h> #include <html_messagebox.h>
#include <macros.h>
#include <common.h>
HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle, HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle,

3
common/lib_table_base.cpp
View File

@ -29,12 +29,9 @@
#include <set> #include <set>
#include <common.h>
#include <fctsys.h>
#include <kiface_i.h> #include <kiface_i.h>
#include <lib_table_base.h> #include <lib_table_base.h>
#include <lib_table_lexer.h> #include <lib_table_lexer.h>
#include <macros.h>
#include <settings/app_settings.h> #include <settings/app_settings.h>

2
common/marker_base.cpp
View File

@ -30,9 +30,7 @@
*/ */
#include "fctsys.h"
#include "base_screen.h" #include "base_screen.h"
#include "macros.h"
#include "marker_base.h" #include "marker_base.h"
#include <geometry/shape_line_chain.h> #include <geometry/shape_line_chain.h>
#include <render_settings.h> #include <render_settings.h>

1
common/netclass.cpp
View File

@ -23,7 +23,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h>
#include <netclass.h> #include <netclass.h>
#include <base_units.h> #include <base_units.h>

1
common/pgm_base.cpp
View File

@ -30,7 +30,6 @@
* (locale handling) * (locale handling)
*/ */
#include <fctsys.h>
#include <wx/html/htmlwin.h> #include <wx/html/htmlwin.h>
#include <wx/fs_zip.h> #include <wx/fs_zip.h>
#include <wx/dir.h> #include <wx/dir.h>

3
common/prependpath.cpp
View File

@ -23,8 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <macros.h> #include <wx/string.h>
#include <fctsys.h>
#include <wx/filename.h> #include <wx/filename.h>

3
common/project.cpp
View File

@ -23,15 +23,12 @@
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#include <common.h> // NAMELESS_PROJECT
#include <config_params.h> #include <config_params.h>
#include <confirm.h> #include <confirm.h>
#include <fctsys.h>
#include <fp_lib_table.h> #include <fp_lib_table.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <kiface_ids.h> #include <kiface_ids.h>
#include <kiway.h> #include <kiway.h>
#include <macros.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <project.h> #include <project.h>
#include <project/project_file.h> #include <project/project_file.h>

2
common/single_top.cpp
View File

@ -35,8 +35,6 @@
#include <typeinfo> #include <typeinfo>
#include <macros.h>
#include <fctsys.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>

2
common/template_fieldnames.cpp
View File

@ -23,8 +23,6 @@
*/ */
#include <template_fieldnames.h> #include <template_fieldnames.h>
#include <fctsys.h>
#include <macros.h>
#include <pgm_base.h> #include <pgm_base.h>
using namespace TFIELD_T; using namespace TFIELD_T;

2
common/textentry_tricks.cpp
View File

@ -22,7 +22,7 @@
*/ */
#include <fctsys.h> #include <wx/wx.h>
#include <textentry_tricks.h> #include <textentry_tricks.h>
#include <dialog_shim.h> #include <dialog_shim.h>

1
common/undo_redo_container.cpp
View File

@ -23,7 +23,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h>
#include <base_struct.h> #include <base_struct.h>
#include <undo_redo_container.h> #include <undo_redo_container.h>

1
include/grid_tricks.h
View File

@ -28,6 +28,7 @@
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/event.h> #include <wx/event.h>
#include <wx/menu.h>
#include <widgets/wx_grid.h> #include <widgets/wx_grid.h>
enum enum