From 1632707d9b0a3e1c6f5da3cb79cb481deff875fb Mon Sep 17 00:00:00 2001 From: "Marcus A. Romer" <5656753-aimylios@users.noreply.gitlab.com> Date: Sun, 4 Apr 2021 08:48:02 +0200 Subject: [PATCH] Replace tabs with spaces --- CMakeLists.txt | 2 +- CMakeModules/Findngspice.cmake | 2 +- CMakeModules/FindwxPython.cmake | 6 +++--- CMakeModules/config.h.cmake | 6 +++--- CMakeSettings.json.sample | 10 +++++----- DoxygenLayout.xml | 1 - eeschema/hierarch.cpp | 6 +++--- eeschema/sch_text_help.md | 6 +++--- gerbview/excellon_image.h | 4 ++-- helpers/gal_bitmap_font/png2struct.py | 6 +++--- include/build_version.h | 2 +- include/gal/graphics_abstraction_layer.h | 4 ++-- include/gal/opengl/shader.h | 2 +- include/mail_type.h | 2 +- include/undo_redo_container.h | 2 +- include/widgets/mathplot.h | 2 +- libs/kimath/include/geometry/poly_grid_partition.h | 6 ++++-- utils/kicad2step/panel_kicad2step.h | 2 +- 18 files changed, 36 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab3f58d6c6..11d9ebba39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -827,7 +827,7 @@ if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) set( PYTHON_DEST "${OSX_BUNDLE_BUILD_LIB_DIR}/${PYTHON_LIB_DIR}" CACHE PATH "Python module install path." ) - elseif( VCPKG_TOOLCHAIN ) + elseif( VCPKG_TOOLCHAIN ) set( PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/bin/Lib/site-packages" CACHE PATH "Python module install path." ) diff --git a/CMakeModules/Findngspice.cmake b/CMakeModules/Findngspice.cmake index c88fd0a262..1545f8a8d8 100644 --- a/CMakeModules/Findngspice.cmake +++ b/CMakeModules/Findngspice.cmake @@ -141,7 +141,7 @@ if( ${NGSPICE_INCLUDE_DIR} STREQUAL "NGSPICE_INCLUDE_DIR-NOTFOUND" OR ${NGSPICE_ endif() find_package_handle_standard_args( ngspice - REQUIRED_VARS NGSPICE_INCLUDE_DIR NGSPICE_LIBRARY NGSPICE_DLL ) + REQUIRED_VARS NGSPICE_INCLUDE_DIR NGSPICE_LIBRARY NGSPICE_DLL ) mark_as_advanced( NGSPICE_INCLUDE_DIR diff --git a/CMakeModules/FindwxPython.cmake b/CMakeModules/FindwxPython.cmake index 8d5ae3858b..a671bba7b2 100644 --- a/CMakeModules/FindwxPython.cmake +++ b/CMakeModules/FindwxPython.cmake @@ -45,9 +45,9 @@ if( VCPKG_TOOLCHAIN ) # python 3.8+ requires us to use python to add additiona load directories (PATH no longer supported) # vcpkg does not copy all the dlls into the python folder so we need this for development # as the wxpython modules need the wxwidgets library DLLs to load - set( _py_dll "import os;os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin\");os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin\");" ) + set( _py_dll "import os;os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin\");os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin\");" ) else() - set( _py_dll "" ) + set( _py_dll "" ) endif() execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${_py_dll}${_py_site_path}${_py_cmd}" @@ -79,7 +79,7 @@ list( GET _WXPYTHON_VERSION_LIST 2 WXPYTHON_FLAVOR ) # Determine wxWidgets version used by wxPython/Phoenix if( WXPYTHON_FLAVOR MATCHES "phoenix" ) # 4.0.1;gtk3;(phoenix) does not contain wxWidgets version, request it explicitly - + set( _py_cmd "import wx;print(wx.wxWidgets_version.split(' ')[1])") execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${_py_dll}${_py_site_path}${_py_cmd}" RESULT_VARIABLE WXPYTHON_WXVERSION_RESULT diff --git a/CMakeModules/config.h.cmake b/CMakeModules/config.h.cmake index 3281570885..b1b59e511b 100644 --- a/CMakeModules/config.h.cmake +++ b/CMakeModules/config.h.cmake @@ -83,13 +83,13 @@ #define PYTHON_DEST "@PYTHON_DEST@" /// Allows scripts install directory to be referenced by the program code. -#define KICAD_DATA "@KICAD_DATA@" +#define KICAD_DATA "@KICAD_DATA@" // Plugins directory -#define KICAD_PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@" +#define KICAD_PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@" /// ngspice version string detected by pkg-config when available. -#cmakedefine NGSPICE_BUILD_VERSION "@NGSPICE_BUILD_VERSION@" +#cmakedefine NGSPICE_BUILD_VERSION "@NGSPICE_BUILD_VERSION@" /// When pkg-config config is not available for ngspice, use ngspice/config.h for version. #cmakedefine NGSPICE_HAVE_CONFIG_H diff --git a/CMakeSettings.json.sample b/CMakeSettings.json.sample index e82f7f9e2b..de2ac73dca 100644 --- a/CMakeSettings.json.sample +++ b/CMakeSettings.json.sample @@ -3,7 +3,7 @@ { "BuildDir": "${workspaceRoot}\\build", "InstallDir": "${workspaceRoot}\\build\\install" - }, + }, { "environment": "vcpkg", "VcPkgDir": "D:/vcpkg/" @@ -76,11 +76,11 @@ "value": "OFF", "type": "BOOL" }, - { + { "name": "KICAD_WIN32_DPI_AWARE", "value": "ON", "type": "BOOL" - } + } ], "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake" }, @@ -140,11 +140,11 @@ "value": "OFF", "type": "BOOL" }, - { + { "name": "KICAD_WIN32_DPI_AWARE", "value": "ON", "type": "BOOL" - } + } ], "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake" }, diff --git a/DoxygenLayout.xml b/DoxygenLayout.xml index 616b274ab4..606a3b9543 100644 --- a/DoxygenLayout.xml +++ b/DoxygenLayout.xml @@ -34,7 +34,6 @@ - diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp index 3b98985c29..2088031aac 100644 --- a/eeschema/hierarch.cpp +++ b/eeschema/hierarch.cpp @@ -138,8 +138,8 @@ HIERARCHY_NAVIG_DLG::HIERARCHY_NAVIG_DLG( SCH_EDIT_FRAME* aParent ) : // Manage a simple click on a selection, if the selection changes Bind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); - // Connect close event for the dialog: - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); + // Connect close event for the dialog: + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); } @@ -148,7 +148,7 @@ HIERARCHY_NAVIG_DLG::~HIERARCHY_NAVIG_DLG() Unbind( wxEVT_TREE_ITEM_ACTIVATED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); Unbind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); m_Tree->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HIERARCHY_TREE::onChar ) ); - Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); + Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); } diff --git a/eeschema/sch_text_help.md b/eeschema/sch_text_help.md index cd572c6786..637d747fb6 100644 --- a/eeschema/sch_text_help.md +++ b/eeschema/sch_text_help.md @@ -86,9 +86,9 @@
-  
{net1 net2 ...} - -  
net1, net2, ... +  
{net1 net2 ...} + +  
net1, net2, ...  
{SCL SDA} diff --git a/gerbview/excellon_image.h b/gerbview/excellon_image.h index a52cd4cea2..80181d5a41 100644 --- a/gerbview/excellon_image.h +++ b/gerbview/excellon_image.h @@ -229,7 +229,7 @@ private: * The following table provides you with a list of commands which * are the most used in a part program header. * COMMAND DESCRIPTION - * AFS Automatic Feeds and Speeds + * AFS Automatic Feeds and Speeds * ATC Automatic Tool Change * BLKD Delete all Blocks starting with a slash (/) * CCW Clockwise or Counter-clockwise Routing @@ -288,7 +288,7 @@ private: * G01X#Y# Linear (Straight Line) Route Mode YX is the ending point * G02X#Y#... Circular CW Mode. Radius value (A#) or Center position (I#J#) follows * G03X#Y#... Circular CCW Mode. Radius value (A#) or Center position (I#J#) follows - * G04 X# Variable Dwell + * G04X# Variable Dwell * G05 Drill Mode * G07 Override current tool feed or speed * G32X#Y#A# Routed Circle Canned Cycle diff --git a/helpers/gal_bitmap_font/png2struct.py b/helpers/gal_bitmap_font/png2struct.py index bd65f779e6..ee92d43886 100644 --- a/helpers/gal_bitmap_font/png2struct.py +++ b/helpers/gal_bitmap_font/png2struct.py @@ -34,10 +34,10 @@ def convert(png_file): img = r.read() print(img); - + if img[3].get("alpha") == True: print('Detected alpha channel!'); - + output = open(os.path.splitext(png_file)[0] + '_img.c', 'w') width = img[0] @@ -60,7 +60,7 @@ static const struct { for row in img[2]: for p in row[3::4]: output.write('%d,' % p) - output.write('\n'); + output.write('\n'); else: for row in img[2]: for p in row: diff --git a/include/build_version.h b/include/build_version.h index 0daeb44389..41acf9e152 100644 --- a/include/build_version.h +++ b/include/build_version.h @@ -71,4 +71,4 @@ wxString GetBuildDate(); */ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml = false, bool aBrief = false ); -#endif // KICAD_BUILD_VERSION_H +#endif // KICAD_BUILD_VERSION_H diff --git a/include/gal/graphics_abstraction_layer.h b/include/gal/graphics_abstraction_layer.h index 3125f49db8..c5cf4d228f 100644 --- a/include/gal/graphics_abstraction_layer.h +++ b/include/gal/graphics_abstraction_layer.h @@ -143,8 +143,8 @@ public: * DrawArc() draws a "pie piece" when fill is turned on, and a thick stroke when fill is off. * DrawArcSegment() with fill *on* behaves like DrawArc() with fill *off*. * DrawArcSegment() with fill *off* draws the outline of what it would have drawn with fill on. - * - * TODO: Unify Arc routines + * + * TODO: Unify Arc routines * * @param aCenterPoint is the center point of the arc. * @param aRadius is the arc radius. diff --git a/include/gal/opengl/shader.h b/include/gal/opengl/shader.h index 3ff2c36719..779f8b9474 100644 --- a/include/gal/opengl/shader.h +++ b/include/gal/opengl/shader.h @@ -43,7 +43,7 @@ class OPENGL_GAL; /// Type definition for the shader enum SHADER_TYPE { - SHADER_TYPE_VERTEX = GL_VERTEX_SHADER, ///< Vertex shader + SHADER_TYPE_VERTEX = GL_VERTEX_SHADER, ///< Vertex shader SHADER_TYPE_FRAGMENT = GL_FRAGMENT_SHADER, ///< Fragment shader SHADER_TYPE_GEOMETRY = GL_GEOMETRY_SHADER ///< Geometry shader }; diff --git a/include/mail_type.h b/include/mail_type.h index 35463a1c03..f246e3b16e 100644 --- a/include/mail_type.h +++ b/include/mail_type.h @@ -49,7 +49,7 @@ enum MAIL_T MAIL_SCH_REFRESH, // Tell the schematic editor to refresh the display. MAIL_SCH_CLEAN_NETCLASSES, // Tell the schematic editor to clean stale nets out of // the netclass membership lists - MAIL_REANNOTATE, // Reannotate eeSchema + MAIL_REANNOTATE, // Reannotate eeSchema MAIL_LIB_EDIT, MAIL_FP_EDIT }; diff --git a/include/undo_redo_container.h b/include/undo_redo_container.h index 0387f098b5..78ba2a04d5 100644 --- a/include/undo_redo_container.h +++ b/include/undo_redo_container.h @@ -54,7 +54,7 @@ class BASE_SCREEN; */ enum class UNDO_REDO { UNSPECIFIED = 0, // illegal - NOP, // Undo/redo will ignore this entry. Only forces the start of a new stack + NOP, // Undo/redo will ignore this entry. Only forces the start of a new stack CHANGED, // params of items have a value changed: undo is made by exchange // values with a copy of these values NEWITEM, // new item, undo by changing in deleted diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h index a517e9c674..2853324ff3 100644 --- a/include/widgets/mathplot.h +++ b/include/widgets/mathplot.h @@ -307,7 +307,7 @@ public: const wxBrush& GetBrush() const { return m_brush; }; /** Set layer brush - * @param brush brush, will be copied to internal class member */ + * @param brush brush, will be copied to internal class member */ void SetBrush( wxBrush brush ) { m_brush = brush; }; protected: diff --git a/libs/kimath/include/geometry/poly_grid_partition.h b/libs/kimath/include/geometry/poly_grid_partition.h index 83bd7a85d5..289da09d80 100644 --- a/libs/kimath/include/geometry/poly_grid_partition.h +++ b/libs/kimath/include/geometry/poly_grid_partition.h @@ -391,7 +391,8 @@ private: int yy = poly2gridY( py ); indices.insert( m_gridSize * yy + x ); - if( x > 0 ) + + if( x > 0 ) indices.insert( m_gridSize * yy + x - 1 ); } @@ -414,7 +415,8 @@ private: int xx = poly2gridX( px ); indices.insert( m_gridSize * y + xx ); - if( y > 0 ) + + if( y > 0 ) indices.insert( m_gridSize * (y - 1) + xx ); } } diff --git a/utils/kicad2step/panel_kicad2step.h b/utils/kicad2step/panel_kicad2step.h index b46ea44f73..346c6f4185 100644 --- a/utils/kicad2step/panel_kicad2step.h +++ b/utils/kicad2step/panel_kicad2step.h @@ -60,7 +60,7 @@ public: class PANEL_KICAD2STEP: public wxPanel { public: - PANEL_KICAD2STEP( wxWindow* parent, wxWindowID id = wxID_ANY, + PANEL_KICAD2STEP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL );