From aab3c936f072c0bdbc9b20f27770715298e5f6a4 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 17 Dec 2020 11:43:46 -0500 Subject: [PATCH] Move headers from common folders to appropriate include folders round 2. --- 3d-viewer/3d_viewer/eda_3d_viewer.h | 2 +- common/dialogs/dialog_color_picker.cpp | 4 ++-- common/dialogs/dialog_global_lib_table_config.cpp | 12 ++++++++---- common/dialogs/dialog_grid_settings.cpp | 2 +- common/dialogs/dialog_hotkey_list.cpp | 4 ++-- common/dialogs/dialog_image_editor.cpp | 4 ++-- common/dialogs/dialog_unit_entry.cpp | 2 +- common/dialogs/eda_view_switcher.cpp | 2 +- common/dialogs/panel_color_settings.cpp | 2 +- common/dialogs/panel_common_settings.cpp | 12 ++++++++---- common/dialogs/panel_setup_netclasses.cpp | 2 +- common/widgets/color_swatch.cpp | 4 ++-- .../dialogs/dialog_global_sym_lib_table_config.h | 4 ++-- eeschema/dialogs/panel_eeschema_color_settings.h | 3 ++- {common => include}/dialogs/dialog_color_picker.h | 8 ++++---- .../dialogs/dialog_global_lib_table_config.h | 0 {common => include}/dialogs/dialog_grid_settings.h | 0 {common => include}/dialogs/dialog_hotkey_list.h | 0 {common => include}/dialogs/dialog_image_editor.h | 0 .../dialogs/dialog_migrate_settings.h | 0 {common => include}/dialogs/dialog_unit_entry.h | 0 {common => include}/dialogs/eda_view_switcher.h | 0 {common => include}/dialogs/panel_color_settings.h | 0 {common => include}/dialogs/panel_common_settings.h | 0 {common => include}/dialogs/panel_setup_netclasses.h | 0 pcbnew/dialogs/dialog_board_setup.cpp | 2 +- pcbnew/dialogs/dialog_global_fp_lib_table_config.h | 4 ++-- pcbnew/dialogs/panel_fp_editor_color_settings.h | 2 +- pcbnew/dialogs/panel_pcbnew_color_settings.h | 2 +- 29 files changed, 43 insertions(+), 34 deletions(-) rename {common => include}/dialogs/dialog_color_picker.h (96%) rename {common => include}/dialogs/dialog_global_lib_table_config.h (100%) rename {common => include}/dialogs/dialog_grid_settings.h (100%) rename {common => include}/dialogs/dialog_hotkey_list.h (100%) rename {common => include}/dialogs/dialog_image_editor.h (100%) rename {common => include}/dialogs/dialog_migrate_settings.h (100%) rename {common => include}/dialogs/dialog_unit_entry.h (100%) rename {common => include}/dialogs/eda_view_switcher.h (100%) rename {common => include}/dialogs/panel_color_settings.h (100%) rename {common => include}/dialogs/panel_common_settings.h (100%) rename {common => include}/dialogs/panel_setup_netclasses.h (100%) diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.h b/3d-viewer/3d_viewer/eda_3d_viewer.h index 5b459c605e..a963a866dc 100644 --- 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 #include -#include <../common/dialogs/dialog_color_picker.h> // for CUSTOM_COLORS_LIST definition +#include // for CUSTOM_COLORS_LIST definition /// A variable name whose value holds the path of 3D shape files. diff --git a/common/dialogs/dialog_color_picker.cpp b/common/dialogs/dialog_color_picker.cpp index 0c6d6b9e1f..ea6d567ce0 100644 --- 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 #include #include #include diff --git a/common/dialogs/dialog_global_lib_table_config.cpp b/common/dialogs/dialog_global_lib_table_config.cpp index 00aed32224..709199b050 100644 --- 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 - * 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 . */ -#include "dialog_global_lib_table_config.h" +#include #include #include @@ -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 ); } diff --git a/common/dialogs/dialog_grid_settings.cpp b/common/dialogs/dialog_grid_settings.cpp index cf85d30a51..618fc8d9b5 100644 --- 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 +#include #include #include #include diff --git a/common/dialogs/dialog_hotkey_list.cpp b/common/dialogs/dialog_hotkey_list.cpp index b709568d93..ffa3853eb7 100644 --- 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 +#include #include #include diff --git a/common/dialogs/dialog_image_editor.cpp b/common/dialogs/dialog_image_editor.cpp index 2cc3844685..5ab2e5f276 100644 --- 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 #include -#include +#include #include diff --git a/common/dialogs/dialog_unit_entry.cpp b/common/dialogs/dialog_unit_entry.cpp index f139abbb62..76bc7b9d5f 100644 --- 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 WX_UNIT_ENTRY_DIALOG::WX_UNIT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aLabel, diff --git a/common/dialogs/eda_view_switcher.cpp b/common/dialogs/eda_view_switcher.cpp index 255dd50bd6..dba274c22e 100644 --- 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 +#include #ifdef __WXGTK__ diff --git a/common/dialogs/panel_color_settings.cpp b/common/dialogs/panel_color_settings.cpp index 25b63fe720..f80838c2f9 100644 --- a/common/dialogs/panel_color_settings.cpp +++ b/common/dialogs/panel_color_settings.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp index ce5349dcaf..c177acf0e7 100644 --- 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 #include #include @@ -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 ); } diff --git a/common/dialogs/panel_setup_netclasses.cpp b/common/dialogs/panel_setup_netclasses.cpp index 9f973c13fa..7a41097272 100644 --- a/common/dialogs/panel_setup_netclasses.cpp +++ b/common/dialogs/panel_setup_netclasses.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/common/widgets/color_swatch.cpp b/common/widgets/color_swatch.cpp index e626882b7a..0f2a93f197 100644 --- a/common/widgets/color_swatch.cpp +++ b/common/widgets/color_swatch.cpp @@ -24,10 +24,10 @@ #include #include -#include "dialog_color_picker.h" +#include #include -wxDEFINE_EVENT(COLOR_SWATCH_CHANGED, wxCommandEvent); +wxDEFINE_EVENT( COLOR_SWATCH_CHANGED, wxCommandEvent ); using KIGFX::COLOR4D; diff --git a/eeschema/dialogs/dialog_global_sym_lib_table_config.h b/eeschema/dialogs/dialog_global_sym_lib_table_config.h index 86aeec0f24..3f7cea1e7a 100644 --- 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 - * 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 class DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG : public DIALOG_GLOBAL_LIB_TABLE_CONFIG diff --git a/eeschema/dialogs/panel_eeschema_color_settings.h b/eeschema/dialogs/panel_eeschema_color_settings.h index 3957deebfa..a621107525 100644 --- 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 #include #include -#include +#include class COLOR_SETTINGS; class SCH_BASE_FRAME; diff --git a/common/dialogs/dialog_color_picker.h b/include/dialogs/dialog_color_picker.h similarity index 96% rename from common/dialogs/dialog_color_picker.h rename to include/dialogs/dialog_color_picker.h index 3a6b836027..c4757a1326 100644 --- a/common/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 -#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 { diff --git a/common/dialogs/dialog_global_lib_table_config.h b/include/dialogs/dialog_global_lib_table_config.h similarity index 100% rename from common/dialogs/dialog_global_lib_table_config.h rename to include/dialogs/dialog_global_lib_table_config.h diff --git a/common/dialogs/dialog_grid_settings.h b/include/dialogs/dialog_grid_settings.h similarity index 100% rename from common/dialogs/dialog_grid_settings.h rename to include/dialogs/dialog_grid_settings.h diff --git a/common/dialogs/dialog_hotkey_list.h b/include/dialogs/dialog_hotkey_list.h similarity index 100% rename from common/dialogs/dialog_hotkey_list.h rename to include/dialogs/dialog_hotkey_list.h diff --git a/common/dialogs/dialog_image_editor.h b/include/dialogs/dialog_image_editor.h similarity index 100% rename from common/dialogs/dialog_image_editor.h rename to include/dialogs/dialog_image_editor.h diff --git a/common/dialogs/dialog_migrate_settings.h b/include/dialogs/dialog_migrate_settings.h similarity index 100% rename from common/dialogs/dialog_migrate_settings.h rename to include/dialogs/dialog_migrate_settings.h diff --git a/common/dialogs/dialog_unit_entry.h b/include/dialogs/dialog_unit_entry.h similarity index 100% rename from common/dialogs/dialog_unit_entry.h rename to include/dialogs/dialog_unit_entry.h diff --git a/common/dialogs/eda_view_switcher.h b/include/dialogs/eda_view_switcher.h similarity index 100% rename from common/dialogs/eda_view_switcher.h rename to include/dialogs/eda_view_switcher.h diff --git a/common/dialogs/panel_color_settings.h b/include/dialogs/panel_color_settings.h similarity index 100% rename from common/dialogs/panel_color_settings.h rename to include/dialogs/panel_color_settings.h diff --git a/common/dialogs/panel_common_settings.h b/include/dialogs/panel_common_settings.h similarity index 100% rename from common/dialogs/panel_common_settings.h rename to include/dialogs/panel_common_settings.h diff --git a/common/dialogs/panel_setup_netclasses.h b/include/dialogs/panel_setup_netclasses.h similarity index 100% rename from common/dialogs/panel_setup_netclasses.h rename to include/dialogs/panel_setup_netclasses.h diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp index 6383adf130..c7f7149649 100644 --- a/pcbnew/dialogs/dialog_board_setup.cpp +++ b/pcbnew/dialogs/dialog_board_setup.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include <../board_stackup_manager/panel_board_stackup.h> diff --git a/pcbnew/dialogs/dialog_global_fp_lib_table_config.h b/pcbnew/dialogs/dialog_global_fp_lib_table_config.h index 1f749b5da9..056097b6a7 100644 --- 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 - * 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 class DIALOG_GLOBAL_FP_LIB_TABLE_CONFIG : public DIALOG_GLOBAL_LIB_TABLE_CONFIG diff --git a/pcbnew/dialogs/panel_fp_editor_color_settings.h b/pcbnew/dialogs/panel_fp_editor_color_settings.h index b7eb89f0d4..db7707fef8 100644 --- a/pcbnew/dialogs/panel_fp_editor_color_settings.h +++ b/pcbnew/dialogs/panel_fp_editor_color_settings.h @@ -23,7 +23,7 @@ #include #include -#include +#include class COLOR_SETTINGS; class PAGE_INFO; diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.h b/pcbnew/dialogs/panel_pcbnew_color_settings.h index 15dc94c7b9..45096d15a2 100644 --- a/pcbnew/dialogs/panel_pcbnew_color_settings.h +++ b/pcbnew/dialogs/panel_pcbnew_color_settings.h @@ -23,7 +23,7 @@ #include #include -#include +#include class COLOR_SETTINGS; class PAGE_INFO;