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

Fix code after renaming files

This commit is contained in:
jean-pierre charras 2018-02-16 17:52:19 +01:00
parent 35a7f7a7b4
commit a5a6c4a012
23 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
View File

@ -49,14 +49,14 @@
#include <validators.h>
#include <widgets/text_ctrl_eval.h>
#include <dialog_edit_module_for_BoardEditor.h>
#include <dialog_edit_footprint_for_BoardEditor.h>
#include <wildcards_and_files_ext.h>
#include "3d_cache/dialogs/panel_prev_model.h"
#include "3d_cache/dialogs/3d_cache_dialogs.h"
#include "3d_cache/3d_cache.h"
#include "3d_cache/3d_filename_resolver.h"
#include <dialog_edit_module_text.h>
#include <dialog_edit_footprint_text.h>
size_t DIALOG_MODULE_BOARD_EDITOR::m_page = 0; // remember the last open page during session

8
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.h
View File

@ -23,11 +23,11 @@
*/
#ifndef __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR__
#define __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR__
#ifndef DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_H
#define DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_H
#include <dialog_edit_module_for_BoardEditor_base.h>
#include <dialog_edit_footprint_for_BoardEditor_base.h>
#include <wx/valnum.h>
class PANEL_PREV_3D;
@ -106,4 +106,4 @@ private:
};
#endif // __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR__
#endif // DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_H

4
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jul 2 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -7,7 +7,7 @@
#include "widgets/text_ctrl_eval.h"
#include "dialog_edit_module_for_BoardEditor_base.h"
#include "dialog_edit_footprint_for_BoardEditor_base.h"
///////////////////////////////////////////////////////////////////////////

4
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp
View File

@ -11,11 +11,11 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_edit_module_for_BoardEditor_base</property>
<property name="file">dialog_edit_footprint_for_BoardEditor_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_edit_module_for_BoardEditor_base</property>
<property name="name">dialog_edit_footprint_for_BoardEditor_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>

8
pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h
View File

@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jul 2 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
#define __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
#ifndef __DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_BASE_H__
#define __DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
@ -141,4 +141,4 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
};
#endif //__DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
#endif //__DIALOG_EDIT_FOOTPRINT_FOR_BOARDEDITOR_BASE_H__

4
pcbnew/dialogs/dialog_edit_footprint_for_Modedit.cpp
View File

@ -50,7 +50,7 @@
#include <class_module.h>
#include <class_text_mod.h>
#include <footprint_edit_frame.h>
#include <dialog_edit_module_for_Modedit.h>
#include <dialog_edit_footprint_for_Modedit.h>
#include <wildcards_and_files_ext.h>
#include <pgm_base.h>
#include "3d_cache/dialogs/panel_prev_model.h"
@ -58,7 +58,7 @@
#include "3d_cache/3d_cache.h"
#include "3d_cache/3d_filename_resolver.h"
#include <dialog_edit_module_text.h>
#include <dialog_edit_footprint_text.h>
size_t DIALOG_MODULE_MODULE_EDITOR::m_page = 0; // remember the last open page during session

8
pcbnew/dialogs/dialog_edit_footprint_for_Modedit.h
View File

@ -22,12 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __DIALOG_EDIT_MODULE_FOR_MODEDIT__
#define __DIALOG_EDIT_MODULE_FOR_MODEDIT__
#ifndef DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_H
#define DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_H
// Include the wxFormBuider header base:
#include <vector>
#include <dialog_edit_module_for_Modedit_base.h>
#include <dialog_edit_footprint_for_Modedit_base.h>
class PANEL_PREV_3D;
class MODULE;
@ -88,4 +88,4 @@ private:
};
#endif // __DIALOG_EDIT_MODULE_FOR_MODEDIT__
#endif // DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_H

4
pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jul 2 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -7,7 +7,7 @@
#include "widgets/text_ctrl_eval.h"
#include "dialog_edit_module_for_Modedit_base.h"
#include "dialog_edit_footprint_for_Modedit_base.h"
///////////////////////////////////////////////////////////////////////////

4
pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.fbp
View File

@ -11,11 +11,11 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_edit_module_for_Modedit_base</property>
<property name="file">dialog_edit_footprint_for_Modedit_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_edit_module_for_Modedit_base</property>
<property name="name">dialog_edit_footprint_for_Modedit_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>

8
pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.h
View File

@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jul 2 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EDIT_MODULE_FOR_MODEDIT_BASE_H__
#define __DIALOG_EDIT_MODULE_FOR_MODEDIT_BASE_H__
#ifndef __DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_BASE_H__
#define __DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
@ -121,4 +121,4 @@ class DIALOG_MODULE_MODULE_EDITOR_BASE : public DIALOG_SHIM
};
#endif //__DIALOG_EDIT_MODULE_FOR_MODEDIT_BASE_H__
#endif //__DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_BASE_H__

2
pcbnew/dialogs/dialog_edit_footprint_text.cpp
View File

@ -49,7 +49,7 @@
#include <class_board.h>
#include <pcb_layer_box_selector.h>
#include <dialog_edit_module_text.h>
#include <dialog_edit_footprint_text.h>
extern wxPoint MoveVector; // Move vector for move edge, imported from edtxtmod.cpp

8
pcbnew/dialogs/dialog_edit_footprint_text.h
View File

@ -24,10 +24,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef DIALOG_EDIT_MODULE_TEXT_H
#define DIALOG_EDIT_MODULE_TEXT_H
#ifndef DIALOG_EDIT_FOOTPRINT_TEXT_H
#define DIALOG_EDIT_FOOTPRINT_TEXT_H
#include <dialog_edit_module_text_base.h>
#include <dialog_edit_footprint_text_base.h>
#include <wx/valnum.h>
/*************** **************/
@ -66,4 +66,4 @@ private:
}
};
#endif /* DIALOG_EDIT_MODULE_TEXT_H */
#endif /* DIALOG_EDIT_FOOTPRINT_TEXT_H */

2
pcbnew/dialogs/dialog_exchange_footprints.cpp
View File

@ -40,7 +40,7 @@
#include <wx_html_report_panel.h>
#include <pcbnew.h>
#include <dialog_exchange_modules.h>
#include <dialog_exchange_footprint.h>
#include <wildcards_and_files_ext.h>
#include <kiway.h>

2
pcbnew/dialogs/dialog_exchange_footprints.h
View File

@ -25,7 +25,7 @@
#ifndef DIALOG_EXCHANGE_MODULES_H_
#define DIALOG_EXCHANGE_MODULES_H_
#include <dialog_exchange_modules_base.h>
#include <dialog_exchange_footprint_base.h>
#include <board_commit.h>

4
pcbnew/dialogs/dialog_exchange_footprints_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jul 2 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -7,7 +7,7 @@
#include "wx_html_report_panel.h"
#include "dialog_exchange_modules_base.h"
#include "dialog_exchange_footprints_base.h"
///////////////////////////////////////////////////////////////////////////

4
pcbnew/dialogs/dialog_exchange_footprints_base.fbp
View File

@ -11,11 +11,11 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_exchange_modules_base</property>
<property name="file">dialog_exchange_footprints_base</property>
<property name="first_id">4200</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_exchange_modules_base</property>
<property name="name">dialog_exchange_footprints_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>

8
pcbnew/dialogs/dialog_exchange_footprints_base.h
View File

@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jul 2 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EXCHANGE_MODULES_BASE_H__
#define __DIALOG_EXCHANGE_MODULES_BASE_H__
#ifndef __DIALOG_EXCHANGE_FOOTPRINTS_BASE_H__
#define __DIALOG_EXCHANGE_FOOTPRINTS_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
@ -84,4 +84,4 @@ class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM
};
#endif //__DIALOG_EXCHANGE_MODULES_BASE_H__
#endif //__DIALOG_EXCHANGE_FOOTPRINTS_BASE_H__

6
pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp
View File

@ -1,13 +1,13 @@
///////////////////////////////////////////////////////////////////////////
// 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 "wx_html_report_panel.h"
#include "dialog_gen_module_position_file_base.h"
#include "dialog_gen_footprint_position_file_base.h"
///////////////////////////////////////////////////////////////////////////

4
pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp
View File

@ -11,11 +11,11 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_gen_module_position_file_base</property>
<property name="file">dialog_gen_footprint_position_file_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">Dialog_Gen_Modules_Positions_base</property>
<property name="name">dialog_gen_footprint_positions_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>

11
pcbnew/dialogs/dialog_gen_footprint_position_file_base.h
View File

@ -1,16 +1,17 @@
///////////////////////////////////////////////////////////////////////////
// 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_GEN_MODULE_POSITION_FILE_BASE_H__
#define __DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
#ifndef __DIALOG_GEN_FOOTPRINT_POSITION_FILE_BASE_H__
#define __DIALOG_GEN_FOOTPRINT_POSITION_FILE_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class DIALOG_SHIM;
class WX_HTML_REPORT_PANEL;
#include "dialog_shim.h"
@ -62,4 +63,4 @@ class DIALOG_GEN_MODULE_POSITION_BASE : public DIALOG_SHIM
};
#endif //__DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
#endif //__DIALOG_GEN_FOOTPRINT_POSITION_FILE_BASE_H__

10
pcbnew/dialogs/dialog_global_footprints_fields_edition_base.cpp
View File

@ -1,11 +1,11 @@
///////////////////////////////////////////////////////////////////////////
// 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_global_modules_fields_edition_base.h"
#include "dialog_global_footprints_fields_edition_base.h"
///////////////////////////////////////////////////////////////////////////
@ -106,8 +106,8 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_
bMainSizer->Add( bSizerUpper, 1, wxALL|wxEXPAND, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_sdbSizerButtons = new wxStdDialogButtonSizer();
m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );

14
pcbnew/dialogs/dialog_global_footprints_fields_edition_base.h
View File

@ -1,16 +1,18 @@
///////////////////////////////////////////////////////////////////////////
// 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_GLOBAL_MODULES_FIELDS_EDITION_BASE_H__
#define __DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE_H__
#ifndef __DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE_H__
#define __DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE_H__
#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/checkbox.h>
@ -51,7 +53,7 @@ class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM
wxStaticText* m_staticText9;
wxTextCtrl* m_ThicknessValue;
wxStaticText* m_ThicknessUnit;
wxStaticLine* m_staticline1;
wxStaticLine* m_staticline;
wxStdDialogButtonSizer* m_sdbSizerButtons;
wxButton* m_sdbSizerButtonsOK;
wxButton* m_sdbSizerButtonsCancel;
@ -63,4 +65,4 @@ class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM
};
#endif //__DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE_H__
#endif //__DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE_H__

2
pcbnew/exporters/gen_footprints_placefile.cpp
View File

@ -48,7 +48,7 @@
#include <wx_html_report_panel.h>
#include <dialog_gen_module_position_file_base.h>
#include <dialog_gen_footprint_position_file_base.h>
/*
* The ASCII format of the kicad place file is:
* ### Module positions - created on 04/12/2012 15:24:24 ###