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

2020-12-17 11:43:46 -05:00 · 2020-12-17 11:43:46 -05:00 · aab3c936f0
parent e4b60b03d1
commit aab3c936f0
29 changed files with 43 additions and 34 deletions
--- a/3d-viewer/3d_viewer/eda_3d_viewer.h
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.h
@ -37,7 +37,7 @@
 #include "3d_rendering/ctrack_ball.h"
 #include <kiway_player.h>
 #include <wx/colourdata.h>
-#include <../common/dialogs/dialog_color_picker.h>  // for CUSTOM_COLORS_LIST definition
+#include <dialogs/dialog_color_picker.h>  // for CUSTOM_COLORS_LIST definition


 /// A variable name whose value holds the path of 3D shape files.
--- a/common/dialogs/dialog_color_picker.cpp
+++ b/common/dialogs/dialog_color_picker.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 as published by the
@ -18,7 +18,7 @@
 */


-#include "dialog_color_picker.h"
+#include <dialogs/dialog_color_picker.h>
 #include <cmath>
 #include <algorithm>
 #include <kiface_i.h>
--- a/common/dialogs/dialog_global_lib_table_config.cpp
+++ b/common/dialogs/dialog_global_lib_table_config.cpp
@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2019 Wayne Stambaugh <stambaughw@gmail.com>
- * 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
@ -18,7 +18,7 @@
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "dialog_global_lib_table_config.h"
+#include <dialogs/dialog_global_lib_table_config.h>

 #include <pgm_base.h>
 #include <search_stack.h>
@ -67,7 +67,9 @@ DIALOG_GLOBAL_LIB_TABLE_CONFIG::DIALOG_GLOBAL_LIB_TABLE_CONFIG( wxWindow* aParen
    tmp.Printf( _( "Select global %s library table file:" ), aTableName );
    m_staticText2->SetLabel( tmp );

-    m_filePicker1->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_LIB_TABLE_CONFIG::onUpdateFilePicker ), NULL, this );
+    m_filePicker1->Connect( wxEVT_UPDATE_UI,
+                            wxUpdateUIEventHandler( DIALOG_GLOBAL_LIB_TABLE_CONFIG::onUpdateFilePicker ),
+                            NULL, this );

    wxButton* okButton = (wxButton *) FindWindowById( wxID_OK );

@ -80,7 +82,9 @@ DIALOG_GLOBAL_LIB_TABLE_CONFIG::DIALOG_GLOBAL_LIB_TABLE_CONFIG( wxWindow* aParen

 DIALOG_GLOBAL_LIB_TABLE_CONFIG::~DIALOG_GLOBAL_LIB_TABLE_CONFIG()
 {
-    m_filePicker1->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_LIB_TABLE_CONFIG::onUpdateFilePicker ), NULL, this );
+    m_filePicker1->Disconnect( wxEVT_UPDATE_UI,
+                               wxUpdateUIEventHandler( DIALOG_GLOBAL_LIB_TABLE_CONFIG::onUpdateFilePicker ),
+                               NULL, this );
 }


--- a/common/dialogs/dialog_grid_settings.cpp
+++ b/common/dialogs/dialog_grid_settings.cpp
@ -21,7 +21,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <dialog_grid_settings.h>
+#include <dialogs/dialog_grid_settings.h>
 #include <base_units.h>
 #include <common.h>
 #include <settings/app_settings.h>
--- a/common/dialogs/dialog_hotkey_list.cpp
+++ b/common/dialogs/dialog_hotkey_list.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_hotkey_list.h>
+#include <dialogs/dialog_hotkey_list.h>

 #include <panel_hotkeys_editor.h>
 #include <widgets/ui_common.h>
--- a/common/dialogs/dialog_image_editor.cpp
+++ b/common/dialogs/dialog_image_editor.cpp
@ -2,7 +2,7 @@
 * This program source code file is part of KICAD, a free EDA CAD application.
 *
 * Copyright (C) 2018 jean-pierre.charras
- * Copyright (C) 2011-2019 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2011-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
@ -26,7 +26,7 @@
 #include <confirm.h>
 #include <bitmap_base.h>

-#include <dialog_image_editor.h>
+#include <dialogs/dialog_image_editor.h>

 #include <algorithm>

--- a/common/dialogs/dialog_unit_entry.cpp
+++ b/common/dialogs/dialog_unit_entry.cpp
@ -22,7 +22,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include "dialog_unit_entry.h"
+#include <dialogs/dialog_unit_entry.h>


 WX_UNIT_ENTRY_DIALOG::WX_UNIT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aLabel,
--- a/common/dialogs/eda_view_switcher.cpp
+++ b/common/dialogs/eda_view_switcher.cpp
@ -21,7 +21,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <eda_view_switcher.h>
+#include <dialogs/eda_view_switcher.h>


 #ifdef __WXGTK__
--- a/common/dialogs/panel_color_settings.cpp
+++ b/common/dialogs/panel_color_settings.cpp
@ -23,7 +23,7 @@
 #include <launch_ext.h>
 #include <layers_id_colors_and_visibility.h>
 #include <menus_helpers.h>
-#include <panel_color_settings.h>
+#include <dialogs/panel_color_settings.h>
 #include <pgm_base.h>
 #include <settings/color_settings.h>
 #include <settings/common_settings.h>
--- a/common/dialogs/panel_common_settings.cpp
+++ b/common/dialogs/panel_common_settings.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 "panel_common_settings.h"
+#include <dialogs/panel_common_settings.h>

 #include <bitmap_types.h>
 #include <bitmaps.h>
@ -75,13 +75,17 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aP
    m_textEditorBtn->SetBitmap( KiBitmap( folder_xpm ) );
    m_pdfViewerBtn->SetBitmap( KiBitmap( folder_xpm ) );

-    m_canvasScaleCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_COMMON_SETTINGS::OnCanvasScaleChange ), NULL, this );
+    m_canvasScaleCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED,
+                                wxCommandEventHandler( PANEL_COMMON_SETTINGS::OnCanvasScaleChange ),
+                                NULL, this );
 }


 PANEL_COMMON_SETTINGS::~PANEL_COMMON_SETTINGS()
 {
-    m_canvasScaleCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_COMMON_SETTINGS::OnCanvasScaleChange ), NULL, this );
+    m_canvasScaleCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED,
+                                   wxCommandEventHandler( PANEL_COMMON_SETTINGS::OnCanvasScaleChange ),
+                                   NULL, this );
 }


--- a/common/dialogs/panel_setup_netclasses.cpp
+++ b/common/dialogs/panel_setup_netclasses.cpp
@ -28,7 +28,7 @@
 #include <netclass.h>
 #include <confirm.h>
 #include <grid_tricks.h>
-#include <panel_setup_netclasses.h>
+#include <dialogs/panel_setup_netclasses.h>
 #include <tool/tool_manager.h>
 #include <widgets/grid_combobox.h>
 #include <widgets/wx_grid.h>
--- a/common/widgets/color_swatch.cpp
+++ b/common/widgets/color_swatch.cpp
@ -24,7 +24,7 @@
 #include <widgets/color_swatch.h>
 #include <wx/dcmemory.h>

-#include "dialog_color_picker.h"
+#include <dialogs/dialog_color_picker.h>
 #include <memory>

 wxDEFINE_EVENT( COLOR_SWATCH_CHANGED, wxCommandEvent );
--- a/eeschema/dialogs/dialog_global_sym_lib_table_config.h
+++ b/eeschema/dialogs/dialog_global_sym_lib_table_config.h
@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2017 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-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
@ -21,7 +21,7 @@
 #ifndef _DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG_H_
 #define _DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG_H_

-#include "dialog_global_lib_table_config.h"
+#include <dialogs/dialog_global_lib_table_config.h>


 class DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG : public DIALOG_GLOBAL_LIB_TABLE_CONFIG
--- a/eeschema/dialogs/panel_eeschema_color_settings.h
+++ b/eeschema/dialogs/panel_eeschema_color_settings.h
@ -1,3 +1,4 @@
+
 /*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
@ -24,7 +25,7 @@
 #include <gal/color4d.h>
 #include <gal/gal_display_options.h>
 #include <layers_id_colors_and_visibility.h>
-#include <panel_color_settings.h>
+#include <dialogs/panel_color_settings.h>

 class COLOR_SETTINGS;
 class SCH_BASE_FRAME;
--- a/include/dialogs/dialog_color_picker.h
+++ b/include/dialogs/dialog_color_picker.h
@ -5,7 +5,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 as published by the
@ -26,13 +26,13 @@


 #include <gal/color4d.h>
-#include "dialog_color_picker_base.h"
+#include "../../common/dialogs/dialog_color_picker_base.h"

 class COLOR_SWATCH;


-/** a class to handle a custom color (predefined color) for
- * the color picker dialog
+/**
+ * A class to handle a custom color (predefined color) for the color picker dialog.
 */
 struct CUSTOM_COLOR_ITEM
 {
--- a/include/dialogs/dialog_global_lib_table_config.h
+++ b/include/dialogs/dialog_global_lib_table_config.h
--- a/include/dialogs/dialog_grid_settings.h
+++ b/include/dialogs/dialog_grid_settings.h
--- a/include/dialogs/dialog_hotkey_list.h
+++ b/include/dialogs/dialog_hotkey_list.h
--- a/include/dialogs/dialog_image_editor.h
+++ b/include/dialogs/dialog_image_editor.h
--- a/include/dialogs/dialog_migrate_settings.h
+++ b/include/dialogs/dialog_migrate_settings.h
--- a/include/dialogs/dialog_unit_entry.h
+++ b/include/dialogs/dialog_unit_entry.h
--- a/include/dialogs/eda_view_switcher.h
+++ b/include/dialogs/eda_view_switcher.h
--- a/include/dialogs/panel_color_settings.h
+++ b/include/dialogs/panel_color_settings.h
--- a/include/dialogs/panel_common_settings.h
+++ b/include/dialogs/panel_common_settings.h
--- a/include/dialogs/panel_setup_netclasses.h
+++ b/include/dialogs/panel_setup_netclasses.h
--- a/pcbnew/dialogs/dialog_board_setup.cpp
+++ b/pcbnew/dialogs/dialog_board_setup.cpp
@ -20,7 +20,7 @@
 #include <panel_setup_layers.h>
 #include <panel_setup_text_and_graphics.h>
 #include <panel_setup_feature_constraints.h>
-#include <panel_setup_netclasses.h>
+#include <dialogs/panel_setup_netclasses.h>
 #include <panel_setup_tracks_and_vias.h>
 #include <panel_setup_mask_and_paste.h>
 #include <../board_stackup_manager/panel_board_stackup.h>
--- a/pcbnew/dialogs/dialog_global_fp_lib_table_config.h
+++ b/pcbnew/dialogs/dialog_global_fp_lib_table_config.h
@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2019 Wayne Stambaugh <stambaughw@gmail.com>
- * 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
@ -21,7 +21,7 @@
 #ifndef _DIALOG_GLOBAL_FP_LIB_TABLE_CONFIG_H_
 #define _DIALOG_GLOBAL_FP_LIB_TABLE_CONFIG_H_

-#include "dialog_global_lib_table_config.h"
+#include <dialogs/dialog_global_lib_table_config.h>


 class DIALOG_GLOBAL_FP_LIB_TABLE_CONFIG : public DIALOG_GLOBAL_LIB_TABLE_CONFIG
--- a/pcbnew/dialogs/panel_fp_editor_color_settings.h
+++ b/pcbnew/dialogs/panel_fp_editor_color_settings.h
@ -23,7 +23,7 @@

 #include <gal/color4d.h>
 #include <layers_id_colors_and_visibility.h>
-#include <panel_color_settings.h>
+#include <dialogs/panel_color_settings.h>

 class COLOR_SETTINGS;
 class PAGE_INFO;
--- a/pcbnew/dialogs/panel_pcbnew_color_settings.h
+++ b/pcbnew/dialogs/panel_pcbnew_color_settings.h
@ -23,7 +23,7 @@

 #include <gal/color4d.h>
 #include <layers_id_colors_and_visibility.h>
-#include <panel_color_settings.h>
+#include <dialogs/panel_color_settings.h>

 class COLOR_SETTINGS;
 class PAGE_INFO;