Follow naming conventions.

kicad/CMakeLists.txt

@@ -20,7 +20,7 @@ set( KICAD_SRCS
     files-io.cpp
     import_project.cpp
     kicad.cpp
-    mainframe.cpp
+    kicad_manager_frame.cpp
     menubar.cpp
     prjconfig.cpp
     project_template.cpp

kicad/commandframe.cpp

@@ -31,7 +31,7 @@
 #include <bitmaps.h>
 #include <wx/statline.h>
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 #include "kicad_id.h"
 
 // Amount of clearance between tool buttons

kicad/files-io.cpp

@@ -38,7 +38,7 @@
 #include "pgm_kicad.h"
 #include "wildcards_and_files_ext.h"
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 
 #define ZipFileExtension wxT( "zip" )

kicad/import_project.cpp

@@ -48,7 +48,7 @@
 #include <io_mgr.h>
 #include <sch_io_mgr.h>
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 void KICAD_MANAGER_FRAME::OnImportEagleFiles( wxCommandEvent& event )
 {

kicad/kicad.cpp

@@ -43,8 +43,7 @@
 #include <stdexcept>
 
 #include "pgm_kicad.h"
-
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 
 // a dummy to quiet linking with EDA_BASE_FRAME::config();

kicad/kicad_manager_frame.cpp

@@ -23,12 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file kicad/mainframe.cpp
- * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
- */
-
-
 #include <eda_draw_frame.h>
 #include <panel_hotkeys_editor.h>
 #include <gestfich.h>
@@ -49,15 +43,15 @@
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 
 #define TREE_FRAME_WIDTH_ENTRY     wxT( "LeftWinWidth" )
 
-KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent,
-        const wxString& title, const wxPoint&  pos, const wxSize&   size ) :
-    EDA_BASE_FRAME( parent, KICAD_MAIN_FRAME_T, title, pos, size,
-                    KICAD_DEFAULT_DRAWFRAME_STYLE, KICAD_MANAGER_FRAME_NAME, &::Kiway )
+KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& title, 
+                                          const wxPoint& pos, const wxSize&   size ) :
+        EDA_BASE_FRAME( parent, KICAD_MAIN_FRAME_T, title, pos, size,
+                        KICAD_DEFAULT_DRAWFRAME_STYLE, KICAD_MANAGER_FRAME_NAME, &::Kiway )
 {
     m_active_project = false;
     m_mainToolBar = nullptr;

kicad/menubar.cpp

@@ -33,7 +33,7 @@
 #include <hotkeys_basic.h>
 #include <menus_helpers.h>
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 #include "pgm_kicad.h"
 #include "kicad_id.h"
 

kicad/prjconfig.cpp

@@ -42,7 +42,7 @@
 
 #include "dialogs/dialog_template_selector.h"
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 #include "pgm_kicad.h"
 #include "tree_project_frame.h"
 #include "kicad_id.h"

kicad/tree_project_frame.h

@@ -34,7 +34,7 @@
 #include <wx/laywin.h>
 #include <wx/treebase.h>
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 
 class KICAD_MANAGER_FRAME;

kicad/treeproject_item.h

@@ -28,7 +28,7 @@
 
 #include <wx/treebase.h>
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 
 /**

kicad/treeprojectfiles.h

@@ -32,7 +32,7 @@
 
 #include <wx/treectrl.h>
 
-#include "kicad.h"
+#include "kicad_manager_frame.h"
 
 
 /** Class TREEPROJECTFILES

pcbnew/exporters/export_vrml.cpp

@@ -47,7 +47,7 @@
 #include "streamwrapper.h"
 #include "vrml_layer.h"
 #include "pcb_edit_frame.h"
-#include "../../kicad/kicad.h"
+#include "kicad/kicad_manager_frame.h"
 
 #include <convert_basic_shapes_to_polygon.h>
 #include <geometry/geometry_utils.h>