haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update code after file renaming

This commit is contained in:
jean-pierre charras 2018-01-29 09:39:13 +01:00
parent fa10e1b7fe
commit d44494beda
34 changed files with 64 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/CMakeLists.txt
View File

@ -187,8 +187,8 @@ set( COMMON_WIDGET_SRCS
set( COMMON_PAGE_LAYOUT_SRCS
page_layout/title_block_shapes.cpp
page_layout/class_worksheet_dataitem.cpp
page_layout/class_worksheet_layout.cpp
page_layout/worksheet_dataitem.cpp
page_layout/worksheet_layout.cpp
page_layout/page_layout_default_description.cpp
page_layout/page_layout_graphic_items.cpp
page_layout/page_layout_reader_keywords.cpp
@ -232,9 +232,9 @@ set( COMMON_SRCS
bezier_curves.cpp
bin_mod.cpp
bitmap.cpp
bitmap_base.cpp
block_commande.cpp
build_version.cpp
class_bitmap_base.cpp
class_colors_design_settings.cpp
class_layer_box_selector.cpp
class_marker_base.cpp
@ -256,11 +256,11 @@ set( COMMON_SRCS
eda_dde.cpp
eda_doc.cpp
eda_pattern_match.cpp
eda_graphic_text_ctrl.cpp
env_paths.cpp
exceptions.cpp
executable_names.cpp
filter_reader.cpp
# findkicadhelppath.cpp.notused deprecated, use searchhelpfilefullpath.cpp
footprint_filter.cpp
footprint_info.cpp
gbr_metadata.cpp
@ -303,7 +303,6 @@ set( COMMON_SRCS
worksheet.cpp
wx_status_popup.cpp
wxdataviewctrl_helpers.cpp
wxwineda.cpp
xnode.cpp
zoom.cpp
)

2
common/bitmap_base.cpp
View File

@ -35,7 +35,7 @@
#include "richio.h"
#include "plotter.h"
#include "class_bitmap_base.h"
#include "bitmap_base.h"
#include <wx/mstream.h>

4
common/dialogs/dialog_image_editor.cpp
View File

@ -6,7 +6,7 @@
* This program source code file is part of KICAD, a free EDA CAD application.
*
* Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011-2016 Kicad Developers, see change_log.txt for contributors.
* Copyright (C) 2011-2018 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
@ -29,7 +29,7 @@
#include <fctsys.h>
#include <gr_basic.h>
#include <common.h>
#include <class_bitmap_base.h>
#include <bitmap_base.h>
#include <dialog_image_editor.h>

2
common/page_layout/page_layout_default_description.cpp
View File

@ -6,7 +6,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2013 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2013 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
*
*
* This program is free software; you can redistribute it and/or

2
common/page_layout/page_layout_graphic_items.cpp
View File

@ -58,7 +58,7 @@
#include <worksheet.h>
#include <class_title_block.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <polygon_test_point_inside.h>
/* a helper function to draw graphic symbols at start point or end point of

4
common/page_layout/page_layout_reader.cpp
View File

@ -8,7 +8,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2013 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2013 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
*
*
* This program is free software; you can redistribute it and/or
@ -33,7 +33,7 @@
#include <base_struct.h>
#include <worksheet.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <page_layout_reader_lexer.h>

6
common/page_layout/title_block_shapes.cpp
View File

@ -6,8 +6,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2013 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2013 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-2018 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
*
*
* This program is free software; you can redistribute it and/or
@ -60,7 +60,7 @@
#include <worksheet.h>
#include <class_title_block.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList(

6
common/page_layout/worksheet_dataitem.cpp
View File

@ -1,5 +1,5 @@
/**
* @file class_worksheet_dataitem.cpp
* @file worksheet_dataitem.cpp
* @brief description of graphic items and texts to build a title block
*/
@ -7,7 +7,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2013 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2016 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
*
*
* This program is free software; you can redistribute it and/or
@ -60,7 +60,7 @@
#include <worksheet.h>
#include <class_title_block.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
using KIGFX::COLOR4D;

8
common/page_layout/worksheet_layout.cpp
View File

@ -1,13 +1,13 @@
/**
* @file class_worksheet_layout.cpp
* @file worksheet_layout.cpp
* @brief description of graphic items and texts to build a title block
*/
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2013 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2013 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-2018 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
*
*
* This program is free software; you can redistribute it and/or
@ -55,7 +55,7 @@
#include <worksheet.h>
#include <class_title_block.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
// The layout shape used in the application

2
common/plotters/common_plot_functions.cpp
View File

@ -35,7 +35,7 @@
#include <draw_graphic_text.h>
#include <class_title_block.h>
#include "worksheet_shape_builder.h"
#include "class_worksheet_dataitem.h"
#include "worksheet_dataitem.h"
#include <wx/filename.h>

2
eeschema/sch_bitmap.h
View File

@ -32,7 +32,7 @@
#include <sch_item_struct.h>
#include <class_bitmap_base.h>
#include <bitmap_base.h>
/**

12
include/bitmap_base.h
View File

@ -1,8 +1,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 jean-pierre.charras jp.charras at wanadoo.fr
* Copyright (C) 2013-2016 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2018 jean-pierre.charras jp.charras at wanadoo.fr
* Copyright (C) 2013-2018 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,11 +22,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef _BITMAP_BASE_H_
#define _BITMAP_BASE_H_
#ifndef BITMAP_BASE_H
#define BITMAP_BASE_H
/**
* @file class_bitmap_base.h
* @file bitmap_base.h
*
*/
@ -226,4 +226,4 @@ public:
};
#endif // _BITMAP_BASE_H_
#endif // BITMAP_BASE_H

10
include/worksheet_dataitem.h
View File

@ -23,16 +23,16 @@
*/
/**
* @file class_worksheet_dataitem.h
* @file worksheet_dataitem.h
* @brief description of graphic items and texts to build a title block
*/
#ifndef CLASS_WORKSHEET_DATA_ITEM_H
#define CLASS_WORKSHEET_DATA_ITEM_H
#ifndef WORKSHEET_DATA_ITEM_H
#define WORKSHEET_DATA_ITEM_H
#include <math/vector2d.h>
#include <eda_text.h>
#include <class_bitmap_base.h>
#include <bitmap_base.h>
class WS_DRAW_ITEM_TEXT; // Forward declaration
@ -534,4 +534,4 @@ public:
};
#endif // CLASS_WORKSHEET_DATA_ITEM_H
#endif // WORKSHEET_DATA_ITEM_H

2
include/worksheet_shape_builder.h
View File

@ -34,7 +34,7 @@
#include <math/vector2d.h>
#include <eda_text.h>
#include <eda_text.h>
#include <class_bitmap_base.h>
#include <bitmap_base.h>
class WORKSHEET_DATAITEM; // Forward declaration
class TITLE_BLOCK;

4
pagelayout_editor/CMakeLists.txt
View File

@ -17,8 +17,8 @@ set( PL_EDITOR_SRCS
dialogs/dialogs_for_printing.cpp
dialogs/dialog_new_dataitem_base.cpp
dialogs/dialog_new_dataitem.cpp
class_pl_editor_screen.cpp
class_pl_editor_layout.cpp
pl_editor_screen.cpp
pl_editor_layout.cpp
design_tree_frame.cpp
events_functions.cpp
controle.cpp

2
pagelayout_editor/block.cpp
View File

@ -32,7 +32,7 @@
#include <class_drawpanel.h>
#include <pl_editor_frame.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,

2
pagelayout_editor/design_tree_frame.cpp
View File

@ -30,7 +30,7 @@
#include <wx/wupdlock.h>
#include <fctsys.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <pl_editor_id.h>
#include <design_tree_frame.h>

7
pagelayout_editor/dialogs/dialog_new_dataitem.cpp
View File

@ -32,7 +32,7 @@
#include <class_drawpanel.h>
#include <pl_editor_frame.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <dialog_new_dataitem_base.h>
class DIALOG_NEW_DATAITEM : public DIALOG_NEW_DATAITEM_BASE
@ -43,7 +43,6 @@ public:
DIALOG_NEW_DATAITEM( PL_EDITOR_FRAME* aCaller, WORKSHEET_DATAITEM* aItem );
private:
void OnCancelClick( wxCommandEvent& event ) override;
void OnOKClick( wxCommandEvent& event ) override;
void initDlg();
@ -67,10 +66,6 @@ DIALOG_NEW_DATAITEM::DIALOG_NEW_DATAITEM( PL_EDITOR_FRAME* aCaller,
Centre();
}
void DIALOG_NEW_DATAITEM::OnCancelClick( wxCommandEvent& event )
{
EndModal( wxID_CANCEL);
}
void DIALOG_NEW_DATAITEM::OnOKClick( wxCommandEvent& event )
{

6
pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 22 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_new_dataitem_base.h"
@ -145,14 +145,12 @@ DIALOG_NEW_DATAITEM_BASE::DIALOG_NEW_DATAITEM_BASE( wxWindow* parent, wxWindowID
this->Centre( wxBOTH );
// Connect Events
m_sdbSizerButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_NEW_DATAITEM_BASE::OnCancelClick ), NULL, this );
m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_NEW_DATAITEM_BASE::OnOKClick ), NULL, this );
}
DIALOG_NEW_DATAITEM_BASE::~DIALOG_NEW_DATAITEM_BASE()
{
// Disconnect Events
m_sdbSizerButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_NEW_DATAITEM_BASE::OnCancelClick ), NULL, this );
m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_NEW_DATAITEM_BASE::OnOKClick ), NULL, this );
}

2
pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp
View File

@ -1653,7 +1653,7 @@
<property name="name">m_sdbSizerButtons</property>
<property name="permission">protected</property>
<event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick">OnCancelClick</event>
<event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick"></event>
<event name="OnNoButtonClick"></event>

7
pagelayout_editor/dialogs/dialog_new_dataitem_base.h
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 22 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_NEW_DATAITEM_BASE_H__
@ -11,6 +11,8 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class DIALOG_SHIM;
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/stattext.h>
@ -60,7 +62,6 @@ class DIALOG_NEW_DATAITEM_BASE : public DIALOG_SHIM
wxButton* m_sdbSizerButtonsCancel;
// Virtual event handlers, overide them in your derived class
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }

2
pagelayout_editor/dialogs/dialogs_for_printing.cpp
View File

@ -35,7 +35,7 @@
#include <pl_editor_id.h>
#include <dialog_helpers.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <dialog_page_settings.h>
#include <invoke_pl_editor_dialog.h>

2
pagelayout_editor/events_functions.cpp
View File

@ -41,7 +41,7 @@
#include <dialog_helpers.h>
#include <menus_helpers.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <design_tree_frame.h>
#include <properties_frame.h>
#include <dialog_page_settings.h>

2
pagelayout_editor/hotkeys.cpp
View File

@ -35,7 +35,7 @@
#include <class_drawpanel.h>
#include <pl_editor_frame.h>
#include <design_tree_frame.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <hotkeys.h>
#include <pl_editor_id.h>

2
pagelayout_editor/onleftclick.cpp
View File

@ -37,7 +37,7 @@
#include <design_tree_frame.h>
#include <properties_frame.h>
#include <dialog_helpers.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
/* Process the command triggered by the left button of the mouse when a tool
* is already selected.

2
pagelayout_editor/onrightclick.cpp
View File

@ -36,7 +36,7 @@
#include <properties_frame.h>
#include <menus_helpers.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <hotkeys.h>
// Helper function to add menuitems relative to items creation

2
pagelayout_editor/page_layout_writer.cpp
View File

@ -33,7 +33,7 @@
#include <base_struct.h>
#include <worksheet.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <math/vector2d.h>
#include <page_layout_reader_lexer.h>
#include <macros.h>

4
pagelayout_editor/pl_editor_frame.cpp
View File

@ -39,9 +39,9 @@
#include <pl_editor_frame.h>
#include <pl_editor_id.h>
#include <hotkeys.h>
#include <class_pl_editor_screen.h>
#include <pl_editor_screen.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <design_tree_frame.h>
#include <properties_frame.h>

4
pagelayout_editor/pl_editor_frame.h
View File

@ -34,8 +34,8 @@
#include <config_params.h>
#include <draw_frame.h>
#include <class_drawpanel.h>
#include <class_pl_editor_screen.h>
#include <class_pl_editor_layout.h>
#include <pl_editor_screen.h>
#include <pl_editor_layout.h>
class PROPERTIES_FRAME;
class DESIGN_TREE_FRAME;

4
pagelayout_editor/pl_editor_layout.cpp
View File

@ -1,5 +1,5 @@
/**
* @file class_pl_editor_layout.cpp
* @file pl_editor_layout.cpp
* @brief PL_EDITOR_LAYOUT class functions.
*/
/*
@ -32,7 +32,7 @@
#include <fctsys.h>
#include <common.h>
#include <class_eda_rect.h>
#include <class_pl_editor_layout.h>
#include <pl_editor_layout.h>
PL_EDITOR_LAYOUT::PL_EDITOR_LAYOUT()
{

2
pagelayout_editor/pl_editor_layout.h
View File

@ -1,5 +1,5 @@
/**
* @file class_pl_editor_layout.h
* @file pl_editor_layout.h
*/
/*
* This program source code file is part of KiCad, a free EDA CAD application.

4
pagelayout_editor/pl_editor_screen.cpp
View File

@ -1,5 +1,5 @@
/**
* @file class_pl_editor_screen.cpp
* @file pl_editor_screen.cpp
*/
/*
* This program source code file is part of KiCad, a free EDA CAD application.
@ -28,7 +28,7 @@
#include <fctsys.h>
#include <common.h>
#include <macros.h>
#include <class_pl_editor_screen.h>
#include <pl_editor_screen.h>
#include <base_units.h>
#include <pl_editor_id.h>

2
pagelayout_editor/pl_editor_screen.h
View File

@ -1,5 +1,5 @@
/**
* @file class_pl_editor_screen.h
* @file pl_editor_screen.h
*/
/*

2
pagelayout_editor/properties_frame.cpp
View File

@ -30,7 +30,7 @@
#include <wxstruct.h>
#include <class_drawpanel.h>
#include <worksheet_shape_builder.h>
#include <class_worksheet_dataitem.h>
#include <worksheet_dataitem.h>
#include <properties_frame.h>
PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ):