diff --git a/CMakeLists.txt b/CMakeLists.txt index 77e9c8090c..32e6b99f32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1077,7 +1077,7 @@ IF(MSVC) ENDIF(FREECAD_RELEASE_PDB) # Mark 32 bit executables large address aware so they can use > 2GB address space - # NOTE: This setting only has an effect on machines with at least 3GB of RAM, although it sets the linker option it doesn't set the the linker switch 'Enable Large Addresses' + # NOTE: This setting only has an effect on machines with at least 3GB of RAM, although it sets the linker option it doesn't set the linker switch 'Enable Large Addresses' IF(CMAKE_SIZEOF_VOID_P EQUAL 4) set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") diff --git a/ChangeLog.txt b/ChangeLog.txt index bffc3f2769..1ab51adc23 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -430,7 +430,7 @@ Version: V0.5B5 Date: Sat Feb 25 2006 +++++++++++++++++++++++++++++++ * Return the edge list by reference in mesh kernel (to avoid memory leak) * PropertyVectorList implemented * Use PropertyVectorLists and PropertyFloatLists in Mesh::Curvature feature and its associated view provider - * PropertyColor(List) implemeted + * PropertyColor(List) implemented * PropertyMeshKernel added * move all Projects to NODEFAULTLIBS * move all Projects to xcopy @@ -912,7 +912,7 @@ Version: V0.1B48 Date: Sun Mar 30 15:06:23 2003 +++++++++++++++++++++++++++++++ * Big patch from Werner about: - feeding toolbars and Commandbar and menus from the parameterts - customizing works with positions in command bar and toolbar - - customizing by draging from menu into toolbar and commandbar + - customizing by dragging from menu into toolbar and commandbar Version: V0.1B47 Date: Fri Mar 28 18:24:36 2003 +++++++++++++++++++++++++++++++ * Import App Module added diff --git a/package/debian/changelog b/package/debian/changelog index 0ccd1a2ce7..7724842556 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -92,7 +92,7 @@ freecad (0.10.3247.dfsg-2) unstable; urgency=low * control: - Update to standars-version 3.9.0. - Remove libblas-dev, libatlas-dev from build-deps. - * Add debian/shlibs.local file containing the the correct binary dep + * Add debian/shlibs.local file containing the correct binary dep to libsoqt4-20 (closes: #575239). * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes the lintian warning copyright-refers-to-deprecated-bsd-license-file. diff --git a/package/debian/diff/freecad_lucid.diff b/package/debian/diff/freecad_lucid.diff index 476137f7e0..188139fb31 100644 --- a/package/debian/diff/freecad_lucid.diff +++ b/package/debian/diff/freecad_lucid.diff @@ -49,7 +49,7 @@ + * control: + - Update to standars-version 3.9.0. + - Remove libblas-dev, libatlas-dev from build-deps. -+ * Add debian/shlibs.local file containing the the correct binary dep ++ * Add debian/shlibs.local file containing the correct binary dep + to libsoqt4-20 (closes: #575239). + * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes + the lintian warning copyright-refers-to-deprecated-bsd-license-file. diff --git a/package/debian/diff/freecad_natty.diff b/package/debian/diff/freecad_natty.diff index 3907a20eaa..c93ee76b4a 100644 --- a/package/debian/diff/freecad_natty.diff +++ b/package/debian/diff/freecad_natty.diff @@ -62,7 +62,7 @@ + * control: + - Update to standars-version 3.9.0. + - Remove libblas-dev, libatlas-dev from build-deps. -+ * Add debian/shlibs.local file containing the the correct binary dep ++ * Add debian/shlibs.local file containing the correct binary dep + to libsoqt4-20 (closes: #575239). + * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes + the lintian warning copyright-refers-to-deprecated-bsd-license-file. diff --git a/package/debian/diff/freecad_precise.diff b/package/debian/diff/freecad_precise.diff index fcb4e79c28..40081326ad 100644 --- a/package/debian/diff/freecad_precise.diff +++ b/package/debian/diff/freecad_precise.diff @@ -71,7 +71,7 @@ + * control: + - Update to standars-version 3.9.0. + - Remove libblas-dev, libatlas-dev from build-deps. -+ * Add debian/shlibs.local file containing the the correct binary dep ++ * Add debian/shlibs.local file containing the correct binary dep + to libsoqt4-20 (closes: #575239). + * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes + the lintian warning copyright-refers-to-deprecated-bsd-license-file. diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 5847cf7810..b752532325 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1125,7 +1125,7 @@ void segmentation_fault_handler(int sig) case SIGABRT: std::cerr << "Abnormal program termination..." << std::endl; #if !defined(_DEBUG) - throw Base::AbnormalProgramTermination("Break signal occoured"); + throw Base::AbnormalProgramTermination("Break signal occurred"); #endif break; default: @@ -1690,7 +1690,7 @@ void Application::runApplication() Interpreter().runString(Base::ScriptFactory().ProduceScript(mConfig["ScriptFileName"].c_str())); } else if (mConfig["RunMode"] == "Exit") { - // geting out + // getting out Console().Log("Exiting on purpose\n"); } else { diff --git a/src/App/Application.h b/src/App/Application.h index 852ceacb80..b966d43ae0 100644 --- a/src/App/Application.h +++ b/src/App/Application.h @@ -77,7 +77,7 @@ public: App::Document* newDocument(const char * Name=0l, const char * UserName=0l); /// Closes the document \a name and removes it from the application. bool closeDocument(const char* name); - /// find a unique docuement name + /// find a unique document name std::string getUniqueDocumentName(const char *Name) const; /// Open an existing document from a file App::Document* openDocument(const char * FileName=0l); @@ -164,7 +164,7 @@ public: /** Gets a parameter group by a full qualified path * It's an easy method to get a group: * \code - * // geting standard parameter + * // getting standard parameter * ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Raytracing"); * std::string cDir = hGrp->GetASCII("ProjectPath", ""); * std::string cCameraName = hGrp->GetASCII("CameraName", "TempCamera.inc"); diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 34438f0238..8a641145e1 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -1169,7 +1169,7 @@ Document::Document(void) ADD_PROPERTY_TYPE(CreationDate,(CreationDateString.c_str()),0,Prop_ReadOnly,"Date of creation"); ADD_PROPERTY_TYPE(LastModifiedBy,(""),0,Prop_None,0); ADD_PROPERTY_TYPE(LastModifiedDate,("Unknown"),0,Prop_ReadOnly,"Date of last modification"); - ADD_PROPERTY_TYPE(Company,(AuthorComp.c_str()),0,Prop_None,"Additional tag to save the the name of the company"); + ADD_PROPERTY_TYPE(Company,(AuthorComp.c_str()),0,Prop_None,"Additional tag to save the name of the company"); ADD_PROPERTY_TYPE(Comment,(""),0,Prop_None,"Additional tag to save a comment"); ADD_PROPERTY_TYPE(Meta,(),0,Prop_None,"Map with additional meta information"); ADD_PROPERTY_TYPE(Material,(),0,Prop_None,"Map with material properties"); @@ -1742,7 +1742,7 @@ bool Document::save (void) void Document::restore (void) { // clean up if the document is not empty - // !TODO mind exeptions while restoring! + // !TODO mind exceptions while restoring! clearUndos(); // first notify the objects to being deleted and then delete them in a second loop (#0002521) // FIXME: To delete every object individually is inefficient. Add a new signal 'signalClear' @@ -2164,7 +2164,7 @@ int Document::recompute() if (recomputeList.find(Cur) != recomputeList.end() || Cur->ExpressionEngine.depsAreTouched()) { if ( _recomputeFeature(Cur)) { - // if somthing happen break execution of recompute + // if something happened break execution of recompute d->vertexMap.clear(); return -1; } @@ -2225,7 +2225,7 @@ int Document::recompute() if ((*objIt)->isTouched() || (*objIt)->mustExecute() == 1){ objectCount++; if (_recomputeFeature(*objIt)) { - // if something happen break execution of recompute + // if something happened break execution of recompute return -1; } else{ @@ -2465,7 +2465,7 @@ bool Document::_recomputeFeature(DocumentObject* Feat) #ifndef FC_DEBUG catch (...) { Base::Console().Error("App::Document::_RecomputeFeature(): Unknown exception in Feature \"%s\" thrown\n",Feat->getNameInDocument()); - _RecomputeLog.push_back(new DocumentObjectExecReturn("Unknown exeption!")); + _RecomputeLog.push_back(new DocumentObjectExecReturn("Unknown exception!")); Feat->setError(); return true; } diff --git a/src/App/Document.h b/src/App/Document.h index 2cd3b9bdfc..515e580545 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -232,7 +232,7 @@ public: /// Returns a list of all Objects std::vector getObjects() const; std::vector getObjectsOfType(const Base::Type& typeId) const; - /// Returns all object with given extensions. If derived=true also all objects with extenions derived from the given one + /// Returns all object with given extensions. If derived=true also all objects with extensions derived from the given one std::vector getObjectsWithExtension(const Base::Type& typeId, bool derived = true) const; std::vector findObjects(const Base::Type& typeId, const char* objname) const; /// Returns an array with the correct types already. diff --git a/src/App/DynamicProperty.cpp b/src/App/DynamicProperty.cpp index e59e8a8b86..75c427f916 100644 --- a/src/App/DynamicProperty.cpp +++ b/src/App/DynamicProperty.cpp @@ -306,7 +306,7 @@ std::string DynamicProperty::getUniquePropertyName(const char *Name) const void DynamicProperty::Save (Base::Writer &writer) const { - //extenions must be saved first, as they need to be read and initialised before properties (as + //extensions must be saved first, as they need to be read and initialised before properties (as //they have their own properties which they need to handle on restore) if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId())) static_cast(this->pc)->saveExtensions(writer); diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index c4654c95b7..696fb23e02 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -224,7 +224,7 @@ NumberExpression::NumberExpression(const DocumentObject *_owner, const Quantity } /** - * Evalute the expression. For NumberExpressions, it is a simply copy(). + * Evaluate the expression. For NumberExpressions, it is a simply copy(). */ Expression * NumberExpression::eval() const @@ -334,7 +334,7 @@ static bool definitelyLessThan(double a, double b, double epsilon) } /** - * Evalutate the expression. Returns a new Expression with the result, or throws + * Evaluate the expression. Returns a new Expression with the result, or throws * an exception if something is wrong, i.e the expression cannot be evaluated. */ @@ -1274,7 +1274,7 @@ int FunctionExpression::priority() const } /** - * Compute the dependecy set of the expression. The set contains the names + * Compute the dependency set of the expression. The set contains the names * of all Property objects this expression relies on. */ @@ -1355,7 +1355,7 @@ const Property * VariableExpression::getProperty() const } /** - * Evalute the expression. For a VariableExpression, this means to return the + * Evaluate the expression. For a VariableExpression, this means to return the * value of the referenced Property. Quantities are converted to NumberExpression with unit, * int and floats are converted to a NumberExpression without unit. Strings properties * are converted to StringExpression objects. @@ -1449,7 +1449,7 @@ int VariableExpression::priority() const } /** - * Compute the dependecy of the expression. In this case \a props + * Compute the dependency of the expression. In this case \a props * is a set of strings, i.e the names of the Property objects, and * the variable name this expression relies on is inserted into the set. * Notice that the variable may be unqualified, i.e without any reference @@ -1500,7 +1500,7 @@ StringExpression::StringExpression(const DocumentObject *_owner, const std::stri } /** - * Evalute the string. For strings, this is a simple copy of the object. + * Evaluate the string. For strings, this is a simple copy of the object. */ Expression * StringExpression::eval() const @@ -1759,7 +1759,7 @@ static const App::DocumentObject * DocumentObject = 0; /**< The DocumentObject t static bool unitExpression = false; /**< True if the parsed string is a unit only */ static bool valueExpression = false; /**< True if the parsed string is a full expression */ static std::stack labels; /**< Label string primitive */ -static std::map registered_functions; /**< Registerd functions */ +static std::map registered_functions; /**< Registered functions */ static int last_column; static int column; diff --git a/src/App/Extension.cpp b/src/App/Extension.cpp index c47b77ee27..58796fd631 100644 --- a/src/App/Extension.cpp +++ b/src/App/Extension.cpp @@ -175,7 +175,7 @@ void Extension::extensionGetPropertyMap(std::map< std::string, Property* >& Map) void Extension::initExtensionSubclass(Base::Type& toInit, const char* ClassName, const char* ParentName, Base::Type::instantiationMethod method) { - // dont't init twice! + // don't init twice! assert(toInit == Base::Type::badType()); // get the parent class Base::Type parentType(Base::Type::fromName(ParentName)); diff --git a/src/App/Extension.h b/src/App/Extension.h index 0aaefe3e1e..e026ee4c19 100644 --- a/src/App/Extension.h +++ b/src/App/Extension.h @@ -131,7 +131,7 @@ template<> void _class_::init(void){\ * * Extensions are like every other FreeCAD object and based on properties. All information storage * and persistence should be achieved by use of those. Additional any number of methods can be - * added to provide funtionality around the properties. There are 3 samll difference to normal objects: + * added to provide functionality around the properties. There are 3 small difference to normal objects: * 1. They must be derived from Extension class * 2. Properties must be handled with special extension macros * 3. Extensions must be initialised @@ -159,7 +159,7 @@ template<> void _class_::init(void){\ * 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 + * The automatic availability of methods in the class does not hold for the python interface, only * for c++ classes. This is like every where else in FreeCAD, there is no automatic creation of python * API from c++ classes. Hence the extension creator must also create a custom python object of its * extension, which works exactly like the normal FreeCAD python object workflow. There is nothing diff --git a/src/App/ExtensionContainer.h b/src/App/ExtensionContainer.h index fb9fd120a6..edd22ea05f 100644 --- a/src/App/ExtensionContainer.h +++ b/src/App/ExtensionContainer.h @@ -182,7 +182,7 @@ public: virtual void Save(Base::Writer& writer) const override; virtual void Restore(Base::XMLReader& reader) override; - //those methods save/restore the dynamic extenions without handling properties, which is something + //those methods save/restore the dynamic extensions without handling properties, which is something //done by the default Save/Restore methods. void saveExtensions(Base::Writer& writer) const; void restoreExtensions(Base::XMLReader& reader); diff --git a/src/App/FeatureTest.cpp b/src/App/FeatureTest.cpp index db86d08c4a..5be3c4dd29 100644 --- a/src/App/FeatureTest.cpp +++ b/src/App/FeatureTest.cpp @@ -133,7 +133,7 @@ DocumentObjectExecReturn *FeatureTest::execute(void) switch(ExceptionType.getValue()) { case 0: break; - case 1: throw "Test Exeption"; + case 1: throw "Test Exception"; case 2: throw Base::RuntimeError("FeatureTestException::execute(): Testexception"); case 3: *i=0;printf("%i",*i);break; // seg-vault case 4: j=0; printf("%i",1/j); break; // int devision by zero diff --git a/src/App/FeatureTest.h b/src/App/FeatureTest.h index 6d9a2efbe6..019b85346d 100644 --- a/src/App/FeatureTest.h +++ b/src/App/FeatureTest.h @@ -125,7 +125,7 @@ public: /// this property defines which kind of exceptio the feature throw on you App::PropertyInteger ExceptionType; - /// recalculate the Feature and throw an exeption + /// recalculate the Feature and throw an exception virtual DocumentObjectExecReturn *execute(void); /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { diff --git a/src/App/ObjectIdentifier.cpp b/src/App/ObjectIdentifier.cpp index 6dead5c6f0..7b650db3fb 100644 --- a/src/App/ObjectIdentifier.cpp +++ b/src/App/ObjectIdentifier.cpp @@ -322,7 +322,7 @@ std::string ObjectIdentifier::toString() const } /** - * @brief Escape toString representation so it is suitable for being embeddded in a python command. + * @brief Escape toString representation so it is suitable for being embedded in a python command. * @return Escaped string. */ diff --git a/src/App/OriginGroupExtension.h b/src/App/OriginGroupExtension.h index bb39143f5d..fdeb7ca982 100644 --- a/src/App/OriginGroupExtension.h +++ b/src/App/OriginGroupExtension.h @@ -30,7 +30,7 @@ namespace App { class Origin; /** - * Represents an abstact placeable group of objects with an associated Origin + * Represents an abstract placeable group of objects with an associated Origin */ class AppExport OriginGroupExtension : public App::GeoFeatureGroupExtension { diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h index c2c36e4bc3..5b07df8628 100644 --- a/src/App/PropertyGeo.h +++ b/src/App/PropertyGeo.h @@ -343,7 +343,7 @@ private: }; /** the general Link Poperty - * Main Purpose of this property is to Link Objects and Feautures in a document. + * Main Purpose of this property is to Link Objects and Features in a document. */ class AppExport PropertyPlacementLink : public PropertyLink { diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 965604b74c..d2f6d401a3 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -379,7 +379,7 @@ void PropertyLinkList::Restore(Base::XMLReader &reader) std::string name = reader.getAttribute("value"); // In order to do copy/paste it must be allowed to have defined some // referenced objects in XML which do not exist anymore in the new - // document. Thus, we should silently ingore this. + // document. Thus, we should silently ignore this. // Property not in an object! DocumentObject* father = static_cast(getContainer()); App::Document* document = father->getDocument(); diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 8e0d74cccc..c31e52d501 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -88,7 +88,7 @@ protected: }; /** The general Link Property - * Main Purpose of this property is to Link Objects and Feautures in a document. Like all links this + * Main Purpose of this property is to Link Objects and Features in a document. Like all links this * property is scope aware, meaning it does define which objects are allowed to be linked depending * of the GeoFeatureGroup where it is in. Default is Local. * diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h index 65271e75fe..6f2592163b 100644 --- a/src/App/PropertyStandard.h +++ b/src/App/PropertyStandard.h @@ -578,7 +578,7 @@ protected: /** Precision properties * This property fulfills the need of a floating value with many decimal points, * e.g. for holding values like Precision::Confusion(). The value has a default - * constraint for non-negative, but can be overidden + * constraint for non-negative, but can be overridden */ class AppExport PropertyPrecision: public PropertyFloatConstraint { diff --git a/src/App/Transactions.cpp b/src/App/Transactions.cpp index 64dc4fd2c7..7da2d8ce2c 100644 --- a/src/App/Transactions.cpp +++ b/src/App/Transactions.cpp @@ -124,7 +124,7 @@ void Transaction::removeProperty(TransactionalObject *Obj, } //************************************************************************** -// separator for other implemetation aspects +// separator for other implementation aspects void Transaction::apply(Document &Doc, bool forward) diff --git a/src/Base/BaseClass.cpp b/src/Base/BaseClass.cpp index 1e474397c7..18707e63b5 100644 --- a/src/Base/BaseClass.cpp +++ b/src/Base/BaseClass.cpp @@ -58,7 +58,7 @@ BaseClass::~BaseClass() //************************************************************************** -// separator for other implemetation aspects +// separator for other implementation aspects void BaseClass::init(void) { diff --git a/src/Base/Factory.h b/src/Base/Factory.h index f7969b781d..1c25a9246e 100644 --- a/src/Base/Factory.h +++ b/src/Base/Factory.h @@ -42,7 +42,7 @@ class BaseExport AbstractProducer public: AbstractProducer() {} virtual ~AbstractProducer() {} - /// overwriten by a concret producer to produce the needed object + /// overwritten by a concrete producer to produce the needed object virtual void* Produce (void) const = 0; }; @@ -101,7 +101,7 @@ inline ScriptFactorySingleton& ScriptFactory(void) // -------------------------------------------------------------------- /** Script Factory - * This class produce Scirpts. + * This class produce Scripts. * @see Factory */ class BaseExport ScriptProducer: public AbstractProducer diff --git a/src/Base/FileTemplate.cpp b/src/Base/FileTemplate.cpp index 29905c8436..03e159720b 100644 --- a/src/Base/FileTemplate.cpp +++ b/src/Base/FileTemplate.cpp @@ -58,7 +58,7 @@ ClassTemplate::~ClassTemplate() //************************************************************************** -// separator for other implemetation aspects +// separator for other implementation aspects /** * a normal member taking two arguments and returning an integer value. diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp index 06f714fe9e..dfc0ae4905 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp @@ -118,7 +118,7 @@ void PyException::ReportException (void) const SystemExitException::SystemExitException() { // Set exception message and code based upon the pthon sys.exit() code and/or message - // based upon the the following sys.exit() call semantics. + // based upon the following sys.exit() call semantics. // // Invocation | _exitCode | _sErrMsg // ---------------- + --------- + -------- diff --git a/src/Base/MemDebug.cpp b/src/Base/MemDebug.cpp index cac81621de..32bdcf3f7a 100644 --- a/src/Base/MemDebug.cpp +++ b/src/Base/MemDebug.cpp @@ -161,7 +161,7 @@ MemDebug::~MemDebug() //************************************************************************** -// separator for other implemetation aspects +// separator for other implementation aspects /* REPORT HOOK FUNCTION diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index b344774417..e7010b7748 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -319,7 +319,7 @@ Base::Reference ParameterGrp::GetGroup(const char* Name) else { // path, split the first path std::string cTemp; - // geting the first part + // getting the first part cTemp.assign(cName,0,pos); // removing the first part from the original cName.erase(0,pos+1); @@ -373,7 +373,7 @@ std::vector > ParameterGrp::GetGroups(void) return vrParamGrp; } -/// test if this group is emty +/// test if this group is empty bool ParameterGrp::IsEmpty(void) const { if ( _pGroupNode->getFirstChild() ) diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h index 795a196b6b..6d13ffd8bb 100644 --- a/src/Base/Parameter.h +++ b/src/Base/Parameter.h @@ -118,7 +118,7 @@ public: Base::Reference GetGroup(const char* Name); /// get a vector of all sub groups in this group std::vector > GetGroups(void); - /// test if this group is emty + /// test if this group is empty bool IsEmpty(void) const; /// test if a special sub group is in this group bool HasGroup(const char* Name) const; diff --git a/src/Base/Persistence.cpp b/src/Base/Persistence.cpp index ed00e82e3e..cd215c4043 100644 --- a/src/Base/Persistence.cpp +++ b/src/Base/Persistence.cpp @@ -40,7 +40,7 @@ TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass); //************************************************************************** -// separator for other implemetation aspects +// separator for other implementation aspects unsigned int Persistence::getMemSize (void) const { diff --git a/src/Base/PyExport.h b/src/Base/PyExport.h index 3cf641c78d..3e4303e61f 100644 --- a/src/Base/PyExport.h +++ b/src/Base/PyExport.h @@ -118,8 +118,8 @@ public: /** pointer and default constructor * the good way would be not using pointer - * instead using a overwriten new operator in the - * HandledType class! But is not easy to inforce! + * instead using a overwritten new operator in the + * HandledType class! But is not easy to enforce! */ PyHandle(HandledType *ToHandel=0L) :_pHandels(ToHandel) { diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp index 7595539601..25b60eed28 100644 --- a/src/Base/PyObjectBase.cpp +++ b/src/Base/PyObjectBase.cpp @@ -68,7 +68,7 @@ PyObjectBase::~PyObjectBase() * the Py_TPFLAGS_BASETYPE flag. For example, the classes App::VectorPy and App::MatrixPy * have removed this flag and its Python proxies App.Vector and App.Matrix cannot be subclassed. * In case we want to allow to derive from subclasses of PyTypeObject in Python - * we must either reimplment tp_new, tp_dealloc, tp_getattr, tp_setattr, tp_repr or set them to + * we must either reimplement tp_new, tp_dealloc, tp_getattr, tp_setattr, tp_repr or set them to * 0 and define tp_base as 0. */ diff --git a/src/Base/PyObjectBase.h b/src/Base/PyObjectBase.h index 8f2b14bba2..ae9724ac47 100644 --- a/src/Base/PyObjectBase.h +++ b/src/Base/PyObjectBase.h @@ -266,7 +266,7 @@ public: /** PyInit method * Override this method to initialize a newly created - * instance of the class (Constuctor) + * instance of the class (Constructor) */ virtual int PyInit(PyObject* /*args*/, PyObject* /*kwd*/) { diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index ff26189dd0..b8bd929cb2 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -13,7 +13,7 @@ * (should also be enough) * - Changed to compile correctly with the PSDK of VC7.0 * (GetFileVersionInfoSizeA and GetFileVersionInfoA is wrongly defined: - * it uses LPSTR instead of LPCSTR as first paremeter) + * it uses LPSTR instead of LPCSTR as first parameter) * - Added declarations to support VC5/6 without using 'dbghelp.h' * - Added a 'pUserData' member to the ShowCallstack function and the * PReadProcessMemoryRoutine declaration (to pass some user-defined data, @@ -1112,7 +1112,7 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, const CONTEXT *context, PReadPro // if this returns ERROR_INVALID_ADDRESS (487) or ERROR_NOACCESS (998), you can // assume that either you are done, or that the stack is so hosed that the next // deeper frame could not be found. - // CONTEXT need not to be suplied if imageTyp is IMAGE_FILE_MACHINE_I386! + // CONTEXT need not to be supplied if imageTyp is IMAGE_FILE_MACHINE_I386! if ( ! this->m_sw->pSW(imageType, this->m_hProcess, hThread, &s, &c, myReadProcMem, this->m_sw->pSFTA, this->m_sw->pSGMB, NULL) ) { // INFO: "StackWalk64" does not set "GetLastError"... diff --git a/src/Base/TimeInfo.cpp b/src/Base/TimeInfo.cpp index 7d1a669bef..28f2d9b1ab 100644 --- a/src/Base/TimeInfo.cpp +++ b/src/Base/TimeInfo.cpp @@ -53,7 +53,7 @@ TimeInfo::~TimeInfo() //************************************************************************** -// separator for other implemetation aspects +// separator for other implementation aspects void TimeInfo::setCurrent(void) { diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp index 4a29e7062f..eadab0763c 100644 --- a/src/Base/UnitsApi.cpp +++ b/src/Base/UnitsApi.cpp @@ -143,7 +143,7 @@ void UnitsApi::setSchema(UnitSystem s) actSystem = SI1; } - UserPrefSystem->setSchemaUnits(); // if necesarry a unit schema can change the constants in Quantity (e.g. mi=1.8km rather then 1.6km). + UserPrefSystem->setSchemaUnits(); // if necessary a unit schema can change the constants in Quantity (e.g. mi=1.8km rather then 1.6km). } diff --git a/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp b/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp index e15db577ec..715b66e23a 100644 --- a/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp +++ b/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp @@ -703,7 +703,7 @@ bool Gui::GUIApplicationNativeEventAware::TranslateRawInputData(UINT nInputCode, #endif return true; } - } else { // Zero out the data if the app is not in forground + } else { // Zero out the data if the app is not in foreground deviceData.fAxes.assign(6, 0.f); } } else if (pRawInput->data.hid.bRawData[0] == 0x02) { // Rotation vector diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/BlenderNavigationStyle.cpp index 2adb019940..c18b776e4e 100644 --- a/src/Gui/BlenderNavigationStyle.cpp +++ b/src/Gui/BlenderNavigationStyle.cpp @@ -327,7 +327,7 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev) if (curmode == NavigationStyle::SPINNING) { break; } newmode = NavigationStyle::IDLE; // The left mouse button has been released right now but - // we want to avoid that the event is procesed elsewhere + // we want to avoid that the event is processed elsewhere if (this->lockButton1) { this->lockButton1 = false; processed = true; diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp index f663b039b5..12e4e7e24c 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/CADNavigationStyle.cpp @@ -371,7 +371,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev) if (curmode == NavigationStyle::SPINNING) { break; } newmode = NavigationStyle::IDLE; // The left mouse button has been released right now but - // we want to avoid that the event is procesed elsewhere + // we want to avoid that the event is processed elsewhere if (this->lockButton1) { this->lockButton1 = false; processed = true; diff --git a/src/Gui/CoinRiftWidget.cpp b/src/Gui/CoinRiftWidget.cpp index ba1b89ffd8..7dde3f9cff 100644 --- a/src/Gui/CoinRiftWidget.cpp +++ b/src/Gui/CoinRiftWidget.cpp @@ -242,7 +242,7 @@ void CoinRiftWidget::resizeGL(int width, int height) { void CoinRiftWidget::initializeGL() { makeCurrent(); - // Infer hardware capabilites. + // Infer hardware capabilities. #ifdef USE_FRAMEBUFFER OVR::CAPI::GL::InitGLExtensions(); if (OVR::CAPI::GL::glBindFramebuffer == NULL) { diff --git a/src/Gui/DlgToolbarsImp.h b/src/Gui/DlgToolbarsImp.h index a7ce803a39..ff0c4424e5 100644 --- a/src/Gui/DlgToolbarsImp.h +++ b/src/Gui/DlgToolbarsImp.h @@ -33,7 +33,7 @@ namespace Dialog { /** This class implements the creation of user defined toolbars. * In the left panel are shown all command groups with their command objects. * If any changeable toolbar was created in the left panel are shown all commands - * of the currently edited toolbar, otherwise it is emtpy. + * of the currently edited toolbar, otherwise it is empty. * All changes to a toolbar is done immediately. * * \author Werner Mayer diff --git a/src/Gui/DockWindow.h b/src/Gui/DockWindow.h index aaf3c1f763..910aae70c6 100644 --- a/src/Gui/DockWindow.h +++ b/src/Gui/DockWindow.h @@ -60,7 +60,7 @@ public: */ virtual ~DockWindow(); - /** @name methods to overrride + /** @name methods to override */ //@{ /// get called when the document is updated diff --git a/src/Gui/DockWindowManager.h b/src/Gui/DockWindowManager.h index de0b5c8e5a..2a29ce4ac0 100644 --- a/src/Gui/DockWindowManager.h +++ b/src/Gui/DockWindowManager.h @@ -76,7 +76,7 @@ public: /// Removes and destroys the QDockWidget and returns the widget /// with name \a name added with @ref addDockWindow. QWidget* removeDockWindow(const char* name); - /// Removes and destroys the QDockWidget that conains \a dock. \a dock + /// Removes and destroys the QDockWidget that contains \a dock. \a dock /// does not get destroyed. void removeDockWindow(QWidget* dock); /// Returns the widget with name \a name added with @ref addDockWindow. diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp index e318b457ae..07278dd037 100644 --- a/src/Gui/GraphvizView.cpp +++ b/src/Gui/GraphvizView.cpp @@ -57,7 +57,7 @@ namespace Gui { * @brief The GraphvizWorker class * * Implements a QThread class that does the actual conversion from dot to - * svg. All critical communcation is done using queued signals. + * svg. All critical communication is done using queued signals. * */ diff --git a/src/Gui/Icons/Std_ViewScreenShot.svg b/src/Gui/Icons/Std_ViewScreenShot.svg index 599399c59b..dc1a00612c 100644 --- a/src/Gui/Icons/Std_ViewScreenShot.svg +++ b/src/Gui/Icons/Std_ViewScreenShot.svg @@ -20,7 +20,7 @@ version="1.1">image/svg+xmlGenric ImageJakub SteinerimagepicturesnapshotphotoGeneric ImageJakub SteinerimagepicturesnapshotphotosetWorkingDirectory( dir.path() ); } - // user authentification + // user authentication if ( !d->proxy.isEmpty() ) { if ( !d->user.isEmpty() ) diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp index 14edc6d2ea..fd6c6d633f 100644 --- a/src/Gui/Quarter/QuarterWidget.cpp +++ b/src/Gui/Quarter/QuarterWidget.cpp @@ -110,7 +110,7 @@ using namespace SIM::Coin3D::Quarter; the scene. Some of the settings will provide faster rendering, while others gives you better quality rendering. - See \ref SoGLRenderAction::TransparencyType for a full descrition of the modes + See \ref SoGLRenderAction::TransparencyType for a full description of the modes */ /*! @@ -118,7 +118,7 @@ using namespace SIM::Coin3D::Quarter; Sets how rendering of primitives is done. - See \ref SoRenderManager::RenderMode for a full descrition of the modes + See \ref SoRenderManager::RenderMode for a full description of the modes */ /*! @@ -126,7 +126,7 @@ using namespace SIM::Coin3D::Quarter; Sets how stereo rendering is performed. - See \ref SoRenderManager::StereoMode for a full descrition of the modes + See \ref SoRenderManager::StereoMode for a full description of the modes */ enum StereoMode { @@ -143,7 +143,7 @@ using namespace SIM::Coin3D::Quarter; #define GL_MULTISAMPLE_BIT_EXT 0x20000000 #endif -//We need to avoid buffer swaping when initializing a QPainter on this widget +//We need to avoid buffer swapping when initializing a QPainter on this widget #if defined(HAVE_QT5_OPENGL) class CustomGLWidget : public QOpenGLWidget { public: diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp index e3ac5d05c9..c207f9cc23 100644 --- a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp +++ b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp @@ -587,7 +587,7 @@ void SIM::Coin3D::Quarter::SoQTQuarterAdaptor::resetToHomePosition(void) } // otherwise, cameras have changed in ways we don't understand since - // the last saveHomePosition() invokation, and so we're just going + // the last saveHomePosition() invocation, and so we're just going // to ignore the reset request } diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.h b/src/Gui/Quarter/SoQTQuarterAdaptor.h index 55014bd01e..3f9cc9fe96 100644 --- a/src/Gui/Quarter/SoQTQuarterAdaptor.h +++ b/src/Gui/Quarter/SoQTQuarterAdaptor.h @@ -1,5 +1,5 @@ /* - * Extends the QuarterWidget with all funcions the SoQtViewer has + * Extends the QuarterWidget with all functions the SoQtViewer has * Copyright (C) 2014 Stefan Tröger * * This library is free software; you can redistribute it and/or diff --git a/src/Gui/RevitNavigationStyle.cpp b/src/Gui/RevitNavigationStyle.cpp index 20173d42e5..27cd2e0a24 100644 --- a/src/Gui/RevitNavigationStyle.cpp +++ b/src/Gui/RevitNavigationStyle.cpp @@ -327,7 +327,7 @@ SbBool RevitNavigationStyle::processSoEvent(const SoEvent * const ev) if (curmode == NavigationStyle::SPINNING) { break; } newmode = NavigationStyle::IDLE; // The left mouse button has been released right now but - // we want to avoid that the event is procesed elsewhere + // we want to avoid that the event is processed elsewhere if (this->lockButton1) { this->lockButton1 = false; processed = true; diff --git a/src/Gui/Stylesheets/Dark-blue.qss b/src/Gui/Stylesheets/Dark-blue.qss index f2944975e0..9b60ef8ad0 100644 --- a/src/Gui/Stylesheets/Dark-blue.qss +++ b/src/Gui/Stylesheets/Dark-blue.qss @@ -504,7 +504,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ QTabBar { border-top: 1px solid #5a5a5a; /* set color for all QTabBars */ } diff --git a/src/Gui/Stylesheets/Dark-green.qss b/src/Gui/Stylesheets/Dark-green.qss index e03a7c5647..e89d5b16a3 100644 --- a/src/Gui/Stylesheets/Dark-green.qss +++ b/src/Gui/Stylesheets/Dark-green.qss @@ -504,7 +504,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ QTabBar { border-top: 1px solid #5a5a5a; /* set color for all QTabBars */ } diff --git a/src/Gui/Stylesheets/Dark-orange.qss b/src/Gui/Stylesheets/Dark-orange.qss index e03d41e9d7..8e76746be9 100644 --- a/src/Gui/Stylesheets/Dark-orange.qss +++ b/src/Gui/Stylesheets/Dark-orange.qss @@ -504,7 +504,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ QTabBar { border-top: 1px solid #5a5a5a; /* set color for all QTabBars */ } diff --git a/src/Gui/Stylesheets/Light-blue.qss b/src/Gui/Stylesheets/Light-blue.qss index dad47bae41..cd68716a88 100644 --- a/src/Gui/Stylesheets/Light-blue.qss +++ b/src/Gui/Stylesheets/Light-blue.qss @@ -504,7 +504,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ QTabBar { border-top: 1px solid #d2d2d2; /* set color for all QTabBars */ } diff --git a/src/Gui/Stylesheets/Light-green.qss b/src/Gui/Stylesheets/Light-green.qss index 4d79249bcf..65e92ecaa4 100644 --- a/src/Gui/Stylesheets/Light-green.qss +++ b/src/Gui/Stylesheets/Light-green.qss @@ -504,7 +504,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ QTabBar { border-top: 1px solid #d2d2d2; /* set color for all QTabBars */ } diff --git a/src/Gui/Stylesheets/Light-orange.qss b/src/Gui/Stylesheets/Light-orange.qss index 0c2de5c93d..0e25467a9b 100644 --- a/src/Gui/Stylesheets/Light-orange.qss +++ b/src/Gui/Stylesheets/Light-orange.qss @@ -504,7 +504,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ QTabBar { border-top: 1px solid #d2d2d2; /* set color for all QTabBars */ } diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.h b/src/Gui/TaskView/TaskSelectLinkProperty.h index 6b873001e7..85dbf456c4 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.h +++ b/src/Gui/TaskView/TaskSelectLinkProperty.h @@ -40,7 +40,7 @@ namespace Gui { class ViewProvider; namespace TaskView { -/** General Link/Selction editor for the Task view +/** General Link/Selection editor for the Task view * This can be used as part of a TaskDialog to alter * the content of a LinkProperty by user input/selection. * If set active it reflects the selection to the Property diff --git a/src/Gui/View.h b/src/Gui/View.h index ee56748678..c3fd2c49f7 100644 --- a/src/Gui/View.h +++ b/src/Gui/View.h @@ -81,7 +81,7 @@ public: /// indicates if the view is in passive mode bool isPassive(void) const {return bIsPassive;} - /** @name methods to overrride + /** @name methods to override */ //@{ /// get called when the document is updated diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index e4b595ab43..dee8c7de2f 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -2132,7 +2132,7 @@ void View3DInventorViewer::boxZoom(const SbBox2s& box) void View3DInventorViewer::viewAll() { - // in the scene graph we may have objects which we want to exlcude + // in the scene graph we may have objects which we want to exclude // when doing a fit all. Such objects must be part of the group // SoSkipBoundingGroup. SoSearchAction sa; @@ -2630,7 +2630,7 @@ void View3DInventorViewer::setCursorRepresentation(int modearg) { // There is a synchronization problem between Qt and SoQt which // happens when popping up a context-menu. In this case the - // Qt::WA_UnderMouse attribute is resetted and never set again + // Qt::WA_UnderMouse attribute is reset and never set again // even if the mouse is still in the canvas. Thus, the cursor // won't be changed as long as the user doesn't leave and enter // the canvas. To fix this we explicitly set Qt::WA_UnderMouse diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index ff960dde26..815516ecde 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -128,7 +128,7 @@ public: virtual std::string getElement(const SoDetail *) const { return std::string(); } virtual SoDetail* getDetail(const char*) const { return 0; } virtual std::vector getModelPoints(const SoPickedPoint *) const; - /// return the higlight lines for a given element or the whole shape + /// return the highlight lines for a given element or the whole shape virtual std::vector getSelectionShape(const char* Element) const { (void)Element; return std::vector(); diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index ab7bce2a5a..e9182de6db 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -1456,7 +1456,7 @@ Py::Object PyResource::setValue(const Py::Tuple& args) } /** - * If any resouce has been loaded this methods shows it as a modal dialog. + * If any resource has been loaded this methods shows it as a modal dialog. */ Py::Object PyResource::show(const Py::Tuple&) { diff --git a/src/Gui/WidgetFactory.h b/src/Gui/WidgetFactory.h index cec009643c..37bca098e2 100644 --- a/src/Gui/WidgetFactory.h +++ b/src/Gui/WidgetFactory.h @@ -116,8 +116,8 @@ public: virtual ~UiLoader(); /** - * Creates a widget of the type \a className withe the parent \a parent. - * Fore more details see the documentation to QWidgetFactory. + * Creates a widget of the type \a className with the parent \a parent. + * For more details see the documentation to QWidgetFactory. */ QWidget* createWidget(const QString & className, QWidget * parent=0, const QString& name = QString()); diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp index deac0628e6..66acc1fb97 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp @@ -331,7 +331,7 @@ static LONG __stdcall MyCrashHandlerExceptionFilter(EXCEPTION_POINTERS* pEx) #ifdef _M_IX86 if (pEx->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW) { - // be sure that we have enought space... + // be sure that we have enough space... static char MyStack[1024*128]; // it assumes that DS and SS are the same!!! (this is the case for Win32) // change the stack only if the selectors are the same (this is the case for Win32) diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index 298750165e..b5acbd9734 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -65,7 +65,7 @@ for pre in Presets: def makeStructure(baseobj=None,length=None,width=None,height=None,name="Structure"): - '''makeStructure([obj],[length],[width],[heigth],[swap]): creates a + '''makeStructure([obj],[length],[width],[height],[swap]): creates a structure element based on the given profile object and the given extrusion height. If no base object is given, you can also specify length and width for a cubic object.''' diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 964dce9c09..b4f07ffdc2 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -1553,7 +1553,7 @@ def offset(obj,delta,copy=False,bind=False,sym=False,occ=False): print("the offset tool is currently unable to offset a non-Draft object directly - Creating a copy") def getRect(p,obj): - "returns length,heigh,placement" + "returns length,height,placement" pl = obj.Placement.copy() pl.Base = p[0] diag = p[2].sub(p[0]) diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py index c6696cc183..ecafe60196 100644 --- a/src/Mod/Draft/DraftSnap.py +++ b/src/Mod/Draft/DraftSnap.py @@ -49,7 +49,7 @@ class Snapper: 3 functions are useful for the scriptwriter: snap(), constrain() or getPoint() which is an all-in-one combo. - The indivudual snapToXXX() functions return a snap definition in + The individual snapToXXX() functions return a snap definition in the form [real_point,marker_type,visual_point], and are not meant to be used directly, they are all called when necessary by the general snap() function. diff --git a/src/Mod/Drawing/DrawingPatterns.py b/src/Mod/Drawing/DrawingPatterns.py index 97ef5b9296..4a0756a6f2 100644 --- a/src/Mod/Drawing/DrawingPatterns.py +++ b/src/Mod/Drawing/DrawingPatterns.py @@ -83,7 +83,7 @@ AutocadPatterns = { "AR-RROOF":"", # seemingly random lines "AR-RSHKE":"", # seemingly random tiles "AR-SAND":"sand", - "BOX":"", # stupid unuseful square-inside-square + "BOX":"", # stupid useless square-inside-square "BRASS":"", # horizontal ansi33 "BRICK":"brick", "BRSTONE":"", # material symbol diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp index 24cc53c8b3..0ef9d47e63 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp @@ -463,7 +463,7 @@ void OrthoViews::calc_scale() // compute scale req void OrthoViews::calc_offsets() // calcs SVG coords for centre of upper left view { - // space_x is the emptry clear white space between views + // space_x is the empty clear white space between views // gap_x is the centre - centre distance between views float space_x = (page_dims[2] - scale * layout_width) / num_gaps_x; diff --git a/src/Mod/Image/Gui/GLImageBox.cpp b/src/Mod/Image/Gui/GLImageBox.cpp index fc6d3c2544..e9c3b5ebc1 100644 --- a/src/Mod/Image/Gui/GLImageBox.cpp +++ b/src/Mod/Image/Gui/GLImageBox.cpp @@ -148,7 +148,7 @@ void GLImageBox::drawImage() if (_image.hasValidData() == false) return; - // Gets the size of the diplayed image area using the current display settings + // Gets the size of the displayed image area using the current display settings // (in units of image pixels) int dx, dy; getDisplayedImageAreaSize(dx, dy); @@ -213,7 +213,7 @@ void GLImageBox::drawImage() } } -// Gets the size of the diplayed image area using the current display settings +// Gets the size of the displayed image area using the current display settings // (in units of image pixels) void GLImageBox::getDisplayedImageAreaSize(int &dx, int &dy) { diff --git a/src/Mod/Image/Gui/OpenGLImageBox.cpp b/src/Mod/Image/Gui/OpenGLImageBox.cpp index 8dd1e74886..6552f5089c 100644 --- a/src/Mod/Image/Gui/OpenGLImageBox.cpp +++ b/src/Mod/Image/Gui/OpenGLImageBox.cpp @@ -200,7 +200,7 @@ void GLImageBox::drawImage() if (_image.hasValidData() == false) return; - // Gets the size of the diplayed image area using the current display settings + // Gets the size of the displayed image area using the current display settings // (in units of image pixels) int dx, dy; getDisplayedImageAreaSize(dx, dy); @@ -265,7 +265,7 @@ void GLImageBox::drawImage() } } -// Gets the size of the diplayed image area using the current display settings +// Gets the size of the displayed image area using the current display settings // (in units of image pixels) void GLImageBox::getDisplayedImageAreaSize(int &dx, int &dy) { diff --git a/src/Mod/Inspection/Gui/AppInspectionGui.cpp b/src/Mod/Inspection/Gui/AppInspectionGui.cpp index 8c7ff77759..dcb5fe6690 100644 --- a/src/Mod/Inspection/Gui/AppInspectionGui.cpp +++ b/src/Mod/Inspection/Gui/AppInspectionGui.cpp @@ -69,7 +69,7 @@ PyMOD_INIT_FUNC(InspectionGui) PyMOD_Return(0); } - // instanciating the commands + // instantiating the commands CreateInspectionCommands(); InspectionGui::ViewProviderInspection ::init(); InspectionGui::ViewProviderInspectionGroup ::init(); diff --git a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat index 1c0ac58457..a8682839a2 100644 --- a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat +++ b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat @@ -40,10 +40,10 @@ UltimateTensileStrength = value MPa ; Poisson's ratio [unitless], see https://en.wikipedia.org/wiki/Poisson%27s_ratio for the details PoissonRatio = -; Descrition to be updated +; Description to be updated AmbientColor = -; Descrition to be updated +; Description to be updated Color = ; Compressive strength https://en.wikipedia.org/wiki/Compressive_strength @@ -52,76 +52,76 @@ CompressiveStrength = ; Density in [kg/m^3] https://en.wikipedia.org/wiki/Density Density = value kg/m^3 -; Descrition to be updated +; Description to be updated DiffuseColor = ; Elasticity https://en.wikipedia.org/wiki/Elasticity_%28physics%29 Elasticity = -; Descrition to be updated +; Description to be updated EmissiveColor = -; Descrition to be updated +; Description to be updated Enlargen = -; Descrition to be updated +; Description to be updated EnvironmentalEfficiencyClass = -; Descrition to be updated +; Description to be updated ExecutionInstructions = -; Descrition to be updated +; Description to be updated Finish = -; Descrition to be updated +; Description to be updated FireResistanceClass = -; Descrition to be updated +; Description to be updated FractureToughness = -; Descrition to be updated +; Description to be updated FragmentShader = -; Descrition to be updated +; Description to be updated KindOfMaterial = -; Descrition to be updated +; Description to be updated KindOfMaterialDE = -; Descrition to be updated +; Description to be updated MaterialNumber = -; Descrition to be updated +; Description to be updated Model = -; Descrition to be updated +; Description to be updated ModulusOfShare = -; Descrition to be updated +; Description to be updated Norm = -; Descrition to be updated +; Description to be updated SectionFillPattern = -; Descrition to be updated +; Description to be updated SectionLinewidth = -; Descrition to be updated +; Description to be updated Shininess = -; Descrition to be updated +; Description to be updated SoundTransmissionClass = -; Descrition to be updated +; Description to be updated SpecularColor = -; Descrition to be updated +; Description to be updated StandardCode = -; Descrition to be updated +; Description to be updated TexturePath = -; Descrition to be updated +; Description to be updated TextureScaling = ; Thermal conductivity https://en.wikipedia.org/wiki/Thermal_conductivity @@ -130,25 +130,25 @@ ThermalConductivity = ; Thermal expansion coefficient (linear) in [1/K] https://en.wikipedia.org/wiki/Thermal_expansion ThermalExpansionCoefficient = -; Descrition to be updated +; Description to be updated Transparency = -; Descrition to be updated +; Description to be updated UltimateStrain = -; Descrition to be updated +; Description to be updated UnitsPerQuantity = -; Descrition to be updated +; Description to be updated VertexShader = -; Descrition to be updated +; Description to be updated ViewColor = -; Descrition to be updated +; Description to be updated ViewFillPattern = -; Descrition to be updated +; Description to be updated ViewLinewidth = ; Yield strength in [MPa] https://en.wikipedia.org/wiki/Yield_%28engineering%29 diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp index 157596e4a5..79320ca27f 100644 --- a/src/Mod/Mesh/App/AppMeshPy.cpp +++ b/src/Mod/Mesh/App/AppMeshPy.cpp @@ -127,7 +127,7 @@ public: ); initialize("The functions in this module allow working with mesh objects.\n" "A set of functions are provided for reading in registered mesh\n" - "file formats to either a new or exising document.\n" + "file formats to either a new or existing document.\n" "\n" "open(string) -- Create a new document and a Mesh feature\n" " to load the file into the document.\n" diff --git a/src/Mod/Mesh/App/Core/Algorithm.cpp b/src/Mod/Mesh/App/Core/Algorithm.cpp index 1120d5a5ff..aea7f8b669 100644 --- a/src/Mod/Mesh/App/Core/Algorithm.cpp +++ b/src/Mod/Mesh/App/Core/Algorithm.cpp @@ -932,12 +932,12 @@ void MeshAlgorithm::GetFacetsFromToolMesh(const MeshKernel& rToolMesh, const Bas MeshAlgorithm cToolAlg(rToolMesh); // To speed up the algorithm we use the grid built up from the associated mesh. For each grid - // element we check whether it lies completely inside or outside the toolmesh or even intersect + // element we check whether it lies completely inside or outside the toolmesh or even intersects // with the toolmesh. So we can reduce the number of facets with further tests dramatically. // If the grid box is outside the toolmesh all the facets inside can be skipped. If the grid // box is inside the toolmesh all facets are stored with no further tests because they must - // also lie inside the toolmesh. Finally, if the grid box intersect with the toolmesh we must - // also check for each whether it intersect we the toolmesh as well. + // also lie inside the toolmesh. Finally, if the grid box intersects with the toolmesh we must + // also check for each whether it intersects with the toolmesh as well. std::vector aulInds; for (clGridIter.Init(); clGridIter.More(); clGridIter.Next()) { int ret = cToolAlg.Surround(clGridIter.GetBoundBox(), rcDir); @@ -947,15 +947,15 @@ void MeshAlgorithm::GetFacetsFromToolMesh(const MeshKernel& rToolMesh, const Bas // these facets can be removed without more checks clGridIter.GetElements(raclCutted); } - // the box intersect with toolmesh + // the box intersects with toolmesh else if (ret == 0) { - // these facets must be tested for intersectons with the toolmesh + // these facets must be tested for intersections with the toolmesh clGridIter.GetElements(aulInds); } // the box is outside the toolmesh but this could still mean that the triangles // inside the grid intersect with the toolmesh else if (ret == -1) { - // these facets must be tested for intersectons with the toolmesh + // these facets must be tested for intersections with the toolmesh clGridIter.GetElements(aulInds); } } diff --git a/src/Mod/Mesh/App/Core/Evaluation.cpp b/src/Mod/Mesh/App/Core/Evaluation.cpp index 3b9889ff67..56f77bc153 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.cpp +++ b/src/Mod/Mesh/App/Core/Evaluation.cpp @@ -233,7 +233,7 @@ std::vector MeshEvalOrientation::GetIndices() const ulStartFacet = ULONG_MAX; } - // in some very rare cases where we have some strange artefacts in the mesh structure + // in some very rare cases where we have some strange artifacts in the mesh structure // we get false-positives. If we find some we check all 'invalid' faces again cAlg.ResetFacetFlag(MeshFacet::TMP0); cAlg.SetFacetsFlag(uIndices, MeshFacet::TMP0); diff --git a/src/Mod/Mesh/App/Core/Evaluation.h b/src/Mod/Mesh/App/Core/Evaluation.h index 2c8e8accda..47d42334bc 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.h +++ b/src/Mod/Mesh/App/Core/Evaluation.h @@ -104,7 +104,7 @@ private: /** * This class searches for inconsistent orientation of neighboured facets. - * Note: The 'TMP0' flag for facets must be resetted before using this class. + * Note: The 'TMP0' flag for facets must be reset before using this class. * @author Werner Mayer */ class MeshExport MeshOrientationCollector : public MeshOrientationVisitor diff --git a/src/Mod/Mesh/App/Core/Iterator.h b/src/Mod/Mesh/App/Core/Iterator.h index 3beabaddd0..0f917a7118 100644 --- a/src/Mod/Mesh/App/Core/Iterator.h +++ b/src/Mod/Mesh/App/Core/Iterator.h @@ -59,7 +59,7 @@ public: /** @name Transformation */ //@{ - /// Transforms the returned facet points with the current tranformation + /// Transforms the returned facet points with the current transformation inline void Transform( const Base::Matrix4D& rclTrf ); //@} @@ -180,7 +180,7 @@ public: /** @name Transformation */ //@{ - /// Transforms the returned points with the current tranformation + /// Transforms the returned points with the current transformation inline void Transform( const Base::Matrix4D& rclTrf ); //@} diff --git a/src/Mod/Mesh/App/Core/SetOperations.cpp b/src/Mod/Mesh/App/Core/SetOperations.cpp index 291a7de467..e2a2d9f441 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.cpp +++ b/src/Mod/Mesh/App/Core/SetOperations.cpp @@ -531,7 +531,7 @@ bool SetOperations::CollectFacetVisitor::AllowVisit (const MeshFacet& rclFacet, if (it != _edges.end()) { if (_addFacets == -1) { - // detemine if the facets shoud add or not only once + // determine if the facets should add or not only once MeshGeomFacet facet = _mesh.GetFacet(rclFrom); // triangulated facet MeshGeomFacet facetOther = it->second.facets[1-_side][0]; // triangulated facet from same edge and other mesh Vector3f normalOther = facetOther.GetNormal(); diff --git a/src/Mod/Mesh/App/Core/Triangulation.h b/src/Mod/Mesh/App/Core/Triangulation.h index 0d75e2a3b3..ff5dfdd5c8 100644 --- a/src/Mod/Mesh/App/Core/Triangulation.h +++ b/src/Mod/Mesh/App/Core/Triangulation.h @@ -79,11 +79,11 @@ public: const std::vector& GetTriangles() const { return _triangles;} /** Returns the topologic facets of the polygon. */ const std::vector& GetFacets() const { return _facets;} - /** Returns the the triangle to a given topologic facet. */ + /** Returns the triangle to a given topologic facet. */ virtual MeshGeomFacet GetTriangle(const MeshPointArray&, const MeshFacet&) const; /** Returns the length of the polygon */ float GetLength() const; - /** Get information about the polstyles = SoPolygonOffset::FILLED; diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp index 6fabc01364..35f4da1c33 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp @@ -123,7 +123,7 @@ void ViewProviderMeshTransformDemolding::attach(App::DocumentObject *pcFeat) calcNormalVector(); calcMaterialIndex(SbRotation()); - // geting center point + // getting center point center = static_cast(pcObject)->Mesh.getValue().getKernel().GetBoundBox().GetCenter(); //SoGetBoundingBoxAction boxAction; @@ -183,7 +183,7 @@ void ViewProviderMeshTransformDemolding::DragEndCallback(void) SbRotation rot = pcTrackballDragger->rotation.getValue(); calcMaterialIndex(rot); - Base::Console().Log("View: Finish draging\n"); + Base::Console().Log("View: Finish dragging\n"); } diff --git a/src/Mod/MeshPart/App/MeshAlgos.cpp b/src/Mod/MeshPart/App/MeshAlgos.cpp index d73a0f0633..58c5ec5e88 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.cpp +++ b/src/Mod/MeshPart/App/MeshAlgos.cpp @@ -337,7 +337,7 @@ GtsSurface* MeshAlgos::createGTSSurface(MeshCore::MeshKernel* Mesh) Base::Vector3f Vertex; - // Geting all the points + // Getting all the points GtsVertex ** aVertex = (GtsVertex **) malloc(Mesh->CountPoints() * sizeof (GtsVertex *)); for (unsigned int PIter = 0;PIter < Mesh->CountPoints(); PIter++) { @@ -348,7 +348,7 @@ GtsSurface* MeshAlgos::createGTSSurface(MeshCore::MeshKernel* Mesh) // cycling through the facets for (unsigned int pFIter = 0;pFIter < Mesh->CountFacets(); pFIter++) { - // geting the three points of the facet + // getting the three points of the facet Mesh->GetFacetPoints(pFIter,p1,p2,p3); // creating the edges and add the face to the surface diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index ad711bd0b4..0069d0f338 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -347,7 +347,7 @@ void ViewProviderScattered::attach(App::DocumentObject* pcObj) pcHighlight->documentName = pcObj->getDocument()->getName(); pcHighlight->subElementName = "Main"; - // Hilight for selection + // Highlight for selection pcHighlight->addChild(pcPointsCoord); pcHighlight->addChild(pcPoints); @@ -508,7 +508,7 @@ void ViewProviderStructured::attach(App::DocumentObject* pcObj) pcHighlight->documentName = pcObj->getDocument()->getName(); pcHighlight->subElementName = "Main"; - // Hilight for selection + // Highlight for selection pcHighlight->addChild(pcPointsCoord); pcHighlight->addChild(pcPoints); diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp index 6f3a9d7ee1..0ddc26706c 100644 --- a/src/Mod/Raytracing/App/PovTools.cpp +++ b/src/Mod/Raytracing/App/PovTools.cpp @@ -377,7 +377,7 @@ void PovTools::transferToArray(const TopoDS_Face& aFace,gp_Vec** vertices,gp_Vec return; } - // geting the transformation of the shape/face + // getting the transformation of the shape/face gp_Trsf myTransf; Standard_Boolean identity = true; if (!aLoc.IsIdentity()) { @@ -386,7 +386,7 @@ void PovTools::transferToArray(const TopoDS_Face& aFace,gp_Vec** vertices,gp_Vec } Standard_Integer i; - // geting size and create the array + // getting size and create the array nbNodesInFace = aPoly->NbNodes(); nbTriInFace = aPoly->NbTriangles(); *vertices = new gp_Vec[nbNodesInFace]; diff --git a/src/Mod/Raytracing/App/PovTools.h b/src/Mod/Raytracing/App/PovTools.h index 27a9e8b410..e28627c46e 100644 --- a/src/Mod/Raytracing/App/PovTools.h +++ b/src/Mod/Raytracing/App/PovTools.h @@ -105,7 +105,7 @@ public: const TopoDS_Shape& Shape, float fMeshDeviation=0.1); - /// write a given shape as points and normal Vectors in a coma separeted format + /// write a given shape as points and normal Vectors in a comma separated format static void writeShapeCSV(const char *FileName, const TopoDS_Shape& Shape, float fMeshDeviation, diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp index 84ffd36d4c..56c5d71f34 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp @@ -447,7 +447,7 @@ void ImageTriangulation::perform() // Set parameters ofm.setInputCloud (cloud_organized); - // This parameter is not yet implmented (pcl 1.7) + // This parameter is not yet implemented (pcl 1.7) ofm.setMaxEdgeLength (1.5); ofm.setTrianglePixelSize (1); ofm.setTriangulationType (OrganizedFastMesh::TRIANGLE_ADAPTIVE_CUT); diff --git a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp index e0eba5853a..14664b6ae9 100644 --- a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp +++ b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp @@ -270,7 +270,7 @@ PyMOD_INIT_FUNC(SandboxGui) PyMOD_Return(0); } - // instanciating the commands + // instantiating the commands CreateSandboxCommands(); SandboxGui::Workbench::init(); SandboxGui::SoWidgetShape::initClass(); diff --git a/src/Mod/Sandbox/exportDRAWEXE.py b/src/Mod/Sandbox/exportDRAWEXE.py index 907c5da411..89e307ab0c 100644 --- a/src/Mod/Sandbox/exportDRAWEXE.py +++ b/src/Mod/Sandbox/exportDRAWEXE.py @@ -161,7 +161,7 @@ def saveShape(csg,filename,shape,name,hasplacement = True,cleanshape=False): sh=shape.copy() sh.Placement=FreeCAD.Placement() # it not yet tested if changing the placement recreated the - # tesselation. but for now we simply do the cleaing once again + # tessellation. but for now we simply do the cleaing once again # to stay on the safe side if cleanshape: shape = shape.cleaned() @@ -347,7 +347,7 @@ class Drawexporter(object): self.csg.write('explode %s E\n' % subobj.Name ) self.csg.write('wire %s %s_1\n' %(sectionname,subobj.Name)) if sh.ShapeType == 'Face': - #we should use outer wire when it becomes avaiable + #we should use outer wire when it becomes available self.csg.write('explode %s W\n' % subobj.Name ) #csg.write('tcopy %s_1 %s\n' %(subobj.Name,sectionname)) sectionname ='%s_1' % subobj.Name @@ -551,7 +551,7 @@ class Drawexporter(object): elif ob.TypeId == "Part::Extrusion" and ob.TaperAngle.Value == 0: if checksupported: return True # The object is supported self.process_object(ob.Base) - #Warning does not fully ressemle the functionallity of + #Warning does not fully resemble the functionality of #Part::Extrusion #csg.write('tcopy %s %s\n'%(ob.Base.Name,d1['name'])) facename=ob.Base.Name @@ -589,7 +589,7 @@ class Drawexporter(object): for i,subobj in enumerate(ob.Sections): explodeshape = self.alwaysexplode or \ self.process_object(suboobj,True) - if explodeshape and False: #diabled TBD + if explodeshape and False: #disabled TBD try: raise NotImplementedError sectionname = '%s-%02d-section' % (ob.Name,i) diff --git a/src/Mod/Surface/Gui/AppSurfaceGui.cpp b/src/Mod/Surface/Gui/AppSurfaceGui.cpp index 25ee2db676..4410b2a585 100644 --- a/src/Mod/Surface/Gui/AppSurfaceGui.cpp +++ b/src/Mod/Surface/Gui/AppSurfaceGui.cpp @@ -73,7 +73,7 @@ PyMOD_INIT_FUNC(SurfaceGui) Base::Interpreter().runString("import Surface"); Base::Interpreter().runString("import PartGui"); - // instanciating the commands + // instantiating the commands CreateSurfaceCommands(); SurfaceGui::Workbench::init(); diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp index 6dedb3df94..c8b97ef643 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp @@ -228,7 +228,7 @@ App::DocumentObjectExecReturn * DrawSVGTemplate::execute(void) // Parse the document XML QDomElement docElem = doc.documentElement(); - // Obtain the size of the SVG document by reading the document attirbutes + // Obtain the size of the SVG document by reading the document attributes Base::Quantity quantity; // Obtain the width diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index aaf17cd7c2..aa4444543b 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -914,7 +914,7 @@ void MDIViewPage::clearSelection() blockSelection(false); } -//!Update QGVPage's selection based on Selection made outside Drawing Interace +//!Update QGVPage's selection based on Selection made outside Drawing Interface //invoked from VPP void MDIViewPage::selectFeature(App::DocumentObject *obj, const bool isSelected) { diff --git a/src/Mod/Test/Document.py b/src/Mod/Test/Document.py index 1ccfa214e1..a49824d652 100644 --- a/src/Mod/Test/Document.py +++ b/src/Mod/Test/Document.py @@ -89,7 +89,7 @@ class DocumentBasicCases(unittest.TestCase): except: FreeCAD.Console.PrintLog(" exception thrown, OK\n") else: - self.fail("no exeption thrown") + self.fail("no exception thrown") self.Doc.RedoCount self.Doc.UndoNames self.Doc.RedoNames diff --git a/vagrant/Xenial/reset b/vagrant/Xenial/reset index 959c88e4fa..d4ca716316 100755 --- a/vagrant/Xenial/reset +++ b/vagrant/Xenial/reset @@ -34,7 +34,7 @@ echo "DESTROYING ALL STATE OF SNAPD" if systemctl is-active --quiet snapd.service snapd.socket; then snapd_was_active=yes echo - echo "Stoping snapd..." + echo "Stopping snapd..." echo ( set -x