diff --git a/3d-viewer/3d_aux.cpp b/3d-viewer/3d_aux.cpp
index 8b3f6223f7..a4c60ad682 100644
--- a/3d-viewer/3d_aux.cpp
+++ b/3d-viewer/3d_aux.cpp
@@ -27,25 +27,25 @@
* @file 3d_aux.cpp
*/
-#include "fctsys.h"
+#include <fctsys.h>
#if !wxUSE_GLCANVAS
#error Please set wxUSE_GLCANVAS to 1 in setup.h.
#endif
-#include "common.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
+#include <common.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
-#include "class_board_design_settings.h"
-#include "class_zone.h"
-#include "class_text_mod.h"
-#include "class_module.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
+#include <class_board_design_settings.h>
+#include <class_zone.h>
+#include <class_text_mod.h>
+#include <class_module.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
void S3D_MASTER::Set_Object_Coords( std::vector< S3D_Vertex >& aVertices )
diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp
index 56afe767c9..627359a0ec 100644
--- a/3d-viewer/3d_canvas.cpp
+++ b/3d-viewer/3d_canvas.cpp
@@ -1,23 +1,23 @@
/**
* @file 3d_canvas.cpp
*/
-#include "fctsys.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <trigo.h>
-#include "wx/image.h"
+#include <wx/image.h>
#if !wxUSE_GLCANVAS
#error Please set wxUSE_GLCANVAS to 1 in setup.h.
#endif
-#include "wx/dataobj.h"
-#include "wx/clipbrd.h"
+#include <wx/dataobj.h>
+#include <wx/clipbrd.h>
#include <wx/wupdlock.h>
-#include "gestfich.h"
+#include <gestfich.h>
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
// -----------------
diff --git a/3d-viewer/3d_class.cpp b/3d-viewer/3d_class.cpp
index a724f852b6..e60e310641 100644
--- a/3d-viewer/3d_class.cpp
+++ b/3d-viewer/3d_class.cpp
@@ -2,9 +2,9 @@
// Name: 3d_class.cpp
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
+#include <fctsys.h>
-#include "3d_viewer.h"
+#include <3d_viewer.h>
S3D_Vertex::S3D_Vertex()
diff --git a/3d-viewer/3d_draw.cpp b/3d-viewer/3d_draw.cpp
index 718a7d2e8d..0351718c65 100644
--- a/3d-viewer/3d_draw.cpp
+++ b/3d-viewer/3d_draw.cpp
@@ -27,27 +27,27 @@
* @file 3d_draw.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "trigo.h"
-#include "pcbstruct.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "layers_id_colors_and_visibility.h"
+#include <fctsys.h>
+#include <common.h>
+#include <trigo.h>
+#include <pcbstruct.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <layers_id_colors_and_visibility.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_edge_mod.h"
-#include "class_zone.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
-#include "class_board_design_settings.h"
-#include "class_marker_pcb.h"
-#include "colors_selection.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_edge_mod.h>
+#include <class_zone.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_board_design_settings.h>
+#include <class_marker_pcb.h>
+#include <colors_selection.h>
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
#if !wxUSE_GLCANVAS
#error Please set wxUSE_GLCANVAS to 1 in setup.h.
diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp
index 5f968f7e0a..b4140358b9 100644
--- a/3d-viewer/3d_frame.cpp
+++ b/3d-viewer/3d_frame.cpp
@@ -2,15 +2,15 @@
// Name: 3d_frame.cpp
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
#if !wxUSE_GLCANVAS
#error Please set wxUSE_GLCANVAS to 1 in setup.h.
#endif
-#include "3d_viewer.h"
-#include "trackball.h"
+#include <3d_viewer.h>
+#include <trackball.h>
#include <wx/colordlg.h>
#include <wxstruct.h>
diff --git a/3d-viewer/3d_read_mesh.cpp b/3d-viewer/3d_read_mesh.cpp
index e98d398574..6740234b4a 100644
--- a/3d-viewer/3d_read_mesh.cpp
+++ b/3d-viewer/3d_read_mesh.cpp
@@ -27,13 +27,13 @@
* @file 3d_read_mesh.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
-#include "kicad_string.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
+#include <kicad_string.h>
+#include <appl_wxstruct.h>
-#include "3d_viewer.h"
+#include <3d_viewer.h>
int S3D_MASTER::ReadData()
diff --git a/3d-viewer/3d_struct.h b/3d-viewer/3d_struct.h
index b27178e339..0941f17fd1 100644
--- a/3d-viewer/3d_struct.h
+++ b/3d-viewer/3d_struct.h
@@ -30,8 +30,8 @@
#ifndef STRUCT_3D_H
#define STRUCT_3D_H
-#include "common.h"
-#include "base_struct.h"
+#include <common.h>
+#include <base_struct.h>
/* 3D modeling units -> PCB units conversion scale:
diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp
index c3436b7613..752c1015d1 100644
--- a/3d-viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_toolbar.cpp
@@ -27,9 +27,9 @@
* @file 3d_toolbar.cpp
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "3d_viewer.h"
+#include <3d_viewer.h>
void EDA_3D_FRAME::ReCreateHToolbar()
diff --git a/3d-viewer/3d_viewer.h b/3d-viewer/3d_viewer.h
index c6193a552b..4744019de9 100644
--- a/3d-viewer/3d_viewer.h
+++ b/3d-viewer/3d_viewer.h
@@ -30,14 +30,14 @@
#ifndef __3D_VIEWER_H__
#define __3D_VIEWER_H__
-#include "wxBasePcbFrame.h" // m_auimanager member.
+#include <wxBasePcbFrame.h> // m_auimanager member.
#if !wxUSE_GLCANVAS
#error Please set wxUSE_GLCANVAS to 1 in setup.h.
#endif
-#include "wx/glcanvas.h"
+#include <wx/glcanvas.h>
#ifdef __WXMAC__
# ifdef __DARWIN__
@@ -49,8 +49,8 @@
# include <GL/glu.h>
#endif
-#include "3d_struct.h"
-#include "id.h"
+#include <3d_struct.h>
+#include <id.h>
class BOARD_DESIGN_SETTINGS;
diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 472a74bd38..8f1a0a5aa9 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -1,8 +1,12 @@
add_definitions(-DPCBNEW)
-include_directories(${Boost_INCLUDE_DIR}
- ../pcbnew
- ../polygon)
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ${Boost_INCLUDE_DIR}
+ ../pcbnew
+ ../polygon
+ ${INC_AFTER}
+ )
set(3D-VIEWER_SRCS
3d_aux.cpp
@@ -12,6 +16,7 @@ set(3D-VIEWER_SRCS
3d_frame.cpp
3d_read_mesh.cpp
3d_toolbar.cpp
- trackball.cpp)
+ trackball.cpp
+ )
add_library(3d-viewer ${3D-VIEWER_SRCS})
diff --git a/3d-viewer/trackball.cpp b/3d-viewer/trackball.cpp
index 2bebd262e1..b816684fe6 100644
--- a/3d-viewer/trackball.cpp
+++ b/3d-viewer/trackball.cpp
@@ -50,8 +50,8 @@
* Gavin Bell
*/
#include <math.h>
-#include "wx/glcanvas.h" // used only to define GLfloat
-#include "trackball.h"
+#include <wx/glcanvas.h> // used only to define GLfloat
+#include <trackball.h>
/*
* This size should really be based on the distance from the center of
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6a99bab13..24d3716566 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,12 +229,20 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
add_definitions(-DHAVE_SVN_REVISION)
endif(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
+# For include_directories(BEFORE ...), which _reverses_
+# the order during insertion, so put first wanted last, which is
+# ${CMAKE_SOURCE_DIR/include. Use '.' for current source dir since
+# we don't want expansion here and now, and don't need expansion of
+# ${CMAKE_CURRENT_SOURCE_DIR}, '.' will work for any source directory.
+set(INC_BEFORE
+ .
+ ${CMAKE_SOURCE_DIR}/include
+ )
-# Include paths.
-include_directories(${CMAKE_SOURCE_DIR}/include
- ${CMAKE_SOURCE_DIR}/share
- ${CMAKE_BINARY_DIR})
-
+set(INC_AFTER
+ #include <config.h>
+ ${CMAKE_BINARY_DIR}
+ )
#================================================
# Let CMake look in these directories for nested
@@ -252,6 +260,7 @@ else()
add_subdirectory(bitmaps_xpm)
endif()
+
add_subdirectory(common)
add_subdirectory(cvpcb)
add_subdirectory(eeschema)
diff --git a/CMakeModules/PNG2cpp.cmake b/CMakeModules/PNG2cpp.cmake
index 7b63944a5e..986f534d4f 100644
--- a/CMakeModules/PNG2cpp.cmake
+++ b/CMakeModules/PNG2cpp.cmake
@@ -47,7 +47,7 @@ set( output_begin "
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include \"bitmaps.h\"
+#include <bitmaps.h>
static const unsigned char png[] = {"
)
diff --git a/CMakeModules/TokenList2DsnLexer.cmake b/CMakeModules/TokenList2DsnLexer.cmake
index f27cbdbaee..2747b2f3a8 100644
--- a/CMakeModules/TokenList2DsnLexer.cmake
+++ b/CMakeModules/TokenList2DsnLexer.cmake
@@ -104,7 +104,7 @@ set( includeFileHeader
#ifndef ${headerTag}
#define ${headerTag}
-#include \"dsnlexer.h\"
+#include <dsnlexer.h>
/**
* C++ does not put enum _values_ in separate namespaces unless the enum itself
@@ -150,7 +150,7 @@ set( sourceFileHeader
* your DSN lexer.
*/
-#include \"${result}_lexer.h\"
+#include <${result}_lexer.h>
using namespace ${enum};
diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 87f54de9d8..4ab7b012c3 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -1,8 +1,11 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ../potrace
- ../polygon/kbool/include
- ${CMAKE_SOURCE_DIR}/common
- )
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ../potrace
+ ../polygon/kbool/include
+ ../common
+ ${INC_AFTER}
+ )
set(BITMAP2COMPONENT_SRCS
bitmap2component.cpp
diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 22180719aa..f6cfc1c998 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -21,23 +21,23 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "wx/wx.h"
-#include "wx/config.h"
-#include "wx/filename.h"
+#include <wx/wx.h>
+#include <wx/config.h>
+#include <wx/filename.h>
-#include "bitmap2cmp_gui_base.h"
+#include <bitmap2cmp_gui_base.h>
-#include "potracelib.h"
-#include "bitmap_io.h"
+#include <potracelib.h>
+#include <bitmap_io.h>
-#include "colors_selection.h"
-#include "build_version.h"
+#include <colors_selection.h>
+#include <build_version.h>
#define KEYWORD_FRAME_POSX wxT( "Bmconverter_Pos_x" )
#define KEYWORD_FRAME_POSY wxT( "Bmconverter_Pos_y" )
@@ -81,8 +81,8 @@ private:
void OnExportEeschema( wxCommandEvent& event );
void OnExportPcbnew( wxCommandEvent& event );
void Binarize( double aThreshold ); // aThreshold = 0.0 (black level) to 1.0 (white level)
- void OnOptionsSelection( wxCommandEvent& event );
- void OnThresholdChange( wxScrollEvent& event );
+ void OnOptionsSelection( wxCommandEvent& event );
+ void OnThresholdChange( wxScrollEvent& event );
void NegateGreyscaleImage( );
void ExportFile( FILE* aOutfile, int aFormat );
};
@@ -113,8 +113,8 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL )
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
- m_buttonExportEeschema->Enable( false );
- m_buttonExportPcbnew->Enable( false );
+ m_buttonExportEeschema->Enable( false );
+ m_buttonExportPcbnew->Enable( false );
if ( m_FramePos == wxDefaultPosition )
Centre();
@@ -197,8 +197,8 @@ void BM2CMP_FRAME::OnLoadFile( wxCommandEvent& event )
if( ! LoadFile( fullFilename ) )
return;
- m_buttonExportEeschema->Enable( true );
- m_buttonExportPcbnew->Enable( true );
+ m_buttonExportEeschema->Enable( true );
+ m_buttonExportPcbnew->Enable( true );
SetStatusText( fullFilename );
Refresh();
}
diff --git a/bitmap2component/bitmap2component.cpp b/bitmap2component/bitmap2component.cpp
index 3da52dfea8..615339a6dd 100644
--- a/bitmap2component/bitmap2component.cpp
+++ b/bitmap2component/bitmap2component.cpp
@@ -24,7 +24,7 @@
#include <math.h>
// For some unknown reasons, polygon.hpp shoul be included first
-#include "boost/polygon/polygon.hpp"
+#include <boost/polygon/polygon.hpp>
#include <stdio.h>
#include <string.h>
@@ -33,8 +33,8 @@
#include <math.h>
#include <vector>
-#include "potracelib.h"
-#include "auxiliary.h"
+#include <potracelib.h>
+#include <auxiliary.h>
#ifndef max
diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index a45974ff95..8ea7380d7c 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -69,6 +69,10 @@ option( MAINTAIN_PNGS
"Set to true if you are a PNG maintainer and have the required tools given in the bitmaps_png/CMakeLists.txt file (default OFF)."
OFF)
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ${INC_AFTER}
+ )
# Plan for three sizes of bitmaps:
diff --git a/bitmaps_png/cpp_16/pinorient_down.cpp b/bitmaps_png/cpp_16/pinorient_down.cpp
index 847963d934..e42ebecd3b 100644
--- a/bitmaps_png/cpp_16/pinorient_down.cpp
+++ b/bitmaps_png/cpp_16/pinorient_down.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_left.cpp b/bitmaps_png/cpp_16/pinorient_left.cpp
index 8ed06a9bfc..098bb0bbe8 100644
--- a/bitmaps_png/cpp_16/pinorient_left.cpp
+++ b/bitmaps_png/cpp_16/pinorient_left.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_right.cpp b/bitmaps_png/cpp_16/pinorient_right.cpp
index 0466b0099c..c2e5df2b20 100644
--- a/bitmaps_png/cpp_16/pinorient_right.cpp
+++ b/bitmaps_png/cpp_16/pinorient_right.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_up.cpp b/bitmaps_png/cpp_16/pinorient_up.cpp
index cde042fc80..e7386d085b 100644
--- a/bitmaps_png/cpp_16/pinorient_up.cpp
+++ b/bitmaps_png/cpp_16/pinorient_up.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_active_low_input.cpp b/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
index 1e619680f9..dd805d0d27 100644
--- a/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
+++ b/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_active_low_output.cpp b/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
index f6d1118e1e..928deb00d4 100644
--- a/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
+++ b/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp b/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
index a09f0e6d61..2482f87b33 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_fall.cpp b/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
index a9112440d0..8dfcfcf013 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_invert.cpp b/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
index bcc8e79f1e..ea6192f75d 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_normal.cpp b/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
index 978d504d77..6364da3c41 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_invert.cpp b/bitmaps_png/cpp_16/pinshape_invert.cpp
index 0ed80ba48a..bf4c939dca 100644
--- a/bitmaps_png/cpp_16/pinshape_invert.cpp
+++ b/bitmaps_png/cpp_16/pinshape_invert.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_nonlogic.cpp b/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
index 981d09455a..b381465ecd 100644
--- a/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
+++ b/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_normal.cpp b/bitmaps_png/cpp_16/pinshape_normal.cpp
index f5287390d6..3e1a263e40 100644
--- a/bitmaps_png/cpp_16/pinshape_normal.cpp
+++ b/bitmaps_png/cpp_16/pinshape_normal.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_3states.cpp b/bitmaps_png/cpp_16/pintype_3states.cpp
index d2a3967364..83d82b17f4 100644
--- a/bitmaps_png/cpp_16/pintype_3states.cpp
+++ b/bitmaps_png/cpp_16/pintype_3states.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_bidi.cpp b/bitmaps_png/cpp_16/pintype_bidi.cpp
index 2fb289f134..59ecdf13c2 100644
--- a/bitmaps_png/cpp_16/pintype_bidi.cpp
+++ b/bitmaps_png/cpp_16/pintype_bidi.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_input.cpp b/bitmaps_png/cpp_16/pintype_input.cpp
index 1042aaea03..139f941554 100644
--- a/bitmaps_png/cpp_16/pintype_input.cpp
+++ b/bitmaps_png/cpp_16/pintype_input.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_noconnect.cpp b/bitmaps_png/cpp_16/pintype_noconnect.cpp
index 1ed6b1aa9c..0f2e7eab68 100644
--- a/bitmaps_png/cpp_16/pintype_noconnect.cpp
+++ b/bitmaps_png/cpp_16/pintype_noconnect.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_notspecif.cpp b/bitmaps_png/cpp_16/pintype_notspecif.cpp
index b17efebf2e..b4c5f67005 100644
--- a/bitmaps_png/cpp_16/pintype_notspecif.cpp
+++ b/bitmaps_png/cpp_16/pintype_notspecif.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_opencoll.cpp b/bitmaps_png/cpp_16/pintype_opencoll.cpp
index c4f023c380..52b2cba0fa 100644
--- a/bitmaps_png/cpp_16/pintype_opencoll.cpp
+++ b/bitmaps_png/cpp_16/pintype_opencoll.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_openemit.cpp b/bitmaps_png/cpp_16/pintype_openemit.cpp
index ba6c79d9f5..da47094d42 100644
--- a/bitmaps_png/cpp_16/pintype_openemit.cpp
+++ b/bitmaps_png/cpp_16/pintype_openemit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_output.cpp b/bitmaps_png/cpp_16/pintype_output.cpp
index 20bdf848ae..c779586813 100644
--- a/bitmaps_png/cpp_16/pintype_output.cpp
+++ b/bitmaps_png/cpp_16/pintype_output.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_passive.cpp b/bitmaps_png/cpp_16/pintype_passive.cpp
index 07fe350bc8..5df5cb4be5 100644
--- a/bitmaps_png/cpp_16/pintype_passive.cpp
+++ b/bitmaps_png/cpp_16/pintype_passive.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_powerinput.cpp b/bitmaps_png/cpp_16/pintype_powerinput.cpp
index 8238926dc3..d45702df13 100644
--- a/bitmaps_png/cpp_16/pintype_powerinput.cpp
+++ b/bitmaps_png/cpp_16/pintype_powerinput.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_poweroutput.cpp b/bitmaps_png/cpp_16/pintype_poweroutput.cpp
index c93d135711..29c5cbca19 100644
--- a/bitmaps_png/cpp_16/pintype_poweroutput.cpp
+++ b/bitmaps_png/cpp_16/pintype_poweroutput.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_arc.cpp b/bitmaps_png/cpp_26/add_arc.cpp
index 8b9397f8cb..7300344d5c 100644
--- a/bitmaps_png/cpp_26/add_arc.cpp
+++ b/bitmaps_png/cpp_26/add_arc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_bus.cpp b/bitmaps_png/cpp_26/add_bus.cpp
index a3111616e8..df0e599c8d 100644
--- a/bitmaps_png/cpp_26/add_bus.cpp
+++ b/bitmaps_png/cpp_26/add_bus.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_bus2bus.cpp b/bitmaps_png/cpp_26/add_bus2bus.cpp
index 858bb97306..70d662f39b 100644
--- a/bitmaps_png/cpp_26/add_bus2bus.cpp
+++ b/bitmaps_png/cpp_26/add_bus2bus.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_circle.cpp b/bitmaps_png/cpp_26/add_circle.cpp
index e19f0720a1..a843110125 100644
--- a/bitmaps_png/cpp_26/add_circle.cpp
+++ b/bitmaps_png/cpp_26/add_circle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_component.cpp b/bitmaps_png/cpp_26/add_component.cpp
index 1e336d38ad..98115f65ec 100644
--- a/bitmaps_png/cpp_26/add_component.cpp
+++ b/bitmaps_png/cpp_26/add_component.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_corner.cpp b/bitmaps_png/cpp_26/add_corner.cpp
index df813b7ac5..f1e34aa272 100644
--- a/bitmaps_png/cpp_26/add_corner.cpp
+++ b/bitmaps_png/cpp_26/add_corner.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_dashed_line.cpp b/bitmaps_png/cpp_26/add_dashed_line.cpp
index e8bf07049e..5579224ae2 100644
--- a/bitmaps_png/cpp_26/add_dashed_line.cpp
+++ b/bitmaps_png/cpp_26/add_dashed_line.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_dimension.cpp b/bitmaps_png/cpp_26/add_dimension.cpp
index 6bb1252215..8dcbc2aab3 100644
--- a/bitmaps_png/cpp_26/add_dimension.cpp
+++ b/bitmaps_png/cpp_26/add_dimension.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_entry.cpp b/bitmaps_png/cpp_26/add_entry.cpp
index 12dd42e500..e572a09f28 100644
--- a/bitmaps_png/cpp_26/add_entry.cpp
+++ b/bitmaps_png/cpp_26/add_entry.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_glabel.cpp b/bitmaps_png/cpp_26/add_glabel.cpp
index a192c343ec..7860c5a52b 100644
--- a/bitmaps_png/cpp_26/add_glabel.cpp
+++ b/bitmaps_png/cpp_26/add_glabel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierar_pin.cpp b/bitmaps_png/cpp_26/add_hierar_pin.cpp
index 0622c1fbbc..cbe601df1d 100644
--- a/bitmaps_png/cpp_26/add_hierar_pin.cpp
+++ b/bitmaps_png/cpp_26/add_hierar_pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierar_subsheet.cpp b/bitmaps_png/cpp_26/add_hierar_subsheet.cpp
index 0063b3e7f3..cf3bdf37c7 100644
--- a/bitmaps_png/cpp_26/add_hierar_subsheet.cpp
+++ b/bitmaps_png/cpp_26/add_hierar_subsheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierarchical_label.cpp b/bitmaps_png/cpp_26/add_hierarchical_label.cpp
index 9fdf852234..25124cd0ec 100644
--- a/bitmaps_png/cpp_26/add_hierarchical_label.cpp
+++ b/bitmaps_png/cpp_26/add_hierarchical_label.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
index 0616d19da4..ce55f12087 100644
--- a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
+++ b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_junction.cpp b/bitmaps_png/cpp_26/add_junction.cpp
index 2edd7d658c..0c5470d310 100644
--- a/bitmaps_png/cpp_26/add_junction.cpp
+++ b/bitmaps_png/cpp_26/add_junction.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_line.cpp b/bitmaps_png/cpp_26/add_line.cpp
index 2992629294..8160ea76e5 100644
--- a/bitmaps_png/cpp_26/add_line.cpp
+++ b/bitmaps_png/cpp_26/add_line.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_line2bus.cpp b/bitmaps_png/cpp_26/add_line2bus.cpp
index cc6eac2381..4dabe79051 100644
--- a/bitmaps_png/cpp_26/add_line2bus.cpp
+++ b/bitmaps_png/cpp_26/add_line2bus.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_line_label.cpp b/bitmaps_png/cpp_26/add_line_label.cpp
index a36a469221..e0ef11ed81 100644
--- a/bitmaps_png/cpp_26/add_line_label.cpp
+++ b/bitmaps_png/cpp_26/add_line_label.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_mires.cpp b/bitmaps_png/cpp_26/add_mires.cpp
index 932ad93647..a354514728 100644
--- a/bitmaps_png/cpp_26/add_mires.cpp
+++ b/bitmaps_png/cpp_26/add_mires.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_polygon.cpp b/bitmaps_png/cpp_26/add_polygon.cpp
index 821f1b9aca..c8defc0236 100644
--- a/bitmaps_png/cpp_26/add_polygon.cpp
+++ b/bitmaps_png/cpp_26/add_polygon.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_power.cpp b/bitmaps_png/cpp_26/add_power.cpp
index 9023fcf892..02035a3bbb 100644
--- a/bitmaps_png/cpp_26/add_power.cpp
+++ b/bitmaps_png/cpp_26/add_power.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_rectangle.cpp b/bitmaps_png/cpp_26/add_rectangle.cpp
index 1b100e2dbf..6f56ba0269 100644
--- a/bitmaps_png/cpp_26/add_rectangle.cpp
+++ b/bitmaps_png/cpp_26/add_rectangle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_text.cpp b/bitmaps_png/cpp_26/add_text.cpp
index 43e0cde667..53ec8773a6 100644
--- a/bitmaps_png/cpp_26/add_text.cpp
+++ b/bitmaps_png/cpp_26/add_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_tracks.cpp b/bitmaps_png/cpp_26/add_tracks.cpp
index c6cbcdcf67..7e0301f318 100644
--- a/bitmaps_png/cpp_26/add_tracks.cpp
+++ b/bitmaps_png/cpp_26/add_tracks.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_zone.cpp b/bitmaps_png/cpp_26/add_zone.cpp
index 037b33ee35..3e92743f1e 100644
--- a/bitmaps_png/cpp_26/add_zone.cpp
+++ b/bitmaps_png/cpp_26/add_zone.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_zone_cutout.cpp b/bitmaps_png/cpp_26/add_zone_cutout.cpp
index 17e3a4b497..12e0e5bdd6 100644
--- a/bitmaps_png/cpp_26/add_zone_cutout.cpp
+++ b/bitmaps_png/cpp_26/add_zone_cutout.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/anchor.cpp b/bitmaps_png/cpp_26/anchor.cpp
index b31401312c..b1c3b05c09 100644
--- a/bitmaps_png/cpp_26/anchor.cpp
+++ b/bitmaps_png/cpp_26/anchor.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/annotate.cpp b/bitmaps_png/cpp_26/annotate.cpp
index e991631b8d..82ed5ad756 100644
--- a/bitmaps_png/cpp_26/annotate.cpp
+++ b/bitmaps_png/cpp_26/annotate.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/annotate_down_right.cpp b/bitmaps_png/cpp_26/annotate_down_right.cpp
index 57dc6f26fa..c65b5df969 100644
--- a/bitmaps_png/cpp_26/annotate_down_right.cpp
+++ b/bitmaps_png/cpp_26/annotate_down_right.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/annotate_right_down.cpp b/bitmaps_png/cpp_26/annotate_right_down.cpp
index 40c9c51a13..29e652a497 100644
--- a/bitmaps_png/cpp_26/annotate_right_down.cpp
+++ b/bitmaps_png/cpp_26/annotate_right_down.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/apply.cpp b/bitmaps_png/cpp_26/apply.cpp
index 5b945e9ad8..da72146dd7 100644
--- a/bitmaps_png/cpp_26/apply.cpp
+++ b/bitmaps_png/cpp_26/apply.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/auto_associe.cpp b/bitmaps_png/cpp_26/auto_associe.cpp
index 2f0643e939..54af2b2713 100644
--- a/bitmaps_png/cpp_26/auto_associe.cpp
+++ b/bitmaps_png/cpp_26/auto_associe.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/auto_delete_track.cpp b/bitmaps_png/cpp_26/auto_delete_track.cpp
index 2c5ec33486..2e8e6d47f0 100644
--- a/bitmaps_png/cpp_26/auto_delete_track.cpp
+++ b/bitmaps_png/cpp_26/auto_delete_track.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/auto_track_width.cpp b/bitmaps_png/cpp_26/auto_track_width.cpp
index 688c8d3c43..0938cbbd78 100644
--- a/bitmaps_png/cpp_26/auto_track_width.cpp
+++ b/bitmaps_png/cpp_26/auto_track_width.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d.cpp b/bitmaps_png/cpp_26/axis3d.cpp
index c6ff301124..8508032599 100644
--- a/bitmaps_png/cpp_26/axis3d.cpp
+++ b/bitmaps_png/cpp_26/axis3d.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_back.cpp b/bitmaps_png/cpp_26/axis3d_back.cpp
index 0449bd88fe..b7964937c1 100644
--- a/bitmaps_png/cpp_26/axis3d_back.cpp
+++ b/bitmaps_png/cpp_26/axis3d_back.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_bottom.cpp b/bitmaps_png/cpp_26/axis3d_bottom.cpp
index e9b80a6d8a..c4c940459e 100644
--- a/bitmaps_png/cpp_26/axis3d_bottom.cpp
+++ b/bitmaps_png/cpp_26/axis3d_bottom.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_front.cpp b/bitmaps_png/cpp_26/axis3d_front.cpp
index 0e6934b844..e432299927 100644
--- a/bitmaps_png/cpp_26/axis3d_front.cpp
+++ b/bitmaps_png/cpp_26/axis3d_front.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_left.cpp b/bitmaps_png/cpp_26/axis3d_left.cpp
index 3919759a96..c1278caa11 100644
--- a/bitmaps_png/cpp_26/axis3d_left.cpp
+++ b/bitmaps_png/cpp_26/axis3d_left.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_right.cpp b/bitmaps_png/cpp_26/axis3d_right.cpp
index 4000be5059..8ee9daf815 100644
--- a/bitmaps_png/cpp_26/axis3d_right.cpp
+++ b/bitmaps_png/cpp_26/axis3d_right.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_top.cpp b/bitmaps_png/cpp_26/axis3d_top.cpp
index b3e0c8081c..72c93ff266 100644
--- a/bitmaps_png/cpp_26/axis3d_top.cpp
+++ b/bitmaps_png/cpp_26/axis3d_top.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/bom.cpp b/bitmaps_png/cpp_26/bom.cpp
index c52904b1c0..eb0475261a 100644
--- a/bitmaps_png/cpp_26/bom.cpp
+++ b/bitmaps_png/cpp_26/bom.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/book.cpp b/bitmaps_png/cpp_26/book.cpp
index 266183219c..a210d6e8e2 100644
--- a/bitmaps_png/cpp_26/book.cpp
+++ b/bitmaps_png/cpp_26/book.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/break_bus.cpp b/bitmaps_png/cpp_26/break_bus.cpp
index efa5631dd0..4185cf1982 100644
--- a/bitmaps_png/cpp_26/break_bus.cpp
+++ b/bitmaps_png/cpp_26/break_bus.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/break_line.cpp b/bitmaps_png/cpp_26/break_line.cpp
index c421afd3dd..7c4b33db51 100644
--- a/bitmaps_png/cpp_26/break_line.cpp
+++ b/bitmaps_png/cpp_26/break_line.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/browse_files.cpp b/bitmaps_png/cpp_26/browse_files.cpp
index da4a5b8a72..7c9cffa193 100644
--- a/bitmaps_png/cpp_26/browse_files.cpp
+++ b/bitmaps_png/cpp_26/browse_files.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cancel.cpp b/bitmaps_png/cpp_26/cancel.cpp
index ed961bc0a7..bebc0e935e 100644
--- a/bitmaps_png/cpp_26/cancel.cpp
+++ b/bitmaps_png/cpp_26/cancel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cancel_tool.cpp b/bitmaps_png/cpp_26/cancel_tool.cpp
index 47737db5f9..9ddf71dc7e 100644
--- a/bitmaps_png/cpp_26/cancel_tool.cpp
+++ b/bitmaps_png/cpp_26/cancel_tool.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/change_entry_orient.cpp b/bitmaps_png/cpp_26/change_entry_orient.cpp
index fe2cfba4fa..474ebdef39 100644
--- a/bitmaps_png/cpp_26/change_entry_orient.cpp
+++ b/bitmaps_png/cpp_26/change_entry_orient.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/checked_ok.cpp b/bitmaps_png/cpp_26/checked_ok.cpp
index c56e91f866..5cdaf97ccb 100644
--- a/bitmaps_png/cpp_26/checked_ok.cpp
+++ b/bitmaps_png/cpp_26/checked_ok.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/component_select_alternate_shape.cpp b/bitmaps_png/cpp_26/component_select_alternate_shape.cpp
index a4a0972e13..c3db506a8c 100644
--- a/bitmaps_png/cpp_26/component_select_alternate_shape.cpp
+++ b/bitmaps_png/cpp_26/component_select_alternate_shape.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/component_select_unit.cpp b/bitmaps_png/cpp_26/component_select_unit.cpp
index 5854c5080e..377f87d7bb 100644
--- a/bitmaps_png/cpp_26/component_select_unit.cpp
+++ b/bitmaps_png/cpp_26/component_select_unit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/config.cpp b/bitmaps_png/cpp_26/config.cpp
index 8d7fb6dd14..b8a39b267e 100644
--- a/bitmaps_png/cpp_26/config.cpp
+++ b/bitmaps_png/cpp_26/config.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copper_layers_setup.cpp b/bitmaps_png/cpp_26/copper_layers_setup.cpp
index 03359a7898..dbcc1e9b12 100644
--- a/bitmaps_png/cpp_26/copper_layers_setup.cpp
+++ b/bitmaps_png/cpp_26/copper_layers_setup.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copy_button.cpp b/bitmaps_png/cpp_26/copy_button.cpp
index ab96b376ae..eb35fd0a96 100644
--- a/bitmaps_png/cpp_26/copy_button.cpp
+++ b/bitmaps_png/cpp_26/copy_button.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copyblock.cpp b/bitmaps_png/cpp_26/copyblock.cpp
index 6aae4af180..ba64cc5804 100644
--- a/bitmaps_png/cpp_26/copyblock.cpp
+++ b/bitmaps_png/cpp_26/copyblock.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copycomponent.cpp b/bitmaps_png/cpp_26/copycomponent.cpp
index c62c39c586..86495a07ef 100644
--- a/bitmaps_png/cpp_26/copycomponent.cpp
+++ b/bitmaps_png/cpp_26/copycomponent.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/create_cmp_file.cpp b/bitmaps_png/cpp_26/create_cmp_file.cpp
index 0d939ce821..0469e8d507 100644
--- a/bitmaps_png/cpp_26/create_cmp_file.cpp
+++ b/bitmaps_png/cpp_26/create_cmp_file.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cursor.cpp b/bitmaps_png/cpp_26/cursor.cpp
index 385a83a626..4a8e2733c8 100644
--- a/bitmaps_png/cpp_26/cursor.cpp
+++ b/bitmaps_png/cpp_26/cursor.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cursor_shape.cpp b/bitmaps_png/cpp_26/cursor_shape.cpp
index 78c26a7fc9..19c947c3de 100644
--- a/bitmaps_png/cpp_26/cursor_shape.cpp
+++ b/bitmaps_png/cpp_26/cursor_shape.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cut_button.cpp b/bitmaps_png/cpp_26/cut_button.cpp
index 52287ca30c..ae01f1555e 100644
--- a/bitmaps_png/cpp_26/cut_button.cpp
+++ b/bitmaps_png/cpp_26/cut_button.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cvpcb.cpp b/bitmaps_png/cpp_26/cvpcb.cpp
index a2a6d700bd..36cecd147b 100644
--- a/bitmaps_png/cpp_26/cvpcb.cpp
+++ b/bitmaps_png/cpp_26/cvpcb.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/dashline.cpp b/bitmaps_png/cpp_26/dashline.cpp
index 1923227ddb..a0eb02a15a 100644
--- a/bitmaps_png/cpp_26/dashline.cpp
+++ b/bitmaps_png/cpp_26/dashline.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/datasheet.cpp b/bitmaps_png/cpp_26/datasheet.cpp
index 63cb08ceff..b1eee6fec4 100644
--- a/bitmaps_png/cpp_26/datasheet.cpp
+++ b/bitmaps_png/cpp_26/datasheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete.cpp b/bitmaps_png/cpp_26/delete.cpp
index 658c16cb9d..f7d56cfb85 100644
--- a/bitmaps_png/cpp_26/delete.cpp
+++ b/bitmaps_png/cpp_26/delete.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_arc.cpp b/bitmaps_png/cpp_26/delete_arc.cpp
index 5c507b3934..3d31292e9b 100644
--- a/bitmaps_png/cpp_26/delete_arc.cpp
+++ b/bitmaps_png/cpp_26/delete_arc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_association.cpp b/bitmaps_png/cpp_26/delete_association.cpp
index 5fec92fdc4..2b613ebbcf 100644
--- a/bitmaps_png/cpp_26/delete_association.cpp
+++ b/bitmaps_png/cpp_26/delete_association.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_body.cpp b/bitmaps_png/cpp_26/delete_body.cpp
index 87101726d3..76bb7cf699 100644
--- a/bitmaps_png/cpp_26/delete_body.cpp
+++ b/bitmaps_png/cpp_26/delete_body.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_bus.cpp b/bitmaps_png/cpp_26/delete_bus.cpp
index 91f49aba07..f166053511 100644
--- a/bitmaps_png/cpp_26/delete_bus.cpp
+++ b/bitmaps_png/cpp_26/delete_bus.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_circle.cpp b/bitmaps_png/cpp_26/delete_circle.cpp
index 77c9a16f28..6e804ab766 100644
--- a/bitmaps_png/cpp_26/delete_circle.cpp
+++ b/bitmaps_png/cpp_26/delete_circle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_connection.cpp b/bitmaps_png/cpp_26/delete_connection.cpp
index de3337d3bf..05ff3c7f0b 100644
--- a/bitmaps_png/cpp_26/delete_connection.cpp
+++ b/bitmaps_png/cpp_26/delete_connection.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_cotation.cpp b/bitmaps_png/cpp_26/delete_cotation.cpp
index 3a87213940..943866702f 100644
--- a/bitmaps_png/cpp_26/delete_cotation.cpp
+++ b/bitmaps_png/cpp_26/delete_cotation.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_field.cpp b/bitmaps_png/cpp_26/delete_field.cpp
index 2d37ffa15f..91869b775e 100644
--- a/bitmaps_png/cpp_26/delete_field.cpp
+++ b/bitmaps_png/cpp_26/delete_field.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_glabel.cpp b/bitmaps_png/cpp_26/delete_glabel.cpp
index 4432b9e2b2..c8730c606e 100644
--- a/bitmaps_png/cpp_26/delete_glabel.cpp
+++ b/bitmaps_png/cpp_26/delete_glabel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_line.cpp b/bitmaps_png/cpp_26/delete_line.cpp
index f94b5903eb..da28d59418 100644
--- a/bitmaps_png/cpp_26/delete_line.cpp
+++ b/bitmaps_png/cpp_26/delete_line.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_module.cpp b/bitmaps_png/cpp_26/delete_module.cpp
index eaac2b06e7..aca264e816 100644
--- a/bitmaps_png/cpp_26/delete_module.cpp
+++ b/bitmaps_png/cpp_26/delete_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_net.cpp b/bitmaps_png/cpp_26/delete_net.cpp
index 6a650be6b1..64794ccfd2 100644
--- a/bitmaps_png/cpp_26/delete_net.cpp
+++ b/bitmaps_png/cpp_26/delete_net.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_node.cpp b/bitmaps_png/cpp_26/delete_node.cpp
index 891f2e1f79..b00d3206c6 100644
--- a/bitmaps_png/cpp_26/delete_node.cpp
+++ b/bitmaps_png/cpp_26/delete_node.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_pad.cpp b/bitmaps_png/cpp_26/delete_pad.cpp
index 0958cf8273..e74650f348 100644
--- a/bitmaps_png/cpp_26/delete_pad.cpp
+++ b/bitmaps_png/cpp_26/delete_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_pin.cpp b/bitmaps_png/cpp_26/delete_pin.cpp
index 0d631f80ea..9c5494da76 100644
--- a/bitmaps_png/cpp_26/delete_pin.cpp
+++ b/bitmaps_png/cpp_26/delete_pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_pinsheet.cpp b/bitmaps_png/cpp_26/delete_pinsheet.cpp
index 96ceee3d6a..86da59931c 100644
--- a/bitmaps_png/cpp_26/delete_pinsheet.cpp
+++ b/bitmaps_png/cpp_26/delete_pinsheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_polygon.cpp b/bitmaps_png/cpp_26/delete_polygon.cpp
index 9756c34260..6d6d7ddc9f 100644
--- a/bitmaps_png/cpp_26/delete_polygon.cpp
+++ b/bitmaps_png/cpp_26/delete_polygon.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_rectangle.cpp b/bitmaps_png/cpp_26/delete_rectangle.cpp
index addde1daaf..e40e740da7 100644
--- a/bitmaps_png/cpp_26/delete_rectangle.cpp
+++ b/bitmaps_png/cpp_26/delete_rectangle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_segment.cpp b/bitmaps_png/cpp_26/delete_segment.cpp
index 7123f70ca5..b6add46b6d 100644
--- a/bitmaps_png/cpp_26/delete_segment.cpp
+++ b/bitmaps_png/cpp_26/delete_segment.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_sheet.cpp b/bitmaps_png/cpp_26/delete_sheet.cpp
index e59ffcc77a..b033dcab1a 100644
--- a/bitmaps_png/cpp_26/delete_sheet.cpp
+++ b/bitmaps_png/cpp_26/delete_sheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_text.cpp b/bitmaps_png/cpp_26/delete_text.cpp
index fba10d8829..89fd395f6d 100644
--- a/bitmaps_png/cpp_26/delete_text.cpp
+++ b/bitmaps_png/cpp_26/delete_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_track.cpp b/bitmaps_png/cpp_26/delete_track.cpp
index 17674dc7f9..af7034740d 100644
--- a/bitmaps_png/cpp_26/delete_track.cpp
+++ b/bitmaps_png/cpp_26/delete_track.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/directory.cpp b/bitmaps_png/cpp_26/directory.cpp
index 28c2f01ff3..665f93fa13 100644
--- a/bitmaps_png/cpp_26/directory.cpp
+++ b/bitmaps_png/cpp_26/directory.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/display_options.cpp b/bitmaps_png/cpp_26/display_options.cpp
index 15cbac3c31..d6eb0c80a2 100644
--- a/bitmaps_png/cpp_26/display_options.cpp
+++ b/bitmaps_png/cpp_26/display_options.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/down.cpp b/bitmaps_png/cpp_26/down.cpp
index 09d5080c7b..657f77eb70 100644
--- a/bitmaps_png/cpp_26/down.cpp
+++ b/bitmaps_png/cpp_26/down.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_module.cpp b/bitmaps_png/cpp_26/drag_module.cpp
index 4cc6309e54..1264f11272 100644
--- a/bitmaps_png/cpp_26/drag_module.cpp
+++ b/bitmaps_png/cpp_26/drag_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_outline_segment.cpp b/bitmaps_png/cpp_26/drag_outline_segment.cpp
index c7ff7ee182..9df7611d20 100644
--- a/bitmaps_png/cpp_26/drag_outline_segment.cpp
+++ b/bitmaps_png/cpp_26/drag_outline_segment.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_pad.cpp b/bitmaps_png/cpp_26/drag_pad.cpp
index caee751a4f..b371fa924c 100644
--- a/bitmaps_png/cpp_26/drag_pad.cpp
+++ b/bitmaps_png/cpp_26/drag_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_segment_withslope.cpp b/bitmaps_png/cpp_26/drag_segment_withslope.cpp
index 35107bef9b..274f814de7 100644
--- a/bitmaps_png/cpp_26/drag_segment_withslope.cpp
+++ b/bitmaps_png/cpp_26/drag_segment_withslope.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_track_segment.cpp b/bitmaps_png/cpp_26/drag_track_segment.cpp
index 3bd169f652..447ff5f4d1 100644
--- a/bitmaps_png/cpp_26/drag_track_segment.cpp
+++ b/bitmaps_png/cpp_26/drag_track_segment.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drc.cpp b/bitmaps_png/cpp_26/drc.cpp
index e832260bda..1068f996a8 100644
--- a/bitmaps_png/cpp_26/drc.cpp
+++ b/bitmaps_png/cpp_26/drc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drc_off.cpp b/bitmaps_png/cpp_26/drc_off.cpp
index 0e1703b87c..ee8de92219 100644
--- a/bitmaps_png/cpp_26/drc_off.cpp
+++ b/bitmaps_png/cpp_26/drc_off.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edges_sketch.cpp b/bitmaps_png/cpp_26/edges_sketch.cpp
index 17dfe53a1d..69aef6765f 100644
--- a/bitmaps_png/cpp_26/edges_sketch.cpp
+++ b/bitmaps_png/cpp_26/edges_sketch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit.cpp b/bitmaps_png/cpp_26/edit.cpp
index 51e937f624..f01914af8a 100644
--- a/bitmaps_png/cpp_26/edit.cpp
+++ b/bitmaps_png/cpp_26/edit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_comp_footprint.cpp b/bitmaps_png/cpp_26/edit_comp_footprint.cpp
index e50f15a99a..faefdba1f6 100644
--- a/bitmaps_png/cpp_26/edit_comp_footprint.cpp
+++ b/bitmaps_png/cpp_26/edit_comp_footprint.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_comp_ref.cpp b/bitmaps_png/cpp_26/edit_comp_ref.cpp
index 942fbc2775..275548111f 100644
--- a/bitmaps_png/cpp_26/edit_comp_ref.cpp
+++ b/bitmaps_png/cpp_26/edit_comp_ref.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_comp_value.cpp b/bitmaps_png/cpp_26/edit_comp_value.cpp
index 762c8fb9b5..5cf1b540aa 100644
--- a/bitmaps_png/cpp_26/edit_comp_value.cpp
+++ b/bitmaps_png/cpp_26/edit_comp_value.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_component.cpp b/bitmaps_png/cpp_26/edit_component.cpp
index e88647aa49..8cb502677f 100644
--- a/bitmaps_png/cpp_26/edit_component.cpp
+++ b/bitmaps_png/cpp_26/edit_component.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_module.cpp b/bitmaps_png/cpp_26/edit_module.cpp
index 6d1171d49d..93d4ae69c2 100644
--- a/bitmaps_png/cpp_26/edit_module.cpp
+++ b/bitmaps_png/cpp_26/edit_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_part.cpp b/bitmaps_png/cpp_26/edit_part.cpp
index 2bafab5505..ed79b40e3e 100644
--- a/bitmaps_png/cpp_26/edit_part.cpp
+++ b/bitmaps_png/cpp_26/edit_part.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_sheet.cpp b/bitmaps_png/cpp_26/edit_sheet.cpp
index a87320b1e6..d51b8db1f7 100644
--- a/bitmaps_png/cpp_26/edit_sheet.cpp
+++ b/bitmaps_png/cpp_26/edit_sheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_text.cpp b/bitmaps_png/cpp_26/edit_text.cpp
index 9d4228042d..98534c4628 100644
--- a/bitmaps_png/cpp_26/edit_text.cpp
+++ b/bitmaps_png/cpp_26/edit_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/editor.cpp b/bitmaps_png/cpp_26/editor.cpp
index f9a364d083..a99b63fc59 100644
--- a/bitmaps_png/cpp_26/editor.cpp
+++ b/bitmaps_png/cpp_26/editor.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/eeschema.cpp b/bitmaps_png/cpp_26/eeschema.cpp
index f4dc9444ee..04da396e7f 100644
--- a/bitmaps_png/cpp_26/eeschema.cpp
+++ b/bitmaps_png/cpp_26/eeschema.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/enter_sheet.cpp b/bitmaps_png/cpp_26/enter_sheet.cpp
index 3e41638214..0735a06f22 100644
--- a/bitmaps_png/cpp_26/enter_sheet.cpp
+++ b/bitmaps_png/cpp_26/enter_sheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/erc.cpp b/bitmaps_png/cpp_26/erc.cpp
index 2fd3202fb4..96e14d743e 100644
--- a/bitmaps_png/cpp_26/erc.cpp
+++ b/bitmaps_png/cpp_26/erc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/erc_green.cpp b/bitmaps_png/cpp_26/erc_green.cpp
index 65aa9152ca..ac8724790b 100644
--- a/bitmaps_png/cpp_26/erc_green.cpp
+++ b/bitmaps_png/cpp_26/erc_green.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ercerr.cpp b/bitmaps_png/cpp_26/ercerr.cpp
index 1c8a4af3f1..3f83523e02 100644
--- a/bitmaps_png/cpp_26/ercerr.cpp
+++ b/bitmaps_png/cpp_26/ercerr.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ercwarn.cpp b/bitmaps_png/cpp_26/ercwarn.cpp
index 82f383a564..afd55a8a80 100644
--- a/bitmaps_png/cpp_26/ercwarn.cpp
+++ b/bitmaps_png/cpp_26/ercwarn.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/error.cpp b/bitmaps_png/cpp_26/error.cpp
index 02d5c886ce..a099f674cb 100644
--- a/bitmaps_png/cpp_26/error.cpp
+++ b/bitmaps_png/cpp_26/error.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/exit.cpp b/bitmaps_png/cpp_26/exit.cpp
index 182ff7a84e..88799543b2 100644
--- a/bitmaps_png/cpp_26/exit.cpp
+++ b/bitmaps_png/cpp_26/exit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export.cpp b/bitmaps_png/cpp_26/export.cpp
index 41d1aeae93..a27e01b9bc 100644
--- a/bitmaps_png/cpp_26/export.cpp
+++ b/bitmaps_png/cpp_26/export.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_footprint_names.cpp b/bitmaps_png/cpp_26/export_footprint_names.cpp
index 8d5b438cd9..72cfa53e71 100644
--- a/bitmaps_png/cpp_26/export_footprint_names.cpp
+++ b/bitmaps_png/cpp_26/export_footprint_names.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_module.cpp b/bitmaps_png/cpp_26/export_module.cpp
index 24eb101ef6..bec160f88f 100644
--- a/bitmaps_png/cpp_26/export_module.cpp
+++ b/bitmaps_png/cpp_26/export_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_options_pad.cpp b/bitmaps_png/cpp_26/export_options_pad.cpp
index e47a40d16d..1e2bcf0f74 100644
--- a/bitmaps_png/cpp_26/export_options_pad.cpp
+++ b/bitmaps_png/cpp_26/export_options_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/fabrication.cpp b/bitmaps_png/cpp_26/fabrication.cpp
index 0dd464f91e..ab272ce475 100644
--- a/bitmaps_png/cpp_26/fabrication.cpp
+++ b/bitmaps_png/cpp_26/fabrication.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/file_footprint.cpp b/bitmaps_png/cpp_26/file_footprint.cpp
index 199776ef62..8ceec9f1a3 100644
--- a/bitmaps_png/cpp_26/file_footprint.cpp
+++ b/bitmaps_png/cpp_26/file_footprint.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/fill_zone.cpp b/bitmaps_png/cpp_26/fill_zone.cpp
index 70af15c261..a66b421f07 100644
--- a/bitmaps_png/cpp_26/fill_zone.cpp
+++ b/bitmaps_png/cpp_26/fill_zone.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/find.cpp b/bitmaps_png/cpp_26/find.cpp
index 19794e8357..53bdfab5df 100644
--- a/bitmaps_png/cpp_26/find.cpp
+++ b/bitmaps_png/cpp_26/find.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/find_replace.cpp b/bitmaps_png/cpp_26/find_replace.cpp
index a3ae5bd478..4425763d1a 100644
--- a/bitmaps_png/cpp_26/find_replace.cpp
+++ b/bitmaps_png/cpp_26/find_replace.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/flag.cpp b/bitmaps_png/cpp_26/flag.cpp
index 7fb16f3874..9f23f3c749 100644
--- a/bitmaps_png/cpp_26/flag.cpp
+++ b/bitmaps_png/cpp_26/flag.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/fonts.cpp b/bitmaps_png/cpp_26/fonts.cpp
index e55ac3b7f1..3d7d6373f5 100644
--- a/bitmaps_png/cpp_26/fonts.cpp
+++ b/bitmaps_png/cpp_26/fonts.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/footprint_text.cpp b/bitmaps_png/cpp_26/footprint_text.cpp
index 237b3811a5..d44dc9e4dd 100644
--- a/bitmaps_png/cpp_26/footprint_text.cpp
+++ b/bitmaps_png/cpp_26/footprint_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gbr_select_mode0.cpp b/bitmaps_png/cpp_26/gbr_select_mode0.cpp
index cd9e3bf1c7..ad7497b40a 100644
--- a/bitmaps_png/cpp_26/gbr_select_mode0.cpp
+++ b/bitmaps_png/cpp_26/gbr_select_mode0.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gbr_select_mode1.cpp b/bitmaps_png/cpp_26/gbr_select_mode1.cpp
index 1b1d89eb95..0320f4f090 100644
--- a/bitmaps_png/cpp_26/gbr_select_mode1.cpp
+++ b/bitmaps_png/cpp_26/gbr_select_mode1.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gbr_select_mode2.cpp b/bitmaps_png/cpp_26/gbr_select_mode2.cpp
index 30f399cdf5..fb3b31543e 100644
--- a/bitmaps_png/cpp_26/gbr_select_mode2.cpp
+++ b/bitmaps_png/cpp_26/gbr_select_mode2.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/general_deletions.cpp b/bitmaps_png/cpp_26/general_deletions.cpp
index bc609d720e..823da4cfa2 100644
--- a/bitmaps_png/cpp_26/general_deletions.cpp
+++ b/bitmaps_png/cpp_26/general_deletions.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/general_ratsnest.cpp b/bitmaps_png/cpp_26/general_ratsnest.cpp
index b60b6b75d6..757342b732 100644
--- a/bitmaps_png/cpp_26/general_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/general_ratsnest.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerber_file.cpp b/bitmaps_png/cpp_26/gerber_file.cpp
index 07fabb8716..ea3f38b2e9 100644
--- a/bitmaps_png/cpp_26/gerber_file.cpp
+++ b/bitmaps_png/cpp_26/gerber_file.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerber_open_dcode_file.cpp b/bitmaps_png/cpp_26/gerber_open_dcode_file.cpp
index 2f05411148..b9cfb57ff5 100644
--- a/bitmaps_png/cpp_26/gerber_open_dcode_file.cpp
+++ b/bitmaps_png/cpp_26/gerber_open_dcode_file.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerber_recent_files.cpp b/bitmaps_png/cpp_26/gerber_recent_files.cpp
index b0ef5e0f2c..71c8df4012 100644
--- a/bitmaps_png/cpp_26/gerber_recent_files.cpp
+++ b/bitmaps_png/cpp_26/gerber_recent_files.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerbview_clear_layers.cpp b/bitmaps_png/cpp_26/gerbview_clear_layers.cpp
index 4040efa4c4..eeab7f8e63 100644
--- a/bitmaps_png/cpp_26/gerbview_clear_layers.cpp
+++ b/bitmaps_png/cpp_26/gerbview_clear_layers.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerbview_drill_file.cpp b/bitmaps_png/cpp_26/gerbview_drill_file.cpp
index 355ef8ec99..9a623648a6 100644
--- a/bitmaps_png/cpp_26/gerbview_drill_file.cpp
+++ b/bitmaps_png/cpp_26/gerbview_drill_file.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerbview_open_recent_drill_files.cpp b/bitmaps_png/cpp_26/gerbview_open_recent_drill_files.cpp
index f74bb15a78..0559577c83 100644
--- a/bitmaps_png/cpp_26/gerbview_open_recent_drill_files.cpp
+++ b/bitmaps_png/cpp_26/gerbview_open_recent_drill_files.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gl_change.cpp b/bitmaps_png/cpp_26/gl_change.cpp
index 8b38a56ac6..845d226504 100644
--- a/bitmaps_png/cpp_26/gl_change.cpp
+++ b/bitmaps_png/cpp_26/gl_change.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/glabel2label.cpp b/bitmaps_png/cpp_26/glabel2label.cpp
index 0385713716..7415043af5 100644
--- a/bitmaps_png/cpp_26/glabel2label.cpp
+++ b/bitmaps_png/cpp_26/glabel2label.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/glabel2text.cpp b/bitmaps_png/cpp_26/glabel2text.cpp
index 846e1a0aa3..8e6b2f6d67 100644
--- a/bitmaps_png/cpp_26/glabel2text.cpp
+++ b/bitmaps_png/cpp_26/glabel2text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/global_options_pad.cpp b/bitmaps_png/cpp_26/global_options_pad.cpp
index cfe3c9d676..19c6b2525b 100644
--- a/bitmaps_png/cpp_26/global_options_pad.cpp
+++ b/bitmaps_png/cpp_26/global_options_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/green.cpp b/bitmaps_png/cpp_26/green.cpp
index 2c81979a9d..903b6f5665 100644
--- a/bitmaps_png/cpp_26/green.cpp
+++ b/bitmaps_png/cpp_26/green.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/grid.cpp b/bitmaps_png/cpp_26/grid.cpp
index a88bdec4a0..91fff5edd1 100644
--- a/bitmaps_png/cpp_26/grid.cpp
+++ b/bitmaps_png/cpp_26/grid.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/grid_select.cpp b/bitmaps_png/cpp_26/grid_select.cpp
index 69634ce148..72983c5078 100644
--- a/bitmaps_png/cpp_26/grid_select.cpp
+++ b/bitmaps_png/cpp_26/grid_select.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/grid_select_axis.cpp b/bitmaps_png/cpp_26/grid_select_axis.cpp
index 493511df9b..cc6113403c 100644
--- a/bitmaps_png/cpp_26/grid_select_axis.cpp
+++ b/bitmaps_png/cpp_26/grid_select_axis.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hammer.cpp b/bitmaps_png/cpp_26/hammer.cpp
index 389eca062b..94e8f760db 100644
--- a/bitmaps_png/cpp_26/hammer.cpp
+++ b/bitmaps_png/cpp_26/hammer.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/help.cpp b/bitmaps_png/cpp_26/help.cpp
index 373c7aa677..107110577a 100644
--- a/bitmaps_png/cpp_26/help.cpp
+++ b/bitmaps_png/cpp_26/help.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hidden_pin.cpp b/bitmaps_png/cpp_26/hidden_pin.cpp
index 890f8d27dc..7e5162169d 100644
--- a/bitmaps_png/cpp_26/hidden_pin.cpp
+++ b/bitmaps_png/cpp_26/hidden_pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hierarchy_cursor.cpp b/bitmaps_png/cpp_26/hierarchy_cursor.cpp
index 32aa9965db..4d205612cc 100644
--- a/bitmaps_png/cpp_26/hierarchy_cursor.cpp
+++ b/bitmaps_png/cpp_26/hierarchy_cursor.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hierarchy_nav.cpp b/bitmaps_png/cpp_26/hierarchy_nav.cpp
index ddc897b334..41436bb34a 100644
--- a/bitmaps_png/cpp_26/hierarchy_nav.cpp
+++ b/bitmaps_png/cpp_26/hierarchy_nav.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hotkeys.cpp b/bitmaps_png/cpp_26/hotkeys.cpp
index a7836e3e91..c59fd6bd52 100644
--- a/bitmaps_png/cpp_26/hotkeys.cpp
+++ b/bitmaps_png/cpp_26/hotkeys.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/icon_cvpcb_small.cpp b/bitmaps_png/cpp_26/icon_cvpcb_small.cpp
index 7ce83ba83e..fc8f34eb20 100644
--- a/bitmaps_png/cpp_26/icon_cvpcb_small.cpp
+++ b/bitmaps_png/cpp_26/icon_cvpcb_small.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/icon_gerbview_small.cpp b/bitmaps_png/cpp_26/icon_gerbview_small.cpp
index 6213a23eae..bdc739724f 100644
--- a/bitmaps_png/cpp_26/icon_gerbview_small.cpp
+++ b/bitmaps_png/cpp_26/icon_gerbview_small.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/icon_txt.cpp b/bitmaps_png/cpp_26/icon_txt.cpp
index b6af7d2e82..df05c16365 100644
--- a/bitmaps_png/cpp_26/icon_txt.cpp
+++ b/bitmaps_png/cpp_26/icon_txt.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/image.cpp b/bitmaps_png/cpp_26/image.cpp
index 4c214c0112..967f38ae4d 100644
--- a/bitmaps_png/cpp_26/image.cpp
+++ b/bitmaps_png/cpp_26/image.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import.cpp b/bitmaps_png/cpp_26/import.cpp
index 965be69bfc..79b6493341 100644
--- a/bitmaps_png/cpp_26/import.cpp
+++ b/bitmaps_png/cpp_26/import.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import3d.cpp b/bitmaps_png/cpp_26/import3d.cpp
index a0f1f7b4d0..388b3f3608 100644
--- a/bitmaps_png/cpp_26/import3d.cpp
+++ b/bitmaps_png/cpp_26/import3d.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_cmp_from_lib.cpp b/bitmaps_png/cpp_26/import_cmp_from_lib.cpp
index e2842915d1..5be3a4dcb2 100644
--- a/bitmaps_png/cpp_26/import_cmp_from_lib.cpp
+++ b/bitmaps_png/cpp_26/import_cmp_from_lib.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_footprint_names.cpp b/bitmaps_png/cpp_26/import_footprint_names.cpp
index 35ed21b305..135ca31c62 100644
--- a/bitmaps_png/cpp_26/import_footprint_names.cpp
+++ b/bitmaps_png/cpp_26/import_footprint_names.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_hierarchical_label.cpp b/bitmaps_png/cpp_26/import_hierarchical_label.cpp
index 813d47ffc4..6e396e7513 100644
--- a/bitmaps_png/cpp_26/import_hierarchical_label.cpp
+++ b/bitmaps_png/cpp_26/import_hierarchical_label.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_module.cpp b/bitmaps_png/cpp_26/import_module.cpp
index 134dc6086d..cb2d8f950b 100644
--- a/bitmaps_png/cpp_26/import_module.cpp
+++ b/bitmaps_png/cpp_26/import_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/info.cpp b/bitmaps_png/cpp_26/info.cpp
index 5a50e298d1..4150fff5f2 100644
--- a/bitmaps_png/cpp_26/info.cpp
+++ b/bitmaps_png/cpp_26/info.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/insert_module_board.cpp b/bitmaps_png/cpp_26/insert_module_board.cpp
index ddf95e2497..453518bda2 100644
--- a/bitmaps_png/cpp_26/insert_module_board.cpp
+++ b/bitmaps_png/cpp_26/insert_module_board.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/invert_module.cpp b/bitmaps_png/cpp_26/invert_module.cpp
index 35fceeee1b..1fe9f8e980 100644
--- a/bitmaps_png/cpp_26/invert_module.cpp
+++ b/bitmaps_png/cpp_26/invert_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/invisible_text.cpp b/bitmaps_png/cpp_26/invisible_text.cpp
index 7d1a4e4b1e..389c7672bd 100644
--- a/bitmaps_png/cpp_26/invisible_text.cpp
+++ b/bitmaps_png/cpp_26/invisible_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/jigsaw.cpp b/bitmaps_png/cpp_26/jigsaw.cpp
index 153b48494c..63eee77215 100644
--- a/bitmaps_png/cpp_26/jigsaw.cpp
+++ b/bitmaps_png/cpp_26/jigsaw.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/kicad_icon_small.cpp b/bitmaps_png/cpp_26/kicad_icon_small.cpp
index d3a415d9c3..91511a3c47 100644
--- a/bitmaps_png/cpp_26/kicad_icon_small.cpp
+++ b/bitmaps_png/cpp_26/kicad_icon_small.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/label.cpp b/bitmaps_png/cpp_26/label.cpp
index 3354f10c8b..f631bda87f 100644
--- a/bitmaps_png/cpp_26/label.cpp
+++ b/bitmaps_png/cpp_26/label.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/label2glabel.cpp b/bitmaps_png/cpp_26/label2glabel.cpp
index 45bb3072cc..dff93044b0 100644
--- a/bitmaps_png/cpp_26/label2glabel.cpp
+++ b/bitmaps_png/cpp_26/label2glabel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/label2text.cpp b/bitmaps_png/cpp_26/label2text.cpp
index 4e245d1b4d..20cf056dba 100644
--- a/bitmaps_png/cpp_26/label2text.cpp
+++ b/bitmaps_png/cpp_26/label2text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_bg.cpp b/bitmaps_png/cpp_26/lang_bg.cpp
index 8360f4e99e..08b34bc3cc 100644
--- a/bitmaps_png/cpp_26/lang_bg.cpp
+++ b/bitmaps_png/cpp_26/lang_bg.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_catalan.cpp b/bitmaps_png/cpp_26/lang_catalan.cpp
index 21c7062003..0949915f6c 100644
--- a/bitmaps_png/cpp_26/lang_catalan.cpp
+++ b/bitmaps_png/cpp_26/lang_catalan.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_chinese.cpp b/bitmaps_png/cpp_26/lang_chinese.cpp
index 5461d89f8b..6144174637 100644
--- a/bitmaps_png/cpp_26/lang_chinese.cpp
+++ b/bitmaps_png/cpp_26/lang_chinese.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_cs.cpp b/bitmaps_png/cpp_26/lang_cs.cpp
index b2966caa5f..a8e5c0f699 100644
--- a/bitmaps_png/cpp_26/lang_cs.cpp
+++ b/bitmaps_png/cpp_26/lang_cs.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_de.cpp b/bitmaps_png/cpp_26/lang_de.cpp
index b4dc747bf5..003d055540 100644
--- a/bitmaps_png/cpp_26/lang_de.cpp
+++ b/bitmaps_png/cpp_26/lang_de.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_def.cpp b/bitmaps_png/cpp_26/lang_def.cpp
index 259156f111..8e12333adf 100644
--- a/bitmaps_png/cpp_26/lang_def.cpp
+++ b/bitmaps_png/cpp_26/lang_def.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_default.cpp b/bitmaps_png/cpp_26/lang_default.cpp
index 643ae2b412..f7235c73e8 100644
--- a/bitmaps_png/cpp_26/lang_default.cpp
+++ b/bitmaps_png/cpp_26/lang_default.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_en.cpp b/bitmaps_png/cpp_26/lang_en.cpp
index 007339654e..63b2e5b9e6 100644
--- a/bitmaps_png/cpp_26/lang_en.cpp
+++ b/bitmaps_png/cpp_26/lang_en.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_es.cpp b/bitmaps_png/cpp_26/lang_es.cpp
index 034bc064bd..8db664dcf3 100644
--- a/bitmaps_png/cpp_26/lang_es.cpp
+++ b/bitmaps_png/cpp_26/lang_es.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_fi.cpp b/bitmaps_png/cpp_26/lang_fi.cpp
index 83ffddbc90..7b3c160653 100644
--- a/bitmaps_png/cpp_26/lang_fi.cpp
+++ b/bitmaps_png/cpp_26/lang_fi.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_fr.cpp b/bitmaps_png/cpp_26/lang_fr.cpp
index 8f8f92b0d8..e183e4b9fb 100644
--- a/bitmaps_png/cpp_26/lang_fr.cpp
+++ b/bitmaps_png/cpp_26/lang_fr.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_gr.cpp b/bitmaps_png/cpp_26/lang_gr.cpp
index b69f0f22bb..f22d590f7f 100644
--- a/bitmaps_png/cpp_26/lang_gr.cpp
+++ b/bitmaps_png/cpp_26/lang_gr.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_hu.cpp b/bitmaps_png/cpp_26/lang_hu.cpp
index e2722938e2..17a618a49e 100644
--- a/bitmaps_png/cpp_26/lang_hu.cpp
+++ b/bitmaps_png/cpp_26/lang_hu.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_it.cpp b/bitmaps_png/cpp_26/lang_it.cpp
index bd3e587734..764d6bf024 100644
--- a/bitmaps_png/cpp_26/lang_it.cpp
+++ b/bitmaps_png/cpp_26/lang_it.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_jp.cpp b/bitmaps_png/cpp_26/lang_jp.cpp
index 6c9040e298..a4f0945590 100644
--- a/bitmaps_png/cpp_26/lang_jp.cpp
+++ b/bitmaps_png/cpp_26/lang_jp.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_ko.cpp b/bitmaps_png/cpp_26/lang_ko.cpp
index ad98d0df82..8f88c49391 100644
--- a/bitmaps_png/cpp_26/lang_ko.cpp
+++ b/bitmaps_png/cpp_26/lang_ko.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_nl.cpp b/bitmaps_png/cpp_26/lang_nl.cpp
index 9db8add54e..e6ebfb64ad 100644
--- a/bitmaps_png/cpp_26/lang_nl.cpp
+++ b/bitmaps_png/cpp_26/lang_nl.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_pl.cpp b/bitmaps_png/cpp_26/lang_pl.cpp
index c27f97f407..7c9f7d350d 100644
--- a/bitmaps_png/cpp_26/lang_pl.cpp
+++ b/bitmaps_png/cpp_26/lang_pl.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_pt.cpp b/bitmaps_png/cpp_26/lang_pt.cpp
index 51958b3a93..77307b64d5 100644
--- a/bitmaps_png/cpp_26/lang_pt.cpp
+++ b/bitmaps_png/cpp_26/lang_pt.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_ru.cpp b/bitmaps_png/cpp_26/lang_ru.cpp
index 8739cf553e..35147bd7f3 100644
--- a/bitmaps_png/cpp_26/lang_ru.cpp
+++ b/bitmaps_png/cpp_26/lang_ru.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_sl.cpp b/bitmaps_png/cpp_26/lang_sl.cpp
index 577f5d1616..09c096cf3d 100644
--- a/bitmaps_png/cpp_26/lang_sl.cpp
+++ b/bitmaps_png/cpp_26/lang_sl.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/language.cpp b/bitmaps_png/cpp_26/language.cpp
index 7edfd7e1df..8ce57f76f5 100644
--- a/bitmaps_png/cpp_26/language.cpp
+++ b/bitmaps_png/cpp_26/language.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/layers_manager.cpp b/bitmaps_png/cpp_26/layers_manager.cpp
index db3939ff47..64e1e52684 100644
--- a/bitmaps_png/cpp_26/layers_manager.cpp
+++ b/bitmaps_png/cpp_26/layers_manager.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/leave_sheet.cpp b/bitmaps_png/cpp_26/leave_sheet.cpp
index 74641fc004..35bff1b47a 100644
--- a/bitmaps_png/cpp_26/leave_sheet.cpp
+++ b/bitmaps_png/cpp_26/leave_sheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/left.cpp b/bitmaps_png/cpp_26/left.cpp
index 65fde3ece2..2bf4b77106 100644
--- a/bitmaps_png/cpp_26/left.cpp
+++ b/bitmaps_png/cpp_26/left.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lib_next.cpp b/bitmaps_png/cpp_26/lib_next.cpp
index e6a5688653..21fb919ff6 100644
--- a/bitmaps_png/cpp_26/lib_next.cpp
+++ b/bitmaps_png/cpp_26/lib_next.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lib_previous.cpp b/bitmaps_png/cpp_26/lib_previous.cpp
index 6a95ca4d8a..7fd3ac9c9a 100644
--- a/bitmaps_png/cpp_26/lib_previous.cpp
+++ b/bitmaps_png/cpp_26/lib_previous.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/libedit.cpp b/bitmaps_png/cpp_26/libedit.cpp
index 95d14b2af4..e75175db8a 100644
--- a/bitmaps_png/cpp_26/libedit.cpp
+++ b/bitmaps_png/cpp_26/libedit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/libedprt.cpp b/bitmaps_png/cpp_26/libedprt.cpp
index 74785eb73f..4264d7d39c 100644
--- a/bitmaps_png/cpp_26/libedprt.cpp
+++ b/bitmaps_png/cpp_26/libedprt.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library.cpp b/bitmaps_png/cpp_26/library.cpp
index 9ecbef300c..36d18a6472 100644
--- a/bitmaps_png/cpp_26/library.cpp
+++ b/bitmaps_png/cpp_26/library.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_browse.cpp b/bitmaps_png/cpp_26/library_browse.cpp
index 550f3a90f6..87ccca1d63 100644
--- a/bitmaps_png/cpp_26/library_browse.cpp
+++ b/bitmaps_png/cpp_26/library_browse.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_update.cpp b/bitmaps_png/cpp_26/library_update.cpp
index 7f3d8a2340..c30d6f2032 100644
--- a/bitmaps_png/cpp_26/library_update.cpp
+++ b/bitmaps_png/cpp_26/library_update.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/libsavem.cpp b/bitmaps_png/cpp_26/libsavem.cpp
index a457c94fe6..112779957e 100644
--- a/bitmaps_png/cpp_26/libsavem.cpp
+++ b/bitmaps_png/cpp_26/libsavem.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/libview.cpp b/bitmaps_png/cpp_26/libview.cpp
index 5c6d3ca5a7..512402179f 100644
--- a/bitmaps_png/cpp_26/libview.cpp
+++ b/bitmaps_png/cpp_26/libview.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lines90.cpp b/bitmaps_png/cpp_26/lines90.cpp
index 9ab6d6494b..0b72ae6d6a 100644
--- a/bitmaps_png/cpp_26/lines90.cpp
+++ b/bitmaps_png/cpp_26/lines90.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/load_module_board.cpp b/bitmaps_png/cpp_26/load_module_board.cpp
index 241bfec7e4..2bbdaa5da3 100644
--- a/bitmaps_png/cpp_26/load_module_board.cpp
+++ b/bitmaps_png/cpp_26/load_module_board.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/load_module_lib.cpp b/bitmaps_png/cpp_26/load_module_lib.cpp
index 00be91443f..853f63fc32 100644
--- a/bitmaps_png/cpp_26/load_module_lib.cpp
+++ b/bitmaps_png/cpp_26/load_module_lib.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/local_ratsnest.cpp b/bitmaps_png/cpp_26/local_ratsnest.cpp
index 859713a290..7438020670 100644
--- a/bitmaps_png/cpp_26/local_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/local_ratsnest.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/locked.cpp b/bitmaps_png/cpp_26/locked.cpp
index 53ff22c9ca..fb65df0f55 100644
--- a/bitmaps_png/cpp_26/locked.cpp
+++ b/bitmaps_png/cpp_26/locked.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/macros_record.cpp b/bitmaps_png/cpp_26/macros_record.cpp
index bea33d959a..e7c85f3f23 100644
--- a/bitmaps_png/cpp_26/macros_record.cpp
+++ b/bitmaps_png/cpp_26/macros_record.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mirepcb.cpp b/bitmaps_png/cpp_26/mirepcb.cpp
index dc9a5abc49..fc2a9d4364 100644
--- a/bitmaps_png/cpp_26/mirepcb.cpp
+++ b/bitmaps_png/cpp_26/mirepcb.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mirror_h.cpp b/bitmaps_png/cpp_26/mirror_h.cpp
index 028447d3c2..fdb0de666a 100644
--- a/bitmaps_png/cpp_26/mirror_h.cpp
+++ b/bitmaps_png/cpp_26/mirror_h.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mirror_v.cpp b/bitmaps_png/cpp_26/mirror_v.cpp
index dc64d2f702..0c95926154 100644
--- a/bitmaps_png/cpp_26/mirror_v.cpp
+++ b/bitmaps_png/cpp_26/mirror_v.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mode_module.cpp b/bitmaps_png/cpp_26/mode_module.cpp
index 2335498efa..f4a78202a9 100644
--- a/bitmaps_png/cpp_26/mode_module.cpp
+++ b/bitmaps_png/cpp_26/mode_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mode_track.cpp b/bitmaps_png/cpp_26/mode_track.cpp
index e2d62bff06..63e0f5cfcd 100644
--- a/bitmaps_png/cpp_26/mode_track.cpp
+++ b/bitmaps_png/cpp_26/mode_track.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/modedit.cpp b/bitmaps_png/cpp_26/modedit.cpp
index 59e9c1771c..e4a4b42826 100644
--- a/bitmaps_png/cpp_26/modedit.cpp
+++ b/bitmaps_png/cpp_26/modedit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/modratsnest.cpp b/bitmaps_png/cpp_26/modratsnest.cpp
index f38ec03c5f..3c4b3ad47b 100644
--- a/bitmaps_png/cpp_26/modratsnest.cpp
+++ b/bitmaps_png/cpp_26/modratsnest.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/modul_edit.cpp b/bitmaps_png/cpp_26/modul_edit.cpp
index 6fb6c04b2c..8d5061ad6c 100644
--- a/bitmaps_png/cpp_26/modul_edit.cpp
+++ b/bitmaps_png/cpp_26/modul_edit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module.cpp b/bitmaps_png/cpp_26/module.cpp
index 4093f8269d..ed3fa66b6a 100644
--- a/bitmaps_png/cpp_26/module.cpp
+++ b/bitmaps_png/cpp_26/module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_check.cpp b/bitmaps_png/cpp_26/module_check.cpp
index da01a41963..0e44103f93 100644
--- a/bitmaps_png/cpp_26/module_check.cpp
+++ b/bitmaps_png/cpp_26/module_check.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_filtered_list.cpp b/bitmaps_png/cpp_26/module_filtered_list.cpp
index 434ac46abd..fb07756f64 100644
--- a/bitmaps_png/cpp_26/module_filtered_list.cpp
+++ b/bitmaps_png/cpp_26/module_filtered_list.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_full_list.cpp b/bitmaps_png/cpp_26/module_full_list.cpp
index 22c43d463a..d74072b376 100644
--- a/bitmaps_png/cpp_26/module_full_list.cpp
+++ b/bitmaps_png/cpp_26/module_full_list.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_options.cpp b/bitmaps_png/cpp_26/module_options.cpp
index 8e5bb63f9d..97afbcabc7 100644
--- a/bitmaps_png/cpp_26/module_options.cpp
+++ b/bitmaps_png/cpp_26/module_options.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_ratsnest.cpp b/bitmaps_png/cpp_26/module_ratsnest.cpp
index bb1077c09a..bf897c7407 100644
--- a/bitmaps_png/cpp_26/module_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/module_ratsnest.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/morgan1.cpp b/bitmaps_png/cpp_26/morgan1.cpp
index d791e74f25..9464943b2e 100644
--- a/bitmaps_png/cpp_26/morgan1.cpp
+++ b/bitmaps_png/cpp_26/morgan1.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/morgan2.cpp b/bitmaps_png/cpp_26/morgan2.cpp
index 4af7bdc624..0d03d98198 100644
--- a/bitmaps_png/cpp_26/morgan2.cpp
+++ b/bitmaps_png/cpp_26/morgan2.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move.cpp b/bitmaps_png/cpp_26/move.cpp
index 1b8e2b2e69..dbff73963c 100644
--- a/bitmaps_png/cpp_26/move.cpp
+++ b/bitmaps_png/cpp_26/move.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_arc.cpp b/bitmaps_png/cpp_26/move_arc.cpp
index fd1405e914..ff754e1bbf 100644
--- a/bitmaps_png/cpp_26/move_arc.cpp
+++ b/bitmaps_png/cpp_26/move_arc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_circle.cpp b/bitmaps_png/cpp_26/move_circle.cpp
index dd3909739c..cb2927c508 100644
--- a/bitmaps_png/cpp_26/move_circle.cpp
+++ b/bitmaps_png/cpp_26/move_circle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_field.cpp b/bitmaps_png/cpp_26/move_field.cpp
index 6f132d4b6b..5501af7d52 100644
--- a/bitmaps_png/cpp_26/move_field.cpp
+++ b/bitmaps_png/cpp_26/move_field.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_glabel.cpp b/bitmaps_png/cpp_26/move_glabel.cpp
index ce96d1203f..da37be7081 100644
--- a/bitmaps_png/cpp_26/move_glabel.cpp
+++ b/bitmaps_png/cpp_26/move_glabel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_line.cpp b/bitmaps_png/cpp_26/move_line.cpp
index 18c5b2bc8c..1bd96b3a64 100644
--- a/bitmaps_png/cpp_26/move_line.cpp
+++ b/bitmaps_png/cpp_26/move_line.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_module.cpp b/bitmaps_png/cpp_26/move_module.cpp
index 35d2c763ff..3b8cedfc92 100644
--- a/bitmaps_png/cpp_26/move_module.cpp
+++ b/bitmaps_png/cpp_26/move_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_pad.cpp b/bitmaps_png/cpp_26/move_pad.cpp
index d7b925fe27..695a66dec5 100644
--- a/bitmaps_png/cpp_26/move_pad.cpp
+++ b/bitmaps_png/cpp_26/move_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_pin.cpp b/bitmaps_png/cpp_26/move_pin.cpp
index 873a682310..f05959fec3 100644
--- a/bitmaps_png/cpp_26/move_pin.cpp
+++ b/bitmaps_png/cpp_26/move_pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_pinsheet.cpp b/bitmaps_png/cpp_26/move_pinsheet.cpp
index b6454702b1..93f585ae39 100644
--- a/bitmaps_png/cpp_26/move_pinsheet.cpp
+++ b/bitmaps_png/cpp_26/move_pinsheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_polygon.cpp b/bitmaps_png/cpp_26/move_polygon.cpp
index 0fa2da2524..566a87d1d6 100644
--- a/bitmaps_png/cpp_26/move_polygon.cpp
+++ b/bitmaps_png/cpp_26/move_polygon.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_rectangle.cpp b/bitmaps_png/cpp_26/move_rectangle.cpp
index c468f2dfc2..32611e5c2d 100644
--- a/bitmaps_png/cpp_26/move_rectangle.cpp
+++ b/bitmaps_png/cpp_26/move_rectangle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_sheet.cpp b/bitmaps_png/cpp_26/move_sheet.cpp
index 70f23eb37e..b08eaea9b4 100644
--- a/bitmaps_png/cpp_26/move_sheet.cpp
+++ b/bitmaps_png/cpp_26/move_sheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_text.cpp b/bitmaps_png/cpp_26/move_text.cpp
index 2450066a36..1b97612b26 100644
--- a/bitmaps_png/cpp_26/move_text.cpp
+++ b/bitmaps_png/cpp_26/move_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_track.cpp b/bitmaps_png/cpp_26/move_track.cpp
index 394c122d17..218400b54e 100644
--- a/bitmaps_png/cpp_26/move_track.cpp
+++ b/bitmaps_png/cpp_26/move_track.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_track_segment.cpp b/bitmaps_png/cpp_26/move_track_segment.cpp
index 74af242037..5c5b6b37cf 100644
--- a/bitmaps_png/cpp_26/move_track_segment.cpp
+++ b/bitmaps_png/cpp_26/move_track_segment.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_gap.cpp b/bitmaps_png/cpp_26/mw_add_gap.cpp
index 8db14afa2e..6692a857b9 100644
--- a/bitmaps_png/cpp_26/mw_add_gap.cpp
+++ b/bitmaps_png/cpp_26/mw_add_gap.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_line.cpp b/bitmaps_png/cpp_26/mw_add_line.cpp
index c3001e9fee..03494a9739 100644
--- a/bitmaps_png/cpp_26/mw_add_line.cpp
+++ b/bitmaps_png/cpp_26/mw_add_line.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_shape.cpp b/bitmaps_png/cpp_26/mw_add_shape.cpp
index 359142e41e..8912291dff 100644
--- a/bitmaps_png/cpp_26/mw_add_shape.cpp
+++ b/bitmaps_png/cpp_26/mw_add_shape.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_stub.cpp b/bitmaps_png/cpp_26/mw_add_stub.cpp
index 76a9302c72..202dc8c4ca 100644
--- a/bitmaps_png/cpp_26/mw_add_stub.cpp
+++ b/bitmaps_png/cpp_26/mw_add_stub.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_stub_arc.cpp b/bitmaps_png/cpp_26/mw_add_stub_arc.cpp
index dfc0659831..91def8cd94 100644
--- a/bitmaps_png/cpp_26/mw_add_stub_arc.cpp
+++ b/bitmaps_png/cpp_26/mw_add_stub_arc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_toolbar.cpp b/bitmaps_png/cpp_26/mw_toolbar.cpp
index 6eae32629f..0d879842f7 100644
--- a/bitmaps_png/cpp_26/mw_toolbar.cpp
+++ b/bitmaps_png/cpp_26/mw_toolbar.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_highlight.cpp b/bitmaps_png/cpp_26/net_highlight.cpp
index 1c2b850cc8..2af9aeab2e 100644
--- a/bitmaps_png/cpp_26/net_highlight.cpp
+++ b/bitmaps_png/cpp_26/net_highlight.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_locked.cpp b/bitmaps_png/cpp_26/net_locked.cpp
index e5ca2ff30f..5428491380 100644
--- a/bitmaps_png/cpp_26/net_locked.cpp
+++ b/bitmaps_png/cpp_26/net_locked.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_unlocked.cpp b/bitmaps_png/cpp_26/net_unlocked.cpp
index a5d1dcab0d..5cd1cab018 100644
--- a/bitmaps_png/cpp_26/net_unlocked.cpp
+++ b/bitmaps_png/cpp_26/net_unlocked.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/netlist.cpp b/bitmaps_png/cpp_26/netlist.cpp
index 146f60a41b..ac06cf5df3 100644
--- a/bitmaps_png/cpp_26/netlist.cpp
+++ b/bitmaps_png/cpp_26/netlist.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new.cpp b/bitmaps_png/cpp_26/new.cpp
index ecbefdb40a..07c9b24a4b 100644
--- a/bitmaps_png/cpp_26/new.cpp
+++ b/bitmaps_png/cpp_26/new.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_component.cpp b/bitmaps_png/cpp_26/new_component.cpp
index 1df6aa5de4..945a240604 100644
--- a/bitmaps_png/cpp_26/new_component.cpp
+++ b/bitmaps_png/cpp_26/new_component.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_cvpcb.cpp b/bitmaps_png/cpp_26/new_cvpcb.cpp
index 08cf31e50a..6dd420496d 100644
--- a/bitmaps_png/cpp_26/new_cvpcb.cpp
+++ b/bitmaps_png/cpp_26/new_cvpcb.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_footprint.cpp b/bitmaps_png/cpp_26/new_footprint.cpp
index 9e06714b7a..78679e5815 100644
--- a/bitmaps_png/cpp_26/new_footprint.cpp
+++ b/bitmaps_png/cpp_26/new_footprint.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_library.cpp b/bitmaps_png/cpp_26/new_library.cpp
index cd9119a635..368066fe68 100644
--- a/bitmaps_png/cpp_26/new_library.cpp
+++ b/bitmaps_png/cpp_26/new_library.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_module.cpp b/bitmaps_png/cpp_26/new_module.cpp
index 5091d7d0d0..9980e6828b 100644
--- a/bitmaps_png/cpp_26/new_module.cpp
+++ b/bitmaps_png/cpp_26/new_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_pcb.cpp b/bitmaps_png/cpp_26/new_pcb.cpp
index da96f568b1..abca8d0d79 100644
--- a/bitmaps_png/cpp_26/new_pcb.cpp
+++ b/bitmaps_png/cpp_26/new_pcb.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_project.cpp b/bitmaps_png/cpp_26/new_project.cpp
index 2de22d8ed6..03014dba46 100644
--- a/bitmaps_png/cpp_26/new_project.cpp
+++ b/bitmaps_png/cpp_26/new_project.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_sch.cpp b/bitmaps_png/cpp_26/new_sch.cpp
index 7da830e03a..f575d71240 100644
--- a/bitmaps_png/cpp_26/new_sch.cpp
+++ b/bitmaps_png/cpp_26/new_sch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_txt.cpp b/bitmaps_png/cpp_26/new_txt.cpp
index 5da07ae02f..8ab6f4862a 100644
--- a/bitmaps_png/cpp_26/new_txt.cpp
+++ b/bitmaps_png/cpp_26/new_txt.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/noconn.cpp b/bitmaps_png/cpp_26/noconn.cpp
index d4e7c2b08e..55ec2066f2 100644
--- a/bitmaps_png/cpp_26/noconn.cpp
+++ b/bitmaps_png/cpp_26/noconn.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/normal.cpp b/bitmaps_png/cpp_26/normal.cpp
index a59e4e13b1..b0e4e392ae 100644
--- a/bitmaps_png/cpp_26/normal.cpp
+++ b/bitmaps_png/cpp_26/normal.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/online_help.cpp b/bitmaps_png/cpp_26/online_help.cpp
index 82a2c01f0e..66c762d27a 100644
--- a/bitmaps_png/cpp_26/online_help.cpp
+++ b/bitmaps_png/cpp_26/online_help.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_brd_file.cpp b/bitmaps_png/cpp_26/open_brd_file.cpp
index e9cb719ede..d402d55a4c 100644
--- a/bitmaps_png/cpp_26/open_brd_file.cpp
+++ b/bitmaps_png/cpp_26/open_brd_file.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_document.cpp b/bitmaps_png/cpp_26/open_document.cpp
index 1108ee889c..760dcc2c0f 100644
--- a/bitmaps_png/cpp_26/open_document.cpp
+++ b/bitmaps_png/cpp_26/open_document.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_library.cpp b/bitmaps_png/cpp_26/open_library.cpp
index 3717a65327..cf65a50a89 100644
--- a/bitmaps_png/cpp_26/open_library.cpp
+++ b/bitmaps_png/cpp_26/open_library.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_project.cpp b/bitmaps_png/cpp_26/open_project.cpp
index 0ef5f43074..64d360e45a 100644
--- a/bitmaps_png/cpp_26/open_project.cpp
+++ b/bitmaps_png/cpp_26/open_project.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/opt_show_polygon.cpp b/bitmaps_png/cpp_26/opt_show_polygon.cpp
index dcba5ce49b..59600050c1 100644
--- a/bitmaps_png/cpp_26/opt_show_polygon.cpp
+++ b/bitmaps_png/cpp_26/opt_show_polygon.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_all_tracks.cpp b/bitmaps_png/cpp_26/options_all_tracks.cpp
index f00cfcfcfe..2ca580f30c 100644
--- a/bitmaps_png/cpp_26/options_all_tracks.cpp
+++ b/bitmaps_png/cpp_26/options_all_tracks.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp b/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp
index 2363635d44..6162bd1d14 100644
--- a/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp
+++ b/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_all_vias.cpp b/bitmaps_png/cpp_26/options_all_vias.cpp
index 70b0e64e55..5571aaaa04 100644
--- a/bitmaps_png/cpp_26/options_all_vias.cpp
+++ b/bitmaps_png/cpp_26/options_all_vias.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_arc.cpp b/bitmaps_png/cpp_26/options_arc.cpp
index a67527ad9b..4c1d125a35 100644
--- a/bitmaps_png/cpp_26/options_arc.cpp
+++ b/bitmaps_png/cpp_26/options_arc.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_circle.cpp b/bitmaps_png/cpp_26/options_circle.cpp
index 508e82c131..490a3c9172 100644
--- a/bitmaps_png/cpp_26/options_circle.cpp
+++ b/bitmaps_png/cpp_26/options_circle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_module.cpp b/bitmaps_png/cpp_26/options_module.cpp
index 4f7421ca91..4a8ee0ea66 100644
--- a/bitmaps_png/cpp_26/options_module.cpp
+++ b/bitmaps_png/cpp_26/options_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_new_pad.cpp b/bitmaps_png/cpp_26/options_new_pad.cpp
index cd022914c3..c0205a4dc1 100644
--- a/bitmaps_png/cpp_26/options_new_pad.cpp
+++ b/bitmaps_png/cpp_26/options_new_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_pad.cpp b/bitmaps_png/cpp_26/options_pad.cpp
index 825768f532..05858c36aa 100644
--- a/bitmaps_png/cpp_26/options_pad.cpp
+++ b/bitmaps_png/cpp_26/options_pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_pin.cpp b/bitmaps_png/cpp_26/options_pin.cpp
index 9f27556637..bb4f449db8 100644
--- a/bitmaps_png/cpp_26/options_pin.cpp
+++ b/bitmaps_png/cpp_26/options_pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_pinsheet.cpp b/bitmaps_png/cpp_26/options_pinsheet.cpp
index fc43674a3a..14d1eb9f74 100644
--- a/bitmaps_png/cpp_26/options_pinsheet.cpp
+++ b/bitmaps_png/cpp_26/options_pinsheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_rectangle.cpp b/bitmaps_png/cpp_26/options_rectangle.cpp
index d71e3358e9..d562eabba6 100644
--- a/bitmaps_png/cpp_26/options_rectangle.cpp
+++ b/bitmaps_png/cpp_26/options_rectangle.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_segment.cpp b/bitmaps_png/cpp_26/options_segment.cpp
index c02bfb0314..81e9004d0d 100644
--- a/bitmaps_png/cpp_26/options_segment.cpp
+++ b/bitmaps_png/cpp_26/options_segment.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_text.cpp b/bitmaps_png/cpp_26/options_text.cpp
index f19df63ca9..adf5cb385d 100644
--- a/bitmaps_png/cpp_26/options_text.cpp
+++ b/bitmaps_png/cpp_26/options_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_track.cpp b/bitmaps_png/cpp_26/options_track.cpp
index 2ccb926afd..6ca4077b7c 100644
--- a/bitmaps_png/cpp_26/options_track.cpp
+++ b/bitmaps_png/cpp_26/options_track.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_tracks.cpp b/bitmaps_png/cpp_26/options_tracks.cpp
index e955650967..31000e189a 100644
--- a/bitmaps_png/cpp_26/options_tracks.cpp
+++ b/bitmaps_png/cpp_26/options_tracks.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_vias.cpp b/bitmaps_png/cpp_26/options_vias.cpp
index 4aa4c231b1..31cc64a184 100644
--- a/bitmaps_png/cpp_26/options_vias.cpp
+++ b/bitmaps_png/cpp_26/options_vias.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/orient.cpp b/bitmaps_png/cpp_26/orient.cpp
index 01481b01fd..222d5e708d 100644
--- a/bitmaps_png/cpp_26/orient.cpp
+++ b/bitmaps_png/cpp_26/orient.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ortho.cpp b/bitmaps_png/cpp_26/ortho.cpp
index c282b1552e..03d3ce2927 100644
--- a/bitmaps_png/cpp_26/ortho.cpp
+++ b/bitmaps_png/cpp_26/ortho.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pad.cpp b/bitmaps_png/cpp_26/pad.cpp
index 1b59a83544..20a856258c 100644
--- a/bitmaps_png/cpp_26/pad.cpp
+++ b/bitmaps_png/cpp_26/pad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pad_sketch.cpp b/bitmaps_png/cpp_26/pad_sketch.cpp
index fffd4bc03f..0fd77f90f8 100644
--- a/bitmaps_png/cpp_26/pad_sketch.cpp
+++ b/bitmaps_png/cpp_26/pad_sketch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pads_mask_layers.cpp b/bitmaps_png/cpp_26/pads_mask_layers.cpp
index 76ac761ac4..60a2026436 100644
--- a/bitmaps_png/cpp_26/pads_mask_layers.cpp
+++ b/bitmaps_png/cpp_26/pads_mask_layers.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/palette.cpp b/bitmaps_png/cpp_26/palette.cpp
index 6b64f9e76d..d06f09574c 100644
--- a/bitmaps_png/cpp_26/palette.cpp
+++ b/bitmaps_png/cpp_26/palette.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/part_properties.cpp b/bitmaps_png/cpp_26/part_properties.cpp
index 57538fd38b..d580af2b95 100644
--- a/bitmaps_png/cpp_26/part_properties.cpp
+++ b/bitmaps_png/cpp_26/part_properties.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/paste.cpp b/bitmaps_png/cpp_26/paste.cpp
index d65f5c8f11..2fd19e22c7 100644
--- a/bitmaps_png/cpp_26/paste.cpp
+++ b/bitmaps_png/cpp_26/paste.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcb_offset.cpp b/bitmaps_png/cpp_26/pcb_offset.cpp
index 4d43d0668b..35174ee095 100644
--- a/bitmaps_png/cpp_26/pcb_offset.cpp
+++ b/bitmaps_png/cpp_26/pcb_offset.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcbnew.cpp b/bitmaps_png/cpp_26/pcbnew.cpp
index 6733addef9..2cec89cc45 100644
--- a/bitmaps_png/cpp_26/pcbnew.cpp
+++ b/bitmaps_png/cpp_26/pcbnew.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcboffset.cpp b/bitmaps_png/cpp_26/pcboffset.cpp
index f24b55744c..74456402d7 100644
--- a/bitmaps_png/cpp_26/pcboffset.cpp
+++ b/bitmaps_png/cpp_26/pcboffset.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin.cpp b/bitmaps_png/cpp_26/pin.cpp
index d7f3144aaf..28913190e5 100644
--- a/bitmaps_png/cpp_26/pin.cpp
+++ b/bitmaps_png/cpp_26/pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin2pin.cpp b/bitmaps_png/cpp_26/pin2pin.cpp
index 14f03c3353..7f4b05defc 100644
--- a/bitmaps_png/cpp_26/pin2pin.cpp
+++ b/bitmaps_png/cpp_26/pin2pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_name_to.cpp b/bitmaps_png/cpp_26/pin_name_to.cpp
index 28d6cd2905..5ab35c7153 100644
--- a/bitmaps_png/cpp_26/pin_name_to.cpp
+++ b/bitmaps_png/cpp_26/pin_name_to.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_number_to.cpp b/bitmaps_png/cpp_26/pin_number_to.cpp
index afa66fdbe4..6900d63832 100644
--- a/bitmaps_png/cpp_26/pin_number_to.cpp
+++ b/bitmaps_png/cpp_26/pin_number_to.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_size_to.cpp b/bitmaps_png/cpp_26/pin_size_to.cpp
index dbb82eb0c5..949c2b4379 100644
--- a/bitmaps_png/cpp_26/pin_size_to.cpp
+++ b/bitmaps_png/cpp_26/pin_size_to.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_to.cpp b/bitmaps_png/cpp_26/pin_to.cpp
index a1cd53e6bc..f5ec2a7a69 100644
--- a/bitmaps_png/cpp_26/pin_to.cpp
+++ b/bitmaps_png/cpp_26/pin_to.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot.cpp b/bitmaps_png/cpp_26/plot.cpp
index 03baf65241..b3b62ec03c 100644
--- a/bitmaps_png/cpp_26/plot.cpp
+++ b/bitmaps_png/cpp_26/plot.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_hpg.cpp b/bitmaps_png/cpp_26/plot_hpg.cpp
index db9cbcf50b..75a2f730ee 100644
--- a/bitmaps_png/cpp_26/plot_hpg.cpp
+++ b/bitmaps_png/cpp_26/plot_hpg.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_ps.cpp b/bitmaps_png/cpp_26/plot_ps.cpp
index 1d9423f2e3..1f980f6d21 100644
--- a/bitmaps_png/cpp_26/plot_ps.cpp
+++ b/bitmaps_png/cpp_26/plot_ps.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/polar.cpp b/bitmaps_png/cpp_26/polar.cpp
index 9f4010049d..b02f77a31a 100644
--- a/bitmaps_png/cpp_26/polar.cpp
+++ b/bitmaps_png/cpp_26/polar.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/polar_coord.cpp b/bitmaps_png/cpp_26/polar_coord.cpp
index 1dab44b320..12885c3bac 100644
--- a/bitmaps_png/cpp_26/polar_coord.cpp
+++ b/bitmaps_png/cpp_26/polar_coord.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/post_compo.cpp b/bitmaps_png/cpp_26/post_compo.cpp
index 1e8ecdc3db..3685ec2789 100644
--- a/bitmaps_png/cpp_26/post_compo.cpp
+++ b/bitmaps_png/cpp_26/post_compo.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/post_drill.cpp b/bitmaps_png/cpp_26/post_drill.cpp
index 998962fbc9..634854c3ed 100644
--- a/bitmaps_png/cpp_26/post_drill.cpp
+++ b/bitmaps_png/cpp_26/post_drill.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/post_module.cpp b/bitmaps_png/cpp_26/post_module.cpp
index 5a57d305bc..8b1e885109 100644
--- a/bitmaps_png/cpp_26/post_module.cpp
+++ b/bitmaps_png/cpp_26/post_module.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/preference.cpp b/bitmaps_png/cpp_26/preference.cpp
index 60b9f96fa0..c4f4b134cd 100644
--- a/bitmaps_png/cpp_26/preference.cpp
+++ b/bitmaps_png/cpp_26/preference.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/print_button.cpp b/bitmaps_png/cpp_26/print_button.cpp
index b4453e3218..176ed107aa 100644
--- a/bitmaps_png/cpp_26/print_button.cpp
+++ b/bitmaps_png/cpp_26/print_button.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ratsnest.cpp b/bitmaps_png/cpp_26/ratsnest.cpp
index 70aaf01425..17797c28ee 100644
--- a/bitmaps_png/cpp_26/ratsnest.cpp
+++ b/bitmaps_png/cpp_26/ratsnest.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/read_setup.cpp b/bitmaps_png/cpp_26/read_setup.cpp
index 0cb4f1c563..935236769f 100644
--- a/bitmaps_png/cpp_26/read_setup.cpp
+++ b/bitmaps_png/cpp_26/read_setup.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/red.cpp b/bitmaps_png/cpp_26/red.cpp
index 535411e8a0..239e0fd78d 100644
--- a/bitmaps_png/cpp_26/red.cpp
+++ b/bitmaps_png/cpp_26/red.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/redo.cpp b/bitmaps_png/cpp_26/redo.cpp
index 5bf1d5853e..a177dd909c 100644
--- a/bitmaps_png/cpp_26/redo.cpp
+++ b/bitmaps_png/cpp_26/redo.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/reload.cpp b/bitmaps_png/cpp_26/reload.cpp
index c66fcef42b..c84e05a66d 100644
--- a/bitmaps_png/cpp_26/reload.cpp
+++ b/bitmaps_png/cpp_26/reload.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/reload2.cpp b/bitmaps_png/cpp_26/reload2.cpp
index ddfcf34ba9..d783f73793 100644
--- a/bitmaps_png/cpp_26/reload2.cpp
+++ b/bitmaps_png/cpp_26/reload2.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/reset_text.cpp b/bitmaps_png/cpp_26/reset_text.cpp
index dcd4f2a2ce..c53e3513b6 100644
--- a/bitmaps_png/cpp_26/reset_text.cpp
+++ b/bitmaps_png/cpp_26/reset_text.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/resize_sheet.cpp b/bitmaps_png/cpp_26/resize_sheet.cpp
index 738f64ec35..96db8c7e2f 100644
--- a/bitmaps_png/cpp_26/resize_sheet.cpp
+++ b/bitmaps_png/cpp_26/resize_sheet.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/right.cpp b/bitmaps_png/cpp_26/right.cpp
index fc0d0eef23..795c4f291d 100644
--- a/bitmaps_png/cpp_26/right.cpp
+++ b/bitmaps_png/cpp_26/right.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_ccw.cpp b/bitmaps_png/cpp_26/rotate_ccw.cpp
index 8c2c14cd5d..1e08a00212 100644
--- a/bitmaps_png/cpp_26/rotate_ccw.cpp
+++ b/bitmaps_png/cpp_26/rotate_ccw.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_cw.cpp b/bitmaps_png/cpp_26/rotate_cw.cpp
index 04df98c9eb..0b287f6b5b 100644
--- a/bitmaps_png/cpp_26/rotate_cw.cpp
+++ b/bitmaps_png/cpp_26/rotate_cw.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_field.cpp b/bitmaps_png/cpp_26/rotate_field.cpp
index aea14c4273..56def6f66a 100644
--- a/bitmaps_png/cpp_26/rotate_field.cpp
+++ b/bitmaps_png/cpp_26/rotate_field.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_glabel.cpp b/bitmaps_png/cpp_26/rotate_glabel.cpp
index dcc50ba496..22a2f685f1 100644
--- a/bitmaps_png/cpp_26/rotate_glabel.cpp
+++ b/bitmaps_png/cpp_26/rotate_glabel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_module_neg.cpp b/bitmaps_png/cpp_26/rotate_module_neg.cpp
index 1ff9578065..0277523641 100644
--- a/bitmaps_png/cpp_26/rotate_module_neg.cpp
+++ b/bitmaps_png/cpp_26/rotate_module_neg.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_module_pos.cpp b/bitmaps_png/cpp_26/rotate_module_pos.cpp
index e13d254c17..899f47bec9 100644
--- a/bitmaps_png/cpp_26/rotate_module_pos.cpp
+++ b/bitmaps_png/cpp_26/rotate_module_pos.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_neg_x.cpp b/bitmaps_png/cpp_26/rotate_neg_x.cpp
index 3438899167..2ffe8d670a 100644
--- a/bitmaps_png/cpp_26/rotate_neg_x.cpp
+++ b/bitmaps_png/cpp_26/rotate_neg_x.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_neg_y.cpp b/bitmaps_png/cpp_26/rotate_neg_y.cpp
index 40bc3533e8..8d4cecab17 100644
--- a/bitmaps_png/cpp_26/rotate_neg_y.cpp
+++ b/bitmaps_png/cpp_26/rotate_neg_y.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_neg_z.cpp b/bitmaps_png/cpp_26/rotate_neg_z.cpp
index e1a5c78937..ae0ce52e60 100644
--- a/bitmaps_png/cpp_26/rotate_neg_z.cpp
+++ b/bitmaps_png/cpp_26/rotate_neg_z.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pin.cpp b/bitmaps_png/cpp_26/rotate_pin.cpp
index f501ca09d2..8e9901e68b 100644
--- a/bitmaps_png/cpp_26/rotate_pin.cpp
+++ b/bitmaps_png/cpp_26/rotate_pin.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pos_x.cpp b/bitmaps_png/cpp_26/rotate_pos_x.cpp
index 8995cafba0..1d1690bef9 100644
--- a/bitmaps_png/cpp_26/rotate_pos_x.cpp
+++ b/bitmaps_png/cpp_26/rotate_pos_x.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pos_y.cpp b/bitmaps_png/cpp_26/rotate_pos_y.cpp
index d099e59158..a2df1b9fd2 100644
--- a/bitmaps_png/cpp_26/rotate_pos_y.cpp
+++ b/bitmaps_png/cpp_26/rotate_pos_y.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pos_z.cpp b/bitmaps_png/cpp_26/rotate_pos_z.cpp
index d69a666475..2bbdeaa689 100644
--- a/bitmaps_png/cpp_26/rotate_pos_z.cpp
+++ b/bitmaps_png/cpp_26/rotate_pos_z.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save.cpp b/bitmaps_png/cpp_26/save.cpp
index 88604a338d..085970b5df 100644
--- a/bitmaps_png/cpp_26/save.cpp
+++ b/bitmaps_png/cpp_26/save.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_as.cpp b/bitmaps_png/cpp_26/save_as.cpp
index 86d7f8e4a6..c0edb06bcd 100644
--- a/bitmaps_png/cpp_26/save_as.cpp
+++ b/bitmaps_png/cpp_26/save_as.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_library.cpp b/bitmaps_png/cpp_26/save_library.cpp
index f6e50ed412..bf11490872 100644
--- a/bitmaps_png/cpp_26/save_library.cpp
+++ b/bitmaps_png/cpp_26/save_library.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_netlist.cpp b/bitmaps_png/cpp_26/save_netlist.cpp
index 01c8f384a5..777bff350e 100644
--- a/bitmaps_png/cpp_26/save_netlist.cpp
+++ b/bitmaps_png/cpp_26/save_netlist.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_part_in_mem.cpp b/bitmaps_png/cpp_26/save_part_in_mem.cpp
index 75f098a3e2..24b213aa1d 100644
--- a/bitmaps_png/cpp_26/save_part_in_mem.cpp
+++ b/bitmaps_png/cpp_26/save_part_in_mem.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_project.cpp b/bitmaps_png/cpp_26/save_project.cpp
index 37b59b2988..93df9c4cc9 100644
--- a/bitmaps_png/cpp_26/save_project.cpp
+++ b/bitmaps_png/cpp_26/save_project.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_setup.cpp b/bitmaps_png/cpp_26/save_setup.cpp
index 1537d3b1f8..707317b09e 100644
--- a/bitmaps_png/cpp_26/save_setup.cpp
+++ b/bitmaps_png/cpp_26/save_setup.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/schematic.cpp b/bitmaps_png/cpp_26/schematic.cpp
index 1e6f93b283..bd02f301d3 100644
--- a/bitmaps_png/cpp_26/schematic.cpp
+++ b/bitmaps_png/cpp_26/schematic.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_grid.cpp b/bitmaps_png/cpp_26/select_grid.cpp
index db2f3a80a0..990f7b3a6e 100644
--- a/bitmaps_png/cpp_26/select_grid.cpp
+++ b/bitmaps_png/cpp_26/select_grid.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_layer_pair.cpp b/bitmaps_png/cpp_26/select_layer_pair.cpp
index 6d4068f665..9ab514f033 100644
--- a/bitmaps_png/cpp_26/select_layer_pair.cpp
+++ b/bitmaps_png/cpp_26/select_layer_pair.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_w_layer.cpp b/bitmaps_png/cpp_26/select_w_layer.cpp
index bd2591c6de..480087dca1 100644
--- a/bitmaps_png/cpp_26/select_w_layer.cpp
+++ b/bitmaps_png/cpp_26/select_w_layer.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/shape_3d.cpp b/bitmaps_png/cpp_26/shape_3d.cpp
index fd6d08abb1..3ed971ee30 100644
--- a/bitmaps_png/cpp_26/shape_3d.cpp
+++ b/bitmaps_png/cpp_26/shape_3d.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sheetset.cpp b/bitmaps_png/cpp_26/sheetset.cpp
index 44a3ab1dc4..5aaff5d494 100644
--- a/bitmaps_png/cpp_26/sheetset.cpp
+++ b/bitmaps_png/cpp_26/sheetset.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_dcodenumber.cpp b/bitmaps_png/cpp_26/show_dcodenumber.cpp
index 98fce24ba3..518ce3560c 100644
--- a/bitmaps_png/cpp_26/show_dcodenumber.cpp
+++ b/bitmaps_png/cpp_26/show_dcodenumber.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_footprint.cpp b/bitmaps_png/cpp_26/show_footprint.cpp
index 665a4e2d69..a081544827 100644
--- a/bitmaps_png/cpp_26/show_footprint.cpp
+++ b/bitmaps_png/cpp_26/show_footprint.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_mod_edge.cpp b/bitmaps_png/cpp_26/show_mod_edge.cpp
index 9325ffd6f9..aae2ff1d3a 100644
--- a/bitmaps_png/cpp_26/show_mod_edge.cpp
+++ b/bitmaps_png/cpp_26/show_mod_edge.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_zone.cpp b/bitmaps_png/cpp_26/show_zone.cpp
index 07701af8ec..1f170f2368 100644
--- a/bitmaps_png/cpp_26/show_zone.cpp
+++ b/bitmaps_png/cpp_26/show_zone.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_zone_disable.cpp b/bitmaps_png/cpp_26/show_zone_disable.cpp
index dcd4d03f90..954fb2f678 100644
--- a/bitmaps_png/cpp_26/show_zone_disable.cpp
+++ b/bitmaps_png/cpp_26/show_zone_disable.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_zone_outline_only.cpp b/bitmaps_png/cpp_26/show_zone_outline_only.cpp
index 49340d44cb..31af00e966 100644
--- a/bitmaps_png/cpp_26/show_zone_outline_only.cpp
+++ b/bitmaps_png/cpp_26/show_zone_outline_only.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/showdcode.cpp b/bitmaps_png/cpp_26/showdcode.cpp
index 37041c7240..ec3d1eb12b 100644
--- a/bitmaps_png/cpp_26/showdcode.cpp
+++ b/bitmaps_png/cpp_26/showdcode.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/showmodedge.cpp b/bitmaps_png/cpp_26/showmodedge.cpp
index 953754ed82..47ae27e91a 100644
--- a/bitmaps_png/cpp_26/showmodedge.cpp
+++ b/bitmaps_png/cpp_26/showmodedge.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/showtrack.cpp b/bitmaps_png/cpp_26/showtrack.cpp
index 9ac77ffec4..eeaabc5bde 100644
--- a/bitmaps_png/cpp_26/showtrack.cpp
+++ b/bitmaps_png/cpp_26/showtrack.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/swap_layer.cpp b/bitmaps_png/cpp_26/swap_layer.cpp
index 4b01590ca6..6611b1d09b 100644
--- a/bitmaps_png/cpp_26/swap_layer.cpp
+++ b/bitmaps_png/cpp_26/swap_layer.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/text_sketch.cpp b/bitmaps_png/cpp_26/text_sketch.cpp
index e1293e52a3..5e513d8e48 100644
--- a/bitmaps_png/cpp_26/text_sketch.cpp
+++ b/bitmaps_png/cpp_26/text_sketch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/three_d.cpp b/bitmaps_png/cpp_26/three_d.cpp
index d26e1b9f85..2ef08d40c4 100644
--- a/bitmaps_png/cpp_26/three_d.cpp
+++ b/bitmaps_png/cpp_26/three_d.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/tool_ratsnest.cpp b/bitmaps_png/cpp_26/tool_ratsnest.cpp
index a67014846a..dcc06b9ddd 100644
--- a/bitmaps_png/cpp_26/tool_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/tool_ratsnest.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/tools.cpp b/bitmaps_png/cpp_26/tools.cpp
index 2c3d73cb6d..0a7d691748 100644
--- a/bitmaps_png/cpp_26/tools.cpp
+++ b/bitmaps_png/cpp_26/tools.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/track_locked.cpp b/bitmaps_png/cpp_26/track_locked.cpp
index 561f533c68..77ee69b64b 100644
--- a/bitmaps_png/cpp_26/track_locked.cpp
+++ b/bitmaps_png/cpp_26/track_locked.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/track_sketch.cpp b/bitmaps_png/cpp_26/track_sketch.cpp
index 4f2fe183c2..d670a46654 100644
--- a/bitmaps_png/cpp_26/track_sketch.cpp
+++ b/bitmaps_png/cpp_26/track_sketch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/track_unlocked.cpp b/bitmaps_png/cpp_26/track_unlocked.cpp
index 0a78b50763..54e80f8b8a 100644
--- a/bitmaps_png/cpp_26/track_unlocked.cpp
+++ b/bitmaps_png/cpp_26/track_unlocked.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/transistor.cpp b/bitmaps_png/cpp_26/transistor.cpp
index 4d9cd24ff5..6055fbc9c3 100644
--- a/bitmaps_png/cpp_26/transistor.cpp
+++ b/bitmaps_png/cpp_26/transistor.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/tree_nosel.cpp b/bitmaps_png/cpp_26/tree_nosel.cpp
index a371fbcc2a..2b8bc7b2aa 100644
--- a/bitmaps_png/cpp_26/tree_nosel.cpp
+++ b/bitmaps_png/cpp_26/tree_nosel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/tree_sel.cpp b/bitmaps_png/cpp_26/tree_sel.cpp
index dc7b8e1d4a..8302bd9b74 100644
--- a/bitmaps_png/cpp_26/tree_sel.cpp
+++ b/bitmaps_png/cpp_26/tree_sel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/treensel.cpp b/bitmaps_png/cpp_26/treensel.cpp
index 2d61c4baf3..a79ef76985 100644
--- a/bitmaps_png/cpp_26/treensel.cpp
+++ b/bitmaps_png/cpp_26/treensel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/treesel.cpp b/bitmaps_png/cpp_26/treesel.cpp
index a32661d93d..4e2e6d1eb7 100644
--- a/bitmaps_png/cpp_26/treesel.cpp
+++ b/bitmaps_png/cpp_26/treesel.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/undelete.cpp b/bitmaps_png/cpp_26/undelete.cpp
index 8458a107de..ac85d13e1e 100644
--- a/bitmaps_png/cpp_26/undelete.cpp
+++ b/bitmaps_png/cpp_26/undelete.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/undo.cpp b/bitmaps_png/cpp_26/undo.cpp
index b4e5c74333..9a9e2bca6d 100644
--- a/bitmaps_png/cpp_26/undo.cpp
+++ b/bitmaps_png/cpp_26/undo.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unit_inch.cpp b/bitmaps_png/cpp_26/unit_inch.cpp
index 2691deec6f..598909789a 100644
--- a/bitmaps_png/cpp_26/unit_inch.cpp
+++ b/bitmaps_png/cpp_26/unit_inch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unit_mm.cpp b/bitmaps_png/cpp_26/unit_mm.cpp
index b4595a83a9..abe32896f5 100644
--- a/bitmaps_png/cpp_26/unit_mm.cpp
+++ b/bitmaps_png/cpp_26/unit_mm.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unknown.cpp b/bitmaps_png/cpp_26/unknown.cpp
index 4d3648a1c1..6ed49342ee 100644
--- a/bitmaps_png/cpp_26/unknown.cpp
+++ b/bitmaps_png/cpp_26/unknown.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unlocked.cpp b/bitmaps_png/cpp_26/unlocked.cpp
index 1ed94b3125..8e42e11961 100644
--- a/bitmaps_png/cpp_26/unlocked.cpp
+++ b/bitmaps_png/cpp_26/unlocked.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unzip.cpp b/bitmaps_png/cpp_26/unzip.cpp
index fb81a458c7..6f3cd3dc41 100644
--- a/bitmaps_png/cpp_26/unzip.cpp
+++ b/bitmaps_png/cpp_26/unzip.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/up.cpp b/bitmaps_png/cpp_26/up.cpp
index 0184cd7cd4..10263d6873 100644
--- a/bitmaps_png/cpp_26/up.cpp
+++ b/bitmaps_png/cpp_26/up.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/update_module_board.cpp b/bitmaps_png/cpp_26/update_module_board.cpp
index b7613615e4..9d0fac6ab1 100644
--- a/bitmaps_png/cpp_26/update_module_board.cpp
+++ b/bitmaps_png/cpp_26/update_module_board.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/via.cpp b/bitmaps_png/cpp_26/via.cpp
index 9ab36f3bee..ccef01b106 100644
--- a/bitmaps_png/cpp_26/via.cpp
+++ b/bitmaps_png/cpp_26/via.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/via_sketch.cpp b/bitmaps_png/cpp_26/via_sketch.cpp
index cbbcce14cf..4aa76d5324 100644
--- a/bitmaps_png/cpp_26/via_sketch.cpp
+++ b/bitmaps_png/cpp_26/via_sketch.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/warning.cpp b/bitmaps_png/cpp_26/warning.cpp
index dc439030c3..bb36a67998 100644
--- a/bitmaps_png/cpp_26/warning.cpp
+++ b/bitmaps_png/cpp_26/warning.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/web_support.cpp b/bitmaps_png/cpp_26/web_support.cpp
index 04c6c89e4a..b32cae000d 100644
--- a/bitmaps_png/cpp_26/web_support.cpp
+++ b/bitmaps_png/cpp_26/web_support.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_net.cpp b/bitmaps_png/cpp_26/width_net.cpp
index cba6ccc2e4..72cb091882 100644
--- a/bitmaps_png/cpp_26/width_net.cpp
+++ b/bitmaps_png/cpp_26/width_net.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_segment.cpp b/bitmaps_png/cpp_26/width_segment.cpp
index 69b389cc3f..12abcfa6d8 100644
--- a/bitmaps_png/cpp_26/width_segment.cpp
+++ b/bitmaps_png/cpp_26/width_segment.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_track.cpp b/bitmaps_png/cpp_26/width_track.cpp
index 2ea7214085..075a727f58 100644
--- a/bitmaps_png/cpp_26/width_track.cpp
+++ b/bitmaps_png/cpp_26/width_track.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_track_via.cpp b/bitmaps_png/cpp_26/width_track_via.cpp
index ac5a0ab7d6..cedf2819b3 100644
--- a/bitmaps_png/cpp_26/width_track_via.cpp
+++ b/bitmaps_png/cpp_26/width_track_via.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_vias.cpp b/bitmaps_png/cpp_26/width_vias.cpp
index 45264d28ea..2216439bcb 100644
--- a/bitmaps_png/cpp_26/width_vias.cpp
+++ b/bitmaps_png/cpp_26/width_vias.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/window_close.cpp b/bitmaps_png/cpp_26/window_close.cpp
index 7ac4ab5d21..9cff48a56e 100644
--- a/bitmaps_png/cpp_26/window_close.cpp
+++ b/bitmaps_png/cpp_26/window_close.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zip.cpp b/bitmaps_png/cpp_26/zip.cpp
index 418582abaa..29673dd0cd 100644
--- a/bitmaps_png/cpp_26/zip.cpp
+++ b/bitmaps_png/cpp_26/zip.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zip_tool.cpp b/bitmaps_png/cpp_26/zip_tool.cpp
index b191367b56..9664bfefd7 100644
--- a/bitmaps_png/cpp_26/zip_tool.cpp
+++ b/bitmaps_png/cpp_26/zip_tool.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom.cpp b/bitmaps_png/cpp_26/zoom.cpp
index e41e3c45eb..66b8616afd 100644
--- a/bitmaps_png/cpp_26/zoom.cpp
+++ b/bitmaps_png/cpp_26/zoom.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_area.cpp b/bitmaps_png/cpp_26/zoom_area.cpp
index c8c2a4b9c0..5eef9aed78 100644
--- a/bitmaps_png/cpp_26/zoom_area.cpp
+++ b/bitmaps_png/cpp_26/zoom_area.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_center_on_screen.cpp b/bitmaps_png/cpp_26/zoom_center_on_screen.cpp
index 2111bd7dc4..610ef6841c 100644
--- a/bitmaps_png/cpp_26/zoom_center_on_screen.cpp
+++ b/bitmaps_png/cpp_26/zoom_center_on_screen.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_fit_in_page.cpp b/bitmaps_png/cpp_26/zoom_fit_in_page.cpp
index 14efd11ce8..a78f5f3c5d 100644
--- a/bitmaps_png/cpp_26/zoom_fit_in_page.cpp
+++ b/bitmaps_png/cpp_26/zoom_fit_in_page.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_in.cpp b/bitmaps_png/cpp_26/zoom_in.cpp
index e664938c03..2b65d8b10d 100644
--- a/bitmaps_png/cpp_26/zoom_in.cpp
+++ b/bitmaps_png/cpp_26/zoom_in.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_out.cpp b/bitmaps_png/cpp_26/zoom_out.cpp
index 07d91c6b64..d002832cda 100644
--- a/bitmaps_png/cpp_26/zoom_out.cpp
+++ b/bitmaps_png/cpp_26/zoom_out.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_redraw.cpp b/bitmaps_png/cpp_26/zoom_redraw.cpp
index 53de0d5688..bbb8a46e9e 100644
--- a/bitmaps_png/cpp_26/zoom_redraw.cpp
+++ b/bitmaps_png/cpp_26/zoom_redraw.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_selection.cpp b/bitmaps_png/cpp_26/zoom_selection.cpp
index 29d3df9340..991bfb0c56 100644
--- a/bitmaps_png/cpp_26/zoom_selection.cpp
+++ b/bitmaps_png/cpp_26/zoom_selection.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_3d.cpp b/bitmaps_png/cpp_48/icon_3d.cpp
index bf5170c30a..8417bf9a34 100644
--- a/bitmaps_png/cpp_48/icon_3d.cpp
+++ b/bitmaps_png/cpp_48/icon_3d.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_bitmap2component.cpp b/bitmaps_png/cpp_48/icon_bitmap2component.cpp
index 723c757378..345efcbb2c 100644
--- a/bitmaps_png/cpp_48/icon_bitmap2component.cpp
+++ b/bitmaps_png/cpp_48/icon_bitmap2component.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_cvpcb.cpp b/bitmaps_png/cpp_48/icon_cvpcb.cpp
index 0f2666b460..e917e3352f 100644
--- a/bitmaps_png/cpp_48/icon_cvpcb.cpp
+++ b/bitmaps_png/cpp_48/icon_cvpcb.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_eeschema.cpp b/bitmaps_png/cpp_48/icon_eeschema.cpp
index 15567582a9..9f2e117a80 100644
--- a/bitmaps_png/cpp_48/icon_eeschema.cpp
+++ b/bitmaps_png/cpp_48/icon_eeschema.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_gerbview.cpp b/bitmaps_png/cpp_48/icon_gerbview.cpp
index e0314dc62a..f4fb4ffa1b 100644
--- a/bitmaps_png/cpp_48/icon_gerbview.cpp
+++ b/bitmaps_png/cpp_48/icon_gerbview.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_kicad.cpp b/bitmaps_png/cpp_48/icon_kicad.cpp
index 582f494429..1f3faa7a5c 100644
--- a/bitmaps_png/cpp_48/icon_kicad.cpp
+++ b/bitmaps_png/cpp_48/icon_kicad.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_modedit.cpp b/bitmaps_png/cpp_48/icon_modedit.cpp
index 1c21769f86..75a5c9a77e 100644
--- a/bitmaps_png/cpp_48/icon_modedit.cpp
+++ b/bitmaps_png/cpp_48/icon_modedit.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_pcbcalculator.cpp b/bitmaps_png/cpp_48/icon_pcbcalculator.cpp
index c0bedaf0d2..f86006b5bf 100644
--- a/bitmaps_png/cpp_48/icon_pcbcalculator.cpp
+++ b/bitmaps_png/cpp_48/icon_pcbcalculator.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_pcbnew.cpp b/bitmaps_png/cpp_48/icon_pcbnew.cpp
index bb1fb3c770..6d73ab543e 100644
--- a/bitmaps_png/cpp_48/icon_pcbnew.cpp
+++ b/bitmaps_png/cpp_48/icon_pcbnew.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/libedit_icon.cpp b/bitmaps_png/cpp_48/libedit_icon.cpp
index 3eaaf972e0..70263d672e 100644
--- a/bitmaps_png/cpp_48/libedit_icon.cpp
+++ b/bitmaps_png/cpp_48/libedit_icon.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/viewlibs_icon.cpp b/bitmaps_png/cpp_48/viewlibs_icon.cpp
index 32d8b8035b..9cb7626efa 100644
--- a/bitmaps_png/cpp_48/viewlibs_icon.cpp
+++ b/bitmaps_png/cpp_48/viewlibs_icon.cpp
@@ -3,7 +3,7 @@
* PNG2cpp CMake script, using a *.png file as input.
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 99125d3221..5634190190 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,12 +1,16 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
- ${Boost_INCLUDE_DIR}
- ../3d-viewer
- ../pcbnew
- ../polygon
- )
-set( COMMON_ABOUT_DLG_SRCS
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ./dialogs
+ ./dialog_about
+ ${Boost_INCLUDE_DIR}
+ ../3d-viewer
+ ../pcbnew
+ ../polygon
+ ${INC_AFTER}
+ )
+
+set(COMMON_ABOUT_DLG_SRCS
dialog_about/AboutDialog_main.cpp
dialog_about/dialog_about.cpp
dialog_about/dialog_about_base.cpp
@@ -18,7 +22,7 @@ set( COMMON_ABOUT_DLG_SRCS
dialogs/dialog_hotkeys_editor.cpp
dialogs/dialog_hotkeys_editor_base.cpp
dialogs/dialog_page_settings_base.cpp
-)
+ )
set(COMMON_SRCS
${COMMON_ABOUT_DLG_SRCS}
@@ -72,7 +76,7 @@ set(COMMON_SRCS
wxwineda.cpp
xnode.cpp
zoom.cpp
-)
+ )
add_library(common ${COMMON_SRCS})
@@ -107,9 +111,9 @@ set(PCB_COMMON_SRCS
../pcbnew/collectors.cpp
../pcbnew/sel_layer.cpp
pcb_plot_params_keywords.cpp
+ dialogs/dialog_page_settings.cpp
)
-
if ( USE_NEW_PCBNEW_LOAD OR USE_NEW_PCBNEW_SAVE )
set( PCB_COMMON_SRCS ${PCB_COMMON_SRCS} ../pcbnew/item_io.cpp ../pcbnew/io_mgr.cpp ../pcbnew/kicad_plugin.cpp )
else()
@@ -123,6 +127,7 @@ set_source_files_properties( ${PCB_COMMON_SRCS} PROPERTIES
add_library(pcbcommon ${PCB_COMMON_SRCS})
+
# auto-generate netlist_lexer.h and netlist_keywords.cpp
make_lexer(
${CMAKE_CURRENT_SOURCE_DIR}/netlist.keywords
@@ -133,11 +138,11 @@ make_lexer(
# auto-generate pcb_plot_params_lexer.h and pcb_plot_params_keywords.cpp
make_lexer(
- ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params.keywords
- ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_lexer.h
- ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_keywords.cpp
- PCBPLOTPARAMS_T
- )
+ ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params.keywords
+ ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_lexer.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_keywords.cpp
+ PCBPLOTPARAMS_T
+ )
# The dsntest may not build properly using MS Visual Studio.
if(NOT MSVC)
@@ -147,4 +152,3 @@ if(NOT MSVC)
target_link_libraries( dsntest common ${wxWidgets_LIBRARIES} )
endif( NOT MSVC )
-
diff --git a/common/base_screen.cpp b/common/base_screen.cpp
index 8c1d579262..89c757134b 100644
--- a/common/base_screen.cpp
+++ b/common/base_screen.cpp
@@ -28,11 +28,11 @@
* @brief BASE_SCREEN object implementation.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "base_struct.h"
-#include "class_base_screen.h"
-#include "id.h"
+#include <fctsys.h>
+#include <common.h>
+#include <base_struct.h>
+#include <class_base_screen.h>
+#include <id.h>
#define CURSOR_SIZE 12 /// size of the cross cursor.
diff --git a/common/base_struct.cpp b/common/base_struct.cpp
index e5e4209d27..e171a04045 100644
--- a/common/base_struct.cpp
+++ b/common/base_struct.cpp
@@ -28,19 +28,18 @@
* @brief Implementation of EDA_ITEM and EDA_TEXT base classes for KiCad.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "common.h"
-#include "macros.h"
-#include "wxstruct.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
-#include "drawtxt.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <common.h>
+#include <macros.h>
+#include <wxstruct.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
+#include <drawtxt.h>
#include "../eeschema/dialogs/dialog_schematic_find.h"
-
enum textbox {
ID_TEXTBOX_LIST = 8010
};
diff --git a/common/basicframe.cpp b/common/basicframe.cpp
index cc0790e505..ec627a10d7 100644
--- a/common/basicframe.cpp
+++ b/common/basicframe.cpp
@@ -34,15 +34,15 @@
#include <wx/statline.h>
#include <wx/platinfo.h>
-#include "build_version.h"
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "online_help.h"
-#include "id.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "wxstruct.h"
-#include "macros.h"
+#include <build_version.h>
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <online_help.h>
+#include <id.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <wxstruct.h>
+#include <macros.h>
/// The default auto save interval is 10 minutes.
diff --git a/common/bezier_curves.cpp b/common/bezier_curves.cpp
index 6f290aced9..cfe64559b5 100644
--- a/common/bezier_curves.cpp
+++ b/common/bezier_curves.cpp
@@ -2,8 +2,8 @@
/* routines to handle bezier curves */
/************************************/
-#include "fctsys.h"
-#include "bezier_curves.h"
+#include <fctsys.h>
+#include <bezier_curves.h>
#define add_segment(segment) if(s_bezier_Points_Buffer[s_bezier_Points_Buffer.size()-1] != segment) s_bezier_Points_Buffer.push_back(segment);
diff --git a/common/bitmap.cpp b/common/bitmap.cpp
index c8e7d447c0..ed886ba87d 100644
--- a/common/bitmap.cpp
+++ b/common/bitmap.cpp
@@ -27,7 +27,7 @@
#include <wx/bitmap.h>
#include <wx/mstream.h>
-#include "bitmaps.h"
+#include <bitmaps.h>
#if defined(USE_PNG_BITMAPS)
diff --git a/common/block_commande.cpp b/common/block_commande.cpp
index fa605248a5..b0254615cc 100644
--- a/common/block_commande.cpp
+++ b/common/block_commande.cpp
@@ -28,16 +28,16 @@
* @brief Common routines for managing on block commands.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wxstruct.h"
-#include "common.h"
-#include "macros.h"
-#include "base_struct.h"
-#include "class_base_screen.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "block_commande.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wxstruct.h>
+#include <common.h>
+#include <macros.h>
+#include <base_struct.h>
+#include <class_base_screen.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <block_commande.h>
BLOCK_SELECTOR::BLOCK_SELECTOR() :
diff --git a/common/build_version.cpp b/common/build_version.cpp
index 647e000970..d3ae27a24d 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -1,8 +1,8 @@
/* Date for KiCad build version */
-#include "fctsys.h"
+#include <fctsys.h>
#ifdef HAVE_SVN_VERSION
-#include "version.h" // define the KICAD_BUILD_VERSION
+#include <version.h> // define the KICAD_BUILD_VERSION
#endif
#ifndef KICAD_BUILD_VERSION
diff --git a/common/class_colors_design_settings.cpp b/common/class_colors_design_settings.cpp
index 224963aba3..e809d0d88e 100644
--- a/common/class_colors_design_settings.cpp
+++ b/common/class_colors_design_settings.cpp
@@ -2,11 +2,11 @@
* @file class_colors_design_settings.cpp
* @brief Handle colors used to draw all items or layers.
*/
-#include "fctsys.h"
-#include "colors.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <colors.h>
+#include <macros.h>
-#include "class_colors_design_settings.h"
+#include <class_colors_design_settings.h>
/* Class for handle list of color settings for designs
* in Eeschema, Pcbnew and GerbView
diff --git a/common/class_layer_box_selector.cpp b/common/class_layer_box_selector.cpp
index dbaf30fb4b..f1ea54a330 100644
--- a/common/class_layer_box_selector.cpp
+++ b/common/class_layer_box_selector.cpp
@@ -1,21 +1,21 @@
-#include "common.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
-#include "colors_selection.h"
-#include "layers_id_colors_and_visibility.h"
-#include "bitmaps.h"
-#include "hotkeys.h"
-#include "help_common_strings.h"
+#include <common.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
+#include <colors_selection.h>
+#include <layers_id_colors_and_visibility.h>
+#include <bitmaps.h>
+#include <hotkeys.h>
+#include <help_common_strings.h>
-#include "class_board.h"
+#include <class_board.h>
#include <wx/ownerdrw.h>
#include <wx/menuitem.h>
#include <wx/bmpcbox.h>
#include <wx/wx.h>
-#include "class_layer_box_selector.h"
+#include <class_layer_box_selector.h>
/* class to display a layer list.
*
diff --git a/common/class_plotter.cpp b/common/class_plotter.cpp
index 78273375b5..9285340a9e 100644
--- a/common/class_plotter.cpp
+++ b/common/class_plotter.cpp
@@ -9,17 +9,17 @@
* DXF
******************************************/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "common.h"
-#include "plot_common.h"
-#include "worksheet.h"
-#include "macros.h"
-#include "class_base_screen.h"
-#include "drawtxt.h"
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <common.h>
+#include <plot_common.h>
+#include <worksheet.h>
+#include <macros.h>
+#include <class_base_screen.h>
+#include <drawtxt.h>
PLOTTER::PLOTTER( PlotFormat aPlotType )
{
diff --git a/common/class_undoredo_container.cpp b/common/class_undoredo_container.cpp
index 8ab4a66243..56454ec193 100644
--- a/common/class_undoredo_container.cpp
+++ b/common/class_undoredo_container.cpp
@@ -23,12 +23,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "common.h"
-#include "base_struct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <base_struct.h>
-#include "base_struct.h"
-#include "class_undoredo_container.h"
+#include <base_struct.h>
+#include <class_undoredo_container.h>
ITEM_PICKER::ITEM_PICKER( EDA_ITEM* aItem, UNDO_REDO_T aUndoRedoStatus )
diff --git a/common/common.cpp b/common/common.cpp
index 1b256c288e..e1141ce4d2 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -27,15 +27,15 @@
* @file common.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "common.h"
-#include "macros.h"
-#include "build_version.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <common.h>
+#include <macros.h>
+#include <build_version.h>
+#include <confirm.h>
#include <wx/process.h>
/**
diff --git a/common/common_plotDXF_functions.cpp b/common/common_plotDXF_functions.cpp
index 165da464f8..1d7bdf1dbf 100644
--- a/common/common_plotDXF_functions.cpp
+++ b/common/common_plotDXF_functions.cpp
@@ -3,14 +3,14 @@
* @brief KiCad: Common plot DXF Routines.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "plot_common.h"
-#include "macros.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <plot_common.h>
+#include <macros.h>
+#include <kicad_string.h>
/* Set the plot offset for the current plotting
diff --git a/common/common_plotGERBER_functions.cpp b/common/common_plotGERBER_functions.cpp
index bced1d6f22..cacf4476f1 100644
--- a/common/common_plotGERBER_functions.cpp
+++ b/common/common_plotGERBER_functions.cpp
@@ -3,17 +3,17 @@
* @brief Common GERBER plot routines.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "common.h"
-#include "plot_common.h"
-#include "macros.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <common.h>
+#include <plot_common.h>
+#include <macros.h>
+#include <kicad_string.h>
-#include "build_version.h"
+#include <build_version.h>
/**
diff --git a/common/common_plotHPGL_functions.cpp b/common/common_plotHPGL_functions.cpp
index 41ea7ed8d2..a88c08c68e 100644
--- a/common/common_plotHPGL_functions.cpp
+++ b/common/common_plotHPGL_functions.cpp
@@ -3,14 +3,14 @@
* @brief KiCad: Common plot HPGL Routines
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "plot_common.h"
-#include "macros.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <plot_common.h>
+#include <macros.h>
+#include <kicad_string.h>
// HPGL scale factor.
const double SCALE_HPGL = 0.102041;
diff --git a/common/common_plotPS_functions.cpp b/common/common_plotPS_functions.cpp
index 69180521a8..f30b0f1921 100644
--- a/common/common_plotPS_functions.cpp
+++ b/common/common_plotPS_functions.cpp
@@ -3,14 +3,14 @@
* @brief Kicad: Common plot Postscript Routines
*/
-#include "fctsys.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "common.h"
-#include "plot_common.h"
-#include "macros.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <common.h>
+#include <plot_common.h>
+#include <macros.h>
+#include <kicad_string.h>
/* Set the plot offset for the current plotting */
diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp
index 2ae314b8d8..0638cb15eb 100644
--- a/common/common_plot_functions.cpp
+++ b/common/common_plot_functions.cpp
@@ -3,18 +3,18 @@
* @brief Kicad: Common plot Postscript Routines
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "common.h"
-#include "plot_common.h"
-#include "worksheet.h"
-#include "macros.h"
-#include "class_base_screen.h"
-#include "drawtxt.h"
-#include "class_title_block.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <common.h>
+#include <plot_common.h>
+#include <worksheet.h>
+#include <macros.h>
+#include <class_base_screen.h>
+#include <drawtxt.h>
+#include <class_title_block.h>
/* Plot sheet references
* margin is in mils (1/1000 inch)
@@ -319,7 +319,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
break;
case WS_COMPANY_NAME:
- msg = GetTitleBlock().GetCompany();
+ msg = GetTitleBlock().GetCompany();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
@@ -330,7 +330,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
break;
case WS_TITLE:
- msg = GetTitleBlock().GetTitle();
+ msg = GetTitleBlock().GetTitle();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
@@ -341,7 +341,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
break;
case WS_COMMENT1:
- msg = GetTitleBlock().GetComment1();
+ msg = GetTitleBlock().GetComment1();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
@@ -358,7 +358,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
break;
case WS_COMMENT2:
- msg = GetTitleBlock().GetComment2();
+ msg = GetTitleBlock().GetComment2();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
@@ -369,7 +369,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
break;
case WS_COMMENT3:
- msg = GetTitleBlock().GetComment3();
+ msg = GetTitleBlock().GetComment3();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
@@ -380,7 +380,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
break;
case WS_COMMENT4:
- msg = GetTitleBlock().GetComment4();
+ msg = GetTitleBlock().GetComment4();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
@@ -415,7 +415,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
{
case WS_CADRE:
// Begin list number > 1
- msg = GetTitleBlock().GetComment1();
+ msg = GetTitleBlock().GetComment1();
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
diff --git a/common/confirm.cpp b/common/confirm.cpp
index d9a7fec687..95a8a96616 100644
--- a/common/confirm.cpp
+++ b/common/confirm.cpp
@@ -3,11 +3,11 @@
* utilities to display some error, warning and info short messges
*/
-#include "fctsys.h"
-#include "common.h"
-#include "wx/wx.h"
-#include "wx/html/htmlwin.h"
-#include "html_messagebox.h"
+#include <fctsys.h>
+#include <common.h>
+#include <wx/wx.h>
+#include <wx/html/htmlwin.h>
+#include <html_messagebox.h>
void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
diff --git a/common/copy_to_clipboard.cpp b/common/copy_to_clipboard.cpp
index 31507a068a..ad9225b1b0 100644
--- a/common/copy_to_clipboard.cpp
+++ b/common/copy_to_clipboard.cpp
@@ -26,15 +26,15 @@
* @file copy_to_clipboard.cpp
*/
-#include "wx/metafile.h"
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "id.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
-#include "confirm.h"
-#include "wxstruct.h"
+#include <wx/metafile.h>
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <id.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
+#include <confirm.h>
+#include <wxstruct.h>
static bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame );
diff --git a/common/dcsvg.cpp b/common/dcsvg.cpp
index 489d02adb9..e54d95f3a6 100644
--- a/common/dcsvg.cpp
+++ b/common/dcsvg.cpp
@@ -9,14 +9,14 @@
// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+#include <wx/wx.h>
#endif
#if wxCHECK_VERSION( 2, 9, 0 )
@@ -25,10 +25,10 @@
#else
-#include "dcsvg.h"
+#include <dcsvg.h>
-#include "wx/image.h"
-#include "macros.h"
+#include <wx/image.h>
+#include <macros.h>
#define wxSVG_DEBUG false
diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index 5f1512fb86..1e69432959 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -6,8 +6,8 @@
* Copyright: Rafael Sokolowski ()
* License:
**************************************************************/
-#include "dialog_about.h"
-#include "aboutinfo.h"
+#include <dialog_about.h>
+#include <aboutinfo.h>
#include <wx/aboutdlg.h>
#include <wx/textctrl.h>
@@ -18,11 +18,11 @@
* edit_module_xpm[];
* icon_kicad_xpm[]; // Icon of the application
*/
-#include "bitmaps.h"
-#include "wxstruct.h"
-#include "common.h"
-#include "appl_wxstruct.h"
-#include "build_version.h"
+#include <bitmaps.h>
+#include <wxstruct.h>
+#include <common.h>
+#include <appl_wxstruct.h>
+#include <build_version.h>
#include <wx/arrimpl.cpp>
@@ -88,7 +88,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
/* Operating System Information */
#if defined __WIN64__
- libVersion << wxT( "on 64 Bits Windows" );
+ libVersion << wxT( "on 64 Bits Windows" );
# elif defined __WINDOWS__
libVersion << wxT( "on 32 Bits Windows" );
diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp
index f9c701c9c0..24bd3de62a 100644
--- a/common/dialog_about/dialog_about.cpp
+++ b/common/dialog_about/dialog_about.cpp
@@ -6,7 +6,7 @@
* Copyright: Rafael Sokolowski ()
* License:
**************************************************************/
-#include "dialog_about.h"
+#include <dialog_about.h>
///////////////////////////////////////////////////////////////////////////////
/// Class dialog_about methods
diff --git a/common/dialog_about/dialog_about.h b/common/dialog_about/dialog_about.h
index e36fcae145..3e175ece5c 100644
--- a/common/dialog_about/dialog_about.h
+++ b/common/dialog_about/dialog_about.h
@@ -15,8 +15,8 @@
#include <wx/stattext.h>
#include <wx/hyperlink.h>
-#include "aboutinfo.h"
-#include "dialog_about_base.h"
+#include <aboutinfo.h>
+#include <dialog_about_base.h>
/* Pixel information of icons in XPM format.
* All KiCad icons are linked into shared library 'libbitmaps.a'.
@@ -29,7 +29,7 @@
* info_xpm[]; // Bulb for description tab
* tools_xpm[]; // Sheet of paper icon for license info tab
*/
-#include "bitmaps.h"
+#include <bitmaps.h>
/**
* About dialog to show application specific information.
diff --git a/common/dialogs/dialog_get_component.cpp b/common/dialogs/dialog_get_component.cpp
index 8025a4d59c..10567168b1 100644
--- a/common/dialogs/dialog_get_component.cpp
+++ b/common/dialogs/dialog_get_component.cpp
@@ -2,12 +2,12 @@
/* dialog_get_component.cpp */
/*********************************/
-#include "fctsys.h"
+#include <fctsys.h>
//#include "gr_basic.h"
-#include "common.h"
-#include "macros.h"
-#include "wxstruct.h"
-#include "dialog_get_component.h"
+#include <common.h>
+#include <macros.h>
+#include <wxstruct.h>
+#include <dialog_get_component.h>
/****************************************************************************/
diff --git a/common/dialogs/dialog_hotkeys_editor.cpp b/common/dialogs/dialog_hotkeys_editor.cpp
index 5f3687fbbc..25aea233a5 100644
--- a/common/dialogs/dialog_hotkeys_editor.cpp
+++ b/common/dialogs/dialog_hotkeys_editor.cpp
@@ -27,11 +27,11 @@
#include <algorithm>
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
-#include "dialog_hotkeys_editor.h"
+#include <dialog_hotkeys_editor.h>
void InstallHotkeyFrame( EDA_DRAW_FRAME* parent, EDA_HOTKEY_CONFIG* hotkeys )
{
diff --git a/common/dialogs/dialog_image_editor.cpp b/common/dialogs/dialog_image_editor.cpp
index b1ca03675a..212953c724 100644
--- a/common/dialogs/dialog_image_editor.cpp
+++ b/common/dialogs/dialog_image_editor.cpp
@@ -26,12 +26,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_bitmap_base.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_bitmap_base.h>
-#include "dialog_image_editor.h"
+#include <dialog_image_editor.h>
DIALOG_IMAGE_EDITOR::DIALOG_IMAGE_EDITOR( wxWindow* aParent, BITMAP_BASE* aItem )
: DIALOG_IMAGE_EDITOR_BASE( aParent )
diff --git a/common/dialogs/dialog_image_editor.h b/common/dialogs/dialog_image_editor.h
index 874622f357..226221c239 100644
--- a/common/dialogs/dialog_image_editor.h
+++ b/common/dialogs/dialog_image_editor.h
@@ -29,7 +29,7 @@
#ifndef _DIALOG_IMAGE_EDITOR_H_
#define _DIALOG_IMAGE_EDITOR_H_
-#include "dialog_image_editor_base.h"
+#include <dialog_image_editor_base.h>
class DIALOG_IMAGE_EDITOR : public DIALOG_IMAGE_EDITOR_BASE
@@ -53,15 +53,15 @@ public:
void TransfertToImage( BITMAP_BASE* aItem );
private:
- void OnUndoLastChange( wxCommandEvent& event );
- void OnGreyScaleConvert( wxCommandEvent& event );
- void OnHalfSize( wxCommandEvent& event );
+ void OnUndoLastChange( wxCommandEvent& event );
+ void OnGreyScaleConvert( wxCommandEvent& event );
+ void OnHalfSize( wxCommandEvent& event );
void OnMirrorX_click( wxCommandEvent& event );
void OnMirrorY_click( wxCommandEvent& event );
void OnRotateClick( wxCommandEvent& event );
void OnOK_Button( wxCommandEvent& aEvent );
void OnCancel_Button( wxCommandEvent& aEvent );
- void OnRedrawPanel( wxPaintEvent& event );
+ void OnRedrawPanel( wxPaintEvent& event );
bool CheckValues();
};
diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index 447efe34ff..646de5da98 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/common/dialogs/dialog_page_settings.cpp
@@ -8,21 +8,23 @@
* invoked in Pcbnew instead.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "base_struct.h"
-#include "class_drawpanel.h"
-#include "class_sch_screen.h"
-#include "wxstruct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <base_struct.h>
+#include <class_drawpanel.h>
+#include <class_title_block.h>
+#include <wxstruct.h>
+#include <class_base_screen.h>
-#include "wx/valgen.h"
+#include <wx/valgen.h>
#include <wx/tokenzr.h>
#ifdef EESCHEMA
-#include "general.h"
+#include <class_sch_screen.h>
+#include <general.h>
#endif
-#include "dialog_page_settings.h"
+#include <dialog_page_settings.h>
void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event )
@@ -63,6 +65,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()
SetFocus();
+#ifdef EESCHEMA
// Init display value for sheet User size
wxString format = m_TextSheetCount->GetLabel();
msg.Printf( format, m_Screen->m_NumberOfScreen );
@@ -71,6 +74,10 @@ void DIALOG_PAGES_SETTINGS::initDialog()
format = m_TextSheetNumber->GetLabel();
msg.Printf( format, m_Screen->m_ScreenNumber );
m_TextSheetNumber->SetLabel( msg );
+#else
+ m_TextSheetCount->Show(false);
+ m_TextSheetNumber->Show(false);
+#endif
const PAGE_INFO& pageInfo = m_Parent->GetPageSettings();
diff --git a/common/dialogs/dialog_page_settings.h b/common/dialogs/dialog_page_settings.h
index 0a8563adf0..efd07e6aea 100644
--- a/common/dialogs/dialog_page_settings.h
+++ b/common/dialogs/dialog_page_settings.h
@@ -5,7 +5,7 @@
#ifndef _DIALOG_PAGES_SETTINGS_H_
#define _DIALOG_PAGES_SETTINGS_H_
-#include "dialog_page_settings_base.h"
+#include <dialog_page_settings_base.h>
/*!
* DIALOG_PAGES_SETTINGS class declaration
diff --git a/common/displlst.cpp b/common/displlst.cpp
index aba8e1e952..f90f8a08a4 100644
--- a/common/displlst.cpp
+++ b/common/displlst.cpp
@@ -2,13 +2,13 @@
* @file displlst.cpp
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "macros.h"
-#include "kicad_string.h"
-#include "dialog_helpers.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <macros.h>
+#include <kicad_string.h>
+#include <dialog_helpers.h>
enum listbox {
diff --git a/common/dlist.cpp b/common/dlist.cpp
index e802406e84..aae531fd61 100644
--- a/common/dlist.cpp
+++ b/common/dlist.cpp
@@ -23,9 +23,9 @@
*/
-#include "fctsys.h"
-#include "dlist.h"
-#include "base_struct.h"
+#include <fctsys.h>
+#include <dlist.h>
+#include <base_struct.h>
/* Implement the class DHEAD from dlist.h */
diff --git a/common/drawframe.cpp b/common/drawframe.cpp
index 6e4c87030c..fa5dfc124e 100644
--- a/common/drawframe.cpp
+++ b/common/drawframe.cpp
@@ -27,19 +27,19 @@
* @file drawframe.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "bitmaps.h"
-#include "macros.h"
-#include "id.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "kicad_device_context.h"
-#include "dialog_helpers.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <bitmaps.h>
+#include <macros.h>
+#include <id.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <kicad_device_context.h>
+#include <dialog_helpers.h>
#include <wx/fontdlg.h>
diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index b91ed77147..5762da186c 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -27,17 +27,17 @@
* @file drawpanel.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "macros.h"
-#include "id.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
-#include "wxstruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <macros.h>
+#include <id.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
+#include <wxstruct.h>
-#include "kicad_device_context.h"
+#include <kicad_device_context.h>
#define CURSOR_SIZE 12 // Cursor size in pixels
diff --git a/common/drawtxt.cpp b/common/drawtxt.cpp
index e2913226cf..e811050bba 100644
--- a/common/drawtxt.cpp
+++ b/common/drawtxt.cpp
@@ -2,24 +2,24 @@
* Functions to draw and plot text on screen
* @file drawtxt.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <gr_basic.h>
-#include "common.h"
-#include "plot_common.h"
+#include <common.h>
+#include <plot_common.h>
-#include "trigo.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
+#include <trigo.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
#ifndef DEFAULT_SIZE_TEXT
# define DEFAULT_SIZE_TEXT 50
#endif
#define EDA_DRAWBASE
-#include "newstroke_font.h"
-#include "plot_common.h"
+#include <newstroke_font.h>
+#include <plot_common.h>
/* factor used to calculate actual size of shapes from hershey fonts (could be adjusted depending on the font name)
* Its value is choosen in order to have letters like M, P .. vertical size equal to the vertical char size parameter
diff --git a/common/dsnlexer.cpp b/common/dsnlexer.cpp
index 512c542eed..da08358b05 100644
--- a/common/dsnlexer.cpp
+++ b/common/dsnlexer.cpp
@@ -30,7 +30,7 @@
#include <cctype>
-#include "dsnlexer.h"
+#include <dsnlexer.h>
//#include "fctsys.h"
//#include "pcbnew.h"
diff --git a/common/eda_dde.cpp b/common/eda_dde.cpp
index 9a93fa2bbb..b9c33d36cf 100644
--- a/common/eda_dde.cpp
+++ b/common/eda_dde.cpp
@@ -2,13 +2,13 @@
* @file eda_dde.cpp
*/
-#include "fctsys.h"
-#include "eda_dde.h"
-#include "wxstruct.h"
-#include "id.h"
+#include <fctsys.h>
+#include <eda_dde.h>
+#include <wxstruct.h>
+#include <id.h>
-#include "common.h"
-#include "macros.h"
+#include <common.h>
+#include <macros.h>
wxString HOSTNAME( wxT( "localhost" ) );
diff --git a/common/eda_doc.cpp b/common/eda_doc.cpp
index 569eba2596..4082634b36 100644
--- a/common/eda_doc.cpp
+++ b/common/eda_doc.cpp
@@ -2,16 +2,16 @@
* @file eda_doc.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <confirm.h>
+#include <gestfich.h>
#include <wx/mimetype.h>
#include <wx/tokenzr.h>
#include <wx/filename.h>
-#include "macros.h"
+#include <macros.h>
void EDA_APP::ReadPdfBrowserInfos()
diff --git a/common/edaappl.cpp b/common/edaappl.cpp
index f888a3f390..bcce7aa9bc 100644
--- a/common/edaappl.cpp
+++ b/common/edaappl.cpp
@@ -30,10 +30,10 @@
* (locale handling)
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wx/html/htmlwin.h"
-#include "wx/fs_zip.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wx/html/htmlwin.h>
+#include <wx/fs_zip.h>
#include <wx/dir.h>
#include <wx/filename.h>
#include <wx/stdpaths.h>
@@ -41,16 +41,16 @@
#include <wx/snglinst.h>
#include <wx/tokenzr.h>
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "macros.h"
-#include "param_config.h"
-#include "worksheet.h"
-#include "id.h"
-#include "build_version.h"
-#include "hotkeys_basic.h"
-#include "online_help.h"
-#include "gestfich.h"
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <macros.h>
+#include <param_config.h>
+#include <worksheet.h>
+#include <id.h>
+#include <build_version.h>
+#include <hotkeys_basic.h>
+#include <online_help.h>
+#include <gestfich.h>
static const wxChar* CommonConfigPath = wxT( "kicad_common" );
diff --git a/common/filter_reader.cpp b/common/filter_reader.cpp
index 34bf971999..f97172846f 100644
--- a/common/filter_reader.cpp
+++ b/common/filter_reader.cpp
@@ -24,8 +24,8 @@
*/
#include <string.h>
-#include "richio.h"
-#include "filter_reader.h"
+#include <richio.h>
+#include <filter_reader.h>
unsigned FILTER_READER::ReadLine() throw( IO_ERROR )
{
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index b2cd08b1f4..fead30cbb2 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -7,21 +7,21 @@
* Functions to read footprint libraries and fill m_footprints by available footprints names
* and their documentation (comments and keywords)
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "common.h"
-#include "kicad_string.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <common.h>
+#include <kicad_string.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
-#include "pcbcommon.h"
-#include "pcbstruct.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "footprint_info.h"
+#include <pcbcommon.h>
+#include <pcbstruct.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <footprint_info.h>
-#include "class_pad.h"
-#include "class_module.h"
+#include <class_pad.h>
+#include <class_module.h>
/* Read the list of libraries (*.mod files)
diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index 3e6b272ea1..d1139b1931 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -29,16 +29,16 @@
*/
// For compilers that support precompilation, includes "wx.h".
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
-#include "common.h"
-#include "macros.h"
-#include "gestfich.h"
+#include <common.h>
+#include <macros.h>
+#include <gestfich.h>
-#include "wx/mimetype.h"
-#include "wx/filename.h"
+#include <wx/mimetype.h>
+#include <wx/filename.h>
/* List of default paths used to locate help files and KiCad library files.
@@ -520,7 +520,7 @@ wxString& EDA_APP::GetEditorName()
// We get the preferred editor name from environment variable first.
if( editorname.IsEmpty() )
{
- // If there is no EDITOR variable set, try the desktop default
+ // If there is no EDITOR variable set, try the desktop default
if(!wxGetEnv( wxT( "EDITOR" ), &editorname ))
{
#ifdef __WXOSX__
diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index 17808c8667..569f5852ab 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -3,15 +3,15 @@
/********************************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "trigo.h"
-#include "macros.h"
-#include "base_struct.h"
-#include "class_base_screen.h"
-#include "bezier_curves.h"
-#include "math_for_graphics.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <trigo.h>
+#include <macros.h>
+#include <base_struct.h>
+#include <class_base_screen.h>
+#include <bezier_curves.h>
+#include <math_for_graphics.h>
#include <wx/graphics.h>
@@ -1381,7 +1381,7 @@ void GRSFilledRect( EDA_RECT* aClipBox, wxDC* aDC, int x1, int y1, int x2, int y
/* Note: aClipBox == NULL is legal, so if aClipBox == NULL,
* the polygon is drawn, but not clipped
*/
-#include "SutherlandHodgmanClipPoly.h"
+#include <SutherlandHodgmanClipPoly.h>
void ClipAndDrawFilledPoly( EDA_RECT* aClipBox, wxDC* aDC, wxPoint aPoints[], int n )
{
diff --git a/common/hotkey_grid_table.cpp b/common/hotkey_grid_table.cpp
index 6ff89b9f37..c08893d5cc 100644
--- a/common/hotkey_grid_table.cpp
+++ b/common/hotkey_grid_table.cpp
@@ -1,4 +1,4 @@
-#include "hotkey_grid_table.h"
+#include <hotkey_grid_table.h>
/*
* Reads the hotkey table from its stored format into a format suitable
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 930b6b91f4..91a3de87b9 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -28,16 +28,16 @@
* @brief Some functions to handle hotkeys in KiCad
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "hotkeys_basic.h"
-#include "id.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxstruct.h"
-#include "macros.h"
-#include "dialog_hotkeys_editor.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <hotkeys_basic.h>
+#include <id.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxstruct.h>
+#include <macros.h>
+#include <dialog_hotkeys_editor.h>
#include <wx/apptrait.h>
#include <wx/stdpaths.h>
diff --git a/common/html_messagebox.cpp b/common/html_messagebox.cpp
index cf41c0c35c..6d4b0567cd 100644
--- a/common/html_messagebox.cpp
+++ b/common/html_messagebox.cpp
@@ -1,6 +1,6 @@
-#include "fctsys.h"
-#include "html_messagebox.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <html_messagebox.h>
+#include <macros.h>
HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* parent, const wxString & aTitle,
wxPoint aPos, wxSize aSize)
diff --git a/common/msgpanel.cpp b/common/msgpanel.cpp
index 999d068afc..c57d32f5e2 100644
--- a/common/msgpanel.cpp
+++ b/common/msgpanel.cpp
@@ -27,10 +27,10 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "common.h"
-#include "colors.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <common.h>
+#include <colors.h>
BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel )
diff --git a/common/newstroke_font.cpp b/common/newstroke_font.cpp
index 840a68882f..45d7986ad5 100644
--- a/common/newstroke_font.cpp
+++ b/common/newstroke_font.cpp
@@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "newstroke_font.h"
+#include <newstroke_font.h>
const char* const newstroke_font[] =
{
diff --git a/common/pcbcommon.cpp b/common/pcbcommon.cpp
index 9ce3f2ac47..cc6a6553e2 100644
--- a/common/pcbcommon.cpp
+++ b/common/pcbcommon.cpp
@@ -30,13 +30,13 @@
* back into the application layer.
*/
-#include "fctsys.h"
-#include "pcbcommon.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <pcbcommon.h>
+#include <plot_common.h>
-#include "class_pad.h"
-#include "class_zone_setting.h"
-#include "class_board_design_settings.h"
+#include <class_pad.h>
+#include <class_zone_setting.h>
+#include <class_board_design_settings.h>
class MODULE;
diff --git a/common/projet_config.cpp b/common/projet_config.cpp
index 0fa0f1fcea..9fc9866c83 100644
--- a/common/projet_config.cpp
+++ b/common/projet_config.cpp
@@ -2,14 +2,14 @@
/* projet_config.cpp */
/*********************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxstruct.h"
-#include "param_config.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxstruct.h>
+#include <param_config.h>
#include <wx/apptrait.h>
#include <wx/stdpaths.h>
diff --git a/common/richio.cpp b/common/richio.cpp
index 774bdd8467..301970fd29 100644
--- a/common/richio.cpp
+++ b/common/richio.cpp
@@ -26,7 +26,7 @@
#include <cstdarg>
-#include "richio.h"
+#include <richio.h>
// This file defines 3 classes useful for working with DSN text files and is named
// "richio" after its author, Richard Hollenbeck, aka Dick Hollenbeck.
diff --git a/common/sch_item_struct.cpp b/common/sch_item_struct.cpp
index 7bffdcb634..b0f8a2244a 100644
--- a/common/sch_item_struct.cpp
+++ b/common/sch_item_struct.cpp
@@ -27,17 +27,17 @@
* @file sch_item_struct.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "gr_basic.h"
-#include "base_struct.h"
-#include "sch_item_struct.h"
-#include "class_sch_screen.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <gr_basic.h>
+#include <base_struct.h>
+#include <sch_item_struct.h>
+#include <class_sch_screen.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
+#include <general.h>
+#include <protos.h>
const wxString traceFindReplace( wxT( "KicadFindReplace" ) );
diff --git a/common/selcolor.cpp b/common/selcolor.cpp
index 13238e2da7..0b3b3cb1e2 100644
--- a/common/selcolor.cpp
+++ b/common/selcolor.cpp
@@ -5,14 +5,14 @@
/* Dialog for selecting color from the palette of available colors.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <gr_basic.h>
-#include "common.h"
-#include "colors.h"
-#include "macros.h"
+#include <common.h>
+#include <colors.h>
+#include <macros.h>
-#include "wx/statline.h"
+#include <wx/statline.h>
enum colors_id {
diff --git a/common/string.cpp b/common/string.cpp
index 92c7222ef1..6d61c1d4ca 100644
--- a/common/string.cpp
+++ b/common/string.cpp
@@ -3,9 +3,9 @@
* @brief Some useful functions to handle strings.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <kicad_string.h>
int ReadDelimitedText( wxString* aDest, const char* aSource )
diff --git a/common/trigo.cpp b/common/trigo.cpp
index 53d7f1d776..eb5d6fb608 100644
--- a/common/trigo.cpp
+++ b/common/trigo.cpp
@@ -3,9 +3,9 @@
* @brief Trigonometric functions.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <trigo.h>
bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist )
diff --git a/common/worksheet.cpp b/common/worksheet.cpp
index fb91ecdf8c..d12455316d 100644
--- a/common/worksheet.cpp
+++ b/common/worksheet.cpp
@@ -2,20 +2,20 @@
/* WORKSHEET.CPP */
/*****************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "wxstruct.h"
-#include "appl_wxstruct.h"
-#include "worksheet.h"
-#include "class_title_block.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <wxstruct.h>
+#include <appl_wxstruct.h>
+#include <worksheet.h>
+#include <class_title_block.h>
-#include "build_version.h"
+#include <build_version.h>
// Must be defined in main applications:
@@ -1251,7 +1251,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
break;
case WS_COMPANY_NAME:
- msg = GetTitleBlock().GetCompany();
+ msg = GetTitleBlock().GetCompany();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
@@ -1263,7 +1263,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
break;
case WS_TITLE:
- msg = GetTitleBlock().GetTitle();
+ msg = GetTitleBlock().GetTitle();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
@@ -1275,7 +1275,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
break;
case WS_COMMENT1:
- msg = GetTitleBlock().GetComment1();
+ msg = GetTitleBlock().GetComment1();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
@@ -1294,7 +1294,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
break;
case WS_COMMENT2:
- msg = GetTitleBlock().GetComment2();
+ msg = GetTitleBlock().GetComment2();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
@@ -1305,7 +1305,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
break;
case WS_COMMENT3:
- msg = GetTitleBlock().GetComment3();
+ msg = GetTitleBlock().GetComment3();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
@@ -1316,7 +1316,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
break;
case WS_COMMENT4:
- msg = GetTitleBlock().GetComment4();
+ msg = GetTitleBlock().GetComment4();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
@@ -1355,7 +1355,7 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_wid
{
case WS_CADRE:
// Begin list number > 1
- msg = GetTitleBlock().GetComment1();
+ msg = GetTitleBlock().GetComment1();
if( !msg.IsEmpty() )
{
DrawGraphicText( m_canvas, DC, pos, Color,
diff --git a/common/wxwineda.cpp b/common/wxwineda.cpp
index ea1e549d72..514c5c8273 100644
--- a/common/wxwineda.cpp
+++ b/common/wxwineda.cpp
@@ -2,9 +2,9 @@
* @file wxwineda.cpp
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "dialog_helpers.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <dialog_helpers.h>
/*******************************************************/
diff --git a/common/xnode.cpp b/common/xnode.cpp
index f8e05678a8..4d0894d7de 100644
--- a/common/xnode.cpp
+++ b/common/xnode.cpp
@@ -23,8 +23,8 @@
*/
-#include "xnode.h"
-#include "macros.h"
+#include <xnode.h>
+#include <macros.h>
typedef wxXmlProperty XATTR;
diff --git a/common/zoom.cpp b/common/zoom.cpp
index 12d1a4006e..390507fc96 100644
--- a/common/zoom.cpp
+++ b/common/zoom.cpp
@@ -6,14 +6,14 @@
* Manage zoom, grid step, and auto crop.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "id.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
-#include "wxstruct.h"
-#include "kicad_device_context.h"
-#include "hotkeys_basic.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <id.h>
+#include <class_drawpanel.h>
+#include <class_base_screen.h>
+#include <wxstruct.h>
+#include <kicad_device_context.h>
+#include <hotkeys_basic.h>
void EDA_DRAW_FRAME::RedrawScreen( const wxPoint& aCenterPoint, bool aWarpPointer )
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index ce4e617d77..ee3da837b1 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -3,13 +3,17 @@ add_definitions(-DCVPCB)
###
# Includes
###
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
- ${Boost_INCLUDE_DIR}
- ../3d-viewer
- ../pcbnew
- ../polygon
- ${CMAKE_SOURCE_DIR}/common)
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ./dialogs
+ ${Boost_INCLUDE_DIR}
+ ../3d-viewer
+ ../pcbnew
+ ../polygon
+ ../common
+ ${INC_AFTER}
+ )
###
# Sources
diff --git a/cvpcb/autosel.cpp b/cvpcb/autosel.cpp
index 12f1cb8e26..6ebea9bce8 100644
--- a/cvpcb/autosel.cpp
+++ b/cvpcb/autosel.cpp
@@ -4,17 +4,17 @@
/* Routines for automatic selection of modules. */
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "kicad_string.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <kicad_string.h>
+#include <macros.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
#define QUOTE '\''
diff --git a/cvpcb/cfg.cpp b/cvpcb/cfg.cpp
index 4507c7766e..79d5360035 100644
--- a/cvpcb/cfg.cpp
+++ b/cvpcb/cfg.cpp
@@ -2,14 +2,14 @@
/** cfg.cpp **/
/*************/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "id.h"
-#include "common.h"
-#include "gestfich.h"
-#include "param_config.h"
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <id.h>
+#include <common.h>
+#include <gestfich.h>
+#include <param_config.h>
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
#define GROUP wxT("/cvpcb")
diff --git a/cvpcb/class_DisplayFootprintsFrame.cpp b/cvpcb/class_DisplayFootprintsFrame.cpp
index 1775996934..e1570b7e1f 100644
--- a/cvpcb/class_DisplayFootprintsFrame.cpp
+++ b/cvpcb/class_DisplayFootprintsFrame.cpp
@@ -27,27 +27,27 @@
* @file class_DisplayFootprintsFrame.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "macros.h"
-#include "bitmaps.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <macros.h>
+#include <bitmaps.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "class_DisplayFootprintsFrame.h"
-#include "cvpcb_id.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <class_DisplayFootprintsFrame.h>
+#include <cvpcb_id.h>
/*
* NOTE: There is something in 3d_viewer.h that causes a compiler error in
* <boost/foreach.hpp> in Linux so move it after cvpcb.h where it is
* included to prevent the error from occurring.
*/
-#include "3d_viewer.h"
+#include <3d_viewer.h>
diff --git a/cvpcb/class_DisplayFootprintsFrame.h b/cvpcb/class_DisplayFootprintsFrame.h
index 02e5a12c6e..1b6c4e456c 100644
--- a/cvpcb/class_DisplayFootprintsFrame.h
+++ b/cvpcb/class_DisplayFootprintsFrame.h
@@ -3,7 +3,7 @@
*/
-#include "wxBasePcbFrame.h"
+#include <wxBasePcbFrame.h>
class CVPCB_MAINFRAME;
diff --git a/cvpcb/class_components_listbox.cpp b/cvpcb/class_components_listbox.cpp
index be44ee8020..2c09c5215d 100644
--- a/cvpcb/class_components_listbox.cpp
+++ b/cvpcb/class_components_listbox.cpp
@@ -2,12 +2,12 @@
/* listboxes.cpp: class for displaying footprint list and component list */
/*************************************************************************/
-#include "fctsys.h"
-#include "wxstruct.h"
+#include <fctsys.h>
+#include <wxstruct.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
/**************************************************/
diff --git a/cvpcb/class_cvpcb.cpp b/cvpcb/class_cvpcb.cpp
index e66048d9df..fd865aaf54 100644
--- a/cvpcb/class_cvpcb.cpp
+++ b/cvpcb/class_cvpcb.cpp
@@ -2,11 +2,11 @@
* @file class_cvpcb.cpp
*/
-#include "fctsys.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <kicad_string.h>
-#include "cvpcb.h"
-#include "footprint_info.h"
+#include <cvpcb.h>
+#include <footprint_info.h>
PIN::PIN()
diff --git a/cvpcb/class_footprints_listbox.cpp b/cvpcb/class_footprints_listbox.cpp
index f54b4e56a0..d00fb1afe5 100644
--- a/cvpcb/class_footprints_listbox.cpp
+++ b/cvpcb/class_footprints_listbox.cpp
@@ -3,13 +3,13 @@
* class to display the list fo available footprints
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <macros.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
/***************************************/
diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index e6866d42bf..dc7a474429 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -27,23 +27,23 @@
* @file cvframe.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "macros.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "eda_dde.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <macros.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <eda_dde.h>
+#include <gestfich.h>
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
-#include "dialog_cvpcb_config.h"
-#include "class_DisplayFootprintsFrame.h"
-#include "cvpcb_id.h"
-#include "html_messagebox.h"
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
+#include <dialog_cvpcb_config.h>
+#include <class_DisplayFootprintsFrame.h>
+#include <cvpcb_id.h>
+#include <html_messagebox.h>
-#include "build_version.h"
+#include <build_version.h>
#define FRAME_MIN_SIZE_X 450
#define FRAME_MIN_SIZE_Y 300
diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index dd550b401d..bc430ee813 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -2,20 +2,20 @@
* @file cvpcb.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "cvpcb.h"
-#include "zones.h"
-#include "cvpcb_mainframe.h"
-#include "colors_selection.h"
-#include "cvpcb_id.h"
+#include <cvpcb.h>
+#include <zones.h>
+#include <cvpcb_mainframe.h>
+#include <colors_selection.h>
+#include <cvpcb_id.h>
-#include "build_version.h"
+#include <build_version.h>
#include <wx/snglinst.h>
diff --git a/cvpcb/cvpcb.h b/cvpcb/cvpcb.h
index fa3704acfa..6f5414dda7 100644
--- a/cvpcb/cvpcb.h
+++ b/cvpcb/cvpcb.h
@@ -5,7 +5,7 @@
#ifndef __CVPCB_H__
#define __CVPCB_H__
-#include "pcbcommon.h"
+#include <pcbcommon.h>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/foreach.hpp>
diff --git a/cvpcb/cvpcb_id.h b/cvpcb/cvpcb_id.h
index c7e0301582..48b3f8be7b 100644
--- a/cvpcb/cvpcb_id.h
+++ b/cvpcb/cvpcb_id.h
@@ -10,7 +10,7 @@
*/
// Generic IDs:
-#include "id.h"
+#include <id.h>
// specific IDs
enum id_cvpcb_frm
diff --git a/cvpcb/cvpcb_mainframe.h b/cvpcb/cvpcb_mainframe.h
index 06ad0246b0..e509159059 100644
--- a/cvpcb/cvpcb_mainframe.h
+++ b/cvpcb/cvpcb_mainframe.h
@@ -8,10 +8,10 @@
#include <wx/listctrl.h>
#include <wx/filename.h>
-#include "wxBasePcbFrame.h"
-#include "param_config.h"
-#include "cvpcb.h"
-#include "footprint_info.h"
+#include <wxBasePcbFrame.h>
+#include <param_config.h>
+#include <cvpcb.h>
+#include <footprint_info.h>
/* Forward declarations of all top-level window classes. */
@@ -243,11 +243,11 @@ public:
/**
* Function SendMessageToEESCHEMA
- * Send a remote command to Eeschema via a socket,
- * Commands are
- * $PART: "reference" put cursor on component anchor
+ * Send a remote command to Eeschema via a socket,
+ * Commands are
+ * $PART: "reference" put cursor on component anchor
*/
- void SendMessageToEESCHEMA();
+ void SendMessageToEESCHEMA();
DECLARE_EVENT_TABLE()
};
diff --git a/cvpcb/cvstruct.h b/cvpcb/cvstruct.h
index f50b807480..4f3288fc84 100644
--- a/cvpcb/cvstruct.h
+++ b/cvpcb/cvstruct.h
@@ -5,8 +5,8 @@
#ifndef CVSTRUCT_H
#define CVSTRUCT_H
-#include "wx/listctrl.h"
-#include "cvpcb.h"
+#include <wx/listctrl.h>
+#include <cvpcb.h>
/* Forward declarations of all top-level window classes. */
class CVPCB_MAINFRAME;
diff --git a/cvpcb/dialogs/dialog_cvpcb_config.cpp b/cvpcb/dialogs/dialog_cvpcb_config.cpp
index 108e2d1e7c..70ec8465fd 100644
--- a/cvpcb/dialogs/dialog_cvpcb_config.cpp
+++ b/cvpcb/dialogs/dialog_cvpcb_config.cpp
@@ -4,21 +4,21 @@
// Licence: gpl
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
+#include <fctsys.h>
#include <wx/tokenzr.h>
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "id.h"
-#include "macros.h"
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <id.h>
+#include <macros.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
-#include "protos.h"
+#include <protos.h>
-#include "dialog_cvpcb_config.h"
+#include <dialog_cvpcb_config.h>
DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent ) :
diff --git a/cvpcb/dialogs/dialog_cvpcb_config.h b/cvpcb/dialogs/dialog_cvpcb_config.h
index 3d8401efe2..a83847d874 100644
--- a/cvpcb/dialogs/dialog_cvpcb_config.h
+++ b/cvpcb/dialogs/dialog_cvpcb_config.h
@@ -8,7 +8,7 @@
#ifndef _DIALOG_CVPCB_CONFIG_H_
#define _DIALOG_CVPCB_CONFIG_H_
-#include "dialog_cvpcb_config_fbp.h"
+#include <dialog_cvpcb_config_fbp.h>
class DIALOG_CVPCB_CONFIG : public DIALOG_CVPCB_CONFIG_FBP
{
@@ -31,8 +31,8 @@ private:
void OnBrowseModDocFile( wxCommandEvent& event );
void OnAddOrInsertPath( wxCommandEvent& event );
void OnRemoveUserPath( wxCommandEvent& event );
- void OnButtonUpClick( wxCommandEvent& event );
- void OnButtonDownClick( wxCommandEvent& event );
+ void OnButtonUpClick( wxCommandEvent& event );
+ void OnButtonDownClick( wxCommandEvent& event );
public:
diff --git a/cvpcb/dialogs/dialog_display_options.cpp b/cvpcb/dialogs/dialog_display_options.cpp
index 438927ae5e..468aaced11 100644
--- a/cvpcb/dialogs/dialog_display_options.cpp
+++ b/cvpcb/dialogs/dialog_display_options.cpp
@@ -2,17 +2,17 @@
// Name: dialog_display_options.cpp
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
+#include <fctsys.h>
-#include "wxstruct.h"
-#include "common.h"
-#include "cvpcb.h"
-#include "class_drawpanel.h"
-#include "footprint_info.h"
-#include "cvstruct.h"
-#include "class_DisplayFootprintsFrame.h"
+#include <wxstruct.h>
+#include <common.h>
+#include <cvpcb.h>
+#include <class_drawpanel.h>
+#include <footprint_info.h>
+#include <cvstruct.h>
+#include <class_DisplayFootprintsFrame.h>
-#include "dialog_display_options.h"
+#include <dialog_display_options.h>
void DISPLAY_FOOTPRINTS_FRAME::InstallOptionsDisplay( wxCommandEvent& event )
diff --git a/cvpcb/dialogs/dialog_display_options.h b/cvpcb/dialogs/dialog_display_options.h
index eca0ebe7e0..84f11f3564 100644
--- a/cvpcb/dialogs/dialog_display_options.h
+++ b/cvpcb/dialogs/dialog_display_options.h
@@ -6,7 +6,7 @@
#ifndef _DIALOG_DISPLAY_OPTIONS_H_
#define _DIALOG_DISPLAY_OPTIONS_H_
-#include "dialog_display_options_base.h"
+#include <dialog_display_options_base.h>
////////////////////////////////////////////
/// Class DIALOG_FOOTPRINTS_DISPLAY_OPTIONS
diff --git a/cvpcb/genequiv.cpp b/cvpcb/genequiv.cpp
index e07cffee12..ef0b2e461a 100644
--- a/cvpcb/genequiv.cpp
+++ b/cvpcb/genequiv.cpp
@@ -2,13 +2,13 @@
/* genequiv.cpp */
/*****************/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
void CVPCB_MAINFRAME::WriteStuffList( wxCommandEvent& event )
diff --git a/cvpcb/init.cpp b/cvpcb/init.cpp
index ce1039e37d..1dc25c37e0 100644
--- a/cvpcb/init.cpp
+++ b/cvpcb/init.cpp
@@ -2,18 +2,18 @@
* @file init.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
-#include "gr_basic.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "macros.h"
-#include "build_version.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
+#include <gr_basic.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <macros.h>
+#include <build_version.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
void CVPCB_MAINFRAME::SetNewPkg( const wxString& package )
diff --git a/cvpcb/listboxes.cpp b/cvpcb/listboxes.cpp
index 5df7dfa10e..8ee94db5b4 100644
--- a/cvpcb/listboxes.cpp
+++ b/cvpcb/listboxes.cpp
@@ -3,14 +3,14 @@
* @brief Implementation of class for displaying footprint list and component lists.
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <macros.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
-#include "cvpcb_id.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
+#include <cvpcb_id.h>
/******************************************************************************
diff --git a/cvpcb/loadcmp.cpp b/cvpcb/loadcmp.cpp
index fba5a9e678..0e212776dc 100644
--- a/cvpcb/loadcmp.cpp
+++ b/cvpcb/loadcmp.cpp
@@ -2,23 +2,23 @@
* @file cvpcb/loadcmp.cpp
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "gr_basic.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <gr_basic.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
-#include "pcbstruct.h"
-#include "class_module.h"
+#include <pcbstruct.h>
+#include <class_module.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "class_DisplayFootprintsFrame.h"
-#include "richio.h"
-#include "filter_reader.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <class_DisplayFootprintsFrame.h>
+#include <richio.h>
+#include <filter_reader.h>
/**
diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp
index baf26722e2..d21163276b 100644
--- a/cvpcb/menubar.cpp
+++ b/cvpcb/menubar.cpp
@@ -26,14 +26,14 @@
* @file cvpcb/menubar.cpp
* @brief (Re)Create the menubar for CvPcb
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvpcb_id.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvpcb_id.h>
/**
diff --git a/cvpcb/readschematicnetlist.cpp b/cvpcb/readschematicnetlist.cpp
index 6567c508ce..a3ed60d53d 100644
--- a/cvpcb/readschematicnetlist.cpp
+++ b/cvpcb/readschematicnetlist.cpp
@@ -5,15 +5,15 @@
/* Read a nelist type Eeschema or OrcadPCB2 and build the component list
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <macros.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "richio.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <richio.h>
#define SEPARATEUR '|' /* Separator character in NetList */
diff --git a/cvpcb/savecmp.cpp b/cvpcb/savecmp.cpp
index 008c50ff58..9d1f3dbb4d 100644
--- a/cvpcb/savecmp.cpp
+++ b/cvpcb/savecmp.cpp
@@ -2,18 +2,18 @@
/* savecmp.cpp */
/****************/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
-#include "build_version.h"
+#include <build_version.h>
/* File header. */
diff --git a/cvpcb/setvisu.cpp b/cvpcb/setvisu.cpp
index 40a79aa167..ce069a4a50 100644
--- a/cvpcb/setvisu.cpp
+++ b/cvpcb/setvisu.cpp
@@ -2,26 +2,26 @@
* @file setvisu.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "bitmaps.h"
+#include <fctsys.h>
+#include <common.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <bitmaps.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvstruct.h"
-#include "class_DisplayFootprintsFrame.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvstruct.h>
+#include <class_DisplayFootprintsFrame.h>
/*
* NOTE: There is something in 3d_viewer.h that causes a compiler error in
* <boost/foreach.hpp> in Linux so move it after cvpcb.h where it is
* included to prevent the error from occurring.
*/
-#include "3d_viewer.h"
+#include <3d_viewer.h>
/*
diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp
index 4e01c9d85e..5e22c7cd83 100644
--- a/cvpcb/tool_cvpcb.cpp
+++ b/cvpcb/tool_cvpcb.cpp
@@ -27,14 +27,14 @@
* @file tool_cvpcb.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
-#include "bitmaps.h"
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
-#include "cvpcb_id.h"
+#include <bitmaps.h>
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
+#include <cvpcb_id.h>
void CVPCB_MAINFRAME::ReCreateHToolbar()
diff --git a/cvpcb/writenetlistpcbnew.cpp b/cvpcb/writenetlistpcbnew.cpp
index 5c019cc6aa..16577e9b33 100644
--- a/cvpcb/writenetlistpcbnew.cpp
+++ b/cvpcb/writenetlistpcbnew.cpp
@@ -3,15 +3,15 @@
/***************************/
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
-#include "cvpcb.h"
-#include "cvpcb_mainframe.h"
+#include <cvpcb.h>
+#include <cvpcb_mainframe.h>
static void WriteFootprintFilterInfos( FILE* dest, COMPONENT_LIST& list );
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index e6e7538a2d..576a14dadf 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -1,11 +1,14 @@
add_definitions(-DEESCHEMA)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
- ${CMAKE_SOURCE_DIR}/common
- ${CMAKE_SOURCE_DIR}/common/dialogs
- ${Boost_INCLUDE_DIR}
- )
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ./dialogs
+ ../common
+ ../common/dialogs
+ ${Boost_INCLUDE_DIR}
+ ${INC_AFTER}
+ )
set(EESCHEMA_SRCS
annotate.cpp
@@ -145,12 +148,18 @@ set(EESCHEMA_SRCS
tool_viewlib.cpp
transform.cpp
viewlib_frame.cpp
- viewlibs.cpp)
+ viewlibs.cpp
-set(EESCHEMA_EXTRA_SRCS
- ../common/dialogs/dialog_page_settings.cpp
+ # This file does not look common.
+ # Keep it after template_fieldnames_keywords.cpp
../common/sch_item_struct.cpp
-)
+ )
+
+
+set(EESCHEMA_COMMON_SRCS
+ ../common/dialogs/dialog_page_settings.cpp
+ )
+
if(WIN32)
if(MINGW)
@@ -186,8 +195,11 @@ make_lexer(
TFIELD_T
)
-add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS}
- ${EESCHEMA_RESOURCES})
+add_executable(eeschema WIN32 MACOSX_BUNDLE
+ ${EESCHEMA_SRCS}
+ ${EESCHEMA_COMMON_SRCS}
+ ${EESCHEMA_RESOURCES}
+ )
if(APPLE)
set_target_properties(eeschema PROPERTIES MACOSX_BUNDLE_INFO_PLIST
diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index f0a2a1d9fe..6e54263381 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -6,16 +6,16 @@
#include <algorithm> // to use sort vector
#include <vector>
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "netlist.h"
-#include "class_library.h"
-#include "protos.h"
-#include "sch_component.h"
-#include "lib_pin.h"
+#include <netlist.h>
+#include <class_library.h>
+#include <protos.h>
+#include <sch_component.h>
+#include <lib_pin.h>
void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
diff --git a/eeschema/backanno.cpp b/eeschema/backanno.cpp
index 2fe48ede71..579e2ae5d4 100644
--- a/eeschema/backanno.cpp
+++ b/eeschema/backanno.cpp
@@ -28,18 +28,18 @@
* @brief Functions for backannotating footprint information.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "wxEeschemaStruct.h"
-#include "build_version.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <wxEeschemaStruct.h>
+#include <build_version.h>
-#include "general.h"
-#include "sch_sheet_path.h"
-#include "sch_component.h"
-#include "netlist.h"
+#include <general.h>
+#include <sch_sheet_path.h>
+#include <sch_component.h>
+#include <netlist.h>
const wxString BackAnnotateFileWildcard( wxT( "Eeschema Back Annotation File (*.stf)|*.stf" ) );
diff --git a/eeschema/block.cpp b/eeschema/block.cpp
index 16f80961ce..a2bdec1dfd 100644
--- a/eeschema/block.cpp
+++ b/eeschema/block.cpp
@@ -27,25 +27,25 @@
* @file eeschema/block.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "class_library.h"
-#include "lib_pin.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
-#include "sch_marker.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_text.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <class_library.h>
+#include <lib_pin.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
+#include <sch_marker.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_text.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/block_libedit.cpp b/eeschema/block_libedit.cpp
index 1d8b8f9c7b..4ff0e75a0e 100644
--- a/eeschema/block_libedit.cpp
+++ b/eeschema/block_libedit.cpp
@@ -27,15 +27,15 @@
* @file block_libedit.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
-#include "general.h"
-#include "class_library.h"
-#include "protos.h"
-#include "libeditframe.h"
+#include <general.h>
+#include <class_library.h>
+#include <protos.h>
+#include <libeditframe.h>
static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
diff --git a/eeschema/build_BOM.cpp b/eeschema/build_BOM.cpp
index 7621279215..e78fe8ae06 100644
--- a/eeschema/build_BOM.cpp
+++ b/eeschema/build_BOM.cpp
@@ -31,15 +31,15 @@
#include <algorithm> // to use sort vector
#include <vector>
-#include "fctsys.h"
-#include "class_sch_screen.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <class_sch_screen.h>
+#include <kicad_string.h>
-#include "general.h"
-#include "sch_sheet.h"
-#include "sch_component.h"
-#include "template_fieldnames.h"
-#include "netlist.h"
+#include <general.h>
+#include <sch_sheet.h>
+#include <sch_component.h>
+#include <template_fieldnames.h>
+#include <netlist.h>
/* Fill aList with labels
diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index 02b034f9fb..ad990cec55 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -28,24 +28,24 @@
* @brief Code for editing buses, wires, and junctions.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "lib_draw_item.h"
-#include "lib_pin.h"
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_polyline.h"
-#include "sch_text.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
+#include <lib_draw_item.h>
+#include <lib_pin.h>
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_polyline.h>
+#include <sch_text.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
static void AbortCreateNewLine( EDA_DRAW_PANEL* Panel, wxDC* DC );
diff --git a/eeschema/busentry.cpp b/eeschema/busentry.cpp
index cf9ea84ed7..2a198f3857 100644
--- a/eeschema/busentry.cpp
+++ b/eeschema/busentry.cpp
@@ -28,16 +28,16 @@
* @brief Code to handle manipulation of bus entry objects.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "eeschema_id.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <eeschema_id.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
static int s_LastShape = '\\';
diff --git a/eeschema/class_drc_erc_item.cpp b/eeschema/class_drc_erc_item.cpp
index 90f4f58191..d9e1a0c2d9 100644
--- a/eeschema/class_drc_erc_item.cpp
+++ b/eeschema/class_drc_erc_item.cpp
@@ -25,11 +25,11 @@
/******************************************************************/
/* class_drc_erc_item.cpp - DRC_ITEM class functions for eeschema */
/******************************************************************/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "class_drc_item.h"
-#include "erc.h"
+#include <class_drc_item.h>
+#include <erc.h>
wxString DRC_ITEM::GetErrorText() const
{
diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index 0d93bc78c5..ff2db51338 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -27,28 +27,28 @@
* @file class_libentry.cpp
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "kicad_string.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "gr_basic.h"
-#include "class_sch_screen.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <kicad_string.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <gr_basic.h>
+#include <class_sch_screen.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.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 "lib_bezier.h"
-#include "lib_circle.h"
-#include "lib_polyline.h"
-#include "lib_rectangle.h"
-#include "lib_text.h"
+#include <general.h>
+#include <protos.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 <lib_bezier.h>
+#include <lib_circle.h>
+#include <lib_polyline.h>
+#include <lib_rectangle.h>
+#include <lib_text.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/class_libentry.h b/eeschema/class_libentry.h
index a66a0d0bbb..0eab6c88a9 100644
--- a/eeschema/class_libentry.h
+++ b/eeschema/class_libentry.h
@@ -30,9 +30,9 @@
#ifndef CLASS_LIBENTRY_H
#define CLASS_LIBENTRY_H
-#include "general.h"
-#include "lib_draw_item.h"
-#include "lib_field.h"
+#include <general.h>
+#include <lib_draw_item.h>
+#include <lib_field.h>
#include <map>
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 0d7b0ee03f..85b5f609d7 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -27,18 +27,18 @@
* @file class_library.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "eda_doc.h"
-#include "wxstruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <eda_doc.h>
+#include <wxstruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "class_library.h"
+#include <general.h>
+#include <protos.h>
+#include <class_library.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/class_library.h b/eeschema/class_library.h
index 58777b0001..423d024f64 100644
--- a/eeschema/class_library.h
+++ b/eeschema/class_library.h
@@ -33,7 +33,7 @@
#include <wx/filename.h>
-#include "class_libentry.h"
+#include <class_libentry.h>
class LINE_READER;
diff --git a/eeschema/class_netlist_object.cpp b/eeschema/class_netlist_object.cpp
index b45889af9b..5cb1dfed27 100644
--- a/eeschema/class_netlist_object.cpp
+++ b/eeschema/class_netlist_object.cpp
@@ -28,12 +28,12 @@
* @brief Class NETLIST_OBJECT to handle 1 item connected (in netlist and erc calculations)
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "sch_component.h"
+#include <general.h>
+#include <sch_component.h>
#if defined(DEBUG)
diff --git a/eeschema/class_netlist_object.h b/eeschema/class_netlist_object.h
index 9550067e28..b28dad9346 100644
--- a/eeschema/class_netlist_object.h
+++ b/eeschema/class_netlist_object.h
@@ -32,9 +32,9 @@
#define _CLASS_NETLIST_OBJECT_H_
-#include "sch_sheet_path.h"
+#include <sch_sheet_path.h>
-#include "lib_pin.h" // LIB_PIN::ReturnPinStringNum( m_PinNum )
+#include <lib_pin.h> // LIB_PIN::ReturnPinStringNum( m_PinNum )
class NETLIST_OBJECT;
diff --git a/eeschema/cmp_library_lexer.cpp b/eeschema/cmp_library_lexer.cpp
index 279b37b55d..67d21705e1 100644
--- a/eeschema/cmp_library_lexer.cpp
+++ b/eeschema/cmp_library_lexer.cpp
@@ -3,4 +3,4 @@
* library file DSN lexer which will replace the current library and library
* document file formats.
*/
-#include "cmp_library_lexer.h"
+#include <cmp_library_lexer.h>
diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp
index 6547edfb63..23e063cde1 100644
--- a/eeschema/component_references_lister.cpp
+++ b/eeschema/component_references_lister.cpp
@@ -32,11 +32,11 @@
#include <algorithm> // to use sort vector
#include <vector>
-#include "fctsys.h"
-#include "kicad_string.h"
-#include "wxEeschemaStruct.h"
-#include "netlist.h"
-#include "sch_component.h"
+#include <fctsys.h>
+#include <kicad_string.h>
+#include <wxEeschemaStruct.h>
+#include <netlist.h>
+#include <sch_component.h>
//#define USE_OLD_ALGO
diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index 0fddf914a1..5b6f133310 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -27,24 +27,24 @@
* eeschema/controle.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "eda_dde.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <eda_dde.h>
+#include <wxEeschemaStruct.h>
-#include "eeschema_id.h"
-#include "general.h"
-#include "hotkeys.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "viewlib_frame.h"
-#include "lib_draw_item.h"
-#include "lib_pin.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
-#include "sch_marker.h"
-#include "sch_component.h"
+#include <eeschema_id.h>
+#include <general.h>
+#include <hotkeys.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <viewlib_frame.h>
+#include <lib_draw_item.h>
+#include <lib_pin.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+#include <sch_marker.h>
+#include <sch_component.h>
SCH_ITEM* SCH_EDIT_FRAME::LocateAndShowItem( const wxPoint& aPosition, const KICAD_T aFilterList[],
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index 955fc73496..7cf5f54537 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -27,18 +27,18 @@
* @file eeschema/cross-probing.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "macros.h"
-#include "eda_dde.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <macros.h>
+#include <eda_dde.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "eeschema_id.h"
-#include "protos.h"
-#include "lib_draw_item.h"
-#include "lib_pin.h"
-#include "sch_component.h"
+#include <general.h>
+#include <eeschema_id.h>
+#include <protos.h>
+#include <lib_draw_item.h>
+#include <lib_pin.h>
+#include <sch_component.h>
/**
diff --git a/eeschema/dangling_ends.cpp b/eeschema/dangling_ends.cpp
index 455751fa8d..88b6700553 100644
--- a/eeschema/dangling_ends.cpp
+++ b/eeschema/dangling_ends.cpp
@@ -2,16 +2,16 @@
* @file dangling_ends.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "sch_item_struct.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <sch_item_struct.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "class_libentry.h"
-#include "lib_pin.h"
-#include "sch_component.h"
+#include <general.h>
+#include <protos.h>
+#include <class_libentry.h>
+#include <lib_pin.h>
+#include <sch_component.h>
/* Returns true if the point P is on the segment S. */
diff --git a/eeschema/dialog_erc_listbox.h b/eeschema/dialog_erc_listbox.h
index e3c828253f..6ce17abd41 100644
--- a/eeschema/dialog_erc_listbox.h
+++ b/eeschema/dialog_erc_listbox.h
@@ -10,9 +10,9 @@
#include <wx/htmllbox.h>
#include <vector>
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "sch_marker.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <sch_marker.h>
/**
* Class ERC_HTML_LISTBOX
diff --git a/eeschema/dialogs/annotate_dialog.cpp b/eeschema/dialogs/annotate_dialog.cpp
index e64d06d85f..d6ac66abb6 100644
--- a/eeschema/dialogs/annotate_dialog.cpp
+++ b/eeschema/dialogs/annotate_dialog.cpp
@@ -28,12 +28,12 @@
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxEeschemaStruct.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxEeschemaStruct.h>
+#include <class_drawpanel.h>
-#include "annotate_dialog.h"
+#include <annotate_dialog.h>
#define KEY_ANNOTATE_SORT_OPTION wxT("AnnotateSortOption")
#define KEY_ANNOTATE_ALGO_OPTION wxT("AnnotateAlgoOption")
diff --git a/eeschema/dialogs/annotate_dialog.h b/eeschema/dialogs/annotate_dialog.h
index efa8f7f903..a3e28bad7f 100644
--- a/eeschema/dialogs/annotate_dialog.h
+++ b/eeschema/dialogs/annotate_dialog.h
@@ -24,7 +24,7 @@
#ifndef _ANNOTATE_DIALOG_H_
#define _ANNOTATE_DIALOG_H_
-#include "dialog_annotate_base.h"
+#include <dialog_annotate_base.h>
class SCH_EDIT_FRAME;
diff --git a/eeschema/dialogs/dialog_SVG_print.cpp b/eeschema/dialogs/dialog_SVG_print.cpp
index fd97d1eebc..fee1553ca8 100644
--- a/eeschema/dialogs/dialog_SVG_print.cpp
+++ b/eeschema/dialogs/dialog_SVG_print.cpp
@@ -27,20 +27,20 @@
* @file eeschema/dialogs/dialog_SVG_print.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
-#include "dcsvg.h"
-#include "general.h"
-#include "libeditframe.h"
-#include "sch_sheet_path.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
+#include <dcsvg.h>
+#include <general.h>
+#include <libeditframe.h>
+#include <sch_sheet_path.h>
-#include "dialog_SVG_print.h"
+#include <dialog_SVG_print.h>
// Keys for configuration
diff --git a/eeschema/dialogs/dialog_SVG_print.h b/eeschema/dialogs/dialog_SVG_print.h
index cf58c6825e..365dc42121 100644
--- a/eeschema/dialogs/dialog_SVG_print.h
+++ b/eeschema/dialogs/dialog_SVG_print.h
@@ -6,7 +6,7 @@
class EDA_DRAW_FRAME;
-#include "dialog_SVG_print_base.h"
+#include <dialog_SVG_print_base.h>
class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
diff --git a/eeschema/dialogs/dialog_build_BOM.cpp b/eeschema/dialogs/dialog_build_BOM.cpp
index f92ab506f9..7367086893 100644
--- a/eeschema/dialogs/dialog_build_BOM.cpp
+++ b/eeschema/dialogs/dialog_build_BOM.cpp
@@ -26,27 +26,27 @@
* @file dialog_build_BOM.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "kicad_string.h"
-#include "class_sch_screen.h"
-#include "wxstruct.h"
-#include "build_version.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <kicad_string.h>
+#include <class_sch_screen.h>
+#include <wxstruct.h>
+#include <build_version.h>
-#include "general.h"
-#include "netlist.h"
-#include "template_fieldnames.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
-#include "class_library.h"
+#include <general.h>
+#include <netlist.h>
+#include <template_fieldnames.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
+#include <class_library.h>
-#include "wx/valgen.h"
+#include <wx/valgen.h>
-#include "dialog_build_BOM.h"
+#include <dialog_build_BOM.h>
-#include "protos.h"
+#include <protos.h>
extern void GenListeGLabels( std::vector <BOM_LABEL>& aList );
diff --git a/eeschema/dialogs/dialog_build_BOM.h b/eeschema/dialogs/dialog_build_BOM.h
index a5c3dca780..16e42f6edf 100644
--- a/eeschema/dialogs/dialog_build_BOM.h
+++ b/eeschema/dialogs/dialog_build_BOM.h
@@ -7,7 +7,7 @@
#ifndef _DIALOG_BUILD_BOM_H_
#define _DIALOG_BUILD_BOM_H_
-#include "dialog_build_BOM_base.h"
+#include <dialog_build_BOM_base.h>
class EDA_DRAW_FRAME;
diff --git a/eeschema/dialogs/dialog_color_config.cpp b/eeschema/dialogs/dialog_color_config.cpp
index a4234da696..72acba448d 100644
--- a/eeschema/dialogs/dialog_color_config.cpp
+++ b/eeschema/dialogs/dialog_color_config.cpp
@@ -2,15 +2,15 @@
/* Set up color Layers for Eeschema
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wxstruct.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wxstruct.h>
+#include <class_drawpanel.h>
-#include "general.h"
-#include "protos.h"
+#include <general.h>
+#include <protos.h>
-#include "dialog_color_config.h"
+#include <dialog_color_config.h>
#define ID_COLOR_SETUP 1800
diff --git a/eeschema/dialogs/dialog_color_config.h b/eeschema/dialogs/dialog_color_config.h
index 2dd235abed..2912d3a50c 100644
--- a/eeschema/dialogs/dialog_color_config.h
+++ b/eeschema/dialogs/dialog_color_config.h
@@ -2,7 +2,7 @@
#ifndef _DIALOG_COLOR_CONFIG_H_
#define _DIALOG_COLOR_CONFIG_H_
-#include "wx/statline.h"
+#include <wx/statline.h>
class wxBoxSizer;
diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.cpp b/eeschema/dialogs/dialog_edit_component_in_lib.cpp
index 066c0475d5..2568908c28 100644
--- a/eeschema/dialogs/dialog_edit_component_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_lib.cpp
@@ -4,27 +4,27 @@
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_library.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_library.h>
-#include "dialog_edit_component_in_lib.h"
+#include <dialog_edit_component_in_lib.h>
DIALOG_EDIT_COMPONENT_IN_LIBRARY::DIALOG_EDIT_COMPONENT_IN_LIBRARY( LIB_EDIT_FRAME* aParent ):
DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( aParent )
{
- m_Parent = aParent;
- m_RecreateToolbar = false;
+ m_Parent = aParent;
+ m_RecreateToolbar = false;
- initDlg();
+ initDlg();
GetSizer()->SetSizeHints( this );
Center();
@@ -94,7 +94,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::initDlg()
void DIALOG_EDIT_COMPONENT_IN_LIBRARY::OnCancelClick( wxCommandEvent& event )
{
- EndModal( wxID_CANCEL );
+ EndModal( wxID_CANCEL );
}
diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.h b/eeschema/dialogs/dialog_edit_component_in_lib.h
index 6e71ee73ed..610b2b211b 100644
--- a/eeschema/dialogs/dialog_edit_component_in_lib.h
+++ b/eeschema/dialogs/dialog_edit_component_in_lib.h
@@ -8,15 +8,15 @@
#ifndef _DIALOG_EDIT_COMPONENT_IN_LIB_H_
#define _DIALOG_EDIT_COMPONENT_IN_LIB_H_
-#include "dialog_edit_component_in_lib_base.h"
+#include <dialog_edit_component_in_lib_base.h>
class DIALOG_EDIT_COMPONENT_IN_LIBRARY: public DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE
{
public:
- LIB_EDIT_FRAME* m_Parent;
- bool m_RecreateToolbar;
- int m_AliasLocation;
+ LIB_EDIT_FRAME* m_Parent;
+ bool m_RecreateToolbar;
+ int m_AliasLocation;
public:
/// Constructors
@@ -27,19 +27,19 @@ private:
void initDlg();
void InitPanelDoc();
void InitBasicPanel();
- void OnCancelClick( wxCommandEvent& event );
- void OnOkClick(wxCommandEvent& event);
- void DeleteAllAliasOfPart(wxCommandEvent& event);
- void DeleteAliasOfPart(wxCommandEvent& event);
- void AddAliasOfPart(wxCommandEvent& event);
- bool ChangeNbUnitsPerPackage(int newUnit);
- bool SetUnsetConvert();
- void CopyDocToAlias(wxCommandEvent& event);
- void BrowseAndSelectDocFile(wxCommandEvent& event);
+ void OnCancelClick( wxCommandEvent& event );
+ void OnOkClick(wxCommandEvent& event);
+ void DeleteAllAliasOfPart(wxCommandEvent& event);
+ void DeleteAliasOfPart(wxCommandEvent& event);
+ void AddAliasOfPart(wxCommandEvent& event);
+ bool ChangeNbUnitsPerPackage(int newUnit);
+ bool SetUnsetConvert();
+ void CopyDocToAlias(wxCommandEvent& event);
+ void BrowseAndSelectDocFile(wxCommandEvent& event);
- void DeleteAllFootprintFilter(wxCommandEvent& event);
- void DeleteOneFootprintFilter(wxCommandEvent& event);
- void AddFootprintFilter(wxCommandEvent& event);
+ void DeleteAllFootprintFilter(wxCommandEvent& event);
+ void DeleteOneFootprintFilter(wxCommandEvent& event);
+ void AddFootprintFilter(wxCommandEvent& event);
};
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 94fe42f810..0e6bd1f217 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -4,20 +4,20 @@
#include <wx/tooltip.h>
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "class_library.h"
-#include "sch_component.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <class_library.h>
+#include <sch_component.h>
+#include <dialog_helpers.h>
-#include "dialog_edit_component_in_schematic.h"
+#include <dialog_edit_component_in_schematic.h>
int DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::s_SelectedRow;
@@ -814,7 +814,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
}
-#include "kicad_device_context.h"
+#include <kicad_device_context.h>
/* reinitialize components parameters to default values found in lib
*/
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.h b/eeschema/dialogs/dialog_edit_component_in_schematic.h
index 1ee7a86499..4711ed5b24 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.h
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.h
@@ -3,10 +3,10 @@
#define __dialog_edit_component_in_schematic__
-#include "sch_field.h"
-#include "template_fieldnames.h"
+#include <sch_field.h>
+#include <template_fieldnames.h>
-#include "dialog_edit_component_in_schematic_fbp.h"
+#include <dialog_edit_component_in_schematic_fbp.h>
class SCH_EDIT_FRAME;
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index 43285ce60e..ffda22832c 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -28,17 +28,17 @@
* @brief Implementation of the label properties dialog.
*/
-#include "fctsys.h"
-#include "wx/valgen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <wx/valgen.h>
+#include <wxEeschemaStruct.h>
-#include "class_drawpanel.h"
-#include "general.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "sch_text.h"
+#include <class_drawpanel.h>
+#include <general.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <sch_text.h>
-#include "dialog_edit_label.h"
+#include <dialog_edit_label.h>
/* Edit the properties of the text (Label, Global label, graphic text).. )
diff --git a/eeschema/dialogs/dialog_edit_label.h b/eeschema/dialogs/dialog_edit_label.h
index 0e4f56bacc..505038875e 100644
--- a/eeschema/dialogs/dialog_edit_label.h
+++ b/eeschema/dialogs/dialog_edit_label.h
@@ -8,7 +8,7 @@
#ifndef _DIALOG_EDIT_LABEL_H_
#define _DIALOG_EDIT_LABEL_H_
-#include "dialog_edit_label_base.h"
+#include <dialog_edit_label_base.h>
class SCH_EDIT_FRAME;
@@ -31,7 +31,7 @@ public:
private:
void InitDialog( );
- virtual void OnEnterKey( wxCommandEvent& aEvent );
+ virtual void OnEnterKey( wxCommandEvent& aEvent );
virtual void OnOkClick( wxCommandEvent& aEvent );
virtual void OnCancelClick( wxCommandEvent& aEvent );
void TextPropertiesAccept( wxCommandEvent& aEvent );
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
index 1717826ad2..51f9fc2eeb 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -4,23 +4,23 @@
#include <algorithm>
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
-#include "id.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
+#include <id.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_library.h"
-#include "sch_component.h"
-#include "sch_field.h"
-#include "template_fieldnames.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_library.h>
+#include <sch_component.h>
+#include <sch_field.h>
+#include <template_fieldnames.h>
+#include <dialog_helpers.h>
-#include "dialog_edit_libentry_fields_in_lib_base.h"
+#include <dialog_edit_libentry_fields_in_lib_base.h>
// Local variables:
static int s_SelectedRow;
diff --git a/eeschema/dialogs/dialog_eeschema_config.cpp b/eeschema/dialogs/dialog_eeschema_config.cpp
index 6546ccdbbb..ed59063944 100644
--- a/eeschema/dialogs/dialog_eeschema_config.cpp
+++ b/eeschema/dialogs/dialog_eeschema_config.cpp
@@ -26,21 +26,21 @@
* @file dialog_eeschema_config.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "netlist.h"
-#include "libeditframe.h"
-#include "viewlib_frame.h"
+#include <general.h>
+#include <protos.h>
+#include <netlist.h>
+#include <libeditframe.h>
+#include <viewlib_frame.h>
#include <wx/tokenzr.h>
-#include "dialog_eeschema_config.h"
+#include <dialog_eeschema_config.h>
DIALOG_EESCHEMA_CONFIG::DIALOG_EESCHEMA_CONFIG( SCH_EDIT_FRAME* aSchFrame,
diff --git a/eeschema/dialogs/dialog_eeschema_config.h b/eeschema/dialogs/dialog_eeschema_config.h
index ba9d919d77..a380176323 100644
--- a/eeschema/dialogs/dialog_eeschema_config.h
+++ b/eeschema/dialogs/dialog_eeschema_config.h
@@ -3,7 +3,7 @@
#define _DIALOG_EESCHEMA_CONFIG_H_
-#include "dialog_eeschema_config_fbp.h"
+#include <dialog_eeschema_config_fbp.h>
class SCH_EDIT_FRAME;
@@ -26,11 +26,11 @@ private:
void OnRemoveLibClick( wxCommandEvent& event );
void OnAddOrInsertLibClick( wxCommandEvent& event );
void OnAddOrInsertPath( wxCommandEvent& event );
- void OnOkClick( wxCommandEvent& event );
- void OnCancelClick( wxCommandEvent& event );
+ void OnOkClick( wxCommandEvent& event );
+ void OnCancelClick( wxCommandEvent& event );
void OnRemoveUserPath( wxCommandEvent& event );
- void OnButtonUpClick( wxCommandEvent& event );
- void OnButtonDownClick( wxCommandEvent& event );
+ void OnButtonUpClick( wxCommandEvent& event );
+ void OnButtonDownClick( wxCommandEvent& event );
public:
diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp
index 8574c7f701..ae610214f2 100644
--- a/eeschema/dialogs/dialog_eeschema_options.cpp
+++ b/eeschema/dialogs/dialog_eeschema_options.cpp
@@ -26,10 +26,10 @@
* @file dialog_eeschema_options.cpp
*/
-#include "fctsys.h"
-#include "class_base_screen.h"
+#include <fctsys.h>
+#include <class_base_screen.h>
-#include "dialog_eeschema_options.h"
+#include <dialog_eeschema_options.h>
DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
diff --git a/eeschema/dialogs/dialog_eeschema_options.h b/eeschema/dialogs/dialog_eeschema_options.h
index a7c56869ae..7585ff79ff 100644
--- a/eeschema/dialogs/dialog_eeschema_options.h
+++ b/eeschema/dialogs/dialog_eeschema_options.h
@@ -31,7 +31,7 @@
#ifndef __dialog_eeschema_options__
#define __dialog_eeschema_options__
-#include "dialog_eeschema_options_base.h"
+#include <dialog_eeschema_options_base.h>
class DIALOG_EESCHEMA_OPTIONS : public DIALOG_EESCHEMA_OPTIONS_BASE
{
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 3df0f6b53c..1d10993dea 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -28,24 +28,24 @@
* @brief Electrical Rules Check dialog implementation.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "netlist.h"
-#include "sch_marker.h"
-#include "sch_sheet.h"
-#include "lib_pin.h"
-#include "protos.h"
+#include <general.h>
+#include <netlist.h>
+#include <sch_marker.h>
+#include <sch_sheet.h>
+#include <lib_pin.h>
+#include <protos.h>
-#include "dialog_erc.h"
-#include "dialog_erc_listbox.h"
-#include "erc.h"
+#include <dialog_erc.h>
+#include <dialog_erc_listbox.h>
+#include <erc.h>
bool DIALOG_ERC::m_writeErcFile = false;
diff --git a/eeschema/dialogs/dialog_erc.h b/eeschema/dialogs/dialog_erc.h
index e4eb2dffe6..1de584d852 100644
--- a/eeschema/dialogs/dialog_erc.h
+++ b/eeschema/dialogs/dialog_erc.h
@@ -11,7 +11,7 @@
#include <vector>
-#include "dialog_erc_base.h"
+#include <dialog_erc_base.h>
/* Variable locales */
extern int DiagErc[PIN_NMAX][PIN_NMAX];
diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
index 111c75e5bc..ff917dbe03 100644
--- a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
@@ -1,4 +1,4 @@
-#include "dialog_lib_edit_draw_item.h"
+#include <dialog_lib_edit_draw_item.h>
DIALOG_LIB_EDIT_DRAW_ITEM::DIALOG_LIB_EDIT_DRAW_ITEM( wxWindow* parent,
diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item.h b/eeschema/dialogs/dialog_lib_edit_draw_item.h
index 6d9098d058..80ada253e0 100644
--- a/eeschema/dialogs/dialog_lib_edit_draw_item.h
+++ b/eeschema/dialogs/dialog_lib_edit_draw_item.h
@@ -10,7 +10,7 @@
class LIB_DRAW_ITEM;
-#include "dialog_lib_edit_draw_item_base.h"
+#include <dialog_lib_edit_draw_item_base.h>
/**
@@ -19,8 +19,8 @@ class LIB_DRAW_ITEM;
class DIALOG_LIB_EDIT_DRAW_ITEM : public DIALOG_LIB_EDIT_DRAW_ITEM_BASE
{
public:
- /** Constructor */
- DIALOG_LIB_EDIT_DRAW_ITEM( wxWindow* parent, const wxString& itemName );
+ /** Constructor */
+ DIALOG_LIB_EDIT_DRAW_ITEM( wxWindow* parent, const wxString& itemName );
wxString GetWidth( void );
void SetWidth( const wxString& width );
diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp
index b5e3628d64..461eaba2c2 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp
@@ -1,11 +1,11 @@
-#include "fctsys.h"
-#include "macros.h"
-#include "gr_basic.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
-#include "lib_pin.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <gr_basic.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
+#include <lib_pin.h>
-#include "dialog_lib_edit_pin.h"
+#include <dialog_lib_edit_pin.h>
// dialog should remember its previous screen position and size
// Not also if the defaut size is > s_LastSize, default size is used
diff --git a/eeschema/dialogs/dialog_lib_edit_pin.h b/eeschema/dialogs/dialog_lib_edit_pin.h
index e5f5be528e..e41f2d2a6d 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin.h
+++ b/eeschema/dialogs/dialog_lib_edit_pin.h
@@ -6,9 +6,9 @@
* Subclass of DIALOG_LIB_EDIT_PIN_BASE, which is generated by wxFormBuilder.
*/
-#include "wx/bmpcbox.h"
+#include <wx/bmpcbox.h>
-#include "dialog_lib_edit_pin_base.h"
+#include <dialog_lib_edit_pin_base.h>
/** Implementing DIALOG_LIB_EDIT_PIN_BASE */
class DIALOG_LIB_EDIT_PIN : public DIALOG_LIB_EDIT_PIN_BASE
diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp
index 14f74e1e40..aedd4825fa 100644
--- a/eeschema/dialogs/dialog_lib_edit_text.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text.cpp
@@ -27,17 +27,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
-#include "general.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
-#include "lib_text.h"
+#include <general.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
+#include <lib_text.h>
-#include "dialog_lib_edit_text.h"
+#include <dialog_lib_edit_text.h>
DIALOG_LIB_EDIT_TEXT::DIALOG_LIB_EDIT_TEXT( LIB_EDIT_FRAME* aParent, LIB_TEXT* aText ) :
diff --git a/eeschema/dialogs/dialog_lib_edit_text.h b/eeschema/dialogs/dialog_lib_edit_text.h
index bae3b40c92..774e26ddff 100644
--- a/eeschema/dialogs/dialog_lib_edit_text.h
+++ b/eeschema/dialogs/dialog_lib_edit_text.h
@@ -3,7 +3,7 @@
#define _DIALOG_LIB_EDIT_TEXT_H_
-#include "dialog_lib_edit_text_base.h"
+#include <dialog_lib_edit_text_base.h>
class LIB_EDIT_FRAME;
diff --git a/eeschema/dialogs/dialog_lib_new_component.cpp b/eeschema/dialogs/dialog_lib_new_component.cpp
index 0cf15cc040..56321b746c 100644
--- a/eeschema/dialogs/dialog_lib_new_component.cpp
+++ b/eeschema/dialogs/dialog_lib_new_component.cpp
@@ -1,4 +1,4 @@
-#include "dialog_lib_new_component.h"
+#include <dialog_lib_new_component.h>
DIALOG_LIB_NEW_COMPONENT::DIALOG_LIB_NEW_COMPONENT( wxWindow* parent ) :
DIALOG_LIB_NEW_COMPONENT_BASE( parent )
diff --git a/eeschema/dialogs/dialog_lib_new_component.h b/eeschema/dialogs/dialog_lib_new_component.h
index e919314ddd..be0cd6c11f 100644
--- a/eeschema/dialogs/dialog_lib_new_component.h
+++ b/eeschema/dialogs/dialog_lib_new_component.h
@@ -6,14 +6,14 @@
Subclass of DIALOG_LIB_NEW_COMPONENT, which is generated by wxFormBuilder.
*/
-#include "dialog_lib_new_component_base.h"
+#include <dialog_lib_new_component_base.h>
/** Implementing DIALOG_LIB_NEW_COMPONENT */
class DIALOG_LIB_NEW_COMPONENT : public DIALOG_LIB_NEW_COMPONENT_BASE
{
public:
- /** Constructor */
- DIALOG_LIB_NEW_COMPONENT( wxWindow* parent );
+ /** Constructor */
+ DIALOG_LIB_NEW_COMPONENT( wxWindow* parent );
void SetName( const wxString& name ) { m_textName->SetValue( name ); }
wxString GetName( void ) { return m_textName->GetValue(); }
diff --git a/eeschema/dialogs/dialog_libedit_dimensions.cpp b/eeschema/dialogs/dialog_libedit_dimensions.cpp
index 4ceddb06bb..2c73b6aab4 100644
--- a/eeschema/dialogs/dialog_libedit_dimensions.cpp
+++ b/eeschema/dialogs/dialog_libedit_dimensions.cpp
@@ -2,20 +2,20 @@
* dialog_libedit_dimensions.cpp
* Handles the dialog so set current texts and pins sizes in LibEdit
*/
-#include "fctsys.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "libeditframe.h"
+#include <general.h>
+#include <libeditframe.h>
-#include "dialog_libedit_dimensions.h"
+#include <dialog_libedit_dimensions.h>
DIALOG_LIBEDIT_DIMENSIONS::DIALOG_LIBEDIT_DIMENSIONS( LIB_EDIT_FRAME* parent )
: DIALOG_LIBEDIT_DIMENSIONS_BASE( parent )
{
GetSizer()->SetSizeHints( this );
- Centre( wxBOTH );
+ Centre( wxBOTH );
}
diff --git a/eeschema/dialogs/dialog_libedit_dimensions.h b/eeschema/dialogs/dialog_libedit_dimensions.h
index 20891ea67d..cf3cf78e8d 100644
--- a/eeschema/dialogs/dialog_libedit_dimensions.h
+++ b/eeschema/dialogs/dialog_libedit_dimensions.h
@@ -3,7 +3,7 @@
#define _DIALOG_LIBEDIT_DIMENSIONS_H_
-#include "dialog_libedit_dimensions_base.h"
+#include <dialog_libedit_dimensions_base.h>
class LIB_EDIT_FRAME;
diff --git a/eeschema/dialogs/dialog_plot_schematic_DXF.cpp b/eeschema/dialogs/dialog_plot_schematic_DXF.cpp
index 67a0ae27d6..fc21d78e6b 100644
--- a/eeschema/dialogs/dialog_plot_schematic_DXF.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic_DXF.cpp
@@ -25,20 +25,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "plot_common.h"
-#include "confirm.h"
-#include "worksheet.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <plot_common.h>
+#include <confirm.h>
+#include <worksheet.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_sheet_path.h>
-#include "dialog_plot_schematic_DXF_base.h"
+#include <dialog_plot_schematic_DXF_base.h>
class DIALOG_PLOT_SCHEMATIC_DXF : public DIALOG_PLOT_SCHEMATIC_DXF_BASE
{
diff --git a/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp b/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
index de275ab27c..a275610e64 100644
--- a/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
@@ -25,19 +25,19 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "confirm.h"
-#include "plot_common.h"
-#include "worksheet.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <confirm.h>
+#include <plot_common.h>
+#include <worksheet.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_sheet_path.h>
-#include "dialog_plot_schematic_HPGL_base.h"
+#include <dialog_plot_schematic_HPGL_base.h>
enum HPGL_PAGEZ_T
diff --git a/eeschema/dialogs/dialog_plot_schematic_PS.cpp b/eeschema/dialogs/dialog_plot_schematic_PS.cpp
index d17a8235a9..d932fffe38 100644
--- a/eeschema/dialogs/dialog_plot_schematic_PS.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic_PS.cpp
@@ -25,17 +25,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "confirm.h"
-#include "worksheet.h"
-#include "plot_common.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <confirm.h>
+#include <worksheet.h>
+#include <plot_common.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_sheet_path.h>
enum PageFormatReq {
@@ -44,7 +44,7 @@ enum PageFormatReq {
PAGE_SIZE_A
};
-#include "dialog_plot_schematic_PS_base.h"
+#include <dialog_plot_schematic_PS_base.h>
class DIALOG_PLOT_SCHEMATIC_PS : public DIALOG_PLOT_SCHEMATIC_PS_BASE
{
diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp
index 893f25bd7a..704f9aad64 100644
--- a/eeschema/dialogs/dialog_print_using_printer.cpp
+++ b/eeschema/dialogs/dialog_print_using_printer.cpp
@@ -2,20 +2,20 @@
/* File: dialog_print_using_printer.cpp */
/****************************************/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "class_sch_screen.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <class_sch_screen.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "eeschema_config.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <eeschema_config.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
-#include "dialog_print_using_printer.h"
+#include <dialog_print_using_printer.h>
/**
diff --git a/eeschema/dialogs/dialog_print_using_printer.h b/eeschema/dialogs/dialog_print_using_printer.h
index ef0a7c4833..662babed60 100644
--- a/eeschema/dialogs/dialog_print_using_printer.h
+++ b/eeschema/dialogs/dialog_print_using_printer.h
@@ -3,7 +3,7 @@
#define _DIALOG_PRINT_USING_PRINTER_H_
-#include "dialog_print_using_printer_base.h"
+#include <dialog_print_using_printer_base.h>
/**
diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp b/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp
index ffca6424ef..d3e9787e61 100644
--- a/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp
+++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp
@@ -1,4 +1,4 @@
-#include "dialog_sch_edit_sheet_pin.h"
+#include <dialog_sch_edit_sheet_pin.h>
static wxString sheetPinTypes[] =
diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin.h b/eeschema/dialogs/dialog_sch_edit_sheet_pin.h
index 5d74d5698b..88e3a22eba 100644
--- a/eeschema/dialogs/dialog_sch_edit_sheet_pin.h
+++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin.h
@@ -8,7 +8,7 @@
*/
-#include "dialog_sch_edit_sheet_pin_base.h"
+#include <dialog_sch_edit_sheet_pin_base.h>
class DIALOG_SCH_EDIT_SHEET_PIN : public DIALOG_SCH_EDIT_SHEET_PIN_BASE
diff --git a/eeschema/dialogs/dialog_sch_sheet_props.cpp b/eeschema/dialogs/dialog_sch_sheet_props.cpp
index 8aa611724c..83f871c2cd 100644
--- a/eeschema/dialogs/dialog_sch_sheet_props.cpp
+++ b/eeschema/dialogs/dialog_sch_sheet_props.cpp
@@ -1,4 +1,4 @@
-#include "dialog_sch_sheet_props.h"
+#include <dialog_sch_sheet_props.h>
DIALOG_SCH_SHEET_PROPS::DIALOG_SCH_SHEET_PROPS( wxWindow* parent ) :
DIALOG_SCH_SHEET_PROPS_BASE( parent )
diff --git a/eeschema/dialogs/dialog_sch_sheet_props.h b/eeschema/dialogs/dialog_sch_sheet_props.h
index 873c57981b..ad92bfcd31 100644
--- a/eeschema/dialogs/dialog_sch_sheet_props.h
+++ b/eeschema/dialogs/dialog_sch_sheet_props.h
@@ -6,14 +6,14 @@
* Subclass of DIALOG_SCH_SHEET_PROPS_BASE, which is generated by wxFormBuilder.
*/
-#include "dialog_sch_sheet_props_base.h"
+#include <dialog_sch_sheet_props_base.h>
/** Implementing DIALOG_SCH_SHEET_PROPS_BASE */
class DIALOG_SCH_SHEET_PROPS : public DIALOG_SCH_SHEET_PROPS_BASE
{
public:
- /** Constructor */
- DIALOG_SCH_SHEET_PROPS( wxWindow* parent );
+ /** Constructor */
+ DIALOG_SCH_SHEET_PROPS( wxWindow* parent );
void SetFileName( const wxString& aFileName )
{
diff --git a/eeschema/dialogs/dialog_schematic_find.cpp b/eeschema/dialogs/dialog_schematic_find.cpp
index 0bb4747ce3..0cfe86b1ba 100644
--- a/eeschema/dialogs/dialog_schematic_find.cpp
+++ b/eeschema/dialogs/dialog_schematic_find.cpp
@@ -27,7 +27,7 @@
* @brief Schematic find and replace dialog implementation.
*/
-#include "dialog_schematic_find.h"
+#include <dialog_schematic_find.h>
DEFINE_EVENT_TYPE( EVT_COMMAND_FIND_DRC_MARKER )
diff --git a/eeschema/edit_bitmap.cpp b/eeschema/edit_bitmap.cpp
index 43b040477f..3e832a3215 100644
--- a/eeschema/edit_bitmap.cpp
+++ b/eeschema/edit_bitmap.cpp
@@ -26,18 +26,18 @@
* @file edit_bitmap.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "richio.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <richio.h>
+#include <plot_common.h>
-#include "wxEeschemaStruct.h"
-#include "general.h"
-#include "sch_bitmap.h"
-#include "dialog_image_editor.h"
+#include <wxEeschemaStruct.h>
+#include <general.h>
+#include <sch_bitmap.h>
+#include <dialog_image_editor.h>
#include <algorithm>
diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp
index 77d99bad0d..10c88a52a4 100644
--- a/eeschema/edit_component_in_schematic.cpp
+++ b/eeschema/edit_component_in_schematic.cpp
@@ -28,16 +28,16 @@
* @brief Schematic component editing code.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "class_library.h"
-#include "sch_component.h"
+#include <general.h>
+#include <protos.h>
+#include <class_library.h>
+#include <sch_component.h>
void SCH_EDIT_FRAME::EditComponentFieldText( SCH_FIELD* aField, wxDC* aDC )
diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp
index e4538b2938..32d428c987 100644
--- a/eeschema/edit_label.cpp
+++ b/eeschema/edit_label.cpp
@@ -28,19 +28,19 @@
* @brief Label, global label and text creation and editing.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "base_struct.h"
-#include "drawtxt.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
-#include "kicad_device_context.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <base_struct.h>
+#include <drawtxt.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
+#include <kicad_device_context.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_text.h"
-#include "eeschema_id.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_text.h>
+#include <eeschema_id.h>
static int lastGlobalLabelShape = (int) NET_INPUT;
diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp
index 67362f3255..e836b013c0 100644
--- a/eeschema/eelibs_read_libraryfiles.cpp
+++ b/eeschema/eelibs_read_libraryfiles.cpp
@@ -3,16 +3,16 @@
* @brief Functions to handle reading component library files.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "class_library.h"
+#include <general.h>
+#include <class_library.h>
-#include "html_messagebox.h"
+#include <html_messagebox.h>
void SCH_EDIT_FRAME::LoadLibraries( void )
diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp
index 4090ea268d..a36d297931 100644
--- a/eeschema/eeredraw.cpp
+++ b/eeschema/eeredraw.cpp
@@ -27,21 +27,21 @@
* @file eeredraw.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "class_library.h"
-#include "sch_bus_entry.h"
-#include "sch_component.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_polyline.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <class_library.h>
+#include <sch_bus_entry.h>
+#include <sch_component.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_polyline.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
void DrawDanglingSymbol( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& pos, int Color )
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 90dc4f287c..16b96b998a 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -27,20 +27,20 @@
* @file eeschema.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "eda_dde.h"
-#include "id.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <eda_dde.h>
+#include <id.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "hotkeys.h"
-#include "dialogs/dialog_color_config.h"
-#include "transform.h"
+#include <general.h>
+#include <protos.h>
+#include <hotkeys.h>
+#include <dialogs/dialog_color_config.h>
+#include <transform.h>
#include <wx/snglinst.h>
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index a55ffdc368..466d0f7ab3 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -2,29 +2,29 @@
* @file eeschema_config.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <wxEeschemaStruct.h>
-#include "eeschema_id.h"
-#include "general.h"
-#include "netlist_control.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "eeschema_config.h"
-#include "worksheet.h"
-#include "hotkeys.h"
-#include "sch_sheet.h"
+#include <eeschema_id.h>
+#include <general.h>
+#include <netlist_control.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <eeschema_config.h>
+#include <worksheet.h>
+#include <hotkeys.h>
+#include <sch_sheet.h>
-#include "dialog_hotkeys_editor.h"
+#include <dialog_hotkeys_editor.h>
-#include "dialogs/dialog_color_config.h"
-#include "dialogs/dialog_eeschema_config.h"
-#include "dialogs/dialog_eeschema_options.h"
-#include "dialogs/dialog_schematic_find.h"
+#include <dialogs/dialog_color_config.h>
+#include <dialogs/dialog_eeschema_config.h>
+#include <dialogs/dialog_eeschema_options.h>
+#include <dialogs/dialog_schematic_find.h>
#define HOTKEY_FILENAME wxT( "eeschema" )
diff --git a/eeschema/eeschema_config.h b/eeschema/eeschema_config.h
index 56c7d79a70..c33a4ea2f7 100644
--- a/eeschema/eeschema_config.h
+++ b/eeschema/eeschema_config.h
@@ -2,7 +2,7 @@
* @file eeschema_config.h
*/
-#include "param_config.h"
+#include <param_config.h>
#define GROUP wxT( "/eeschema" )
#define GROUPCOMMON wxT( "/common" )
diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h
index 942e2cbcd5..59d0189ca5 100644
--- a/eeschema/eeschema_id.h
+++ b/eeschema/eeschema_id.h
@@ -30,7 +30,7 @@
#define __EESCHEMA_ID_H__
-#include "id.h"
+#include <id.h>
/**
@@ -182,52 +182,52 @@ enum id_eeschema_frm
ID_LIBEDIT_DIMENSIONS,
/* Library editor horizontal toolbar IDs. */
- ID_LIBEDIT_SELECT_PART,
- ID_LIBEDIT_SELECT_CURRENT_LIB,
- ID_LIBEDIT_SAVE_CURRENT_LIB,
- ID_LIBEDIT_SAVE_CURRENT_PART,
- ID_LIBEDIT_NEW_PART,
+ ID_LIBEDIT_SELECT_PART,
+ ID_LIBEDIT_SELECT_CURRENT_LIB,
+ ID_LIBEDIT_SAVE_CURRENT_LIB,
+ ID_LIBEDIT_SAVE_CURRENT_PART,
+ ID_LIBEDIT_NEW_PART,
ID_LIBEDIT_NEW_PART_FROM_EXISTING,
ID_LIBEDIT_GET_FRAME_EDIT_PART,
- ID_LIBEDIT_GET_FRAME_EDIT_FIELDS,
- ID_LIBEDIT_DELETE_PART,
- ID_DE_MORGAN_NORMAL_BUTT,
- ID_DE_MORGAN_CONVERT_BUTT,
- ID_LIBEDIT_EDIT_PIN_BY_PIN,
- ID_LIBEDIT_VIEW_DOC,
+ ID_LIBEDIT_GET_FRAME_EDIT_FIELDS,
+ ID_LIBEDIT_DELETE_PART,
+ ID_DE_MORGAN_NORMAL_BUTT,
+ ID_DE_MORGAN_CONVERT_BUTT,
+ ID_LIBEDIT_EDIT_PIN_BY_PIN,
+ ID_LIBEDIT_VIEW_DOC,
ID_LIBEDIT_CHECK_PART,
- ID_LIBEDIT_SELECT_PART_NUMBER,
- ID_LIBEDIT_SELECT_ALIAS,
+ ID_LIBEDIT_SELECT_PART_NUMBER,
+ ID_LIBEDIT_SELECT_ALIAS,
- /* Library editor vertical toolbar IDs. */
- ID_LIBEDIT_PIN_BUTT,
- ID_LIBEDIT_BODY_LINE_BUTT,
- ID_LIBEDIT_BODY_ARC_BUTT,
- ID_LIBEDIT_BODY_CIRCLE_BUTT,
- ID_LIBEDIT_BODY_RECT_BUTT,
- ID_LIBEDIT_BODY_TEXT_BUTT,
- ID_LIBEDIT_ANCHOR_ITEM_BUTT,
- ID_LIBEDIT_IMPORT_BODY_BUTT,
- ID_LIBEDIT_EXPORT_BODY_BUTT,
- ID_LIBEDIT_DELETE_ITEM_BUTT,
+ /* Library editor vertical toolbar IDs. */
+ ID_LIBEDIT_PIN_BUTT,
+ ID_LIBEDIT_BODY_LINE_BUTT,
+ ID_LIBEDIT_BODY_ARC_BUTT,
+ ID_LIBEDIT_BODY_CIRCLE_BUTT,
+ ID_LIBEDIT_BODY_RECT_BUTT,
+ ID_LIBEDIT_BODY_TEXT_BUTT,
+ ID_LIBEDIT_ANCHOR_ITEM_BUTT,
+ ID_LIBEDIT_IMPORT_BODY_BUTT,
+ ID_LIBEDIT_EXPORT_BODY_BUTT,
+ ID_LIBEDIT_DELETE_ITEM_BUTT,
- ID_LIBEDIT_ROTATE_ITEM,
+ ID_LIBEDIT_ROTATE_ITEM,
/* Library editor context menu IDs */
- ID_LIBEDIT_EDIT_PIN,
- ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_ITEM,
- ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINSIZE_ITEM,
- ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNAMESIZE_ITEM,
- ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNUMSIZE_ITEM,
- ID_POPUP_LIBEDIT_BODY_EDIT_ITEM,
- ID_POPUP_LIBEDIT_DELETE_ITEM,
- ID_POPUP_LIBEDIT_MODIFY_ITEM,
- ID_POPUP_LIBEDIT_END_CREATE_ITEM,
- ID_POPUP_LIBEDIT_CANCEL_EDITING,
- ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST,
- ID_POPUP_LIBEDIT_FIELD_EDIT_ITEM,
- ID_POPUP_LIBEDIT_DELETE_CURRENT_POLY_SEGMENT,
+ ID_LIBEDIT_EDIT_PIN,
+ ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_ITEM,
+ ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINSIZE_ITEM,
+ ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNAMESIZE_ITEM,
+ ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNUMSIZE_ITEM,
+ ID_POPUP_LIBEDIT_BODY_EDIT_ITEM,
+ ID_POPUP_LIBEDIT_DELETE_ITEM,
+ ID_POPUP_LIBEDIT_MODIFY_ITEM,
+ ID_POPUP_LIBEDIT_END_CREATE_ITEM,
+ ID_POPUP_LIBEDIT_CANCEL_EDITING,
+ ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST,
+ ID_POPUP_LIBEDIT_FIELD_EDIT_ITEM,
+ ID_POPUP_LIBEDIT_DELETE_CURRENT_POLY_SEGMENT,
/* Library editor menubar IDs */
ID_LIBEDIT_SAVE_CURRENT_LIB_AS,
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 15ebf4435b..a9698faf45 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -28,19 +28,19 @@
* @brief Electrical Rules Check implementation.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "kicad_string.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <kicad_string.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "netlist.h"
-#include "lib_pin.h"
-#include "protos.h"
-#include "erc.h"
-#include "sch_marker.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <netlist.h>
+#include <lib_pin.h>
+#include <protos.h>
+#include <erc.h>
+#include <sch_marker.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
/* ERC tests :
diff --git a/eeschema/events_called_functions_for_edit.cpp b/eeschema/events_called_functions_for_edit.cpp
index f6e5984740..2fdbd751c1 100644
--- a/eeschema/events_called_functions_for_edit.cpp
+++ b/eeschema/events_called_functions_for_edit.cpp
@@ -2,16 +2,16 @@
* @file events_called_functions.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "general.h"
-#include "kicad_device_context.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <general.h>
+#include <kicad_device_context.h>
+#include <wxEeschemaStruct.h>
-#include "protos.h"
-#include "sch_component.h"
-#include "sch_text.h"
+#include <protos.h>
+#include <sch_component.h>
+#include <sch_text.h>
void SCH_EDIT_FRAME::OnCopySchematicItemRequest( wxCommandEvent& event )
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 29292571b2..2de303fb50 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -27,18 +27,18 @@
* @file eeschema/files-io.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "eeschema_id.h"
-#include "class_library.h"
-#include "libeditframe.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <protos.h>
+#include <eeschema_id.h>
+#include <class_library.h>
+#include <libeditframe.h>
+#include <sch_sheet.h>
bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, int aSaveType, bool aCreateBackupFile )
diff --git a/eeschema/find.cpp b/eeschema/find.cpp
index 3e305ee392..e8ff657fcb 100644
--- a/eeschema/find.cpp
+++ b/eeschema/find.cpp
@@ -33,28 +33,28 @@
* search a component in libraries, a marker ...,
* in current sheet or whole the project
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "class_library.h"
-#include "lib_pin.h"
-#include "sch_marker.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <protos.h>
+#include <class_library.h>
+#include <lib_pin.h>
+#include <sch_marker.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
-#include "kicad_device_context.h"
+#include <kicad_device_context.h>
#include <boost/foreach.hpp>
-#include "dialogs/dialog_schematic_find.h"
+#include <dialogs/dialog_schematic_find.h>
void SCH_EDIT_FRAME::OnFindDrcMarker( wxFindDialogEvent& event )
diff --git a/eeschema/general.h b/eeschema/general.h
index 8cdc0ff80a..88c92bf835 100644
--- a/eeschema/general.h
+++ b/eeschema/general.h
@@ -8,8 +8,8 @@
#include <wx/string.h>
#include <wx/gdicmn.h>
-#include "block_commande.h"
-#include "class_netlist_object.h"
+#include <block_commande.h>
+#include <class_netlist_object.h>
class SCH_ITEM;
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index a8c362d8cf..5299456376 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -28,22 +28,22 @@
* @brief Cod to handle get & place library component.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
-#include "kicad_device_context.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
+#include <kicad_device_context.h>
-#include "general.h"
-#include "protos.h"
-#include "class_library.h"
-#include "sch_component.h"
-#include "viewlib_frame.h"
-#include "eeschema_id.h"
+#include <general.h>
+#include <protos.h>
+#include <class_library.h>
+#include <sch_component.h>
+#include <viewlib_frame.h>
+#include <eeschema_id.h>
-#include "dialog_get_component.h"
+#include <dialog_get_component.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp
index 579a88e96a..8906933fbe 100644
--- a/eeschema/hierarch.cpp
+++ b/eeschema/hierarch.cpp
@@ -27,17 +27,17 @@
* @file hierarch.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
+#include <general.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
-#include "wx/imaglist.h"
-#include "wx/treectrl.h"
+#include <wx/imaglist.h>
+#include <wx/treectrl.h>
enum
diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp
index 9022794e02..e0d18d482f 100644
--- a/eeschema/hotkeys.cpp
+++ b/eeschema/hotkeys.cpp
@@ -27,21 +27,21 @@
* @file eeschema/hotkeys.cpp
*/
-#include "fctsys.h"
-#include "eeschema_id.h"
-#include "hotkeys.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <eeschema_id.h>
+#include <hotkeys.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
-#include "dialogs/dialog_schematic_find.h"
+#include <dialogs/dialog_schematic_find.h>
/* How to add a new hotkey:
diff --git a/eeschema/hotkeys.h b/eeschema/hotkeys.h
index fb7ef7637f..25e00ef6ab 100644
--- a/eeschema/hotkeys.h
+++ b/eeschema/hotkeys.h
@@ -1,10 +1,10 @@
/**
* eeschema/hotkeys.h
*/
-#ifndef KOTKEYS_H
-#define KOTKEYS_H
+#ifndef EESCHEMA_KOTKEYS_H_
+#define EESCHEMA_KOTKEYS_H_
-#include "hotkeys_basic.h"
+#include <hotkeys_basic.h>
// List of hot keys id.
// see also enum common_hotkey_id_commnand in hotkeys_basic.h
@@ -57,4 +57,4 @@ extern struct EDA_HOTKEY_CONFIG s_Libedit_Hokeys_Descr[];
// List of hotkey descriptors for the lib browser only
extern struct EDA_HOTKEY_CONFIG s_Viewlib_Hokeys_Descr[];
-#endif // KOTKEYS_H
+#endif // EESCHEMA_KOTKEYS_H_
diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp
index 44f1170e03..660556efa2 100644
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@@ -27,19 +27,19 @@
* @file lib_arc.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "lib_arc.h"
-#include "transform.h"
+#include <general.h>
+#include <protos.h>
+#include <lib_arc.h>
+#include <transform.h>
//! @brief Given three points A B C, compute the circumcenter of the resulting triangle
diff --git a/eeschema/lib_arc.h b/eeschema/lib_arc.h
index c6b268bf9e..a80ae3f0ab 100644
--- a/eeschema/lib_arc.h
+++ b/eeschema/lib_arc.h
@@ -30,7 +30,7 @@
#ifndef _LIB_ARC_H_
#define _LIB_ARC_H_
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
class TRANSFORM;
diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index d0a24b77dd..ab3bb95e36 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -27,20 +27,20 @@
* @file lib_bezier.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "bezier_curves.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <bezier_curves.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "lib_bezier.h"
-#include "transform.h"
+#include <general.h>
+#include <protos.h>
+#include <lib_bezier.h>
+#include <transform.h>
LIB_BEZIER::LIB_BEZIER( LIB_COMPONENT* aParent ) :
diff --git a/eeschema/lib_bezier.h b/eeschema/lib_bezier.h
index 066deea579..d67cd4d9ec 100644
--- a/eeschema/lib_bezier.h
+++ b/eeschema/lib_bezier.h
@@ -30,7 +30,7 @@
#ifndef _LIB_BEZIER_H_
#define _LIB_BEZIER_H_
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
/**
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index 7bf748f521..3b796c9ebf 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -28,19 +28,19 @@
* @brief LIB_CIRCLE class implementation.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "lib_circle.h"
-#include "transform.h"
+#include <general.h>
+#include <protos.h>
+#include <lib_circle.h>
+#include <transform.h>
LIB_CIRCLE::LIB_CIRCLE( LIB_COMPONENT* aParent ) :
diff --git a/eeschema/lib_circle.h b/eeschema/lib_circle.h
index e17c6ac0bf..5c36cf058c 100644
--- a/eeschema/lib_circle.h
+++ b/eeschema/lib_circle.h
@@ -30,7 +30,7 @@
#ifndef _LIB_CIRCLE_H_
#define _LIB_CIRCLE_H_
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
class LIB_CIRCLE : public LIB_ITEM
diff --git a/eeschema/lib_collectors.cpp b/eeschema/lib_collectors.cpp
index 0e538250a8..d18bafcb6d 100644
--- a/eeschema/lib_collectors.cpp
+++ b/eeschema/lib_collectors.cpp
@@ -22,10 +22,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "macros.h"
-#include "general.h"
-#include "transform.h"
-#include "lib_collectors.h"
+#include <macros.h>
+#include <general.h>
+#include <transform.h>
+#include <lib_collectors.h>
const KICAD_T LIB_COLLECTOR::AllItems[] = {
diff --git a/eeschema/lib_collectors.h b/eeschema/lib_collectors.h
index 00fc5724c7..2b62e325ab 100644
--- a/eeschema/lib_collectors.h
+++ b/eeschema/lib_collectors.h
@@ -26,8 +26,8 @@
#define _LIB_COLLECTORS_H_
-#include "class_collector.h"
-#include "lib_draw_item.h"
+#include <class_collector.h>
+#include <lib_draw_item.h>
class LIB_COLLECTOR;
diff --git a/eeschema/lib_draw_item.cpp b/eeschema/lib_draw_item.cpp
index b4d54c904b..ee0e3e23e7 100644
--- a/eeschema/lib_draw_item.cpp
+++ b/eeschema/lib_draw_item.cpp
@@ -27,14 +27,14 @@
* @file lib_draw_item.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "wxstruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <wxstruct.h>
-#include "protos.h"
-#include "general.h"
-#include "lib_draw_item.h"
+#include <protos.h>
+#include <general.h>
+#include <lib_draw_item.h>
const int fill_tab[3] = { 'N', 'F', 'f' };
diff --git a/eeschema/lib_draw_item.h b/eeschema/lib_draw_item.h
index 28983a3775..93ef1e50d1 100644
--- a/eeschema/lib_draw_item.h
+++ b/eeschema/lib_draw_item.h
@@ -31,8 +31,8 @@
#ifndef _LIB_ITEM_H_
#define _LIB_ITEM_H_
-#include "base_struct.h"
-#include "transform.h"
+#include <base_struct.h>
+#include <transform.h>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp
index 1470fa4dcb..850a97ba5f 100644
--- a/eeschema/lib_export.cpp
+++ b/eeschema/lib_export.cpp
@@ -29,18 +29,18 @@
* create, edit, and delete components.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "eeschema_id.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <eeschema_id.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_library.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_library.h>
#include <wx/filename.h>
#include <wx/wfstream.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index d9b64e53a3..d746f7fad1 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -27,23 +27,23 @@
* @file lib_field.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "base_struct.h"
-#include "drawtxt.h"
-#include "kicad_string.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <base_struct.h>
+#include <drawtxt.h>
+#include <kicad_string.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <trigo.h>
-#include "general.h"
-#include "protos.h"
-#include "class_libentry.h"
-#include "transform.h"
-#include "lib_field.h"
-#include "template_fieldnames.h"
+#include <general.h>
+#include <protos.h>
+#include <class_libentry.h>
+#include <transform.h>
+#include <lib_field.h>
+#include <template_fieldnames.h>
LIB_FIELD::LIB_FIELD(LIB_COMPONENT * aParent, int idfield ) :
diff --git a/eeschema/lib_field.h b/eeschema/lib_field.h
index 105346577e..f5dce3b258 100644
--- a/eeschema/lib_field.h
+++ b/eeschema/lib_field.h
@@ -30,7 +30,7 @@
#ifndef CLASS_LIBENTRY_FIELDS_H
#define CLASS_LIBENTRY_FIELDS_H
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
/**
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 70c9a837f4..19fac25146 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -27,24 +27,24 @@
* @file lib_pin.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "trigo.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "plot_common.h"
-#include "wxEeschemaStruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <trigo.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <plot_common.h>
+#include <wxEeschemaStruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
-#include "lib_pin.h"
-#include "transform.h"
-#include "sch_component.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
+#include <lib_pin.h>
+#include <transform.h>
+#include <sch_component.h>
/**
diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h
index 33f2f0e15d..5f4864a323 100644
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@@ -30,7 +30,7 @@
#ifndef CLASS_PIN_H
#define CLASS_PIN_H
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
#define TARGET_PIN_RADIUS 12 /* Circle diameter drawn at the active end of pins */
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index b757f605bd..21fdef447f 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -27,19 +27,19 @@
* @file lib_polyline.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "lib_polyline.h"
-#include "transform.h"
+#include <general.h>
+#include <protos.h>
+#include <lib_polyline.h>
+#include <transform.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/lib_polyline.h b/eeschema/lib_polyline.h
index cc96eba728..d010bcb2f7 100644
--- a/eeschema/lib_polyline.h
+++ b/eeschema/lib_polyline.h
@@ -30,7 +30,7 @@
#ifndef _LIB_POLYLINE_H_
#define _LIB_POLYLINE_H_
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
class LIB_POLYLINE : public LIB_ITEM
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index 8413a9d34b..8eeafaeead 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -27,19 +27,19 @@
* @file lib_rectangle.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "lib_rectangle.h"
-#include "transform.h"
+#include <general.h>
+#include <protos.h>
+#include <lib_rectangle.h>
+#include <transform.h>
LIB_RECTANGLE::LIB_RECTANGLE( LIB_COMPONENT* aParent ) :
diff --git a/eeschema/lib_rectangle.h b/eeschema/lib_rectangle.h
index 7ffe79fc4f..dc3bae6c1b 100644
--- a/eeschema/lib_rectangle.h
+++ b/eeschema/lib_rectangle.h
@@ -30,7 +30,7 @@
#ifndef _LIB_RECTANGLE_H_
#define _LIB_RECTANGLE_H_
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
class LIB_RECTANGLE : public LIB_ITEM
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index a05787b550..8061e7fa8f 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -27,21 +27,21 @@
* @file lib_text.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "plot_common.h"
-#include "drawtxt.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <plot_common.h>
+#include <drawtxt.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <richio.h>
-#include "lib_draw_item.h"
-#include "general.h"
-#include "protos.h"
-#include "transform.h"
-#include "lib_text.h"
+#include <lib_draw_item.h>
+#include <general.h>
+#include <protos.h>
+#include <transform.h>
+#include <lib_text.h>
LIB_TEXT::LIB_TEXT( LIB_COMPONENT * aParent ) :
diff --git a/eeschema/lib_text.h b/eeschema/lib_text.h
index 2cf32f4b79..c7a3df80a8 100644
--- a/eeschema/lib_text.h
+++ b/eeschema/lib_text.h
@@ -30,7 +30,7 @@
#ifndef _LIB_TEXT_H_
#define _LIB_TEXT_H_
-#include "lib_draw_item.h"
+#include <lib_draw_item.h>
/**
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 5e5138c281..1c2cc9ab1c 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -28,18 +28,18 @@
* @brief Module for generation of component archive files.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "class_sch_screen.h"
-#include "wxstruct.h"
-#include "sch_item_struct.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <class_sch_screen.h>
+#include <wxstruct.h>
+#include <sch_item_struct.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "netlist.h"
-#include "protos.h"
-#include "class_library.h"
-#include "sch_component.h"
+#include <general.h>
+#include <netlist.h>
+#include <protos.h>
+#include <class_library.h>
+#include <sch_component.h>
#include <wx/wfstream.h>
diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp
index 38909883a5..8321bbe3f8 100644
--- a/eeschema/libedit.cpp
+++ b/eeschema/libedit.cpp
@@ -28,23 +28,23 @@
* @brief Eeschema component library editor.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "class_sch_screen.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <class_sch_screen.h>
-#include "eeschema_id.h"
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_library.h"
-#include "template_fieldnames.h"
+#include <eeschema_id.h>
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_library.h>
+#include <template_fieldnames.h>
-#include "dialogs/dialog_lib_new_component.h"
+#include <dialogs/dialog_lib_new_component.h>
#include <wx/wfstream.h>
diff --git a/eeschema/libedit_onleftclick.cpp b/eeschema/libedit_onleftclick.cpp
index fee4a66616..a4fd1ba319 100644
--- a/eeschema/libedit_onleftclick.cpp
+++ b/eeschema/libedit_onleftclick.cpp
@@ -28,16 +28,16 @@
* @brief Eeschema library editor event handler for a mouse left button single or double click.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "eeschema_id.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <eeschema_id.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
void LIB_EDIT_FRAME::OnLeftClick( wxDC* DC, const wxPoint& aPosition )
diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp
index 241cecd42b..501c446b2a 100644
--- a/eeschema/libedit_onrightclick.cpp
+++ b/eeschema/libedit_onrightclick.cpp
@@ -5,19 +5,19 @@
/* , In library editor, create the pop menu when clicking on mouse right button
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "eeschema_id.h"
-#include "hotkeys.h"
-#include "class_drawpanel.h"
-#include "class_sch_screen.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <eeschema_id.h>
+#include <hotkeys.h>
+#include <class_drawpanel.h>
+#include <class_sch_screen.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
-#include "lib_pin.h"
-#include "lib_polyline.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
+#include <lib_pin.h>
+#include <lib_polyline.h>
/* functions to add commands and submenus depending on the item */
diff --git a/eeschema/libedit_plot_component.cpp b/eeschema/libedit_plot_component.cpp
index fd39dc8e58..9fbac84439 100644
--- a/eeschema/libedit_plot_component.cpp
+++ b/eeschema/libedit_plot_component.cpp
@@ -2,19 +2,19 @@
* @file libedit_plot_component.cpp
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "gr_basic.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "eeschema_id.h"
-#include "class_sch_screen.h"
+#include <gr_basic.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <eeschema_id.h>
+#include <class_sch_screen.h>
-#include "general.h"
-#include "libeditframe.h"
-#include "class_library.h"
+#include <general.h>
+#include <libeditframe.h>
+#include <class_library.h>
void LIB_EDIT_FRAME::OnPlotCurrentComponent( wxCommandEvent& event )
diff --git a/eeschema/libedit_undo_redo.cpp b/eeschema/libedit_undo_redo.cpp
index cbc6e3d075..c11ba52e37 100644
--- a/eeschema/libedit_undo_redo.cpp
+++ b/eeschema/libedit_undo_redo.cpp
@@ -2,13 +2,13 @@
/* library editor: undo and redo functions */
/********************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
void LIB_EDIT_FRAME::SaveCopyInUndoList( EDA_ITEM* ItemToCopy, int unused_flag )
diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp
index c0e1b0856b..e7d3d649f2 100644
--- a/eeschema/libeditframe.cpp
+++ b/eeschema/libeditframe.cpp
@@ -28,30 +28,30 @@
* @brief LIB_EDIT_FRAME class is the component library editor frame.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "gr_basic.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <gr_basic.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "eeschema_id.h"
-#include "libeditframe.h"
-#include "class_library.h"
-#include "lib_polyline.h"
+#include <general.h>
+#include <protos.h>
+#include <eeschema_id.h>
+#include <libeditframe.h>
+#include <class_library.h>
+#include <lib_polyline.h>
-#include "kicad_device_context.h"
-#include "hotkeys.h"
+#include <kicad_device_context.h>
+#include <hotkeys.h>
-#include "dialogs/dialog_lib_edit_text.h"
-#include "dialogs/dialog_SVG_print.h"
-#include "dialogs/dialog_edit_component_in_lib.h"
-#include "dialogs/dialog_libedit_dimensions.h"
+#include <dialogs/dialog_lib_edit_text.h>
+#include <dialogs/dialog_SVG_print.h>
+#include <dialogs/dialog_edit_component_in_lib.h>
+#include <dialogs/dialog_libedit_dimensions.h>
-#include "dialog_helpers.h"
+#include <dialog_helpers.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/libfield.cpp b/eeschema/libfield.cpp
index 755b5c1091..1aa7e32184 100644
--- a/eeschema/libfield.cpp
+++ b/eeschema/libfield.cpp
@@ -2,17 +2,17 @@
/* Component library edit field manipulation code. */
/*****************************************************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "class_sch_screen.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <class_sch_screen.h>
-#include "general.h"
-#include "sch_component.h"
-#include "libeditframe.h"
-#include "class_library.h"
-#include "template_fieldnames.h"
+#include <general.h>
+#include <sch_component.h>
+#include <libeditframe.h>
+#include <class_library.h>
+#include <template_fieldnames.h>
void LIB_EDIT_FRAME::EditField( wxDC* DC, LIB_FIELD* aField )
diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp
index 7fbfa545b5..3ea0e57d49 100644
--- a/eeschema/load_one_schematic_file.cpp
+++ b/eeschema/load_one_schematic_file.cpp
@@ -28,24 +28,24 @@
* @brief Code to load and save Eeschema files.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "wxEeschemaStruct.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <wxEeschemaStruct.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
-#include "sch_marker.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_component.h"
-#include "sch_polyline.h"
-#include "sch_text.h"
-#include "sch_sheet.h"
-#include "sch_bitmap.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
+#include <sch_marker.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_component.h>
+#include <sch_polyline.h>
+#include <sch_text.h>
+#include <sch_sheet.h>
+#include <sch_bitmap.h>
bool ReadSchemaDescr( LINE_READER* aLine, wxString& aMsgDiag, SCH_SCREEN* Window );
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 226a5e4baa..b138c8ee49 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -31,16 +31,16 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "eeschema_id.h"
-#include "hotkeys.h"
+#include <general.h>
+#include <protos.h>
+#include <eeschema_id.h>
+#include <hotkeys.h>
-#include "help_common_strings.h"
+#include <help_common_strings.h>
/**
* @brief (Re)Create the menubar for the schematic frame
diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp
index 6245abc34e..86608ec469 100644
--- a/eeschema/menubar_libedit.cpp
+++ b/eeschema/menubar_libedit.cpp
@@ -27,15 +27,15 @@
* @file eeschema/menubar_libedit.cpp
* @brief (Re)Create the main menubar for the component editor frame (LibEdit)
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
-#include "general.h"
-#include "libeditframe.h"
-#include "eeschema_id.h"
-#include "hotkeys.h"
+#include <general.h>
+#include <libeditframe.h>
+#include <eeschema_id.h>
+#include <hotkeys.h>
-#include "help_common_strings.h"
+#include <help_common_strings.h>
/**
* @brief (Re)Create the menubar for the component editor frame
diff --git a/eeschema/netform.cpp b/eeschema/netform.cpp
index ad95458487..0bbd44f04a 100644
--- a/eeschema/netform.cpp
+++ b/eeschema/netform.cpp
@@ -28,30 +28,30 @@
* @brief Net list generation code.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "netlist.h"
-#include "netlist_control.h"
-#include "protos.h"
-#include "class_library.h"
-#include "lib_pin.h"
-#include "sch_component.h"
-#include "sch_text.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <netlist.h>
+#include <netlist_control.h>
+#include <protos.h>
+#include <class_library.h>
+#include <lib_pin.h>
+#include <sch_component.h>
+#include <sch_text.h>
+#include <sch_sheet.h>
#include <wx/tokenzr.h>
-#include "xnode.h" // also nests: <wx/xml/xml.h>
+#include <xnode.h> // also nests: <wx/xml/xml.h>
-#include "build_version.h"
+#include <build_version.h>
#define INTERMEDIATE_NETLIST_EXT wxT("xml")
diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp
index 215ad3a750..cf90255a05 100644
--- a/eeschema/netlist.cpp
+++ b/eeschema/netlist.cpp
@@ -27,21 +27,21 @@
* @file eeschema/netlist.cpp
*/
-#include "fctsys.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "netlist.h"
-#include "protos.h"
-#include "class_library.h"
-#include "lib_pin.h"
-#include "sch_junction.h"
-#include "sch_component.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_text.h"
-#include "sch_sheet.h"
-#include "algorithm"
+#include <general.h>
+#include <netlist.h>
+#include <protos.h>
+#include <class_library.h>
+#include <lib_pin.h>
+#include <sch_junction.h>
+#include <sch_component.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_text.h>
+#include <sch_sheet.h>
+#include <algorithm>
#include <boost/foreach.hpp>
diff --git a/eeschema/netlist.h b/eeschema/netlist.h
index 6a291feb87..fabb68c730 100644
--- a/eeschema/netlist.h
+++ b/eeschema/netlist.h
@@ -32,11 +32,11 @@
#define _NETLIST_H_
-#include "macros.h"
+#include <macros.h>
-#include "class_libentry.h"
-#include "sch_sheet_path.h"
-#include "sch_component.h"
+#include <class_libentry.h>
+#include <sch_sheet_path.h>
+#include <sch_component.h>
class SCH_COMPONENT;
diff --git a/eeschema/netlist_control.cpp b/eeschema/netlist_control.cpp
index 960eecec36..f0b347449d 100644
--- a/eeschema/netlist_control.cpp
+++ b/eeschema/netlist_control.cpp
@@ -38,19 +38,19 @@
* but there are not really plugins, there are only external binaries
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "netlist.h"
-#include "protos.h"
-#include "sch_sheet.h"
-#include "dialog_helpers.h"
-#include "netlist_control.h"
-#include "dialogs/annotate_dialog.h"
+#include <general.h>
+#include <netlist.h>
+#include <protos.h>
+#include <sch_sheet.h>
+#include <dialog_helpers.h>
+#include <netlist_control.h>
+#include <dialogs/annotate_dialog.h>
diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp
index 3e28088fb5..9413ea8bcb 100644
--- a/eeschema/onleftclick.cpp
+++ b/eeschema/onleftclick.cpp
@@ -27,23 +27,23 @@
* @file eeschema/onleftclick.cpp
*/
-#include "fctsys.h"
-#include "eeschema_id.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <eeschema_id.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
-#include "sch_text.h"
-#include "sch_marker.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
-#include "sch_bitmap.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
+#include <sch_text.h>
+#include <sch_marker.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
+#include <sch_bitmap.h>
static wxArrayString s_CmpNameList;
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 270897f7c8..13849c912a 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -27,25 +27,25 @@
* @file eeschema/onrightclick.cpp
*/
-#include "fctsys.h"
-#include "eeschema_id.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <eeschema_id.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "hotkeys.h"
-#include "class_library.h"
-#include "sch_bus_entry.h"
-#include "sch_marker.h"
-#include "sch_text.h"
-#include "sch_junction.h"
-#include "sch_component.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
-#include "sch_bitmap.h"
+#include <general.h>
+#include <hotkeys.h>
+#include <class_library.h>
+#include <sch_bus_entry.h>
+#include <sch_marker.h>
+#include <sch_text.h>
+#include <sch_junction.h>
+#include <sch_component.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+#include <sch_bitmap.h>
#include <iostream>
diff --git a/eeschema/operations_on_items_lists.cpp b/eeschema/operations_on_items_lists.cpp
index 79f585f4fd..1c8f5a0270 100644
--- a/eeschema/operations_on_items_lists.cpp
+++ b/eeschema/operations_on_items_lists.cpp
@@ -4,21 +4,21 @@
* lists of schematic items.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
-#include "sch_marker.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_polyline.h"
-#include "sch_sheet.h"
-#include "sch_component.h"
-#include "sch_junction.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
+#include <sch_marker.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_polyline.h>
+#include <sch_sheet.h>
+#include <sch_component.h>
+#include <sch_junction.h>
void SetSchItemParent( SCH_ITEM* Struct, SCH_SCREEN* Screen )
diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp
index 719b39bdda..5490b27212 100644
--- a/eeschema/pinedit.cpp
+++ b/eeschema/pinedit.cpp
@@ -28,21 +28,21 @@
* @brief Eeschema pin edit code.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "class_sch_screen.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <class_sch_screen.h>
-#include "libeditframe.h"
-#include "eeschema_id.h"
-#include "class_libentry.h"
-#include "lib_pin.h"
-#include "general.h"
-#include "protos.h"
+#include <libeditframe.h>
+#include <eeschema_id.h>
+#include <class_libentry.h>
+#include <lib_pin.h>
+#include <general.h>
+#include <protos.h>
-#include "../common/dialogs/dialog_display_info_HTML_base.h"
-#include "dialog_lib_edit_pin.h"
+#include <../common/dialogs/dialog_display_info_HTML_base.h>
+#include <dialog_lib_edit_pin.h>
extern void IncrementLabelMember( wxString& name );
diff --git a/eeschema/protos.h b/eeschema/protos.h
index 548af61ace..dd71d59004 100644
--- a/eeschema/protos.h
+++ b/eeschema/protos.h
@@ -2,7 +2,7 @@
#ifndef __PROTOS_H__
#define __PROTOS_H__
-#include "colors.h"
+#include <colors.h>
class EDA_DRAW_PANEL;
diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp
index 8812733b64..38d18b1c2c 100644
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@@ -26,19 +26,19 @@
* @file sch_bitmap.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "richio.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <richio.h>
+#include <plot_common.h>
-#include "wxEeschemaStruct.h"
-#include "general.h"
-#include "sch_bitmap.h"
+#include <wxEeschemaStruct.h>
+#include <general.h>
+#include <sch_bitmap.h>
-#include "protos.h"
+#include <protos.h>
#include <wx/mstream.h>
diff --git a/eeschema/sch_bitmap.h b/eeschema/sch_bitmap.h
index 0114e0d693..5837d160ed 100644
--- a/eeschema/sch_bitmap.h
+++ b/eeschema/sch_bitmap.h
@@ -31,8 +31,8 @@
#define _SCH_BITMAP_H_
-#include "sch_item_struct.h"
-#include "class_bitmap_base.h"
+#include <sch_item_struct.h>
+#include <class_bitmap_base.h>
class SCH_BITMAP : public SCH_ITEM
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 89c81b6698..7037e8f756 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -28,18 +28,18 @@
*
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "common.h"
-#include "richio.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <common.h>
+#include <richio.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
SCH_BUS_ENTRY::SCH_BUS_ENTRY( const wxPoint& pos, int shape, int id ) :
diff --git a/eeschema/sch_bus_entry.h b/eeschema/sch_bus_entry.h
index fcade2f9b0..57dd258aa8 100644
--- a/eeschema/sch_bus_entry.h
+++ b/eeschema/sch_bus_entry.h
@@ -31,7 +31,7 @@
#ifndef _SCH_BUS_ENTRY_H_
#define _SCH_BUS_ENTRY_H_
-#include "sch_item_struct.h"
+#include <sch_item_struct.h>
/* Flags for BUS ENTRY (bus to bus or wire to bus */
diff --git a/eeschema/sch_collectors.cpp b/eeschema/sch_collectors.cpp
index 6d38003f20..d119a933fb 100644
--- a/eeschema/sch_collectors.cpp
+++ b/eeschema/sch_collectors.cpp
@@ -26,13 +26,13 @@
* @file sch_collectors.cpp
*/
-#include "macros.h"
+#include <macros.h>
-#include "general.h"
-#include "transform.h"
-#include "sch_collectors.h"
-#include "sch_component.h"
-#include "sch_line.h"
+#include <general.h>
+#include <transform.h>
+#include <sch_collectors.h>
+#include <sch_component.h>
+#include <sch_line.h>
const KICAD_T SCH_COLLECTOR::AllItems[] = {
diff --git a/eeschema/sch_collectors.h b/eeschema/sch_collectors.h
index 64f6f7c660..2299509b77 100644
--- a/eeschema/sch_collectors.h
+++ b/eeschema/sch_collectors.h
@@ -30,9 +30,9 @@
#define _SCH_COLLECTORS_H_
-#include "class_collector.h"
-#include "sch_item_struct.h"
-#include "dialogs/dialog_schematic_find.h"
+#include <class_collector.h>
+#include <sch_item_struct.h>
+#include <dialogs/dialog_schematic_find.h>
/**
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 7e92362ae9..8fbe1076ed 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -28,27 +28,27 @@
* @brief Implementation of the class SCH_COMPONENT.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "gr_basic.h"
-#include "trigo.h"
-#include "kicad_string.h"
-#include "richio.h"
-#include "wxEeschemaStruct.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <gr_basic.h>
+#include <trigo.h>
+#include <kicad_string.h>
+#include <richio.h>
+#include <wxEeschemaStruct.h>
+#include <plot_common.h>
-#include "general.h"
-#include "class_library.h"
-#include "lib_rectangle.h"
-#include "lib_pin.h"
-#include "lib_text.h"
-#include "sch_component.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
-#include "class_netlist_object.h"
+#include <general.h>
+#include <class_library.h>
+#include <lib_rectangle.h>
+#include <lib_pin.h>
+#include <lib_text.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+#include <class_netlist_object.h>
-#include "dialogs/dialog_schematic_find.h"
+#include <dialogs/dialog_schematic_find.h>
#include <wx/tokenzr.h>
diff --git a/eeschema/sch_component.h b/eeschema/sch_component.h
index 1b36f4e398..40cb54e234 100644
--- a/eeschema/sch_component.h
+++ b/eeschema/sch_component.h
@@ -32,9 +32,9 @@
#define COMPONENT_CLASS_H
-#include "sch_field.h"
-#include "transform.h"
-#include "general.h"
+#include <sch_field.h>
+#include <transform.h>
+#include <general.h>
class SCH_SHEET_PATH;
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 5be6be1bd0..38e7e27077 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -49,22 +49,22 @@
*/
#define USE_TEXT_JUSTIFY_INITIAL_BEHAVIOR 0
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "base_struct.h"
-#include "gr_basic.h"
-#include "drawtxt.h"
-#include "macros.h"
-#include "trigo.h"
-#include "wxEeschemaStruct.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <base_struct.h>
+#include <gr_basic.h>
+#include <drawtxt.h>
+#include <macros.h>
+#include <trigo.h>
+#include <wxEeschemaStruct.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "class_library.h"
-#include "sch_component.h"
-#include "sch_field.h"
-#include "kicad_string.h"
+#include <general.h>
+#include <protos.h>
+#include <class_library.h>
+#include <sch_component.h>
+#include <sch_field.h>
+#include <kicad_string.h>
SCH_FIELD::SCH_FIELD( const wxPoint& aPos, int aFieldId, SCH_COMPONENT* aParent, wxString aName ) :
diff --git a/eeschema/sch_field.h b/eeschema/sch_field.h
index 198987558f..d48af7fbea 100644
--- a/eeschema/sch_field.h
+++ b/eeschema/sch_field.h
@@ -32,8 +32,8 @@
#define CLASS_SCH_FIELD_H
-#include "sch_item_struct.h"
-#include "general.h"
+#include <sch_item_struct.h>
+#include <general.h>
class SCH_EDIT_FRAME;
diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp
index 9c1c047752..4088e2b46b 100644
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@@ -27,19 +27,19 @@
* @file sch_junction.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "common.h"
-#include "richio.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <common.h>
+#include <richio.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_junction.h"
-#include "class_netlist_object.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_junction.h>
+#include <class_netlist_object.h>
SCH_JUNCTION::SCH_JUNCTION( const wxPoint& pos ) :
diff --git a/eeschema/sch_junction.h b/eeschema/sch_junction.h
index 1b4d5a1db8..1ca58a6b7d 100644
--- a/eeschema/sch_junction.h
+++ b/eeschema/sch_junction.h
@@ -31,7 +31,7 @@
#define _SCH_JUNCTION_H_
-#include "sch_item_struct.h"
+#include <sch_item_struct.h>
class SCH_JUNCTION : public SCH_ITEM
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index a495e2c2f9..d3b49d8b6f 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -28,18 +28,18 @@
* @brief Class SCH_LINE implementation
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "richio.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <richio.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_line.h"
-#include "class_netlist_object.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_line.h>
+#include <class_netlist_object.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/sch_line.h b/eeschema/sch_line.h
index e1b0a444fe..57b8e80a5c 100644
--- a/eeschema/sch_line.h
+++ b/eeschema/sch_line.h
@@ -31,7 +31,7 @@
#define _SCH_LINE_H_
-#include "sch_item_struct.h"
+#include <sch_item_struct.h>
/**
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index 8f52a5ea7c..1ab556aec2 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -2,14 +2,14 @@
/* Schematic marker object implementation. */
/*******************************************/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
-#include "general.h"
-#include "sch_marker.h"
-#include "erc.h"
+#include <general.h>
+#include <sch_marker.h>
+#include <erc.h>
/* Marker are mainly used to show an ERC error
diff --git a/eeschema/sch_marker.h b/eeschema/sch_marker.h
index 97f4f0ec10..2446e41656 100644
--- a/eeschema/sch_marker.h
+++ b/eeschema/sch_marker.h
@@ -31,8 +31,8 @@
#ifndef TYPE_SCH_MARKER_H_
#define TYPE_SCH_MARKER_H_
-#include "sch_item_struct.h"
-#include "class_marker_base.h"
+#include <sch_item_struct.h>
+#include <class_marker_base.h>
/* Marker are mainly used to show an ERC error
*/
diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp
index e49b296af4..c87dd6d669 100644
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@@ -28,19 +28,19 @@
* @brief Class SCH_NO_CONNECT implementation.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "common.h"
-#include "trigo.h"
-#include "richio.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <common.h>
+#include <trigo.h>
+#include <richio.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_no_connect.h"
-#include "class_netlist_object.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_no_connect.h>
+#include <class_netlist_object.h>
SCH_NO_CONNECT::SCH_NO_CONNECT( const wxPoint& pos ) :
diff --git a/eeschema/sch_no_connect.h b/eeschema/sch_no_connect.h
index f9b7ee2636..c6c77d4667 100644
--- a/eeschema/sch_no_connect.h
+++ b/eeschema/sch_no_connect.h
@@ -31,7 +31,7 @@
#define _SCH_NO_CONNECT_H_
-#include "sch_item_struct.h"
+#include <sch_item_struct.h>
class SCH_NO_CONNECT : public SCH_ITEM
diff --git a/eeschema/sch_polyline.cpp b/eeschema/sch_polyline.cpp
index 82a48d4ec5..1663f3aeab 100644
--- a/eeschema/sch_polyline.cpp
+++ b/eeschema/sch_polyline.cpp
@@ -27,17 +27,17 @@
* @file sch_polyline.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "common.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <common.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_polyline.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_polyline.h>
SCH_POLYLINE::SCH_POLYLINE( int layer ) :
diff --git a/eeschema/sch_polyline.h b/eeschema/sch_polyline.h
index e030775dba..a997c4842f 100644
--- a/eeschema/sch_polyline.h
+++ b/eeschema/sch_polyline.h
@@ -32,7 +32,7 @@
#define _SCH_POLYLINE_H_
-#include "sch_item_struct.h"
+#include <sch_item_struct.h>
class SCH_POLYLINE : public SCH_ITEM
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 448445c972..acb23c344d 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -28,28 +28,28 @@
* @brief Implementation of SCH_SCREEN and SCH_SCREENS classes.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "kicad_string.h"
-#include "eeschema_id.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "sch_item_struct.h"
-#include "wxEeschemaStruct.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <kicad_string.h>
+#include <eeschema_id.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <sch_item_struct.h>
+#include <wxEeschemaStruct.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "netlist.h"
-#include "class_library.h"
-#include "sch_junction.h"
-#include "sch_bus_entry.h"
-#include "sch_line.h"
-#include "sch_marker.h"
-#include "sch_no_connect.h"
-#include "sch_sheet.h"
-#include "sch_component.h"
-#include "sch_text.h"
+#include <general.h>
+#include <protos.h>
+#include <netlist.h>
+#include <class_library.h>
+#include <sch_junction.h>
+#include <sch_bus_entry.h>
+#include <sch_line.h>
+#include <sch_marker.h>
+#include <sch_no_connect.h>
+#include <sch_sheet.h>
+#include <sch_component.h>
+#include <sch_text.h>
#include <boost/foreach.hpp>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 66a3d171fc..79a732a225 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -28,23 +28,23 @@
* @brief Implementation of SCH_SHEET class.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "trigo.h"
-#include "richio.h"
-#include "wxEeschemaStruct.h"
-#include "plot_common.h"
-#include "kicad_string.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <trigo.h>
+#include <richio.h>
+#include <wxEeschemaStruct.h>
+#include <plot_common.h>
+#include <kicad_string.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
-#include "sch_component.h"
-#include "class_netlist_object.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+#include <sch_component.h>
+#include <class_netlist_object.h>
SCH_SHEET::SCH_SHEET( const wxPoint& pos ) :
diff --git a/eeschema/sch_sheet.h b/eeschema/sch_sheet.h
index f823c77818..53c861b996 100644
--- a/eeschema/sch_sheet.h
+++ b/eeschema/sch_sheet.h
@@ -33,7 +33,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/foreach.hpp>
-#include "sch_text.h"
+#include <sch_text.h>
class LINE_READER;
diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index fcaaf2df5c..616ff31b2a 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -28,21 +28,21 @@
* @brief SCH_SHEET_PATH class implementation.
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "general.h"
-#include "dlist.h"
-#include "class_sch_screen.h"
-#include "sch_item_struct.h"
+#include <general.h>
+#include <dlist.h>
+#include <class_sch_screen.h>
+#include <sch_item_struct.h>
-#include "netlist.h"
-#include "class_library.h"
-#include "sch_sheet.h"
-#include "sch_sheet_path.h"
-#include "sch_component.h"
-#include "template_fieldnames.h"
+#include <netlist.h>
+#include <class_library.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+#include <sch_component.h>
+#include <template_fieldnames.h>
-#include "dialogs/dialog_schematic_find.h"
+#include <dialogs/dialog_schematic_find.h>
SCH_SHEET_PATH::SCH_SHEET_PATH()
diff --git a/eeschema/sch_sheet_path.h b/eeschema/sch_sheet_path.h
index 4cd3957eec..4ab4237064 100644
--- a/eeschema/sch_sheet_path.h
+++ b/eeschema/sch_sheet_path.h
@@ -31,7 +31,7 @@
#ifndef CLASS_DRAWSHEET_PATH_H
#define CLASS_DRAWSHEET_PATH_H
-#include "base_struct.h"
+#include <base_struct.h>
/** Info about complex hierarchies handling:
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index a1b4a89194..b2231ed893 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -28,19 +28,19 @@
* @brief Implementation of the SCH_SHEET_PIN class.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "plot_common.h"
-#include "trigo.h"
-#include "richio.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <plot_common.h>
+#include <trigo.h>
+#include <richio.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_sheet.h"
-#include "kicad_string.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_sheet.h>
+#include <kicad_string.h>
SCH_SHEET_PIN::SCH_SHEET_PIN( SCH_SHEET* parent, const wxPoint& pos, const wxString& text ) :
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 60761e555e..13747dcab0 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -28,20 +28,20 @@
* @brief Code for handling schematic sheet labels.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "trigo.h"
-#include "eeschema_id.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "wxEeschemaStruct.h"
-#include "plot_common.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <trigo.h>
+#include <eeschema_id.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <wxEeschemaStruct.h>
+#include <plot_common.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_text.h"
-#include "class_netlist_object.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_text.h>
+#include <class_netlist_object.h>
extern void IncrementLabelMember( wxString& name );
diff --git a/eeschema/sch_text.h b/eeschema/sch_text.h
index c7fac5b9fe..a25c4b09ec 100644
--- a/eeschema/sch_text.h
+++ b/eeschema/sch_text.h
@@ -32,8 +32,8 @@
#define CLASS_TEXT_LABEL_H
-#include "macros.h"
-#include "sch_item_struct.h"
+#include <macros.h>
+#include <sch_item_struct.h>
class LINE_READER;
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 232c942e46..55fbc154ec 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -27,26 +27,26 @@
* @file schedit.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "wxEeschemaStruct.h"
-#include "kicad_device_context.h"
-#include "hotkeys_basic.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <wxEeschemaStruct.h>
+#include <kicad_device_context.h>
+#include <hotkeys_basic.h>
-#include "general.h"
-#include "eeschema_id.h"
-#include "protos.h"
-#include "class_library.h"
-#include "sch_bus_entry.h"
-#include "sch_marker.h"
-#include "sch_component.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <eeschema_id.h>
+#include <protos.h>
+#include <class_library.h>
+#include <sch_bus_entry.h>
+#include <sch_marker.h>
+#include <sch_component.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_sheet.h>
void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index 2daae5cf3f..82327663cb 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -28,21 +28,21 @@
* @brief Eeschema undo and redo functions for schematic editor.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_bus_entry.h"
-#include "sch_marker.h"
-#include "sch_junction.h"
-#include "sch_line.h"
-#include "sch_no_connect.h"
-#include "sch_component.h"
-#include "sch_polyline.h"
-#include "sch_sheet.h"
-#include "sch_bitmap.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_bus_entry.h>
+#include <sch_marker.h>
+#include <sch_junction.h>
+#include <sch_line.h>
+#include <sch_no_connect.h>
+#include <sch_component.h>
+#include <sch_polyline.h>
+#include <sch_sheet.h>
+#include <sch_bitmap.h>
/* Functions to undo and redo edit commands.
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index 3d81d88baa..803c51800a 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -31,35 +31,35 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <gestfich.h>
-#include "general.h"
-#include "protos.h"
-#include "eeschema_id.h"
-#include "netlist.h"
-#include "lib_pin.h"
-#include "class_library.h"
-#include "wxEeschemaStruct.h"
-#include "sch_component.h"
+#include <general.h>
+#include <protos.h>
+#include <eeschema_id.h>
+#include <netlist.h>
+#include <lib_pin.h>
+#include <class_library.h>
+#include <wxEeschemaStruct.h>
+#include <sch_component.h>
-#include "dialog_helpers.h"
-#include "netlist_control.h"
-#include "libeditframe.h"
-#include "viewlib_frame.h"
-#include "hotkeys.h"
-#include "eeschema_config.h"
-#include "sch_sheet.h"
+#include <dialog_helpers.h>
+#include <netlist_control.h>
+#include <libeditframe.h>
+#include <viewlib_frame.h>
+#include <hotkeys.h>
+#include <eeschema_config.h>
+#include <sch_sheet.h>
-#include "dialogs/annotate_dialog.h"
-#include "dialogs/dialog_build_BOM.h"
-#include "dialogs/dialog_erc.h"
-#include "dialogs/dialog_print_using_printer.h"
-#include "dialogs/dialog_schematic_find.h"
-#include "dialogs/dialog_SVG_print.h"
+#include <dialogs/annotate_dialog.h>
+#include <dialogs/dialog_build_BOM.h>
+#include <dialogs/dialog_erc.h>
+#include <dialogs/dialog_print_using_printer.h>
+#include <dialogs/dialog_schematic_find.h>
+#include <dialogs/dialog_SVG_print.h>
#include <wx/display.h>
#include <build_version.h>
diff --git a/eeschema/selpart.cpp b/eeschema/selpart.cpp
index bb8aab8389..e5d7f4c747 100644
--- a/eeschema/selpart.cpp
+++ b/eeschema/selpart.cpp
@@ -2,15 +2,15 @@
* @file selpart.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "confirm.h"
-#include "wxstruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <confirm.h>
+#include <wxstruct.h>
-#include "general.h"
-#include "protos.h"
-#include "class_library.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <class_library.h>
+#include <dialog_helpers.h>
CMP_LIBRARY* SelectLibraryFromList( EDA_DRAW_FRAME* frame )
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index eff1d5703e..4f3c4cb565 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -27,16 +27,16 @@
* @file sheet.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "sch_sheet.h"
+#include <general.h>
+#include <sch_sheet.h>
-#include "dialogs/dialog_sch_sheet_props.h"
+#include <dialogs/dialog_sch_sheet_props.h>
bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, wxDC* aDC )
diff --git a/eeschema/sheetlab.cpp b/eeschema/sheetlab.cpp
index f2f36e6b3f..38661fe6ef 100644
--- a/eeschema/sheetlab.cpp
+++ b/eeschema/sheetlab.cpp
@@ -28,19 +28,19 @@
* @brief Create and edit the SCH_SHEET_PIN items.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "sch_sheet.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <sch_sheet.h>
+#include <dialog_helpers.h>
-#include "dialogs/dialog_sch_edit_sheet_pin.h"
+#include <dialogs/dialog_sch_edit_sheet_pin.h>
int SCH_EDIT_FRAME::m_lastSheetPinType = NET_INPUT;
diff --git a/eeschema/symbdraw.cpp b/eeschema/symbdraw.cpp
index ea197c27c0..a751de1159 100644
--- a/eeschema/symbdraw.cpp
+++ b/eeschema/symbdraw.cpp
@@ -28,23 +28,23 @@
* @brief Create, move .. graphic shapes used to build and draw a component (lines, arcs ..)
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "class_sch_screen.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <class_sch_screen.h>
-#include "eeschema_id.h"
-#include "general.h"
-#include "libeditframe.h"
-#include "class_libentry.h"
-#include "lib_arc.h"
-#include "lib_circle.h"
-#include "lib_polyline.h"
-#include "lib_rectangle.h"
-#include "lib_text.h"
+#include <eeschema_id.h>
+#include <general.h>
+#include <libeditframe.h>
+#include <class_libentry.h>
+#include <lib_arc.h>
+#include <lib_circle.h>
+#include <lib_polyline.h>
+#include <lib_rectangle.h>
+#include <lib_text.h>
-#include "dialogs/dialog_lib_edit_draw_item.h"
+#include <dialogs/dialog_lib_edit_draw_item.h>
static void SymbolDisplayDraw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
diff --git a/eeschema/symbedit.cpp b/eeschema/symbedit.cpp
index 8acbf85a51..5aece2e28f 100644
--- a/eeschema/symbedit.cpp
+++ b/eeschema/symbedit.cpp
@@ -28,20 +28,20 @@
* @brief Functions to load from and save to file component libraries and symbols.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "class_sch_screen.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <class_sch_screen.h>
+#include <richio.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "class_library.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <class_library.h>
#include <boost/foreach.hpp>
#include <wx/wfstream.h>
diff --git a/eeschema/template_fieldnames.cpp b/eeschema/template_fieldnames.cpp
index c32e9a42ad..2f119b26e9 100644
--- a/eeschema/template_fieldnames.cpp
+++ b/eeschema/template_fieldnames.cpp
@@ -1,9 +1,9 @@
-#include "template_fieldnames.h"
-#include "dsnlexer.h"
-#include "fctsys.h"
-#include "macros.h"
+#include <template_fieldnames.h>
+#include <dsnlexer.h>
+#include <fctsys.h>
+#include <macros.h>
using namespace TFIELD_T;
diff --git a/eeschema/template_fieldnames.h b/eeschema/template_fieldnames.h
index d05cb51cfc..4b74c1ba35 100644
--- a/eeschema/template_fieldnames.h
+++ b/eeschema/template_fieldnames.h
@@ -2,10 +2,10 @@
#ifndef _TEMPLATE_FIELDNAME_H_
#define _TEMPLATE_FIELDNAME_H_
-#include "richio.h"
-#include "wxstruct.h"
-#include "macros.h"
-#include "template_fieldnames_lexer.h"
+#include <richio.h>
+#include <wxstruct.h>
+#include <macros.h>
+#include <template_fieldnames_lexer.h>
class TEMPLATE_FIELDNAMES_LEXER;
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index d68116b732..2ac7e14213 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -27,16 +27,16 @@
* @file tool_lib.cpp
*/
-#include "fctsys.h"
-#include "hotkeys.h"
-#include "eeschema_id.h"
+#include <fctsys.h>
+#include <hotkeys.h>
+#include <eeschema_id.h>
-#include "general.h"
-#include "protos.h"
-#include "libeditframe.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <libeditframe.h>
+#include <dialog_helpers.h>
-#include "help_common_strings.h"
+#include <help_common_strings.h>
#ifdef __UNIX__
#define LISTBOX_WIDTH 140
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index 21bd8f0720..9795ae5931 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -27,15 +27,15 @@
* @file tool_sch.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "hotkeys.h"
-#include "eeschema_id.h"
+#include <general.h>
+#include <hotkeys.h>
+#include <eeschema_id.h>
-#include "help_common_strings.h"
+#include <help_common_strings.h>
/* Create the main Horizontal Toolbar for the schematic editor
diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp
index 371e3be708..c6d7651fb3 100644
--- a/eeschema/tool_viewlib.cpp
+++ b/eeschema/tool_viewlib.cpp
@@ -28,16 +28,16 @@
* @brief Build the toolbars for the library browser.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "eeschema_id.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <eeschema_id.h>
-#include "general.h"
-#include "protos.h"
-#include "hotkeys.h"
-#include "class_library.h"
-#include "viewlib_frame.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <hotkeys.h>
+#include <class_library.h>
+#include <viewlib_frame.h>
+#include <dialog_helpers.h>
void LIB_VIEW_FRAME::ReCreateHToolbar()
diff --git a/eeschema/transform.cpp b/eeschema/transform.cpp
index 1080a133f2..d2375ff28e 100644
--- a/eeschema/transform.cpp
+++ b/eeschema/transform.cpp
@@ -1,6 +1,6 @@
-#include "macros.h"
-#include "transform.h"
+#include <macros.h>
+#include <transform.h>
TRANSFORM& TRANSFORM::operator=( const TRANSFORM& aTransform )
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index e3f7915221..9818c3b6bb 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -27,18 +27,18 @@
* @file viewlib_frame.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "eeschema_id.h"
-#include "class_drawpanel.h"
-#include "wxEeschemaStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <eeschema_id.h>
+#include <class_drawpanel.h>
+#include <wxEeschemaStruct.h>
-#include "general.h"
-#include "protos.h"
-#include "viewlib_frame.h"
-#include "class_library.h"
-#include "hotkeys.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <viewlib_frame.h>
+#include <class_library.h>
+#include <hotkeys.h>
+#include <dialog_helpers.h>
/**
diff --git a/eeschema/viewlibs.cpp b/eeschema/viewlibs.cpp
index f5f231221d..22b6dadfad 100644
--- a/eeschema/viewlibs.cpp
+++ b/eeschema/viewlibs.cpp
@@ -2,20 +2,20 @@
* @file viewlibs.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "class_sch_screen.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <class_sch_screen.h>
-#include "general.h"
-#include "protos.h"
-#include "viewlib_frame.h"
-#include "eeschema_id.h"
-#include "class_library.h"
-#include "dialog_helpers.h"
+#include <general.h>
+#include <protos.h>
+#include <viewlib_frame.h>
+#include <eeschema_id.h>
+#include <class_library.h>
+#include <dialog_helpers.h>
#define NEXT_PART 1
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index d267cbe848..ad39be8b99 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -3,14 +3,17 @@ add_definitions(-DGERBVIEW -DPCBNEW)
###
# Includes
###
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${Boost_INCLUDE_DIR}
- ./dialogs
- ../3d-viewer
- ../common
- ../cvpcb
- ../pcbnew
- ../polygon)
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ../pcbnew
+ dialogs
+ ../3d-viewer
+ ../polygon
+ ${INC_AFTER}
+ )
+
+
###
# Sources
###
diff --git a/gerbview/block.cpp b/gerbview/block.cpp
index 22f026f93e..93bead130c 100644
--- a/gerbview/block.cpp
+++ b/gerbview/block.cpp
@@ -28,16 +28,16 @@
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gr_basic.h>
-#include "gerbview.h"
-#include "class_gerber_draw_item.h"
+#include <gerbview.h>
+#include <class_gerber_draw_item.h>
-#include "wx/debug.h"
+#include <wx/debug.h>
#define BLOCK_COLOR BROWN
diff --git a/gerbview/class_DCodeSelectionbox.cpp b/gerbview/class_DCodeSelectionbox.cpp
index 0c3e308707..32969313f6 100644
--- a/gerbview/class_DCodeSelectionbox.cpp
+++ b/gerbview/class_DCodeSelectionbox.cpp
@@ -2,13 +2,13 @@
/* class_DCodeSelectionbox.cpp: class for displaying DCodes list */
/*****************************************************************/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "class_drawpanel.h"
-#include "gerbview.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <class_drawpanel.h>
+#include <gerbview.h>
-#include "class_DCodeSelectionbox.h"
+#include <class_DCodeSelectionbox.h>
/*******************************************/
/* Helper class for displaying DCodes list */
diff --git a/gerbview/class_GERBER.cpp b/gerbview/class_GERBER.cpp
index f7dc01df83..c702f90586 100644
--- a/gerbview/class_GERBER.cpp
+++ b/gerbview/class_GERBER.cpp
@@ -27,14 +27,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <macros.h>
-#include "gerbview.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <class_GERBER.h>
/**
diff --git a/gerbview/class_GERBER.h b/gerbview/class_GERBER.h
index d1e4499953..51ebb95581 100644
--- a/gerbview/class_GERBER.h
+++ b/gerbview/class_GERBER.h
@@ -8,9 +8,9 @@
#include <vector>
#include <set>
-#include "dcode.h"
-#include "class_gerber_draw_item.h"
-#include "class_aperture_macro.h"
+#include <dcode.h>
+#include <class_gerber_draw_item.h>
+#include <class_aperture_macro.h>
// An useful macro used when reading gerber files;
#define IsNumber( x ) ( ( ( (x) >= '0' ) && ( (x) <='9' ) ) \
diff --git a/gerbview/class_am_param.cpp b/gerbview/class_am_param.cpp
index b7315e9fab..ce4c078153 100644
--- a/gerbview/class_am_param.cpp
+++ b/gerbview/class_am_param.cpp
@@ -27,8 +27,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "class_am_param.h"
-#include "class_aperture_macro.h"
+#include <class_am_param.h>
+#include <class_aperture_macro.h>
extern int ReadInt( char*& text, bool aSkipSeparator = true );
extern double ReadDouble( char*& text, bool aSkipSeparator = true );
diff --git a/gerbview/class_am_param.h b/gerbview/class_am_param.h
index 48ca662d41..ccb3dc491d 100644
--- a/gerbview/class_am_param.h
+++ b/gerbview/class_am_param.h
@@ -102,7 +102,7 @@
#include <vector>
-#include "dcode.h"
+#include <dcode.h>
/*
Values of a parameter can be the result of an arithmetic operation,
between immediate values and defered value.
diff --git a/gerbview/class_aperture_macro.cpp b/gerbview/class_aperture_macro.cpp
index 79cfd2963d..ce1886d104 100644
--- a/gerbview/class_aperture_macro.cpp
+++ b/gerbview/class_aperture_macro.cpp
@@ -27,14 +27,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
-#include "trigo.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
+#include <trigo.h>
+#include <gr_basic.h>
-#include "gerbview.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <class_GERBER.h>
@@ -753,7 +753,7 @@ bool APERTURE_MACRO::HasNegativeItems( GERBER_DRAW_ITEM* aParent )
if( prim_macro->mapExposure( aParent ) == false ) // = is negative
return true;
}
-
+
return false;
}
diff --git a/gerbview/class_aperture_macro.h b/gerbview/class_aperture_macro.h
index a20cf129a5..7d2ace227d 100644
--- a/gerbview/class_aperture_macro.h
+++ b/gerbview/class_aperture_macro.h
@@ -33,8 +33,8 @@
#include <vector>
#include <set>
-#include "base_struct.h"
-#include "class_am_param.h"
+#include <base_struct.h>
+#include <class_am_param.h>
/*
* An aperture macro defines a complex shape and is a list of aperture primitives.
diff --git a/gerbview/class_gerber_draw_item.cpp b/gerbview/class_gerber_draw_item.cpp
index 044deda9de..c98ef7e78f 100644
--- a/gerbview/class_gerber_draw_item.cpp
+++ b/gerbview/class_gerber_draw_item.cpp
@@ -26,20 +26,20 @@
* @file class_gerber_draw_item.cpp
*/
-#include "fctsys.h"
-#include "polygons_defs.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "trigo.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <polygons_defs.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <trigo.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <macros.h>
-#include "gerbview.h"
-#include "class_board_design_settings.h"
-#include "colors_selection.h"
-#include "class_gerber_draw_item.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <class_board_design_settings.h>
+#include <colors_selection.h>
+#include <class_gerber_draw_item.h>
+#include <class_GERBER.h>
GERBER_DRAW_ITEM::GERBER_DRAW_ITEM( BOARD_ITEM* aParent, GERBER_IMAGE* aGerberparams ) :
diff --git a/gerbview/class_gerber_draw_item.h b/gerbview/class_gerber_draw_item.h
index 3f32925cfe..08239c0684 100644
--- a/gerbview/class_gerber_draw_item.h
+++ b/gerbview/class_gerber_draw_item.h
@@ -29,8 +29,8 @@
#ifndef CLASS_GERBER_DRAW_ITEM_H
#define CLASS_GERBER_DRAW_ITEM_H
-#include "base_struct.h"
-#include "class_board_item.h"
+#include <base_struct.h>
+#include <class_board_item.h>
class GERBER_IMAGE;
diff --git a/gerbview/class_gerbview_layer_widget.cpp b/gerbview/class_gerbview_layer_widget.cpp
index 6cddcf3cb0..a805a6a9ba 100644
--- a/gerbview/class_gerbview_layer_widget.cpp
+++ b/gerbview/class_gerbview_layer_widget.cpp
@@ -29,17 +29,17 @@
* @brief GerbView layers manager.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "pcbstruct.h"
-#include "macros.h"
-#include "class_layer_box_selector.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <pcbstruct.h>
+#include <macros.h>
+#include <class_layer_box_selector.h>
-#include "gerbview.h"
-#include "class_GERBER.h"
-#include "layer_widget.h"
-#include "class_gerbview_layer_widget.h"
+#include <gerbview.h>
+#include <class_GERBER.h>
+#include <layer_widget.h>
+#include <class_gerbview_layer_widget.h>
/*
diff --git a/gerbview/class_gerbview_layer_widget.h b/gerbview/class_gerbview_layer_widget.h
index e11814a3b8..c595f52b71 100644
--- a/gerbview/class_gerbview_layer_widget.h
+++ b/gerbview/class_gerbview_layer_widget.h
@@ -31,7 +31,7 @@
#ifndef _CLASS_GERBER_LAYER_WIDGET_H_
#define _CLASS_GERBER_LAYER_WIDGET_H_
-#include "layer_widget.h"
+#include <layer_widget.h>
/**
* Class GERBER_LAYER_WIDGET
diff --git a/gerbview/controle.cpp b/gerbview/controle.cpp
index e003f1d0b9..70c04a9d93 100644
--- a/gerbview/controle.cpp
+++ b/gerbview/controle.cpp
@@ -26,10 +26,10 @@
* @file gerbview/controle.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "gerbview.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <gerbview.h>
void GERBVIEW_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPosition, int aHotKey )
diff --git a/gerbview/dcode.cpp b/gerbview/dcode.cpp
index fa7aabf38f..ff93db7922 100644
--- a/gerbview/dcode.cpp
+++ b/gerbview/dcode.cpp
@@ -28,17 +28,17 @@
* @brief D_CODE class implementation
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "macros.h"
-#include "trigo.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <macros.h>
+#include <trigo.h>
+#include <gr_basic.h>
-#include "gerbview.h"
-#include "class_gerber_draw_item.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <class_gerber_draw_item.h>
+#include <class_GERBER.h>
#define DEFAULT_SIZE 100
diff --git a/gerbview/dcode.h b/gerbview/dcode.h
index bebf665331..87de8ac0a4 100644
--- a/gerbview/dcode.h
+++ b/gerbview/dcode.h
@@ -32,7 +32,7 @@
#include <vector>
-#include "base_struct.h"
+#include <base_struct.h>
class GERBER_DRAW_ITEM;
diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp
index 5a6cb6948c..636e891d16 100644
--- a/gerbview/dialogs/dialog_print_using_printer.cpp
+++ b/gerbview/dialogs/dialog_print_using_printer.cpp
@@ -5,18 +5,18 @@
// Set this to 1 if you want to test PostScript printing under MSW.
#define wxTEST_POSTSCRIPT_IN_MSW 1
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
-#include "dialog_print_using_printer_base.h"
-#include "printout_controler.h"
+#include <dialog_print_using_printer_base.h>
+#include <printout_controler.h>
-#include "gerbview.h"
-#include "pcbplot.h"
-#include "class_board_design_settings.h"
+#include <gerbview.h>
+#include <pcbplot.h>
+#include <class_board_design_settings.h>
#define WIDTH_MAX_VALUE 1000
#define WIDTH_MIN_VALUE 1
diff --git a/gerbview/dialogs/dialog_show_page_borders.cpp b/gerbview/dialogs/dialog_show_page_borders.cpp
index 244b45e5ce..c68d62f526 100644
--- a/gerbview/dialogs/dialog_show_page_borders.cpp
+++ b/gerbview/dialogs/dialog_show_page_borders.cpp
@@ -27,12 +27,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
-#include "gerbview.h"
-#include "dialog_show_page_borders.h"
+#include <gerbview.h>
+#include <dialog_show_page_borders.h>
DIALOG_PAGE_SHOW_PAGE_BORDERS::DIALOG_PAGE_SHOW_PAGE_BORDERS( GERBVIEW_FRAME *parent) :
diff --git a/gerbview/dialogs/dialog_show_page_borders.h b/gerbview/dialogs/dialog_show_page_borders.h
index 4cf1e30b07..1c866867b6 100644
--- a/gerbview/dialogs/dialog_show_page_borders.h
+++ b/gerbview/dialogs/dialog_show_page_borders.h
@@ -27,7 +27,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "dialog_show_page_borders_base.h"
+#include <dialog_show_page_borders_base.h>
class DIALOG_PAGE_SHOW_PAGE_BORDERS : public DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
diff --git a/gerbview/dialogs/gerbview_dialog_display_options_frame.cpp b/gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
index 3e0b330ada..b13b80223c 100644
--- a/gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
+++ b/gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
@@ -4,14 +4,14 @@
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
+#include <class_drawpanel.h>
-#include "pcbplot.h"
-#include "gerbview.h"
-#include "gerbview_dialog_display_options_frame_base.h"
+#include <pcbplot.h>
+#include <gerbview.h>
+#include <gerbview_dialog_display_options_frame_base.h>
/*******************************************/
diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp
index 37f1a0ddf4..b94aaefac1 100644
--- a/gerbview/draw_gerber_screen.cpp
+++ b/gerbview/draw_gerber_screen.cpp
@@ -28,17 +28,17 @@
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
-#include "gerbview.h"
-#include "class_board_design_settings.h"
-#include "colors_selection.h"
-#include "class_gerber_draw_item.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <class_board_design_settings.h>
+#include <colors_selection.h>
+#include <class_gerber_draw_item.h>
+#include <class_GERBER.h>
void GERBVIEW_FRAME::PrintPage( wxDC* aDC, int aPrintMasklayer,
diff --git a/gerbview/events_called_functions.cpp b/gerbview/events_called_functions.cpp
index 7f7f8340ed..410ec6ac2d 100644
--- a/gerbview/events_called_functions.cpp
+++ b/gerbview/events_called_functions.cpp
@@ -3,21 +3,21 @@
* @brief GerbView command event functions.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "common.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <common.h>
+#include <gestfich.h>
-#include "gerbview.h"
-#include "kicad_device_context.h"
-#include "gerbview_id.h"
-#include "class_GERBER.h"
-#include "dialog_helpers.h"
-#include "class_DCodeSelectionbox.h"
-#include "class_gerbview_layer_widget.h"
-#include "dialog_show_page_borders.h"
+#include <gerbview.h>
+#include <kicad_device_context.h>
+#include <gerbview_id.h>
+#include <class_GERBER.h>
+#include <dialog_helpers.h>
+#include <class_DCodeSelectionbox.h>
+#include <class_gerbview_layer_widget.h>
+#include <dialog_show_page_borders.h>
// Event table:
diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp
index 85e1e8aefa..bb15e13d20 100644
--- a/gerbview/excellon_read_drill_file.cpp
+++ b/gerbview/excellon_read_drill_file.cpp
@@ -56,21 +56,21 @@
* T0
* M30
*/
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
-#include "gerbview.h"
-#include "trigo.h"
-#include "macros.h"
-#include "class_gerber_draw_item.h"
-#include "class_GERBER.h"
-#include "class_excellon.h"
-#include "kicad_string.h"
+#include <gerbview.h>
+#include <trigo.h>
+#include <macros.h>
+#include <class_gerber_draw_item.h>
+#include <class_GERBER.h>
+#include <class_excellon.h>
+#include <kicad_string.h>
#include <math.h>
-#include "html_messagebox.h"
+#include <html_messagebox.h>
extern int ReadInt( char*& text, bool aSkipSeparator = true );
extern double ReadDouble( char*& text, bool aSkipSeparator = true );
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index 85712c75ea..5cc9740e89 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -3,23 +3,23 @@
* @brief Export the layers to Pcbnew.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "macros.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <macros.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <trigo.h>
-#include "../pcbnew/class_track.h"
-#include "../pcbnew/class_drawsegment.h"
+#include <../pcbnew/class_track.h>
+#include <../pcbnew/class_drawsegment.h>
-#include "gerbview.h"
-#include "class_board_design_settings.h"
-#include "class_gerber_draw_item.h"
-#include "select_layers_to_pcb.h"
-#include "build_version.h" // BOARD_FILE_VERSION
+#include <gerbview.h>
+#include <class_board_design_settings.h>
+#include <class_gerber_draw_item.h>
+#include <select_layers_to_pcb.h>
+#include <build_version.h> // BOARD_FILE_VERSION
/* A helper class to export a Gerber set of files to Pcbnew
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 21d531a19e..ea171f512a 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -2,15 +2,15 @@
* @file gerbview/files.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "gerbview.h"
-#include "gerbview_id.h"
-#include "class_gerbview_layer_widget.h"
+#include <gerbview.h>
+#include <gerbview_id.h>
+#include <class_gerbview_layer_widget.h>
void GERBVIEW_FRAME::OnGbrFileHistory( wxCommandEvent& event )
diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp
index b5f525c0b3..c31dd68c20 100644
--- a/gerbview/gerbview.cpp
+++ b/gerbview/gerbview.cpp
@@ -3,22 +3,22 @@
* @brief GERBVIEW main file.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "gr_basic.h"
+ #include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <gr_basic.h>
-#include "gerbview.h"
-#include "gerbview_id.h"
-#include "pcbplot.h"
-#include "zones.h"
-#include "class_board_design_settings.h"
-#include "colors_selection.h"
-#include "hotkeys.h"
+#include <gerbview.h>
+#include <gerbview_id.h>
+#include <pcbplot.h>
+#include <zones.h>
+#include <class_board_design_settings.h>
+#include <colors_selection.h>
+#include <hotkeys.h>
-#include "build_version.h"
+#include <build_version.h>
#include <wx/file.h>
#include <wx/snglinst.h>
diff --git a/gerbview/gerbview.h b/gerbview/gerbview.h
index e64ec05e0f..8608a59be9 100644
--- a/gerbview/gerbview.h
+++ b/gerbview/gerbview.h
@@ -8,9 +8,9 @@
#include <vector>
#include <set>
-#include "dcode.h"
-#include "class_gerber_draw_item.h"
-#include "class_aperture_macro.h"
+#include <dcode.h>
+#include <class_gerber_draw_item.h>
+#include <class_aperture_macro.h>
#define CURSEUR_ON_GRILLE 0
#define CURSEUR_OFF_GRILLE 1
@@ -110,7 +110,7 @@ enum Gerb_Analyse_Cmd
bool GetEndOfBlock( char buff[GERBER_BUFZ], char*& text, FILE* gerber_file );
extern GERBER_IMAGE* g_GERBER_List[32];
-#include "pcbcommon.h"
-#include "gerbview_frame.h"
+#include <pcbcommon.h>
+#include <gerbview_frame.h>
#endif // ifndef GERBVIEW_H
diff --git a/gerbview/gerbview_config.cpp b/gerbview/gerbview_config.cpp
index ae97ee4809..6881d0d240 100644
--- a/gerbview/gerbview_config.cpp
+++ b/gerbview/gerbview_config.cpp
@@ -28,20 +28,20 @@
* @brief GerbView configuration.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "id.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "gestfich.h"
-#include "pcbcommon.h"
-#include "param_config.h"
-#include "colors_selection.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <id.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <gestfich.h>
+#include <pcbcommon.h>
+#include <param_config.h>
+#include <colors_selection.h>
-#include "gerbview.h"
-#include "hotkeys.h"
-#include "class_board_design_settings.h"
-#include "dialog_hotkeys_editor.h"
+#include <gerbview.h>
+#include <hotkeys.h>
+#include <class_board_design_settings.h>
+#include <dialog_hotkeys_editor.h>
#define GROUP wxT("/gerbview")
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index 830f0b7cb9..471d93f822 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -27,23 +27,23 @@
* @file gerbview_frame.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "class_drawpanel.h"
-#include "build_version.h"
-#include "macros.h"
-#include "class_layer_box_selector.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <class_drawpanel.h>
+#include <build_version.h>
+#include <macros.h>
+#include <class_layer_box_selector.h>
-#include "gerbview.h"
-#include "class_gerber_draw_item.h"
-#include "pcbplot.h"
-#include "gerbview_id.h"
-#include "hotkeys.h"
-#include "class_GERBER.h"
-#include "dialog_helpers.h"
-#include "class_DCodeSelectionbox.h"
-#include "class_gerbview_layer_widget.h"
+#include <gerbview.h>
+#include <class_gerber_draw_item.h>
+#include <pcbplot.h>
+#include <gerbview_id.h>
+#include <hotkeys.h>
+#include <class_GERBER.h>
+#include <dialog_helpers.h>
+#include <class_DCodeSelectionbox.h>
+#include <class_gerbview_layer_widget.h>
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index d2d14baefe..58925dd8aa 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -31,10 +31,10 @@
#define WX_GERBER_STRUCT_H
-#include "param_config.h"
-#include "wxBasePcbFrame.h"
+#include <param_config.h>
+#include <wxBasePcbFrame.h>
-#include "../pcbnew/class_board.h"
+#include <../pcbnew/class_board.h>
class DCODE_SELECTION_BOX;
diff --git a/gerbview/gerbview_id.h b/gerbview/gerbview_id.h
index b958fe53ed..3d83291b2a 100644
--- a/gerbview/gerbview_id.h
+++ b/gerbview/gerbview_id.h
@@ -1,7 +1,7 @@
#ifndef __GERBVIEW_ID_H__
#define __GERBVIEW_ID_H__
-#include "id.h"
+#include <id.h>
/**
* Command IDs for the printed circuit board editor.
diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp
index 6e5fe42e07..ba09db3834 100644
--- a/gerbview/hotkeys.cpp
+++ b/gerbview/hotkeys.cpp
@@ -2,14 +2,14 @@
* @file gerbview/hotkeys.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "kicad_device_context.h"
-#include "id.h"
+#include <fctsys.h>
+#include <common.h>
+#include <kicad_device_context.h>
+#include <id.h>
-#include "gerbview.h"
-#include "class_drawpanel.h"
-#include "hotkeys.h"
+#include <gerbview.h>
+#include <class_drawpanel.h>
+#include <hotkeys.h>
/* How to add a new hotkey:
diff --git a/gerbview/hotkeys.h b/gerbview/hotkeys.h
index c159e97a46..abb97dcdc4 100644
--- a/gerbview/hotkeys.h
+++ b/gerbview/hotkeys.h
@@ -2,17 +2,17 @@
* gerbview/hotkeys.h
*/
-#ifndef KOTKEYS_H
-#define KOTKEYS_H
+#ifndef GERBVIEW_KOTKEYS_H_
+#define GERBVIEW_KOTKEYS_H_
-#include "hotkeys_basic.h"
+#include <hotkeys_basic.h>
// List of hot keys id.
// see also enum common_hotkey_id_commnand in hotkeys_basic.h
// for shared hotkeys id
enum hotkey_id_commnand {
- HK_SWITCH_UNITS = HK_COMMON_END,
- HK_SWITCH_GBR_ITEMS_DISPLAY_MODE,
+ HK_SWITCH_UNITS = HK_COMMON_END,
+ HK_SWITCH_GBR_ITEMS_DISPLAY_MODE,
HK_SWITCH_LAYER_TO_NEXT,
HK_SWITCH_LAYER_TO_PREVIOUS
};
@@ -20,4 +20,4 @@ enum hotkey_id_commnand {
// List of hotkey descriptors for GerbView.
extern struct EDA_HOTKEY_CONFIG s_Gerbview_Hokeys_Descr[];
-#endif // KOTKEYS_H
+#endif // GERBVIEW_KOTKEYS_H_
diff --git a/gerbview/initpcb.cpp b/gerbview/initpcb.cpp
index 0e5fc1c33f..7efb5d5d75 100644
--- a/gerbview/initpcb.cpp
+++ b/gerbview/initpcb.cpp
@@ -26,15 +26,15 @@
* @file gerbview/initpcb.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
-#include "gerbview.h"
-#include "class_gerber_draw_item.h"
-#include "class_GERBER.h"
-#include "class_gerbview_layer_widget.h"
+#include <gerbview.h>
+#include <class_gerber_draw_item.h>
+#include <class_GERBER.h>
+#include <class_gerbview_layer_widget.h>
bool GERBVIEW_FRAME::Clear_Pcb( bool query )
diff --git a/gerbview/locate.cpp b/gerbview/locate.cpp
index 217f83bde5..6f7011e8f6 100644
--- a/gerbview/locate.cpp
+++ b/gerbview/locate.cpp
@@ -26,10 +26,10 @@
* @file locate.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "gerbview.h"
-#include "class_gerber_draw_item.h"
+#include <fctsys.h>
+#include <common.h>
+#include <gerbview.h>
+#include <class_gerber_draw_item.h>
/* localize a gerber item and return a pointer to it.
* Display info about this item
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index 9c98b14370..b1d8c78a57 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -27,13 +27,13 @@
* @file gerbview/menubar.cpp
* @brief (Re)Create the main menubar for GerbView
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "appl_wxstruct.h"
+#include <appl_wxstruct.h>
-#include "gerbview.h"
-#include "gerbview_id.h"
-#include "hotkeys.h"
+#include <gerbview.h>
+#include <gerbview_id.h>
+#include <hotkeys.h>
void GERBVIEW_FRAME::ReCreateMenuBar( void )
diff --git a/gerbview/onleftclick.cpp b/gerbview/onleftclick.cpp
index a4442e545b..8dee3d8b7d 100644
--- a/gerbview/onleftclick.cpp
+++ b/gerbview/onleftclick.cpp
@@ -2,19 +2,19 @@
/* onleftclick.cpp: functions called on left or double left click */
/******************************************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "common.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <common.h>
//#include "gestfich.h"
//#include "appl_wxstruct.h"
-#include "gerbview.h"
+#include <gerbview.h>
//#include "pcbplot.h"
//#include "kicad_device_context.h"
-#include "gerbview_id.h"
-#include "class_GERBER.h"
-#include "dialog_helpers.h"
-#include "class_DCodeSelectionbox.h"
+#include <gerbview_id.h>
+#include <class_GERBER.h>
+#include <dialog_helpers.h>
+#include <class_DCodeSelectionbox.h>
/* Process the command triggered by the left button of the mouse when a tool
* is already selected.
diff --git a/gerbview/onrightclick.cpp b/gerbview/onrightclick.cpp
index 4e46ba7b51..5bd97eb7da 100644
--- a/gerbview/onrightclick.cpp
+++ b/gerbview/onrightclick.cpp
@@ -2,12 +2,12 @@
/* onrightclick.cpp */
/********************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "id.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <id.h>
-#include "gerbview.h"
+#include <gerbview.h>
/* Prepare the right-click pullup menu.
diff --git a/gerbview/options.cpp b/gerbview/options.cpp
index 9bebd0c498..0aa3dcbff9 100644
--- a/gerbview/options.cpp
+++ b/gerbview/options.cpp
@@ -4,12 +4,12 @@
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
-#include "gerbview.h"
-#include "gerbview_id.h"
+#include <gerbview.h>
+#include <gerbview_id.h>
/**
diff --git a/gerbview/pcbplot.cpp b/gerbview/pcbplot.cpp
index bc63003c4e..b130bda6a8 100644
--- a/gerbview/pcbplot.cpp
+++ b/gerbview/pcbplot.cpp
@@ -2,11 +2,11 @@
/* pcbplot.cpp */
/***************/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "gerbview.h"
-#include "pcbplot.h"
+#include <gerbview.h>
+#include <pcbplot.h>
/* The group of plot options - sadly global XXX */
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index a77b93deee..3c89f21c08 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -2,15 +2,15 @@
/**** readgerb.cpp ****/
/**********************/
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "gerbview.h"
-#include "class_GERBER.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <gerbview.h>
+#include <class_GERBER.h>
-#include "html_messagebox.h"
+#include <html_messagebox.h>
/* Read a gerber file, RS274D or RS274X format.
*/
diff --git a/gerbview/rs274_read_XY_and_IJ_coordinates.cpp b/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
index e184cbc09f..7453234730 100644
--- a/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
+++ b/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
@@ -2,12 +2,12 @@
/**** rs274_read_XY_and_IJ_coordinates.cpp ****/
/**********************************************/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "gerbview.h"
-#include "macros.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <macros.h>
+#include <class_GERBER.h>
/* These routines read the text string point from Text.
diff --git a/gerbview/rs274d.cpp b/gerbview/rs274d.cpp
index 81f26e6f39..9d91924ee9 100644
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
@@ -2,14 +2,14 @@
/**** rs274d.cpp ****/
/********************/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "gerbview.h"
-#include "trigo.h"
-#include "macros.h"
-#include "class_gerber_draw_item.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <trigo.h>
+#include <macros.h>
+#include <class_gerber_draw_item.h>
+#include <class_GERBER.h>
#include <math.h>
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index 5be2448276..ce43d29a29 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -2,12 +2,12 @@
* @file rs274x.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
-#include "gerbview.h"
-#include "class_GERBER.h"
+#include <gerbview.h>
+#include <class_GERBER.h>
extern int ReadInt( char*& text, bool aSkipSeparator = true );
extern double ReadDouble( char*& text, bool aSkipSeparator = true );
diff --git a/gerbview/select_layers_to_pcb.cpp b/gerbview/select_layers_to_pcb.cpp
index d885ac9046..a17f97c730 100644
--- a/gerbview/select_layers_to_pcb.cpp
+++ b/gerbview/select_layers_to_pcb.cpp
@@ -6,16 +6,16 @@
* @file select_layers_to_pcb.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "appl_wxstruct.h"
-#include "gerbview.h"
-#include "gerbview_id.h"
-#include "class_board_design_settings.h"
-#include "class_GERBER.h"
-#include "wx/statline.h"
+#include <fctsys.h>
+#include <common.h>
+#include <appl_wxstruct.h>
+#include <gerbview.h>
+#include <gerbview_id.h>
+#include <class_board_design_settings.h>
+#include <class_GERBER.h>
+#include <wx/statline.h>
-#include "select_layers_to_pcb.h"
+#include <select_layers_to_pcb.h>
#define LAYER_UNSELECTED NB_LAYERS
diff --git a/gerbview/select_layers_to_pcb.h b/gerbview/select_layers_to_pcb.h
index 107717a601..dd5b0ceda0 100644
--- a/gerbview/select_layers_to_pcb.h
+++ b/gerbview/select_layers_to_pcb.h
@@ -9,9 +9,9 @@
#ifndef _SELECT_LAYERS_TO_PCB_H_
#define _SELECT_LAYERS_TO_PCB_H_
-#include "wx/statline.h"
+#include <wx/statline.h>
-#include "dialogs/dialog_layers_select_to_pcb_base.h"
+#include <dialogs/dialog_layers_select_to_pcb_base.h>
#define LAYER_UNSELECTED NB_LAYERS
@@ -26,7 +26,7 @@ private:
GERBVIEW_FRAME* m_Parent;
int m_itemsCount;
int m_exportBoardCopperLayersCount;
- wxFlexGridSizer* m_flexRightColumnBoxSizer; // An extra wxFlexGridSizer used
+ wxFlexGridSizer* m_flexRightColumnBoxSizer; // An extra wxFlexGridSizer used
// when we have more than 16 gerber files loaded
int m_layersLookUpTable[32+1]; // Indexes Gerber layers to PCB file layers
// the last value in table is the number of copper layers
@@ -42,14 +42,14 @@ public: LAYERS_MAP_DIALOG( GERBVIEW_FRAME* parent );
private:
void initDialog();
void normalizeBrdLayersCount();
- void OnBrdLayersCountSelection( wxCommandEvent& event );
+ void OnBrdLayersCountSelection( wxCommandEvent& event );
void OnSelectLayer( wxCommandEvent& event );
void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
void OnStoreSetup( wxCommandEvent& event );
void OnGetSetup( wxCommandEvent& event );
- void OnResetClick( wxCommandEvent& event );
+ void OnResetClick( wxCommandEvent& event );
DECLARE_EVENT_TABLE()
};
diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index d853682d47..be6e8e741c 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -28,18 +28,18 @@
* @brief Build tool bars
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "common.h"
-#include "macros.h"
-#include "gerbview.h"
-#include "bitmaps.h"
-#include "gerbview_id.h"
-#include "hotkeys.h"
-#include "class_GERBER.h"
-#include "class_layer_box_selector.h"
-#include "class_DCodeSelectionbox.h"
-#include "dialog_helpers.h"
+#include <common.h>
+#include <macros.h>
+#include <gerbview.h>
+#include <bitmaps.h>
+#include <gerbview_id.h>
+#include <hotkeys.h>
+#include <class_GERBER.h>
+#include <class_layer_box_selector.h>
+#include <class_DCodeSelectionbox.h>
+#include <dialog_helpers.h>
void GERBVIEW_FRAME::ReCreateHToolbar( void )
{
diff --git a/include/appl_wxstruct.h b/include/appl_wxstruct.h
index 7ea12ded28..a30674c117 100644
--- a/include/appl_wxstruct.h
+++ b/include/appl_wxstruct.h
@@ -35,7 +35,7 @@
#include <wx/docview.h>
#include <wx/config.h>
#include <wx/filename.h>
-#include "param_config.h"
+#include <param_config.h>
enum EDA_APP_T {
diff --git a/include/base_struct.h b/include/base_struct.h
index 822cf4276c..3bfed5cf99 100644
--- a/include/base_struct.h
+++ b/include/base_struct.h
@@ -31,8 +31,8 @@
#ifndef BASE_STRUCT_H_
#define BASE_STRUCT_H_
-#include "colors.h"
-#include "bitmaps.h"
+#include <colors.h>
+#include <bitmaps.h>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/bitmaps.h b/include/bitmaps.h
index 1fcaf9cfab..d540b0a12d 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -7,7 +7,7 @@
// #include <wx/bitmap.h> // only to define wxBitmap
class wxBitmap; // only to define wxBitmap
-#include "config.h"
+#include <config.h>
#if defined(USE_PNG_BITMAPS)
diff --git a/include/block_commande.h b/include/block_commande.h
index 6e3efd0489..920bc1e1bf 100644
--- a/include/block_commande.h
+++ b/include/block_commande.h
@@ -8,8 +8,8 @@
#define __INCLUDE__BLOCK_COMMANDE_H__ 1
-#include "base_struct.h"
-#include "class_undoredo_container.h"
+#include <base_struct.h>
+#include <class_undoredo_container.h>
// Forward declarations:
diff --git a/include/boost/polygon/gtl_boost_unit_test.cpp b/include/boost/polygon/gtl_boost_unit_test.cpp
index 71dd4169e2..1523e5da53 100644
--- a/include/boost/polygon/gtl_boost_unit_test.cpp
+++ b/include/boost/polygon/gtl_boost_unit_test.cpp
@@ -1,6 +1,6 @@
/*
Copyright 2008 Intel Corporation
-
+
Use, modification and distribution are subject to the Boost Software License,
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
@@ -9,7 +9,7 @@
#include <iostream>
#define BOOST_VERY_LITTLE_SFINAE
//#include <boost/polygon/polygon.hpp>
-#include "polygon.hpp"
+#include <polygon.hpp>
//#include "ac_int_override.hpp"
namespace gtl = boost::polygon;
using namespace boost::polygon::operators;
@@ -31,11 +31,11 @@ namespace boost { namespace polygon{
template <typename T>
std::ostream& operator<<(std::ostream& o, const polygon_45_data<T>& poly) {
o << "Polygon { ";
- for(typename polygon_45_data<T>::iterator_type itr = poly.begin();
+ for(typename polygon_45_data<T>::iterator_type itr = poly.begin();
itr != poly.end(); ++itr) {
if(itr != poly.begin()) o << ", ";
o << (*itr).get(HORIZONTAL) << " " << (*itr).get(VERTICAL);
- }
+ }
o << " } ";
return o;
}
@@ -74,7 +74,7 @@ namespace boost { namespace polygon{
std::istream& operator >> (std::istream& i, polygon_90_data<T>& r)
{
std::size_t size;
- i >> size;
+ i >> size;
std::vector<T> vec;
vec.reserve(size);
for(std::size_t ii = 0; ii < size; ++ii) {
@@ -85,12 +85,12 @@ namespace boost { namespace polygon{
r.set_compact(vec.begin(), vec.end());
return i;
}
-
+
template <typename T>
std::ostream& operator << (std::ostream& o, const std::vector<polygon_90_data<T> >& r) {
o << r.size() << ' ';
for(std::size_t ii = 0; ii < r.size(); ++ii) {
- o << (r[ii]);
+ o << (r[ii]);
}
return o;
}
@@ -110,14 +110,14 @@ namespace boost { namespace polygon{
template <typename T>
std::ostream& operator<<(std::ostream& o, const polygon_data<T>& poly) {
o << "Polygon { ";
- for(typename polygon_data<T>::iterator_type itr = poly.begin();
+ for(typename polygon_data<T>::iterator_type itr = poly.begin();
itr != poly.end(); ++itr) {
if(itr != poly.begin()) o << ", ";
o << (*itr).get(HORIZONTAL) << " " << (*itr).get(VERTICAL);
- }
+ }
o << " } ";
return o;
- }
+ }
template <typename T>
std::ostream& operator << (std::ostream& o, const polygon_set_data<T>& r)
{
@@ -131,7 +131,7 @@ namespace boost { namespace polygon{
template <typename T>
std::ostream& operator<<(std::ostream& o, const polygon_90_with_holes_data<T>& poly) {
o << "Polygon With Holes { ";
- for(typename polygon_90_with_holes_data<T>::iterator_type itr = poly.begin();
+ for(typename polygon_90_with_holes_data<T>::iterator_type itr = poly.begin();
itr != poly.end(); ++itr) {
if(itr != poly.begin()) o << ", ";
o << (*itr).get(HORIZONTAL) << " " << (*itr).get(VERTICAL);
@@ -146,7 +146,7 @@ namespace boost { namespace polygon{
template <typename T>
std::ostream& operator<<(std::ostream& o, const polygon_45_with_holes_data<T>& poly) {
o << "Polygon With Holes { ";
- for(typename polygon_45_with_holes_data<T>::iterator_type itr = poly.begin();
+ for(typename polygon_45_with_holes_data<T>::iterator_type itr = poly.begin();
itr != poly.end(); ++itr) {
if(itr != poly.begin()) o << ", ";
o << (*itr).get(HORIZONTAL) << " " << (*itr).get(VERTICAL);
@@ -161,7 +161,7 @@ namespace boost { namespace polygon{
template <typename T>
std::ostream& operator<<(std::ostream& o, const polygon_with_holes_data<T>& poly) {
o << "Polygon With Holes { ";
- for(typename polygon_with_holes_data<T>::iterator_type itr = poly.begin();
+ for(typename polygon_with_holes_data<T>::iterator_type itr = poly.begin();
itr != poly.end(); ++itr) {
if(itr != poly.begin()) o << ", ";
o << (*itr).get(HORIZONTAL) << " " << (*itr).get(VERTICAL);
@@ -196,7 +196,7 @@ namespace boost { namespace polygon{
booleanOr.processInterval(container, interval_data<Unit>(0, 10), 1);
booleanOr.advanceScan();
booleanOr.processInterval(container, interval_data<Unit>(0, 10), -1);
- if(container.size() != 2) {
+ if(container.size() != 2) {
std::cout << "Test one rectangle, wrong output size\n";
return false;
}
@@ -331,7 +331,7 @@ namespace boost { namespace polygon{
polygon_90_set_data<int> ps90;
polygon_45_set_data<int> ps45;
polygon_set_data<int> ps;
-
+
assign(p, rect);
assign(p90, view_as<polygon_90_concept>(p));
if(!equivalence(p90, rect))
@@ -365,7 +365,7 @@ namespace boost { namespace polygon{
std::cout << "fail 11\n";
assign(p90wh, view_as<polygon_90_with_holes_concept>(p45wh));
if(!equivalence(p90wh, rect))
- std::cout << "fail 12\n";
+ std::cout << "fail 12\n";
assign(p90, view_as<polygon_90_concept>(pwh));
if(!equivalence(p90, rect))
std::cout << "fail 13\n";
@@ -571,7 +571,7 @@ namespace boost { namespace polygon{
//poly.set(points.begin(), points.end());
//ps.insert(poly);
polygon_45_set_data<int> preps(polys[0]);
-
+
ps.insert(polys[0]);
convolve(polys[0], point_data<int>(0, 1) );
@@ -902,18 +902,18 @@ bool testPolygonAssign() {
//assign(p_90, p_wh);
//assign(p_90, p_45_wh);
//assign(p_90, p_90_wh);
- assign(p_wh, p);
- assign(p_wh, p_45);
- assign(p_wh, p_90);
+ assign(p_wh, p);
+ assign(p_wh, p_45);
+ assign(p_wh, p_90);
assign(p_wh1, p_wh);
assign(p_wh, p_45_wh);
assign(p_wh, p_90_wh);
- //assign(p_45_wh, p);
- assign(p_45_wh, p_45);
- assign(p_45_wh, p_90);
+ //assign(p_45_wh, p);
+ assign(p_45_wh, p_45);
+ assign(p_45_wh, p_90);
//assign(p_45_wh, p_wh);
assign(p_45_wh1, p_45_wh);
- //assign(p_90_wh, p);
+ //assign(p_90_wh, p);
//assign(p_90_wh, p_45);
assign(p_90_wh, p_90);
assign(p_90_wh1, p_90_wh);
@@ -1018,7 +1018,7 @@ Polygon45 getRandomTriangle() {
x(pts[1], x(pts[1]) + disp);
if(dir)
y(pts[1], y(pts[1]) + disp);
- else
+ else
y(pts[1], y(pts[1]) - disp);
return Polygon45(pts, pts+3);
}
@@ -2130,23 +2130,23 @@ void max_cover_stress_test() {
// inline iterator_type begin() const {
// return polygon_traits<T>::begin_points(*t);
// }
-
+
// /// Get the end iterator
// inline iterator_type end() const {
// return polygon_traits<T>::end_points(*t);
// }
-
+
// /// Get the number of sides of the polygon
// inline unsigned int size() const {
// return polygon_traits<T>::size(*t);
// }
-
+
// /// Get the winding direction of the polygon
// inline winding_direction winding() const {
// return polygon_traits<T>::winding(*t);
// }
// };
-
+
// template <typename T1, typename T2>
// view_of<T1, T2> view_as(const T2& obj) { return view_of<T1, T2>(obj); }
@@ -2169,18 +2169,18 @@ void max_cover_stress_test() {
// return compact_iterator_type(polygon_traits<T>::begin_points(*t),
// polygon_traits<T>::end_points(*t));
// }
-
+
// /// Get the end iterator
// inline compact_iterator_type end_compact() const {
// return compact_iterator_type(polygon_traits<T>::end_points(*t),
// polygon_traits<T>::end_points(*t));
// }
-
+
// /// Get the number of sides of the polygon
// inline unsigned int size() const {
// return polygon_traits<T>::size(*t);
// }
-
+
// /// Get the winding direction of the polygon
// inline winding_direction winding() const {
// return polygon_traits<T>::winding(*t);
@@ -2212,7 +2212,7 @@ bool test_colinear_duplicate_points() {
bool test_extents() {
PolygonSet psT(gtl::VERTICAL);
- //int xy[] = { 126, 69, 54, 69, 54, 81, 126, 81 };
+ //int xy[] = { 126, 69, 54, 69, 54, 81, 126, 81 };
//CPolygonQuery polygon(0, 4, xy);
//Rectangle rectIn(54, 69, 126, 81);
polygon_data<int> polygon;
@@ -2222,11 +2222,11 @@ bool test_extents() {
pts.push_back(Point(54, 81));
pts.push_back(Point(126, 81));
psT.insert(view_as<polygon_90_concept>(polygon));
-
+
Rectangle rect, rect2;
psT.extents(rect2);
gtl::extents(rect, psT);
-
+
if (rect != rect2) {
std::cout << "gtl::Rectangles differ: " << gtl::xl(rect) << " " << gtl::xh(rect) << " " << gtl::yl(rect) << " " << gtl::yh(rect) << std::endl;
std::cout << " " << gtl::xl(rect2) << " " << gtl::xh(rect2) << " " << gtl::yl(rect2) << " " << gtl::yh(rect2) << std::endl;
@@ -2237,23 +2237,23 @@ bool test_extents() {
bool test_extents2() {
Polygon45Set psT;
- Point xy[] = { Point(130, 50), Point(50, 50), Point(50, 100), Point(119, 100),
+ Point xy[] = { Point(130, 50), Point(50, 50), Point(50, 100), Point(119, 100),
Point(119, 59), Point(89, 89), Point(59, 59), Point(119, 59), Point(119, 100), Point(130, 100) };
Polygon45 polygon(xy, xy+10);
-
+
psT.insert(polygon);
psT += 2;
-
+
Rectangle rect, rect2;
psT.extents(rect2);
- gtl::extents(rect, psT);
+ gtl::extents(rect, psT);
std::cout << "Extents: " << gtl::xl(rect) << " " << gtl::xh(rect) << " " << gtl::yl(rect) << " " << gtl::yh(rect) << std::endl;
std::cout << "Extents: " << gtl::xl(rect2) << " " << gtl::xh(rect2) << " " << gtl::yl(rect2) << " " << gtl::yh(rect2) << std::endl;
std::vector<Polygon45WithHoles> pwhs;
psT.get(pwhs);
for(unsigned int i = 0; i < pwhs.size(); ++i) {
std::cout << pwhs[i] << std::endl;
- }
+ }
return gtl::equivalence(rect, rect2);
}
@@ -2389,7 +2389,7 @@ int main() {
point_data<int> pt(1, 1);
std::cout << contains(p, pt) << std::endl;
std::cout << contains(p90, pt) << std::endl;
-
+
interval_data<int> ivl = construct<interval_data<int> >(0, 10);
std::cout << get(ivl, LOW) << std::endl;
set(ivl, HIGH, 20);
@@ -2637,7 +2637,7 @@ int main() {
}
std::cout << area(rv) << std::endl;
std::cout << area(rv) << std::endl;
-
+
scale_up(rv, 10);
std::cout << area(rv) << std::endl;
scale_down(rv, 7);
@@ -2711,7 +2711,7 @@ int main() {
std::cout << pwh << std::endl;
std::cout << area(pwh) << std::endl;
if(area(pwh) != 9900) return 1;
-
+
//test point scale up / down
Point pt(10, 10);
scale_up(pt, 25);
@@ -2955,7 +2955,7 @@ int main() {
ps451.transform(tr);
std::cout << (ps451 == ps452) << std::endl;
if(ps451 != ps452) return 1;
-
+
//test polygon45set area
std::cout << area(ps451) << std::endl;
if(area(ps451) != 12.5) return 1;
@@ -3210,7 +3210,7 @@ int main() {
ps45.insert(ps90);
ps45.insert(p90whv);
ps45.insert(p90whv + p90whv);
-
+
ps45.insert(polygon_90_with_holes_data<int>());
polygon_with_holes_data<int> pwh;
snap_to_45(pwh);
diff --git a/include/class_base_screen.h b/include/class_base_screen.h
index e49b0fe37a..3c8abc128f 100644
--- a/include/class_base_screen.h
+++ b/include/class_base_screen.h
@@ -31,10 +31,10 @@
#ifndef CLASS_BASE_SCREEN_H_
#define CLASS_BASE_SCREEN_H_
-#include "base_struct.h"
-#include "class_undoredo_container.h"
-#include "block_commande.h"
-#include "common.h"
+#include <base_struct.h>
+#include <class_undoredo_container.h>
+#include <block_commande.h>
+#include <common.h>
/**
diff --git a/include/class_bitmap_base.h b/include/class_bitmap_base.h
index 725dbab522..25319fac20 100644
--- a/include/class_bitmap_base.h
+++ b/include/class_bitmap_base.h
@@ -31,7 +31,7 @@
#define _BITMAP_BASE_H_
-#include "sch_item_struct.h"
+#include <sch_item_struct.h>
/**
* This class handle bitmap images in KiCad.
diff --git a/include/class_board_design_settings.h b/include/class_board_design_settings.h
index 780faa3be8..55d0343886 100644
--- a/include/class_board_design_settings.h
+++ b/include/class_board_design_settings.h
@@ -5,7 +5,7 @@
#ifndef _BOARD_DESIGN_SETTING_H
#define _BOARD_DESIGN_SETTING_H
-#include "pcbstruct.h" // NB_COLORS
+#include <pcbstruct.h> // NB_COLORS
// Class for handle current printed board design settings
class BOARD_DESIGN_SETTINGS
diff --git a/include/class_board_item.h b/include/class_board_item.h
index 9c54280bf4..d1dd6d133c 100644
--- a/include/class_board_item.h
+++ b/include/class_board_item.h
@@ -31,7 +31,7 @@
#define BOARD_ITEM_STRUCT_H
-#include "base_struct.h"
+#include <base_struct.h>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/class_collector.h b/include/class_collector.h
index e8f2174191..54cec07cdf 100644
--- a/include/class_collector.h
+++ b/include/class_collector.h
@@ -32,9 +32,9 @@
#include <vector>
-#include "fctsys.h"
-#include "base_struct.h" // SEARCH_RESULT
-#include "common.h" // GetNewTimeStamp()
+#include <fctsys.h>
+#include <base_struct.h> // SEARCH_RESULT
+#include <common.h> // GetNewTimeStamp()
class EDA_ITEM;
diff --git a/include/class_drawpanel.h b/include/class_drawpanel.h
index a18a492d03..c74fe280dd 100644
--- a/include/class_drawpanel.h
+++ b/include/class_drawpanel.h
@@ -31,8 +31,8 @@
#ifndef PANEL_WXSTRUCT_H
#define PANEL_WXSTRUCT_H
-#include "colors.h"
-#include "base_struct.h"
+#include <colors.h>
+#include <base_struct.h>
class EDA_DRAW_FRAME;
class BASE_SCREEN;
diff --git a/include/class_drc_item.h b/include/class_drc_item.h
index 3fb45c3afc..78a7a29c4b 100644
--- a/include/class_drc_item.h
+++ b/include/class_drc_item.h
@@ -25,7 +25,7 @@
#ifndef _CLASS_DRC_ITEM_H
#define _CLASS_DRC_ITEM_H
-#include "macros.h"
+#include <macros.h>
/**
diff --git a/include/class_layer_box_selector.h b/include/class_layer_box_selector.h
index 91e216fddd..cb558ae99b 100644
--- a/include/class_layer_box_selector.h
+++ b/include/class_layer_box_selector.h
@@ -1,7 +1,7 @@
#ifndef CLASS_LAYER_BOX_SELECTOR_H
#define CLASS_LAYER_BOX_SELECTOR_H 1
-#include "hotkeys_basic.h"
+#include <hotkeys_basic.h>
#include <wx/bmpcbox.h>
diff --git a/include/class_marker_base.h b/include/class_marker_base.h
index cbc3ae379c..5a81e52fe2 100644
--- a/include/class_marker_base.h
+++ b/include/class_marker_base.h
@@ -5,7 +5,7 @@
#ifndef _CLASS_MARKER_BASE_H
#define _CLASS_MARKER_BASE_H
-#include "class_drc_item.h"
+#include <class_drc_item.h>
class MARKER_BASE
{
diff --git a/include/class_pcb_screen.h b/include/class_pcb_screen.h
index 4e5a3d2639..46971bf64c 100644
--- a/include/class_pcb_screen.h
+++ b/include/class_pcb_screen.h
@@ -6,8 +6,8 @@
#define CLASS_PCB_SCREEN_H_
-#include "class_base_screen.h"
-#include "class_board_item.h"
+#include <class_base_screen.h>
+#include <class_board_item.h>
class UNDO_REDO_CONTAINER;
diff --git a/include/class_sch_screen.h b/include/class_sch_screen.h
index 0dfd7e3ace..94e8b97a8e 100644
--- a/include/class_sch_screen.h
+++ b/include/class_sch_screen.h
@@ -31,12 +31,12 @@
#ifndef CLASS_SCREEN_H
#define CLASS_SCREEN_H
-#include "macros.h"
-#include "sch_item_struct.h"
-#include "class_base_screen.h"
-#include "class_title_block.h"
+#include <macros.h>
+#include <sch_item_struct.h>
+#include <class_base_screen.h>
+#include <class_title_block.h>
-#include "../eeschema/general.h"
+#include <../eeschema/general.h>
class LIB_PIN;
diff --git a/include/class_undoredo_container.h b/include/class_undoredo_container.h
index 0711218dc2..30c5cda79f 100644
--- a/include/class_undoredo_container.h
+++ b/include/class_undoredo_container.h
@@ -27,7 +27,7 @@
#define _CLASS_UNDOREDO_CONTAINER_H
#include <vector>
-#include "base_struct.h"
+#include <base_struct.h>
class PICKED_ITEMS_LIST;
diff --git a/include/colors_selection.h b/include/colors_selection.h
index 50af026e0c..d5bd3e0ba7 100644
--- a/include/colors_selection.h
+++ b/include/colors_selection.h
@@ -3,7 +3,7 @@
#ifndef _COLORS_SELECTION_H_
#define _COLORS_SELECTION_H_
-#include "class_colors_design_settings.h"
+#include <class_colors_design_settings.h>
// Colors for layers and items
extern COLORS_DESIGN_SETTINGS g_ColorsSettings;
diff --git a/include/common.h b/include/common.h
index 983ab2f22f..bc2e283df2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -34,9 +34,9 @@
#include <vector>
-#include "wx/wx.h"
-#include "wx/confbase.h"
-#include "wx/fileconf.h"
+#include <wx/wx.h>
+#include <wx/confbase.h>
+#include <wx/fileconf.h>
class wxAboutDialogInfo;
diff --git a/include/dcsvg.h b/include/dcsvg.h
index 38c5bda012..a47e89f3bd 100644
--- a/include/dcsvg.h
+++ b/include/dcsvg.h
@@ -1,13 +1,13 @@
#if wxCHECK_VERSION( 2, 9, 0 )
// Do nothing, because wxWidgets 3 supports the SVG format
// previously, was a contribution library, not included in wxWidgets base
-#include "wx/dcsvg.h"
+#include <wx/dcsvg.h>
#else
#ifndef __DCSVG_H
#define __DCSVG_H
-#include "wx/wfstream.h"
-#include "wx/string.h"
+#include <wx/wfstream.h>
+#include <wx/string.h>
#define wxSVGVersion wxT( "v0101" )
#ifdef __BORLANDC__
diff --git a/include/dialog_get_component.h b/include/dialog_get_component.h
index 8b085f8aab..5a1dbaffcc 100644
--- a/include/dialog_get_component.h
+++ b/include/dialog_get_component.h
@@ -6,7 +6,7 @@
#ifndef __INCLUDE_DIALOG_GET_COMPONENT_H__
#define __INCLUDE_DIALOG_GET_COMPONENT_H__
-#include "../common/dialogs/dialog_get_component_base.h"
+#include <../common/dialogs/dialog_get_component_base.h>
wxPoint GetComponentDialogPosition( void );
diff --git a/include/dialog_helpers.h b/include/dialog_helpers.h
index ff98234161..a560c6a146 100644
--- a/include/dialog_helpers.h
+++ b/include/dialog_helpers.h
@@ -8,7 +8,7 @@
#define _DIALOG_HELPERS_H_
-#include "common.h" // EDA_UNITS_T
+#include <common.h> // EDA_UNITS_T
class EDA_DRAW_FRAME;
diff --git a/include/dialog_hotkeys_editor.h b/include/dialog_hotkeys_editor.h
index af704ca41d..6d090a71be 100644
--- a/include/dialog_hotkeys_editor.h
+++ b/include/dialog_hotkeys_editor.h
@@ -16,10 +16,10 @@
#include <wx/dialog.h>
#include <wx/grid.h>
-#include "hotkeys_basic.h"
-#include "hotkey_grid_table.h"
-#include "wxstruct.h"
-#include "../common/dialogs/dialog_hotkeys_editor_base.h"
+#include <hotkeys_basic.h>
+#include <hotkey_grid_table.h>
+#include <wxstruct.h>
+#include <../common/dialogs/dialog_hotkeys_editor_base.h>
class HOTKEYS_EDITOR_DIALOG : public HOTKEYS_EDITOR_DIALOG_BASE
{
diff --git a/include/drawtxt.h b/include/drawtxt.h
index 00db99f3b4..8974bbd380 100644
--- a/include/drawtxt.h
+++ b/include/drawtxt.h
@@ -7,7 +7,7 @@
#ifndef __INCLUDE__DRAWTXT_H__
#define __INCLUDE__DRAWTXT_H__ 1
-#include "base_struct.h"
+#include <base_struct.h>
class EDA_DRAW_PANEL;
class PLOTTER;
diff --git a/include/dsnlexer.h b/include/dsnlexer.h
index c298c537d1..757e1156e6 100644
--- a/include/dsnlexer.h
+++ b/include/dsnlexer.h
@@ -29,7 +29,7 @@
#include <string>
#include <vector>
-#include "richio.h"
+#include <richio.h>
#ifndef SWIG
/**
diff --git a/include/fctsys.h b/include/fctsys.h
index 6f10a4214d..f1cb2b6b58 100644
--- a/include/fctsys.h
+++ b/include/fctsys.h
@@ -5,7 +5,7 @@
#define FCTSYS_H
// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
#ifdef __BORLANDC__
#pragma hdrstop
@@ -62,6 +62,6 @@
#define wxNullPtr ((void *)NULL)
#endif
-#include "config.h"
+#include <config.h>
#endif /* FCTSYS_H */
diff --git a/include/filter_reader.h b/include/filter_reader.h
index a3d980d1d3..51240c8d4f 100644
--- a/include/filter_reader.h
+++ b/include/filter_reader.h
@@ -27,7 +27,7 @@
#define FILTER_READER_H_
#include <wx/wx.h>
-#include "richio.h"
+#include <richio.h>
/**
diff --git a/include/footprint_info.h b/include/footprint_info.h
index 201d1eae07..c23aca99e4 100644
--- a/include/footprint_info.h
+++ b/include/footprint_info.h
@@ -8,7 +8,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/foreach.hpp>
-#include "kicad_string.h"
+#include <kicad_string.h>
/*
* class FOOTPRINT_INFO is a helper class to handle the list of footprints
diff --git a/include/gr_basic.h b/include/gr_basic.h
index 582171b067..d7c9925ad4 100644
--- a/include/gr_basic.h
+++ b/include/gr_basic.h
@@ -30,7 +30,7 @@
#ifndef GR_BASIC
#define GR_BASIC
-#include "colors.h"
+#include <colors.h>
#include <vector>
class EDA_RECT;
diff --git a/include/hotkey_grid_table.h b/include/hotkey_grid_table.h
index e96eb9c342..7075ec4d9a 100644
--- a/include/hotkey_grid_table.h
+++ b/include/hotkey_grid_table.h
@@ -9,10 +9,10 @@
#include <vector>
#include <utility>
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "hotkeys_basic.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <hotkeys_basic.h>
class HotkeyGridTable : public wxGridTableBase
{
diff --git a/include/html_messagebox.h b/include/html_messagebox.h
index 5d89965e37..fa83e33d7a 100644
--- a/include/html_messagebox.h
+++ b/include/html_messagebox.h
@@ -6,7 +6,7 @@
Subclass of DIALOG_DISPLAY_HTML_TEXT_BASE, which is generated by wxFormBuilder.
*/
-#include "../common/dialogs/dialog_display_info_HTML_base.h"
+#include <../common/dialogs/dialog_display_info_HTML_base.h>
/** Implementing HTML_MESSAGE_BOX */
class HTML_MESSAGE_BOX : public DIALOG_DISPLAY_HTML_TEXT_BASE
diff --git a/include/macros.h b/include/macros.h
index 0278576eba..5c635cfa52 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -125,7 +125,7 @@ static inline const wxChar* GetChars( const wxString& s )
* with native typeof support.
*/
-#include "boost/typeof/typeof.hpp"
+#include <boost/typeof/typeof.hpp>
// we have to register the types used with the typeof keyword with boost
BOOST_TYPEOF_REGISTER_TYPE( wxPoint )
diff --git a/include/param_config.h b/include/param_config.h
index 9077624aff..f526e6adfb 100644
--- a/include/param_config.h
+++ b/include/param_config.h
@@ -6,8 +6,8 @@
#ifndef PARAM_CONFIG_H_
#define PARAM_CONFIG_H_
-#include "wx/confbase.h"
-#include "wx/fileconf.h"
+#include <wx/confbase.h>
+#include <wx/fileconf.h>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/pcbcommon.h b/include/pcbcommon.h
index 5f0683957e..3667c25116 100644
--- a/include/pcbcommon.h
+++ b/include/pcbcommon.h
@@ -6,8 +6,8 @@
#define __PCBCOMMON_H__
-#include "dlist.h"
-#include "layers_id_colors_and_visibility.h" // LAYER_COUNT and NB_COPPER_LAYERS definitions.
+#include <dlist.h>
+#include <layers_id_colors_and_visibility.h> // LAYER_COUNT and NB_COPPER_LAYERS definitions.
//#include <wx/string.h> // wxString class.
//#include <wx/arrstr.h> // wxArrayString class.
diff --git a/include/plot_common.h b/include/plot_common.h
index b336e17fb2..dca0c8c2fe 100644
--- a/include/plot_common.h
+++ b/include/plot_common.h
@@ -9,8 +9,8 @@
#define PLOT_COMMON_H_
#include <vector>
-#include "drawtxt.h"
-#include "common.h" // PAGE_INFO
+#include <drawtxt.h>
+#include <common.h> // PAGE_INFO
/**
* Enum PlotFormat
@@ -362,12 +362,12 @@ public:
plot_scale_adjX = scaleX;
plot_scale_adjY = scaleY;
}
-
+
virtual void set_plot_width_adj( double width )
{
plot_width_adj = width;
}
-
+
virtual double get_plot_width_adj()
{
return plot_width_adj;
diff --git a/include/wxBasePcbFrame.h b/include/wxBasePcbFrame.h
index 003a8fc666..15761faa43 100644
--- a/include/wxBasePcbFrame.h
+++ b/include/wxBasePcbFrame.h
@@ -34,10 +34,10 @@
#include <vector>
-#include "wxstruct.h"
-#include "base_struct.h"
-#include "richio.h"
-#include "class_pcb_screen.h"
+#include <wxstruct.h>
+#include <base_struct.h>
+#include <richio.h>
+#include <class_pcb_screen.h>
#ifndef PCB_INTERNAL_UNIT
#define PCB_INTERNAL_UNIT 10000
diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h
index 512af55e7f..3195dd27cb 100644
--- a/include/wxEeschemaStruct.h
+++ b/include/wxEeschemaStruct.h
@@ -30,13 +30,13 @@
#ifndef WX_EESCHEMA_STRUCT_H
#define WX_EESCHEMA_STRUCT_H
-#include "sch_base_frame.h"
-#include "param_config.h"
-#include "class_undoredo_container.h"
-#include "template_fieldnames.h"
-#include "block_commande.h"
-#include "class_sch_screen.h"
-#include "sch_collectors.h"
+#include <sch_base_frame.h>
+#include <param_config.h>
+#include <class_undoredo_container.h>
+#include <template_fieldnames.h>
+#include <block_commande.h>
+#include <class_sch_screen.h>
+#include <sch_collectors.h>
class LIB_EDIT_FRAME;
diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h
index bbcdd77896..0721cff94f 100644
--- a/include/wxPcbStruct.h
+++ b/include/wxPcbStruct.h
@@ -31,11 +31,11 @@
#define WXPCB_STRUCT_H
-#include "wxBasePcbFrame.h"
-#include "param_config.h"
-#include "class_layer_box_selector.h"
-#include "class_macros_record.h"
-#include "class_undoredo_container.h"
+#include <wxBasePcbFrame.h>
+#include <param_config.h>
+#include <class_layer_box_selector.h>
+#include <class_macros_record.h>
+#include <class_undoredo_container.h>
#ifndef PCB_INTERNAL_UNIT
diff --git a/include/wxstruct.h b/include/wxstruct.h
index 6475a5ad2b..e6c14842df 100644
--- a/include/wxstruct.h
+++ b/include/wxstruct.h
@@ -35,16 +35,16 @@
#include <vector>
#include <wx/socket.h>
-#include "wx/log.h"
-#include "wx/config.h"
+#include <wx/log.h>
+#include <wx/config.h>
#include <wx/wxhtml.h>
#include <wx/laywin.h>
#include <wx/aui/aui.h>
#include <wx/docview.h>
-#include "bitmaps.h"
-#include "colors.h"
-#include "common.h"
+#include <bitmaps.h>
+#include <colors.h>
+#include <common.h>
#ifdef USE_WX_OVERLAY
#include <wx/overlay.h>
diff --git a/include/xnode.h b/include/xnode.h
index 828d9a6c1d..3b7fc38a0a 100644
--- a/include/xnode.h
+++ b/include/xnode.h
@@ -25,7 +25,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "richio.h"
+#include <richio.h>
// quiet the deprecated warnings with 3 lines:
#include <wx/defs.h>
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 00c7abff28..6944a31359 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -1,8 +1,11 @@
add_definitions(-DKICAD)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${Boost_INCLUDE_DIR}
- )
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ${Boost_INCLUDE_DIR}
+ ${INC_AFTER}
+ )
+
set(KICAD_SRCS
class_treeprojectfiles.cpp
@@ -44,9 +47,9 @@ add_executable(kicad WIN32 MACOSX_BUNDLE
if(APPLE)
set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
- target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES})
+ target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES})
else(APPLE)
- target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES})
+ target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES})
endif(APPLE)
install(TARGETS kicad
diff --git a/kicad/class_treeproject_item.cpp b/kicad/class_treeproject_item.cpp
index 7704a8d300..0003280da3 100644
--- a/kicad/class_treeproject_item.cpp
+++ b/kicad/class_treeproject_item.cpp
@@ -5,17 +5,17 @@
* store info about a file or directory shown in the KiCad tree project files
*/
-#include "fctsys.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <gestfich.h>
-#include "kicad.h"
-#include "tree_project_frame.h"
-#include "class_treeprojectfiles.h"
-#include "class_treeproject_item.h"
-#include "wx/imaglist.h"
+#include <kicad.h>
+#include <tree_project_frame.h>
+#include <class_treeprojectfiles.h>
+#include <class_treeproject_item.h>
+#include <wx/imaglist.h>
-#include "wx/regex.h"
-#include "wx/dir.h"
+#include <wx/regex.h>
+#include <wx/dir.h>
/* sort function for tree items.
* items are sorted :
diff --git a/kicad/class_treeprojectfiles.cpp b/kicad/class_treeprojectfiles.cpp
index c55c6c05e1..df9b057eeb 100644
--- a/kicad/class_treeprojectfiles.cpp
+++ b/kicad/class_treeprojectfiles.cpp
@@ -3,15 +3,15 @@
* this is the wxTreeCtrl that shows a KiCad tree project files
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "kicad.h"
-#include "tree_project_frame.h"
-#include "class_treeprojectfiles.h"
-#include "class_treeproject_item.h"
+#include <kicad.h>
+#include <tree_project_frame.h>
+#include <class_treeprojectfiles.h>
+#include <class_treeproject_item.h>
-#include "wx/regex.h"
-#include "wx/imaglist.h"
+#include <wx/regex.h>
+#include <wx/imaglist.h>
IMPLEMENT_ABSTRACT_CLASS( TREEPROJECTFILES, wxTreeCtrl )
diff --git a/kicad/commandframe.cpp b/kicad/commandframe.cpp
index 4edec906e3..28fda0568f 100644
--- a/kicad/commandframe.cpp
+++ b/kicad/commandframe.cpp
@@ -3,10 +3,10 @@
* @brief Frame showing fast launch buttons and messages box
*/
-#include "fctsys.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <macros.h>
-#include "kicad.h"
+#include <kicad.h>
RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) :
diff --git a/kicad/files-io.cpp b/kicad/files-io.cpp
index cf16ff2498..75b61f4a20 100644
--- a/kicad/files-io.cpp
+++ b/kicad/files-io.cpp
@@ -6,8 +6,8 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
#include <wx/fs_zip.h>
#include <wx/zipstrm.h>
#include <wx/docview.h>
@@ -15,12 +15,12 @@
#include <wx/zstream.h>
#include <wx/dir.h>
-#include "confirm.h"
-#include "gestfich.h"
-#include "macros.h"
+#include <confirm.h>
+#include <gestfich.h>
+#include <macros.h>
-#include "kicad.h"
-#include "prjconfig.h"
+#include <kicad.h>
+#include <prjconfig.h>
static const wxString ZipFileExtension( wxT( "zip" ) );
static const wxString ZipFileWildcard( wxT( "Zip file (*.zip) | *.zip" ) );
diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp
index 292dd1b0a2..aa5f077625 100644
--- a/kicad/kicad.cpp
+++ b/kicad/kicad.cpp
@@ -3,8 +3,8 @@
* @brief Main KiCad library manager file
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
#ifdef USE_SPLASH_IMAGE
#define SPLASH_IMAGE logo_kicad.png
@@ -12,10 +12,10 @@
#include "wx/mediactrl.h"
#endif
-#include "kicad.h"
-#include "tree_project_frame.h"
+#include <kicad.h>
+#include <tree_project_frame.h>
-#include "build_version.h"
+#include <build_version.h>
const wxString g_KicadPrjFilenameExtension( wxT( ".pro" ) );
diff --git a/kicad/kicad.h b/kicad/kicad.h
index 978517d05e..5712a26fa0 100644
--- a/kicad/kicad.h
+++ b/kicad/kicad.h
@@ -11,9 +11,9 @@
#include <wx/dragimag.h>
#include <wx/filename.h>
-#include "id.h"
-#include "wxstruct.h"
-#include "appl_wxstruct.h"
+#include <id.h>
+#include <wxstruct.h>
+#include <appl_wxstruct.h>
extern const wxString g_KicadPrjFilenameExtension;
diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp
index b679e5b8a5..566f1aa7ab 100644
--- a/kicad/mainframe.cpp
+++ b/kicad/mainframe.cpp
@@ -7,14 +7,14 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <macros.h>
-#include "kicad.h"
-#include "tree_project_frame.h"
+#include <kicad.h>
+#include <tree_project_frame.h>
static const wxString TreeFrameWidthEntry( wxT( "LeftWinWidth" ) );
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index 8ef95f60ac..c284cd85d0 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -27,9 +27,9 @@
* @file kicad/menubar.cpp
* @brief (Re)Create the project manager menubar for KiCad
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "kicad.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <kicad.h>
/* Menubar and toolbar event table */
diff --git a/kicad/preferences.cpp b/kicad/preferences.cpp
index bf8538ddda..b7e046c878 100644
--- a/kicad/preferences.cpp
+++ b/kicad/preferences.cpp
@@ -31,12 +31,12 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "kicad.h"
+#include <kicad.h>
#include <wx/fontdlg.h>
diff --git a/kicad/prjconfig.cpp b/kicad/prjconfig.cpp
index e671788b88..ddbc16fe13 100644
--- a/kicad/prjconfig.cpp
+++ b/kicad/prjconfig.cpp
@@ -3,15 +3,15 @@
* Load and save project configuration files (*.pro)
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "prjconfig.h"
-#include "kicad.h"
-#include "tree_project_frame.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <prjconfig.h>
+#include <kicad.h>
+#include <tree_project_frame.h>
-#include "build_version.h"
+#include <build_version.h>
static const wxString GeneralGroupName( wxT( "/general" ) );
diff --git a/kicad/prjconfig.h b/kicad/prjconfig.h
index cbe7bd0e7b..8f813daf3e 100644
--- a/kicad/prjconfig.h
+++ b/kicad/prjconfig.h
@@ -2,7 +2,7 @@
/* prjconfig.h : configuration: definition des structures */
/**********************************************************/
-#include "param_config.h"
+#include <param_config.h>
extern PARAM_CFG_BASE* CfgParamList[];
diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp
index e3c7831254..71450715ac 100644
--- a/kicad/tree_project_frame.cpp
+++ b/kicad/tree_project_frame.cpp
@@ -4,19 +4,19 @@
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
-#include "kicad.h"
-#include "tree_project_frame.h"
-#include "class_treeprojectfiles.h"
-#include "class_treeproject_item.h"
+#include <kicad.h>
+#include <tree_project_frame.h>
+#include <class_treeprojectfiles.h>
+#include <class_treeproject_item.h>
-#include "wx/regex.h"
-#include "wx/dir.h"
-#include "wx/imaglist.h"
+#include <wx/regex.h>
+#include <wx/dir.h>
+#include <wx/imaglist.h>
/* Note about the tree project build process:
diff --git a/new/sch_canvas.cpp b/new/sch_canvas.cpp
index 0e53cde6fc..776306cfff 100644
--- a/new/sch_canvas.cpp
+++ b/new/sch_canvas.cpp
@@ -23,8 +23,8 @@
*/
-#include "sch_canvas.h"
-#include "sch_part.h"
+#include <sch_canvas.h>
+#include <sch_part.h>
#include <gal/font/newstroke_font.h>
diff --git a/new/sweet_edit.cpp b/new/sweet_edit.cpp
index d64aa287ed..cff23173ea 100644
--- a/new/sweet_edit.cpp
+++ b/new/sweet_edit.cpp
@@ -41,7 +41,7 @@
#include <math/vector2d.h>
#include <math/matrix3x3.h>
-#include "sweet_editor_panel.h"
+#include <sweet_editor_panel.h>
#define screenSizeX 640
#define screenSizeY 480
diff --git a/new/sweet_editor_panel.cpp b/new/sweet_editor_panel.cpp
index d5668bcbb5..db2fbda5dd 100644
--- a/new/sweet_editor_panel.cpp
+++ b/new/sweet_editor_panel.cpp
@@ -5,70 +5,70 @@
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
-#include "sweet_editor_panel.h"
+#include <sweet_editor_panel.h>
///////////////////////////////////////////////////////////////////////////
SWEET_EDITOR_PANEL::SWEET_EDITOR_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
- wxBoxSizer* bSizer2;
- bSizer2 = new wxBoxSizer( wxVERTICAL );
-
- m_top_bottom = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
- m_top_bottom->SetSashGravity( 1 );
- m_top_bottom->Connect( wxEVT_IDLE, wxIdleEventHandler( SWEET_EDITOR_PANEL::m_top_bottomOnIdle ), NULL, this );
-
- m_panel9 = new wxPanel( m_top_bottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bSizer10;
- bSizer10 = new wxBoxSizer( wxVERTICAL );
-
- m_splitter3 = new wxSplitterWindow( m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
- m_splitter3->Connect( wxEVT_IDLE, wxIdleEventHandler( SWEET_EDITOR_PANEL::m_splitter3OnIdle ), NULL, this );
-
- m_scrolledTextWindow = new wxScrolledWindow( m_splitter3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
- m_scrolledTextWindow->SetScrollRate( 5, 5 );
- wxStaticBoxSizer* m_scrolledTextSizer;
- m_scrolledTextSizer = new wxStaticBoxSizer( new wxStaticBox( m_scrolledTextWindow, wxID_ANY, _("Sweet") ), wxVERTICAL );
-
- m_sweet_scroll_window = new wxTextCtrl( m_scrolledTextWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxALWAYS_SHOW_SB );
- m_scrolledTextSizer->Add( m_sweet_scroll_window, 1, wxALL|wxEXPAND, 5 );
-
- m_scrolledTextWindow->SetSizer( m_scrolledTextSizer );
- m_scrolledTextWindow->Layout();
- m_scrolledTextSizer->Fit( m_scrolledTextWindow );
- m_gal_scrolled_window = new wxScrolledWindow( m_splitter3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxHSCROLL|wxVSCROLL );
- m_gal_scrolled_window->SetScrollRate( 5, 5 );
- wxStaticBoxSizer* m_gal_sizer;
- m_gal_sizer = new wxStaticBoxSizer( new wxStaticBox( m_gal_scrolled_window, wxID_ANY, _("Visual Part") ), wxVERTICAL );
-
- m_gal = new SCH::CANVAS( m_gal_scrolled_window );
- m_gal_sizer->Add( m_gal, 1, wxEXPAND, 5 );
-
- m_gal_scrolled_window->SetSizer( m_gal_sizer );
- m_gal_scrolled_window->Layout();
- m_gal_sizer->Fit( m_gal_scrolled_window );
- m_splitter3->SplitVertically( m_scrolledTextWindow, m_gal_scrolled_window, 0 );
- bSizer10->Add( m_splitter3, 1, wxEXPAND, 5 );
-
- m_panel9->SetSizer( bSizer10 );
- m_panel9->Layout();
- bSizer10->Fit( m_panel9 );
- m_scrolledWindow3 = new wxScrolledWindow( m_top_bottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
- m_scrolledWindow3->SetScrollRate( 5, 5 );
- wxStaticBoxSizer* sbSizer1;
- sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_scrolledWindow3, wxID_ANY, _("Parsing Errors") ), wxVERTICAL );
-
- m_htmlWin2 = new wxHtmlWindow( m_scrolledWindow3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
- sbSizer1->Add( m_htmlWin2, 1, wxALL|wxEXPAND, 5 );
-
- m_scrolledWindow3->SetSizer( sbSizer1 );
- m_scrolledWindow3->Layout();
- sbSizer1->Fit( m_scrolledWindow3 );
- m_top_bottom->SplitHorizontally( m_panel9, m_scrolledWindow3, 0 );
- bSizer2->Add( m_top_bottom, 1, wxEXPAND, 5 );
-
- this->SetSizer( bSizer2 );
- this->Layout();
+ wxBoxSizer* bSizer2;
+ bSizer2 = new wxBoxSizer( wxVERTICAL );
+
+ m_top_bottom = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+ m_top_bottom->SetSashGravity( 1 );
+ m_top_bottom->Connect( wxEVT_IDLE, wxIdleEventHandler( SWEET_EDITOR_PANEL::m_top_bottomOnIdle ), NULL, this );
+
+ m_panel9 = new wxPanel( m_top_bottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+ wxBoxSizer* bSizer10;
+ bSizer10 = new wxBoxSizer( wxVERTICAL );
+
+ m_splitter3 = new wxSplitterWindow( m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+ m_splitter3->Connect( wxEVT_IDLE, wxIdleEventHandler( SWEET_EDITOR_PANEL::m_splitter3OnIdle ), NULL, this );
+
+ m_scrolledTextWindow = new wxScrolledWindow( m_splitter3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+ m_scrolledTextWindow->SetScrollRate( 5, 5 );
+ wxStaticBoxSizer* m_scrolledTextSizer;
+ m_scrolledTextSizer = new wxStaticBoxSizer( new wxStaticBox( m_scrolledTextWindow, wxID_ANY, _("Sweet") ), wxVERTICAL );
+
+ m_sweet_scroll_window = new wxTextCtrl( m_scrolledTextWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxALWAYS_SHOW_SB );
+ m_scrolledTextSizer->Add( m_sweet_scroll_window, 1, wxALL|wxEXPAND, 5 );
+
+ m_scrolledTextWindow->SetSizer( m_scrolledTextSizer );
+ m_scrolledTextWindow->Layout();
+ m_scrolledTextSizer->Fit( m_scrolledTextWindow );
+ m_gal_scrolled_window = new wxScrolledWindow( m_splitter3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxHSCROLL|wxVSCROLL );
+ m_gal_scrolled_window->SetScrollRate( 5, 5 );
+ wxStaticBoxSizer* m_gal_sizer;
+ m_gal_sizer = new wxStaticBoxSizer( new wxStaticBox( m_gal_scrolled_window, wxID_ANY, _("Visual Part") ), wxVERTICAL );
+
+ m_gal = new SCH::CANVAS( m_gal_scrolled_window );
+ m_gal_sizer->Add( m_gal, 1, wxEXPAND, 5 );
+
+ m_gal_scrolled_window->SetSizer( m_gal_sizer );
+ m_gal_scrolled_window->Layout();
+ m_gal_sizer->Fit( m_gal_scrolled_window );
+ m_splitter3->SplitVertically( m_scrolledTextWindow, m_gal_scrolled_window, 0 );
+ bSizer10->Add( m_splitter3, 1, wxEXPAND, 5 );
+
+ m_panel9->SetSizer( bSizer10 );
+ m_panel9->Layout();
+ bSizer10->Fit( m_panel9 );
+ m_scrolledWindow3 = new wxScrolledWindow( m_top_bottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+ m_scrolledWindow3->SetScrollRate( 5, 5 );
+ wxStaticBoxSizer* sbSizer1;
+ sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_scrolledWindow3, wxID_ANY, _("Parsing Errors") ), wxVERTICAL );
+
+ m_htmlWin2 = new wxHtmlWindow( m_scrolledWindow3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+ sbSizer1->Add( m_htmlWin2, 1, wxALL|wxEXPAND, 5 );
+
+ m_scrolledWindow3->SetSizer( sbSizer1 );
+ m_scrolledWindow3->Layout();
+ sbSizer1->Fit( m_scrolledWindow3 );
+ m_top_bottom->SplitHorizontally( m_panel9, m_scrolledWindow3, 0 );
+ bSizer2->Add( m_top_bottom, 1, wxEXPAND, 5 );
+
+ this->SetSizer( bSizer2 );
+ this->Layout();
}
SWEET_EDITOR_PANEL::~SWEET_EDITOR_PANEL()
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index bc63ae3806..f55418c5e3 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -1,11 +1,14 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/bitmaps
- ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
- ${CMAKE_CURRENT_SOURCE_DIR}/transline
- ${CMAKE_CURRENT_SOURCE_DIR}/attenuators
- ../polygon
- ${CMAKE_SOURCE_DIR}/common
- )
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ bitmaps
+ dialogs
+ transline
+ attenuators
+ ../polygon
+ ../common
+ ${INC_AFTER}
+ )
set(PCB_CALCULATOR_SRCS
attenuators.cpp
diff --git a/pcb_calculator/UnitSelector.cpp b/pcb_calculator/UnitSelector.cpp
index e2fffdded3..dca045cab1 100644
--- a/pcb_calculator/UnitSelector.cpp
+++ b/pcb_calculator/UnitSelector.cpp
@@ -3,8 +3,8 @@
* a wxChoiceBox to select units in Pcb_Calculator
*/
-#include "UnitSelector.h"
-#include "units_scales.h"
+#include <UnitSelector.h>
+#include <units_scales.h>
UNIT_SELECTOR_LEN::UNIT_SELECTOR_LEN(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
diff --git a/pcb_calculator/attenuators.cpp b/pcb_calculator/attenuators.cpp
index 512751fca4..18c02cd448 100644
--- a/pcb_calculator/attenuators.cpp
+++ b/pcb_calculator/attenuators.cpp
@@ -25,10 +25,10 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wx/wx.h"
+#include <wx/wx.h>
-#include "pcb_calculator.h"
-#include "attenuator_classes.h"
+#include <pcb_calculator.h>
+#include <attenuator_classes.h>
extern double ReturnDoubleFromString( const wxString& TextValue );
diff --git a/pcb_calculator/attenuators/attenuator_classes.cpp b/pcb_calculator/attenuators/attenuator_classes.cpp
index 32362b0f0c..d3ef1d1a0c 100644
--- a/pcb_calculator/attenuators/attenuator_classes.cpp
+++ b/pcb_calculator/attenuators/attenuator_classes.cpp
@@ -7,17 +7,17 @@
*****************************************************************************/
#include <math.h>
-#include "attenuator_classes.h"
+#include <attenuator_classes.h>
// Bitmaps:
-#include "att_pi.xpm"
-#include "att_tee.xpm"
-#include "att_bridge.xpm"
-#include "att_splitter.xpm"
-#include "pi_formula.xpm"
-#include "tee_formula.xpm"
-#include "bridged_tee_formula.xpm"
-#include "splitter_formula.xpm"
+#include <att_pi.xpm>
+#include <att_tee.xpm>
+#include <att_bridge.xpm>
+#include <att_splitter.xpm>
+#include <pi_formula.xpm>
+#include <tee_formula.xpm>
+#include <bridged_tee_formula.xpm>
+#include <splitter_formula.xpm>
#ifndef NULL
#define NULL 0
diff --git a/pcb_calculator/attenuators/attenuator_classes.h b/pcb_calculator/attenuators/attenuator_classes.h
index 0a2e3f39fe..96e21e7159 100644
--- a/pcb_calculator/attenuators/attenuator_classes.h
+++ b/pcb_calculator/attenuators/attenuator_classes.h
@@ -12,7 +12,7 @@
#ifndef ATTENUATORFUNC_H
#define ATTENUATORFUNC_H
-#include "wx/config.h"
+#include <wx/config.h>
#include <wx/bitmap.h>
enum ATTENUATORS_TYPE {
diff --git a/pcb_calculator/board_classes_values.cpp b/pcb_calculator/board_classes_values.cpp
index 358e802f2e..a0476afa62 100644
--- a/pcb_calculator/board_classes_values.cpp
+++ b/pcb_calculator/board_classes_values.cpp
@@ -26,10 +26,10 @@
#include <wx/config.h>
#include <wx/msgdlg.h>
-#include "pcb_calculator_frame_base.h"
-#include "pcb_calculator.h"
-#include "UnitSelector.h"
-#include "units_scales.h"
+#include <pcb_calculator_frame_base.h>
+#include <pcb_calculator.h>
+#include <UnitSelector.h>
+#include <units_scales.h>
// A helper class to handle min values
// Values are in meters.
diff --git a/pcb_calculator/colorcode.cpp b/pcb_calculator/colorcode.cpp
index 76d3ffcc86..d102461043 100644
--- a/pcb_calculator/colorcode.cpp
+++ b/pcb_calculator/colorcode.cpp
@@ -26,8 +26,8 @@
#include <wx/config.h>
#include <wx/msgdlg.h>
-#include "pcb_calculator_frame_base.h"
-#include "pcb_calculator.h"
+#include <pcb_calculator_frame_base.h>
+#include <pcb_calculator.h>
void PCB_CALCULATOR_FRAME::OnToleranceSelection( wxCommandEvent& event )
{
diff --git a/pcb_calculator/electrical_spacing_values.cpp b/pcb_calculator/electrical_spacing_values.cpp
index 69cc7e38fd..66609d3533 100644
--- a/pcb_calculator/electrical_spacing_values.cpp
+++ b/pcb_calculator/electrical_spacing_values.cpp
@@ -25,10 +25,10 @@
#include <wx/app.h>
#include <wx/config.h>
-#include "pcb_calculator_frame_base.h"
-#include "pcb_calculator.h"
-#include "UnitSelector.h"
-#include "units_scales.h"
+#include <pcb_calculator_frame_base.h>
+#include <pcb_calculator.h>
+#include <UnitSelector.h>
+#include <units_scales.h>
extern double ReturnDoubleFromString( const wxString& TextValue );
diff --git a/pcb_calculator/params_read_write.cpp b/pcb_calculator/params_read_write.cpp
index b179485b4c..b1f787c8ef 100644
--- a/pcb_calculator/params_read_write.cpp
+++ b/pcb_calculator/params_read_write.cpp
@@ -27,9 +27,9 @@
#include <wx/msgdlg.h>
#include <wx/log.h>
-#include "pcb_calculator_frame_base.h"
-#include "pcb_calculator.h"
-#include "transline.h"
+#include <pcb_calculator_frame_base.h>
+#include <pcb_calculator.h>
+#include <transline.h>
/*
* Return the value from a string,
diff --git a/pcb_calculator/pcb_calculator.cpp b/pcb_calculator/pcb_calculator.cpp
index 3595d5fac6..213169c44a 100644
--- a/pcb_calculator/pcb_calculator.cpp
+++ b/pcb_calculator/pcb_calculator.cpp
@@ -21,21 +21,21 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
-#include "wx/wx.h"
-#include "wx/config.h"
+#include <wx/wx.h>
+#include <wx/config.h>
-#include "pcb_calculator_frame_base.h"
-#include "pcb_calculator.h"
+#include <pcb_calculator_frame_base.h>
+#include <pcb_calculator.h>
-#include "bitmaps.h"
-#include "colors_selection.h"
-#include "build_version.h"
+#include <bitmaps.h>
+#include <colors_selection.h>
+#include <build_version.h>
// PCB_CALCULATOR_APP
diff --git a/pcb_calculator/pcb_calculator.h b/pcb_calculator/pcb_calculator.h
index ebf87b418a..523f3795f6 100644
--- a/pcb_calculator/pcb_calculator.h
+++ b/pcb_calculator/pcb_calculator.h
@@ -5,11 +5,11 @@
#ifndef PCB_CALCULATOR_H
#define PCB_CALCULATOR_H
-#include "pcb_calculator_frame_base.h"
+#include <pcb_calculator_frame_base.h>
-#include "transline.h" // Included for SUBST_PRMS_ID definition.
-#include "transline_ident.h"
-#include "attenuator_classes.h"
+#include <transline.h> // Included for SUBST_PRMS_ID definition.
+#include <transline_ident.h>
+#include <attenuator_classes.h>
/* Class PCB_CALCULATOR_FRAME_BASE
This is the main frame for this application
@@ -38,9 +38,9 @@ private:
// Event handlers
// These 3 functions are called by the OnPaint event, to draw
// icons that show the current item on the specific panels
- void OnPaintTranslinePanel( wxPaintEvent& event );
- void OnPaintAttenuatorPanel( wxPaintEvent& event );
- void OnPaintAttFormulaPanel( wxPaintEvent& event );
+ void OnPaintTranslinePanel( wxPaintEvent& event );
+ void OnPaintAttenuatorPanel( wxPaintEvent& event );
+ void OnPaintAttFormulaPanel( wxPaintEvent& event );
// Config read-write
void ReadConfig();
@@ -82,42 +82,42 @@ private:
* Function OnTranslineSelection
* Called on new transmission line selection
*/
- void OnTranslineSelection( wxCommandEvent& event );
+ void OnTranslineSelection( wxCommandEvent& event );
/**
* Function OnTranslineAnalyse
* Run a new analyse for the current transline with current parameters
* and displays the electrical parmeters
*/
- void OnTranslineAnalyse( wxCommandEvent& event );
+ void OnTranslineAnalyse( wxCommandEvent& event );
/**
* Function OnTranslineSynthetize
* Run a new synthezis for the current transline with current parameters
* and displays the geometrical parmeters
*/
- void OnTranslineSynthetize( wxCommandEvent& event );
+ void OnTranslineSynthetize( wxCommandEvent& event );
/**
* Function OnTranslineEpsilonR_Button
* Shows a list of current relative dielectric constant(Er)
* and set the selected value in main dialog frame
*/
- void OnTranslineEpsilonR_Button( wxCommandEvent& event );
+ void OnTranslineEpsilonR_Button( wxCommandEvent& event );
/**
* Function OnTranslineTanD_Button
* Shows a list of current dielectric loss factor (tangent delta)
* and set the selected value in main dialog frame
*/
- void OnTranslineTanD_Button( wxCommandEvent& event );
+ void OnTranslineTanD_Button( wxCommandEvent& event );
/**
* Function OnTranslineRho_Button
* Shows a list of current Specific resistance list (rho)
* and set the selected value in main dialog frame
*/
- void OnTranslineRho_Button( wxCommandEvent& event );
+ void OnTranslineRho_Button( wxCommandEvent& event );
/**
* Function TranslineTypeSelection
@@ -127,7 +127,7 @@ private:
* Irrelevant parameters texts are blanked.
* @param aType = the transline_type_id of the new selected transline
*/
- void TranslineTypeSelection( enum transline_type_id aType );
+ void TranslineTypeSelection( enum transline_type_id aType );
/**
* Function TransfDlgDataToTranslineParams
@@ -149,7 +149,7 @@ private:
void TransfAttenuatorResultsToPanel();
// Regulators Panel
- void OnRegulatorCalcButtonClick( wxCommandEvent& event );
+ void OnRegulatorCalcButtonClick( wxCommandEvent& event );
void RegulatorsSolve();
public:
diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp
index 2e53d12235..ea9c988abe 100644
--- a/pcb_calculator/pcb_calculator_frame.cpp
+++ b/pcb_calculator/pcb_calculator_frame.cpp
@@ -21,13 +21,13 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wx/wx.h"
-#include "wx/config.h"
+#include <wx/wx.h>
+#include <wx/config.h>
-#include "pcb_calculator.h"
-#include "UnitSelector.h"
+#include <pcb_calculator.h>
+#include <UnitSelector.h>
-#include "bitmaps.h"
+#include <bitmaps.h>
#define KEYWORD_FRAME_POSX wxT( "Pcb_calculator_Pos_x" )
diff --git a/pcb_calculator/regulators_funct.cpp b/pcb_calculator/regulators_funct.cpp
index 92c8c685e8..ebf369f7fc 100644
--- a/pcb_calculator/regulators_funct.cpp
+++ b/pcb_calculator/regulators_funct.cpp
@@ -24,10 +24,10 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wx/wx.h"
-#include "wx/config.h"
+#include <wx/wx.h>
+#include <wx/config.h>
-#include "pcb_calculator.h"
+#include <pcb_calculator.h>
extern double ReturnDoubleFromString( const wxString& TextValue );
diff --git a/pcb_calculator/tracks_width_versus_current.cpp b/pcb_calculator/tracks_width_versus_current.cpp
index 400928d66a..331dbac0a0 100644
--- a/pcb_calculator/tracks_width_versus_current.cpp
+++ b/pcb_calculator/tracks_width_versus_current.cpp
@@ -28,14 +28,14 @@
* for more info
*/
-#include "wx/wx.h"
-#include "wx/config.h"
+#include <wx/wx.h>
+#include <wx/config.h>
-#include "pcb_calculator_frame_base.h"
+#include <pcb_calculator_frame_base.h>
-#include "pcb_calculator.h"
-#include "UnitSelector.h"
-#include "units_scales.h"
+#include <pcb_calculator.h>
+#include <UnitSelector.h>
+#include <units_scales.h>
extern double ReturnDoubleFromString( const wxString& TextValue );
diff --git a/pcb_calculator/transline/c_microstrip.cpp b/pcb_calculator/transline/c_microstrip.cpp
index d293b8b036..53af6d519a 100644
--- a/pcb_calculator/transline/c_microstrip.cpp
+++ b/pcb_calculator/transline/c_microstrip.cpp
@@ -31,10 +31,10 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "microstrip.h"
-#include "c_microstrip.h"
+#include <units.h>
+#include <transline.h>
+#include <microstrip.h>
+#include <c_microstrip.h>
C_MICROSTRIP::C_MICROSTRIP() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/coax.cpp b/pcb_calculator/transline/coax.cpp
index d10e1dc544..46caedac6f 100644
--- a/pcb_calculator/transline/coax.cpp
+++ b/pcb_calculator/transline/coax.cpp
@@ -34,9 +34,9 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "coax.h"
+#include <units.h>
+#include <transline.h>
+#include <coax.h>
COAX::COAX() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/coplanar.cpp b/pcb_calculator/transline/coplanar.cpp
index 2630bb591c..c248e59af2 100644
--- a/pcb_calculator/transline/coplanar.cpp
+++ b/pcb_calculator/transline/coplanar.cpp
@@ -28,9 +28,9 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "coplanar.h"
+#include <units.h>
+#include <transline.h>
+#include <coplanar.h>
COPLANAR::COPLANAR() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/microstrip.cpp b/pcb_calculator/transline/microstrip.cpp
index bdd365514a..8ab3cfe05c 100644
--- a/pcb_calculator/transline/microstrip.cpp
+++ b/pcb_calculator/transline/microstrip.cpp
@@ -34,9 +34,9 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "microstrip.h"
+#include <units.h>
+#include <transline.h>
+#include <microstrip.h>
MICROSTRIP::MICROSTRIP() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/rectwaveguide.cpp b/pcb_calculator/transline/rectwaveguide.cpp
index 90c737c9d8..191468c6c6 100644
--- a/pcb_calculator/transline/rectwaveguide.cpp
+++ b/pcb_calculator/transline/rectwaveguide.cpp
@@ -25,9 +25,9 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "rectwaveguide.h"
+#include <units.h>
+#include <transline.h>
+#include <rectwaveguide.h>
RECTWAVEGUIDE::RECTWAVEGUIDE() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/stripline.cpp b/pcb_calculator/transline/stripline.cpp
index f4a145fc51..c2b731289f 100644
--- a/pcb_calculator/transline/stripline.cpp
+++ b/pcb_calculator/transline/stripline.cpp
@@ -27,9 +27,9 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "stripline.h"
+#include <units.h>
+#include <transline.h>
+#include <stripline.h>
STRIPLINE::STRIPLINE() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/transline.cpp b/pcb_calculator/transline/transline.cpp
index 5347af7c81..805e4bf168 100644
--- a/pcb_calculator/transline/transline.cpp
+++ b/pcb_calculator/transline/transline.cpp
@@ -22,8 +22,8 @@
*/
#include <limits>
-#include "transline.h"
-#include "units.h"
+#include <transline.h>
+#include <units.h>
#ifndef INFINITY
#define INFINITY std::numeric_limits<double>::infinity()
@@ -37,7 +37,7 @@
#ifdef _MSC_VER
inline bool isinf(double x)
{
- return x == INFINITY; // return true if x is infinity
+ return x == INFINITY; // return true if x is infinity
}
inline double asinh(double x)
diff --git a/pcb_calculator/transline/twistedpair.cpp b/pcb_calculator/transline/twistedpair.cpp
index 8893252f52..540683afc4 100644
--- a/pcb_calculator/transline/twistedpair.cpp
+++ b/pcb_calculator/transline/twistedpair.cpp
@@ -27,9 +27,9 @@
#include <string.h>
#include <math.h>
-#include "units.h"
-#include "transline.h"
-#include "twistedpair.h"
+#include <units.h>
+#include <transline.h>
+#include <twistedpair.h>
TWISTEDPAIR::TWISTEDPAIR() : TRANSLINE()
{
diff --git a/pcb_calculator/transline/units.h b/pcb_calculator/transline/units.h
index 937b26fdc8..c0759d0adb 100644
--- a/pcb_calculator/transline/units.h
+++ b/pcb_calculator/transline/units.h
@@ -25,7 +25,7 @@
#define __UNITS_H
#include <math.h>
-#include "units_scales.h"
+#include <units_scales.h>
#ifdef __MINGW32__
#define atanh(x) (0.5 * log((1.0 + (x)) / (1.0 - (x))))
diff --git a/pcb_calculator/transline_dlg_funct.cpp b/pcb_calculator/transline_dlg_funct.cpp
index 9d078e1cca..dea6bfde6e 100644
--- a/pcb_calculator/transline_dlg_funct.cpp
+++ b/pcb_calculator/transline_dlg_funct.cpp
@@ -21,14 +21,14 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wx/wx.h"
-#include "wx/config.h"
-#include "wx/filename.h"
+#include <wx/wx.h>
+#include <wx/config.h>
+#include <wx/filename.h>
-#include "pcb_calculator_frame_base.h"
+#include <pcb_calculator_frame_base.h>
-#include "pcb_calculator.h"
-#include "UnitSelector.h"
+#include <pcb_calculator.h>
+#include <UnitSelector.h>
extern double ReturnDoubleFromString( const wxString& TextValue );
diff --git a/pcb_calculator/transline_ident.cpp b/pcb_calculator/transline_ident.cpp
index f2904b23fc..5f03329700 100644
--- a/pcb_calculator/transline_ident.cpp
+++ b/pcb_calculator/transline_ident.cpp
@@ -6,27 +6,27 @@
// Bitmaps:
-#include "c_microstrip.xpm"
-#include "microstrip.xpm"
-#include "twistedpair.xpm"
-#include "coax.xpm"
-#include "cpw.xpm"
-#include "cpw_back.xpm"
-#include "stripline.xpm"
-#include "rectwaveguide.xpm"
+#include <c_microstrip.xpm>
+#include <microstrip.xpm>
+#include <twistedpair.xpm>
+#include <coax.xpm>
+#include <cpw.xpm>
+#include <cpw_back.xpm>
+#include <stripline.xpm>
+#include <rectwaveguide.xpm>
// transline specific functions:
-#include "transline.h"
-#include "microstrip.h"
-#include "coplanar.h"
-#include "rectwaveguide.h"
-#include "coax.h"
-#include "c_microstrip.h"
-#include "stripline.h"
-#include "twistedpair.h"
+#include <transline.h>
+#include <microstrip.h>
+#include <coplanar.h>
+#include <rectwaveguide.h>
+#include <coax.h>
+#include <c_microstrip.h>
+#include <stripline.h>
+#include <twistedpair.h>
-#include "transline_ident.h"
-#include "UnitSelector.h"
+#include <transline_ident.h>
+#include <UnitSelector.h>
/*
diff --git a/pcb_calculator/transline_ident.h b/pcb_calculator/transline_ident.h
index e6a7596923..f434d4ed28 100644
--- a/pcb_calculator/transline_ident.h
+++ b/pcb_calculator/transline_ident.h
@@ -9,7 +9,7 @@
#include <wx/config.h>
#include <wx/bitmap.h>
-#include "transline.h"
+#include <transline.h>
// An enum to handle muwave shapes:
enum transline_type_id {
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 2f33104443..8f5d2d7d21 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -3,12 +3,17 @@ add_definitions(-DPCBNEW)
###
# Includes
###
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
- ${Boost_INCLUDE_DIR}
- ../3d-viewer
- ../common
- ../polygon)
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ./dialogs
+ ../3d-viewer
+ ../common
+ ${Boost_INCLUDE_DIR}
+ ../polygon
+ ../common/dialogs
+ ${INC_AFTER}
+ )
+
###
# Sources
@@ -192,10 +197,11 @@ set(PCBNEW_SRCS
###
# We need some extra sources from common
###
-set(PCBNEW_EXTRA_SRCS
+set(PCBNEW_COMMON_SRCS
../common/dialogs/dialog_page_settings.cpp
)
+
###
# Windows resource file
###
@@ -253,10 +259,10 @@ make_lexer(
# Create the pcbnew executable
###
add_executable(pcbnew WIN32 MACOSX_BUNDLE
- ${PCBNEW_SRCS}
- ${PCBNEW_EXTRA_SRCS}
- ${PCBNEW_RESOURCES}
- )
+ ${PCBNEW_SRCS}
+ ${PCBNEW_COMMON_SRCS}
+ ${PCBNEW_RESOURCES}
+ )
###
# Set properties for APPLE on pcbnew target
@@ -268,17 +274,24 @@ endif(APPLE)
###
# Link executable target pcbnew with correct libraries
###
-target_link_libraries(pcbnew 3d-viewer common pcbcommon polygon bitmaps kbool
- ${OPENGL_LIBRARIES}
- ${wxWidgets_LIBRARIES}
- ${GDI_PLUS_LIBRARIES})
+target_link_libraries(pcbnew
+ 3d-viewer
+ pcbcommon
+ common
+ polygon
+ bitmaps
+ kbool
+ ${OPENGL_LIBRARIES}
+ ${wxWidgets_LIBRARIES}
+ ${GDI_PLUS_LIBRARIES}
+ )
###
# Add pcbnew as install target
###
install(TARGETS pcbnew
- DESTINATION ${KICAD_BIN}
- COMPONENT binary)
+ DESTINATION ${KICAD_BIN}
+ COMPONENT binary)
# The specctra test fails to build properly using MS Visual Studio.
diff --git a/pcbnew/ar_protos.h b/pcbnew/ar_protos.h
index 8e72ba3036..bfee375510 100644
--- a/pcbnew/ar_protos.h
+++ b/pcbnew/ar_protos.h
@@ -7,7 +7,7 @@
#define _AR_PROTOS_H_
-#include "autorout.h"
+#include <autorout.h>
class PCB_EDIT_FRAME;
diff --git a/pcbnew/attribut.cpp b/pcbnew/attribut.cpp
index 2b757c47b3..f51fb6c86a 100644
--- a/pcbnew/attribut.cpp
+++ b/pcbnew/attribut.cpp
@@ -28,16 +28,16 @@
* @brief Track attribute flags editing.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "gr_basic.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <gr_basic.h>
+#include <wxPcbStruct.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "class_track.h"
-#include "class_board.h"
+#include <class_track.h>
+#include <class_board.h>
/* Attribute change for 1 track segment.
diff --git a/pcbnew/automove.cpp b/pcbnew/automove.cpp
index 198efa06de..b8e7a838eb 100644
--- a/pcbnew/automove.cpp
+++ b/pcbnew/automove.cpp
@@ -30,19 +30,19 @@
#include <algorithm>
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "kicad_device_context.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <kicad_device_context.h>
-#include "autorout.h"
-#include "cell.h"
-#include "pcbnew_id.h"
-#include "class_board.h"
-#include "class_module.h"
+#include <autorout.h>
+#include <cell.h>
+#include <pcbnew_id.h>
+#include <class_board.h>
+#include <class_module.h>
typedef enum {
diff --git a/pcbnew/autoplac.cpp b/pcbnew/autoplac.cpp
index 694df6989e..d1732c6160 100644
--- a/pcbnew/autoplac.cpp
+++ b/pcbnew/autoplac.cpp
@@ -28,24 +28,24 @@
* @brief Routiness to automatically place MODULES on a board.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "protos.h"
-#include "ar_protos.h"
-#include "cell.h"
-#include "colors_selection.h"
+#include <protos.h>
+#include <ar_protos.h>
+#include <cell.h>
+#include <colors_selection.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
#define GAIN 16
diff --git a/pcbnew/autorout.cpp b/pcbnew/autorout.cpp
index 730d561c5a..72aa513b71 100644
--- a/pcbnew/autorout.cpp
+++ b/pcbnew/autorout.cpp
@@ -3,19 +3,19 @@
* @brief Autorouting command and control.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <gr_basic.h>
-#include "pcbnew.h"
-#include "cell.h"
-#include "zones.h"
-#include "ar_protos.h"
+#include <pcbnew.h>
+#include <cell.h>
+#include <zones.h>
+#include <ar_protos.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
int E_scale; /* Scaling factor of distance tables. */
diff --git a/pcbnew/autorout.h b/pcbnew/autorout.h
index 45377a9f61..f9fd61bf44 100644
--- a/pcbnew/autorout.h
+++ b/pcbnew/autorout.h
@@ -31,7 +31,7 @@
#define AUTOROUT_H
-#include "base_struct.h"
+#include <base_struct.h>
class BOARD;
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 3351114242..7c616eaa3a 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -31,21 +31,21 @@
#pragma implementation
#endif
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "pcbcommon.h"
-#include "confirm.h"
-#include "appl_wxstruct.h"
-#include "dialog_helpers.h"
-#include "kicad_device_context.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <pcbcommon.h>
+#include <confirm.h>
+#include <appl_wxstruct.h>
+#include <dialog_helpers.h>
+#include <kicad_device_context.h>
+#include <wxBasePcbFrame.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "class_board.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <class_board.h>
-#include "collectors.h"
-#include "class_drawpanel.h"
+#include <collectors.h>
+#include <class_drawpanel.h>
// Configuration entry names.
diff --git a/pcbnew/block.cpp b/pcbnew/block.cpp
index 912b99b67a..f7a8470f9f 100644
--- a/pcbnew/block.cpp
+++ b/pcbnew/block.cpp
@@ -28,27 +28,27 @@
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "block_commande.h"
-#include "pcbcommon.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <block_commande.h>
+#include <pcbcommon.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
-#include "class_mire.h"
-#include "class_module.h"
-#include "class_dimension.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_mire.h>
+#include <class_module.h>
+#include <class_dimension.h>
+#include <class_zone.h>
-#include "dialog_block_options_base.h"
+#include <dialog_block_options_base.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
#define BLOCK_OUTLINE_COLOR YELLOW
diff --git a/pcbnew/block_module_editor.cpp b/pcbnew/block_module_editor.cpp
index 5dbcd3d012..375336cac6 100644
--- a/pcbnew/block_module_editor.cpp
+++ b/pcbnew/block_module_editor.cpp
@@ -28,30 +28,30 @@
* @brief Footprint editor block handling implementation.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "block_commande.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <block_commande.h>
+#include <macros.h>
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
-#include "pcbplot.h"
-#include "trigo.h"
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
+#include <pcbplot.h>
+#include <trigo.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
-#include "class_mire.h"
-#include "class_module.h"
-#include "class_dimension.h"
-#include "class_edge_mod.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_mire.h>
+#include <class_module.h>
+#include <class_dimension.h>
+#include <class_edge_mod.h>
#define BLOCK_COLOR BROWN
diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 499f161170..34647529fe 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -28,20 +28,20 @@
* @brief Functions for autorouting
*/
-#include "fctsys.h"
-#include "common.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <common.h>
+#include <pcbcommon.h>
-#include "pcbnew.h"
-#include "cell.h"
-#include "ar_protos.h"
+#include <pcbnew.h>
+#include <cell.h>
+#include <ar_protos.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
-#include "class_edge_mod.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
+#include <class_edge_mod.h>
+#include <class_pcb_text.h>
bool MATRIX_ROUTING_HEAD::ComputeMatrixSize( BOARD* aPcb )
diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp
index b90a1f6cc1..5086373428 100644
--- a/pcbnew/board_items_to_polygon_shape_transform.cpp
+++ b/pcbnew/board_items_to_polygon_shape_transform.cpp
@@ -7,16 +7,16 @@
*/
#include <vector>
-#include "fctsys.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <macros.h>
-#include "class_pad.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
+#include <class_pad.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
/* Exported functions */
diff --git a/pcbnew/board_undo_redo.cpp b/pcbnew/board_undo_redo.cpp
index e5e184ab67..5c923504cb 100644
--- a/pcbnew/board_undo_redo.cpp
+++ b/pcbnew/board_undo_redo.cpp
@@ -2,21 +2,21 @@
/* board editor: undo and redo functions for board editor */
/*************************************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <macros.h>
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
-#include "class_mire.h"
-#include "class_module.h"
-#include "class_dimension.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_mire.h>
+#include <class_module.h>
+#include <class_dimension.h>
+#include <class_zone.h>
/* Functions to undo and redo edit commands.
diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp
index 55617410f5..fe6660c426 100644
--- a/pcbnew/build_BOM_from_board.cpp
+++ b/pcbnew/build_BOM_from_board.cpp
@@ -1,16 +1,16 @@
/* build_BOM_from_board.cpp */
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
#include <wx/listimpl.cpp>
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 0cfb900ba5..aff1d0bbb2 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -6,20 +6,20 @@
#include <limits.h>
#include <algorithm>
-#include "fctsys.h"
-#include "common.h"
-#include "pcbcommon.h"
-#include "wxBasePcbFrame.h"
-#include "build_version.h" // BOARD_FILE_VERSION
+#include <fctsys.h>
+#include <common.h>
+#include <pcbcommon.h>
+#include <wxBasePcbFrame.h>
+#include <build_version.h> // BOARD_FILE_VERSION
-#include "pcbnew.h"
-#include "colors_selection.h"
+#include <pcbnew.h>
+#include <colors_selection.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
-#include "class_marker_pcb.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
+#include <class_marker_pcb.h>
/* This is an odd place for this, but CvPcb won't link if it is
diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h
index 2666dcc4ef..2a38114752 100644
--- a/pcbnew/class_board.h
+++ b/pcbnew/class_board.h
@@ -7,15 +7,15 @@
#define CLASS_BOARD_H
-#include "dlist.h"
+#include <dlist.h>
-#include "layers_id_colors_and_visibility.h"
-#include "class_netinfo.h"
-#include "class_pad.h"
-#include "class_colors_design_settings.h"
-#include "class_board_design_settings.h"
-#include "common.h" // PAGE_INFO
-#include "class_title_block.h"
+#include <layers_id_colors_and_visibility.h>
+#include <class_netinfo.h>
+#include <class_pad.h>
+#include <class_colors_design_settings.h>
+#include <class_board_design_settings.h>
+#include <common.h> // PAGE_INFO
+#include <class_title_block.h>
class PCB_BASE_FRAME;
class PCB_EDIT_FRAME;
diff --git a/pcbnew/class_board_connected_item.cpp b/pcbnew/class_board_connected_item.cpp
index 27bd379263..b48776d9f3 100644
--- a/pcbnew/class_board_connected_item.cpp
+++ b/pcbnew/class_board_connected_item.cpp
@@ -3,11 +3,11 @@
* @brief BOARD_CONNECTED_ITEM class functions.
*/
-#include "fctsys.h"
-#include "pcbnew.h"
+#include <fctsys.h>
+#include <pcbnew.h>
-#include "class_board.h"
-#include "class_board_item.h"
+#include <class_board.h>
+#include <class_board_item.h>
BOARD_CONNECTED_ITEM::BOARD_CONNECTED_ITEM( BOARD_ITEM* aParent, KICAD_T idtype ) :
diff --git a/pcbnew/class_board_connected_item.h b/pcbnew/class_board_connected_item.h
index 6828e2cf9a..52d8281ee6 100644
--- a/pcbnew/class_board_connected_item.h
+++ b/pcbnew/class_board_connected_item.h
@@ -7,7 +7,7 @@
#define BOARD_CONNECTED_ITEM_H
-#include "class_board_item.h"
+#include <class_board_item.h>
class NETCLASS;
class TRACK;
diff --git a/pcbnew/class_board_design_settings.cpp b/pcbnew/class_board_design_settings.cpp
index 8f96069cc8..8ec99f8df2 100644
--- a/pcbnew/class_board_design_settings.cpp
+++ b/pcbnew/class_board_design_settings.cpp
@@ -3,14 +3,14 @@
* BOARD_DESIGN_SETTINGS class functions.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "layers_id_colors_and_visibility.h"
+#include <fctsys.h>
+#include <common.h>
+#include <layers_id_colors_and_visibility.h>
-#include "pcbnew.h"
-#include "class_board_design_settings.h"
+#include <pcbnew.h>
+#include <class_board_design_settings.h>
-#include "class_track.h"
+#include <class_track.h>
BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS()
diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp
index 94e1d05843..790a52f252 100644
--- a/pcbnew/class_board_item.cpp
+++ b/pcbnew/class_board_item.cpp
@@ -3,11 +3,11 @@
* @brief Class BOARD_ITEM definition and some basic functions.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "pcbnew.h"
+#include <fctsys.h>
+#include <common.h>
+#include <pcbnew.h>
-#include "class_board.h"
+#include <class_board.h>
wxString BOARD_ITEM::ShowShape( STROKE_T aShape )
diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp
index 067111db8a..ecd342cb11 100644
--- a/pcbnew/class_dimension.cpp
+++ b/pcbnew/class_dimension.cpp
@@ -27,21 +27,21 @@
* @file class_dimension.cpp
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "gr_basic.h"
-#include "pcbcommon.h"
-#include "trigo.h"
-#include "wxstruct.h"
-#include "class_drawpanel.h"
-#include "colors_selection.h"
-#include "kicad_string.h"
-#include "protos.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <gr_basic.h>
+#include <pcbcommon.h>
+#include <trigo.h>
+#include <wxstruct.h>
+#include <class_drawpanel.h>
+#include <colors_selection.h>
+#include <kicad_string.h>
+#include <protos.h>
+#include <richio.h>
-#include "class_board.h"
-#include "class_pcb_text.h"
-#include "class_dimension.h"
+#include <class_board.h>
+#include <class_pcb_text.h>
+#include <class_dimension.h>
DIMENSION::DIMENSION( BOARD_ITEM* aParent ) :
diff --git a/pcbnew/class_dimension.h b/pcbnew/class_dimension.h
index c09f00c398..11e2c63dd3 100644
--- a/pcbnew/class_dimension.h
+++ b/pcbnew/class_dimension.h
@@ -32,7 +32,7 @@
#define DIMENSION_H_
-#include "class_board_item.h"
+#include <class_board_item.h>
class LINE_READER;
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index 9a6ea027f0..7959322247 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -28,24 +28,24 @@
* @brief Class and functions to handle a graphic segments.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "wxstruct.h"
-#include "gr_basic.h"
-#include "bezier_curves.h"
-#include "class_drawpanel.h"
-#include "kicad_string.h"
-#include "colors_selection.h"
-#include "trigo.h"
-#include "richio.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <wxstruct.h>
+#include <gr_basic.h>
+#include <bezier_curves.h>
+#include <class_drawpanel.h>
+#include <kicad_string.h>
+#include <colors_selection.h>
+#include <trigo.h>
+#include <richio.h>
+#include <pcbcommon.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_drawsegment.h>
DRAWSEGMENT::DRAWSEGMENT( BOARD_ITEM* aParent, KICAD_T idtype ) :
diff --git a/pcbnew/class_drawsegment.h b/pcbnew/class_drawsegment.h
index 1650315871..3a2ed0ce63 100644
--- a/pcbnew/class_drawsegment.h
+++ b/pcbnew/class_drawsegment.h
@@ -32,8 +32,8 @@
#define CLASS_DRAWSEGMENT_H_
-#include "class_board_item.h"
-#include "PolyLine.h"
+#include <class_board_item.h>
+#include <PolyLine.h>
class LINE_READER;
diff --git a/pcbnew/class_drc_item.cpp b/pcbnew/class_drc_item.cpp
index 6f883c2190..92924300a7 100644
--- a/pcbnew/class_drc_item.cpp
+++ b/pcbnew/class_drc_item.cpp
@@ -26,12 +26,12 @@
/*************************************************/
/* class_drc_item.cpp - DRC_ITEM class functions */
/*************************************************/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "pcbnew.h"
-#include "drc_stuff.h"
-#include "class_drc_item.h"
+#include <pcbnew.h>
+#include <drc_stuff.h>
+#include <class_drc_item.h>
wxString DRC_ITEM::GetErrorText() const
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index b1e0989b8c..2455224d34 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -28,22 +28,22 @@
* @brief EDGE_MODULE class definition.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wxstruct.h"
-#include "trigo.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "colors_selection.h"
-#include "richio.h"
-#include "macros.h"
-#include "wxBasePcbFrame.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wxstruct.h>
+#include <trigo.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <colors_selection.h>
+#include <richio.h>
+#include <macros.h>
+#include <wxBasePcbFrame.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
EDGE_MODULE::EDGE_MODULE( MODULE* parent, STROKE_T aShape ) :
diff --git a/pcbnew/class_edge_mod.h b/pcbnew/class_edge_mod.h
index 323f0f4842..dba11ce197 100644
--- a/pcbnew/class_edge_mod.h
+++ b/pcbnew/class_edge_mod.h
@@ -32,7 +32,7 @@
#define CLASS_EDGE_MOD_H_
-#include "class_drawsegment.h"
+#include <class_drawsegment.h>
class LINE_READER;
diff --git a/pcbnew/class_footprint_library.cpp b/pcbnew/class_footprint_library.cpp
index 79641ae113..34178561b4 100644
--- a/pcbnew/class_footprint_library.cpp
+++ b/pcbnew/class_footprint_library.cpp
@@ -3,16 +3,16 @@
* Helper class to read/write footprint libraries.
*/
-#include "fctsys.h"
-#include "kicad_string.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "macros.h"
-#include "pcbstruct.h"
+#include <fctsys.h>
+#include <kicad_string.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <macros.h>
+#include <pcbstruct.h>
-#include "class_footprint_library.h"
+#include <class_footprint_library.h>
/*
* Module library header format:
diff --git a/pcbnew/class_footprint_library.h b/pcbnew/class_footprint_library.h
index 2e08c2de28..c834f53e90 100644
--- a/pcbnew/class_footprint_library.h
+++ b/pcbnew/class_footprint_library.h
@@ -4,7 +4,7 @@
#ifndef _FOOTPRINT_LIBRARY_H_
#define _FOOTPRINT_LIBRARY_H_
-#include "filter_reader.h"
+#include <filter_reader.h>
class FOOTPRINT_LIBRARY
{
diff --git a/pcbnew/class_marker_pcb.cpp b/pcbnew/class_marker_pcb.cpp
index 2d3371769a..35b1138d40 100644
--- a/pcbnew/class_marker_pcb.cpp
+++ b/pcbnew/class_marker_pcb.cpp
@@ -4,14 +4,14 @@
/* file class_marker.cpp */
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "wxstruct.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <wxstruct.h>
+#include <trigo.h>
-#include "pcbnew.h"
-#include "class_marker_pcb.h"
+#include <pcbnew.h>
+#include <class_marker_pcb.h>
#define SCALING_FACTOR 30 // Adjust the actual size of markers, when using default shape
diff --git a/pcbnew/class_marker_pcb.h b/pcbnew/class_marker_pcb.h
index 2dc9584051..c7fb48bb9b 100644
--- a/pcbnew/class_marker_pcb.h
+++ b/pcbnew/class_marker_pcb.h
@@ -7,8 +7,8 @@
#define CLASS_MARKER_PCB_H
-#include "class_board_item.h"
-#include "class_marker_base.h"
+#include <class_board_item.h>
+#include <class_marker_base.h>
class MARKER_PCB : public BOARD_ITEM, public MARKER_BASE
diff --git a/pcbnew/class_mire.cpp b/pcbnew/class_mire.cpp
index a70b98ab39..3a2765c7eb 100644
--- a/pcbnew/class_mire.cpp
+++ b/pcbnew/class_mire.cpp
@@ -28,20 +28,20 @@
* MIRE class definition (targets for photo plots)
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "kicad_string.h"
-#include "pcbcommon.h"
-#include "colors_selection.h"
-#include "trigo.h"
-#include "macros.h"
-#include "protos.h"
-#include "richio.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <kicad_string.h>
+#include <pcbcommon.h>
+#include <colors_selection.h>
+#include <trigo.h>
+#include <macros.h>
+#include <protos.h>
+#include <richio.h>
-#include "class_board.h"
-#include "class_mire.h"
+#include <class_board.h>
+#include <class_mire.h>
PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent ) :
diff --git a/pcbnew/class_mire.h b/pcbnew/class_mire.h
index eeef9c59d8..77f1d06d52 100644
--- a/pcbnew/class_mire.h
+++ b/pcbnew/class_mire.h
@@ -32,7 +32,7 @@
#define MIRE_H
-#include "class_board_item.h"
+#include <class_board_item.h>
class EDA_RECT;
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 45056c045c..3db494eae7 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -28,28 +28,28 @@
* @brief MODULE class implementation.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wxstruct.h"
-#include "plot_common.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "pcbcommon.h"
-#include "pcbnew.h"
-#include "colors_selection.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "macros.h"
-#include "3d_struct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wxstruct.h>
+#include <plot_common.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <pcbcommon.h>
+#include <pcbnew.h>
+#include <colors_selection.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <macros.h>
+#include <3d_struct.h>
-#include "drag.h"
+#include <drag.h>
-#include "protos.h"
-#include "class_board.h"
-#include "class_edge_mod.h"
-#include "class_module.h"
+#include <protos.h>
+#include <class_board.h>
+#include <class_edge_mod.h>
+#include <class_module.h>
MODULE::MODULE( BOARD* parent ) :
diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h
index fc69655f20..68379b7a15 100644
--- a/pcbnew/class_module.h
+++ b/pcbnew/class_module.h
@@ -33,11 +33,11 @@
#define _MODULE_H_
-#include "dlist.h"
-#include "layers_id_colors_and_visibility.h" // ALL_LAYERS definition.
-#include "class_board_item.h"
+#include <dlist.h>
+#include <layers_id_colors_and_visibility.h> // ALL_LAYERS definition.
+#include <class_board_item.h>
-#include "class_text_mod.h"
+#include <class_text_mod.h>
class LINE_READER;
diff --git a/pcbnew/class_module_transform_functions.cpp b/pcbnew/class_module_transform_functions.cpp
index 2eefe9d945..15bd7e95f0 100644
--- a/pcbnew/class_module_transform_functions.cpp
+++ b/pcbnew/class_module_transform_functions.cpp
@@ -3,17 +3,17 @@
* @brief Functions of class MODULE to handle some geometric changes such as move, rotate ...
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "trigo.h"
-#include "pcbcommon.h"
-#include "pcbnew.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <trigo.h>
+#include <pcbcommon.h>
+#include <pcbnew.h>
+#include <macros.h>
-#include "protos.h"
-#include "class_pad.h"
-#include "class_edge_mod.h"
-#include "class_module.h"
+#include <protos.h>
+#include <class_pad.h>
+#include <class_edge_mod.h>
+#include <class_module.h>
/* Calculate the layer number for changing cu / cmp layers for Cu / CMP
diff --git a/pcbnew/class_netclass.cpp b/pcbnew/class_netclass.cpp
index 213137d188..11fb4ec79f 100644
--- a/pcbnew/class_netclass.cpp
+++ b/pcbnew/class_netclass.cpp
@@ -24,15 +24,15 @@
*/
-#include "fctsys.h"
-#include "common.h"
-#include "kicad_string.h"
-#include "pcbnew.h"
-#include "richio.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <kicad_string.h>
+#include <pcbnew.h>
+#include <richio.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_netclass.h"
+#include <class_board.h>
+#include <class_netclass.h>
// This will get mapped to "kicad_default" in the specctra_export.
diff --git a/pcbnew/class_netinfo.h b/pcbnew/class_netinfo.h
index ac4c7ba0fa..9df1b27c04 100644
--- a/pcbnew/class_netinfo.h
+++ b/pcbnew/class_netinfo.h
@@ -12,7 +12,7 @@
#include <vector>
-#include "class_netclass.h"
+#include <class_netclass.h>
class wxDC;
diff --git a/pcbnew/class_netinfo_item.cpp b/pcbnew/class_netinfo_item.cpp
index c2057cd80b..8018dec411 100644
--- a/pcbnew/class_netinfo_item.cpp
+++ b/pcbnew/class_netinfo_item.cpp
@@ -2,20 +2,20 @@
/* NETINFO_ITEM class, to handle info on nets (netnames, net constraints */
/*************************************************************************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "wxBasePcbFrame.h"
-#include "common.h"
-#include "kicad_string.h"
-#include "pcbnew.h"
-#include "colors_selection.h"
-#include "richio.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <wxBasePcbFrame.h>
+#include <common.h>
+#include <kicad_string.h>
+#include <pcbnew.h>
+#include <colors_selection.h>
+#include <richio.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
/*********************************************************/
diff --git a/pcbnew/class_netinfolist.cpp b/pcbnew/class_netinfolist.cpp
index d4a9f47362..077fb35e48 100644
--- a/pcbnew/class_netinfolist.cpp
+++ b/pcbnew/class_netinfolist.cpp
@@ -2,16 +2,16 @@
* @file class_netinfolist.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_netinfo.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_netinfo.h>
// Constructor and destructor
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 955986cdeb..55897315dd 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -27,21 +27,21 @@
* D_PAD class implementation.
*/
-#include "fctsys.h"
-#include "PolyLine.h"
-#include "common.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "trigo.h"
-#include "richio.h"
-#include "wxstruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <PolyLine.h>
+#include <common.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <trigo.h>
+#include <richio.h>
+#include <wxstruct.h>
+#include <macros.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h" // ID_TRACK_BUTT
+#include <pcbnew.h>
+#include <pcbnew_id.h> // ID_TRACK_BUTT
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
int D_PAD::m_PadSketchModePenSize = 0; // Pen size used to draw pads in sketch mode
diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h
index f48f9a3315..3f5bf79486 100644
--- a/pcbnew/class_pad.h
+++ b/pcbnew/class_pad.h
@@ -31,10 +31,10 @@
#define _PAD_H_
-#include "class_board_item.h"
-#include "class_board_connected_item.h"
-#include "pad_shapes.h"
-#include "PolyLine.h"
+#include <class_board_item.h>
+#include <class_board_connected_item.h>
+#include <pad_shapes.h>
+#include <PolyLine.h>
class LINE_READER;
diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp
index d830a8cebb..3140318386 100644
--- a/pcbnew/class_pad_draw_functions.cpp
+++ b/pcbnew/class_pad_draw_functions.cpp
@@ -27,23 +27,23 @@
* @file class_pad_draw_functions.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "trigo.h"
-#include "class_pcb_screen.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "layers_id_colors_and_visibility.h"
-#include "wxBasePcbFrame.h"
-#include "pcbcommon.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <trigo.h>
+#include <class_pcb_screen.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <layers_id_colors_and_visibility.h>
+#include <wxBasePcbFrame.h>
+#include <pcbcommon.h>
+#include <macros.h>
-#include "pcbnew_id.h" // ID_TRACK_BUTT
-#include "pcbnew.h"
-#include "colors_selection.h"
+#include <pcbnew_id.h> // ID_TRACK_BUTT
+#include <pcbnew.h>
+#include <colors_selection.h>
-#include "class_board.h"
+#include <class_board.h>
/* uncomment this line to show this pad with its specfic size and color
diff --git a/pcbnew/class_pcb_layer_widget.cpp b/pcbnew/class_pcb_layer_widget.cpp
index 6012712d05..c02ae6af2f 100644
--- a/pcbnew/class_pcb_layer_widget.cpp
+++ b/pcbnew/class_pcb_layer_widget.cpp
@@ -28,22 +28,22 @@
/* class_pcb_layer_widget.cpp - Pcbnew layers manager */
/******************************************************/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "pcbstruct.h" // enum PCB_VISIBLE
-#include "layer_widget.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <pcbstruct.h> // enum PCB_VISIBLE
+#include <layer_widget.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_pcb_layer_widget.h"
+#include <class_board.h>
+#include <class_pcb_layer_widget.h>
-#include "pcbnew.h"
-#include "collectors.h"
-#include "pcbnew_id.h"
+#include <pcbnew.h>
+#include <collectors.h>
+#include <pcbnew_id.h>
/**
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index 8b30a73ce0..a04288aa7d 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -27,23 +27,23 @@
* @brief Class TEXTE_PCB texts on copper or technical layers implementation
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "gr_basic.h"
-#include "base_struct.h"
-#include "drawtxt.h"
-#include "kicad_string.h"
-#include "trigo.h"
-#include "pcbcommon.h"
-#include "colors_selection.h"
-#include "richio.h"
-#include "class_drawpanel.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <gr_basic.h>
+#include <base_struct.h>
+#include <drawtxt.h>
+#include <kicad_string.h>
+#include <trigo.h>
+#include <pcbcommon.h>
+#include <colors_selection.h>
+#include <richio.h>
+#include <class_drawpanel.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_pcb_text.h>
-#include "protos.h"
+#include <protos.h>
TEXTE_PCB::TEXTE_PCB( BOARD_ITEM* parent ) :
diff --git a/pcbnew/class_pcb_text.h b/pcbnew/class_pcb_text.h
index 0deee11fe9..b85d78534e 100644
--- a/pcbnew/class_pcb_text.h
+++ b/pcbnew/class_pcb_text.h
@@ -30,8 +30,8 @@
#ifndef CLASS_PCB_TEXT_H
#define CLASS_PCB_TEXT_H
-#include "class_board_item.h"
-#include "PolyLine.h"
+#include <class_board_item.h>
+#include <PolyLine.h>
class LINE_READER;
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 2496d06c68..0bbb52f615 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -27,23 +27,23 @@
* @brief TEXT_MODULE class implementation.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wxstruct.h"
-#include "trigo.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "kicad_string.h"
-#include "pcbcommon.h"
-#include "colors_selection.h"
-#include "richio.h"
-#include "macros.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wxstruct.h>
+#include <trigo.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <kicad_string.h>
+#include <pcbcommon.h>
+#include <colors_selection.h>
+#include <richio.h>
+#include <macros.h>
+#include <wxBasePcbFrame.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
TEXTE_MODULE::TEXTE_MODULE( MODULE* parent, int text_type ) :
diff --git a/pcbnew/class_text_mod.h b/pcbnew/class_text_mod.h
index 6330995336..ecafe079c0 100644
--- a/pcbnew/class_text_mod.h
+++ b/pcbnew/class_text_mod.h
@@ -32,7 +32,7 @@
#define TEXT_MODULE_H_
-#include "class_board_item.h"
+#include <class_board_item.h>
class LINE_READER;
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index ca69f7d674..1365d0e98c 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -28,24 +28,24 @@
* @brief Functions relatives to tracks, vias and segments used to fill zones.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "trigo.h"
-#include "class_drawpanel.h"
-#include "class_pcb_screen.h"
-#include "drawtxt.h"
-#include "pcbcommon.h"
-#include "colors_selection.h"
-#include "wxstruct.h"
-#include "macros.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <trigo.h>
+#include <class_drawpanel.h>
+#include <class_pcb_screen.h>
+#include <drawtxt.h>
+#include <pcbcommon.h>
+#include <colors_selection.h>
+#include <wxstruct.h>
+#include <macros.h>
+#include <wxBasePcbFrame.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
/**
* Function ShowClearance
diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h
index 06232be805..78526604e2 100644
--- a/pcbnew/class_track.h
+++ b/pcbnew/class_track.h
@@ -31,9 +31,9 @@
#define CLASS_TRACK_H
-#include "class_board_item.h"
-#include "class_board_connected_item.h"
-#include "PolyLine.h"
+#include <class_board_item.h>
+#include <class_board_connected_item.h>
+#include <PolyLine.h>
class TRACK;
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index 2ad7178fae..aefcd198cc 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -28,24 +28,24 @@
* @brief Implementation of class to handle copper zones.
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "trigo.h"
-#include "class_pcb_screen.h"
-#include "class_drawpanel.h"
-#include "kicad_string.h"
-#include "pcbcommon.h"
-#include "colors_selection.h"
-#include "richio.h"
-#include "macros.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <trigo.h>
+#include <class_pcb_screen.h>
+#include <class_drawpanel.h>
+#include <kicad_string.h>
+#include <pcbcommon.h>
+#include <colors_selection.h>
+#include <richio.h>
+#include <macros.h>
+#include <wxBasePcbFrame.h>
-#include "protos.h"
-#include "class_board.h"
-#include "class_zone.h"
+#include <protos.h>
+#include <class_board.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
ZONE_CONTAINER::ZONE_CONTAINER( BOARD* parent ) :
diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h
index bdb09ba72d..643e7354c4 100644
--- a/pcbnew/class_zone.h
+++ b/pcbnew/class_zone.h
@@ -32,12 +32,12 @@
#include <vector>
-#include "gr_basic.h"
-#include "class_board_item.h"
-#include "class_board_connected_item.h"
-#include "layers_id_colors_and_visibility.h"
-#include "PolyLine.h"
-#include "class_zone_setting.h"
+#include <gr_basic.h>
+#include <class_board_item.h>
+#include <class_board_connected_item.h>
+#include <layers_id_colors_and_visibility.h>
+#include <PolyLine.h>
+#include <class_zone_setting.h>
class EDA_RECT;
diff --git a/pcbnew/class_zone_setting.cpp b/pcbnew/class_zone_setting.cpp
index 6d6ac21583..a5e59f18a0 100644
--- a/pcbnew/class_zone_setting.cpp
+++ b/pcbnew/class_zone_setting.cpp
@@ -3,24 +3,24 @@
/******************************************************/
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+#include <wx/wx.h>
#endif
/* For compilers that support precompilation:
*/
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
#ifdef __BORLANDC__
#pragma hdrstop
#endif
-#include "fctsys.h"
+#include <fctsys.h>
-#include "common.h"
-#include "pcbnew.h"
-#include "zones.h"
+#include <common.h>
+#include <pcbnew.h>
+#include <zones.h>
-#include "class_zone.h"
+#include <class_zone.h>
ZONE_SETTING::ZONE_SETTING( void )
{
diff --git a/pcbnew/classpcb.cpp b/pcbnew/classpcb.cpp
index 5eb153f1ce..1d7c95cf95 100644
--- a/pcbnew/classpcb.cpp
+++ b/pcbnew/classpcb.cpp
@@ -4,16 +4,16 @@
* except for tracks (see class_track.cpp).
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
-#include "trigo.h"
-#include "class_pcb_screen.h"
-#include "pcbnew.h"
-#include "class_board_design_settings.h"
-#include "layers_id_colors_and_visibility.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
+#include <trigo.h>
+#include <class_pcb_screen.h>
+#include <pcbnew.h>
+#include <class_board_design_settings.h>
+#include <layers_id_colors_and_visibility.h>
-#include "pcbnew_id.h"
+#include <pcbnew_id.h>
/* Default Pcbnew zoom values.
diff --git a/pcbnew/clean.cpp b/pcbnew/clean.cpp
index 4bfb80e46a..320b5448fa 100644
--- a/pcbnew/clean.cpp
+++ b/pcbnew/clean.cpp
@@ -29,13 +29,13 @@
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "pcbcommon.h"
-#include "wxPcbStruct.h"
-#include "pcbnew.h"
-#include "class_board.h"
-#include "class_track.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <pcbcommon.h>
+#include <wxPcbStruct.h>
+#include <pcbnew.h>
+#include <class_board.h>
+#include <class_track.h>
/* local functions : */
static void clean_segments( PCB_EDIT_FRAME* aFrame );
@@ -47,7 +47,7 @@ static void CleanupTracks( PCB_EDIT_FRAME* aFrame,
bool aCleanVias, bool aMergeSegments,
bool aDeleteUnconnectedSegm, bool aConnectToPads );
-#include "dialog_cleaning_options.h"
+#include <dialog_cleaning_options.h>
#define CONN2PAD_ENBL
diff --git a/pcbnew/collectors.cpp b/pcbnew/collectors.cpp
index 7614be6223..51a7335296 100644
--- a/pcbnew/collectors.cpp
+++ b/pcbnew/collectors.cpp
@@ -22,11 +22,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "collectors.h"
-#include "class_board_item.h" // class BOARD_ITEM
+#include <collectors.h>
+#include <class_board_item.h> // class BOARD_ITEM
-#include "class_module.h"
-#include "class_pad.h"
+#include <class_module.h>
+#include <class_pad.h>
/* This module contains out of line member functions for classes given in
diff --git a/pcbnew/collectors.h b/pcbnew/collectors.h
index 9c06c021ea..cd1f25dcfa 100644
--- a/pcbnew/collectors.h
+++ b/pcbnew/collectors.h
@@ -35,8 +35,8 @@
*/
-#include "class_collector.h"
-#include "layers_id_colors_and_visibility.h" // LAYER_COUNT, layer defs
+#include <class_collector.h>
+#include <layers_id_colors_and_visibility.h> // LAYER_COUNT, layer defs
class BOARD_ITEM;
diff --git a/pcbnew/connect.cpp b/pcbnew/connect.cpp
index 578ac541c5..fae504eb4e 100644
--- a/pcbnew/connect.cpp
+++ b/pcbnew/connect.cpp
@@ -27,16 +27,16 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "common.h"
-#include "pcbcommon.h"
-#include "macros.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <common.h>
+#include <pcbcommon.h>
+#include <macros.h>
+#include <wxBasePcbFrame.h>
-#include "class_track.h"
-#include "class_board.h"
+#include <class_track.h>
+#include <class_board.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
extern void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb );
diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp
index 041482351b..945b10587c 100644
--- a/pcbnew/controle.cpp
+++ b/pcbnew/controle.cpp
@@ -27,20 +27,20 @@
* @file pcbnew/controle.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h>
+#include <macros.h>
-#include "pcbnew_id.h"
+#include <pcbnew_id.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "collectors.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <collectors.h>
//external functions used here:
extern bool Magnetize( BOARD* m_Pcb, PCB_EDIT_FRAME* frame,
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index feb065ea6b..927cb3534f 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -10,19 +10,19 @@
* Note: these ports must be enabled for firewall protection
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "wxPcbStruct.h"
-#include "eda_dde.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <wxPcbStruct.h>
+#include <eda_dde.h>
+#include <macros.h>
-#include "pcbnew_id.h"
-#include "class_board.h"
-#include "class_module.h"
+#include <pcbnew_id.h>
+#include <class_board.h>
+#include <class_module.h>
-#include "collectors.h"
-#include "pcbnew.h"
-#include "protos.h"
+#include <collectors.h>
+#include <pcbnew.h>
+#include <protos.h>
/**
diff --git a/pcbnew/deltrack.cpp b/pcbnew/deltrack.cpp
index 50524adaf1..c177a9787c 100644
--- a/pcbnew/deltrack.cpp
+++ b/pcbnew/deltrack.cpp
@@ -27,18 +27,18 @@
* @file deltrack.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
TRACK* PCB_EDIT_FRAME::Delete_Segment( wxDC* DC, TRACK* aTrack )
diff --git a/pcbnew/dialogs/dialog_SVG_print.cpp b/pcbnew/dialogs/dialog_SVG_print.cpp
index 0e4dd1eabf..a9d444fd60 100644
--- a/pcbnew/dialogs/dialog_SVG_print.cpp
+++ b/pcbnew/dialogs/dialog_SVG_print.cpp
@@ -5,29 +5,29 @@
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "dcsvg.h"
-#include "wxBasePcbFrame.h"
-#include "class_pcb_screen.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <dcsvg.h>
+#include <wxBasePcbFrame.h>
+#include <class_pcb_screen.h>
+#include <macros.h>
-#include "pcbnew.h"
-#include "pcbplot.h"
-#include "printout_controler.h"
+#include <pcbnew.h>
+#include <pcbplot.h>
+#include <printout_controler.h>
-#include "class_board.h"
-#include "class_edge_mod.h"
-#include "class_mire.h"
-#include "class_pcb_text.h"
-#include "class_dimension.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_edge_mod.h>
+#include <class_mire.h>
+#include <class_pcb_text.h>
+#include <class_dimension.h>
+#include <class_zone.h>
-#include "dialog_SVG_print.h"
+#include <dialog_SVG_print.h>
// Keys for configuration
diff --git a/pcbnew/dialogs/dialog_SVG_print.h b/pcbnew/dialogs/dialog_SVG_print.h
index f417a0ad3f..8eec0fb1af 100644
--- a/pcbnew/dialogs/dialog_SVG_print.h
+++ b/pcbnew/dialogs/dialog_SVG_print.h
@@ -3,7 +3,7 @@
#define _DIALOG_SVG_PRINT_H_
-#include "dialog_SVG_print_base.h"
+#include <dialog_SVG_print_base.h>
class BASE_SCREEN;
diff --git a/pcbnew/dialogs/dialog_cleaning_options.cpp b/pcbnew/dialogs/dialog_cleaning_options.cpp
index 4b00c611b5..2f745caf17 100644
--- a/pcbnew/dialogs/dialog_cleaning_options.cpp
+++ b/pcbnew/dialogs/dialog_cleaning_options.cpp
@@ -3,9 +3,9 @@
// Author: jean-pierre Charras
/////////////////////////////////////////////////////////////////////////////
-#include "wx/wx.h"
+#include <wx/wx.h>
-#include "dialog_cleaning_options.h"
+#include <dialog_cleaning_options.h>
DIALOG_CLEANING_OPTIONS::DIALOG_CLEANING_OPTIONS( wxWindow* parent ):
diff --git a/pcbnew/dialogs/dialog_cleaning_options.h b/pcbnew/dialogs/dialog_cleaning_options.h
index 642268fd10..14dcf0efa2 100644
--- a/pcbnew/dialogs/dialog_cleaning_options.h
+++ b/pcbnew/dialogs/dialog_cleaning_options.h
@@ -6,7 +6,7 @@
#ifndef DIALOG_CLEANING_OPTIONS_H_
#define DIALOG_CLEANING_OPTIONS_H_
-#include "dialog_cleaning_options_base.h"
+#include <dialog_cleaning_options_base.h>
class DIALOG_CLEANING_OPTIONS: public DIALOG_CLEANING_OPTIONS_BASE
{
@@ -14,7 +14,7 @@ public:
static bool cleanVias;
static bool mergeSegments;
static bool deleteUnconnectedSegm;
- static bool connectToPads;
+ static bool connectToPads;
public:
DIALOG_CLEANING_OPTIONS( wxWindow* parent );
@@ -24,17 +24,17 @@ public:
}
private:
- void OnCancelClick( wxCommandEvent& event )
+ void OnCancelClick( wxCommandEvent& event )
{
EndModal( wxID_CANCEL );
}
- void OnOKClick( wxCommandEvent& event )
+ void OnOKClick( wxCommandEvent& event )
{
GetOpts( );
EndModal( wxID_OK );
}
- void OnCloseWindow( wxCloseEvent& event )
+ void OnCloseWindow( wxCloseEvent& event )
{
GetOpts( );
}
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index 700daeff7e..682d0da3fb 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -7,18 +7,18 @@
#include <wx/wx.h>
#include <wx/imaglist.h>
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "PolyLine.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "zones.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <PolyLine.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <zones.h>
-#include "dialog_copper_zones.h"
-#include "class_zone_setting.h"
-#include "class_board.h"
+#include <dialog_copper_zones.h>
+#include <class_zone_setting.h>
+#include <class_board.h>
#define LAYER_BITMAP_SIZE_X 20
diff --git a/pcbnew/dialogs/dialog_copper_zones.h b/pcbnew/dialogs/dialog_copper_zones.h
index c2c55b1bb9..3a9cbbb170 100644
--- a/pcbnew/dialogs/dialog_copper_zones.h
+++ b/pcbnew/dialogs/dialog_copper_zones.h
@@ -5,7 +5,7 @@
#include <wx/wx.h>
#include <wx/listctrl.h>
-#include "dialog_copper_zones_base.h"
+#include <dialog_copper_zones_base.h>
/**
* Class DIALOG_COPPER_ZONE
diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp
index f1100ee942..cd5b6ba2f2 100644
--- a/pcbnew/dialogs/dialog_design_rules.cpp
+++ b/pcbnew/dialogs/dialog_design_rules.cpp
@@ -30,21 +30,21 @@
/* functions relatives to the design rules editor
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <macros.h>
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
-#include "pcbnew_id.h"
-#include "class_track.h"
+#include <pcbnew_id.h>
+#include <class_track.h>
-#include "dialog_design_rules.h"
-#include "wx/generic/gridctrl.h"
-#include "dialog_design_rules_aux_helper_class.h"
+#include <dialog_design_rules.h>
+#include <wx/generic/gridctrl.h>
+#include <dialog_design_rules_aux_helper_class.h>
// Column labels for net lists
diff --git a/pcbnew/dialogs/dialog_design_rules.h b/pcbnew/dialogs/dialog_design_rules.h
index f997f27c06..b26dc4ec80 100644
--- a/pcbnew/dialogs/dialog_design_rules.h
+++ b/pcbnew/dialogs/dialog_design_rules.h
@@ -5,9 +5,9 @@
#ifndef __dialog_design_rules_h_
#define __dialog_design_rules_h_
-#include "../class_board.h"
+#include <../class_board.h>
-#include "dialog_design_rules_base.h"
+#include <dialog_design_rules_base.h>
class PCB_EDIT_FRAME;
diff --git a/pcbnew/dialogs/dialog_display_options.cpp b/pcbnew/dialogs/dialog_display_options.cpp
index e08c611da6..90891d7bcc 100644
--- a/pcbnew/dialogs/dialog_display_options.cpp
+++ b/pcbnew/dialogs/dialog_display_options.cpp
@@ -5,18 +5,18 @@
/* functions relatives to the dialog opened from the main menu :
Prefernces/display
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "pcbstruct.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <pcbstruct.h>
+#include <pcbcommon.h>
-#include "pcbnew_id.h"
+#include <pcbnew_id.h>
-#include "dialog_display_options.h"
-#include "dialog_display_options_base.h"
+#include <dialog_display_options.h>
+#include <dialog_display_options_base.h>
void PCB_EDIT_FRAME::InstallDisplayOptionsDialog( wxCommandEvent& aEvent )
diff --git a/pcbnew/dialogs/dialog_display_options.h b/pcbnew/dialogs/dialog_display_options.h
index 06952d90be..0b47715dc2 100644
--- a/pcbnew/dialogs/dialog_display_options.h
+++ b/pcbnew/dialogs/dialog_display_options.h
@@ -1,7 +1,7 @@
/**
* @file pcbnew/dialogs/dialog_display_options.h
*/
-#include "dialog_display_options_base.h"
+#include <dialog_display_options_base.h>
class DIALOG_DISPLAY_OPTIONS : public DIALOG_DISPLAY_OPTIONS_BASE
{
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index e375a49747..9c646fb400 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -26,10 +26,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "dialog_drc.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
+#include <fctsys.h>
+#include <dialog_drc.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
// dialog should remember its previous screen position and size
diff --git a/pcbnew/dialogs/dialog_drc.h b/pcbnew/dialogs/dialog_drc.h
index a219f80644..4ab241c59a 100644
--- a/pcbnew/dialogs/dialog_drc.h
+++ b/pcbnew/dialogs/dialog_drc.h
@@ -9,15 +9,15 @@
#include <wx/htmllbox.h>
-#include "fctsys.h"
-#include "pcbnew.h"
-#include "class_drawpanel.h"
-#include "wxstruct.h"
-#include "drc_stuff.h"
-#include "class_marker_pcb.h"
-#include "class_board.h"
+#include <fctsys.h>
+#include <pcbnew.h>
+#include <class_drawpanel.h>
+#include <wxstruct.h>
+#include <drc_stuff.h>
+#include <class_marker_pcb.h>
+#include <class_board.h>
-#include "dialog_drc_base.h"
+#include <dialog_drc_base.h>
// forward declarations
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
index f79d18209b..e9eacef6a6 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
@@ -2,21 +2,21 @@
* Module editor: Dialog box for editing module properties in the pcb editor. *
******************************************************************************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "appl_wxstruct.h"
-#include "gestfich.h"
-#include "3d_struct.h"
-#include "3d_viewer.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <appl_wxstruct.h>
+#include <gestfich.h>
+#include <3d_struct.h>
+#include <3d_viewer.h>
+#include <wxPcbStruct.h>
-#include "class_module.h"
-#include "class_text_mod.h"
+#include <class_module.h>
+#include <class_text_mod.h>
-#include "dialog_edit_module_for_BoardEditor.h"
+#include <dialog_edit_module_for_BoardEditor.h>
DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent,
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h
index 18a598b362..4c5a8ca1ee 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h
@@ -3,7 +3,7 @@
/* properties and carateristics */
/************************************************/
-#include "dialog_edit_module_for_BoardEditor_base.h"
+#include <dialog_edit_module_for_BoardEditor_base.h>
/**************************************/
/* class DIALOG_MODULE_BOARD_EDITOR */
@@ -38,7 +38,7 @@ private:
void OnEditValue( wxCommandEvent& event );
void OnEditReference( wxCommandEvent& event );
void On3DShapeSelection( wxCommandEvent& event );
- void On3DShapeNameSelected( wxCommandEvent& event );
+ void On3DShapeNameSelected( wxCommandEvent& event );
void Browse3DLib( wxCommandEvent& event );
void Add3DShape( wxCommandEvent& event );
void Remove3DShape( wxCommandEvent& event );
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
index 555e840c5c..2fe3315735 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
@@ -2,20 +2,20 @@
/* Dialog box for editing module properties and carateristics in module editor (modedit)*/
/*******************************************************************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "appl_wxstruct.h"
-#include "gestfich.h"
-#include "3d_struct.h"
-#include "3d_viewer.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <appl_wxstruct.h>
+#include <gestfich.h>
+#include <3d_struct.h>
+#include <3d_viewer.h>
+#include <wxPcbStruct.h>
-#include "class_module.h"
-#include "class_text_mod.h"
-#include "module_editor_frame.h"
-#include "dialog_edit_module_for_Modedit.h"
+#include <class_module.h>
+#include <class_text_mod.h>
+#include <module_editor_frame.h>
+#include <dialog_edit_module_for_Modedit.h>
DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME* aParent,
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h
index b8a1b48ca6..31fa97545f 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.h
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h
@@ -7,7 +7,7 @@
// Include the wxFormBuider header base:
#include <vector>
-#include "dialog_edit_module_for_Modedit_base.h"
+#include <dialog_edit_module_for_Modedit_base.h>
/**************************************/
/* class DIALOG_MODULE_MODULE_EDITOR */
@@ -40,7 +40,7 @@ private:
void OnEditValue( wxCommandEvent& event );
void OnEditReference( wxCommandEvent& event );
void On3DShapeSelection( wxCommandEvent& event );
- void On3DShapeNameSelected( wxCommandEvent& event );
+ void On3DShapeNameSelected( wxCommandEvent& event );
void BrowseAndAdd3DLib( wxCommandEvent& event );
void Remove3DShape( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp
index 46255339db..e6a7526036 100644
--- a/pcbnew/dialogs/dialog_edit_module_text.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_text.cpp
@@ -5,20 +5,20 @@
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "macros.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "pcbnew.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <pcbnew.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <wxBasePcbFrame.h>
-#include "class_module.h"
-#include "class_text_mod.h"
+#include <class_module.h>
+#include <class_text_mod.h>
-#include "dialog_edit_module_text_base.h"
+#include <dialog_edit_module_text_base.h>
extern wxPoint MoveVector; // Move vector for move edge, imported from edtxtmod.cpp
diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
index 72936ab88e..5e1c1a8dff 100644
--- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp
+++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
@@ -2,17 +2,17 @@
// Name: dialog_freeroute.cpp
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
-#include "../common/dialogs/dialog_display_info_HTML_base.h"
+#include <../common/dialogs/dialog_display_info_HTML_base.h>
-#include "dialog_freeroute_exchange.h"
+#include <dialog_freeroute_exchange.h>
#define FREEROUTE_URL_KEY wxT( "freeroute_url" )
@@ -63,7 +63,7 @@ void DIALOG_FREEROUTE::MyInit()
}
const char * s_FreeRouteHelpInfo =
-#include "dialog_freeroute_exchange_help_html.h"
+#include <dialog_freeroute_exchange_help_html.h>
;
void DIALOG_FREEROUTE::OnHelpButtonClick( wxCommandEvent& event )
{
diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.h b/pcbnew/dialogs/dialog_freeroute_exchange.h
index 451275b42e..0f1e6f97ff 100644
--- a/pcbnew/dialogs/dialog_freeroute_exchange.h
+++ b/pcbnew/dialogs/dialog_freeroute_exchange.h
@@ -6,7 +6,7 @@
#ifndef _DIALOG_FREEROUTE_EXCHANGE_H_
#define _DIALOG_FREEROUTE_EXCHANGE_H_
-#include "dialog_freeroute_exchange_base.h"
+#include <dialog_freeroute_exchange_base.h>
///////////////////////////////////////////////////////////////////////////////
// Class DIALOG_FREEROUTE derived from wxFormBuilder class DIALOG_FREEROUTE_BASE
@@ -19,14 +19,14 @@ private:
private:
// Virtual event handlers
- void OnOKButtonClick( wxCommandEvent& event );
+ void OnOKButtonClick( wxCommandEvent& event );
void OnExportButtonClick( wxCommandEvent& event );
void OnLaunchButtonClick( wxCommandEvent& event );
void OnImportButtonClick( wxCommandEvent& event );
void OnVisitButtonClick( wxCommandEvent& event );
void OnHelpButtonClick( wxCommandEvent& event );
- void OnCancelButtonClick( wxCommandEvent& event );
- void OnTextEditFrUrlUpdated( wxCommandEvent& event );
+ void OnCancelButtonClick( wxCommandEvent& event );
+ void OnTextEditFrUrlUpdated( wxCommandEvent& event );
void MyInit ( );
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 15f3b65fd9..4dadb576c7 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -26,18 +26,18 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "pcbplot.h"
-#include "gendrill.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <pcbplot.h>
+#include <gendrill.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_module.h>
-#include "dialog_gendrill.h"
+#include <dialog_gendrill.h>
// Keywords for read and write config
diff --git a/pcbnew/dialogs/dialog_gendrill.h b/pcbnew/dialogs/dialog_gendrill.h
index f48c116709..1b3c611b80 100644
--- a/pcbnew/dialogs/dialog_gendrill.h
+++ b/pcbnew/dialogs/dialog_gendrill.h
@@ -29,7 +29,7 @@
#ifndef _DIALOG_GENDRILL_H_
#define _DIALOG_GENDRILL_H_
-#include "dialog_gendrill_base.h"
+#include <dialog_gendrill_base.h>
class DIALOG_GENDRILL : public DIALOG_GENDRILL_BASE
{
diff --git a/pcbnew/dialogs/dialog_general_options.cpp b/pcbnew/dialogs/dialog_general_options.cpp
index 3ec86912b8..02e9aa532b 100644
--- a/pcbnew/dialogs/dialog_general_options.cpp
+++ b/pcbnew/dialogs/dialog_general_options.cpp
@@ -30,18 +30,18 @@
* Preferences/general
* Preferences/display
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
+#include <pcbcommon.h>
-#include "pcbnew_id.h"
-#include "class_board.h"
+#include <pcbnew_id.h>
+#include <class_board.h>
-#include "dialog_general_options.h"
+#include <dialog_general_options.h>
Dialog_GeneralOptions::Dialog_GeneralOptions( PCB_EDIT_FRAME* parent ) :
diff --git a/pcbnew/dialogs/dialog_general_options.h b/pcbnew/dialogs/dialog_general_options.h
index 4639d4a1af..04d6d939a3 100644
--- a/pcbnew/dialogs/dialog_general_options.h
+++ b/pcbnew/dialogs/dialog_general_options.h
@@ -1,7 +1,7 @@
#ifndef __dialog_general_options_h
#define __dialog_general_options_h
-#include "dialog_general_options_BoardEditor_base.h"
+#include <dialog_general_options_BoardEditor_base.h>
class Dialog_GeneralOptions : public DialogGeneralOptionsBoardEditor_base
{
diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp
index 1906a578fd..76c043f701 100644
--- a/pcbnew/dialogs/dialog_global_deletion.cpp
+++ b/pcbnew/dialogs/dialog_global_deletion.cpp
@@ -3,19 +3,19 @@
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "dialog_global_deletion.h"
+#include <dialog_global_deletion.h>
DIALOG_GLOBAL_DELETION::DIALOG_GLOBAL_DELETION( PCB_EDIT_FRAME* parent )
diff --git a/pcbnew/dialogs/dialog_global_deletion.h b/pcbnew/dialogs/dialog_global_deletion.h
index f6c1a85187..ea7e313d5f 100644
--- a/pcbnew/dialogs/dialog_global_deletion.h
+++ b/pcbnew/dialogs/dialog_global_deletion.h
@@ -5,12 +5,12 @@
#ifndef _DIALOG_GLOBAL_DELETION_H_
#define _DIALOG_GLOBAL_DELETION_H_
-#include "dialog_global_deletion_base.h"
+#include <dialog_global_deletion_base.h>
class DIALOG_GLOBAL_DELETION: public DIALOG_GLOBAL_DELETION_BASE
{
private:
- PCB_EDIT_FRAME * m_Parent;
+ PCB_EDIT_FRAME * m_Parent;
public:
DIALOG_GLOBAL_DELETION( PCB_EDIT_FRAME* parent );
@@ -26,7 +26,7 @@ private:
EndModal(wxID_CANCEL);
}
- void AcceptPcbDelete();
+ void AcceptPcbDelete();
};
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
index 6ee9556fa3..dfeb05fc6d 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
@@ -5,15 +5,15 @@
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "class_drawpanel.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <class_drawpanel.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "dialog_global_edit_tracks_and_vias.h"
+#include <dialog_global_edit_tracks_and_vias.h>
/**
@@ -134,7 +134,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit()
for( int jj = 0; jj < m_gridDisplayCurrentSettings->GetNumberCols(); jj++ )
m_gridDisplayCurrentSettings->SetReadOnly( ii, jj, true );
}
-
+
// needs wxWidgets version >= 2.8.8:
m_gridDisplayCurrentSettings->SetRowLabelSize(wxGRID_AUTOSIZE);
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h
index 2183f90a74..6114239879 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.h
@@ -25,7 +25,7 @@
#ifndef __dialog_global_edit_tracks_and_vias__
#define __dialog_global_edit_tracks_and_vias__
-#include "dialog_global_edit_tracks_and_vias_base.h"
+#include <dialog_global_edit_tracks_and_vias_base.h>
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS
@@ -43,7 +43,7 @@ public:
~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS() {};
// Virtual event handlers, overided here
- void OnSelectionClick( wxCommandEvent& event ){ m_OptionID = event.GetId(); }
+ void OnSelectionClick( wxCommandEvent& event ){ m_OptionID = event.GetId(); }
void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
void MyInit();
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 0ac42a8555..913a8116a4 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -10,19 +10,19 @@
* items on edge layers are considered as graphic items
* Pcb texts are not always graphic items and are not handled here
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "gr_basic.h"
-#include "confirm.h"
-#include "class_drawpanel.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <gr_basic.h>
+#include <confirm.h>
+#include <class_drawpanel.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
-#include "class_board.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_drawsegment.h>
-#include "dialog_graphic_item_properties_base.h"
+#include <dialog_graphic_item_properties_base.h>
///////////////////////////////////////////////////////////////////////////
diff --git a/pcbnew/dialogs/dialog_graphic_items_options.cpp b/pcbnew/dialogs/dialog_graphic_items_options.cpp
index 29afff83bb..a75cdf185b 100644
--- a/pcbnew/dialogs/dialog_graphic_items_options.cpp
+++ b/pcbnew/dialogs/dialog_graphic_items_options.cpp
@@ -3,16 +3,16 @@
/************************************/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
-#include "pcbnew_id.h"
-#include "module_editor_frame.h"
-#include "class_board.h"
+#include <pcbnew_id.h>
+#include <module_editor_frame.h>
+#include <class_board.h>
-#include "dialog_graphic_items_options.h"
+#include <dialog_graphic_items_options.h>
extern int g_DrawDefaultLineThickness;
diff --git a/pcbnew/dialogs/dialog_graphic_items_options.h b/pcbnew/dialogs/dialog_graphic_items_options.h
index 45f06ea77c..e6df745bbc 100644
--- a/pcbnew/dialogs/dialog_graphic_items_options.h
+++ b/pcbnew/dialogs/dialog_graphic_items_options.h
@@ -29,7 +29,7 @@
#ifndef _DIALOG_GRAPHIC_ITEMS_OPTIONS_H_
#define _DIALOG_GRAPHIC_ITEMS_OPTIONS_H_
-#include "dialog_graphic_items_options_base.h"
+#include <dialog_graphic_items_options_base.h>
/*!
* DIALOG_GRAPHIC_ITEMS_OPTIONS class declaration
diff --git a/pcbnew/dialogs/dialog_layers_setup.cpp b/pcbnew/dialogs/dialog_layers_setup.cpp
index 7bd85a5dc8..c31b8f39fc 100644
--- a/pcbnew/dialogs/dialog_layers_setup.cpp
+++ b/pcbnew/dialogs/dialog_layers_setup.cpp
@@ -24,17 +24,17 @@
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <macros.h>
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "dialog_layers_setup_base.h"
+#include <dialog_layers_setup_base.h>
// some define to choose how copper layers widgets are shown
diff --git a/pcbnew/dialogs/dialog_mask_clearance.cpp b/pcbnew/dialogs/dialog_mask_clearance.cpp
index 8a6dbf49b8..3c7a76a6a8 100644
--- a/pcbnew/dialogs/dialog_mask_clearance.cpp
+++ b/pcbnew/dialogs/dialog_mask_clearance.cpp
@@ -6,15 +6,15 @@
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "dialog_mask_clearance.h"
+#include <dialog_mask_clearance.h>
/**
* DIALOG_PADS_MASK_CLEARANCE_BASE, derived from DIALOG_PADS_MASK_CLEARANCE_BASE_BASE
diff --git a/pcbnew/dialogs/dialog_mask_clearance.h b/pcbnew/dialogs/dialog_mask_clearance.h
index b5614c3bae..51d4ef49d6 100644
--- a/pcbnew/dialogs/dialog_mask_clearance.h
+++ b/pcbnew/dialogs/dialog_mask_clearance.h
@@ -9,7 +9,7 @@
#ifndef _DIALOG_MASK_CLEARANCE_H_
#define _DIALOG_MASK_CLEARANCE_H_
-#include "dialog_mask_clearance_base.h"
+#include <dialog_mask_clearance_base.h>
/**
* DIALOG_PADS_MASK_CLEARANCE, derived from DIALOG_PADS_MASK_CLEARANCE_BASE
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index 39b7223e1f..c3914f3723 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -4,18 +4,18 @@
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "pcbnew_config.h"
-#include "class_board_design_settings.h"
+#include <pcbnew_config.h>
+#include <class_board_design_settings.h>
-#include "dialog_netlist.h"
+#include <dialog_netlist.h>
void PCB_EDIT_FRAME::InstallNetlistFrame( wxDC* DC )
{
diff --git a/pcbnew/dialogs/dialog_netlist.h b/pcbnew/dialogs/dialog_netlist.h
index 3535e8c539..d227c32a7a 100644
--- a/pcbnew/dialogs/dialog_netlist.h
+++ b/pcbnew/dialogs/dialog_netlist.h
@@ -9,28 +9,28 @@
#ifndef _DIALOG_NETLIST_H_
#define _DIALOG_NETLIST_H_
-#include "dialog_netlist_fbp.h"
+#include <dialog_netlist_fbp.h>
class DIALOG_NETLIST : public DIALOG_NETLIST_FBP
{
- private:
+ private:
PCB_EDIT_FRAME * m_Parent;
wxDC * m_DC;
- public:
- DIALOG_NETLIST( PCB_EDIT_FRAME* aParent, wxDC * aDC,
+ public:
+ DIALOG_NETLIST( PCB_EDIT_FRAME* aParent, wxDC * aDC,
const wxString & aNetlistFull_Filename );
- ~DIALOG_NETLIST() {};
+ ~DIALOG_NETLIST() {};
void Init();
- // Virtual event handlers, overide them in your derived class
- void OnOpenNelistClick( wxCommandEvent& event );
- void OnReadNetlistFileClick( wxCommandEvent& event );
- void OnTestFootprintsClick( wxCommandEvent& event );
- void OnCompileRatsnestClick( wxCommandEvent& event );
- void OnCancelClick( wxCommandEvent& event );
+ // Virtual event handlers, overide them in your derived class
+ void OnOpenNelistClick( wxCommandEvent& event );
+ void OnReadNetlistFileClick( wxCommandEvent& event );
+ void OnTestFootprintsClick( wxCommandEvent& event );
+ void OnCompileRatsnestClick( wxCommandEvent& event );
+ void OnCancelClick( wxCommandEvent& event );
};
diff --git a/pcbnew/dialogs/dialog_orient_footprints.cpp b/pcbnew/dialogs/dialog_orient_footprints.cpp
index 2fd7346d3e..2df11a67c4 100644
--- a/pcbnew/dialogs/dialog_orient_footprints.cpp
+++ b/pcbnew/dialogs/dialog_orient_footprints.cpp
@@ -26,18 +26,18 @@
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "dialog_orient_footprints_base.h"
+#include <dialog_orient_footprints_base.h>
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index aa92ef8bfc..50d9c3f871 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -3,23 +3,23 @@
/* see also dialog_pad_properties.xxx (built with wxFormBuilder) */
/*******************************************************************/
-#include "fctsys.h"
-#include "common.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "trigo.h"
-#include "macros.h"
-#include "wxBasePcbFrame.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <common.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <trigo.h>
+#include <macros.h>
+#include <wxBasePcbFrame.h>
+#include <pcbcommon.h>
#include <wx/dcbuffer.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "dialog_pad_properties_base.h"
+#include <dialog_pad_properties_base.h>
#define NBSHAPES 4
diff --git a/pcbnew/dialogs/dialog_pcb_text_properties.cpp b/pcbnew/dialogs/dialog_pcb_text_properties.cpp
index 1056f0baea..ae70e82fae 100644
--- a/pcbnew/dialogs/dialog_pcb_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_pcb_text_properties.cpp
@@ -26,19 +26,19 @@
/* Dialog editor for text on copper and technical layers (TEXTE_PCB class) */
/***************************************************************************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "dialog_helpers.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <dialog_helpers.h>
-#include "class_board.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_pcb_text.h>
-#include "dialog_pcb_text_properties.h"
+#include <dialog_pcb_text_properties.h>
/**
diff --git a/pcbnew/dialogs/dialog_pcb_text_properties.h b/pcbnew/dialogs/dialog_pcb_text_properties.h
index 16593616e5..236454ca92 100644
--- a/pcbnew/dialogs/dialog_pcb_text_properties.h
+++ b/pcbnew/dialogs/dialog_pcb_text_properties.h
@@ -3,7 +3,7 @@
#include <vector>
#include <wx/wx.h>
-#include "dialog_pcb_text_properties_base.h"
+#include <dialog_pcb_text_properties_base.h>
class PCB_EDIT_FRAME;
class TEXTE_PCB;
diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
index b733dd2fae..965026e885 100644
--- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
+++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
@@ -8,17 +8,17 @@
/* Handle the Pcbnew library config (library list, and default lib path)
*/
-#include "fctsys.h"
+#include <fctsys.h>
#include <wx/tokenzr.h>
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "pcbnew.h"
-#include "macros.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h"
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <pcbnew.h>
+#include <macros.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h>
-#include "dialog_pcbnew_config_libs_and_paths.h"
+#include <dialog_pcbnew_config_libs_and_paths.h>
void PCB_EDIT_FRAME::InstallConfigFrame( )
diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.h b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.h
index 620c5f97c8..b90f78c0ba 100644
--- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.h
+++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.h
@@ -7,7 +7,7 @@
#ifndef _DIALOG_PCBNEW_CONFIG_LIBS_H_
#define _DIALOG_PCBNEW_CONFIG_LIBS_H_
-#include "dialog_pcbnew_config_libs_and_paths_fbp.h"
+#include <dialog_pcbnew_config_libs_and_paths_fbp.h>
class DIALOG_PCBNEW_CONFIG_LIBS : public DIALOG_PCBNEW_CONFIG_LIBS_FBP
{
@@ -26,12 +26,12 @@ private:
void OnRemoveLibClick( wxCommandEvent& event );
void OnAddOrInsertLibClick( wxCommandEvent& event );
void OnAddOrInsertPath( wxCommandEvent& event );
- void OnOkClick( wxCommandEvent& event );
- void OnCancelClick( wxCommandEvent& event );
+ void OnOkClick( wxCommandEvent& event );
+ void OnCancelClick( wxCommandEvent& event );
void OnRemoveUserPath( wxCommandEvent& event );
- void OnBrowseModDocFile( wxCommandEvent& event );
- void OnButtonUpClick( wxCommandEvent& event );
- void OnButtonDownClick( wxCommandEvent& event );
+ void OnBrowseModDocFile( wxCommandEvent& event );
+ void OnButtonUpClick( wxCommandEvent& event );
+ void OnButtonDownClick( wxCommandEvent& event );
public:
diff --git a/pcbnew/dialogs/dialog_print_for_modedit.cpp b/pcbnew/dialogs/dialog_print_for_modedit.cpp
index 6269bb1c43..77039d70e7 100644
--- a/pcbnew/dialogs/dialog_print_for_modedit.cpp
+++ b/pcbnew/dialogs/dialog_print_for_modedit.cpp
@@ -5,17 +5,17 @@
// Set this to 1 if you want to test PostScript printing under MSW.
#define wxTEST_POSTSCRIPT_IN_MSW 1
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
-#include "pcbplot.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
+#include <pcbplot.h>
-#include "dialog_print_for_modedit_base.h"
-#include "printout_controler.h"
+#include <dialog_print_for_modedit_base.h>
+#include <printout_controler.h>
#define WIDTH_MAX_VALUE 1000
#define WIDTH_MIN_VALUE 1
diff --git a/pcbnew/dialogs/dialog_print_using_printer.cpp b/pcbnew/dialogs/dialog_print_using_printer.cpp
index c77ba1c488..10fa3d12a6 100644
--- a/pcbnew/dialogs/dialog_print_using_printer.cpp
+++ b/pcbnew/dialogs/dialog_print_using_printer.cpp
@@ -5,19 +5,19 @@
// Set this to 1 if you want to test PostScript printing under MSW.
#define wxTEST_POSTSCRIPT_IN_MSW 1
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "printout_controler.h"
-#include "pcbnew.h"
-#include "pcbplot.h"
+#include <printout_controler.h>
+#include <pcbnew.h>
+#include <pcbplot.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "dialog_print_using_printer_base.h"
+#include <dialog_print_using_printer_base.h>
#define WIDTH_MAX_VALUE 1000
diff --git a/pcbnew/dimension.cpp b/pcbnew/dimension.cpp
index 3fe508dd5f..07dd09c1bb 100644
--- a/pcbnew/dimension.cpp
+++ b/pcbnew/dimension.cpp
@@ -3,21 +3,21 @@
* @brief Dialog and code for editing a dimension object.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "drawtxt.h"
-#include "dialog_helpers.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <drawtxt.h>
+#include <dialog_helpers.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_pcb_text.h"
-#include "class_dimension.h"
+#include <class_board.h>
+#include <class_pcb_text.h>
+#include <class_dimension.h>
-#include "pcbnew.h"
-#include "dialog_dimension_editor_base.h"
+#include <pcbnew.h>
+#include <dialog_dimension_editor_base.h>
/* Local functions */
static void BuildDimension( EDA_DRAW_PANEL* aPanel, wxDC* aDC,
diff --git a/pcbnew/dist.cpp b/pcbnew/dist.cpp
index 28cceeb924..e5359d5842 100644
--- a/pcbnew/dist.cpp
+++ b/pcbnew/dist.cpp
@@ -3,12 +3,12 @@
* @brief Routines to calculate PCB editor auto routing distances.
*/
-#include "fctsys.h"
-#include "macros.h"
-#include "common.h"
-#include "pcbnew.h"
-#include "autorout.h"
-#include "cell.h"
+#include <fctsys.h>
+#include <macros.h>
+#include <common.h>
+#include <pcbnew.h>
+#include <autorout.h>
+#include <cell.h>
/* The tables of distances and keep out areas are established on the basis of not
diff --git a/pcbnew/drag.h b/pcbnew/drag.h
index b241d91498..0cff7d2a74 100644
--- a/pcbnew/drag.h
+++ b/pcbnew/drag.h
@@ -6,7 +6,7 @@
#include <vector>
#include <wx/gdicmn.h>
-#include "class_track.h"
+#include <class_track.h>
class wxDC;
diff --git a/pcbnew/dragsegm.cpp b/pcbnew/dragsegm.cpp
index 61d2d912a5..15c28bb74f 100644
--- a/pcbnew/dragsegm.cpp
+++ b/pcbnew/dragsegm.cpp
@@ -4,17 +4,17 @@
/* Fichier dragsegm.cpp */
-#include "fctsys.h"
-#include "common.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <common.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <wxBasePcbFrame.h>
-#include "drag.h"
-#include "pcbnew.h"
+#include <drag.h>
+#include <pcbnew.h>
-#include "class_module.h"
-#include "class_board.h"
+#include <class_module.h>
+#include <class_board.h>
/* a list of DRAG_SEGM items used to move or drag tracks */
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 3c17c76976..5eb835b18e 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -28,21 +28,21 @@
/* DRC control */
/****************************/
-#include "fctsys.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "class_board_design_settings.h"
+#include <fctsys.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <class_board_design_settings.h>
-#include "class_module.h"
-#include "class_track.h"
-#include "class_pad.h"
-#include "class_zone.h"
+#include <class_module.h>
+#include <class_track.h>
+#include <class_pad.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "drc_stuff.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <drc_stuff.h>
-#include "dialog_drc.h"
+#include <dialog_drc.h>
void DRC::ShowDialog()
diff --git a/pcbnew/drc_clearance_test_functions.cpp b/pcbnew/drc_clearance_test_functions.cpp
index 94b65914ef..2a3a0964af 100644
--- a/pcbnew/drc_clearance_test_functions.cpp
+++ b/pcbnew/drc_clearance_test_functions.cpp
@@ -31,19 +31,19 @@
/* DRC control */
/****************************/
-#include "fctsys.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "drc_stuff.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <drc_stuff.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
-#include "class_marker_pcb.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
+#include <class_marker_pcb.h>
/* compare 2 trapezoids (can be rectangle) and return true if distance > aDist
diff --git a/pcbnew/drc_marker_functions.cpp b/pcbnew/drc_marker_functions.cpp
index 1b7de24e30..ecaeb78419 100644
--- a/pcbnew/drc_marker_functions.cpp
+++ b/pcbnew/drc_marker_functions.cpp
@@ -32,16 +32,16 @@
* according to items and error ode
*/
-#include "fctsys.h"
-#include "common.h"
-#include "pcbnew.h"
-#include "class_board_design_settings.h"
+#include <fctsys.h>
+#include <common.h>
+#include <pcbnew.h>
+#include <class_board_design_settings.h>
-#include "drc_stuff.h"
-#include "class_pad.h"
-#include "class_track.h"
-#include "class_zone.h"
-#include "class_marker_pcb.h"
+#include <drc_stuff.h>
+#include <class_pad.h>
+#include <class_track.h>
+#include <class_zone.h>
+#include <class_marker_pcb.h>
MARKER_PCB* DRC::fillMarker( TRACK* aTrack, BOARD_ITEM* aItem, int aErrorCode, MARKER_PCB* fillMe )
diff --git a/pcbnew/edgemod.cpp b/pcbnew/edgemod.cpp
index a49ed60708..c0e67f1832 100644
--- a/pcbnew/edgemod.cpp
+++ b/pcbnew/edgemod.cpp
@@ -30,19 +30,19 @@
* @todo - Arc functions not compete but menus are ready to use.
*/
-#include "fctsys.h"
-#include "trigo.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <trigo.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "module_editor_frame.h"
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
+#include <module_editor_frame.h>
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
static void ShowNewEdgeModule( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index 18631e7dc4..da46e5d06e 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -28,29 +28,29 @@
* @brief Edit PCB implementation.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "gestfich.h"
-#include "kicad_device_context.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <gestfich.h>
+#include <kicad_device_context.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h>
-#include "pcbnew_id.h"
-#include "pcbnew.h"
-#include "module_editor_frame.h"
-#include "protos.h"
+#include <pcbnew_id.h>
+#include <pcbnew.h>
+#include <module_editor_frame.h>
+#include <protos.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "dialog_drc.h"
+#include <dialog_drc.h>
-#include "dialog_global_edit_tracks_and_vias.h"
+#include <dialog_global_edit_tracks_and_vias.h>
// Uncomment following line to enable wxBell() command (which beeps speaker)
// #include <wx/utils.h>
diff --git a/pcbnew/edit_pcb_text.cpp b/pcbnew/edit_pcb_text.cpp
index 60b27f76c2..a059552f4e 100644
--- a/pcbnew/edit_pcb_text.cpp
+++ b/pcbnew/edit_pcb_text.cpp
@@ -27,17 +27,17 @@
* @brief Editimg of text on copper and technical layers (TEXTE_PCB class)
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_pcb_text.h>
-#include "protos.h"
+#include <protos.h>
static void Move_Texte_Pcb( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp
index 68497a9f61..f4229626fb 100644
--- a/pcbnew/edit_track_width.cpp
+++ b/pcbnew/edit_track_width.cpp
@@ -3,18 +3,18 @@
* @brief Functions to modify sizes of segment, track, net, all vias and/or all tracks.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "drc_stuff.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <drc_stuff.h>
+#include <protos.h>
/**
diff --git a/pcbnew/editedge.cpp b/pcbnew/editedge.cpp
index 4640b5bef5..1dcc5e7dbd 100644
--- a/pcbnew/editedge.cpp
+++ b/pcbnew/editedge.cpp
@@ -27,18 +27,18 @@
* @brief Edit segments and edges of PCB.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "gr_basic.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <gr_basic.h>
+#include <pcbcommon.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "class_board.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_drawsegment.h>
static void Abort_EditEdge( EDA_DRAW_PANEL* Panel, wxDC* DC );
diff --git a/pcbnew/editmod.cpp b/pcbnew/editmod.cpp
index c436879eae..a2fb529fd3 100644
--- a/pcbnew/editmod.cpp
+++ b/pcbnew/editmod.cpp
@@ -3,20 +3,20 @@
/* properties and characteristics */
/************************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
-#include "trigo.h"
-#include "3d_viewer.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
+#include <trigo.h>
+#include <3d_viewer.h>
-#include "class_module.h"
-#include "class_pad.h"
-#include "class_edge_mod.h"
+#include <class_module.h>
+#include <class_pad.h>
+#include <class_edge_mod.h>
-#include "dialog_edit_module_for_BoardEditor.h"
+#include <dialog_edit_module_for_BoardEditor.h>
/*
diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp
index d95ae7acec..c693a7f618 100644
--- a/pcbnew/editrack-part2.cpp
+++ b/pcbnew/editrack-part2.cpp
@@ -28,21 +28,21 @@
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_marker_pcb.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_marker_pcb.h>
-#include "pcbnew.h"
-#include "drc_stuff.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <drc_stuff.h>
+#include <protos.h>
bool PCB_EDIT_FRAME::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp
index d9f85da89e..3deadbb941 100644
--- a/pcbnew/editrack.cpp
+++ b/pcbnew/editrack.cpp
@@ -27,20 +27,20 @@
* @file editrack.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "trigo.h"
-#include "pcbcommon.h"
-#include "wxPcbStruct.h"
-#include "colors_selection.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <trigo.h>
+#include <pcbcommon.h>
+#include <wxPcbStruct.h>
+#include <colors_selection.h>
-#include "pcbnew.h"
-#include "drc_stuff.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <drc_stuff.h>
+#include <protos.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_zone.h>
static void Abort_Create_Track( EDA_DRAW_PANEL* panel, wxDC* DC );
diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp
index dc77ca12dc..c04e89ed25 100644
--- a/pcbnew/edtxtmod.cpp
+++ b/pcbnew/edtxtmod.cpp
@@ -27,22 +27,22 @@
* @brief Edit module text.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "drawtxt.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <drawtxt.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
+#include <macros.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_text_mod.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_text_mod.h>
+#include <class_pcb_text.h>
static void Show_MoveTexte_Module( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
diff --git a/pcbnew/event_handlers_tracks_vias_sizes.cpp b/pcbnew/event_handlers_tracks_vias_sizes.cpp
index 4e93e02048..89f3a45e43 100644
--- a/pcbnew/event_handlers_tracks_vias_sizes.cpp
+++ b/pcbnew/event_handlers_tracks_vias_sizes.cpp
@@ -4,17 +4,17 @@
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "dialog_helpers.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <dialog_helpers.h>
-#include "pcbnew_id.h"
-#include "pcbnew.h"
+#include <pcbnew_id.h>
+#include <pcbnew.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
/**
diff --git a/pcbnew/export_gencad.cpp b/pcbnew/export_gencad.cpp
index 627c33283f..3100e5c1e3 100644
--- a/pcbnew/export_gencad.cpp
+++ b/pcbnew/export_gencad.cpp
@@ -28,22 +28,22 @@
* @brief Export GenCAD 1.4 format.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "build_version.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <build_version.h>
+#include <macros.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_edge_mod.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_edge_mod.h>
static bool CreateHeaderInfoData( FILE* aFile, PCB_EDIT_FRAME* frame );
diff --git a/pcbnew/export_vrml.cpp b/pcbnew/export_vrml.cpp
index ff7dd15272..c4b49af8c3 100644
--- a/pcbnew/export_vrml.cpp
+++ b/pcbnew/export_vrml.cpp
@@ -1,21 +1,21 @@
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "drawtxt.h"
-#include "trigo.h"
-#include "appl_wxstruct.h"
-#include "3d_struct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <drawtxt.h>
+#include <trigo.h>
+#include <appl_wxstruct.h>
+#include <3d_struct.h>
+#include <macros.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_edge_mod.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_edge_mod.h>
+#include <class_pcb_text.h>
#include <vector>
#include <cmath>
@@ -31,7 +31,7 @@ static void ChangeIllegalCharacters( wxString & aFileName, bool aDirSepIsIllegal
/* the dialog to create VRML files, derived from DIALOG_EXPORT_3DFILE_BASE,
* created by wxFormBuilder
*/
-#include "dialog_export_3Dfiles_base.h" // the wxFormBuilder header file
+#include <dialog_export_3Dfiles_base.h> // the wxFormBuilder header file
#define OPTKEY_OUTPUT_UNIT wxT("VrmlExportUnit" )
#define OPTKEY_3DFILES_OPT wxT("VrmlExport3DShapeFilesOpt" )
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 0d61ba6500..147c22007a 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -28,26 +28,26 @@
* @brief Read and write board files.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
-#include "pcbcommon.h"
-#include "3d_viewer.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "appl_wxstruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
+#include <pcbcommon.h>
+#include <3d_viewer.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <appl_wxstruct.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbnew_id.h"
-#include "io_mgr.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbnew_id.h>
+#include <io_mgr.h>
-#include "class_board.h"
-#include "build_version.h" // BOARD_FILE_VERSION
+#include <class_board.h>
+#include <build_version.h> // BOARD_FILE_VERSION
static const wxString pcbBackupFileExtension( wxT( "000" ) );
diff --git a/pcbnew/find.cpp b/pcbnew/find.cpp
index bc760e3fce..1cf0ffaf76 100644
--- a/pcbnew/find.cpp
+++ b/pcbnew/find.cpp
@@ -4,21 +4,21 @@
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_marker_pcb.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_marker_pcb.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "protos.h"
-#include "find.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <protos.h>
+#include <find.h>
static wxString s_OldStringFound;
diff --git a/pcbnew/gen_drill_report_files.cpp b/pcbnew/gen_drill_report_files.cpp
index 96a7c5d1b6..b022f71464 100644
--- a/pcbnew/gen_drill_report_files.cpp
+++ b/pcbnew/gen_drill_report_files.cpp
@@ -2,21 +2,21 @@
/* Functions to create drill data used to create files and report files */
/************************************************************************/
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "base_struct.h"
-#include "colors.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <base_struct.h>
+#include <colors.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <macros.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "pcbplot.h"
-#include "gendrill.h"
+#include <pcbnew.h>
+#include <pcbplot.h>
+#include <gendrill.h>
void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName,
diff --git a/pcbnew/gen_holes_and_tools_lists_for_drill.cpp b/pcbnew/gen_holes_and_tools_lists_for_drill.cpp
index 8f486b3708..eda6b18e2a 100644
--- a/pcbnew/gen_holes_and_tools_lists_for_drill.cpp
+++ b/pcbnew/gen_holes_and_tools_lists_for_drill.cpp
@@ -4,18 +4,18 @@
#include <algorithm> // sort
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "pcbplot.h"
-#include "gendrill.h"
+#include <pcbnew.h>
+#include <pcbplot.h>
+#include <gendrill.h>
/* Local Functions */
diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp
index 0ee89ff2b7..f02a919e41 100644
--- a/pcbnew/gen_modules_placefile.cpp
+++ b/pcbnew/gen_modules_placefile.cpp
@@ -7,21 +7,21 @@
* 2 - create a module report (pos and module descr) (ascii file)
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "appl_wxstruct.h"
-#include "build_version.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <appl_wxstruct.h>
+#include <build_version.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_drawsegment.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
class LIST_MOD /* Can list the elements of useful modules. */
diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp
index c4355810de..ff20d2df31 100644
--- a/pcbnew/gendrill.cpp
+++ b/pcbnew/gendrill.cpp
@@ -33,27 +33,27 @@
* and the CNC-7 manual.
*/
-#include "fctsys.h"
+#include <fctsys.h>
#include <vector>
-#include "plot_common.h"
-#include "trigo.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
-#include "appl_wxstruct.h"
-#include "build_version.h"
+#include <plot_common.h>
+#include <trigo.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
+#include <appl_wxstruct.h>
+#include <build_version.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbplot.h"
-#include "pcbnew.h"
-#include "gendrill.h"
+#include <pcbplot.h>
+#include <pcbnew.h>
+#include <gendrill.h>
-#include "dialog_gendrill.h" // Dialog box for drill file generation
+#include <dialog_gendrill.h> // Dialog box for drill file generation
const wxString DrillFileExtension( wxT( "drl" ) );
diff --git a/pcbnew/globaleditpad.cpp b/pcbnew/globaleditpad.cpp
index 7e784ed272..693297db9b 100644
--- a/pcbnew/globaleditpad.cpp
+++ b/pcbnew/globaleditpad.cpp
@@ -2,19 +2,19 @@
* @file globaleditpad.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h"
-#include "module_editor_frame.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h>
+#include <module_editor_frame.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "dialog_global_pads_edition_base.h"
+#include <pcbnew.h>
+#include <dialog_global_pads_edition_base.h>
/************************************/
diff --git a/pcbnew/gpcb_exchange.cpp b/pcbnew/gpcb_exchange.cpp
index b9b602b257..0d20f4c613 100644
--- a/pcbnew/gpcb_exchange.cpp
+++ b/pcbnew/gpcb_exchange.cpp
@@ -3,19 +3,19 @@
* @brief Import functions to import footprints from a gpcb (Newlib) library.
*/
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "kicad_string.h"
-#include "trigo.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <wxstruct.h>
+#include <kicad_string.h>
+#include <trigo.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <macros.h>
-#include "class_pad.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
+#include <class_pad.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
/* read parameters from a line, and return all params in a wxArrayString
diff --git a/pcbnew/graphpcb.cpp b/pcbnew/graphpcb.cpp
index 04e17c786b..acd8bc43d2 100644
--- a/pcbnew/graphpcb.cpp
+++ b/pcbnew/graphpcb.cpp
@@ -3,18 +3,18 @@
* @brief PCB editor autorouting and "graphics" routines.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
-#include "trigo.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
+#include <trigo.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "cell.h"
-#include "ar_protos.h"
+#include <pcbnew.h>
+#include <cell.h>
+#include <ar_protos.h>
int ToMatrixCoordinate( int aPhysicalCoordinate );
diff --git a/pcbnew/highlight.cpp b/pcbnew/highlight.cpp
index ef0a4660ad..5168c74186 100644
--- a/pcbnew/highlight.cpp
+++ b/pcbnew/highlight.cpp
@@ -27,19 +27,19 @@
* @brief Highlight nets.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "kicad_string.h"
-#include "wxPcbStruct.h"
-#include "kicad_device_context.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <kicad_string.h>
+#include <wxPcbStruct.h>
+#include <kicad_device_context.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "collectors.h"
+#include <pcbnew.h>
+#include <collectors.h>
#define Pad_fill ( Pad_Fill_Item.State == RUN )
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index fe3f1ce5d9..889affa496 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -2,11 +2,11 @@
* @file pcbnew/hotkeys.cpp
*/
-#include "fctsys.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
-#include "hotkeys.h"
+#include <hotkeys.h>
/* How to add a new hotkey:
* add a new id in the enum hotkey_id_commnand like MY_NEW_ID_FUNCTION.
diff --git a/pcbnew/hotkeys.h b/pcbnew/hotkeys.h
index a733830232..531ad48b69 100644
--- a/pcbnew/hotkeys.h
+++ b/pcbnew/hotkeys.h
@@ -5,7 +5,7 @@
#ifndef _PCBNEW_KOTKEYS_H
#define _PCBNEW_HOTKEYS_H
-#include "hotkeys_basic.h"
+#include <hotkeys_basic.h>
// List of hot keys id.
// see also enum common_hotkey_id_commnand in hotkeys_basic.h
diff --git a/pcbnew/hotkeys_board_editor.cpp b/pcbnew/hotkeys_board_editor.cpp
index 462e8246bf..cbfc2ab89e 100644
--- a/pcbnew/hotkeys_board_editor.cpp
+++ b/pcbnew/hotkeys_board_editor.cpp
@@ -2,20 +2,20 @@
* @file hotkeys_board_editor.cpp
*/
-#include "fctsys.h"
-#include "wxPcbStruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <wxPcbStruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
+#include <protos.h>
/* How to add a new hotkey:
* see hotkeys.cpp
diff --git a/pcbnew/hotkeys_module_editor.cpp b/pcbnew/hotkeys_module_editor.cpp
index a99f4afe5f..0034545b77 100644
--- a/pcbnew/hotkeys_module_editor.cpp
+++ b/pcbnew/hotkeys_module_editor.cpp
@@ -2,17 +2,17 @@
* @file hotkeys_module_editor.cpp
*/
-#include "fctsys.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
-#include "pcbnew_id.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "class_board_design_settings.h"
+#include <fctsys.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
+#include <pcbnew_id.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <class_board_design_settings.h>
-#include "hotkeys.h"
-#include "protos.h"
+#include <hotkeys.h>
+#include <protos.h>
/* How to add a new hotkey:
* See hotkeys.cpp
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index 29b9f02ad6..f9c44ba04d 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -2,15 +2,15 @@
* @file pcbnew/initpcb.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <module_editor_frame.h>
/**
diff --git a/pcbnew/ioascii.cpp b/pcbnew/ioascii.cpp
index 47b5fc57e6..ac9d5f9196 100644
--- a/pcbnew/ioascii.cpp
+++ b/pcbnew/ioascii.cpp
@@ -3,40 +3,40 @@
* @brief Routines for reading and saving of structures in ASCII file common to Pcbnew and CvPcb.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "build_version.h"
-#include "wxPcbStruct.h"
-#include "richio.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <build_version.h>
+#include <wxPcbStruct.h>
+#include <richio.h>
+#include <macros.h>
+#include <pcbcommon.h>
/**
* @todo Fix having to recompile the same file with a different defintion. This is
* what C++ derivation was designed to solve.
*/
#ifdef PCBNEW
-#include "zones.h"
+#include <zones.h>
#endif
#ifdef CVPCB
-#include "cvpcb.h"
+#include <cvpcb.h>
#endif
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_pcb_text.h"
-#include "class_zone.h"
-#include "class_dimension.h"
-#include "class_drawsegment.h"
-#include "class_mire.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_pcb_text.h>
+#include <class_zone.h>
+#include <class_dimension.h>
+#include <class_drawsegment.h>
+#include <class_mire.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "autorout.h"
-#include "pcb_plot_params.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <autorout.h>
+#include <pcb_plot_params.h>
/* ASCII format of structures:
diff --git a/pcbnew/item_io.cpp b/pcbnew/item_io.cpp
index 534214e2f5..c74948ec92 100644
--- a/pcbnew/item_io.cpp
+++ b/pcbnew/item_io.cpp
@@ -5,14 +5,14 @@
* This is migrationary and temporary while we move the IO_MGR.
*/
-#include "fctsys.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "build_version.h"
-#include "wxPcbStruct.h"
-#include "richio.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <build_version.h>
+#include <wxPcbStruct.h>
+#include <richio.h>
+#include <macros.h>
+#include <pcbcommon.h>
#ifdef PCBNEW
/**
@@ -22,31 +22,31 @@
//#include "zones.h"
#endif
-#include "zones.h"
+#include <zones.h>
#ifdef CVPCB
-#include "cvpcb.h"
+#include <cvpcb.h>
#endif
-#include "config.h"
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_pcb_text.h"
-#include "class_zone.h"
-#include "class_dimension.h"
-#include "class_drawsegment.h"
-#include "class_mire.h"
+#include <config.h>
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_pcb_text.h>
+#include <class_zone.h>
+#include <class_dimension.h>
+#include <class_drawsegment.h>
+#include <class_mire.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "autorout.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <autorout.h>
-#include "3d_struct.h"
-#include "trigo.h"
-#include "class_edge_mod.h"
-#include "pcbnew.h"
-#include "drawtxt.h"
+#include <3d_struct.h>
+#include <trigo.h>
+#include <class_edge_mod.h>
+#include <pcbnew.h>
+#include <drawtxt.h>
#define MAX_WIDTH 10000 /* Thickness (in 1 / 10000 ") of maximum reasonable features, text... */
diff --git a/pcbnew/layer_widget.cpp b/pcbnew/layer_widget.cpp
index 3d1d05d088..47963cdf37 100644
--- a/pcbnew/layer_widget.cpp
+++ b/pcbnew/layer_widget.cpp
@@ -33,11 +33,11 @@
//#define STAND_ALONE 1 // define to enable test program for LAYER_WIDGET
-#include "layer_widget.h"
+#include <layer_widget.h>
-#include "macros.h"
-#include "common.h"
-#include "colors.h"
+#include <macros.h>
+#include <common.h>
+#include <colors.h>
#include <wx/colour.h>
#define BUTT_SIZE_X 20
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index b5a304340f..b2bbf9ec48 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -3,25 +3,25 @@
* @brief Manage module (footprint) libraries.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "dialog_helpers.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "pcbcommon.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <dialog_helpers.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <pcbcommon.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "class_footprint_library.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <class_footprint_library.h>
+#include <module_editor_frame.h>
/*
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp
index ef11ad77ed..7259649c06 100644
--- a/pcbnew/loadcmp.cpp
+++ b/pcbnew/loadcmp.cpp
@@ -27,27 +27,27 @@
* @brief Footprints selection and loading functions.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "eda_doc.h"
-#include "kicad_string.h"
-#include "appl_wxstruct.h"
-#include "wxPcbStruct.h"
-#include "dialog_helpers.h"
-#include "filter_reader.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <eda_doc.h>
+#include <kicad_string.h>
+#include <appl_wxstruct.h>
+#include <wxPcbStruct.h>
+#include <dialog_helpers.h>
+#include <filter_reader.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "module_editor_frame.h"
-#include "footprint_info.h"
-#include "class_footprint_library.h"
-#include "dialog_get_component.h"
+#include <pcbnew.h>
+#include <module_editor_frame.h>
+#include <footprint_info.h>
+#include <class_footprint_library.h>
+#include <dialog_get_component.h>
static void DisplayCmpDoc( wxString& Name );
diff --git a/pcbnew/magnetic_tracks_functions.cpp b/pcbnew/magnetic_tracks_functions.cpp
index bc3a3f3bb8..5287e90a9b 100644
--- a/pcbnew/magnetic_tracks_functions.cpp
+++ b/pcbnew/magnetic_tracks_functions.cpp
@@ -8,17 +8,17 @@
* the distance is the clearance between tracks)
*/
-#include "fctsys.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "protos.h"
-#include "pcbnew_id.h"
+#include <protos.h>
+#include <pcbnew_id.h>
/**
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index 773ed76169..514f333a89 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -27,14 +27,14 @@
* @file pcbnew/menubar_modedit.cpp
* @brief (Re)Create the main menubar for the module editor
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
-#include "protos.h"
-#include "pcbnew_id.h"
+#include <protos.h>
+#include <pcbnew_id.h>
void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index fd2e30e20a..6cce55b283 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -27,15 +27,15 @@
* @file menubar_pcbframe.cpp
* Pcbnew editor menu bar
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "protos.h"
-#include "hotkeys.h"
-#include "pcbnew_id.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <protos.h>
+#include <hotkeys.h>
+#include <pcbnew_id.h>
-#include "help_common_strings.h"
+#include <help_common_strings.h>
/**
* Pcbnew mainframe menubar
diff --git a/pcbnew/minimun_spanning_tree.cpp b/pcbnew/minimun_spanning_tree.cpp
index d07210b185..df3935d947 100644
--- a/pcbnew/minimun_spanning_tree.cpp
+++ b/pcbnew/minimun_spanning_tree.cpp
@@ -31,8 +31,8 @@
#include <limits.h>
-#include "minimun_spanning_tree.h"
-#include "class_pad.h"
+#include <minimun_spanning_tree.h>
+#include <class_pad.h>
/*
* The class MIN_SPAN_TREE calculates the rectilinear minimum spanning tree
diff --git a/pcbnew/mirepcb.cpp b/pcbnew/mirepcb.cpp
index 47b1f12615..ec0081f623 100644
--- a/pcbnew/mirepcb.cpp
+++ b/pcbnew/mirepcb.cpp
@@ -3,17 +3,17 @@
* @brief Functions to edit targets (class MIRE).
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "dialog_helpers.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <dialog_helpers.h>
+#include <gr_basic.h>
-#include "class_board.h"
-#include "class_mire.h"
+#include <class_board.h>
+#include <class_mire.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
/* Routines Locales */
diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp
index dc2147c841..21ee0aecb2 100644
--- a/pcbnew/modedit.cpp
+++ b/pcbnew/modedit.cpp
@@ -2,30 +2,30 @@
* @file modedit.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "appl_wxstruct.h"
-#include "trigo.h"
-#include "3d_viewer.h"
-#include "wxPcbStruct.h"
-#include "kicad_device_context.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <appl_wxstruct.h>
+#include <trigo.h>
+#include <3d_viewer.h>
+#include <wxPcbStruct.h>
+#include <kicad_device_context.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbnew_id.h"
-#include "module_editor_frame.h"
-#include "collectors.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbnew_id.h>
+#include <module_editor_frame.h>
+#include <collectors.h>
-#include "dialog_edit_module_for_Modedit.h"
+#include <dialog_edit_module_for_Modedit.h>
BOARD_ITEM* FOOTPRINT_EDIT_FRAME::ModeditLocateAndDisplay( int aHotKeyCode )
diff --git a/pcbnew/modedit_onclick.cpp b/pcbnew/modedit_onclick.cpp
index 0288d3b73a..68d5ba2b84 100644
--- a/pcbnew/modedit_onclick.cpp
+++ b/pcbnew/modedit_onclick.cpp
@@ -2,23 +2,23 @@
* @file modedit_onclick.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "3d_viewer.h"
-#include "wxPcbStruct.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <3d_viewer.h>
+#include <wxPcbStruct.h>
+#include <gr_basic.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
-#include "module_editor_frame.h"
-#include "dialog_edit_module_for_Modedit.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
+#include <module_editor_frame.h>
+#include <dialog_edit_module_for_Modedit.h>
void FOOTPRINT_EDIT_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
diff --git a/pcbnew/modedit_undo_redo.cpp b/pcbnew/modedit_undo_redo.cpp
index 79e980d3d4..da6fec21a9 100644
--- a/pcbnew/modedit_undo_redo.cpp
+++ b/pcbnew/modedit_undo_redo.cpp
@@ -2,16 +2,16 @@
/* library editor: undo and redo functions */
/********************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <module_editor_frame.h>
void FOOTPRINT_EDIT_FRAME::SaveCopyInUndoList( BOARD_ITEM* aItem,
diff --git a/pcbnew/modeditoptions.cpp b/pcbnew/modeditoptions.cpp
index 6b017ad5d3..a8d1de43f2 100644
--- a/pcbnew/modeditoptions.cpp
+++ b/pcbnew/modeditoptions.cpp
@@ -28,17 +28,17 @@
* @brief Pcbnew footprint (module) editor options.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
-#include "pcbnew_id.h"
+#include <pcbnew_id.h>
-#include "protos.h"
+#include <protos.h>
void FOOTPRINT_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event )
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 35688fdbd2..6ed3d247f2 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -28,23 +28,23 @@
* @brief Footprint (module) editor main window.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "dialog_helpers.h"
-#include "3d_viewer.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <dialog_helpers.h>
+#include <3d_viewer.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
+#include <module_editor_frame.h>
static PCB_SCREEN* s_screenModule = NULL; // the PCB_SCREEN used by the footprint editor
diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp
index 36caec819b..b427027ecb 100644
--- a/pcbnew/modules.cpp
+++ b/pcbnew/modules.cpp
@@ -27,21 +27,21 @@
* @file modules.cpp
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "drag.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <drag.h>
static void Abort_MoveOrCopyModule( EDA_DRAW_PANEL* Panel, wxDC* DC );
diff --git a/pcbnew/move-drag_pads.cpp b/pcbnew/move-drag_pads.cpp
index 52935ba2ea..2dc534e4a0 100644
--- a/pcbnew/move-drag_pads.cpp
+++ b/pcbnew/move-drag_pads.cpp
@@ -3,23 +3,23 @@
* @brief Edit footprint pads.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "trigo.h"
-#include "block_commande.h"
-#include "wxBasePcbFrame.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <trigo.h>
+#include <block_commande.h>
+#include <wxBasePcbFrame.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "drag.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <drag.h>
+#include <protos.h>
static D_PAD* s_CurrentSelectedPad;
diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp
index 4912664c1f..69f0b57cb0 100644
--- a/pcbnew/move_or_drag_track.cpp
+++ b/pcbnew/move_or_drag_track.cpp
@@ -28,22 +28,22 @@
* @brief Track editing routines to move and drag track segments or node.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
-#include "macros.h"
-#include "gr_basic.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
+#include <macros.h>
+#include <gr_basic.h>
+#include <pcbcommon.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "drc_stuff.h"
-#include "drag.h"
-#include "pcbnew_id.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <drc_stuff.h>
+#include <drag.h>
+#include <pcbnew_id.h>
+#include <protos.h>
static void Show_MoveNode( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
@@ -336,7 +336,7 @@ static void Show_Drag_Track_Segment_With_Cte_Slope( EDA_DRAW_PANEL* aPanel, wxDC
if( tSegmentToEnd )
tSegmentToEnd->Draw( aPanel, aDC, draw_mode );
}
-#endif
+#endif
/* Compute the new track segment position */
wxPoint Pos = screen->GetCrossHairPosition();
diff --git a/pcbnew/muonde.cpp b/pcbnew/muonde.cpp
index 9227b7fabe..7de9053ae7 100644
--- a/pcbnew/muonde.cpp
+++ b/pcbnew/muonde.cpp
@@ -28,26 +28,26 @@
* @brief Microwave pcb layout code.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "trigo.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "dialog_helpers.h"
-#include "richio.h"
-#include "filter_reader.h"
-#include "gr_basic.h"
-#include "pcbcommon.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <trigo.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <dialog_helpers.h>
+#include <richio.h>
+#include <filter_reader.h>
+#include <gr_basic.h>
+#include <pcbcommon.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
-#include "protos.h"
-#include "pcbnew.h"
+#include <protos.h>
+#include <pcbnew.h>
#define COEFF_COUNT 6
diff --git a/pcbnew/muwave_command.cpp b/pcbnew/muwave_command.cpp
index 11e04cd98c..9b312d64da 100644
--- a/pcbnew/muwave_command.cpp
+++ b/pcbnew/muwave_command.cpp
@@ -2,16 +2,16 @@
/* muwave_command.cpp: micro wave functions commands */
/*****************************************************/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
-#include "pcbnew_id.h"
-#include "kicad_device_context.h"
+#include <pcbnew_id.h>
+#include <kicad_device_context.h>
-#include "protos.h"
+#include <protos.h>
/* Handle microwave commands.
diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp
index a3211fbff1..9cd7d475a5 100644
--- a/pcbnew/netlist.cpp
+++ b/pcbnew/netlist.cpp
@@ -26,23 +26,23 @@
* (that reinit the new references)
*/
-#include "algorithm"
+#include <algorithm>
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "richio.h"
-#include "dialog_helpers.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <richio.h>
+#include <dialog_helpers.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "dialog_netlist.h"
+#include <pcbnew.h>
+#include <dialog_netlist.h>
// constants used by ReadNetlistModuleDescr():
diff --git a/pcbnew/onleftclick.cpp b/pcbnew/onleftclick.cpp
index 30c32bc6b9..24ff3f233f 100644
--- a/pcbnew/onleftclick.cpp
+++ b/pcbnew/onleftclick.cpp
@@ -28,17 +28,17 @@
* @brief Functions called when the left button is clicked or double clicked.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_zone.h"
-#include "class_pcb_text.h"
+#include <class_board.h>
+#include <class_zone.h>
+#include <class_pcb_text.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
/* Handle the left button mouse click, when a tool is active
diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp
index 6a4fe78d69..19e07d7a72 100644
--- a/pcbnew/onrightclick.cpp
+++ b/pcbnew/onrightclick.cpp
@@ -28,21 +28,21 @@
* @brief Right mouse button functions.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_pcb_text.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_pcb_text.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
-#include "collectors.h"
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
+#include <collectors.h>
static wxMenu* Append_Track_Width_List( BOARD* aBoard );
diff --git a/pcbnew/pcb_plot_params.cpp b/pcbnew/pcb_plot_params.cpp
index 0cac29af90..96d99bdf25 100644
--- a/pcbnew/pcb_plot_params.cpp
+++ b/pcbnew/pcb_plot_params.cpp
@@ -23,11 +23,11 @@
*/
#include <wx/wx.h>
-#include "pcb_plot_params.h"
-#include "pcb_plot_params_lexer.h"
-#include "layers_id_colors_and_visibility.h"
-#include "plot_common.h"
-#include "macros.h"
+#include <pcb_plot_params.h>
+#include <pcb_plot_params_lexer.h>
+#include <layers_id_colors_and_visibility.h>
+#include <plot_common.h>
+#include <macros.h>
#define PLOT_LINEWIDTH_MIN 0
diff --git a/pcbnew/pcb_plot_params.h b/pcbnew/pcb_plot_params.h
index bbeec353a4..146a72b2a3 100644
--- a/pcbnew/pcb_plot_params.h
+++ b/pcbnew/pcb_plot_params.h
@@ -24,8 +24,8 @@
*/
#include <wx/wx.h>
-#include "pcb_plot_params_lexer.h"
-#include "base_struct.h"
+#include <pcb_plot_params_lexer.h>
+#include <base_struct.h>
class PCB_PLOT_PARAMS_PARSER;
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index b0eacdc950..841be40d08 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -29,29 +29,29 @@
* @brief PCB editor main window implementation.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "pcbcommon.h" // enum PCB_VISIBLE
-#include "collectors.h"
-#include "build_version.h"
-#include "macros.h"
-#include "3d_viewer.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <pcbcommon.h> // enum PCB_VISIBLE
+#include <collectors.h>
+#include <build_version.h>
+#include <macros.h>
+#include <3d_viewer.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbnew_id.h"
-#include "drc_stuff.h"
-#include "layer_widget.h"
-#include "dialog_design_rules.h"
-#include "class_pcb_layer_widget.h"
-#include "hotkeys.h"
-#include "pcbnew_config.h"
-#include "module_editor_frame.h"
-#include "dialog_SVG_print.h"
-#include "dialog_helpers.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbnew_id.h>
+#include <drc_stuff.h>
+#include <layer_widget.h>
+#include <dialog_design_rules.h>
+#include <class_pcb_layer_widget.h>
+#include <hotkeys.h>
+#include <pcbnew_config.h>
+#include <module_editor_frame.h>
+#include <dialog_SVG_print.h>
+#include <dialog_helpers.h>
extern int g_DrawDefaultLineThickness;
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index 980d80f266..12798758da 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -27,23 +27,23 @@
* @brief Pcbnew main program.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "macros.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "eda_dde.h"
-#include "pcbcommon.h"
-#include "colors_selection.h"
-#include "gr_basic.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <macros.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <eda_dde.h>
+#include <pcbcommon.h>
+#include <colors_selection.h>
+#include <gr_basic.h>
#include <wx/file.h>
#include <wx/snglinst.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "hotkeys.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <hotkeys.h>
// Colors for layers and items
diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h
index bb51c4d026..7dc7d1f3d8 100644
--- a/pcbnew/pcbnew.h
+++ b/pcbnew/pcbnew.h
@@ -6,8 +6,8 @@
#define PCBNEW_H
-#include "fctsys.h" // PCB_INTERNAL_UNIT and EESCHEMA_INTERNAL_UNIT definitions.
-#include "base_struct.h" // IS_DRAGGED and IN_EDIT definitions.
+#include <fctsys.h> // PCB_INTERNAL_UNIT and EESCHEMA_INTERNAL_UNIT definitions.
+#include <base_struct.h> // IS_DRAGGED and IN_EDIT definitions.
#define U_PCB (PCB_INTERNAL_UNIT / EESCHEMA_INTERNAL_UNIT)
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index 2fd6f6cd98..4ee6c31ec3 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -27,31 +27,31 @@
* @file pcbnew_config.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "xnode.h"
-#include "macros.h"
-#include "pcbcommon.h"
-#include "wxPcbStruct.h"
-#include "class_board_design_settings.h"
-#include "plot_common.h"
-#include "worksheet.h"
-#include "dialog_hotkeys_editor.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <xnode.h>
+#include <macros.h>
+#include <pcbcommon.h>
+#include <wxPcbStruct.h>
+#include <class_board_design_settings.h>
+#include <plot_common.h>
+#include <worksheet.h>
+#include <dialog_hotkeys_editor.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbplot.h"
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
-#include "protos.h"
-#include "pcbnew_config.h"
+#include <pcbplot.h>
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
+#include <protos.h>
+#include <pcbnew_config.h>
-#include "dialog_mask_clearance.h"
-#include "dialog_general_options.h"
+#include <dialog_mask_clearance.h>
+#include <dialog_general_options.h>
#define HOTKEY_FILENAME wxT( "pcbnew" )
diff --git a/pcbnew/pcbnew_config.h b/pcbnew/pcbnew_config.h
index d945e62a26..7f430b2a88 100644
--- a/pcbnew/pcbnew_config.h
+++ b/pcbnew/pcbnew_config.h
@@ -6,8 +6,8 @@
#ifndef _PCBNEW_CONFIG_H_
#define _PCBNEW_CONFIG_H_
-#include "param_config.h"
-#include "colors_selection.h"
+#include <param_config.h>
+#include <colors_selection.h>
#define GROUP wxT( "/pcbnew" )
#define GROUPLIB wxT( "/pcbnew/libraries" )
diff --git a/pcbnew/pcbnew_id.h b/pcbnew/pcbnew_id.h
index a321129ef2..0f01ccef5f 100644
--- a/pcbnew/pcbnew_id.h
+++ b/pcbnew/pcbnew_id.h
@@ -1,7 +1,7 @@
#ifndef __PCBNEW_ID_H__
#define __PCBNEW_ID_H__
-#include "id.h"
+#include <id.h>
/**
* Command IDs for the printed circuit board editor.
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index 2ba661b568..b748aabfbe 100644
--- a/pcbnew/pcbplot.cpp
+++ b/pcbnew/pcbplot.cpp
@@ -2,24 +2,24 @@
* @file pcbnew/pcbplot.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "plot_common.h"
-#include "confirm.h"
-#include "gestfich.h"
-#include "wxPcbStruct.h"
-#include "pcbplot.h"
-#include "worksheet.h"
-#include "pcbstruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <plot_common.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <wxPcbStruct.h>
+#include <pcbplot.h>
+#include <worksheet.h>
+#include <pcbstruct.h>
+#include <macros.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "protos.h"
-#include "dialog_plot_base.h"
-#include "pcb_plot_params.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <protos.h>
+#include <dialog_plot_base.h>
+#include <pcb_plot_params.h>
/* Keywords to r/w options in m_Config */
#define CONFIG_XFINESCALE_ADJ wxT( "PlotXFineScaleAdj" )
@@ -119,7 +119,7 @@ void DIALOG_PLOT::Init_Dialog()
m_Config->Read( CONFIG_XFINESCALE_ADJ, &m_XScaleAdjust );
m_Config->Read( CONFIG_YFINESCALE_ADJ, &m_YScaleAdjust );
m_Config->Read( CONFIG_PS_FINEWIDTH_ADJ, &m_PSWidthAdjust);
-
+
// The reasonable width correction value must be in a range of
// [-(MinTrackWidth-1), +(MinClearanceValue-1)] decimils.
m_WidthAdjustMinValue = -(board->GetDesignSettings().m_TrackMinWidth - 1);
@@ -145,7 +145,7 @@ void DIALOG_PLOT::Init_Dialog()
msg = ReturnStringFromValue( g_UserUnit, g_PcbPlotOptions.GetPlotLineWidth(),
PCB_INTERNAL_UNIT );
m_linesWidth->AppendText( msg );
-
+
// Set units for PS global width correction.
AddUnitSymbol( *m_textPSFineAdjustWidth, g_UserUnit );
@@ -161,7 +161,7 @@ void DIALOG_PLOT::Init_Dialog()
msg.Printf( wxT( "%f" ), m_YScaleAdjust );
m_fineAdjustYscaleOpt->AppendText( msg );
-
+
// Test for a reasonable PS width correction value. Set to 0 if problem.
if( m_PSWidthAdjust < m_WidthAdjustMinValue || m_PSWidthAdjust > m_WidthAdjustMaxValue )
m_PSWidthAdjust = 0.;
@@ -540,7 +540,7 @@ void DIALOG_PLOT::applyPlotSettings()
}
m_Config->Write( CONFIG_YFINESCALE_ADJ, m_YScaleAdjust );
-
+
// PS Width correction
msg = m_PSFineAdjustWidthOpt->GetValue();
tmpDouble = ReturnValueFromString( g_UserUnit, msg, PCB_INTERNAL_UNIT );
diff --git a/pcbnew/pcbplot.h b/pcbnew/pcbplot.h
index f0d7656403..6400a6812f 100644
--- a/pcbnew/pcbplot.h
+++ b/pcbnew/pcbplot.h
@@ -5,7 +5,7 @@
#ifndef PCBPLOT_H
#define PCBPLOT_H
-#include "pcb_plot_params.h"
+#include <pcb_plot_params.h>
class PLOTTER;
diff --git a/pcbnew/plot_rtn.cpp b/pcbnew/plot_rtn.cpp
index 0851df2a80..99f5553a37 100644
--- a/pcbnew/plot_rtn.cpp
+++ b/pcbnew/plot_rtn.cpp
@@ -3,29 +3,29 @@
* @brief Common plot routines.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "base_struct.h"
-#include "drawtxt.h"
-#include "confirm.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
-#include "pcbcommon.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <base_struct.h>
+#include <drawtxt.h>
+#include <confirm.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
+#include <pcbcommon.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_edge_mod.h"
-#include "class_pcb_text.h"
-#include "class_zone.h"
-#include "class_drawsegment.h"
-#include "class_mire.h"
-#include "class_dimension.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_edge_mod.h>
+#include <class_pcb_text.h>
+#include <class_zone.h>
+#include <class_drawsegment.h>
+#include <class_mire.h>
+#include <class_dimension.h>
-#include "pcbnew.h"
-#include "pcbplot.h"
+#include <pcbnew.h>
+#include <pcbplot.h>
static void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask,
EDA_DRAW_MODE_T trace_mode );
@@ -37,7 +37,7 @@ static int doIntValueFitToBand( int aInt, int aMin, int aMax )
if( aInt < aMin ) return aMin;
if( aInt > aMax ) return aMax;
return aInt;
-}
+}
/* Creates the plot for silkscreen layers
*/
@@ -815,7 +815,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter,
pos = shape_pos;
wxSize margin;
double width_adj = 0;
-
+
if( aLayerMask & ALL_CU_LAYERS )
{
width_adj = aPlotter->get_plot_width_adj();
@@ -913,7 +913,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter,
// clearance for vias
if( ( aLayerMask & ( SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT ) ) )
via_margin = GetBoard()->GetDesignSettings().m_SolderMaskMargin;
-
+
if( aLayerMask & ALL_CU_LAYERS )
{
width_adj = aPlotter->get_plot_width_adj();
@@ -1008,13 +1008,13 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER* aPlotter,
continue;
pos = pts->m_Start;
-
+
// It is quite possible that the real drill value is less then small drill value.
if( g_PcbPlotOptions.m_DrillShapeOpt == PCB_PLOT_PARAMS::SMALL_DRILL_SHAPE )
diam.x = diam.y = MIN( SMALL_DRILL, pts->GetDrillValue() );
else
diam.x = diam.y = pts->GetDrillValue();
-
+
diam.x -= aPlotter->get_plot_width_adj();
diam.x = doIntValueFitToBand( diam.x, 1, pts->m_Width - 1 );
aPlotter->flash_pad_circle( pos, diam.x, aTraceMode );
diff --git a/pcbnew/plotdxf.cpp b/pcbnew/plotdxf.cpp
index 3eb1371a75..7b6e4514fd 100644
--- a/pcbnew/plotdxf.cpp
+++ b/pcbnew/plotdxf.cpp
@@ -3,16 +3,16 @@
* @brief Plot DXF.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "confirm.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <confirm.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbplot.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbplot.h>
bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer,
diff --git a/pcbnew/plotgerb.cpp b/pcbnew/plotgerb.cpp
index c3f91a6859..d0c0747614 100644
--- a/pcbnew/plotgerb.cpp
+++ b/pcbnew/plotgerb.cpp
@@ -10,17 +10,17 @@
* format 3.4 uses the native Pcbnew units (1/10000 inch).
*/
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "confirm.h"
-#include "pcbplot.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
-#include "layers_id_colors_and_visibility.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <confirm.h>
+#include <pcbplot.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
+#include <layers_id_colors_and_visibility.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
bool PCB_BASE_FRAME::ExportToGerberFile( const wxString& aFullFileName, int aLayer,
diff --git a/pcbnew/plothpgl.cpp b/pcbnew/plothpgl.cpp
index 2a607095b4..eb1850197b 100644
--- a/pcbnew/plothpgl.cpp
+++ b/pcbnew/plothpgl.cpp
@@ -2,19 +2,19 @@
* @file plothpgl.cpp
*/
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "confirm.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <confirm.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
+#include <macros.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbplot.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbplot.h>
bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer,
diff --git a/pcbnew/plotps.cpp b/pcbnew/plotps.cpp
index 8af881638b..f0cdcd5d47 100644
--- a/pcbnew/plotps.cpp
+++ b/pcbnew/plotps.cpp
@@ -3,19 +3,19 @@
* @brief Plot Postscript.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "plot_common.h"
-#include "confirm.h"
-#include "trigo.h"
-#include "wxBasePcbFrame.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <plot_common.h>
+#include <confirm.h>
+#include <trigo.h>
+#include <wxBasePcbFrame.h>
+#include <macros.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbplot.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbplot.h>
/* Generate a PostScript file (*. ps) of the circuit layer.
diff --git a/pcbnew/polygons_defs.h b/pcbnew/polygons_defs.h
index ba29c4bd59..3d7640c8d8 100644
--- a/pcbnew/polygons_defs.h
+++ b/pcbnew/polygons_defs.h
@@ -6,7 +6,7 @@
#ifndef _POLYGONS_DEFS_H_
#define _POLYGONS_DEFS_H_
-#include "boost/polygon/polygon.hpp"
+#include <boost/polygon/polygon.hpp>
// Define some types used here from boost::polygon
namespace bpl = boost::polygon; // bpl = boost polygon library
diff --git a/pcbnew/print_board_functions.cpp b/pcbnew/print_board_functions.cpp
index 1fbb58773b..98dcd2f944 100644
--- a/pcbnew/print_board_functions.cpp
+++ b/pcbnew/print_board_functions.cpp
@@ -3,23 +3,23 @@
* @brief Functions to print boards.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "printout_controler.h"
-#include "colors_selection.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <printout_controler.h>
+#include <colors_selection.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "pcbplot.h"
-#include "module_editor_frame.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <pcbplot.h>
+#include <module_editor_frame.h>
static void Print_Module( EDA_DRAW_PANEL* aPanel, wxDC* aDC, MODULE* aModule,
diff --git a/pcbnew/printout_controler.cpp b/pcbnew/printout_controler.cpp
index a806cbfa70..02c74afaf8 100644
--- a/pcbnew/printout_controler.cpp
+++ b/pcbnew/printout_controler.cpp
@@ -29,19 +29,19 @@
// Set this to 1 if you want to test PostScript printing under MSW.
#define wxTEST_POSTSCRIPT_IN_MSW 1
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "gr_basic.h"
-#include "wxBasePcbFrame.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <gr_basic.h>
+#include <wxBasePcbFrame.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "printout_controler.h"
+#include <printout_controler.h>
// This class is an helper to pass print parameters to print functions
PRINT_PARAMETERS::PRINT_PARAMETERS()
diff --git a/pcbnew/queue.cpp b/pcbnew/queue.cpp
index be3655a78d..eb9384de41 100644
--- a/pcbnew/queue.cpp
+++ b/pcbnew/queue.cpp
@@ -27,12 +27,12 @@
* @file queue.cpp
*/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "pcbnew.h"
-#include "autorout.h"
-#include "cell.h"
+#include <pcbnew.h>
+#include <autorout.h>
+#include <cell.h>
struct PcbQueue /* search queue structure */
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp
index 0057329155..596455fc5e 100644
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest.cpp
@@ -3,21 +3,21 @@
* @brief Ratsnets functions.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "colors_selection.h"
-#include "wxBasePcbFrame.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <colors_selection.h>
+#include <wxBasePcbFrame.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
-#include "minimun_spanning_tree.h"
+#include <minimun_spanning_tree.h>
/**
* @brief class MIN_SPAN_TREE_PADS (derived from MIN_SPAN_TREE) specialize
diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp
index f88e60d80f..990e56424f 100644
--- a/pcbnew/sel_layer.cpp
+++ b/pcbnew/sel_layer.cpp
@@ -3,14 +3,14 @@
* @brief Set up the basic primitives for Layer control.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxBasePcbFrame.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxBasePcbFrame.h>
+#include <pcbcommon.h>
-#include "class_board.h"
+#include <class_board.h>
enum layer_sel_id {
diff --git a/pcbnew/set_grid.cpp b/pcbnew/set_grid.cpp
index 204fe27e5e..c49fc46a06 100644
--- a/pcbnew/set_grid.cpp
+++ b/pcbnew/set_grid.cpp
@@ -3,14 +3,14 @@
* @brief Manage user grid.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "class_drawpanel.h"
-#include "wxBasePcbFrame.h"
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <wxBasePcbFrame.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "dialog_set_grid_base.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <dialog_set_grid_base.h>
class DIALOG_SET_GRID : public DIALOG_SET_GRID_BASE
diff --git a/pcbnew/solve.cpp b/pcbnew/solve.cpp
index 6450c595c5..24d152a2b4 100644
--- a/pcbnew/solve.cpp
+++ b/pcbnew/solve.cpp
@@ -27,21 +27,21 @@
* @file solve.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
-#include "gr_basic.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
+#include <gr_basic.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "protos.h"
-#include "ar_protos.h"
-#include "cell.h"
+#include <pcbnew.h>
+#include <protos.h>
+#include <ar_protos.h>
+#include <cell.h>
static int Autoroute_One_Track( PCB_EDIT_FRAME* pcbframe,
diff --git a/pcbnew/specctra.cpp b/pcbnew/specctra.cpp
index 222c316bce..bafd2b6301 100644
--- a/pcbnew/specctra.cpp
+++ b/pcbnew/specctra.cpp
@@ -50,12 +50,12 @@
#include <cstdarg>
#include <cstdio>
-#include "build_version.h"
+#include <build_version.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "specctra.h"
+#include <specctra.h>
#include <wx/wfstream.h> // wxFFileOutputStream
diff --git a/pcbnew/specctra.h b/pcbnew/specctra.h
index 79d10bf7f0..2b10267737 100644
--- a/pcbnew/specctra.h
+++ b/pcbnew/specctra.h
@@ -32,12 +32,12 @@
// see http://www.boost.org/libs/ptr_container/doc/ptr_set.html
#include <boost/ptr_container/ptr_set.hpp>
-#include "fctsys.h"
-#include "macros.h" // MAX definition.
+#include <fctsys.h>
+#include <macros.h> // MAX definition.
-#include "specctra_lexer.h"
+#include <specctra_lexer.h>
-#include "pcbnew.h"
+#include <pcbnew.h>
class TYPE_COLLECTOR; // outside the DSN namespace
diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_export.cpp
index 4f1bba36f0..c27afc79a3 100644
--- a/pcbnew/specctra_export.cpp
+++ b/pcbnew/specctra_export.cpp
@@ -31,27 +31,27 @@
Also see the comments at the top of the specctra.cpp file itself.
*/
-#include "wxPcbStruct.h"
-#include "pcbstruct.h" // HISTORY_NUMBER
-#include "confirm.h" // DisplayError()
-#include "gestfich.h" // EDA_FileSelector()
-#include "trigo.h" // RotatePoint()
+#include <wxPcbStruct.h>
+#include <pcbstruct.h> // HISTORY_NUMBER
+#include <confirm.h> // DisplayError()
+#include <gestfich.h> // EDA_FileSelector()
+#include <trigo.h> // RotatePoint()
#include <set> // std::set
#include <map> // std::map
#include <boost/utility.hpp> // boost::addressof()
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
-#include "class_track.h"
-#include "class_zone.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
+#include <class_track.h>
+#include <class_zone.h>
+#include <class_drawsegment.h>
-#include "collectors.h"
+#include <collectors.h>
-#include "specctra.h"
+#include <specctra.h>
using namespace DSN;
diff --git a/pcbnew/specctra_import.cpp b/pcbnew/specctra_import.cpp
index c72552d69d..99e9a7bc8c 100644
--- a/pcbnew/specctra_import.cpp
+++ b/pcbnew/specctra_import.cpp
@@ -32,19 +32,19 @@
*/
-#include "class_drawpanel.h" // m_canvas
-#include "confirm.h" // DisplayError()
-#include "gestfich.h" // EDA_FileSelector()
-#include "wxPcbStruct.h"
+#include <class_drawpanel.h> // m_canvas
+#include <confirm.h> // DisplayError()
+#include <gestfich.h> // EDA_FileSelector()
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_edge_mod.h"
-#include "class_track.h"
-#include "class_zone.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_edge_mod.h>
+#include <class_track.h>
+#include <class_zone.h>
+#include <class_drawsegment.h>
-#include "specctra.h"
+#include <specctra.h>
using namespace DSN;
diff --git a/pcbnew/specctra_test.cpp b/pcbnew/specctra_test.cpp
index eb17afca54..713c9b15a0 100644
--- a/pcbnew/specctra_test.cpp
+++ b/pcbnew/specctra_test.cpp
@@ -34,8 +34,8 @@
#include <cstdarg>
#include <cstdio>
-#include "specctra.h"
-#include "common.h"
+#include <specctra.h>
+#include <common.h>
using namespace DSN;
diff --git a/pcbnew/swap_layers.cpp b/pcbnew/swap_layers.cpp
index 87a986ccd1..b446ea1635 100644
--- a/pcbnew/swap_layers.cpp
+++ b/pcbnew/swap_layers.cpp
@@ -3,19 +3,19 @@
* @brief Dialog to swap layers.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_drawsegment.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
-#include "wx/statline.h"
+#include <wx/statline.h>
#define LAYER_NO_CHANGE NB_LAYERS
diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp
index 7575108286..b673bae786 100644
--- a/pcbnew/tool_modedit.cpp
+++ b/pcbnew/tool_modedit.cpp
@@ -28,14 +28,14 @@
* @brief Footprint editor tool bars
*/
-#include "fctsys.h"
+#include <fctsys.h>
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
-#include "dialog_helpers.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
+#include <dialog_helpers.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
#ifdef __UNIX__
#define LISTBOX_WIDTH 140
diff --git a/pcbnew/tool_onrightclick.cpp b/pcbnew/tool_onrightclick.cpp
index 024fe266eb..dcdbadba12 100644
--- a/pcbnew/tool_onrightclick.cpp
+++ b/pcbnew/tool_onrightclick.cpp
@@ -2,14 +2,14 @@
/* tool_onrightclick.cpp */
/*************************/
-#include "fctsys.h"
-#include "confirm.h"
-#include "pcbnew.h"
-#include "wxPcbStruct.h"
-#include "module_editor_frame.h"
-#include "dialog_design_rules.h"
+#include <fctsys.h>
+#include <confirm.h>
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+#include <module_editor_frame.h>
+#include <dialog_design_rules.h>
-#include "pcbnew_id.h"
+#include <pcbnew_id.h>
void PCB_EDIT_FRAME::ToolOnRightClick( wxCommandEvent& event )
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index 0a38dd6bc0..ead1d2af51 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -28,20 +28,20 @@
* @brief PCB editor tool bars
*/
-#include "fctsys.h"
-#include "help_common_strings.h"
-#include "dialog_helpers.h"
-#include "class_layer_box_selector.h"
-#include "colors_selection.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <help_common_strings.h>
+#include <dialog_helpers.h>
+#include <class_layer_box_selector.h>
+#include <colors_selection.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "hotkeys.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <hotkeys.h>
-#include "wx/wupdlock.h"
+#include <wx/wupdlock.h>
#ifdef __UNIX__
diff --git a/pcbnew/toolbars_update_user_interface.cpp b/pcbnew/toolbars_update_user_interface.cpp
index 5928e095bb..bfb19d39bd 100644
--- a/pcbnew/toolbars_update_user_interface.cpp
+++ b/pcbnew/toolbars_update_user_interface.cpp
@@ -28,19 +28,19 @@
* @brief Function to update toolbars UI after changing parameters.
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "3d_viewer.h"
-#include "dialog_helpers.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <3d_viewer.h>
+#include <dialog_helpers.h>
+#include <pcbcommon.h>
-#include "class_board.h"
+#include <class_board.h>
-#include "pcbnew.h"
-#include "pcbnew_id.h"
-#include "drc_stuff.h"
+#include <pcbnew.h>
+#include <pcbnew_id.h>
+#include <drc_stuff.h>
void PCB_EDIT_FRAME::OnUpdateLayerPair( wxUpdateUIEvent& aEvent )
diff --git a/pcbnew/tr_modif.cpp b/pcbnew/tr_modif.cpp
index dc9fa9e6c0..cb83423ad8 100644
--- a/pcbnew/tr_modif.cpp
+++ b/pcbnew/tr_modif.cpp
@@ -28,15 +28,15 @@
* @brief Trace editing.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_track.h"
+#include <class_board.h>
+#include <class_track.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
static void ListSetState( EDA_ITEM* Start, int NbItem, int State, int onoff );
diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp
index 6bad2af501..14acb64001 100644
--- a/pcbnew/tracepcb.cpp
+++ b/pcbnew/tracepcb.cpp
@@ -28,20 +28,20 @@
* @brief Functions to redraw the current board.
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
-#include "class_marker_pcb.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
+#include <class_marker_pcb.h>
-#include "pcbnew.h"
-#include "module_editor_frame.h"
-#include "pcbplot.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <module_editor_frame.h>
+#include <pcbplot.h>
+#include <protos.h>
#include <wx/overlay.h>
diff --git a/pcbnew/trpiste.cpp b/pcbnew/trpiste.cpp
index e538baae28..f5501a48af 100644
--- a/pcbnew/trpiste.cpp
+++ b/pcbnew/trpiste.cpp
@@ -3,15 +3,15 @@
* @brief Routine for plotting traces.
*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <gr_basic.h>
+#include <common.h>
+#include <trigo.h>
-#include "class_track.h"
+#include <class_track.h>
-#include "pcbnew.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <protos.h>
void DrawTraces( EDA_DRAW_PANEL* panel, wxDC* DC, TRACK* aTrackList, int nbsegment, int draw_mode )
diff --git a/pcbnew/work.cpp b/pcbnew/work.cpp
index 96498082f9..3436fe3077 100644
--- a/pcbnew/work.cpp
+++ b/pcbnew/work.cpp
@@ -28,12 +28,12 @@
* @brief Automatic routing routines
*/
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "pcbnew.h"
-#include "cell.h"
-#include "ar_protos.h"
+#include <pcbnew.h>
+#include <cell.h>
+#include <ar_protos.h>
struct CWORK /* a unit of work is a hole-pair to connect */
diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp
index b31e1ed5b5..5a686f30b9 100644
--- a/pcbnew/xchgmod.cpp
+++ b/pcbnew/xchgmod.cpp
@@ -2,20 +2,20 @@
* @file xchgmod.cpp
*/
-#include "fctsys.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "kicad_string.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
-#include "pcbcommon.h"
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <kicad_string.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
+#include <pcbcommon.h>
-#include "class_board.h"
-#include "class_module.h"
+#include <class_board.h>
+#include <class_module.h>
-#include "pcbnew.h"
-#include "dialog_exchange_modules_base.h"
-#include "ar_protos.h"
+#include <pcbnew.h>
+#include <dialog_exchange_modules_base.h>
+#include <ar_protos.h>
int s_SelectionMode = 0; // Remember the last exchange option, when exit dialog.
diff --git a/pcbnew/zone_filling_algorithm.cpp b/pcbnew/zone_filling_algorithm.cpp
index 055b9f5ac0..20336eda0e 100644
--- a/pcbnew/zone_filling_algorithm.cpp
+++ b/pcbnew/zone_filling_algorithm.cpp
@@ -6,15 +6,15 @@
#include <algorithm> // sort
-#include "fctsys.h"
-#include "trigo.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <trigo.h>
+#include <wxPcbStruct.h>
-#include "class_zone.h"
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
-#include "protos.h"
+#include <pcbnew.h>
+#include <zones.h>
+#include <protos.h>
/* Local functions */
diff --git a/pcbnew/zones.h b/pcbnew/zones.h
index ddc4f3f547..f39050db86 100644
--- a/pcbnew/zones.h
+++ b/pcbnew/zones.h
@@ -6,7 +6,7 @@
#define ZONES_H
-#include "class_zone_setting.h"
+#include <class_zone_setting.h>
// keys used to store net sort option in config file :
diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp
index 895346b513..1c4a5281fe 100644
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@@ -27,21 +27,21 @@
* @file zones_by_polygon.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
-#include "pcbnew_id.h"
-#include "protos.h"
-#include "zones_functions_for_undo_redo.h"
-#include "drc_stuff.h"
+#include <pcbnew.h>
+#include <zones.h>
+#include <pcbnew_id.h>
+#include <protos.h>
+#include <zones_functions_for_undo_redo.h>
+#include <drc_stuff.h>
bool s_Verbose = false; // false if zone outline diags must not be shown
@@ -66,7 +66,7 @@ static wxPoint s_CursorLastPosition; // in move zone outline, las
static PICKED_ITEMS_LIST s_PickedList; // a picked list to save zones for undo/redo command
static PICKED_ITEMS_LIST _AuxiliaryList; // a picked list to store zones that are deleted or added when combined
-#include "dialog_copper_zones.h"
+#include <dialog_copper_zones.h>
void PCB_EDIT_FRAME::Add_Similar_Zone( wxDC* DC, ZONE_CONTAINER* zone_container )
diff --git a/pcbnew/zones_by_polygon_fill_functions.cpp b/pcbnew/zones_by_polygon_fill_functions.cpp
index 08087f2a21..3dec2401d7 100644
--- a/pcbnew/zones_by_polygon_fill_functions.cpp
+++ b/pcbnew/zones_by_polygon_fill_functions.cpp
@@ -28,18 +28,18 @@
#include <wx/progdlg.h>
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
/**
diff --git a/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp b/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
index cb832a5f90..0cfdd7a51a 100644
--- a/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
+++ b/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
@@ -23,21 +23,21 @@
#include <math.h>
-#include "fctsys.h"
-#include "polygons_defs.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <polygons_defs.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_edge_mod.h"
-#include "class_drawsegment.h"
-#include "class_pcb_text.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_edge_mod.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
extern void BuildUnconnectedThermalStubsPolygonList( std::vector<CPolyPt>& aCornerBuffer,
diff --git a/pcbnew/zones_convert_to_polygons_aux_functions.cpp b/pcbnew/zones_convert_to_polygons_aux_functions.cpp
index a0155500a0..c8f153d7b9 100644
--- a/pcbnew/zones_convert_to_polygons_aux_functions.cpp
+++ b/pcbnew/zones_convert_to_polygons_aux_functions.cpp
@@ -2,18 +2,18 @@
* @file zones_convert_to_polygons_aux_functions.cpp
*/
-#include "fctsys.h"
-#include "polygons_defs.h"
-#include "PolyLine.h"
-#include "wxPcbStruct.h"
-#include "trigo.h"
+#include <fctsys.h>
+#include <polygons_defs.h>
+#include <PolyLine.h>
+#include <wxPcbStruct.h>
+#include <trigo.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
/**
diff --git a/pcbnew/zones_functions_for_undo_redo.cpp b/pcbnew/zones_functions_for_undo_redo.cpp
index c8e3fac822..c605e7eedf 100644
--- a/pcbnew/zones_functions_for_undo_redo.cpp
+++ b/pcbnew/zones_functions_for_undo_redo.cpp
@@ -42,17 +42,17 @@
* and ones they are modified (changes, deletion or addition)
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <class_drawpanel.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
-#include "zones_functions_for_undo_redo.h"
+#include <pcbnew.h>
+#include <zones.h>
+#include <zones_functions_for_undo_redo.h>
/**
* Function IsSame
diff --git a/pcbnew/zones_non_copper_type_functions.cpp b/pcbnew/zones_non_copper_type_functions.cpp
index 23ec0c6386..578f3af639 100644
--- a/pcbnew/zones_non_copper_type_functions.cpp
+++ b/pcbnew/zones_non_copper_type_functions.cpp
@@ -2,18 +2,18 @@
* @file zones_non_copper_type_functions.cpp
*/
-#include "fctsys.h"
-#include "appl_wxstruct.h"
-#include "confirm.h"
-#include "wxPcbStruct.h"
+#include <fctsys.h>
+#include <appl_wxstruct.h>
+#include <confirm.h>
+#include <wxPcbStruct.h>
-#include "class_board.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
-#include "dialog_non_copper_zones_properties_base.h"
+#include <dialog_non_copper_zones_properties_base.h>
/* Class DialogNonCopperZonesEditor
diff --git a/pcbnew/zones_polygons_insulated_copper_islands.cpp b/pcbnew/zones_polygons_insulated_copper_islands.cpp
index 587d19a1a8..cd39935825 100644
--- a/pcbnew/zones_polygons_insulated_copper_islands.cpp
+++ b/pcbnew/zones_polygons_insulated_copper_islands.cpp
@@ -4,16 +4,16 @@
using namespace std;
-#include "fctsys.h"
-#include "common.h"
+#include <fctsys.h>
+#include <common.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
/**
diff --git a/pcbnew/zones_polygons_test_connections.cpp b/pcbnew/zones_polygons_test_connections.cpp
index 3ce13e3c63..bb0c001b01 100644
--- a/pcbnew/zones_polygons_test_connections.cpp
+++ b/pcbnew/zones_polygons_test_connections.cpp
@@ -7,17 +7,17 @@ using namespace std;
#include <algorithm> // sort
-#include "fctsys.h"
-#include "common.h"
-#include "macros.h"
+#include <fctsys.h>
+#include <common.h>
+#include <macros.h>
-#include "class_board.h"
-#include "class_module.h"
-#include "class_track.h"
-#include "class_zone.h"
+#include <class_board.h>
+#include <class_module.h>
+#include <class_track.h>
+#include <class_zone.h>
-#include "pcbnew.h"
-#include "zones.h"
+#include <pcbnew.h>
+#include <zones.h>
static bool CmpZoneSubnetValue( const BOARD_CONNECTED_ITEM* a, const BOARD_CONNECTED_ITEM* b );
void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode );
diff --git a/pcbnew/zones_test_and_combine_areas.cpp b/pcbnew/zones_test_and_combine_areas.cpp
index a9b664612d..63547dca02 100644
--- a/pcbnew/zones_test_and_combine_areas.cpp
+++ b/pcbnew/zones_test_and_combine_areas.cpp
@@ -4,17 +4,17 @@
* some pieces of code come from FreePCB.
*/
-#include "fctsys.h"
-#include "common.h"
-#include "confirm.h"
-#include "class_undoredo_container.h"
+#include <fctsys.h>
+#include <common.h>
+#include <confirm.h>
+#include <class_undoredo_container.h>
-#include "class_board.h"
-#include "class_zone.h"
-#include "class_marker_pcb.h"
+#include <class_board.h>
+#include <class_zone.h>
+#include <class_marker_pcb.h>
-#include "pcbnew.h"
-#include "drc_stuff.h"
+#include <pcbnew.h>
+#include <drc_stuff.h>
static bool bDontShowSelfIntersectionArcsWarning;
diff --git a/polygon/CMakeLists.txt b/polygon/CMakeLists.txt
index ea17a788c5..2ba7f3c11b 100644
--- a/polygon/CMakeLists.txt
+++ b/polygon/CMakeLists.txt
@@ -1,3 +1,9 @@
+
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ${INC_AFTER}
+ )
+
set(POLYGON_SRCS
math_for_graphics.cpp
PolyLine.cpp
diff --git a/polygon/PolyLine.cpp b/polygon/PolyLine.cpp
index 672b973993..7efd6cddd5 100644
--- a/polygon/PolyLine.cpp
+++ b/polygon/PolyLine.cpp
@@ -7,12 +7,12 @@
#include <vector>
#include <algorithm>
-#include "fctsys.h"
-#include "config.h" // to define KICAD_NANOMETRE
+#include <fctsys.h>
+#include <config.h> // to define KICAD_NANOMETRE
-#include "PolyLine.h"
-#include "bezier_curves.h"
-#include "polygon_test_point_inside.h"
+#include <PolyLine.h>
+#include <bezier_curves.h>
+#include <polygon_test_point_inside.h>
#if defined(KICAD_NANOMETRE)
#define PCBU_PER_MIL (1000.0*25.4)
diff --git a/polygon/PolyLine.h b/polygon/PolyLine.h
index 2d9b01e793..ebaa369ff4 100644
--- a/polygon/PolyLine.h
+++ b/polygon/PolyLine.h
@@ -17,8 +17,8 @@
#include <vector>
-#include "kbool/include/kbool/booleng.h"
-#include "pad_shapes.h"
+#include <kbool/include/kbool/booleng.h>
+#include <pad_shapes.h>
// inflection modes for DS_LINE and DS_LINE_VERTEX, used in math_for_graphics.cpp
enum
@@ -69,7 +69,7 @@ public:
};
-#include "math_for_graphics.h"
+#include <math_for_graphics.h>
class CArc
{
@@ -100,7 +100,7 @@ public:
{ return (x != cpt2.x) || (y != cpt2.y) || (end_contour != cpt2.end_contour); }
};
-#include "polygon_test_point_inside.h"
+#include <polygon_test_point_inside.h>
class CPolyLine
{
diff --git a/polygon/math_for_graphics.cpp b/polygon/math_for_graphics.cpp
index 62f9624c7a..94f612a15f 100644
--- a/polygon/math_for_graphics.cpp
+++ b/polygon/math_for_graphics.cpp
@@ -6,9 +6,9 @@
#include <float.h>
#include <limits.h>
-#include "fctsys.h"
+#include <fctsys.h>
-#include "PolyLine.h"
+#include <PolyLine.h>
#define NM_PER_MIL 25400
diff --git a/polygon/polygon_test_point_inside.cpp b/polygon/polygon_test_point_inside.cpp
index 846b9fee64..2f0cd33593 100644
--- a/polygon/polygon_test_point_inside.cpp
+++ b/polygon/polygon_test_point_inside.cpp
@@ -4,7 +4,7 @@
#include <math.h>
#include <vector>
-#include "PolyLine.h"
+#include <PolyLine.h>
/* this algo uses the the Jordan curve theorem to find if a point is inside or outside a polygon:
* It run a semi-infinite line horizontally (increasing x, fixed y)
diff --git a/potrace/CMakeLists.txt b/potrace/CMakeLists.txt
index f54886384d..937f3b75d3 100644
--- a/potrace/CMakeLists.txt
+++ b/potrace/CMakeLists.txt
@@ -1,5 +1,7 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- )
+include_directories(BEFORE ${INC_BEFORE})
+include_directories(
+ ${INC_AFTER}
+ )
set(POTRACE_SRCS
bitmap_io.cpp
diff --git a/potrace/auxiliary.h b/potrace/auxiliary.h
index 041e2a30b7..f96c6a8d02 100644
--- a/potrace/auxiliary.h
+++ b/potrace/auxiliary.h
@@ -9,13 +9,13 @@
#define AUXILIARY_H
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
/* ---------------------------------------------------------------------- */
/* point arithmetic */
-#include "potracelib.h"
+#include <potracelib.h>
struct point_s
{
diff --git a/potrace/bitmap.h b/potrace/bitmap.h
index b3c17ed7ec..6885fc3ae6 100644
--- a/potrace/bitmap.h
+++ b/potrace/bitmap.h
@@ -6,14 +6,14 @@
#define BITMAP_H
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <string.h>
#include <stdlib.h>
/* The bitmap type is defined in potracelib.h */
-#include "potracelib.h"
+#include <potracelib.h>
/* The present file defines some convenient macros and static inline
* functions for accessing bitmaps. Since they only produce inline
diff --git a/potrace/bitmap_io.cpp b/potrace/bitmap_io.cpp
index d628661f16..38665936dd 100644
--- a/potrace/bitmap_io.cpp
+++ b/potrace/bitmap_io.cpp
@@ -8,7 +8,7 @@
#include <stdio.h>
-#include "bitmap.h"
+#include <bitmap.h>
#define INTBITS ( 8 * sizeof(int) )
diff --git a/potrace/bitmap_io.h b/potrace/bitmap_io.h
index 2f5689d893..0590f635bb 100644
--- a/potrace/bitmap_io.h
+++ b/potrace/bitmap_io.h
@@ -9,7 +9,7 @@
#define BITMAP_IO_H
#include <stdio.h>
-#include "bitmap.h"
+#include <bitmap.h>
/* Note that bitmaps are stored bottom to top, i.e., the first
* scanline is the bottom-most one */
diff --git a/potrace/bitops.h b/potrace/bitops.h
index 85b017bbe4..89f4cb0ae9 100644
--- a/potrace/bitops.h
+++ b/potrace/bitops.h
@@ -16,7 +16,7 @@
#define BITOPS_H
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
/* generic macros */
diff --git a/potrace/curve.cpp b/potrace/curve.cpp
index 2984ecbde9..1cb9f0389d 100644
--- a/potrace/curve.cpp
+++ b/potrace/curve.cpp
@@ -9,9 +9,9 @@
#include <stdlib.h>
#include <string.h>
-#include "potracelib.h"
-#include "lists.h"
-#include "curve.h"
+#include <potracelib.h>
+#include <lists.h>
+#include <curve.h>
#define SAFE_MALLOC( var, n, typ ) \
if( ( var = (typ*) malloc( (n)* sizeof(typ) ) ) == NULL ) \
diff --git a/potrace/curve.h b/potrace/curve.h
index a4712fea1f..0a92c73ea7 100644
--- a/potrace/curve.h
+++ b/potrace/curve.h
@@ -5,7 +5,7 @@
#ifndef CURVE_H
#define CURVE_H
-#include "auxiliary.h"
+#include <auxiliary.h>
/* vertex is c[1] for tag=POTRACE_CORNER, and the intersection of
* .c[-1][2]..c[0] and c[1]..c[2] for tag=POTRACE_CURVETO. alpha is only
diff --git a/potrace/decompose.cpp b/potrace/decompose.cpp
index c957d2a33d..76a7cef6da 100644
--- a/potrace/decompose.cpp
+++ b/potrace/decompose.cpp
@@ -9,13 +9,13 @@
#include <string.h>
#include <limits.h>
-#include "potracelib.h"
-#include "curve.h"
-#include "lists.h"
-#include "auxiliary.h"
-#include "bitmap.h"
-#include "decompose.h"
-#include "progress.h"
+#include <potracelib.h>
+#include <curve.h>
+#include <lists.h>
+#include <auxiliary.h>
+#include <bitmap.h>
+#include <decompose.h>
+#include <progress.h>
/* ---------------------------------------------------------------------- */
/* auxiliary bitmap manipulations */
diff --git a/potrace/decompose.h b/potrace/decompose.h
index 1da8847c34..f6148ba02f 100644
--- a/potrace/decompose.h
+++ b/potrace/decompose.h
@@ -7,8 +7,8 @@
#ifndef DECOMPOSE_H
#define DECOMPOSE_H
-#include "potracelib.h"
-#include "progress.h"
+#include <potracelib.h>
+#include <progress.h>
int bm_to_pathlist( const potrace_bitmap_t* bm,
path_t** plistp,
diff --git a/potrace/greymap.cpp b/potrace/greymap.cpp
index 4a45e7b01c..55eda0d45b 100644
--- a/potrace/greymap.cpp
+++ b/potrace/greymap.cpp
@@ -12,7 +12,7 @@
#include <string.h>
#include <math.h>
-#include "greymap.h"
+#include <greymap.h>
#define INTBITS ( 8 * sizeof(int) )
diff --git a/potrace/platform.h b/potrace/platform.h
index 466f309279..1f8dd539dc 100644
--- a/potrace/platform.h
+++ b/potrace/platform.h
@@ -8,7 +8,7 @@
#define PLATFORM_H
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
/* in Windows, set all file i/o to binary */
diff --git a/potrace/potracelib.cpp b/potrace/potracelib.cpp
index e99c5b17a0..26c1aa74c0 100644
--- a/potrace/potracelib.cpp
+++ b/potrace/potracelib.cpp
@@ -6,15 +6,15 @@
#include <stdlib.h>
#include <string.h>
-#include "potracelib.h"
-#include "curve.h"
-#include "decompose.h"
-#include "trace.h"
-#include "progress.h"
-#include "potrace_version.h"
+#include <potracelib.h>
+#include <curve.h>
+#include <decompose.h>
+#include <trace.h>
+#include <progress.h>
+#include <potrace_version.h>
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
/* default parameters */
diff --git a/potrace/render.cpp b/potrace/render.cpp
index 9f310c399d..f7feda06a6 100644
--- a/potrace/render.cpp
+++ b/potrace/render.cpp
@@ -9,9 +9,9 @@
#include <math.h>
#include <string.h>
-#include "render.h"
-#include "greymap.h"
-#include "auxiliary.h"
+#include <render.h>
+#include <greymap.h>
+#include <auxiliary.h>
/* ---------------------------------------------------------------------- */
/* routines for anti-aliased rendering of curves */
diff --git a/potrace/render.h b/potrace/render.h
index f9a3d797c2..5458df0748 100644
--- a/potrace/render.h
+++ b/potrace/render.h
@@ -7,7 +7,7 @@
#ifndef RENDER_H
#define RENDER_H
-#include "greymap.h"
+#include <greymap.h>
struct render_s
{
diff --git a/potrace/trace.cpp b/potrace/trace.cpp
index 9d110fba12..f7cda0df80 100644
--- a/potrace/trace.cpp
+++ b/potrace/trace.cpp
@@ -10,12 +10,12 @@
#include <stdlib.h>
#include <string.h>
-#include "potracelib.h"
-#include "curve.h"
-#include "lists.h"
-#include "auxiliary.h"
-#include "trace.h"
-#include "progress.h"
+#include <potracelib.h>
+#include <curve.h>
+#include <lists.h>
+#include <auxiliary.h>
+#include <trace.h>
+#include <progress.h>
#define INFTY 10000000 /* it suffices that this is longer than any
* path; it need not be really infinite */
diff --git a/potrace/trace.h b/potrace/trace.h
index 7db3afc66c..829bc90331 100644
--- a/potrace/trace.h
+++ b/potrace/trace.h
@@ -7,8 +7,8 @@
#ifndef TRACE_H
#define TRACE_H
-#include "potracelib.h"
-#include "progress.h"
+#include <potracelib.h>
+#include <progress.h>
int process_path( path_t* plist, const potrace_param_t* param, progress_t* progress );