From 3017173c9aeca0c3372f2a92fc11a77cf7f603a7 Mon Sep 17 00:00:00 2001 From: Kunda Date: Mon, 6 Mar 2017 15:48:31 -0500 Subject: [PATCH] source typo fixes pt6 --- src/App/Application.cpp | 6 +-- src/App/Application.h | 2 +- src/App/Document.cpp | 6 +-- src/App/Document.h | 6 +-- src/App/DocumentObject.h | 4 +- src/App/Expression.cpp | 2 +- src/App/Extension.cpp | 2 +- src/App/Extension.h | 8 ++-- src/App/ExtensionContainer.cpp | 6 +-- src/App/ExtensionContainer.h | 4 +- src/App/Material.h | 2 +- src/App/Origin.h | 6 +-- src/App/Part.cpp | 2 +- src/App/Part.h | 6 +-- src/App/PropertyContainer.h | 4 +- src/App/PropertyContainerPy.xml | 2 +- src/App/PropertyExpressionEngine.cpp | 2 +- src/App/PropertyStandard.h | 14 +++---- src/App/PropertyUnits.h | 2 +- src/App/core-app.dox | 4 +- src/Mod/Assembly/App/Item.h | 2 +- src/Mod/Assembly/App/Product.cpp | 2 +- src/Mod/Assembly/App/Product.h | 4 +- .../App/opendcm/core/clustergraph.hpp | 42 +++++++++---------- .../Assembly/App/opendcm/core/constraint.hpp | 2 +- .../Assembly/App/opendcm/core/equations.hpp | 6 +-- .../Assembly/App/opendcm/core/geometry.hpp | 2 +- .../App/opendcm/core/imp/clustergraph_imp.hpp | 8 ++-- .../core/imp/constraint_holder_imp.hpp | 10 ++--- .../App/opendcm/core/imp/equations_imp.hpp | 4 +- .../App/opendcm/core/imp/geometry_imp.hpp | 2 +- .../App/opendcm/core/imp/kernel_imp.hpp | 2 +- src/Mod/Assembly/App/opendcm/core/object.hpp | 6 +-- .../Assembly/App/opendcm/core/property.hpp | 8 ++-- src/Mod/Assembly/App/opendcm/core/system.hpp | 4 +- .../App/opendcm/module3d/distance.hpp | 6 +-- .../opendcm/module3d/imp/clustermath_imp.hpp | 4 +- .../App/opendcm/module3d/imp/solver_imp.hpp | 2 +- .../Assembly/App/opendcm/module3d/module.hpp | 2 +- .../App/opendcm/moduleShape3d/module.hpp | 8 ++-- src/Mod/Assembly/Gui/ViewProviderConstraint.h | 2 +- src/Tools/ImageTools/ImageConv/main.cpp | 2 +- src/Tools/thumbs/IExtractImage.h | 2 +- src/Tools/thumbs/ThumbnailProvider/FCConfig.h | 2 +- 44 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 7e5c848589be..9d8fc1150f4f 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1557,7 +1557,7 @@ void Application::runApplication() processCmdLineFiles(); if (mConfig["RunMode"] == "Cmd") { - // Run the comandline interface + // Run the commandline interface Interpreter().runCommandLine("FreeCAD Console mode"); } else if (mConfig["RunMode"] == "Internal") { @@ -1809,7 +1809,7 @@ void Application::ParseOptions(int ac, char ** av) //x11.add_options() // ("display", boost::program_options::value< string >(), "set the X-Server") // ; - //0000723: improper handling of qt specific comand line arguments + //0000723: improper handling of qt specific command line arguments std::vector args; bool merge=false; for (int i=1; isecond, true); //and remove the tip if needed @@ -2409,7 +2409,7 @@ void Document::_remObject(DocumentObject* pcObject) void Document::breakDependency(DocumentObject* pcObject, bool clear) { - // Nullify all dependant objects + // Nullify all dependent objects for (std::map::iterator it = d->objectMap.begin(); it != d->objectMap.end(); ++it) { std::map Map; it->second->getPropertyMap(Map); diff --git a/src/App/Document.h b/src/App/Document.h index 41b8a2fc8c83..d4274915a717 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -93,11 +93,11 @@ class AppExport Document : public App::PropertyContainer * for the Creative Commons license suit. */ App::PropertyString License; - /// License descripton/contract URL + /// License description/contract URL App::PropertyString LicenseURL; - /// Meta descriptons + /// Meta descriptions App::PropertyMap Meta; - /// Material descriptons, used and defined in the Material module. + /// Material descriptions, used and defined in the Material module. App::PropertyMap Material; /// read-only name of the temp dir created wen the document is opened PropertyString TransientDir; diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index dda66f69f254..79dbc097d020 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -189,11 +189,11 @@ class AppExport DocumentObject: public App::TransactionalObject /// get the status Message const char *getStatusString(void) const; - /** Called in case of loosing a link + /** 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 - *additional or different behavior. + * additional or different behavior. */ virtual void onLostLinkToObject(DocumentObject*); virtual PyObject *getPyObject(void); diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index 895f5359b58c..c787222d66b7 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -908,7 +908,7 @@ Expression * FunctionExpression::evalAggregate() const } /** - * Evaluate function. Returns a NumberExpression if evaluation is successfuly. + * Evaluate function. Returns a NumberExpression if evaluation is successful. * Throws an ExpressionError exception if something fails. * * @returns A NumberExpression with the result. diff --git a/src/App/Extension.cpp b/src/App/Extension.cpp index 519982bc5bba..dc64b9da2e5c 100644 --- a/src/App/Extension.cpp +++ b/src/App/Extension.cpp @@ -84,7 +84,7 @@ void Extension::initExtension(ExtensionContainer* obj) { throw Base::Exception("Extension: Extension type not set"); //all properties are initialised without PropertyContainer father. Now that we know it we can - //finaly finsih the property initialisation + //finally finish the property initialisation std::vector list; extensionGetPropertyData().getPropertyList(this, list); for(Property* prop : list) diff --git a/src/App/Extension.h b/src/App/Extension.h index 903ebcb92c31..8b64d90f44ab 100644 --- a/src/App/Extension.h +++ b/src/App/Extension.h @@ -156,7 +156,7 @@ template<> void _class_::init(void){\ * can be added to an object from python. It does not work to add the c++ version directly there. * * Note that every method of the extension becomes part of the extendded object when added from c++. - * This means one should carefully design the API and make only neccessary methods public or protected. + * This means one should carefully design the API and make only necessary methods public or protected. * Every internal method should be private. * * The automatic availibility of methods in the class does not hold for the python interface, only @@ -165,15 +165,15 @@ template<> void _class_::init(void){\ * extension, which works exactly like the normal FreeCAD python object workflow. There is nothing * special at all for extension python objects, the normal xml + imp.cpp approach is used. It must * only be taken care that the objects father is the correct extension base class. Of course also - * makse sure your extension returns the correct python ojbect in its "getPyObject" call. + * make sure your extension returns the correct python ojbect in its "getPyObject" call. * Every method you create in the extensions python will be later added to an extended object. This * happens automatically for both, c++ and python extension, if "getPyObject" returns the correct * python object. No extra work needs to be done. * - * A special case that needs to be handled for extensions is the possibility of overriden methods. + * A special case that needs to be handled for extensions is the possibility of overridden methods. * Often it is desired to customise extension behaviour by allowing the user to override methods * provided by the extension. On c++ side this is trival, such methods are simply marked as "virtual" - * and can than be overriden in any derived class. This is more involved for the python interface and + * and can than be overridden in any derived class. This is more involved for the python interface and * here special care needs to be taken. * * As already seen above one needs to create a special ExtensionPythonT<> object for extension from diff --git a/src/App/ExtensionContainer.cpp b/src/App/ExtensionContainer.cpp index 6fd435415de0..41101e5c1431 100644 --- a/src/App/ExtensionContainer.cpp +++ b/src/App/ExtensionContainer.cpp @@ -283,7 +283,7 @@ void ExtensionContainer::Save(Base::Writer& writer) const { //Note: save extensions must be called first to ensure that the extension element is always the // very first inside the object element. That is needed as extension eleent works together with - // an object attribute, and if annother element would be read first the object attributes would be + // an object attribute, and if another element would be read first the object attributes would be // cleared. saveExtensions(writer); App::PropertyContainer::Save(writer); @@ -294,7 +294,7 @@ void ExtensionContainer::Restore(Base::XMLReader& reader) { //restore dynamic extensions. //Note 1: The extension element must be read first, before all other object elements. That is // needed as the element works together with an object element attribute, which would be - // cleared if annother attribute is read first + // cleared if another attribute is read first //Note 2: This must happen before the py object of this container is used, as only in the // pyobject constructor the extension methods are added to the container. restoreExtensions(reader); @@ -349,7 +349,7 @@ void ExtensionContainer::saveExtensions(Base::Writer& writer) const { void ExtensionContainer::restoreExtensions(Base::XMLReader& reader) { //Dynamic extensions are optional (also because they are introduced late into the document format) - //and hence it is possible that the element does not exist. As we cannot check for the existance of + //and hence it is possible that the element does not exist. As we cannot check for the existence of //an element a object attribute is set if extensions are available. Here we check that //attribute, and only if it exists the extensions element will be available. if(!reader.hasAttribute("Extensions")) diff --git a/src/App/ExtensionContainer.h b/src/App/ExtensionContainer.h index e9ffa3aad711..1108a75dfb9a 100644 --- a/src/App/ExtensionContainer.h +++ b/src/App/ExtensionContainer.h @@ -102,10 +102,10 @@ namespace App { * registerExtension("App::SecondExtensionPython", self) * @endcode * - * Extensions can provide methods that should be overriden by the extended object for customisation + * Extensions can provide methods that should be overridden by the extended object for customisation * of the extension behaviour. In c++ this is as simple as overriding the provided virtual functions. * In python a class method must be provided which has the same name as the method to override. This - * method must not neccessarily be in the object that is extended, it must be in the object which is + * method must not necessarily be in the object that is extended, it must be in the object which is * provided to the "registerExtension" call as second argument. This second argument is used as a * proxy and enqueired if the method to override exists in this proxy before calling it. * diff --git a/src/App/Material.h b/src/App/Material.h index cca928af58d8..71c3bf2581b9 100644 --- a/src/App/Material.h +++ b/src/App/Material.h @@ -203,7 +203,7 @@ class AppExport Material * \li Jade * \li Ruby * \li Emerald - * Furthermore there two additional modes \a Default which defines a kind of grey metalic and user defined that + * Furthermore there two additional modes \a Default which defines a kind of grey metallic and user defined that * does nothing. * The Color and the other properties of the material are defined in the range [0-1]. * If \a MatName is an unknown material name then the type USER_DEFINED is set and the material doesn't get changed. diff --git a/src/App/Origin.h b/src/App/Origin.h index 97a0b7d17cae..1a7d0c5ab425 100644 --- a/src/App/Origin.h +++ b/src/App/Origin.h @@ -50,8 +50,8 @@ class AppExport Origin : public App::DocumentObject } /** @name Axis and plane access - * This functions returns casted axis and planes objects and asserts they are setted correctly - * otherwice Base::Exception is thrown. + * This functions returns casted axis and planes objects and asserts they are set correctly + * otherwise Base::Exception is thrown. */ ///@{ // returns X axis @@ -90,7 +90,7 @@ class AppExport Origin : public App::DocumentObject return { getXY(), getXZ(), getYZ() }; } - /// Returns all controled objects (both planes and axis) to iterate on them + /// Returns all controlled objects (both planes and axis) to iterate on them std::vector baseObjects() const { return { getX(), getY(), getZ(), getXY(), getXZ(), getYZ() }; } diff --git a/src/App/Part.cpp b/src/App/Part.cpp index 8030c0212dc9..360004cf01cb 100644 --- a/src/App/Part.cpp +++ b/src/App/Part.cpp @@ -57,7 +57,7 @@ Part::Part(void) // license stuff ADD_PROPERTY_TYPE(License, ("CC BY 3.0"), 0, App::Prop_None, "License string of the Item"); ADD_PROPERTY_TYPE(LicenseURL, ("http://creativecommons.org/licenses/by/3.0/"), 0, App::Prop_None, "URL to the license text/contract"); - // color and apperance + // color and appearance ADD_PROPERTY(Color, (1.0, 1.0, 1.0, 1.0)); // set transparent -> not used GroupExtension::initExtension(this); diff --git a/src/App/Part.h b/src/App/Part.h index 089c0d6888e4..416e665a77c8 100644 --- a/src/App/Part.h +++ b/src/App/Part.h @@ -52,9 +52,9 @@ class AppExport Part : public App::GeoFeature, public App::OriginGroupExtension App::PropertyString Id; /// unique identifier of the Item App::PropertyUUID Uid; - /// material descriptons + /// material descriptions App::PropertyMap Material; - /// Meta descriptons + /// Meta descriptions App::PropertyMap Meta; /** License string @@ -62,7 +62,7 @@ class AppExport Part : public App::GeoFeature, public App::OriginGroupExtension * for the Creative Commons license suit. */ App::PropertyString License; - /// License descripton/contract URL + /// License description/contract URL App::PropertyString LicenseURL; //@} diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h index b1d67c495c53..33e99d19241d 100644 --- a/src/App/PropertyContainer.h +++ b/src/App/PropertyContainer.h @@ -58,9 +58,9 @@ struct AppExport PropertyData short Offset,Type; }; - //purpose of this struct is to be constructible from all accepptable container types and to + //purpose of this struct is to be constructible from all acceptable container types and to //be able to return the offset to a property from the accepted containers. This allows to use - //one function implementation for multiple container types without loosing all type safety by + //one function implementation for multiple container types without losing all type safety by //accepting void* struct OffsetBase { diff --git a/src/App/PropertyContainerPy.xml b/src/App/PropertyContainerPy.xml index 1060b6367f04..daef8c3be7b1 100644 --- a/src/App/PropertyContainerPy.xml +++ b/src/App/PropertyContainerPy.xml @@ -48,7 +48,7 @@ If the list contains 'Hidden' then the item even doesn't appear in the property - Return the name of the group which the property belongs to in this class. The properties sorted in differnt named groups for convenience. + Return the name of the group which the property belongs to in this class. The properties sorted in different named groups for convenience. diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index d14662106a11..61bf4f3085ff 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -208,7 +208,7 @@ void PropertyExpressionEngine::Restore(Base::XMLReader &reader) } /** - * @brief Update graph stucture with given path and expression. + * @brief Update graph structure with given path and expression. * @param path Path * @param expression Expression to query for dependencies * @param nodes Map with nodes of graph diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h index b3e68bd1c846..2e1a034c5f82 100644 --- a/src/App/PropertyStandard.h +++ b/src/App/PropertyStandard.h @@ -206,9 +206,9 @@ class AppExport PropertyEnumeration: public Property }; /** Constraint integer properties - * This property fullfill the need of constraint integer. It holds basicly a + * This property fulfills the need of a constraint integer. It holds basically a * state (integer) and a struct of boundaries. If the boundaries - * is not set it act basicly like a IntegerProperty and do no checking. + * is not set it act basically like a IntegerProperty and do no checking. * The constraints struct can be created on the heap or build in. */ class AppExport PropertyIntegerConstraint: public PropertyInteger @@ -229,9 +229,9 @@ class AppExport PropertyIntegerConstraint: public PropertyInteger long LowerBound, UpperBound, StepSize; }; /** setting the boundaries - * This sets the constraint struct. It can be dynamcly + * This sets the constraint struct. It can be dynamically * allocated or set as an static in the class the property - * blongs to: + * belongs to: * \code * const Constraints percent = {0,100,1} * \endcode @@ -249,7 +249,7 @@ class AppExport PropertyIntegerConstraint: public PropertyInteger }; /** Percent property - * This property is a special interger property and holds only + * This property is a special integer property and holds only * numbers between 0 and 100. */ @@ -467,9 +467,9 @@ class AppExport PropertyFloat: public Property }; /** Constraint float properties - * This property fullfill the need of constraint float. It holds basicly a + * This property fulfills the need of a constraint float. It holds basically a * state (float) and a struct of boundaries. If the boundaries - * is not set it acts basicly like a PropertyFloat and does no checking + * is not set it acts basically like a PropertyFloat and does no checking * The constraints struct can be created on the heap or built-in. */ class AppExport PropertyFloatConstraint: public PropertyFloat diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h index ba091964075d..81d2f638e477 100644 --- a/src/App/PropertyUnits.h +++ b/src/App/PropertyUnits.h @@ -163,7 +163,7 @@ class AppExport PropertyVolume : public PropertyQuantityConstraint }; /** Angle property - * This is a property for representing angles. It basicly a float + * This is a property for representing angles. It basically a float * property. On the Gui it has a quantity like RAD. */ class AppExport PropertyAngle: public PropertyQuantityConstraint diff --git a/src/App/core-app.dox b/src/App/core-app.dox index a50a1ceb0d0d..593994ef0ef8 100644 --- a/src/App/core-app.dox +++ b/src/App/core-app.dox @@ -5,9 +5,9 @@ /** \namespace App \ingroup APP - \brief The FreeCAD Aplication layer + \brief The FreeCAD Application layer - This namespace includes Aplication services of FreeCAD like: + This namespace includes Application services of FreeCAD like: - The Application class - The Document class diff --git a/src/Mod/Assembly/App/Item.h b/src/Mod/Assembly/App/Item.h index 7a9fe978abd7..b85edd2bea8f 100644 --- a/src/Mod/Assembly/App/Item.h +++ b/src/Mod/Assembly/App/Item.h @@ -41,7 +41,7 @@ class AssemblyExport Item : public App::GeoFeature Item(); ~Item() {}; - /// Meta descriptons + /// Meta descriptions App::PropertyMap Meta; /** @name methods override feature */ diff --git a/src/Mod/Assembly/App/Product.cpp b/src/Mod/Assembly/App/Product.cpp index 7702f17ca6a4..de988c57e1db 100644 --- a/src/Mod/Assembly/App/Product.cpp +++ b/src/Mod/Assembly/App/Product.cpp @@ -54,7 +54,7 @@ Product::Product() { // license stuff ADD_PROPERTY_TYPE(License,("CC BY 3.0"),0,App::Prop_None,"License string of the Item"); ADD_PROPERTY_TYPE(LicenseURL,("http://creativecommons.org/licenses/by/3.0/"),0,App::Prop_None,"URL to the license text/contract"); - // color and apperance + // color and appearance ADD_PROPERTY(Color,(1.0,1.0,1.0,1.0)); // set transparent -> not used ADD_PROPERTY(Visibility,(true)); diff --git a/src/Mod/Assembly/App/Product.h b/src/Mod/Assembly/App/Product.h index cee0291ebb2a..f58cc9734c55 100644 --- a/src/Mod/Assembly/App/Product.h +++ b/src/Mod/Assembly/App/Product.h @@ -52,7 +52,7 @@ class AssemblyExport Product : public Assembly::Item App::PropertyString Id; /// unique identifier of the Item App::PropertyUUID Uid; - /// material descriptons + /// material descriptions App::PropertyMap Material; /** License string @@ -60,7 +60,7 @@ class AssemblyExport Product : public Assembly::Item * for the Creative Commons license suit. */ App::PropertyString License; - /// License descripton/contract URL + /// License description/contract URL App::PropertyString LicenseURL; //@} diff --git a/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp b/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp index 3e4a599f23fa..fc32a8b5b2e9 100644 --- a/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp +++ b/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp @@ -87,8 +87,8 @@ typedef boost::adjacency_list_traits IDpointer; typedef details::list_traits::vertex_descriptor LocalVertex; /** - * @brief Indentifier for local edge + * @brief Identifier for local edge * * The boost graph library works with identifiers for edges which directly relate to there storage. * Therefore they can be used only in the relevant cluster, they are local. These are the descriptors @@ -210,9 +210,9 @@ struct GlobalEdge { /** - * @brief A graph that can be stacked in a tree-like manner without loosing it connections + * @brief A graph that can be stacked in a tree-like manner without losing it connections * - * This is basicly a boost adjacency_list with single linked lists 'listS' as storage for vertices and + * This is basically a boost adjacency_list with single linked lists 'listS' as storage for vertices and * edges. The edges are undirected. This allows to use all boost graph algorithms and provides therefore * an comprehensive way for analysing and manipulating its content. It further extends the class with the * possibility to cluster its content and to add properties and objects to all entitys. For more @@ -405,7 +405,7 @@ public boost::noncopyable, void copyInto(boost::shared_ptr into, Functor& functor) const; /** - * @brief Compare by adress, not by content + * @brief Compare by address, not by content * @param other the cluster to compare with * @return bool if this is the same cluster in memory **/ @@ -413,7 +413,7 @@ public boost::noncopyable, bool operator== (const T& other) const; /** - * @brief Compare by adress, not by content + * @brief Compare by address, not by content * @param other the cluster to compare with * @return bool if this is the not same cluster in memory **/ @@ -421,7 +421,7 @@ public boost::noncopyable, bool operator!= (const T& other) const; /** - * @brief Set diffrent behaviour for changed markers + * @brief Set different behaviour for changed markers * * Some methods of the ClusterGraph set it's changed_prop to true. Thats sensible, as they change * the graph. However, there are situations where you want to use the methods but don't want the change @@ -462,7 +462,7 @@ public boost::noncopyable, * @brief Creates a new subcluster * * As clusters can be stacked in a tree like manner, this function can be used to create new - * children. It automaticly adds it to the subcluster list and adds it to the graph. The new + * children. It automatically adds it to the subcluster list and adds it to the graph. The new * subcluster is fully defined by its object and the vertex descriptor which is it's position * in the current cluster. * @@ -473,7 +473,7 @@ public boost::noncopyable, /** * @brief Returns the parent cluster * - * In the stacked cluster hirarchy most clusters have a parent whcih can be accessed with this function. + * In the stacked cluster hirarchy most clusters have a parent which can be accessed with this function. * However, the toplevel cluster dos nothave a parent and a empty shared_ptr is returned. * * @return :shared_ptr< ClusterGraph > the parent cluster or empty pointer @@ -569,12 +569,12 @@ public boost::noncopyable, LocalVertex getClusterVertex(boost::shared_ptr g); /** - * @brief Convinience function for \ref removeCluster + * @brief Convenience function for \ref removeCluster **/ template void removeCluster(boost::shared_ptr g, Functor& f); /** - * @brief Convinience function for \ref removeCluster + * @brief Convenience function for \ref removeCluster **/ void removeCluster(boost::shared_ptr g); /** @@ -673,7 +673,7 @@ public boost::noncopyable, * Adds an edge between vertices which are not nesseccarily in this local cluster and have therefore to be * identified with global descriptors. The only condition for source and target vertex is that both must be * in the local cluster or any of its subclusters. If thats not the case, the function will fail. On success - * a new GlobalEdge will be created, but not neccessarily a local one. If the vertices are in different cluster + * a new GlobalEdge will be created, but not necessarily a local one. If the vertices are in different cluster * which are already connected the global edge will be added to this connecting local edge. Thats the one returned * in the seqence. Note that it's possible that the local edge belongs to another subcluster and therefore can't be * used in the local cluster. This case is indicated by the scope return value. @@ -885,7 +885,7 @@ public boost::noncopyable, std::pair< object_iterator, object_iterator > getObjects(LocalEdge k); /** - * @brief Applys the functor to each occurence of an object + * @brief Applys the functor to each occurrence of an object * * Each valid object of the given type is extractet and passed to the function object. Vertices * and edges are searched for valid object pointers, it happens in this order. When a recursive @@ -967,7 +967,7 @@ public boost::noncopyable, /** * @brief Move a vertex to a subcluster * - * Overloaded convinience function which fetches the local descriptor for the cluster reference and calls + * Overloaded convenience function which fetches the local descriptor for the cluster reference and calls * the full parameter equivalent. Both cluster and vertex must be in the local cluster. * * @param v the LocalVertex to be moved @@ -979,7 +979,7 @@ public boost::noncopyable, /** * @brief Move a vertex to a subcluster * - * Overloaded convinience function which fetches the the cluster reference for the local descriptor and calls + * Overloaded convenience function which fetches the the cluster reference for the local descriptor and calls * the full parameter equivalent. Both cluster and vertex must be in the local cluster. * * @param v the LocalVertex to be moved @@ -1014,7 +1014,7 @@ public boost::noncopyable, * stands for all edges which use the moved vertex: global descriptors stay the same, but they are moved to new * local edges. Note that this function is the inverse of moveToSubcluster, and doing Pseudocode: * moveToParent(moveToSubcluster(v)) does nothing (only the local descriptor of the moved vertex is - * diffrent afterwards). + * different afterwards). * * @param v Local vertex which should be moved to the parents cluster * @return LocalVertex the local descriptor of the moved vertex, valid in the parent cluster only. @@ -1036,9 +1036,9 @@ public boost::noncopyable, /* Searches the global vertex in all local vertices of this graph, and returns the local - * one which holds the global vertex. If not successfull the local vertex returned will be + * one which holds the global vertex. If not successful the local vertex returned will be * invalid and the bool parameter will be false. If recursive = true, all subclusters will - * be seached too, however, if found there the retourned local vertex will be the vertex + * be searched too, however, if found there the returned local vertex will be the vertex * representing the toplevel cluster holding the global vertex in the initial graph. * */ std::pair getContainingVertex(GlobalVertex id, bool recursive = true); @@ -1049,7 +1049,7 @@ public boost::noncopyable, fusion::vector, bool> getContainingVertexGraph(GlobalVertex id); /* Searches the global edge in all local edges of this graph, and returns the local - * one which holds the global edge. If not successfull the local edge returned will be + * one which holds the global edge. If not successful the local edge returned will be * invalid and the bool parameter will be false. * */ std::pair getContainingEdge(GlobalEdge id); diff --git a/src/Mod/Assembly/App/opendcm/core/constraint.hpp b/src/Mod/Assembly/App/opendcm/core/constraint.hpp index 0654adedce90..9c7585b05cc6 100644 --- a/src/Mod/Assembly/App/opendcm/core/constraint.hpp +++ b/src/Mod/Assembly/App/opendcm/core/constraint.hpp @@ -149,7 +149,7 @@ class Constraint { virtual void disable() = 0; virtual placeholder* clone() = 0; - //some runtime type infos are needed, as we cant access the contents with arbitrary functors + //some runtime type infos are needed, as we can't access the contents with arbitrary functors virtual std::vector getGenericEquations() = 0; virtual std::vector getGenericConstraints() = 0; virtual std::vector getEquationTypes() = 0; diff --git a/src/Mod/Assembly/App/opendcm/core/equations.hpp b/src/Mod/Assembly/App/opendcm/core/equations.hpp index 795834e107d1..9d987fd6c8e4 100644 --- a/src/Mod/Assembly/App/opendcm/core/equations.hpp +++ b/src/Mod/Assembly/App/opendcm/core/equations.hpp @@ -104,7 +104,7 @@ struct constraint_sequence : public seq { std::cout<<"pretty: "<<__PRETTY_FUNCTION__< diff --git a/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp index d2cb275c2641..678e14e83c92 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp @@ -259,7 +259,7 @@ template< typename edge_prop, typename vertex_prop, typename cluster_prop, typen template void ClusterGraph::copyInto(boost::shared_ptr into, Functor& functor) const { - //lists does not provide vertex index, so we have to build our own (cant use the internal + //lists does not provide vertex index, so we have to build our own (can't use the internal //vertex_index_property as we would need to reset the indices and that's not possible in const graph) typedef std::map IndexMap; IndexMap mapIndex; @@ -272,7 +272,7 @@ void ClusterGraph::copyInto(boost //first copy all vertices and edges, but be aware that the objects in the new graph //are also copys only and point to the old graph. there is a bug in older boost version - //(<1.5 i belive) that breaks vertex_all propety map for bundled properties, so we + //(<1.5 i believe) that breaks vertex_all propety map for bundled properties, so we //have to create our own copie functors into->clear(); vertex_copier vc(*this, *into); @@ -581,7 +581,7 @@ ClusterGraph::addEdge(GlobalVerte if(!(d1 && d2)) return fusion::make_vector(LocalEdge(), GlobalEdge(), false, false); - //if both vertices are in a subcluster this one must do the job as we cant access the local edge from here + //if both vertices are in a subcluster this one must do the job as we can't access the local edge from here if(v1 == v2 && isCluster(v1)) { fusion::vector res = getVertexCluster(v1)->addEdge(source, target); fusion::at_c<3> (res) = false; @@ -1186,7 +1186,7 @@ ClusterGraph::apply_to_bundle(Glo fusion::vector, bool> res = getContainingVertexGraph(k); if(!fusion::at_c<2> (res)) { - //TODO: Throw (propeties return reference, but cant init a reference temporarily) + //TODO: Throw (propeties return reference, but can't init a reference temporarily) } return fusion::at_c<1> (res)->template apply_to_bundle (k, f); diff --git a/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp index 0a5f6ed858b3..4761095195b0 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp @@ -79,7 +79,7 @@ void Constraint::holder::Calculater::ope if(!val.enabled) return; - //if we are not one of the accessed types we dont need to be recalculated + //if we are not one of the accessed types we don't need to be recalculated if((access==rotation && val.access!=rotation) || (access == general && val.access != general)) { @@ -110,7 +110,7 @@ void Constraint::holder::Calculater::ope val.m_residual(0) = val.m_eq.calculate(first->m_parameter, second->m_parameter); - //now see which way we should calculate the gradient (may be diffrent for both geometries) + //now see which way we should calculate the gradient (may be different for both geometries) if(first->m_parameterCount) { if(first->getClusterMode()) { //when the cluster is fixed no maps are set as no parameters exist. @@ -142,7 +142,7 @@ void Constraint::holder::Calculater::ope val.m_diff_second_rot(i) = val.m_eq.calculateGradientSecond(first->m_parameter, second->m_parameter, second->m_diffparam.col(i)); } - //and the translation seperated + //and the translation separated for(int i=0; i<3; i++) { val.m_diff_second(i) = val.m_eq.calculateGradientSecond(first->m_parameter, second->m_parameter, second->m_diffparam.col(i+3)); @@ -250,7 +250,7 @@ void Constraint::holder::LGZ::operator() //LGZ exists for rotations only for(int i=0; i<3; i++) { - //only treat if the gradient realy is zero + //only treat if the gradient really is zero if(Kernel::isSame(val.m_diff_first_rot(i), 0, 1e-7)) { //to get the approximated second derivative we need the slightly moved geometrie @@ -277,7 +277,7 @@ void Constraint::holder::LGZ::operator() for(int i=0; i<3; i++) { - //only treat if the gradient realy is zero + //only treat if the gradient really is zero if(Kernel::isSame(val.m_diff_second_rot(i), 0, 1e-7)) { //to get the approximated second derivative we need the slightly moved geometrie diff --git a/src/Mod/Assembly/App/opendcm/core/imp/equations_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/equations_imp.hpp index ca7e8a1438c9..9f6ff8f8ed78 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/equations_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/equations_imp.hpp @@ -137,7 +137,7 @@ Derived& Equation::assign(const Derived& eq) { option_copy oc(values); fusion::for_each(eq.values, oc); - //the assigned eqution can be set back to default for convinience in further usage + //the assigned eqution can be set back to default for convenience in further usage const_cast(&eq)->setDefault(); return *static_cast(this); @@ -182,7 +182,7 @@ Equation::operator &(T& val) { }; */ -//convinience stream functions for debugging +//convenience stream functions for debugging template struct print_pair { std::basic_ostream* stream; diff --git a/src/Mod/Assembly/App/opendcm/core/imp/geometry_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/geometry_imp.hpp index 4316e27be328..2243abf002d3 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/geometry_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/geometry_imp.hpp @@ -216,7 +216,7 @@ void Geometry::finishCalculation() { BOOST_LOG_SEV(log, information) << "Finish cluster calculation"; #endif } - //TODO:non cluster paramter scaling + //TODO:non cluster parameter scaling else { m_global = m_parameter; normalize(); diff --git a/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp index 22269c0183f8..b836f7ba3e2e 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp @@ -271,7 +271,7 @@ int Dogleg::solve(typename Kernel::MappedEquationSystem& sys, Functor& r rescale(); sys.recalculate(); } - //it can also happen that the differentials get too small, however, we cant check for that + //it can also happen that the differentials get too small, however, we can't check for that else if(iter>1 && (counter>50)) { rescale(); sys.recalculate(); diff --git a/src/Mod/Assembly/App/opendcm/core/object.hpp b/src/Mod/Assembly/App/opendcm/core/object.hpp index cc112bd03e6b..6e264ceccb95 100644 --- a/src/Mod/Assembly/App/opendcm/core/object.hpp +++ b/src/Mod/Assembly/App/opendcm/core/object.hpp @@ -46,7 +46,7 @@ namespace mpl = boost::mpl; namespace fusion = boost::fusion; -/* Preprocessor implementation of emit signal. As we need many overloads with diffrent number of +/* Preprocessor implementation of emit signal. As we need many overloads with different number of * templated parameters we use boost preprocessor to do the hard repetive work. The definition and * implementation are definded first as they need to be known before usage * */ @@ -112,7 +112,7 @@ struct SignalOwner { /** * @brief Enable or disable signal emittion * - * If you want to supress all signals emitted by a object you can do this by calling this function. + * If you want to suppress all signals emitted by a object you can do this by calling this function. * All calls to emitSignal() will be blocked until signals aer reenabled by using this function with * onoff = true. Note that signals are not queued, if emitting is disabled all signals are lost. * @@ -167,7 +167,7 @@ struct Object : public PropertyOwner, typename typename boost::disable_if< boost::is_same< typename mpl::find::type, typename mpl::end::type >, void >::type setOption(typename Option::type value); - //convinience function + //convenience function template typename Option::type& option(); diff --git a/src/Mod/Assembly/App/opendcm/module3d/distance.hpp b/src/Mod/Assembly/App/opendcm/module3d/distance.hpp index af79e5d24820..1092318b88ac 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/distance.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/distance.hpp @@ -390,7 +390,7 @@ struct Distance::type< Kernel, tag::line3D, tag::line3D > { Vector3 c, n1, n2, nxn; //if the lines are parallel we need to fall back to point-line distance - //to do this efficently we just hold a point-line distance equation and use it instead + //to do this efficiently we just hold a point-line distance equation and use it instead Distance::type pl_eqn; #ifdef USE_LOGGING @@ -467,7 +467,7 @@ struct Distance::type< Kernel, tag::line3D, tag::line3D > { Scalar diff = (-dline1.template head<3>().dot(nxn)+c.dot(nxn_diff))*nxn_n; diff -= c.dot(nxn)*nxn.dot(nxn_diff)/nxn_n; - //absoulute value requires diffrent differentation for diffrent results + //absoulute value requires different differentation for different results if(cdn <= 0) diff *= -1; @@ -493,7 +493,7 @@ struct Distance::type< Kernel, tag::line3D, tag::line3D > { Scalar diff = (dline2.template head<3>().dot(nxn)+c.dot(nxn_diff))*nxn_n; diff -= c.dot(nxn)*nxn.dot(nxn_diff)/nxn_n; - //absoulute value requires diffrent differentation for diffrent results + //absoulute value requires different differentation for different results if(cdn <= 0) diff *= -1; diff --git a/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp b/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp index e4043b20a285..fa047ce21c08 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp @@ -428,7 +428,7 @@ typename ClusterMath::Scalar ClusterMath::calculateClusterScale() { //three points on a line need to be treaded as multiple points } - //more than 3 points dont have a exakt solution. we search for a midpoint from which all points + //more than 3 points don't have a exact solution. we search for a midpoint from which all points //are at least MAXFAKTOR*scale away, but not closer than MINFAKTOR*scale //get the bonding box to get the center of points @@ -618,7 +618,7 @@ void ClusterMath::applyClusterScale(Scalar scale, bool isFixed) { #ifdef USE_LOGGING BOOST_LOG(log) << "sstrans scale: "<::solveCluster(boost::shared_ptr cluster, Sys& sy int params=0, constraints=0; typename Kernel::number_type scale = 1; - //get the ammount of parameters and constraint equations we need + //get the amount of parameters and constraint equations we need typedef typename boost::graph_traits::vertex_iterator iter; std::pair it = boost::vertices(*cluster); diff --git a/src/Mod/Assembly/App/opendcm/module3d/module.hpp b/src/Mod/Assembly/App/opendcm/module3d/module.hpp index d273c3a09b69..3ab86649bd59 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/module.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/module.hpp @@ -140,7 +140,7 @@ struct Module3D { template void set(const T& geometry, Identifier id); - //somehow the base class set funtion is not found + //somehow the base class set function is not found template void set(const T& geometry); diff --git a/src/Mod/Assembly/App/opendcm/moduleShape3d/module.hpp b/src/Mod/Assembly/App/opendcm/moduleShape3d/module.hpp index b1e6051c22e0..bdd5f3242232 100644 --- a/src/Mod/Assembly/App/opendcm/moduleShape3d/module.hpp +++ b/src/Mod/Assembly/App/opendcm/moduleShape3d/module.hpp @@ -392,7 +392,7 @@ struct ModuleShape3D { template void set(const T& geometry, ID id); - //somehow the base class set funtion is not found + //somehow the base class set function is not found template void set(const T& geometry); @@ -638,7 +638,7 @@ template void ModuleShape3D::type::Shape3D_base::remove(boost::shared_ptr g) { //before we delete this shape by calling the system remove function, we need to remove - //this geometry as this would be deleted again by the system call and we would go into infinit recoursion + //this geometry as this would be deleted again by the system call and we would go into infinite recursion //get the vector object where the geometry is part of typename GeometryVector::const_iterator it; @@ -659,7 +659,7 @@ template void ModuleShape3D::type::Shape3D_base::remove(boost::shared_ptr g) { //before we delete this shape by calling the system remove function, we need to remove - //this geometry as this would be deleted again by the system call and we would go into infinit recoursion + //this geometry as this would be deleted again by the system call and we would go into infinite recursion //get the vector object where the geometry is part of typename ShapeVector::const_iterator it; @@ -680,7 +680,7 @@ template void ModuleShape3D::type::Shape3D_base::remove(boost::shared_ptr g) { //before we delete this shape by calling the system remove function, we need to remove - //this geometry as this would be deleted again by the system call and we would go into infinit recoursion + //this geometry as this would be deleted again by the system call and we would go into infinite recursion //get the vector object where the geometry is part of typename ConstraintVector::const_iterator it; diff --git a/src/Mod/Assembly/Gui/ViewProviderConstraint.h b/src/Mod/Assembly/Gui/ViewProviderConstraint.h index 7aa57ef20a2f..e45b82d2da38 100644 --- a/src/Mod/Assembly/Gui/ViewProviderConstraint.h +++ b/src/Mod/Assembly/Gui/ViewProviderConstraint.h @@ -99,7 +99,7 @@ class AssemblyGuiExport ViewProviderConstraint: public PartGui::ViewProviderPart void draw(); private: - //we need two seperate visual representations, as both constraint parts have different + //we need two separate visual representations, as both constraint parts have different //placements. ViewProviderConstraintInternal internal_vp; diff --git a/src/Tools/ImageTools/ImageConv/main.cpp b/src/Tools/ImageTools/ImageConv/main.cpp index d65f399fc148..f3a740ff26ef 100644 --- a/src/Tools/ImageTools/ImageConv/main.cpp +++ b/src/Tools/ImageTools/ImageConv/main.cpp @@ -141,7 +141,7 @@ int main( int argc, char **argv ) } catch(...) { - cerr << "An unknown exception has occured!!!" << endl; + cerr << "An unknown exception has occurred!!!" << endl; } return 0; diff --git a/src/Tools/thumbs/IExtractImage.h b/src/Tools/thumbs/IExtractImage.h index 25a4f77e1bca..5eba1f3eaf8a 100644 --- a/src/Tools/thumbs/IExtractImage.h +++ b/src/Tools/thumbs/IExtractImage.h @@ -15,7 +15,7 @@ DEFINE_GUID(IID_IExtractImage, #define IEIFLAG_OFFLINE 0x0008 // if the extractor shouldn't hit the net to get any content neede for the rendering #define IEIFLAG_GLEAM 0x0010 // does the image have a gleam ? this will be returned if it does #define IEIFLAG_SCREEN 0x0020 // render as if for the screen (this is exlusive with IEIFLAG_ASPECT ) -#define IEIFLAG_ORIGSIZE 0x0040 // render to the approx size passed, but crop if neccessary +#define IEIFLAG_ORIGSIZE 0x0040 // render to the approx size passed, but crop if necessary #define IEIFLAG_NOSTAMP 0x0080 // returned from the extractor if it does NOT want an icon stamp on the thumbnail #define IEIFLAG_NOBORDER 0x0100 // returned from the extractor if it does NOT want an a border around the thumbnail #define IEIFLAG_QUALITY 0x0200 // passed to the Extract method to indicate that a slower, higher quality image is desired, re-compute the thumbnail diff --git a/src/Tools/thumbs/ThumbnailProvider/FCConfig.h b/src/Tools/thumbs/ThumbnailProvider/FCConfig.h index f01f17eb117d..e06220a5de3f 100644 --- a/src/Tools/thumbs/ThumbnailProvider/FCConfig.h +++ b/src/Tools/thumbs/ThumbnailProvider/FCConfig.h @@ -163,7 +163,7 @@ typedef unsigned __int64 uint64_t; // here get the warnings of too long specifiers disabled (needed for VC6) #ifdef _MSC_VER # pragma warning( disable : 4251 ) -# pragma warning( disable : 4996 ) // supress depricated warning for e.g. open() +# pragma warning( disable : 4996 ) // suppress depricated warning for e.g. open() #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__) # pragma warning( disable : 4244 ) # pragma warning( disable : 4267 )