From c3e3ff36826ee2780e048c980f6b4f1b596469e6 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Mar 2015 09:58:32 +0100 Subject: [PATCH] Minot fixes: Minor coding style issues fix (tab -> spaces). Add missing GetClass to all classes derived from EDA_ITEM. Make debug method Show() only compiled in debug mode. --- 3d-viewer/3d_material.h | 8 ++++++++ 3d-viewer/3d_struct.h | 8 ++++++++ common/dialogs/dialog_page_settings.h | 2 +- cvpcb/dialogs/dialog_config_equfiles.h | 2 +- cvpcb/dialogs/fp_conflict_assignment_selector.h | 8 ++++---- eeschema/dialogs/dialog_edit_component_in_lib.h | 2 +- .../dialogs/dialog_edit_component_in_schematic.cpp | 4 ++-- .../dialogs/dialog_edit_libentry_fields_in_lib.cpp | 2 +- eeschema/dialogs/dialog_eeschema_options.h | 2 +- eeschema/dialogs/dialog_erc.h | 2 +- eeschema/dialogs/dialog_print_using_printer.cpp | 2 +- include/base_struct.h | 5 +---- include/worksheet_viewitem.h | 10 ++++++++++ pagelayout_editor/dialogs/dialog_new_dataitem.cpp | 4 ++-- pagelayout_editor/pl_editor_undo_redo.cpp | 8 ++++++++ pagelayout_editor/properties_frame.h | 4 ++-- pcbnew/class_marker_pcb.h | 8 ++++++++ pcbnew/dialogs/dialog_drc.h | 2 +- pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h | 2 +- pcbnew/dialogs/dialog_footprint_wizard_list.h | 2 +- pcbnew/dialogs/dialog_fp_lib_table.cpp | 2 +- pcbnew/dialogs/dialog_modedit_options.cpp | 4 ++-- pcbnew/dialogs/wizard_add_fplib.h | 4 ++-- pcbnew/ratsnest_viewitem.h | 10 ++++++++++ pcbnew/router/router_preview_item.h | 10 ++++++++++ pcbnew/tools/bright_box.h | 10 ++++++++++ pcbnew/tools/edit_points.h | 10 ++++++++++ pcbnew/tools/selection_area.h | 10 ++++++++++ 28 files changed, 118 insertions(+), 29 deletions(-) diff --git a/3d-viewer/3d_material.h b/3d-viewer/3d_material.h index 4064d08383..402591e496 100644 --- a/3d-viewer/3d_material.h +++ b/3d-viewer/3d_material.h @@ -65,6 +65,14 @@ public: #if defined(DEBUG) void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override #endif + + /** Get class name + * @return string "S3D_MATERIAL" + */ + virtual wxString GetClass() const + { + return wxT( "S3D_MATERIAL" ); + } }; void SetOpenGlDefaultMaterial(); diff --git a/3d-viewer/3d_struct.h b/3d-viewer/3d_struct.h index c64d3d8655..4a0513f090 100644 --- a/3d-viewer/3d_struct.h +++ b/3d-viewer/3d_struct.h @@ -176,6 +176,14 @@ public: return m_Shape3DName; } + /** Get class name + * @return string "S3D_MASTER" + */ + virtual wxString GetClass() const + { + return wxT( "S3D_MASTER" ); + } + /** * Function GetShape3DFullFilename * @return the full filename of the 3D shape, diff --git a/common/dialogs/dialog_page_settings.h b/common/dialogs/dialog_page_settings.h index 6ff5515cbf..5bd62ba250 100644 --- a/common/dialogs/dialog_page_settings.h +++ b/common/dialogs/dialog_page_settings.h @@ -98,7 +98,7 @@ private: void OnDateApplyClick( wxCommandEvent& event ); // .kicad_wks file description selection - void OnWksFileSelection( wxCommandEvent& event ); + void OnWksFileSelection( wxCommandEvent& event ); // Save in the current title block the new page settings // return true if changes are made, or false if not diff --git a/cvpcb/dialogs/dialog_config_equfiles.h b/cvpcb/dialogs/dialog_config_equfiles.h index b0e20691bc..aeb4868050 100644 --- a/cvpcb/dialogs/dialog_config_equfiles.h +++ b/cvpcb/dialogs/dialog_config_equfiles.h @@ -48,7 +48,7 @@ private: void OnOkClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event ); void OnAddFiles( wxCommandEvent& event ); - void OnEditEquFile( wxCommandEvent& event ); + void OnEditEquFile( wxCommandEvent& event ); void OnRemoveFiles( wxCommandEvent& event ); void OnButtonMoveUp( wxCommandEvent& event ); void OnButtonMoveDown( wxCommandEvent& event ); diff --git a/cvpcb/dialogs/fp_conflict_assignment_selector.h b/cvpcb/dialogs/fp_conflict_assignment_selector.h index 7e3db2858d..9beeb3fc13 100644 --- a/cvpcb/dialogs/fp_conflict_assignment_selector.h +++ b/cvpcb/dialogs/fp_conflict_assignment_selector.h @@ -63,16 +63,16 @@ class DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR : public DIALOG_FP_CONFLICT_ASSIGNM int GetSelection( const wxString& aReference ); private: - void OnSize( wxSizeEvent& event ); + void OnSize( wxSizeEvent& event ); // Virtual: called when clicking on the column title: // when it is a column choice, set all item choices. - void OnColumnClick( wxListEvent& event ); + void OnColumnClick( wxListEvent& event ); void OnItemClicked( wxMouseEvent& event ); - void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } - void OnOKClick( wxCommandEvent& event ) { EndModal( wxID_OK ); } + void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } + void OnOKClick( wxCommandEvent& event ) { EndModal( wxID_OK ); } void recalculateColumns(); diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.h b/eeschema/dialogs/dialog_edit_component_in_lib.h index b0672abd67..829a8cc45b 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib.h +++ b/eeschema/dialogs/dialog_edit_component_in_lib.h @@ -63,7 +63,7 @@ private: void DeleteAllFootprintFilter(wxCommandEvent& event); void DeleteOneFootprintFilter(wxCommandEvent& event); void AddFootprintFilter(wxCommandEvent& event); - void EditOneFootprintFilter( wxCommandEvent& event ); + void EditOneFootprintFilter( wxCommandEvent& event ); }; #endif diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp index c84219a8c4..fa281a23d5 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp @@ -117,8 +117,8 @@ private: void deleteFieldButtonHandler( wxCommandEvent& event ); void moveUpButtonHandler( wxCommandEvent& event ); void showButtonHandler( wxCommandEvent& event ); - void OnTestChipName( wxCommandEvent& event ); - void OnSelectChipName( wxCommandEvent& event ); + void OnTestChipName( wxCommandEvent& event ); + void OnSelectChipName( wxCommandEvent& event ); SCH_FIELD* findField( const wxString& aFieldName ); diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp index b2f3e08bfb..6195982a49 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp @@ -60,7 +60,7 @@ public: private: // Events handlers: void OnInitDialog( wxInitDialogEvent& event ); - void OnCloseDialog( wxCloseEvent& event ); + void OnCloseDialog( wxCloseEvent& event ); void OnListItemDeselected( wxListEvent& event ); void OnListItemSelected( wxListEvent& event ); diff --git a/eeschema/dialogs/dialog_eeschema_options.h b/eeschema/dialogs/dialog_eeschema_options.h index 4e18ba35c8..4c08fe3105 100644 --- a/eeschema/dialogs/dialog_eeschema_options.h +++ b/eeschema/dialogs/dialog_eeschema_options.h @@ -65,7 +65,7 @@ protected: * Process the wxWidgets @a event produced when the user click on * the check box which controls the field visibility */ - void OnVisibleFieldClick( wxCommandEvent& event ); + void OnVisibleFieldClick( wxCommandEvent& event ); /** * Function OnAddButtonClick diff --git a/eeschema/dialogs/dialog_erc.h b/eeschema/dialogs/dialog_erc.h index e8eaf3a81e..13955f1d44 100644 --- a/eeschema/dialogs/dialog_erc.h +++ b/eeschema/dialogs/dialog_erc.h @@ -62,7 +62,7 @@ private: void Init(); // from DIALOG_ERC_BASE: - void OnCloseErcDialog( wxCloseEvent& event ); + void OnCloseErcDialog( wxCloseEvent& event ); void OnErcCmpClick( wxCommandEvent& event ); void OnEraseDrcMarkersClick( wxCommandEvent& event ); void OnButtonCloseClick( wxCommandEvent& event ); diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp index e7c03b58d5..eb7e1c5ee4 100644 --- a/eeschema/dialogs/dialog_print_using_printer.cpp +++ b/eeschema/dialogs/dialog_print_using_printer.cpp @@ -60,7 +60,7 @@ private: void OnPageSetup( wxCommandEvent& event ); void OnPrintPreview( wxCommandEvent& event ); void OnPrintButtonClick( wxCommandEvent& event ); - void OnButtonCancelClick( wxCommandEvent& event ){ Close(); } + void OnButtonCancelClick( wxCommandEvent& event ) { Close(); } void GetPrintOptions(); }; diff --git a/include/base_struct.h b/include/base_struct.h index 2e79b4713e..e6238f3159 100644 --- a/include/base_struct.h +++ b/include/base_struct.h @@ -386,10 +386,7 @@ public: * returns the class name. * @return wxString */ - virtual wxString GetClass() const - { - return wxT( "EDA_ITEM" ); - } + virtual wxString GetClass() const = 0; /** * Function GetSelectMenuText diff --git a/include/worksheet_viewitem.h b/include/worksheet_viewitem.h index ca506c8577..149f804530 100644 --- a/include/worksheet_viewitem.h +++ b/include/worksheet_viewitem.h @@ -123,10 +123,20 @@ public: /// @copydoc VIEW_ITEM::ViewGetLayers() void ViewGetLayers( int aLayers[], int& aCount ) const; +#if defined(DEBUG) /// @copydoc EDA_ITEM::Show() void Show( int x, std::ostream& st ) const { } +#endif + + /** Get class name + * @return string "WORKSHEET_VIEWITEM" + */ + virtual wxString GetClass() const + { + return wxT( "WORKSHEET_VIEWITEM" ); + } protected: /// File name displayed in the title block diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem.cpp b/pagelayout_editor/dialogs/dialog_new_dataitem.cpp index 3a0fe7fb21..12a6744bf3 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem.cpp +++ b/pagelayout_editor/dialogs/dialog_new_dataitem.cpp @@ -43,8 +43,8 @@ public: DIALOG_NEW_DATAITEM( PL_EDITOR_FRAME* aCaller, WORKSHEET_DATAITEM* aItem ); private: - void OnCancelClick( wxCommandEvent& event ); - void OnOKClick( wxCommandEvent& event ); + void OnCancelClick( wxCommandEvent& event ); + void OnOKClick( wxCommandEvent& event ); void initDlg(); }; diff --git a/pagelayout_editor/pl_editor_undo_redo.cpp b/pagelayout_editor/pl_editor_undo_redo.cpp index 390aebb498..d1711e7c5c 100644 --- a/pagelayout_editor/pl_editor_undo_redo.cpp +++ b/pagelayout_editor/pl_editor_undo_redo.cpp @@ -57,6 +57,14 @@ public: #if defined(DEBUG) virtual void Show( int nestLevel, std::ostream& os ) const {} #endif + + /** Get class name + * @return string "PL_ITEM_LAYOUT" + */ + virtual wxString GetClass() const + { + return wxT( "PL_ITEM_LAYOUT" ); + } }; void PL_EDITOR_FRAME::SaveCopyInUndoList() diff --git a/pagelayout_editor/properties_frame.h b/pagelayout_editor/properties_frame.h index 75557c1681..208bdc1d26 100644 --- a/pagelayout_editor/properties_frame.h +++ b/pagelayout_editor/properties_frame.h @@ -48,8 +48,8 @@ public: ~PROPERTIES_FRAME(); // Event functions - void OnAcceptPrms( wxCommandEvent& event ); - void OnSetDefaultValues( wxCommandEvent& event ); + void OnAcceptPrms( wxCommandEvent& event ); + void OnSetDefaultValues( wxCommandEvent& event ); // Data transfert from general properties to widgets diff --git a/pcbnew/class_marker_pcb.h b/pcbnew/class_marker_pcb.h index 6fd09b040a..e524ae7a73 100644 --- a/pcbnew/class_marker_pcb.h +++ b/pcbnew/class_marker_pcb.h @@ -124,6 +124,14 @@ public: void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override #endif + /** Get class name + * @return string "MARKER_PCB" + */ + virtual wxString GetClass() const + { + return wxT( "MARKER_PCB" ); + } + protected: ///> Pointer to BOARD_ITEM that causes DRC error. const BOARD_ITEM* m_item; diff --git a/pcbnew/dialogs/dialog_drc.h b/pcbnew/dialogs/dialog_drc.h index 68ed43c712..a75d457150 100644 --- a/pcbnew/dialogs/dialog_drc.h +++ b/pcbnew/dialogs/dialog_drc.h @@ -111,7 +111,7 @@ private: void OnMarkerSelectionEvent( wxCommandEvent& event ); void OnUnconnectedSelectionEvent( wxCommandEvent& event ); - void OnChangingMarkerList( wxNotebookEvent& event ); + void OnChangingMarkerList( wxNotebookEvent& event ); void DelDRCMarkers(); void RedrawDrawPanel(); diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h index 1b27076dbc..c83b093f82 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h @@ -64,7 +64,7 @@ private: Edit3DShapeFileName(); } void Remove3DShape( wxCommandEvent& event ); - void Add3DShape( wxCommandEvent& event ) + void Add3DShape( wxCommandEvent& event ) { BrowseAndAdd3DShapeFile(); } diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list.h b/pcbnew/dialogs/dialog_footprint_wizard_list.h index 982bd3d112..0361e3634f 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list.h +++ b/pcbnew/dialogs/dialog_footprint_wizard_list.h @@ -41,7 +41,7 @@ public: private: void OnCellWizardClick( wxGridEvent& event ); void OnOpenButtonClick( wxCommandEvent& event ); - void OnCancelClick( wxCommandEvent& event ); + void OnCancelClick( wxCommandEvent& event ); }; #endif // _DIALOG_FOOTPRINT_WIZARD_LIST_H_ diff --git a/pcbnew/dialogs/dialog_fp_lib_table.cpp b/pcbnew/dialogs/dialog_fp_lib_table.cpp index 261b8f599b..7f1b116cc8 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table.cpp +++ b/pcbnew/dialogs/dialog_fp_lib_table.cpp @@ -660,7 +660,7 @@ private: } } - void OnClickLibraryWizard( wxCommandEvent& event ); + void OnClickLibraryWizard( wxCommandEvent& event ); void onCancelButtonClick( wxCommandEvent& event ) { diff --git a/pcbnew/dialogs/dialog_modedit_options.cpp b/pcbnew/dialogs/dialog_modedit_options.cpp index 438cbae522..603db1d3fd 100644 --- a/pcbnew/dialogs/dialog_modedit_options.cpp +++ b/pcbnew/dialogs/dialog_modedit_options.cpp @@ -43,8 +43,8 @@ public: DIALOG_MODEDIT_OPTIONS( FOOTPRINT_EDIT_FRAME* aParent ); private: - void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } - void OnOkClick( wxCommandEvent& event ); + void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } + void OnOkClick( wxCommandEvent& event ); void initValues( ); }; diff --git a/pcbnew/dialogs/wizard_add_fplib.h b/pcbnew/dialogs/wizard_add_fplib.h index f7ad445dce..867d544bf3 100644 --- a/pcbnew/dialogs/wizard_add_fplib.h +++ b/pcbnew/dialogs/wizard_add_fplib.h @@ -186,11 +186,11 @@ private: void OnRemoveFpLibs( wxCommandEvent& event ); void OnPathManagementSelection( wxCommandEvent& event ); void OnSelectEnvVarCell( wxGridEvent& event ); - void OnPluginSelection( wxCommandEvent& event ); + void OnPluginSelection( wxCommandEvent& event ); #ifdef BUILD_GITHUB_PLUGIN void OnGithubLibsList( wxCommandEvent& event ); #endif - bool ValidateOptions(); + bool ValidateOptions(); }; diff --git a/pcbnew/ratsnest_viewitem.h b/pcbnew/ratsnest_viewitem.h index 0ccace0987..8898be8fb6 100644 --- a/pcbnew/ratsnest_viewitem.h +++ b/pcbnew/ratsnest_viewitem.h @@ -52,10 +52,20 @@ public: /// @copydoc VIEW_ITEM::ViewGetLayers() void ViewGetLayers( int aLayers[], int& aCount ) const; +#if defined(DEBUG) /// @copydoc EDA_ITEM::Show() void Show( int x, std::ostream& st ) const { } +#endif + + /** Get class name + * @return string "RATSNEST_VIEWITEM" + */ + virtual wxString GetClass() const + { + return wxT( "RATSNEST_VIEWITEM" ); + } protected: ///> Object containing ratsnest data. diff --git a/pcbnew/router/router_preview_item.h b/pcbnew/router/router_preview_item.h index a5b6759755..90bbe9473e 100644 --- a/pcbnew/router/router_preview_item.h +++ b/pcbnew/router/router_preview_item.h @@ -72,7 +72,17 @@ public: m_clearance = aClearance; } +#if defined(DEBUG) void Show( int aA, std::ostream& aB ) const {}; +#endif + + /** Get class name + * @return string "ROUTER_PREVIEW_ITEM" + */ + virtual wxString GetClass() const + { + return wxT( "ROUTER_PREVIEW_ITEM" ); + } const BOX2I ViewBBox() const; diff --git a/pcbnew/tools/bright_box.h b/pcbnew/tools/bright_box.h index f75a7d0115..fc9aeeec7a 100644 --- a/pcbnew/tools/bright_box.h +++ b/pcbnew/tools/bright_box.h @@ -55,9 +55,19 @@ public: aCount = 1; } +#if defined(DEBUG) void Show( int x, std::ostream& st ) const { } +#endif + + /** Get class name + * @return string "BRIGHT_BOX" + */ + virtual wxString GetClass() const + { + return wxT( "BRIGHT_BOX" ); + } private: static const KIGFX::COLOR4D BOX_COLOR; diff --git a/pcbnew/tools/edit_points.h b/pcbnew/tools/edit_points.h index 99b0efcc36..aac2edab33 100644 --- a/pcbnew/tools/edit_points.h +++ b/pcbnew/tools/edit_points.h @@ -503,9 +503,19 @@ public: aLayers[0] = ITEM_GAL_LAYER( GP_OVERLAY ); } +#if defined(DEBUG) void Show( int x, std::ostream& st ) const { } +#endif + + /** Get class name + * @return string "EDIT_POINTS" + */ + virtual wxString GetClass() const + { + return wxT( "EDIT_POINTS" ); + } private: EDA_ITEM* m_parent; ///< Parent of the EDIT_POINTs diff --git a/pcbnew/tools/selection_area.h b/pcbnew/tools/selection_area.h index 533a516091..737e7be719 100644 --- a/pcbnew/tools/selection_area.h +++ b/pcbnew/tools/selection_area.h @@ -63,9 +63,19 @@ public: m_end = aEnd; } +#if defined(DEBUG) void Show( int x, std::ostream& st ) const { } +#endif + + /** Get class name + * @return string "SELECTION_AREA" + */ + virtual wxString GetClass() const + { + return wxT( "SELECTION_AREA" ); + } private: VECTOR2I m_origin, m_end;