From 55679be2e319e8a315163b51038a17f407890107 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 5 Apr 2021 15:24:57 +0200 Subject: [PATCH] Fix some typos across the codebase --- common/bitmap.cpp | 2 +- common/board_printout.cpp | 2 +- common/dialogs/dialog_edit_library_tables.cpp | 2 +- common/dialogs/panel_hotkeys_editor.cpp | 2 +- common/dialogs/wx_html_report_panel.h | 4 ++-- common/drawing_sheet/ds_data_item.cpp | 2 +- common/drawing_sheet/ds_data_model.cpp | 2 +- common/dsnlexer.cpp | 2 +- common/eda_base_frame.cpp | 4 ++-- common/gal/cairo/cairo_gal.cpp | 4 ++-- common/gal/opengl/opengl_gal.cpp | 6 ++--- common/gal/opengl/utils.cpp | 2 +- common/gbr_metadata.cpp | 6 ++--- common/gr_text.cpp | 2 +- common/grid_tricks.cpp | 2 +- common/plotters/DXF_plotter.cpp | 6 ++--- common/plotters/GERBER_plotter.cpp | 10 ++++---- common/plotters/plotter_gerber.h | 12 +++++----- common/plugins/altium/altium_parser_utils.cpp | 12 +++++----- .../plugins/cadstar/cadstar_archive_parser.h | 24 +++++++++---------- common/preview_items/ruler_item.cpp | 2 +- common/swig/kicad.i | 2 +- common/swig/wx.i | 2 +- common/tool/action_menu.cpp | 2 +- common/tool/tool_manager.cpp | 2 +- common/view/view.cpp | 2 +- common/widgets/infobar.cpp | 2 +- common/widgets/mathplot.cpp | 4 ++-- 28 files changed, 63 insertions(+), 63 deletions(-) diff --git a/common/bitmap.cpp b/common/bitmap.cpp index 46da6cc4ac..d728f72d6e 100644 --- a/common/bitmap.cpp +++ b/common/bitmap.cpp @@ -230,7 +230,7 @@ bool SaveCanvasImageToFile( EDA_DRAW_FRAME* aFrame, const wxString& aFileName, void AddBitmapToMenuItem( wxMenuItem* aMenu, const wxBitmap& aImage ) { - // Retrieve the global applicaton show icon option: + // Retrieve the global application show icon option: bool useImagesInMenus = Pgm().GetCommonSettings()->m_Appearance.use_icons_in_menus; wxItemKind menu_type = aMenu->GetKind(); diff --git a/common/board_printout.cpp b/common/board_printout.cpp index b05c48f171..8d19e22ab2 100644 --- a/common/board_printout.cpp +++ b/common/board_printout.cpp @@ -186,7 +186,7 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa void BOARD_PRINTOUT::setupViewLayers( KIGFX::VIEW& aView, const LSET& aLayerSet ) { - // Disable all layers by default, let specific implementions enable required layers + // Disable all layers by default, let specific implementations enable required layers for( int i = 0; i < KIGFX::VIEW::VIEW_MAX_LAYERS; ++i ) { aView.SetLayerVisible( i, false ); diff --git a/common/dialogs/dialog_edit_library_tables.cpp b/common/dialogs/dialog_edit_library_tables.cpp index 9996db3ed0..e9abf4cb08 100644 --- a/common/dialogs/dialog_edit_library_tables.cpp +++ b/common/dialogs/dialog_edit_library_tables.cpp @@ -75,7 +75,7 @@ bool DIALOG_EDIT_LIBRARY_TABLES::TransferDataFromWindow() { /* Transfer tables edited in dialog to the global and project tables: * A good way is to use m_contentPanel->TransferDataFromWindow to do that. - * But be carefull: + * But be careful: * Since wxWidgets 3.1, it is called by wxDialog::TransferDataFromWindow() * Before wxWidgets 3.1, it is *not* called by wxDialog::TransferDataFromWindow() * m_contentPanel->TransferDataFromWindow do not works with two calls. diff --git a/common/dialogs/panel_hotkeys_editor.cpp b/common/dialogs/panel_hotkeys_editor.cpp index 4733f80ef6..e101bc6253 100644 --- a/common/dialogs/panel_hotkeys_editor.cpp +++ b/common/dialogs/panel_hotkeys_editor.cpp @@ -43,7 +43,7 @@ static const wxSize default_dialog_size { 500, 350 }; * Helper function to add a filter box to a panel, with some * sensible defaults for that purpose. * - * @param aParent The panrent widget/panel + * @param aParent The parent widget/panel * @param aDescriptiveText The text to show when the box is empty. * @return A newly constructed filter box - the caller owns it */ diff --git a/common/dialogs/wx_html_report_panel.h b/common/dialogs/wx_html_report_panel.h index 02f4775c6c..66b5c0f3e6 100644 --- a/common/dialogs/wx_html_report_panel.h +++ b/common/dialogs/wx_html_report_panel.h @@ -68,8 +68,8 @@ public: ///< sets the frame label void SetLabel( const wxString& aLabel ) override; - ///< Sets the lasy update. If this mode is on, messages are stored but the display - ///< is not updated (Updating display can be very time consumming if there are many messages) + ///< Sets the lazy update. If this mode is on, messages are stored but the display + ///< is not updated (Updating display can be very time consuming if there are many messages) ///< A call to Flush() will be needed after build the report void SetLazyUpdate( bool aLazyUpdate ); diff --git a/common/drawing_sheet/ds_data_item.cpp b/common/drawing_sheet/ds_data_item.cpp index 9f424b315b..3094baf710 100644 --- a/common/drawing_sheet/ds_data_item.cpp +++ b/common/drawing_sheet/ds_data_item.cpp @@ -525,7 +525,7 @@ bool DS_DATA_ITEM_POLYGONS::IsInsidePage( int ii ) const return false; pos = GetStartPos( ii ); - pos += m_maxCoord; // rignt bottom pos of bounding box + pos += m_maxCoord; // right bottom pos of bounding box if( model.m_RB_Corner.x < pos.x || model.m_RB_Corner.y < pos.y ) return false; diff --git a/common/drawing_sheet/ds_data_model.cpp b/common/drawing_sheet/ds_data_model.cpp index 7b640321e9..2f3a022552 100644 --- a/common/drawing_sheet/ds_data_model.cpp +++ b/common/drawing_sheet/ds_data_model.cpp @@ -28,7 +28,7 @@ * The WS_DATA_ITEM_* classes define the basic shapes of a drawing sheet (frame references * and title block). The list of these items is stored in a DS_DATA_MODEL instance. * - * These items cannot be drawn or plotetd "as is". They must be converted to WS_DRAW_* + * These items cannot be drawn or plotted "as is". They must be converted to WS_DRAW_* * types. When building the draw list: * - the DS_DATA_MODEL is used to create a DS_DRAW_ITEM_LIST * - coordinates are converted to draw/plot coordinates. diff --git a/common/dsnlexer.cpp b/common/dsnlexer.cpp index f39e0cf026..fd87f31f7f 100644 --- a/common/dsnlexer.cpp +++ b/common/dsnlexer.cpp @@ -680,7 +680,7 @@ L_read: { /* get the dash out of a which is embedded for example like: U2-14 or "U2"-"14" - This is detectable by a non-space immediately preceeding the dash. + This is detectable by a non-space immediately preceding the dash. */ if( *cur == '-' && cur>start && !isSpace( cur[-1] ) ) { diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp index 2e7af1c024..bf8c0c1845 100644 --- a/common/eda_base_frame.cpp +++ b/common/eda_base_frame.cpp @@ -651,7 +651,7 @@ void EDA_BASE_FRAME::SaveWindowSettings( WINDOW_SETTINGS* aCfg ) Pgm().GetCommonSettings()->m_System.autosave_interval = m_autoSaveInterval; // Once this is fully implemented, wxAuiManager will be used to maintain - // the persistance of the main frame and all it's managed windows and + // the persistence of the main frame and all it's managed windows and // all of the legacy frame persistence position code can be removed. aCfg->perspective = m_auimgr.SavePerspective().ToStdString(); @@ -749,7 +749,7 @@ void EDA_BASE_FRAME::FinishAUIInitialization() m_auimgr.Update(); #else // Call Update() to fix all pane default sizes, especially the "InfoBar" pane before - // hidding it. + // hiding it. m_auimgr.Update(); // We don't want the infobar displayed right away diff --git a/common/gal/cairo/cairo_gal.cpp b/common/gal/cairo/cairo_gal.cpp index 8d37576d07..cb152cb5a9 100644 --- a/common/gal/cairo/cairo_gal.cpp +++ b/common/gal/cairo/cairo_gal.cpp @@ -68,7 +68,7 @@ CAIRO_GAL_BASE::CAIRO_GAL_BASE( GAL_DISPLAY_OPTIONS& aDisplayOptions ) : GAL( aD SetGridColor( COLOR4D( 0.1, 0.1, 0.1, 0.8 ) ); SetAxesColor( COLOR4D( BLUE ) ); - // Avoid unitialized variables: + // Avoid uninitialized variables: cairo_matrix_init_identity( &m_currentXform ); cairo_matrix_init_identity( &m_currentWorld2Screen ); } @@ -157,7 +157,7 @@ void CAIRO_GAL_BASE::arc_angles_xform_and_normalize( double& aStartAngle, double // now rotate arc according to the rotation transform matrix // Remark: // We call angle_xform() to calculate angles according to the flip/rotation - // transform and normatize between -2M_PI and +2M_PI. + // transform and normalize between -2M_PI and +2M_PI. // Therefore, if aStartAngle = aEndAngle + 2*n*M_PI, the transform gives // aEndAngle = aStartAngle // So, if this is the case, force the aEndAngle value to draw a circle. diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp index 1873330056..e16f43e9d3 100644 --- a/common/gal/opengl/opengl_gal.cpp +++ b/common/gal/opengl/opengl_gal.cpp @@ -67,7 +67,7 @@ using namespace KIGFX; // and the schematic is a hierarchy and when using cross-probing // When the cross probing from pcbnew to eeschema switches to a sheet, the bitmaps cache // becomes broken (in fact the associated texture). -// I hope (JPC) it will be fixed later, but a slighty slower refresh is better than a crash +// I hope (JPC) it will be fixed later, but a slightly slower refresh is better than a crash #define DISABLE_BITMAP_CACHE // The current font is "Ubuntu Mono" available under Ubuntu Font Licence 1.0 @@ -1958,7 +1958,7 @@ int OPENGL_GAL::drawBitmapChar( unsigned long aChar ) const FONT_GLYPH_TYPE* glyph = LookupGlyph( aChar ); - // If the glyph is not found (happens for many esotheric unicode chars) + // If the glyph is not found (happens for many esoteric unicode chars) // shows a '?' instead. if( !glyph ) glyph = LookupGlyph( '?' ); @@ -2189,7 +2189,7 @@ void OPENGL_GAL::init() if( m_tesselator == NULL ) throw std::runtime_error( "Could not create the m_tesselator" ); - // End initialzation checks + // End initialization checks GLenum err = glewInit(); diff --git a/common/gal/opengl/utils.cpp b/common/gal/opengl/utils.cpp index 1cef93c14b..af60c7a3ca 100644 --- a/common/gal/opengl/utils.cpp +++ b/common/gal/opengl/utils.cpp @@ -139,7 +139,7 @@ int checkGlError( const std::string& aInfo, const char* aFile, int aLine, bool a { if( aThrow ) { - wxLogTrace( traceGalOpenGlError, wxT( "Throwing exection for glGetError() '%s' " + wxLogTrace( traceGalOpenGlError, wxT( "Throwing exception for glGetError() '%s' " "in file '%s' on line %d." ), errorMsg, aFile, aLine ); throw std::runtime_error( (const char*) errorMsg.char_str() ); diff --git a/common/gbr_metadata.cpp b/common/gbr_metadata.cpp index b5a610afba..8ef1c16b50 100644 --- a/common/gbr_metadata.cpp +++ b/common/gbr_metadata.cpp @@ -489,7 +489,7 @@ std::string GBR_DATA_FIELD::GetGerberString() const if( !m_field.IsEmpty() ) converted = ConvertNotAllowedCharsInGerber( m_field, m_useUTF8, m_escapeString ); - // Convert the char string to std::string. Be carefull when converting a wxString to + // Convert the char string to std::string. Be careful when converting a wxString to // a std::string: using static_cast is mandatory std::string txt = static_cast( converted.utf8_str() ); @@ -512,7 +512,7 @@ std::string FormatStringToGerber( const wxString& aString ) else converted = aString; - // Convert the char string to std::string. Be carefull when converting awxString to + // Convert the char string to std::string. Be careful when converting awxString to // a std::string: using static_cast is mandatory std::string txt = static_cast( converted.utf8_str() ); @@ -723,7 +723,7 @@ void GBR_CMP_PNP_METADATA::ClearData() m_MountType = MOUNT_TYPE_UNSPECIFIED; } /** - * @return a string containing the formated metadata in X2 syntax. + * @return a string containing the formatted metadata in X2 syntax. * one line by non empty data * the orientation (.CRot) and mount type (.CMnt) are always generated */ diff --git a/common/gr_text.cpp b/common/gr_text.cpp index e00b540b15..fce5f51bb8 100644 --- a/common/gr_text.cpp +++ b/common/gr_text.cpp @@ -201,7 +201,7 @@ void GRHaloText( wxDC * aDC, const wxPoint &aPos, COLOR4D aBgColor, COLOR4D aCol /** * Function PLOTTER::Text - * same as GRText, but plot graphic text insteed of draw it + * same as GRText, but plot graphic text instead of draw it * @param aPos = text position (according to aH_justify, aV_justify) * @param aColor (COLOR4D) = text color * @param aText = text to draw diff --git a/common/grid_tricks.cpp b/common/grid_tricks.cpp index 93e9c28031..d0dfcc2174 100644 --- a/common/grid_tricks.cpp +++ b/common/grid_tricks.cpp @@ -29,7 +29,7 @@ #include -// It works for table data on clipboard for an Excell spreadsheet, +// It works for table data on clipboard for an Excel spreadsheet, // why not us too for now. #define COL_SEP wxT( '\t' ) #define ROW_SEP wxT( '\n' ) diff --git a/common/plotters/DXF_plotter.cpp b/common/plotters/DXF_plotter.cpp index 294414b3b7..c590abfdbc 100644 --- a/common/plotters/DXF_plotter.cpp +++ b/common/plotters/DXF_plotter.cpp @@ -478,7 +478,7 @@ void DXF_PLOTTER::Circle( const wxPoint& centre, int diameter, FILL_TYPE fill, i /** * DXF polygon: doesn't fill it but at least it close the filled ones * DXF does not know thick outline. - * It does not know thhick segments, therefore filled polygons with thick outline + * It does not know thick segments, therefore filled polygons with thick outline * are converted to inflated polygon by aWidth/2 */ void DXF_PLOTTER::PlotPoly( const std::vector& aCornerList, @@ -709,7 +709,7 @@ void DXF_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, /** - * DXF rectangular pad: alwayd done in sketch mode + * DXF rectangular pad: always done in sketch mode */ void DXF_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize, double orient, OUTLINE_MODE trace_mode, void* aData ) @@ -1001,7 +1001,7 @@ void DXF_PLOTTER::Text( const wxPoint& aPos, but today I'm lazy and I have no idea on how to coerce a Unicode wxString to spit out latin1 encoded text ... - Atleast stdio is *supposed* to do output buffering, so there is + At least stdio is *supposed* to do output buffering, so there is hope is not too slow */ wchar_t ch = aText[i]; diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp index 42e60ea3c0..dbea78cd7d 100644 --- a/common/plotters/GERBER_plotter.cpp +++ b/common/plotters/GERBER_plotter.cpp @@ -97,7 +97,7 @@ GERBER_PLOTTER::GERBER_PLOTTER() m_apertureAttribute = 0; // number of digits after the point (number of digits of the mantissa - // Be carefull: the Gerber coordinates are stored in an integer + // Be careful: the Gerber coordinates are stored in an integer // so 6 digits (inches) or 5 digits (mm) is a good value // To avoid overflow, 7 digits (inches) or 6 digits is a max. // with lower values than 6 digits (inches) or 5 digits (mm), @@ -166,14 +166,14 @@ void GERBER_PLOTTER::ClearAllAttributes() else fputs( "G04 #@! TD*\n", m_outputFile ); - m_objectAttributesDictionnary.clear(); + m_objectAttributesDictionary.clear(); } void GERBER_PLOTTER::clearNetAttribute() { // disable a Gerber net attribute (exists only in X2 with net attributes mode). - if( m_objectAttributesDictionnary.empty() ) // No net attribute or not X2 mode + if( m_objectAttributesDictionary.empty() ) // No net attribute or not X2 mode return; // Remove all net attributes from object attributes dictionary @@ -182,7 +182,7 @@ void GERBER_PLOTTER::clearNetAttribute() else fputs( "G04 #@! TD*\n", m_outputFile ); - m_objectAttributesDictionnary.clear(); + m_objectAttributesDictionary.clear(); } @@ -216,7 +216,7 @@ void GERBER_PLOTTER::formatNetAttribute( GBR_NETLIST_METADATA* aData ) bool clearDict; std::string short_attribute_string; - if( !FormatNetAttribute( short_attribute_string, m_objectAttributesDictionnary, + if( !FormatNetAttribute( short_attribute_string, m_objectAttributesDictionary, aData, clearDict, useX1StructuredComment ) ) return; diff --git a/common/plotters/plotter_gerber.h b/common/plotters/plotter_gerber.h index 21f0e1b821..0e02d880f3 100644 --- a/common/plotters/plotter_gerber.h +++ b/common/plotters/plotter_gerber.h @@ -220,7 +220,7 @@ public: * @param aRadius = the radius used for some shapes tool (oval, roundrect macros) * @param aRotDegree = the rotation of tool (primitives round, oval rect accept only 0.0) * @param aType = the type ( shape ) of tool - * @param aApertureAttribute = an aperture attribute of the tool (a tool can have onlu one attribute) + * @param aApertureAttribute = an aperture attribute of the tool (a tool can have only one attribute) * 0 = no specific attribute */ int GetOrCreateAperture( const wxSize& aSize, int aRadius, double aRotDegree, @@ -232,7 +232,7 @@ public: * @param aCorners = the corner list * @param aRotDegree = the rotation of tool * @param aType = the type ( shape ) of tool that can manage a list of corners (polygon) - * @param aApertureAttribute = an aperture attribute of the tool (a tool can have onlu one attribute) + * @param aApertureAttribute = an aperture attribute of the tool (a tool can have only one attribute) * 0 = no specific attribute */ int GetOrCreateAperture( const std::vector& aCorners, double aRotDegree, @@ -301,7 +301,7 @@ protected: * print a Gerber net attribute object record. * In a gerber file, a net attribute is owned by a graphic object * formatNetAttribute must be called before creating the object - * @param aData contains the dato to format. + * @param aData contains the data to format. * the generated string depends on the type of netlist info */ void formatNetAttribute( GBR_NETLIST_METADATA* aData ); @@ -309,7 +309,7 @@ protected: /** * clear a Gerber net attribute record (clear object attribute dictionary) * and output the clear object attribute dictionary command to gerber file - * has effect only if a net attribute is stored in m_objectAttributesDictionnary + * has effect only if a net attribute is stored in m_objectAttributesDictionary */ void clearNetAttribute(); @@ -317,10 +317,10 @@ protected: // by D01, D03, G36/G37 commands // standard attributes are .P, .C and .N // this is used by gerber readers when creating a new object. Cleared by %TD command - // Note: m_objectAttributesDictionnary can store more than one attribute + // Note: m_objectAttributesDictionary can store more than one attribute // the string stores the line(s) actually written to the gerber file // it can store a .P, .C or .N attribute, or 2 or 3 attributes, separated by a \n char (EOL) - std::string m_objectAttributesDictionnary; + std::string m_objectAttributesDictionary; // The last aperture attribute generated (only one aperture attribute can be set) int m_apertureAttribute; diff --git a/common/plugins/altium/altium_parser_utils.cpp b/common/plugins/altium/altium_parser_utils.cpp index 9d21360294..09297d93ee 100644 --- a/common/plugins/altium/altium_parser_utils.cpp +++ b/common/plugins/altium/altium_parser_utils.cpp @@ -53,14 +53,14 @@ wxString AltiumSpecialStringsToKiCadVariables( const wxString& aStr wxString result; size_t start = 1; - size_t delemiter = 0; + size_t delimiter = 0; size_t escaping_start = 0; do { - delemiter = aString.find( "+", start ); + delimiter = aString.find( "+", start ); escaping_start = aString.find( "'", start ); - if( escaping_start < delemiter ) + if( escaping_start < delimiter ) { size_t text_start = escaping_start + 1; size_t escaping_end = aString.find( "'", text_start ); @@ -75,7 +75,7 @@ wxString AltiumSpecialStringsToKiCadVariables( const wxString& aStr } else { - wxString specialString = aString.substr( start, delemiter - start ).Trim( true ); + wxString specialString = aString.substr( start, delimiter - start ).Trim( true ); if( !specialString.IsEmpty() ) { @@ -89,9 +89,9 @@ wxString AltiumSpecialStringsToKiCadVariables( const wxString& aStr result += variableOverride->second; } } - start = delemiter + 1; + start = delimiter + 1; } - } while( delemiter != wxString::npos ); + } while( delimiter != wxString::npos ); return result; } \ No newline at end of file diff --git a/common/plugins/cadstar/cadstar_archive_parser.h b/common/plugins/cadstar/cadstar_archive_parser.h index ca81175ee1..c74a011734 100644 --- a/common/plugins/cadstar/cadstar_archive_parser.h +++ b/common/plugins/cadstar/cadstar_archive_parser.h @@ -32,7 +32,7 @@ #include #include -// THROW_IO_ERROR definitions to ensure consident wording is used in the error messages +// THROW_IO_ERROR definitions to ensure consistent wording is used in the error messages #define THROW_MISSING_NODE_IO_ERROR( nodename, location ) \ THROW_IO_ERROR( wxString::Format( _( "Missing node '%s' in '%s'" ), nodename, location ) ) @@ -122,7 +122,7 @@ public: static const double TXT_HEIGHT_RATIO; /** - * These are speccial fields in text objects enclosed between the tokens '<@' and '@>' such as + * These are special fields in text objects enclosed between the tokens '<@' and '@>' such as * <@[FIELD_NAME][FIELD_VALUE]@>. For example: "<@DESIGN TITLEProject Title@>" */ enum class TEXT_FIELD_NAME @@ -180,7 +180,7 @@ public: /** * Text fields need to be updated in CADSTAR and it is possible that they are not - * consistent accross text elements. + * consistent across text elements. */ std::set InconsistentTextFields; }; @@ -598,7 +598,7 @@ public: static JUSTIFICATION ParseJustification( XNODE* aNode ); /** - * @brief Sets the readibility direction of text. From CADSTAR Help: "Horizontal text will + * @brief Sets the readability direction of text. From CADSTAR Help: "Horizontal text will * always be displayed from left to right (i.e. never upside down). Vertical text can be set as * readable from either the left or right edge of the design." * @@ -649,7 +649,7 @@ public: SYMBOL, ///< From CADSTAR Help: Assigned to Schematic Symbols and displayed on ///< Schematic Designs UNDEFINED ///< Note: It seems that some attribute have no "ATTRUSAGE" defined. It appears - ///< that the attributes that fall under this category arethe ones associated + ///< that the attributes that fall under this category are the ones associated ///< with the design itself (i.e. not inherited from the library) }; @@ -708,7 +708,7 @@ public: ATTRUSAGE AttributeUsage = ATTRUSAGE::UNDEFINED; bool NoTransfer = false; ///< True="All Design Types", False="Current Design Type" ///< "All Design Types" Description from CADSTAR Help: - ///< "The selected attribute name will beavailable when + ///< "The selected attribute name will be available when ///< any design is displayed" ///< "Current Design Type" From CADSTAR Help: This ///< restricts the availability of the selected attribute @@ -926,7 +926,7 @@ public: { enum class PIN_TYPE { - UNCOMMITTED, ///< Uncomitted pin (default) + UNCOMMITTED, ///< Uncommitted pin (default) INPUT, ///< Input pin OUTPUT_OR, ///< Output pin OR tieable OUTPUT_NOT_OR, ///< Output pin not OR tieable @@ -1058,7 +1058,7 @@ public: wxString Name; ///< This name can be different to the PART name bool HidePinNames = - false; ///< Specifies whether to display the pin names/indentifier in + false; ///< Specifies whether to display the pin names/identifier in ///< the schematic symbol or not. E.g. it is useful to display ///< pin name information for integrated circuits but less so ///< for resistors and capacitors. (subnode HIDEPINNAMES) @@ -1105,7 +1105,7 @@ public: ///< Therefore, PART_PIN is only included for ///< completeness of the parser, but won't be used - bool HidePinNames = false; ///< This seems to be a dupplicate of DEFINITION::HidePinNames + bool HidePinNames = false; ///< This seems to be a duplicate of DEFINITION::HidePinNames ///< Possibly only used in older file formats? std::map AttributeValues; ///< Some attributes are defined @@ -1322,7 +1322,7 @@ public: static void ParseChildEValue( XNODE* aNode, PARSER_CONTEXT* aContext, EVALUE& aValueToParse ); /** - * @brief if no childs are present, it just returns an empty + * @brief if no children are present, it just returns an empty * vector (without throwing an exception) * @param aNode containing a series of POINT objects * @param aTestAllChildNodes @@ -1337,7 +1337,7 @@ public: bool aTestAllChildNodes = false, int aExpectedNumPoints = UNDEFINED_VALUE ); /** - * @brief if no childs are present, it just returns an empty + * @brief if no children are present, it just returns an empty * vector (without throwing an exception) * @param aNode containing a series of VERTEX objects * @param aTestAllChildNodes @@ -1351,7 +1351,7 @@ public: XNODE* aNode, PARSER_CONTEXT* aContext, bool aTestAllChildNodes = false ); /** - * @brief if no childs are present, it just returns an empty + * @brief if no children are present, it just returns an empty * vector (without throwing an exception) * @param aNode containing a series of CUTOUT objects * @param aTestAllChildNodes diff --git a/common/preview_items/ruler_item.cpp b/common/preview_items/ruler_item.cpp index 2b71176f77..1661d923bd 100644 --- a/common/preview_items/ruler_item.cpp +++ b/common/preview_items/ruler_item.cpp @@ -132,7 +132,7 @@ static TICK_FORMAT getTickFormatForScale( double aScale, double& aTickSpace, EDA /** * Draw labelled ticks on a line. Ticks are spaced according to a - * maximum density. Miror ticks are not labelled. + * maximum density. Minor ticks are not labelled. * * @param aGal the GAL to draw on * @param aOrigin start of line to draw ticks on diff --git a/common/swig/kicad.i b/common/swig/kicad.i index d4569b35f2..3b8737a5e0 100644 --- a/common/swig/kicad.i +++ b/common/swig/kicad.i @@ -62,7 +62,7 @@ principle should be easily implemented by adapting the current STL containers. %warnfilter(509) UTF8; /* swig tries to wrap SetBack/SetNext on derived classes, but this method is - private for most childs, so if we don't ignore it won't compile */ + private for most children, so if we don't ignore it won't compile */ %ignore EDA_ITEM::SetBack; %ignore EDA_ITEM::SetNext; diff --git a/common/swig/wx.i b/common/swig/wx.i index 9f74deee2d..c0862cff18 100644 --- a/common/swig/wx.i +++ b/common/swig/wx.i @@ -235,7 +235,7 @@ public: when printing a value in situ that was not returned from a wrapped function. Remember wxString return values of functions are converted by the typemaps. - No wxString constructor is given to SWIG, since wxString contruction is + No wxString constructor is given to SWIG, since wxString construction is always done in C++, but python needs to know that it can delete a wxString when necessary. And most importantly we need to see a string's contents so the __str__() function must show content. diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp index bf1ac20106..8ba2fc98f8 100644 --- a/common/tool/action_menu.cpp +++ b/common/tool/action_menu.cpp @@ -169,7 +169,7 @@ wxMenuItem* ACTION_MENU::Add( const TOOL_ACTION& aAction, bool aIsCheckmarkEntry /// ID numbers for tool actions are assigned above ACTION_BASE_UI_ID inside TOOL_EVENT BITMAPS icon = aAction.GetIcon(); - // Allow the label to be overriden at point of use + // Allow the label to be overridden at point of use wxString menuLabel = aOverrideLabel.IsEmpty() ? aAction.GetMenuItem() : aOverrideLabel; wxMenuItem* item = new wxMenuItem( this, aAction.GetUIId(), menuLabel, diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp index 8ab846ab2c..7002404be8 100644 --- a/common/tool/tool_manager.cpp +++ b/common/tool/tool_manager.cpp @@ -754,7 +754,7 @@ bool TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent ) handled = true; if( !st->cofunc->Running() ) - finishTool( st ); // The couroutine has finished immediately? + finishTool( st ); // The coroutine has finished immediately? // if it is a message, continue processing finished = !( aEvent.Category() == TC_MESSAGE ); diff --git a/common/view/view.cpp b/common/view/view.cpp index 18610cf05a..b3d8442444 100644 --- a/common/view/view.cpp +++ b/common/view/view.cpp @@ -121,7 +121,7 @@ private: /** * Set a group id for the item and the layer combination. * - * @param aLayer is the layer numbe. + * @param aLayer is the layer number. * @param aGroup is the group id. */ void setGroup( int aLayer, int aGroup ) diff --git a/common/widgets/infobar.cpp b/common/widgets/infobar.cpp index 74fdc72e87..b110ca7033 100644 --- a/common/widgets/infobar.cpp +++ b/common/widgets/infobar.cpp @@ -195,7 +195,7 @@ void WX_INFOBAR::onSize( wxSizeEvent& aEvent ) // Calculate the horizontal size: because the infobar is shown on top of the draw canvas // it is adjusted to the canvas width. // On Mac, the canvas is the parent - // On other OS the parent is EDA_BASE_FRAME thta contains the canvas + // On other OS the parent is EDA_BASE_FRAME that contains the canvas int parentWidth = m_parent->GetClientSize().GetWidth(); EDA_BASE_FRAME* frame = dynamic_cast( m_parent ); diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp index 89121c0049..d120b82191 100644 --- a/common/widgets/mathplot.cpp +++ b/common/widgets/mathplot.cpp @@ -3277,7 +3277,7 @@ void mpFXYVector::Clear() void mpFXYVector::SetData( const std::vector& xs, const std::vector& ys ) { - // Check if the data vectora are of the same size + // Check if the data vectors are of the same size if( xs.size() != ys.size() ) return; @@ -3803,7 +3803,7 @@ void mpBitmapLayer::Plot( wxDC& dc, mpWindow& w ) double screenPixelX = ( x1 - x0 ) / (double) m_bitmap.GetWidth(); double screenPixelY = ( y1 - y0 ) / (double) m_bitmap.GetHeight(); - // The minimum number of pixels that the streched image will overpass the actual mpWindow borders: + // The minimum number of pixels that the stretched image will overpass the actual mpWindow borders: wxCoord borderMarginX = (wxCoord) (screenPixelX + 1); // ceil wxCoord borderMarginY = (wxCoord) (screenPixelY + 1); // ceil