Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more typos #16

Merged
merged 1 commit into from
Jul 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/App/Document.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/App/FreeCADInit.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,10 @@ class FCADLogger(object):
The default output format is:
<timestamp> <tag> <source file>(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().

Expand Down
4 changes: 2 additions & 2 deletions src/App/PropertyLinks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<const PropertyXLink&>(from);
if(other.docName.size()) {
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/App/PropertyLinks.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions src/Gui/Tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -4823,4 +4823,3 @@ TreeWidget *DocumentObjectItem::getTree() const{
}

#include "moc_Tree.cpp"

4 changes: 2 additions & 2 deletions src/Mod/Part/App/GeometryDefaultExtension.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Part/App/GeometryPyImp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ PyObject* GeometryPy::getExtensionOfType(PyObject *args)
try {
std::shared_ptr<GeometryExtension> 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<GeometryExtensionPy *>(ext->getPyObject())->copy(Py::new_reference_to(Py::Tuple(size_t(0))));

return cpy;
Expand Down Expand Up @@ -303,7 +303,7 @@ PyObject* GeometryPy::getExtensionOfName(PyObject *args)
try {
std::shared_ptr<GeometryExtension> 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<GeometryExtensionPy *>(ext->getPyObject())->copy(Py::new_reference_to(Py::Tuple(size_t(0))));

return cpy;
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Sketcher/App/ExternalGeometryExtension.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Spreadsheet/App/PropertySheet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ void PropertySheet::renameObjectIdentifiers(const std::map<App::ObjectIdentifier
void PropertySheet::deletedDocumentObject(const App::DocumentObject *docObj)
{
(void)docObj;
// This function is only used in SheetObserver, which is obselete.
// This function is only used in SheetObserver, which is obsolete.
//
// if(docDeps.erase(const_cast<App::DocumentObject*>(docObj))) {
// const App::DocumentObject * docObj = dynamic_cast<const App::DocumentObject*>(getContainer());
Expand Down