From 1c0a0c4bfead4c7af1d71f487aa60e4f737549c0 Mon Sep 17 00:00:00 2001
From: Simon Wells <swel024@gmail.com>
Date: Wed, 24 Feb 2016 16:36:52 -0500
Subject: [PATCH] Kicad: clean up include files.

---
 include/menus_helpers.h          |  5 +++++
 kicad/class_treeproject_item.cpp | 34 +++++++++++++----------------
 kicad/class_treeproject_item.h   |  6 ++++++
 kicad/class_treeprojectfiles.cpp | 22 ++++++++-----------
 kicad/class_treeprojectfiles.h   |  6 ++++++
 kicad/commandframe.cpp           | 16 ++++++--------
 kicad/files-io.cpp               | 28 +++++++++++-------------
 kicad/kicad.cpp                  | 32 ++++++++++++++-------------
 kicad/kicad.h                    | 15 ++++++-------
 kicad/mainframe.cpp              | 29 +++++++++++--------------
 kicad/menubar.cpp                | 13 ++++++-----
 kicad/pgm_kicad.h                |  5 +++--
 kicad/preferences.cpp            | 10 +++------
 kicad/prjconfig.cpp              | 37 +++++++++++++++-----------------
 kicad/project_template.cpp       |  9 ++------
 kicad/project_template.h         |  7 ++++--
 kicad/tree_project_frame.cpp     | 34 ++++++++++++++---------------
 kicad/tree_project_frame.h       | 16 +++++++++-----
 18 files changed, 162 insertions(+), 162 deletions(-)

diff --git a/include/menus_helpers.h b/include/menus_helpers.h
index 6c079ca48d..97b0ef350d 100644
--- a/include/menus_helpers.h
+++ b/include/menus_helpers.h
@@ -30,8 +30,13 @@
  * in menubars or popup menus
  */
 
+
+#include <wx/menu.h>
+#include <wx/menuitem.h>
+
 #include <bitmaps.h>
 
+
 /**
  * Definition SETBITMAPS
  * is a macro use to add a bitmaps to check menu item.
diff --git a/kicad/class_treeproject_item.cpp b/kicad/class_treeproject_item.cpp
index cdf2c71fd5..7da531b0e0 100644
--- a/kicad/class_treeproject_item.cpp
+++ b/kicad/class_treeproject_item.cpp
@@ -1,10 +1,3 @@
-/**
- * @file class_treeproject_item.cpp
- *
- * @brief Class TREEPROJECT_ITEM is a derived  class from wxTreeItemData and
- * store info about a file or directory shown in the KiCad tree project files
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -28,21 +21,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file class_treeproject_item.cpp
+ *
+ * @brief Class TREEPROJECT_ITEM is a derived  class from wxTreeItemData and
+ * store info about a file or directory shown in the KiCad tree project files
+ */
 
-#include <fctsys.h>
-#include <gestfich.h>
-#include <macros.h>
-
-#include <kicad.h>
-#include <project.h>
-#include <pgm_base.h>
-#include <tree_project_frame.h>
-#include <class_treeprojectfiles.h>
-#include <class_treeproject_item.h>
-#include <wx/imaglist.h>
 
 #include <wx/regex.h>
-#include <wx/dir.h>
+
+#include <gestfich.h>
+
+#include "class_treeprojectfiles.h"
+#include "pgm_kicad.h"
+#include "tree_project_frame.h"
+
+#include "class_treeproject_item.h"
+
 
 TREEPROJECT_ITEM::TREEPROJECT_ITEM( enum TreeFileType type, const wxString& data,
                                     wxTreeCtrl* parent ) :
diff --git a/kicad/class_treeproject_item.h b/kicad/class_treeproject_item.h
index 052f462880..fe18ee4248 100644
--- a/kicad/class_treeproject_item.h
+++ b/kicad/class_treeproject_item.h
@@ -25,6 +25,12 @@
 #ifndef TREEPROJECT_ITEM_H_
 #define TREEPROJECT_ITEM_H_
 
+
+#include <wx/treebase.h>
+
+#include "kicad.h"
+
+
 /**
  * Class TREEPROJECT_ITEM
  * handles one item (a file or a directory name) for the tree file
diff --git a/kicad/class_treeprojectfiles.cpp b/kicad/class_treeprojectfiles.cpp
index 1d2b317a9f..90b2e3b0b2 100644
--- a/kicad/class_treeprojectfiles.cpp
+++ b/kicad/class_treeprojectfiles.cpp
@@ -1,7 +1,3 @@
-/**
- * @file class_treeprojectfiles.cpp
- * this is the wxTreeCtrl that shows a KiCad tree project files
- */
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,17 +22,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file class_treeprojectfiles.cpp
+ * this is the wxTreeCtrl that shows a KiCad tree project files
+ */
 
-#include <fctsys.h>
 
-#include <kicad.h>
-#include <tree_project_frame.h>
-#include <class_treeprojectfiles.h>
-#include <class_treeproject_item.h>
+#include <bitmaps.h>
 
-#include <wx/regex.h>
-#include <wx/imaglist.h>
-#include <menus_helpers.h>
+#include "class_treeproject_item.h"
+#include "tree_project_frame.h"
+
+#include "class_treeprojectfiles.h"
 
 
 IMPLEMENT_ABSTRACT_CLASS( TREEPROJECTFILES, wxTreeCtrl )
@@ -109,4 +106,3 @@ int TREEPROJECTFILES::OnCompareItems( const wxTreeItemId& item1, const wxTreeIte
 
     return myitem1->GetFileName().CmpNoCase( myitem2->GetFileName() );
 }
-
diff --git a/kicad/class_treeprojectfiles.h b/kicad/class_treeprojectfiles.h
index d10c53e347..db1d512078 100644
--- a/kicad/class_treeprojectfiles.h
+++ b/kicad/class_treeprojectfiles.h
@@ -29,6 +29,12 @@
 #ifndef CLASS_TREEPROJECTFILES_H
 #define CLASS_TREEPROJECTFILES_H
 
+
+#include <wx/treectrl.h>
+
+#include "kicad.h"
+
+
 /** Class TREEPROJECTFILES
  * This is the class to show (as a tree) the files in the project directory
  */
diff --git a/kicad/commandframe.cpp b/kicad/commandframe.cpp
index dca958027c..1ed6f66f5b 100644
--- a/kicad/commandframe.cpp
+++ b/kicad/commandframe.cpp
@@ -1,8 +1,3 @@
-/**
- * @file commandframe.cpp
- * @brief Frame showing fast launch buttons and messages box
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,12 +22,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file commandframe.cpp
+ * @brief Frame showing fast launch buttons and messages box
+ */
 
-#include <fctsys.h>
-#include <macros.h>
 
-#include <kicad.h>
-#include <menus_helpers.h>
+#include <bitmaps.h>
+
+#include "kicad.h"
 
 
 LAUNCHER_PANEL::LAUNCHER_PANEL( wxWindow* parent ) :
diff --git a/kicad/files-io.cpp b/kicad/files-io.cpp
index 42c8b05abc..40f85b8ab4 100644
--- a/kicad/files-io.cpp
+++ b/kicad/files-io.cpp
@@ -1,7 +1,3 @@
-/**
- * @file kicad/files-io.cpp
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,21 +22,23 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
-#include <kiway.h>
-#include <wx/fs_zip.h>
-#include <wx/zipstrm.h>
-#include <wx/docview.h>
-#include <wx/wfstream.h>
-#include <wx/zstream.h>
+/**
+ * @file kicad/files-io.cpp
+ */
+
+
 #include <wx/dir.h>
+#include <wx/fs_zip.h>
+#include <wx/wfstream.h>
+#include <wx/zipstrm.h>
 
 #include <confirm.h>
-#include <gestfich.h>
-#include <macros.h>
+#include <kiway.h>
+
+#include "pgm_kicad.h"
+
+#include "kicad.h"
 
-#include <kicad.h>
 
 #define     ZipFileExtension    wxT( "zip" )
 #define     ZipFileWildcard     _( "Zip file (*.zip)|*.zip" )
diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp
index 0e220d1d34..6dd3677440 100644
--- a/kicad/kicad.cpp
+++ b/kicad/kicad.cpp
@@ -1,8 +1,3 @@
-/**
- * @file kicad.cpp
- * @brief Main KiCad Project manager file
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,19 +22,26 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file kicad.cpp
+ * @brief Main KiCad Project manager file
+ */
 
-#include <macros.h>
-#include <fctsys.h>
+
+#include <wx/filename.h>
+#include <wx/log.h>
 #include <wx/stdpaths.h>
-#include <kicad.h>
-#include <kiway.h>
-#include <pgm_kicad.h>
-#include <tree_project_frame.h>
-#include <wildcards_and_files_ext.h>
-#include <boost/ptr_container/ptr_vector.hpp>
-#include <hotkeys_basic.h>
+#include <wx/string.h>
 
-#include <build_version.h>
+#include <common.h>
+#include <hotkeys_basic.h>
+#include <kiway.h>
+#include <richio.h>
+#include <wildcards_and_files_ext.h>
+
+#include "pgm_kicad.h"
+
+#include "kicad.h"
 
 
 /// Extend LIB_ENV_VAR list with the directory from which I came, prepending it.
diff --git a/kicad/kicad.h b/kicad/kicad.h
index aa98820ccd..5e319e70d0 100644
--- a/kicad/kicad.h
+++ b/kicad/kicad.h
@@ -1,8 +1,3 @@
-/**
- * @file kicad/kicad.h
- * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,19 +22,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file kicad/kicad.h
+ * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
+ */
+
 #ifndef KICAD_H
 #define KICAD_H
 
-#include <vector>
 
-#include <wx/treectrl.h>
-#include <wx/dragimag.h>
-#include <wx/filename.h>
 #include <wx/process.h>
 
 #include <id.h>
 #include <wxstruct.h>
 
+
 #define KICAD_MANAGER_FRAME_NAME   wxT( "KicadFrame" )
 
 class LAUNCHER_PANEL;
diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp
index ae7c9117f0..8170396eb4 100644
--- a/kicad/mainframe.cpp
+++ b/kicad/mainframe.cpp
@@ -1,8 +1,3 @@
-/**
- * @file kicad/mainframe.cpp
- * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -28,21 +23,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
+/**
+ * @file kicad/mainframe.cpp
+ * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
+ */
+
+
+#include <dialog_hotkeys_editor.h>
+#include <gestfich.h>
 #include <kiway.h>
 #include <kiway_player.h>
-#include <confirm.h>
-#include <gestfich.h>
-#include <macros.h>
-
-#include <kicad.h>
-#include <tree_project_frame.h>
 #include <wildcards_and_files_ext.h>
-#include <menus_helpers.h>
-#include <dialog_hotkeys_editor.h>
 
-#include <wx/filefn.h>
+#include "pgm_kicad.h"
+#include "tree_project_frame.h"
+
+#include "kicad.h"
 
 
 #define TREE_FRAME_WIDTH_ENTRY     wxT( "LeftWinWidth" )
@@ -474,7 +470,6 @@ void KICAD_MANAGER_FRAME::OnRefresh( wxCommandEvent& event )
 void KICAD_MANAGER_FRAME::language_change( wxCommandEvent& event )
 {
     int id = event.GetId();
-
     Kiway.SetLanguage( id );
 }
 
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index 054dfecda9..e6a8980f44 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -27,12 +27,15 @@
  * @file kicad/menubar.cpp
  * @brief (Re)Create the project manager menubar for KiCad
  */
-#include <fctsys.h>
-#include <pgm_kicad.h>
-#include <kicad.h>
-#include <menus_helpers.h>
-#include <tree_project_frame.h>
+
+
+#include <bitmaps.h>
 #include <hotkeys_basic.h>
+#include <menus_helpers.h>
+
+#include "kicad.h"
+#include "pgm_kicad.h"
+
 
 // Menubar and toolbar event table
 BEGIN_EVENT_TABLE( KICAD_MANAGER_FRAME, EDA_BASE_FRAME )
diff --git a/kicad/pgm_kicad.h b/kicad/pgm_kicad.h
index bb1069efac..e7ff040eba 100644
--- a/kicad/pgm_kicad.h
+++ b/kicad/pgm_kicad.h
@@ -1,5 +1,3 @@
-#ifndef PGM_KICAD_H_
-#define PGM_KICAD_H_
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -24,6 +22,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#ifndef PGM_KICAD_H_
+#define PGM_KICAD_H_
+
 
 #include <pgm_base.h>
 #include <bin_mod.h>
diff --git a/kicad/preferences.cpp b/kicad/preferences.cpp
index a259f061bb..bd9a7e82bd 100644
--- a/kicad/preferences.cpp
+++ b/kicad/preferences.cpp
@@ -27,14 +27,11 @@
  * @file preferences.cpp
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
+
 #include <confirm.h>
-#include <gestfich.h>
 
-#include <kicad.h>
-
-#include <wx/fontdlg.h>
+#include "kicad.h"
+#include "pgm_kicad.h"
 
 
 void KICAD_MANAGER_FRAME::OnUpdateDefaultPdfBrowser( wxUpdateUIEvent& event )
@@ -93,4 +90,3 @@ void KICAD_MANAGER_FRAME::OnSelectPreferredPdfBrowser( wxCommandEvent& event )
     Pgm().ForceSystemPdfBrowser( false );
     Pgm().WritePdfBrowserInfos();
 }
-
diff --git a/kicad/prjconfig.cpp b/kicad/prjconfig.cpp
index c8ed495991..5e1f3bc308 100644
--- a/kicad/prjconfig.cpp
+++ b/kicad/prjconfig.cpp
@@ -1,8 +1,3 @@
-/**
- * @file prjconfig.cpp
- * Load and save project configuration files (*.pro)
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,28 +22,30 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
-#include <kiway.h>
-#include <project.h>
-#include <confirm.h>
-#include <gestfich.h>
-#include <kicad.h>
-#include <config_params.h>
-#include <project_template.h>
-#include <tree_project_frame.h>
-#include <wildcards_and_files_ext.h>
-#include <vector>
-#include <build_version.h>
-#include <macros.h>
-#include <common.h>
+/**
+ * @file prjconfig.cpp
+ * Load and save project configuration files (*.pro)
+ */
+
 
 #include <wx/dir.h>
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 
+#include <build_version.h>
+#include <config_params.h>
+#include <confirm.h>
+#include <kiway.h>
+#include <project.h>
+#include <wildcards_and_files_ext.h>
+
 #include "dialogs/dialog_template_selector.h"
 
+#include "kicad.h"
+#include "pgm_kicad.h"
+#include "tree_project_frame.h"
+
+
 #define SEP()   wxFileName::GetPathSeparator()
 
 // Not really useful, provided to save/restore params in project config file,
diff --git a/kicad/project_template.cpp b/kicad/project_template.cpp
index b4f088cf9d..ae3931a6d8 100644
--- a/kicad/project_template.cpp
+++ b/kicad/project_template.cpp
@@ -22,18 +22,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "project_template.h"
 
-#include <vector>
-
-#include <wx/wx.h>
-#include <wx/arrstr.h>
+#include <wx/bitmap.h>
 #include <wx/dir.h>
-#include <wx/filename.h>
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
-#include <macros.h>
+#include "project_template.h"
 
 
 #define SEP()   wxFileName::GetPathSeparator()
diff --git a/kicad/project_template.h b/kicad/project_template.h
index aaef83ed82..8af3634c67 100644
--- a/kicad/project_template.h
+++ b/kicad/project_template.h
@@ -104,11 +104,14 @@
 #ifndef PROJECT_TEMPLATE_H
 #define PROJECT_TEMPLATE_H
 
+
 #include <vector>
 
-#include <wx/wx.h>
-#include <wx/image.h>
 #include <wx/filename.h>
+#include <wx/intl.h>
+
+
+class wxBitmap;
 
 /**
  * @brief A directory which contains information about the project template and does not get
diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp
index 70aa25663a..8eb22c975e 100644
--- a/kicad/tree_project_frame.cpp
+++ b/kicad/tree_project_frame.cpp
@@ -1,8 +1,3 @@
-/**
- * @file tree_project_frame.cpp
- * @brief Function to build the tree of files in the current project directory
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -28,23 +23,28 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <confirm.h>
-#include <gestfich.h>
-#include <pgm_base.h>
-#include <macros.h>
+/**
+ * @file tree_project_frame.cpp
+ * @brief Function to build the tree of files in the current project directory
+ */
 
-#include <tree_project_frame.h>
-#include <class_treeprojectfiles.h>
-#include <class_treeproject_item.h>
-#include <wildcards_and_files_ext.h>
+
+#include <stack>
 
 #include <wx/regex.h>
-#include <wx/dir.h>
-#include <wx/imaglist.h>
 #include <wx/stdpaths.h>
+#include <wx/string.h>
+
+#include <bitmaps.h>
+#include <gestfich.h>
 #include <menus_helpers.h>
-#include <stack>
+#include <wildcards_and_files_ext.h>
+
+#include "class_treeproject_item.h"
+#include "class_treeprojectfiles.h"
+#include "pgm_kicad.h"
+
+#include "tree_project_frame.h"
 
 
 /* Note about the tree project build process:
diff --git a/kicad/tree_project_frame.h b/kicad/tree_project_frame.h
index 908e8a399e..1ed774244b 100644
--- a/kicad/tree_project_frame.h
+++ b/kicad/tree_project_frame.h
@@ -1,7 +1,3 @@
-/**
- * @file tree_project_frame.h
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,14 +22,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file tree_project_frame.h
+ */
+
+
 #ifndef TREEPRJ_FRAME_H
 #define TREEPRJ_FRAME_H
 
-#include <kicad.h>
 #include <wx/fswatcher.h>
+#include <wx/laywin.h>
+#include <wx/treebase.h>
+
+#include "kicad.h"
 
 
+class KICAD_MANAGER_FRAME;
 class TREEPROJECT_ITEM;
+class TREEPROJECTFILES;
 
 /** class TREE_PROJECT_FRAME
  * Window to display the tree files