diff --git a/src/App/Application.cpp b/src/App/Application.cpp index b64002112e..3f37233e6c 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -696,7 +696,7 @@ Base::Reference Application::GetParameterGroupByPath(const char* std::string::size_type pos = cName.find(':'); - // is there a path seperator ? + // is there a path separator ? if (pos == std::string::npos) { throw Base::ValueError("Application::GetParameterGroupByPath() no parameter set name specified"); } @@ -1886,7 +1886,7 @@ void Application::ParseOptions(int ac, char ** av) ("write-log,l", descr.c_str()) ("log-file", value(), "Unlike --write-log this allows logging to an arbitrary file") ("user-cfg,u", value(),"User config file to load/save user settings") - ("system-cfg,s", value(),"Systen config file to load/save system settings") + ("system-cfg,s", value(),"System config file to load/save system settings") ("run-test,t", value() ,"Test case - or 0 for all") ("module-path,M", value< vector >()->composing(),"Additional module paths") ("python-path,P", value< vector >()->composing(),"Additional python paths") diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 4e731263d4..bd564a7d01 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -26,7 +26,7 @@ This is besides the Application class the most important class in FreeCAD It contains all the data of the opened, saved or newly created FreeCAD Document. The Document manage the Undo and Redo mechanism and the linking of documents. -Note: the documents are not free objects. They are completly handled by the +Note: the documents are not free objects. They are completely handled by the App::Application. Only the Application can Open or destroy a document. \section Exception Exception handling diff --git a/src/App/Document.h b/src/App/Document.h index 02e37316f5..4ec3f89390 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -163,7 +163,7 @@ public: std::vector importObjects(Base::XMLReader& reader); /// Opens the document from its file name //void open (void); - /// Is the document already saved to a file + /// Is the document already saved to a file? bool isSaved() const; /// Get the document name const char* getName() const; @@ -172,20 +172,20 @@ public: virtual void Save (Base::Writer &writer) const; virtual void Restore(Base::XMLReader &reader); - /// returns the complet document mermory consumption, including all managed DocObjects and Undo Redo. + /// returns the complete document memory consumption, including all managed DocObjects and Undo Redo. unsigned int getMemSize (void) const; /** @name Object handling */ //@{ /** Add a feature of sType with sName (ASCII) to this document and set it active. - * Unicode names are set through the Label propery. + * Unicode names are set through the Label property. * @param sType the type of created object - * @param pObjectName if nonNULL use that name otherwise generate a new uniq name based on the \a sType + * @param pObjectName if nonNULL use that name otherwise generate a new unique name based on the \a sType * @param isNew if false don't call the \c DocumentObject::setupObject() callback (default is true) */ DocumentObject *addObject(const char* sType, const char* pObjectName=0, bool isNew=true); /** Add an array of features of the given types and names. - * Unicode names are set through the Label propery. + * Unicode names are set through the Label property. * @param sType The type of created object * @param objectNames A list of object names * @param isNew If false don't call the \c DocumentObject::setupObject() callback (default is true) @@ -198,7 +198,7 @@ public: * This is an overloaded function of the function above and can be used to create * a feature outside and add it to the document afterwards. * \note The passed feature must not yet be added to a document, otherwise an exception - * is raisedd. + * is raised. */ void addObject(DocumentObject*, const char* pObjectName=0); @@ -244,7 +244,7 @@ public: /** @name methods for modification and state handling */ //@{ - /// Remove all modifications. After this call The document becomes again Valid. + /// Remove all modifications. After this call The document becomes Valid again. void purgeTouched(); /// check if there is any touched object in this document bool isTouched(void) const; @@ -260,7 +260,7 @@ public: void recomputeFeature(DocumentObject* Feat); /// get the error log from the recompute run const std::vector &getRecomputeLog(void)const{return _RecomputeLog;} - /// get the text of the error of a spezified object + /// get the text of the error of a specified object const char* getErrorDescription(const App::DocumentObject*) const; /// return the status bits bool testStatus(Status pos) const; @@ -281,7 +281,7 @@ public: void openTransaction(const char* name=0); // Commit the Command transaction. Do nothing If there is no Command transaction open. void commitTransaction(); - /// Abort the actually running transaction. + /// Abort the actually running transaction. void abortTransaction(); /// Check if a transaction is open bool hasPendingTransaction() const; @@ -295,17 +295,17 @@ public: unsigned int getMaxUndoStackSize(void)const; /// Remove all stored Undos and Redos void clearUndos(); - /// Returns the number of stored Undos. If greater than 0 Undo will be effective. + /// Returns the number of stored Undos. If greater than 0 Undo will be effective. int getAvailableUndos() const; /// Returns a list of the Undo names std::vector getAvailableUndoNames() const; - /// Will UNDO one step, returns False if no undo was done (Undos == 0). + /// Will UNDO one step, returns False if no undo was done (Undos == 0). bool undo(); /// Returns the number of stored Redos. If greater than 0 Redo will be effective. int getAvailableRedos() const; /// Returns a list of the Redo names. std::vector getAvailableRedoNames() const; - /// Will REDO one step, returns False if no redo was done (Redos == 0). + /// Will REDO one step, returns False if no redo was done (Redos == 0). bool redo() ; /// returns true if the document is in an Transaction phase, e.g. currently performing a redo/undo or rollback bool isPerformingTransaction() const; diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index ddadf45ffb..c6cfe30d13 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -155,9 +155,9 @@ public: bool isInOutListRecursive(DocumentObject* objToTest) const; /// test if this object is directly (non recursive) in the OutList bool isInOutList(DocumentObject* objToTest) const; - /// internal, used by ProperyLink to maintain DAG back links + /// internal, used by PropertyLink to maintain DAG back links void _removeBackLink(DocumentObject*); - /// internal, used by ProperyLink to maintain DAG back links + /// internal, used by PropertyLink to maintain DAG back links void _addBackLink(DocumentObject*); //@} @@ -196,7 +196,7 @@ public: /** Called in case of losing a link * Get called by the document when a object got deleted a link property of this * object ist pointing to. The standard behaviour of the DocumentObject implementation - * is to reset the links to nothing. You may overide this method to implement + * is to reset the links to nothing. You may override this method to implement * additional or different behavior. */ virtual void onLostLinkToObject(DocumentObject*); diff --git a/src/App/FeatureTest.h b/src/App/FeatureTest.h index 986393e504..6d9a2efbe6 100644 --- a/src/App/FeatureTest.h +++ b/src/App/FeatureTest.h @@ -102,7 +102,7 @@ public: //App::PropertyQuantity QuantityMass; //App::PropertyQuantity QuantityAngle; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual DocumentObjectExecReturn *execute(void); diff --git a/src/App/GeoFeatureGroupExtension.h b/src/App/GeoFeatureGroupExtension.h index 8992b2cdfd..7db3eac5c9 100644 --- a/src/App/GeoFeatureGroupExtension.h +++ b/src/App/GeoFeatureGroupExtension.h @@ -36,7 +36,7 @@ namespace App /** * @brief The base class for placeable group of DocumentObjects. It represents a local coordnate system * - * This class is the FreeCAD way of representing local coordinate systems. It groups its childs beneath + * This class is the FreeCAD way of representing local coordinate systems. It groups its children beneath * it and transforms them all with the GeoFeatureGroup placement. A few important properties: * - Every child that belongs to the CS must be in the Group property. Even if a sketch is part of a pad, * it must be in the Group property of the same GeoFeatureGroup as pad. This also holds for normal diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index 281102b9f4..046225920f 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -731,7 +731,7 @@ std::string PropertyExpressionEngine::validateExpression(const ObjectIdentifier // Get document object DocumentObject * pathDocObj = usePath.getDocumentObject(); - // Check for document object dependecies + // Check for document object dependencies for (std::set::const_iterator j = exprDeps.begin(); j != exprDeps.end(); ++j) { DocumentObject * docObj = (*j).getDocumentObject(); diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 5d9dfac110..8e0d74cccc 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -369,7 +369,7 @@ public: /** * @brief getValue emulates the action of a single-object link. * @return reference to object, if the link is to only one object. NULL if - * the link is empty, or links to subelements of more than one documant + * the link is empty, or links to subelements of more than one document * object. */ DocumentObject* getValue() const; diff --git a/src/Base/FileTemplate.h b/src/Base/FileTemplate.h index 0b0616674f..6770bbbe84 100644 --- a/src/Base/FileTemplate.h +++ b/src/Base/FileTemplate.h @@ -33,7 +33,7 @@ namespace Base /** A test class. A more elaborate class description. - * Detaild description with some formating: + * Detailed description with some formatting: * \par * bla blablablablablablabl: * \code diff --git a/src/Base/Writer.h b/src/Base/Writer.h index 0940e35faa..1678512b67 100644 --- a/src/Base/Writer.h +++ b/src/Base/Writer.h @@ -103,7 +103,7 @@ public: std::vector getErrors() const; //@} - /** @name pretty formating for XML */ + /** @name pretty formatting for XML */ //@{ /// get the current indentation const char* ind(void) const {return indBuf;} diff --git a/src/Doc/mainpage.dox.in b/src/Doc/mainpage.dox.in index bff0a45c16..ab5465e46d 100644 --- a/src/Doc/mainpage.dox.in +++ b/src/Doc/mainpage.dox.in @@ -67,7 +67,7 @@ is by no means a well structured corpus or a textbook, but more an utility to browse through the sources. - If you seek informations on FreeCAD at large, please consult our + If you seek information on FreeCAD at large, please consult our Wiki FreeCAD being a fast moving target, don't hesitate to rebuild an up to diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp index 529be0b874..32008aabe5 100644 --- a/src/Gui/Quarter/QuarterWidget.cpp +++ b/src/Gui/Quarter/QuarterWidget.cpp @@ -450,7 +450,7 @@ QuarterWidget::clearWindow(void) const /*! Enable/disable interaction mode. - Specifies wether you may use the alt-key to enter interaction mode. + Specifies whether you may use the alt-key to enter interaction mode. */ void QuarterWidget::setInteractionModeEnabled(bool onoff) diff --git a/src/Gui/SoFCSelection.cpp b/src/Gui/SoFCSelection.cpp index 8905c273bd..eefc7804aa 100644 --- a/src/Gui/SoFCSelection.cpp +++ b/src/Gui/SoFCSelection.cpp @@ -840,7 +840,7 @@ SoFCSelection::redrawHighlighted(SoAction * action , SbBool doHighlight ) SbBool SoFCSelection::readInstance ( SoInput * in, unsigned short flags ) { - // Note: The read in document name can be false, so the caller must ensure pointing to the correct documemt + // Note: The read in document name can be false, so the caller must ensure pointing to the correct document SbBool ret = inherited::readInstance(in, flags); return ret; } diff --git a/src/Gui/iisTaskPanel/config.pri b/src/Gui/iisTaskPanel/config.pri index 07178bb347..0799951fea 100644 --- a/src/Gui/iisTaskPanel/config.pri +++ b/src/Gui/iisTaskPanel/config.pri @@ -15,7 +15,7 @@ CONFIG += debug_and_release macx { # Using gcc QMAKESPEC=macx-g++ - # uncoment this line if you want use xcode + # uncomment this line if you want use xcode # QMAKESPEC=macx-xcode } diff --git a/src/Mod/Assembly/App/opendcm/core/object.hpp b/src/Mod/Assembly/App/opendcm/core/object.hpp index cde06ee885..a348668fc3 100644 --- a/src/Mod/Assembly/App/opendcm/core/object.hpp +++ b/src/Mod/Assembly/App/opendcm/core/object.hpp @@ -102,7 +102,7 @@ struct SignalOwner { * disconnect the slot by the same boost:function it was connected with. * * @tparam S the signal type of interest - * @param c connection with which the slot was initialy connected + * @param c connection with which the slot was initially connected * @return void **/ template diff --git a/src/Mod/Assembly/App/opendcm/module3d/imp/constraint3d_holder_imp.hpp b/src/Mod/Assembly/App/opendcm/module3d/imp/constraint3d_holder_imp.hpp index 8da36ab045..5d6dbf1a7f 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/imp/constraint3d_holder_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/imp/constraint3d_holder_imp.hpp @@ -24,7 +24,7 @@ #include "opendcm/core/imp/constraint_holder_imp.hpp" #ifdef DCM_EXTERNAL_CORE -//following macros are used for externalization. As the holder type can hould a very big set of combinations, +//following macros are used for externalization. As the holder type can hold a very big set of combinations, //especially with module states recursive incarnation, we explicitly initiate all possible versions of this //struct so that it must only be compiled once. To get all possible equation //combinations boost pp is needed. diff --git a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp index 986f80d5b2..d826c611e5 100644 --- a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp +++ b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp @@ -58,7 +58,7 @@ TaskAssemblyConstraints::TaskAssemblyConstraints(ViewProviderConstraint* vp) ui->setupUi(proxy); this->groupLayout()->addWidget(proxy); - //initialy hide the value and orientation field + //initially hide the value and orientation field ui->value_widget->hide(); ui->orientation_widget->hide(); diff --git a/src/Mod/Cam/App/ConvertDyna.h b/src/Mod/Cam/App/ConvertDyna.h index c118c51ae7..fc61b9074c 100644 --- a/src/Mod/Cam/App/ConvertDyna.h +++ b/src/Mod/Cam/App/ConvertDyna.h @@ -51,7 +51,7 @@ typedef struct std::vector Constraining; std::vector FacetRef; -}VERTICES; /*!< VERTICES struct. Contains coordinates, index, face reference, and constraining informations*/ +}VERTICES; /*!< VERTICES struct. Contains coordinates, index, face reference, and constraining information*/ typedef struct { diff --git a/src/Mod/Cam/App/SpringbackCorrection.cpp b/src/Mod/Cam/App/SpringbackCorrection.cpp index b2af19e850..9c56a44771 100644 --- a/src/Mod/Cam/App/SpringbackCorrection.cpp +++ b/src/Mod/Cam/App/SpringbackCorrection.cpp @@ -1973,8 +1973,8 @@ bool SpringbackCorrection::GetCurvature(TopoDS_Face aFace) } -// 1. Computes the curvature of the mesh at the verticies -// 2. Stores the minimum curvatures along the neighbours for all verticies in a vector +// 1. Computes the curvature of the mesh at the vertices +// 2. Stores the minimum curvatures along the neighbours for all vertices in a vector std::vector SpringbackCorrection::MeshCurvature(const TopoDS_Face& aFace, const MeshCore::MeshKernel& mesh) { diff --git a/src/Mod/Cam/App/cutting_tools.cpp b/src/Mod/Cam/App/cutting_tools.cpp index f32bf70b52..1cd49c5aa8 100644 --- a/src/Mod/Cam/App/cutting_tools.cpp +++ b/src/Mod/Cam/App/cutting_tools.cpp @@ -492,7 +492,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() // gp_Vec first_u,first_v,second_u,second_v,third_u,third_v, Norm_first,Norm_second,Norm_third,Norm_average; // double u_middle,v_middle; // /* -// Generate three random point on the surface to get the surface normal and decide wether its a +// Generate three random point on the surface to get the surface normal and decide whether it's a // planar face or not // */ // FirstUParameter = aAdaptor_Surface.FirstUParameter(); diff --git a/src/Mod/Cam/App/path_simulate.cpp b/src/Mod/Cam/App/path_simulate.cpp index 16bae2ddfe..5cf0754ec5 100644 --- a/src/Mod/Cam/App/path_simulate.cpp +++ b/src/Mod/Cam/App/path_simulate.cpp @@ -3161,7 +3161,7 @@ bool path_simulate::WriteOutputDouble(ofstream &anOutputFile, ofstream &anOutput int pid2 = 3; // Slave int pid3 = 4; // Platte - if (brob == false) // Simulations-Output (brob == true -> roboter-ouput) + if (brob == false) // Simulations-Output (brob == true -> roboter-output) { TimeCorrection(); diff --git a/src/Mod/Draft/App/DraftDxf.h b/src/Mod/Draft/App/DraftDxf.h index ed461a126e..3842c985e7 100644 --- a/src/Mod/Draft/App/DraftDxf.h +++ b/src/Mod/Draft/App/DraftDxf.h @@ -49,7 +49,7 @@ namespace DraftUtils // FreeCAD-specific functions void AddObject(Part::TopoShape *shape); //Called by OnRead functions to add Part objects - std::string Deformat(const char* text); // Removes DXF formating from texts + std::string Deformat(const char* text); // Removes DXF formatting from texts private: gp_Pnt makePoint(const double* p); diff --git a/src/Mod/Drawing/App/FeatureClip.h b/src/Mod/Drawing/App/FeatureClip.h index 225f871af0..b2840bc9dc 100644 --- a/src/Mod/Drawing/App/FeatureClip.h +++ b/src/Mod/Drawing/App/FeatureClip.h @@ -50,7 +50,7 @@ public: App::PropertyString ViewResult; App::PropertyBool Visible; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Drawing/App/FeaturePage.h b/src/Mod/Drawing/App/FeaturePage.h index ace5074646..1b8a687f20 100644 --- a/src/Mod/Drawing/App/FeaturePage.h +++ b/src/Mod/Drawing/App/FeaturePage.h @@ -49,7 +49,7 @@ public: App::PropertyFile Template; App::PropertyStringList EditableTexts; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Drawing/App/FeatureProjection.h b/src/Mod/Drawing/App/FeatureProjection.h index f7612d5269..0394a443cb 100644 --- a/src/Mod/Drawing/App/FeatureProjection.h +++ b/src/Mod/Drawing/App/FeatureProjection.h @@ -59,7 +59,7 @@ public: App::PropertyBool OutLineHCompound; App::PropertyBool IsoLineHCompound; - /** @name methods overide feature */ + /** @name methods override feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Drawing/App/FeatureView.h b/src/Mod/Drawing/App/FeatureView.h index ee249f8b33..a938bdb111 100644 --- a/src/Mod/Drawing/App/FeatureView.h +++ b/src/Mod/Drawing/App/FeatureView.h @@ -58,7 +58,7 @@ public: } protected: - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *recompute(void); diff --git a/src/Mod/Drawing/App/FeatureViewAnnotation.h b/src/Mod/Drawing/App/FeatureViewAnnotation.h index 8bd68cf406..4dafe17de8 100644 --- a/src/Mod/Drawing/App/FeatureViewAnnotation.h +++ b/src/Mod/Drawing/App/FeatureViewAnnotation.h @@ -52,7 +52,7 @@ public: App::PropertyString Font; App::PropertyColor TextColor; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Drawing/App/FeatureViewPart.h b/src/Mod/Drawing/App/FeatureViewPart.h index 817edf906a..3c02a1286e 100644 --- a/src/Mod/Drawing/App/FeatureViewPart.h +++ b/src/Mod/Drawing/App/FeatureViewPart.h @@ -57,7 +57,7 @@ public: App::PropertyFloatConstraint Tolerance; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp b/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp index 55800d8ce6..70d5a80217 100644 --- a/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp +++ b/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp @@ -78,7 +78,7 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void) if ( (scellstart.empty()) || (scellend.empty()) ) return new App::DocumentObjectExecReturn("Empty cell value"); - // build a list of available colums: A, B, C, ... AA, AB, ... ZY, ZZ. + // build a list of available columns: A, B, C, ... AA, AB, ... ZY, ZZ. std::string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; std::vector availcolumns; for (int i=0; i<26; ++i) { diff --git a/src/Mod/Drawing/App/FeatureViewSpreadsheet.h b/src/Mod/Drawing/App/FeatureViewSpreadsheet.h index b6e478a162..3f8e204cf4 100644 --- a/src/Mod/Drawing/App/FeatureViewSpreadsheet.h +++ b/src/Mod/Drawing/App/FeatureViewSpreadsheet.h @@ -50,7 +50,7 @@ public: App::PropertyFloat LineWidth; App::PropertyFloat FontSize; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Drawing/App/FeatureViewSymbol.h b/src/Mod/Drawing/App/FeatureViewSymbol.h index 2377d53bc0..2a576bfae4 100644 --- a/src/Mod/Drawing/App/FeatureViewSymbol.h +++ b/src/Mod/Drawing/App/FeatureViewSymbol.h @@ -51,7 +51,7 @@ public: App::PropertyString Symbol; App::PropertyStringList EditableTexts; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 36ef6edf8f..78442bc604 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -315,7 +315,7 @@ void ViewProviderFemMesh::attach(App::DocumentObject *pcObj) SoGroup* pcFlatWireRoot = new SoSeparator(); // add the complete flat group (contains the coordinates) pcFlatWireRoot->addChild(pcFlatRoot); - //pcFlatWireRoot->addChild(offset); // makes no differents..... + //pcFlatWireRoot->addChild(offset); // makes no difference..... // add the line nodes SoMaterialBinding *pcMatBind = new SoMaterialBinding; pcMatBind->value = SoMaterialBinding::OVERALL; @@ -1298,7 +1298,7 @@ void ViewProviderFEMMeshBuilder::createMesh(const App::Property* prop, // 6 nodes case 6: // tria6 face - // penta6 volume, two 3-node triangle and three 4-node qudrangles + // penta6 volume, two 3-node triangle and three 4-node quadrangles switch (facesHelper[l].FaceNo){ case 0: { // tria6 face, 6-node triangle // prefeche all node indexes of this face @@ -1758,9 +1758,9 @@ void ViewProviderFEMMeshBuilder::createMesh(const App::Property* prop, break; // 13 nodes case 13: - // pyra13 volume, four 6-node triangle and one 8-node qudrangles + // pyra13 volume, four 6-node triangle and one 8-node quadrangles switch(facesHelper[l].FaceNo){ - case 1: { // pyra13 volume: face 1, 8-node qudrangles + case 1: { // pyra13 volume: face 1, 8-node quadrangles int nIdx0 = mapNodeIndex[facesHelper[l].Element->GetNode(0)]; int nIdx1 = mapNodeIndex[facesHelper[l].Element->GetNode(5)]; int nIdx2 = mapNodeIndex[facesHelper[l].Element->GetNode(1)]; @@ -1943,7 +1943,7 @@ void ViewProviderFEMMeshBuilder::createMesh(const App::Property* prop, break; // 15 nodes case 15: - // penta15 volume, two 6-node triangles and three 8-node qudrangles + // penta15 volume, two 6-node triangles and three 8-node quadrangles switch(facesHelper[l].FaceNo){ case 1: { // penta15 volume: face 1, 6-node triangle int nIdx0 = mapNodeIndex[facesHelper[l].Element->GetNode(0)]; @@ -2154,7 +2154,7 @@ void ViewProviderFEMMeshBuilder::createMesh(const App::Property* prop, break; // 20 nodes case 20: - // hexa20 volume, six 8-node qudrangles + // hexa20 volume, six 8-node quadrangles switch(facesHelper[l].FaceNo){ case 1: { // hexa20 volume: face 1 int nIdx0 = mapNodeIndex[facesHelper[l].Element->GetNode(0)]; diff --git a/src/Mod/Import/App/SCL/Part21.py b/src/Mod/Import/App/SCL/Part21.py index 7864416122..8583f87d21 100644 --- a/src/Mod/Import/App/SCL/Part21.py +++ b/src/Mod/Import/App/SCL/Part21.py @@ -37,7 +37,7 @@ import time INSTANCE_DEFINITION_RE = re.compile("#(\d+)[^\S\n]?=[^\S\n]?(.*?)\((.*)\)[^\S\n]?;[\\r]?$") def map_string_to_num(stri): - """ Take a string, check wether it is an integer, a float or not + """ Take a string, check whether it is an integer, a float or not """ if ('.' in stri) or ('E' in stri): #it's definitely a float return REAL(stri) diff --git a/src/Mod/Import/App/SCL/TypeChecker.py b/src/Mod/Import/App/SCL/TypeChecker.py index 2c04faed53..979e99ed29 100644 --- a/src/Mod/Import/App/SCL/TypeChecker.py +++ b/src/Mod/Import/App/SCL/TypeChecker.py @@ -46,7 +46,7 @@ def cast_python_object_to_aggregate(obj, aggregate): return aggregate def check_type(instance, expected_type): - """ This function checks wether an object is an instance of a given class + """ This function checks whether an object is an instance of a given class returns False or True """ type_match = False #by default, will be set to True if any match diff --git a/src/Mod/Material/materials-editor.ui b/src/Mod/Material/materials-editor.ui index de864a5c4c..add1da1aff 100644 --- a/src/Mod/Material/materials-editor.ui +++ b/src/Mod/Material/materials-editor.ui @@ -227,7 +227,7 @@ Source - An optional description of where the informations included in this card come from + An optional description of where the information included in this card comes from ItemIsSelectable|ItemIsEditable|ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled diff --git a/src/Mod/Mesh/App/Core/Elements.h b/src/Mod/Mesh/App/Core/Elements.h index edacd3ca47..2d73229a59 100644 --- a/src/Mod/Mesh/App/Core/Elements.h +++ b/src/Mod/Mesh/App/Core/Elements.h @@ -281,7 +281,7 @@ public: * Therefore the two facets must be adjacent. */ inline bool HasSameOrientation(const MeshFacet&) const; - /** Checks wether the facet is degenerated to a line of point. */ + /** Checks whether the facet is degenerated to a line of point. */ inline bool IsDegenerated() const; /** Flips the orientation of the facet. */ void FlipNormal (void) diff --git a/src/Mod/Mesh/App/Core/MeshIO.h b/src/Mod/Mesh/App/Core/MeshIO.h index 8f0d9c1ac0..afcce6111a 100644 --- a/src/Mod/Mesh/App/Core/MeshIO.h +++ b/src/Mod/Mesh/App/Core/MeshIO.h @@ -129,7 +129,7 @@ protected: }; /** - * The MeshOutput class is able to write a mesh object to an ouput stream + * The MeshOutput class is able to write a mesh object to an output stream * on various formats. */ class MeshExport MeshOutput diff --git a/src/Mod/Mesh/App/Core/tritritest.h b/src/Mod/Mesh/App/Core/tritritest.h index 12bd28e0a8..7dc63b1774 100644 --- a/src/Mod/Mesh/App/Core/tritritest.h +++ b/src/Mod/Mesh/App/Core/tritritest.h @@ -138,7 +138,7 @@ #define POINT_IN_TRI(V0,U0,U1,U2) \ { \ float a,b,c,d0,d1,d2; \ - /* is T1 completly inside T2? */ \ + /* is T1 completely inside T2? */ \ /* check if V0 is inside tri(U0,U1,U2) */ \ a=U1[i1]-U0[i1]; \ b=-(U1[i0]-U0[i0]); \ diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.h b/src/Mod/Mesh/App/FeatureMeshCurvature.h index 3c5365c62d..b82e337e75 100644 --- a/src/Mod/Mesh/App/FeatureMeshCurvature.h +++ b/src/Mod/Mesh/App/FeatureMeshCurvature.h @@ -48,7 +48,7 @@ public: App::PropertyLink Source; PropertyCurvatureList CurvInfo; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Mesh/App/FeatureMeshImport.h b/src/Mod/Mesh/App/FeatureMeshImport.h index dabcc140fb..9ed4561e3d 100644 --- a/src/Mod/Mesh/App/FeatureMeshImport.h +++ b/src/Mod/Mesh/App/FeatureMeshImport.h @@ -46,7 +46,7 @@ public: App::PropertyFile FileName; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h index 76c51c54b1..5cc9c7ead3 100644 --- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h +++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h @@ -53,7 +53,7 @@ public: App::PropertyVector Normal; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.h b/src/Mod/Mesh/App/FeatureMeshSetOperations.h index b4b38401aa..58aabe3fc3 100644 --- a/src/Mod/Mesh/App/FeatureMeshSetOperations.h +++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.h @@ -51,7 +51,7 @@ public: App::PropertyLink Source2; App::PropertyString OperationType; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.h b/src/Mod/Mesh/App/FeatureMeshTransform.h index 0695493fcb..92598dded3 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransform.h +++ b/src/Mod/Mesh/App/FeatureMeshTransform.h @@ -49,7 +49,7 @@ public: App::PropertyMatrix Position; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h index 5441211825..02c4a8e38d 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h +++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h @@ -48,7 +48,7 @@ public: App::PropertyFloat Rotation; App::PropertyVector Axis; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Mesh/App/GTSAlgos.cpp b/src/Mod/Mesh/App/GTSAlgos.cpp index 14c91cc2bc..e54aec1205 100644 --- a/src/Mod/Mesh/App/GTSAlgos.cpp +++ b/src/Mod/Mesh/App/GTSAlgos.cpp @@ -91,7 +91,7 @@ void GTSAlgos::boolean(const Mesh::MeshObject& ToolMesh, int Type) s1 = GTSAlgos::createGTSSurface(_Mesh); s2 = GTSAlgos::createGTSSurface(ToolMesh); - // clear the mesh (mermory) + // clear the mesh (memory) //Mesh1.clear(); //Mesh2.clear(); diff --git a/src/Mod/Mesh/App/MeshFeature.h b/src/Mod/Mesh/App/MeshFeature.h index c1bf8f2e42..ca9d8c0abc 100644 --- a/src/Mod/Mesh/App/MeshFeature.h +++ b/src/Mod/Mesh/App/MeshFeature.h @@ -66,7 +66,7 @@ public: PropertyMeshKernel Mesh; //@} - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/MeshPart/App/MeshAlgos.cpp b/src/Mod/MeshPart/App/MeshAlgos.cpp index 43776fdbed..fd68cb6658 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.cpp +++ b/src/Mod/MeshPart/App/MeshAlgos.cpp @@ -183,7 +183,7 @@ MeshCore::MeshKernel* MeshAlgos::boolean(MeshCore::MeshKernel* pMesh1, s1 = MeshAlgos::createGTSSurface(pMesh1); s2 = MeshAlgos::createGTSSurface(pMesh2); - // clear the mesh (mermory) + // clear the mesh (memory) //Mesh1.clear(); //Mesh2.clear(); diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py index 1afec9f01c..de9d48fecf 100644 --- a/src/Mod/OpenSCAD/importCSG.py +++ b/src/Mod/OpenSCAD/importCSG.py @@ -219,8 +219,8 @@ def p_anymodifier(p): | MODIFIERDISABLE ''' #just return the plain modifier for now - #has to be changed when the modifiers are inplemented - #please note that disabled objects usually are stript of the CSG ouput during compilation + #has to be changed when the modifiers are implemented + #please note that disabled objects usually are stripped of the CSG output during compilation p[0] = p[1] def p_statementwithmod(p): diff --git a/src/Mod/Part/App/BSplineSurfacePy.xml b/src/Mod/Part/App/BSplineSurfacePy.xml index a967328b2e..77c303ce35 100644 --- a/src/Mod/Part/App/BSplineSurfacePy.xml +++ b/src/Mod/Part/App/BSplineSurfacePy.xml @@ -250,7 +250,7 @@ - insertUKnote(float U, int Index, float Tolerance) - Insert or overide a knot + insertUKnote(float U, int Index, float Tolerance) - Insert or override a knot @@ -260,7 +260,7 @@ - insertUKnote(float V, int Index, float Tolerance) - Insert or overide a knot. + insertUKnote(float V, int Index, float Tolerance) - Insert or override a knot. diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h index 330915cd75..9f78a6b00c 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.h +++ b/src/Mod/Part/App/FeatureGeometrySet.h @@ -42,7 +42,7 @@ public: PropertyGeometryList GeometrySet; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartBoolean.h b/src/Mod/Part/App/FeaturePartBoolean.h index 2730af82f2..a224809c0f 100644 --- a/src/Mod/Part/App/FeaturePartBoolean.h +++ b/src/Mod/Part/App/FeaturePartBoolean.h @@ -43,7 +43,7 @@ public: App::PropertyLink Tool; PropertyShapeHistory History; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartCommon.h b/src/Mod/Part/App/FeaturePartCommon.h index ccb568aed9..68256d656c 100644 --- a/src/Mod/Part/App/FeaturePartCommon.h +++ b/src/Mod/Part/App/FeaturePartCommon.h @@ -37,7 +37,7 @@ class Common : public Boolean public: Common(); - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature protected: diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h index 45ac4d41ab..3784d272be 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.h +++ b/src/Mod/Part/App/FeaturePartCurveNet.h @@ -41,7 +41,7 @@ public: App::PropertyString FileName; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartCut.h b/src/Mod/Part/App/FeaturePartCut.h index f0ade1cdb6..78a52eece2 100644 --- a/src/Mod/Part/App/FeaturePartCut.h +++ b/src/Mod/Part/App/FeaturePartCut.h @@ -38,7 +38,7 @@ class Cut : public Boolean public: Cut(); - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature protected: diff --git a/src/Mod/Part/App/FeaturePartFuse.h b/src/Mod/Part/App/FeaturePartFuse.h index f1c83bb6f8..6abae82ac8 100644 --- a/src/Mod/Part/App/FeaturePartFuse.h +++ b/src/Mod/Part/App/FeaturePartFuse.h @@ -38,7 +38,7 @@ class Fuse : public Boolean public: Fuse(); - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature protected: diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h index 38f9fe4253..f27b580bba 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.h +++ b/src/Mod/Part/App/FeaturePartImportBrep.h @@ -41,7 +41,7 @@ public: App::PropertyString FileName; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h index 1fb2b767f8..2271bad9b2 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.h +++ b/src/Mod/Part/App/FeaturePartImportIges.h @@ -41,7 +41,7 @@ public: App::PropertyString FileName; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h index 0bcbf868da..384506ddf8 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.h +++ b/src/Mod/Part/App/FeaturePartImportStep.h @@ -45,7 +45,7 @@ public: App::PropertyString FileName; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartPolygon.h b/src/Mod/Part/App/FeaturePartPolygon.h index 316c3970d8..3653b3cde2 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.h +++ b/src/Mod/Part/App/FeaturePartPolygon.h @@ -42,7 +42,7 @@ public: App::PropertyVectorList Nodes; App::PropertyBool Close; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/App/FeaturePartSection.h b/src/Mod/Part/App/FeaturePartSection.h index 69ec64c927..ca27b902cc 100644 --- a/src/Mod/Part/App/FeaturePartSection.h +++ b/src/Mod/Part/App/FeaturePartSection.h @@ -38,7 +38,7 @@ class Section : public Boolean public: Section(); - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature protected: diff --git a/src/Mod/Part/App/Part2DObject.h b/src/Mod/Part/App/Part2DObject.h index c4d19dacf5..12c16b3e6f 100644 --- a/src/Mod/Part/App/Part2DObject.h +++ b/src/Mod/Part/App/Part2DObject.h @@ -38,13 +38,13 @@ namespace Part class Geometry; /** 2D Shape - * This is a specialiced version of the PartShape for use with + * This is a specialized version of the PartShape for use with * flat (2D) geometry. The Z direction has always to be 0. * The position and orientation of the Plane this 2D geometry is * referenced is defined by the Placement property. It also * has a link to a supporting Face which defines the position * in space where it is located. If the support is changed the - * static methode positionBySupport() is used to calculate a + * static method positionBySupport() is used to calculate a * new position for the Part2DObject. * This object can be used stand alone or for constraint * geometry as its descend Sketcher::SketchObject . @@ -82,7 +82,7 @@ public: static const int V_Axis; static const int N_Axis; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp index d4817e46de..158b1ef9f9 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.cpp +++ b/src/Mod/Part/Gui/ViewProviderExt.cpp @@ -1194,7 +1194,7 @@ void ViewProviderPartExt::updateVisual(const TopoDS_Shape& inputShape) } # ifdef FC_DEBUG - // printing some informations + // printing some information Base::Console().Log("ViewProvider update time: %f s\n",Base::TimeInfo::diffTimeF(start_time,Base::TimeInfo())); Base::Console().Log("Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d\n",numFaces,numEdges,numNodes,numTriangles,numLines); # endif diff --git a/src/Mod/PartDesign/Gui/Utils.h b/src/Mod/PartDesign/Gui/Utils.h index 5e4e6a7422..0c3e6d911c 100644 --- a/src/Mod/PartDesign/Gui/Utils.h +++ b/src/Mod/PartDesign/Gui/Utils.h @@ -74,7 +74,7 @@ void relinkToBody ( PartDesign::Feature *feature ); /// Check if feature is dependent on anything except movable sketches and datums bool isFeatureMovable(App::DocumentObject* feature); -/// Collect dependencies of the features during the move. Dependecies should only be dependent on origin +/// Collect dependencies of the features during the move. Dependencies should only be dependent on origin std::vector collectMovableDependencies(std::vector& features); /// Relink sketches and datums to target body's origin void relinkToOrigin(App::DocumentObject* feature, PartDesign::Body* body); diff --git a/src/Mod/PartDesign/TestPartDesignGui.py b/src/Mod/PartDesign/TestPartDesignGui.py index a51f57ebe9..673a7bef26 100644 --- a/src/Mod/PartDesign/TestPartDesignGui.py +++ b/src/Mod/PartDesign/TestPartDesignGui.py @@ -85,7 +85,7 @@ class PartDesignGuiTestCases(unittest.TestCase): self.Doc = FreeCAD.newDocument("SketchGuiTest") def testRefuseToMoveSingleFeature(self): - FreeCAD.Console.PrintMessage('Testing refuse to move the feature with dependecies from one body to another\n') + FreeCAD.Console.PrintMessage('Testing refuse to move the feature with dependencies from one body to another\n') self.BodySource = self.Doc.addObject('PartDesign::Body','Body') Gui.activeView().setActiveObject('pdbody', self.BodySource) diff --git a/src/Mod/Path/PathScripts/post/dumper_post.py b/src/Mod/Path/PathScripts/post/dumper_post.py index 1268d30189..ed58d570d6 100644 --- a/src/Mod/Path/PathScripts/post/dumper_post.py +++ b/src/Mod/Path/PathScripts/post/dumper_post.py @@ -40,7 +40,7 @@ if open.__module__ == '__builtin__': def export(objectslist, filename,argstring): - output = '''(This ouput produced with the dump post processor) + output = '''(This output produced with the dump post processor) (Dump is useful for inspecting the raw commands in your paths) (but is not useful for driving machines.) (Consider setting a default postprocessor in your project or ) diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h index 00cca571b0..15873685e8 100644 --- a/src/Mod/Points/App/PointsFeature.h +++ b/src/Mod/Points/App/PointsFeature.h @@ -58,7 +58,7 @@ public: Feature(void); virtual ~Feature(void); - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ void Restore(Base::XMLReader &reader); void RestoreDocFile(Base::Reader &reader); diff --git a/src/Mod/Points/App/Structured.h b/src/Mod/Points/App/Structured.h index d8f61f717b..e6a89a524e 100644 --- a/src/Mod/Points/App/Structured.h +++ b/src/Mod/Points/App/Structured.h @@ -46,7 +46,7 @@ public: App::PropertyInteger Width; /**< The width of the structured cloud. */ App::PropertyInteger Height; /**< The height of the structured cloud. */ - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Raytracing/App/LuxFeature.h b/src/Mod/Raytracing/App/LuxFeature.h index cbda5944e6..469c0d1772 100644 --- a/src/Mod/Raytracing/App/LuxFeature.h +++ b/src/Mod/Raytracing/App/LuxFeature.h @@ -51,7 +51,7 @@ public: App::PropertyColor Color; App::PropertyPercent Transparency; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Raytracing/App/LuxProject.h b/src/Mod/Raytracing/App/LuxProject.h index 6b0024290b..36054b7c2e 100644 --- a/src/Mod/Raytracing/App/LuxProject.h +++ b/src/Mod/Raytracing/App/LuxProject.h @@ -51,7 +51,7 @@ public: App::PropertyString Camera; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h index be053d068e..f0f2af933f 100644 --- a/src/Mod/Raytracing/App/RayFeature.h +++ b/src/Mod/Raytracing/App/RayFeature.h @@ -51,7 +51,7 @@ public: App::PropertyColor Color; App::PropertyPercent Transparency; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h index 29ccb692d2..e0f7689c36 100644 --- a/src/Mod/Raytracing/App/RayProject.h +++ b/src/Mod/Raytracing/App/RayProject.h @@ -51,7 +51,7 @@ public: App::PropertyString Camera; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h index 7acd1f0994..721490a5cb 100644 --- a/src/Mod/Raytracing/App/RaySegment.h +++ b/src/Mod/Raytracing/App/RaySegment.h @@ -50,7 +50,7 @@ public: App::PropertyString Result; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx b/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx index 9f4bcb918b..eacf6cbcdd 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx +++ b/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx @@ -104,7 +104,7 @@ int _EatSpace( std::istream& is,int* countp=NULL) { // Eats whites, returns, tabs and the delim character -// Checks wether delim char. is encountered. +// Checks whether delim char. is encountered. void Eat( std::istream& is, int delim ) { int ch; @@ -117,7 +117,7 @@ void Eat( std::istream& is, int delim ) } // Eats whites, returns, tabs and the delim character -// Checks wether delim char. is encountered. +// Checks whether delim char. is encountered. // EatEnd does not eat all space-like char's at the end. void EatEnd( std::istream& is, int delim ) { diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index a061a7437c..da36a33caa 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -58,7 +58,7 @@ public: Part ::PropertyGeometryList Geometry; Sketcher::PropertyConstraintList Constraints; App ::PropertyLinkSubList ExternalGeometry; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature (if no recompute is needed see also solve() and solverNeedsUpdate boolean) App::DocumentObjectExecReturn *execute(void); @@ -220,7 +220,7 @@ public: bool increaseBSplineDegree(int GeoId, int degreeincrement = 1); /*! - \ brief Increases or Decreases the multiplicity of a BSpline knot by the multiplicityincr param, which defaults to 1, if the result is multiplicity zero, the knot is removed + \brief Increases or Decreases the multiplicity of a BSpline knot by the multiplicityincr param, which defaults to 1, if the result is multiplicity zero, the knot is removed \param GeoId - the geometry of type bspline to increase the degree \param knotIndex - the index of the knot to modify (note that index is OCC consistent, so 1<=knotindex<=knots) \param multiplicityincr - the increment (positive value) or decrement (negative value) of multiplicity of the knot diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h index b0c2ad92e2..9d4a073c58 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.h +++ b/src/Mod/Sketcher/App/SketchObjectSF.h @@ -44,7 +44,7 @@ public: /// Property App::PropertyFileIncluded SketchFlatFile; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/Sketcher/TestSketcherApp.py b/src/Mod/Sketcher/TestSketcherApp.py index 7ea37f0b11..9ed6c0ccf1 100644 --- a/src/Mod/Sketcher/TestSketcherApp.py +++ b/src/Mod/Sketcher/TestSketcherApp.py @@ -158,4 +158,4 @@ class SketcherSolverTestCases(unittest.TestCase): def tearDown(self): #closing doc FreeCAD.closeDocument("SketchSolverTest") - #print ("omit close document for debugging") + #print ("omit closing document for debugging") diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp index c232e46d6f..3e743f9ade 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.cpp +++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp @@ -974,7 +974,7 @@ void PropertySheet::addDependencies(CellAddress key) } /** - * Remove dependecies given by \a expression for cell at \a key. + * Remove dependencies given by \a expression for cell at \a key. * * @param expression Expression to extract dependencies from * @param key Address of cell containing the expression diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index 4eb6b1999d..0215140345 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -603,7 +603,7 @@ void Sheet::updateAlias(CellAddress key) } /** - * Update the Propery given by \a key. This will also eventually trigger recomputations of cells depending on \a key. + * Update the Property given by \a key. This will also eventually trigger recomputations of cells depending on \a key. * * @param key The address of the cell we want to recompute. * @@ -649,7 +649,7 @@ void Sheet::updateProperty(CellAddress key) } /** - * Retrieve a specifc Property given by \a name. + * Retrieve a specific Property given by \a name. * This function might throw an exception if something fails, but might also * return 0 in case the property is not found. * diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index fffc72f894..60df838b83 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -49,7 +49,7 @@ public: App::PropertyFloatConstraint Scale; App::PropertyEnumeration ProjectionType; // First or Third Angle - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.h b/src/Mod/TechDraw/App/DrawParametricTemplate.h index 8c3a4ebbe5..af673cb95a 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.h +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.h @@ -48,7 +48,7 @@ public: App::PropertyFile Template; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h index 396aa43e29..af0d123ca4 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.h +++ b/src/Mod/TechDraw/App/DrawProjGroup.h @@ -93,7 +93,7 @@ public: Base::Vector3d getXYPosition(const char *viewTypeCStr); short mustExecute() const override; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void) override; diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.h b/src/Mod/TechDraw/App/DrawSVGTemplate.h index 21f780e481..215147249e 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.h +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.h @@ -44,7 +44,7 @@ public: App::PropertyFileIncluded PageResult; App::PropertyFile Template; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h index 31986ed112..f00bcd1cd7 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.h +++ b/src/Mod/TechDraw/App/DrawTemplate.h @@ -61,7 +61,7 @@ public: virtual void getBlockDimensions(double &x, double &y, double &width, double &height) const; virtual DrawPage* getParentPage() const; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index 7b32ab8cd1..985aee523e 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -57,7 +57,7 @@ public: App::PropertyBool KeepLabel; App::PropertyString Caption; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void) override; diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h index 88cacd9348..d2b9b743df 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.h +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h @@ -57,7 +57,7 @@ public: virtual QRectF getRect() const; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index fd573e9c14..96efd0ed0a 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -50,7 +50,7 @@ public: App::PropertyFloat LineWidth; App::PropertyFloat FontSize; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index 5ead6b682f..d8ad88c3bf 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -55,7 +55,7 @@ public: void removeView(DrawView *view); short mustExecute() const; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 37a2e38eb7..a41f5cc779 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -69,7 +69,7 @@ public: bool has2DReferences(void) const; bool has3DReferences(void) const; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 26d0d5d017..354fdc2c8d 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -51,7 +51,7 @@ public: App::PropertyString LineStyle; App::PropertyFloat LineSpacing; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewImage.h b/src/Mod/TechDraw/App/DrawViewImage.h index 9f241138eb..6667a06850 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.h +++ b/src/Mod/TechDraw/App/DrawViewImage.h @@ -48,7 +48,7 @@ public: App::PropertyFloat Width; App::PropertyFloat Height; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index 79a3acfefc..4d8bf98e23 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -60,7 +60,7 @@ public: App::PropertyLinkListGlobal Sources; virtual short mustExecute() const; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void) override; diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h index e11f4eada0..b868d0712b 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.h +++ b/src/Mod/TechDraw/App/DrawViewPart.h @@ -143,7 +143,7 @@ public: bool handleFaces(void); bool showSectionEdges(void); - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void); diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index d78c6f5f41..8a7eac17ad 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -120,7 +120,7 @@ App::DocumentObjectExecReturn *DrawViewSpreadsheet::execute(void) std::vector DrawViewSpreadsheet::getAvailColumns(void) { - // build a list of available colums: A, B, C, ... AA, AB, ... ZY, ZZ. + // build a list of available columns: A, B, C, ... AA, AB, ... ZY, ZZ. std::string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; std::vector availcolumns; for (int i=0; i<26; ++i) { diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.h b/src/Mod/TechDraw/App/DrawViewSymbol.h index 125104cac9..ba69886179 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.h +++ b/src/Mod/TechDraw/App/DrawViewSymbol.h @@ -47,7 +47,7 @@ public: App::PropertyString Symbol; App::PropertyStringList EditableTexts; - /** @name methods overide Feature */ + /** @name methods override Feature */ //@{ /// recalculate the Feature virtual App::DocumentObjectExecReturn *execute(void) override; diff --git a/src/Mod/TemplatePyMod/DocumentObject.py b/src/Mod/TemplatePyMod/DocumentObject.py index 9400e1bd36..63e9c7b9b4 100644 --- a/src/Mod/TemplatePyMod/DocumentObject.py +++ b/src/Mod/TemplatePyMod/DocumentObject.py @@ -189,7 +189,7 @@ class ViewProvider(object): "switches this object to invisible" self.__vobject__.hide() def isVisible(self): - "shows wether this object is visible or invisible" + "shows whether this object is visible or invisible" return self.__vobject__.isVisible() def toString(self): "returns a string representation of the coin node of this object" @@ -201,7 +201,7 @@ class ViewProvider(object): "leaves edit mode for this object" self.__vobject__.finishEditing() def isEditing(self): - "shows wether this object is in edit mode" + "shows whether this object is in edit mode" self.__vobject__.isEditing() def setTransformation(self,trsf): "defines a transformation for this object" diff --git a/src/Tools/generateTemplates/templateClassPyExport.py b/src/Tools/generateTemplates/templateClassPyExport.py index 7b961ba185..8f11dabc22 100644 --- a/src/Tools/generateTemplates/templateClassPyExport.py +++ b/src/Tools/generateTemplates/templateClassPyExport.py @@ -579,7 +579,7 @@ PyObject * @self.export.Name@::staticCallback_@i.Name@ (PyObject *self, PyObject PyErr_SetString(Base::BaseExceptionFreeCADError,e); return NULL; } - // in debug not all exceptions will be catched to get the attention of the developer! + // in debug not all exceptions will be caught to get the attention of the developer! #ifndef DONT_CATCH_CXX_EXCEPTIONS catch(const std::exception& e) // catch other c++ exceptions { diff --git a/src/Tools/wiki2qhelp.py b/src/Tools/wiki2qhelp.py index 7c8c3d1710..00b6de91d1 100755 --- a/src/Tools/wiki2qhelp.py +++ b/src/Tools/wiki2qhelp.py @@ -44,7 +44,7 @@ NORETRIEVE = ['Manual','Developer_hub','Power_users_hub','Users_hub','Source_doc GETTRANSLATIONS = True # Set true if you want to get the translations too. MAXFAIL = 3 # max number of retries if download fails VERBOSE = True # to display what's going on. Otherwise, runs totally silent. -COMPILE = True # Wether qt assistant will be used to compile the final help file +COMPILE = True # Whether Qt assistant will be used to compile the final help file OUTPUTPATH = os.path.expanduser("~")+os.sep+'.FreeCAD' # Where to store the qch file QHELPCOMPILER = 'qhelpgenerator' QCOLLECTIOMGENERATOR = 'qcollectiongenerator'