From a35dd3feea2dbad9b2712c26e377d98eb0545c41 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Mon, 8 Jan 2018 10:23:04 -0500 Subject: [PATCH] Typos The stepcode typos aren't to be found upstream. Recomend we merge nonetheless. --- src/Base/PyExport.h | 4 ++-- src/Mod/Import/App/SCL/Part21.py | 2 +- src/Mod/Import/App/SCL/SimpleReader.py | 2 +- src/Mod/Path/App/Area.cpp | 2 +- src/Mod/Path/PathCommands.py | 2 +- src/Mod/Spreadsheet/App/Sheet.cpp | 2 +- src/Mod/Spreadsheet/App/SheetPy.xml | 2 +- src/Mod/Spreadsheet/importXLSX.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Base/PyExport.h b/src/Base/PyExport.h index 2a16200598..15ad55e229 100644 --- a/src/Base/PyExport.h +++ b/src/Base/PyExport.h @@ -101,8 +101,8 @@ class PyObjectBase; /** Python Object handle class * Using pointers on classes derived from PyObjectBase would * be potentionaly dangerous because you would have to take - * care of the reference counting of python by your self. There - * fore this class was designd. It takes care of references and + * care of the reference counting of python by your self. Hence + * this class was designed. It takes care of references and * as long as a object of this class exists the handled class get * not destructed. That means a PyObjectBase derived object you can * only destruct by destructing all FCPyHandle and all python diff --git a/src/Mod/Import/App/SCL/Part21.py b/src/Mod/Import/App/SCL/Part21.py index 8583f87d21..ab575ad107 100644 --- a/src/Mod/Import/App/SCL/Part21.py +++ b/src/Mod/Import/App/SCL/Part21.py @@ -94,7 +94,7 @@ class Part21Parser: """ Loads all instances definition of a Part21 file into memory. Two dicts are created: - self._instance_definition : stores attibutes, key is the instance integer id + self._instance_definition : stores attributes, key is the instance integer id self._number_of_ancestors : stores the number of ancestors of entity id. This enables to define the order of instances creation. """ diff --git a/src/Mod/Import/App/SCL/SimpleReader.py b/src/Mod/Import/App/SCL/SimpleReader.py index e1f6dd2b18..1c631d2eb1 100644 --- a/src/Mod/Import/App/SCL/SimpleReader.py +++ b/src/Mod/Import/App/SCL/SimpleReader.py @@ -51,7 +51,7 @@ class SimpleParser: Part21.Part21Parser Loads all instances definition of a Part21 file into memory. Two dicts are created: - Part21.Part21Parser._instance_definition : stores attibutes, key is the instance integer id + Part21.Part21Parser._instance_definition : stores attributes, key is the instance integer id Part21.Part21Parser._number_of_ancestors : stores the number of ancestors of entity id. This enables to define the order of instances creation. """ diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index f23e9194d4..ab889bf46a 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -1224,7 +1224,7 @@ int Area::project(TopoDS_Shape &shape_out, FC_TIME_LOG(t,"project total"); if(shape.IsNull()) { - AREA_ERR("poject failed"); + AREA_ERR("project failed"); return -1; } shape_out = shape; diff --git a/src/Mod/Path/PathCommands.py b/src/Mod/Path/PathCommands.py index 9425ca8c82..5e756db72a 100644 --- a/src/Mod/Path/PathCommands.py +++ b/src/Mod/Path/PathCommands.py @@ -150,7 +150,7 @@ if FreeCAD.GuiUp: # \c findShape() is referenced from Gui/Command.cpp and used by Path.Area commands. # Do not remove! def findShape(shape, subname=None, subtype=None): - '''To find a higher oder shape containing the subshape with subname. + '''To find a higher order shape containing the subshape with subname. E.g. to find the wire containing 'Edge1' in shape, findShape(shape,'Edge1','Wires') ''' diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index 0215140345..cabc91b542 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -131,7 +131,7 @@ void Sheet::clearAll() * Import a file into the spreadsheet object. * * @param filename Name of file to import - * @param delimiter The field delimiter charater used. + * @param delimiter The field delimiter character used. * @param quoteChar Quote character, if any (set to '\0' to disable). * @param escapeChar The escape character used, if any (set to '0' to disable). * diff --git a/src/Mod/Spreadsheet/App/SheetPy.xml b/src/Mod/Spreadsheet/App/SheetPy.xml index 56b6b38cb0..679371b665 100644 --- a/src/Mod/Spreadsheet/App/SheetPy.xml +++ b/src/Mod/Spreadsheet/App/SheetPy.xml @@ -57,7 +57,7 @@ - Split a perviously merged cell + Split a previously merged cell diff --git a/src/Mod/Spreadsheet/importXLSX.py b/src/Mod/Spreadsheet/importXLSX.py index e3d6dcc0d4..3644b50fd3 100644 --- a/src/Mod/Spreadsheet/importXLSX.py +++ b/src/Mod/Spreadsheet/importXLSX.py @@ -167,7 +167,7 @@ class exprNode(object): class FormulaTranslator(object): - ''' This class tranlates a cell-formula from Excel to FreeCAD.''' + ''' This class translates a cell-formula from Excel to FreeCAD.''' def __init__(self): self.tokenList = ['=']