Move headers from common folders to appropriate include folders round 1.

common/dialogs/dialog_locked_items_query.cpp

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <dialog_locked_items_query.h>
+#include <dialogs/dialog_locked_items_query.h>
 #include <bitmaps.h>
 
 DIALOG_LOCKED_ITEMS_QUERY::DIALOG_LOCKED_ITEMS_QUERY( wxWindow* aParent, int aLockedItemCount ) :

common/dialogs/dialog_page_settings.cpp

@@ -24,7 +24,7 @@
 #include <base_screen.h>
 #include <confirm.h>
 #include <core/arraydim.h>
-#include <dialog_page_settings.h>
+#include <dialogs/dialog_page_settings.h>
 #include <eda_draw_frame.h>
 #include <eda_item.h>
 #include <gr_basic.h>

common/dialogs/dialog_print_generic.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2018 CERN
+ * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
  * Author: Maciej Suminski <maciej.suminski@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -16,7 +17,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dialog_print_generic.h"
+#include <dialogs/dialog_print_generic.h>
 
 #include <confirm.h>
 #include <eda_draw_frame.h>
@@ -27,6 +28,7 @@
 static constexpr double MIN_SCALE = 0.01;
 static constexpr double MAX_SCALE = 100.0;
 
+
 DIALOG_PRINT_GENERIC::DIALOG_PRINT_GENERIC( EDA_DRAW_FRAME* aParent, PRINTOUT_SETTINGS* aSettings )
     : DIALOG_PRINT_GENERIC_BASE( aParent ),
       m_config( nullptr ),
@@ -246,6 +248,7 @@ void DIALOG_PRINT_GENERIC::onPrintButtonClick( wxCommandEvent& event )
     auto printout = std::unique_ptr<wxPrintout>( createPrintout( _( "Print" ) ) );
 
     Pgm().m_Printing = true;
+
     {
         if( !printer.Print( this, printout.get(), true ) )
         {
@@ -257,6 +260,7 @@ void DIALOG_PRINT_GENERIC::onPrintButtonClick( wxCommandEvent& event )
             *s_PrintData = printer.GetPrintDialogData().GetPrintData();
         }
     }
+
     Pgm().m_Printing = false;
 }
 
@@ -314,10 +318,10 @@ void DIALOG_PRINT_GENERIC::initPrintData()
         {
             if( pageInfo.IsPortrait() )
                 s_pageSetupData->SetPaperSize( wxSize( Mils2mm( pageInfo.GetWidthMils() ),
-                                                    Mils2mm( pageInfo.GetHeightMils() ) ) );
+                                                       Mils2mm( pageInfo.GetHeightMils() ) ) );
             else
                 s_pageSetupData->SetPaperSize( wxSize( Mils2mm( pageInfo.GetHeightMils() ),
-                                                    Mils2mm( pageInfo.GetWidthMils() ) ) );
+                                                       Mils2mm( pageInfo.GetWidthMils() ) ) );
         }
 
         *s_PrintData = s_pageSetupData->GetPrintData();

common/dialogs/dialog_text_entry.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2020 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
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <dialog_text_entry.h>
+#include <dialogs/dialog_text_entry.h>
 
 
 WX_TEXT_ENTRY_DIALOG::WX_TEXT_ENTRY_DIALOG( wxWindow* aParent,

common/dialogs/panel_gal_display_options.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2020 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
@@ -22,10 +22,11 @@
 #include <widgets/gal_options_panel.h>
 #include <widgets/paged_dialog.h>
 
-#include <panel_gal_display_options.h>
+#include <dialogs/panel_gal_display_options.h>
 
 
-PANEL_GAL_DISPLAY_OPTIONS::PANEL_GAL_DISPLAY_OPTIONS( EDA_DRAW_FRAME* aFrame, PAGED_DIALOG* aParent ) :
+PANEL_GAL_DISPLAY_OPTIONS::PANEL_GAL_DISPLAY_OPTIONS( EDA_DRAW_FRAME* aFrame,
+                                                      PAGED_DIALOG* aParent ) :
     wxPanel( aParent->GetTreebook(), wxID_ANY ),
     m_frame( aFrame )
 {

common/dialogs/panel_setup_severities.cpp

@@ -24,7 +24,7 @@
 #include <widgets/paged_dialog.h>
 #include <widgets/ui_common.h>
 #include <rc_item.h>
-#include "panel_setup_severities.h"
+#include <dialogs/panel_setup_severities.h>
 #include <wx/radiobut.h>
 
 

common/widgets/grid_color_swatch_helpers.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2020 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
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <grid_color_swatch_helpers.h>
+#include <widgets/grid_color_swatch_helpers.h>
 
 #include <settings/color_settings.h>
 #include <dialogs/dialog_color_picker.h>

common/widgets/lib_tree.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2020 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
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "lib_tree.h"
+#include <widgets/lib_tree.h>
 #include <macros.h>
 #include <wxdataviewctrl_helpers.h>
 #include <wx/artprov.h>

common/widgets/wx_grid.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2020 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
@@ -24,7 +24,7 @@
 #include <wx/tokenzr.h>
 #include <wx/dc.h>
 #include <wx/wx.h>
-#include "wx_grid.h"
+#include <widgets/wx_grid.h>
 
 #include <algorithm>
 
@@ -73,6 +73,7 @@ void WX_GRID::SetTable( wxGridTableBase* aTable, bool aTakeOwnership )
         formBuilderColWidths[ i ] = GetColSize( i );
 
     wxGrid::SetTable( aTable );
+
     // wxGrid::SetTable() may change the number of columns, so prevent out-of-bounds access
     // to formBuilderColWidths
     numberCols = std::min( numberCols, GetNumberCols() );
@@ -116,6 +117,7 @@ wxString WX_GRID::GetShownColumns()
         {
             if( shownColumns.Length() )
                 shownColumns << wxT( " " );
+
             shownColumns << i;
         }
     }
@@ -242,7 +244,8 @@ int WX_GRID::GetVisibleWidth( int aCol, bool aHeader, bool aContents, bool aKeep
         if( aKeep )
             size = GetRowLabelSize();
 
-        // The 1.1 scale factor is due to the fact row labels use a bold font, bigger than the normal font
+        // The 1.1 scale factor is due to the fact row labels use a bold font, bigger than
+        // the normal font.
         // TODO: use a better way to evaluate the text size, for bold font
         for( int row = 0; aContents && row < GetNumberRows(); row++ )
             size = std::max( size, int( GetTextExtent( GetRowLabelValue( row ) + "M" ).x * 1.1 ) );
@@ -252,12 +255,14 @@ int WX_GRID::GetVisibleWidth( int aCol, bool aHeader, bool aContents, bool aKeep
         if( aKeep )
             size = GetColSize( aCol );
 
-        // 'M' is generally the widest character, so we buffer the column width by default to ensure
-        // we don't write a continuous line of text at the column header
+        // 'M' is generally the widest character, so we buffer the column width by default to
+        // ensure we don't write a continuous line of text at the column header
         if( aHeader )
         {
             EnsureColLabelsVisible();
-            // The 1.1 scale factor is due to the fact headers use a bold font, bigger than the normal font
+
+            // The 1.1 scale factor is due to the fact headers use a bold font, bigger than
+            // the normal font.
             size = std::max( size, int( GetTextExtent( GetColLabelValue( aCol ) + "M" ).x * 1.1 ) );
         }
 

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -24,7 +24,7 @@
 #include <bitmaps.h>
 #include <class_libentry.h>
 #include <confirm.h>
-#include <dialog_text_entry.h>
+#include <dialogs/dialog_text_entry.h>
 #include <kiway.h>
 #include <symbol_edit_frame.h>
 #include <symbol_library_manager.h>

eeschema/dialogs/dialog_schematic_setup.cpp

@@ -23,7 +23,7 @@
 #include <kiface_i.h>
 #include <dialog_sch_import_settings.h>
 #include <dialogs/panel_setup_netclasses.h>
-#include <panel_setup_severities.h>
+#include <dialogs/panel_setup_severities.h>
 #include <panel_setup_formatting.h>
 #include <panel_setup_pinmap.h>
 #include <erc_item.h>

eeschema/eeschema_config.cpp

@@ -32,7 +32,7 @@
 #include <dialogs/dialog_schematic_setup.h>
 #include <kiway.h>
 #include <symbol_edit_frame.h>
-#include <panel_gal_display_options.h>
+#include <dialogs/panel_gal_display_options.h>
 #include <panel_hotkeys_editor.h>
 #include <pgm_base.h>
 #include <project/project_file.h>

gerbview/dialogs/dialog_print_gerbview.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010-2016 Jean-Pierre Charras  jp.charras at wanadoo.fr
- * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2018 CERN
  * Author: Maciej Suminski <maciej.suminski@cern.ch>
  *

include/dialogs/dialog_print_generic.h

@@ -19,7 +19,7 @@
 #ifndef DIALOG_PRINT_GENERIC_H
 #define DIALOG_PRINT_GENERIC_H
 
-#include "dialog_print_generic_base.h"
+#include <dialogs/dialog_print_generic_base.h>
 #include <wx/valnum.h>
 #include <widgets/unit_binder.h>