File naming and include cleanup.

2021-01-27 23:06:43 +00:00 · 2021-01-27 23:06:43 +00:00 · ff7742c6b8
parent 902d9e0781
commit ff7742c6b8
43 changed files with 11 additions and 66 deletions
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@ -162,7 +162,7 @@ set( EESCHEMA_SRCS
    autoplace_fields.cpp
    bus_alias.cpp
    bus-wire-junction.cpp
-    class_libentry.cpp
+    lib_part.cpp
    class_library.cpp
    cmp_library_lexer.cpp
    component_references_lister.cpp
--- a/eeschema/dialogs/dialog_choose_symbol.cpp
+++ b/eeschema/dialogs/dialog_choose_symbol.cpp
@ -23,7 +23,6 @@
 */

 #include <algorithm>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <dialog_choose_symbol.h>
 #include <eeschema_settings.h>
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@ -30,7 +30,6 @@
 #include <sch_edit_frame.h>
 #include <ee_collectors.h>
 #include <sch_component.h>
-#include <class_libentry.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
 #include <class_library.h>
--- a/eeschema/dialogs/dialog_edit_one_field.h
+++ b/eeschema/dialogs/dialog_edit_one_field.h
@ -30,7 +30,6 @@
 #include <dialog_lib_edit_text_base.h>
 #include <widgets/unit_binder.h>
 #include <lib_field.h>
-#include <class_libentry.h>
 #include <template_fieldnames.h>

 class SCH_BASE_FRAME;
--- a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
@ -26,7 +26,6 @@
 */

 #include <lib_item.h>
-#include <class_libentry.h>
 #include <dialog_lib_edit_draw_item.h>
 #include <symbol_edit_frame.h>

--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@ -22,7 +22,6 @@
 */

 #include <bitmaps.h>
-#include <class_libentry.h>
 #include <confirm.h>
 #include <dialogs/dialog_text_entry.h>
 #include <kiway.h>
--- a/eeschema/dialogs/dialog_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_pin_properties.cpp
@ -25,7 +25,6 @@
 #include <bitmaps.h>
 #include <sch_painter.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <dialog_pin_properties.h>
 #include <confirm.h>
--- a/eeschema/dialogs/dialog_rescue_each.cpp
+++ b/eeschema/dialogs/dialog_rescue_each.cpp
@ -22,7 +22,6 @@
 */

 #include <class_draw_panel_gal.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <dialog_rescue_each_base.h>
 #include <eeschema_settings.h>
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@ -24,7 +24,6 @@
 #include <eeschema_settings.h>
 #include <gal/gal_display_options.h>
 #include <layers_id_colors_and_visibility.h>
-#include <class_libentry.h>
 #include <lib_polyline.h>
 #include <page_info.h>
 #include <panel_eeschema_color_settings.h>
--- a/eeschema/dialogs/panel_eeschema_display_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_display_options.cpp
@ -24,7 +24,6 @@

 #include <sch_edit_frame.h>
 #include <sch_painter.h>
-#include <class_libentry.h>
 #include <panel_eeschema_display_options.h>
 #include <widgets/gal_options_panel.h>
 #include <sch_junction.h>
--- a/eeschema/dialogs/panel_setup_formatting.cpp
+++ b/eeschema/dialogs/panel_setup_formatting.cpp
@ -23,7 +23,6 @@

 #include <sch_edit_frame.h>
 #include <sch_painter.h>
-#include <class_libentry.h>
 #include <eeschema_settings.h>
 #include <kiface_i.h>
 #include <panel_setup_formatting.h>
--- a/eeschema/ee_collectors.h
+++ b/eeschema/ee_collectors.h
@ -26,7 +26,7 @@
 #ifndef EE_COLLECTORS_H
 #define EE_COLLECTORS_H

-#include <class_libentry.h>
+#include <lib_part.h>
 #include <collector.h>
 #include <dialogs/dialog_schematic_find.h>
 #include <sch_item.h>
--- a/eeschema/generate_alias_info.cpp
+++ b/eeschema/generate_alias_info.cpp
@ -21,7 +21,7 @@
 #include <generate_alias_info.h>
 #include <kicad_string.h>
 #include <template_fieldnames.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <symbol_lib_table.h>


--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@ -23,7 +23,6 @@
 */

 #include <pgm_base.h>
-#include <common.h>
 #include <eda_item.h>
 #include <gr_text.h>
 #include <kicad_string.h>
@ -35,7 +34,7 @@
 #include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <general.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <transform.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@ -23,17 +23,14 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <kicad_string.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <sch_screen.h>
 #include <richio.h>
-#include <trace_helpers.h>
 #include <general.h>
 #include <template_fieldnames.h>
 #include <transform.h>
 #include <class_library.h>
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <lib_arc.h>
 #include <settings/color_settings.h>
--- a/eeschema/class_libentry.h
+++ b/eeschema/class_libentry.h
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@ -26,11 +26,7 @@
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
-#include <base_units.h>
-#include <widgets/msgpanel.h>
-#include <general.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <settings/settings_manager.h>
 #include <symbol_editor/symbol_editor_settings.h>
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@ -32,7 +32,7 @@ class SCH_COMPONENT;
 #include <eda_rect.h>
 #include <lib_item.h>
 #include <pin_type.h>
-#include <class_libentry.h>
+#include <lib_part.h>

 // Circle diameter drawn at the active end of pins:
 #define TARGET_PIN_RADIUS   Mils2iu( 15 )
--- a/eeschema/netlist_exporters/netlist_exporter_base.h
+++ b/eeschema/netlist_exporters/netlist_exporter_base.h
@ -26,7 +26,6 @@
 #ifndef NETLIST_EXPORTER_H
 #define NETLIST_EXPORTER_H

-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <sch_component.h>
 #include <sch_text.h>
--- a/eeschema/project_rescue.h
+++ b/eeschema/project_rescue.h
@ -42,7 +42,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>

 #include <properties.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <class_draw_panel_gal.h>

--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@ -28,7 +28,6 @@
 #include <sch_item.h>

 #include <bezier_curves.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <connection_graph.h>
 #include <gal/graphics_abstraction_layer.h>
--- a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@ -24,7 +24,6 @@

 #include <sch_plugins/eagle/sch_eagle_plugin.h>

-#include <kiway.h>
 #include <locale_io.h>
 #include <properties.h>

@ -33,10 +32,8 @@
 #include <wx/filename.h>
 #include <wx/tokenzr.h>

-#include <class_libentry.h>
 #include <class_library.h>
 #include <plugins/eagle/eagle_parser.h>
-#include <gr_text.h>
 #include <lib_arc.h>
 #include <lib_circle.h>
 #include <lib_id.h>
@ -45,7 +42,6 @@
 #include <lib_polyline.h>
 #include <lib_rectangle.h>
 #include <lib_text.h>
-#include <macros.h>
 #include <project.h>
 #include <sch_bus_entry.h>
 #include <sch_component.h>
@ -60,7 +56,6 @@
 #include <sch_text.h>
 #include <schematic.h>
 #include <symbol_lib_table.h>
-#include <template_fieldnames.h>
 #include <wildcards_and_files_ext.h>
 #include <page_layout/ws_draw_item.h>

--- a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
@ -31,10 +31,7 @@
 #include <wx/mstream.h>
 #include <wx/tokenzr.h>

-#include <common.h>
 #include <lib_id.h>
-
-#include <class_libentry.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
 #include <lib_circle.h>
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@ -42,7 +42,6 @@
 #include <schematic.h>
 #include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <sch_screen.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@ -55,7 +55,6 @@
 #include <template_fieldnames.h>
 #include <sch_screen.h>
 #include <schematic.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
--- a/eeschema/sch_reference_list.h
+++ b/eeschema/sch_reference_list.h
@ -26,17 +26,14 @@
 #ifndef _SCH_REFERENCE_LIST_H_
 #define _SCH_REFERENCE_LIST_H_

+#include <map>

-#include <macros.h>
-
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <sch_sheet_path.h>
 #include <sch_component.h>
 #include <sch_text.h>
 #include <erc_settings.h>

-#include <map>
-
 /**
 * A helper to define a symbol's reference designator in a schematic.
 *
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@ -30,7 +30,6 @@
 */

 #include <eda_rect.h>
-//#include <gr_text.h>
 #include <id.h>
 #include <kicad_string.h>
 #include <kiway.h>
@ -43,7 +42,6 @@
 #include <sch_item.h>

 #include <class_library.h>
-#include <class_libentry.h>
 #include <connection_graph.h>
 #include <lib_pin.h>
 #include <sch_component.h>
--- a/eeschema/schematic_settings.cpp
+++ b/eeschema/schematic_settings.cpp
@ -19,7 +19,7 @@
 */

 #include <base_screen.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <convert_to_biu.h>
 #include <default_values.h>
 #include <eda_text.h>
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@ -30,7 +30,6 @@
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <template_fieldnames.h>
 #include <wildcards_and_files_ext.h>
--- a/eeschema/symbol_editor/symbol_editor_import_export.cpp
+++ b/eeschema/symbol_editor/symbol_editor_import_export.cpp
@ -26,7 +26,6 @@
 #include <confirm.h>
 #include <symbol_lib_table.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <wildcards_and_files_ext.h>
 #include <symbol_library_manager.h>
--- a/eeschema/symbol_editor/symbol_editor_plotter.cpp
+++ b/eeschema/symbol_editor/symbol_editor_plotter.cpp
@ -25,8 +25,6 @@
 #include <sch_painter.h>
 #include <symbol_edit_frame.h>
 #include <locale_io.h>
-#include <class_libentry.h>
-#include <class_library.h>
 #include <plotters_specific.h>

 void SYMBOL_EDIT_FRAME::SVGPlotSymbol( const wxString& aFullFileName )
--- a/eeschema/symbol_editor/symbol_editor_undo_redo.cpp
+++ b/eeschema/symbol_editor/symbol_editor_undo_redo.cpp
@ -23,7 +23,6 @@
 */

 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <symbol_library_manager.h>
 #include <widgets/lib_tree.h>
 #include <symbol_tree_pane.h>
--- a/eeschema/symbol_editor/symbol_library_manager.cpp
+++ b/eeschema/symbol_editor/symbol_library_manager.cpp
@ -24,7 +24,6 @@
 */

 #include <symbol_library_manager.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <symbol_edit_frame.h>
 #include <env_paths.h>
--- a/eeschema/symbol_lib_table.cpp
+++ b/eeschema/symbol_lib_table.cpp
@ -30,7 +30,7 @@
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
 #include <symbol_lib_table.h>
-#include <class_libentry.h>
+#include <lib_part.h>

 #define OPT_SEP     '|'         ///< options separator character

--- a/eeschema/symbol_lib_table.h
+++ b/eeschema/symbol_lib_table.h
@ -28,7 +28,6 @@
 #include <lib_table_base.h>
 #include <sch_io_mgr.h>
 #include <lib_id.h>
-#include <class_libentry.h>

 //class LIB_PART;
 class SYMBOL_LIB_TABLE_GRID;
--- a/eeschema/symbol_tree_model_adapter.cpp
+++ b/eeschema/symbol_tree_model_adapter.cpp
@ -25,9 +25,8 @@

 #include <eda_pattern_match.h>
 #include <symbol_lib_table.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <generate_alias_info.h>
-
 #include <symbol_tree_model_adapter.h>


--- a/eeschema/symbol_tree_synchronizing_adapter.cpp
+++ b/eeschema/symbol_tree_synchronizing_adapter.cpp
@ -26,7 +26,6 @@
 #include <symbol_tree_synchronizing_adapter.h>
 #include <symbol_library_manager.h>
 #include <symbol_lib_table.h>
-#include <class_libentry.h>
 #include <tools/symbol_editor_control.h>


--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@ -24,7 +24,6 @@
 */

 #include <bitmaps.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <confirm.h>
 #include <dialog_helpers.h>
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@ -23,7 +23,6 @@
 */


-#include <class_libentry.h>
 #include <core/typeinfo.h>
 #include <ee_actions.h>
 #include <ee_collectors.h>
--- a/eeschema/tools/symbol_editor_drawing_tools.cpp
+++ b/eeschema/tools/symbol_editor_drawing_tools.cpp
@ -24,11 +24,8 @@

 #include <ee_actions.h>
 #include <symbol_edit_frame.h>
-#include <view/view_controls.h>
-#include <tool/tool_manager.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <tools/symbol_editor_pin_tool.h>
-#include <class_libentry.h>
 #include <bitmaps.h>
 #include <lib_text.h>
 #include <dialogs/dialog_lib_edit_text.h>
--- a/eeschema/widgets/symbol_preview_widget.cpp
+++ b/eeschema/widgets/symbol_preview_widget.cpp
@ -18,12 +18,8 @@
 */

 #include "symbol_preview_widget.h"
-#include <wx/stattext.h>
-#include <wx/sizer.h>
-#include <kiway.h>
 #include <sch_view.h>
 #include <gal/gal_display_options.h>
-#include <class_libentry.h>
 #include <symbol_lib_table.h>
 #include <sch_preview_panel.h>
 #include <pgm_base.h>
--- a/qa/eeschema/lib_field_test_utils.h
+++ b/qa/eeschema/lib_field_test_utils.h
@ -31,7 +31,6 @@

 #include <unit_test_utils/unit_test_utils.h>

-#include <class_libentry.h>
 #include <template_fieldnames.h>


--- a/qa/eeschema/test_lib_part.cpp
+++ b/qa/eeschema/test_lib_part.cpp
@ -29,7 +29,6 @@
 #include <unit_test_utils/unit_test_utils.h>

 // Code under test
-#include <class_libentry.h>
 #include <lib_rectangle.h>
 #include <lib_arc.h>
 #include <lib_pin.h>