diff --git a/src/App/Application.h b/src/App/Application.h index bad5987dcf5a..b44a2b08e147 100644 --- a/src/App/Application.h +++ b/src/App/Application.h @@ -141,7 +141,7 @@ class AppExport Application /** Setup a pending application-wide active transaction * * @param name: new transaction name - * @param persist: by default, if the calling code is inside any invokation + * @param persist: by default, if the calling code is inside any invocation * of a command, it will be auto closed once all command within the current * stack exists. To disable auto closing, set persist=true * diff --git a/src/App/Document.h b/src/App/Document.h index 177db12bd6a6..ccfe0c982729 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -348,7 +348,7 @@ class AppExport Document : public App::PropertyContainer * transactions, meaning that there are other transactions before the given * ID. The Gui component shall ask user if he wants to undo multiple steps. * And if the user agrees, call undo(id) to unroll all transaction before - * and including the the one with the give ID. Same apllies for redo. + * and including the the one with the give ID. Same applies for redo. * * The new transaction ID describe here is fully backward compatible. * Calling the APIs with a default id=0 gives the original behavior. diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index a31d0e3a9c6a..692072724607 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -260,10 +260,10 @@ class FCADLogger(object): The default output format is: (line number): message - The message is formated using new style Python string formating, e.g. - 'test {}'.format(1). It is strongly recommanded to not directly use - Python string formating, but pass additional argument indirectly through - various logger print function, because the logger can skip string + The message is formatted using new style Python string formatting, e.g. + 'test {}'.format(1). It is strongly recommended to not directly use + Python string formatting, but pass additional argument indirectly through + various logger print functions, because the logger can skip string evaluation in case the logging level is disabled. For more options, please consult the docstring of __init__(), catch() and report(). diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 34d04eaef5f9..f061d175be20 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -3342,7 +3342,7 @@ Property *PropertyXLink::Copy(void) const void PropertyXLink::Paste(const Property &from) { if(!from.isDerivedFrom(PropertyXLink::getClassTypeId())) - throw Base::TypeError("Incompatible proeprty to paste to"); + throw Base::TypeError("Incompatible property to paste to"); const auto &other = static_cast(from); if(other.docName.size()) { @@ -4077,7 +4077,7 @@ Property *PropertyXLinkSubList::Copy(void) const void PropertyXLinkSubList::Paste(const Property &from) { if(!from.isDerivedFrom(PropertyXLinkSubList::getClassTypeId())) - throw Base::TypeError("Incompatible proeprty to paste to"); + throw Base::TypeError("Incompatible property to paste to"); aboutToSetValue(); _Links.clear(); diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 181e3d6f652a..5f5a1586fa63 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -294,7 +294,7 @@ class AppExport PropertyLinkBase : public Property, public ScopedLink * tracking of external objects, therefore the link will not by auto broken * when external document is closed. Only use this for temporary case, or * if you handle signalDeleteDocument yourself, or use one of the - * ProeprtyXLink related property. + * PropertyXLink related property. */ void setAllowExternal(bool allow); diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index adfa3fcd870f..4386510d4727 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -3938,7 +3938,7 @@ App::DocumentObject *DocumentItem::getTopParent(App::DocumentObject *obj, std::s return obj; for(auto item : it->second->items) { - // non group object do not provide a cooridnate system, hence its + // non group object do not provide a coordinate system, hence its // claimed child is still in the global coordinate space, so the // child can still be considered a top level object if(!item->isParentGroup()) @@ -4823,4 +4823,3 @@ TreeWidget *DocumentObjectItem::getTree() const{ } #include "moc_Tree.cpp" - diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h index 48110fbba656..54732d3b26c3 100644 --- a/src/Mod/Part/App/GeometryDefaultExtension.h +++ b/src/Mod/Part/App/GeometryDefaultExtension.h @@ -63,7 +63,7 @@ namespace Part { // // Warnings: // - The default constructor relies on the default constructor of T for initialisation. Built-in types - // so constructed will be uninitialised. Use the specific constructor from a T to initiliase it. Note + // so constructed will be uninitialised. Use the specific constructor from a T to initialise it. Note // that the default constructor is required by the type system (see TYPESYSTEM_SOURCE_TEMPLATE_T). // // Default assumptions: @@ -79,7 +79,7 @@ namespace Part { // // Instructions: // - // 1. Read the assumptions above and provide template initilisation if needed. + // 1. Read the assumptions above and provide template initialisation if needed. // 2. Add an alias to your type under these comments // 3. Add a TYPESYSTEM_SOURCE_TEMPLATE_T in the cpp file to generate class type information // 4. Provide a specialisation of getPyObject to generate a py object of the corresponding type (cpp file) diff --git a/src/Mod/Part/App/GeometryPyImp.cpp b/src/Mod/Part/App/GeometryPyImp.cpp index 5fd1aa63760f..55a5bac8c984 100644 --- a/src/Mod/Part/App/GeometryPyImp.cpp +++ b/src/Mod/Part/App/GeometryPyImp.cpp @@ -269,7 +269,7 @@ PyObject* GeometryPy::getExtensionOfType(PyObject *args) try { std::shared_ptr ext(this->getGeometryPtr()->getExtension(type)); - // we create a copy and tranfer this copy's memory management responsibility to Python + // we create a copy and transfer this copy's memory management responsibility to Python PyObject* cpy = static_cast(ext->getPyObject())->copy(Py::new_reference_to(Py::Tuple(size_t(0)))); return cpy; @@ -303,7 +303,7 @@ PyObject* GeometryPy::getExtensionOfName(PyObject *args) try { std::shared_ptr ext(this->getGeometryPtr()->getExtension(std::string(o))); - // we create a copy and tranfer this copy's memory management responsibility to Python + // we create a copy and transfer this copy's memory management responsibility to Python PyObject* cpy = static_cast(ext->getPyObject())->copy(Py::new_reference_to(Py::Tuple(size_t(0)))); return cpy; diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h index 6eafd0a55b34..3fd595f88eee 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h @@ -39,7 +39,7 @@ class SketcherExport ExternalGeometryExtension : public Part::GeometryExtension Frozen = 1, // freeze an external geometry Detached = 2, // signal the intentions of detaching the geometry from external reference Missing = 3, // geometry with missing external reference - Sync = 4, // signal the intension to synchronize a frozen geometry + Sync = 4, // signal the intention to synchronize a frozen geometry NumFlags // Must be the last type }; // END_CREDIT_BLOCK: Credit under LGPL for this block to Zheng, Lei (realthunder) diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp index 3c358fc64529..b0caaf3f7f9d 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.cpp +++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp @@ -1181,7 +1181,7 @@ void PropertySheet::renameObjectIdentifiers(const std::map(docObj))) { // const App::DocumentObject * docObj = dynamic_cast(getContainer());