diff --git a/src/App/MergeDocuments.cpp b/src/App/MergeDocuments.cpp index 205f173e2d..95d9f0633a 100644 --- a/src/App/MergeDocuments.cpp +++ b/src/App/MergeDocuments.cpp @@ -68,7 +68,7 @@ protected: // It is not safe to change potential object name reference at this level. // For example, a LinkSub with sub element name Face1 may also be some // object's name that may potentially be mapped. In addition, with the - // introduction of full quanlified SubName reference, the Sub value inside + // introduction of full qualified SubName reference, the Sub value inside // LinkSub may require customized mapping. So we move the mapping logic to // various link property's Restore() function. #if 0 diff --git a/src/Gui/CoinRiftWidget.cpp b/src/Gui/CoinRiftWidget.cpp index 698362390c..53d97343f1 100644 --- a/src/Gui/CoinRiftWidget.cpp +++ b/src/Gui/CoinRiftWidget.cpp @@ -307,7 +307,7 @@ void CoinRiftWidget::initializeGL() glDisable(GL_TEXTURE_2D); #ifdef USE_FRAMEBUFFER - // Continue rendering to the orgiginal frame buffer (likely 0, the onscreen buffer). + // Continue rendering to the original frame buffer (likely 0, the onscreen buffer). OVR::CAPI::GL::glBindFramebuffer(GL_FRAMEBUFFER_EXT, oldfb); #endif doneCurrent(); @@ -319,7 +319,7 @@ void CoinRiftWidget::paintGL() const int ms(1000 / 75 /*fps*/); QTimer::singleShot(ms, this, SLOT(updateGL())); - // handling the sfety warning + // handling the safety warning handlingSafetyWarning(); makeCurrent(); @@ -388,7 +388,7 @@ void CoinRiftWidget::paintGL() // m_sceneManager->setCamera(camera[eye]); // SoSceneManager does this implicitly. m_sceneManager->render(); - // Continue rendering to the orgiginal frame buffer (likely 0, the onscreen buffer). + // Continue rendering to the original frame buffer (likely 0, the onscreen buffer). OVR::CAPI::GL::glBindFramebuffer(GL_FRAMEBUFFER_EXT, oldfb); Q_ASSERT(!glGetError()); #endif diff --git a/src/Gui/Icons/Std_DependencyGraph.svg b/src/Gui/Icons/Std_DependencyGraph.svg index 3f1c678076..f3fae58f70 100644 --- a/src/Gui/Icons/Std_DependencyGraph.svg +++ b/src/Gui/Icons/Std_DependencyGraph.svg @@ -186,7 +186,7 @@ - Arrows baloons + Arrow balloons diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index 9fd419692d..61f15f02a7 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -1074,7 +1074,7 @@ void NavigationStyle::saveCursorPosition(const SoEvent * const ev) setRotationCenter(boundingBoxCenter); // To drag around the center point of the bbox we have to determine - // its projection on the screen becaue this information is used in + // its projection on the screen because this information is used in // NavigationStyle::spin() for the panning SbViewVolume vv = cam->getViewVolume(ratio); vv.projectToScreen(boundingBoxCenter, boundingBoxCenter); diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h index a47473e4ae..8f9b2a5a76 100644 --- a/src/Gui/Tree.h +++ b/src/Gui/Tree.h @@ -403,7 +403,7 @@ public: // check if a new item is required at root bool requiredAtRoot(bool excludeSelf=true) const; - // return the owner, and full quanlified subname + // return the owner, and full qualified subname App::DocumentObject *getFullSubName(std::ostringstream &str, DocumentObjectItem *parent = 0) const; diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 4ca3c483a8..6543c00ac9 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -276,7 +276,7 @@ public: virtual bool canDragAndDropObject(App::DocumentObject*) const; /** Add an object to the view provider by drag and drop */ virtual void dropObject(App::DocumentObject*); - /** Query object dropping with full quanlified name + /** Query object dropping with full qualified name * * Tree view now calls this function instead of canDropObject(), and may * query for objects from other document. The default implementation @@ -304,7 +304,7 @@ public: /// return a subname referencing the sub-object holding the dropped objects virtual std::string getDropPrefix() const { return std::string(); } - /** Add an object with full quanlified name to the view provider by drag and drop + /** Add an object with full qualified name to the view provider by drag and drop * * @param obj: the object being dropped * diff --git a/src/Gui/ViewProviderPythonFeature.h b/src/Gui/ViewProviderPythonFeature.h index 94b1647c3d..74e7fd8d54 100644 --- a/src/Gui/ViewProviderPythonFeature.h +++ b/src/Gui/ViewProviderPythonFeature.h @@ -109,10 +109,10 @@ public: ValueT dropObject(App::DocumentObject*); /** Return false to force drop only operation for a give object*/ ValueT canDragAndDropObject(App::DocumentObject*) const; - /** Query object dropping with full quanlified name */ + /** Query object dropping with full qualified name */ ValueT canDropObjectEx(App::DocumentObject *obj, App::DocumentObject *, const char *,const std::vector &elements) const; - /** Add an object with full quanlified name to the view provider by drag and drop */ + /** Add an object with full qualified name to the view provider by drag and drop */ bool dropObjectEx(App::DocumentObject *obj, App::DocumentObject *, const char *, const std::vector &elements, std::string &ret); ValueT replaceObject(App::DocumentObject *, App::DocumentObject *); @@ -419,7 +419,7 @@ public: return ViewProviderT::canDropObjectEx(obj,owner,subname,elements); } } - /** Add an object with full quanlified name to the view provider by drag and drop */ + /** Add an object with full qualified name to the view provider by drag and drop */ virtual std::string dropObjectEx(App::DocumentObject *obj, App::DocumentObject *owner, const char *subname, const std::vector &elements) override { diff --git a/src/Mod/MeshPart/App/MeshFlattening.h b/src/Mod/MeshPart/App/MeshFlattening.h index 2a91b2f10b..ebc24b0e14 100644 --- a/src/Mod/MeshPart/App/MeshFlattening.h +++ b/src/Mod/MeshPart/App/MeshFlattening.h @@ -74,7 +74,7 @@ public: ColMat fixed_nodes; // input ColMat xyz_nodes; // compute from uv_mesh (xyz = A * poles) ColMat uv_nodes; // input - ColMat ze_nodes; // copute + ColMat ze_nodes; // compute // nurbs ColMat ze_poles; // compute @@ -82,4 +82,4 @@ public: }; -#endif // MESHFLATTENING +#endif // MESHFLATTENING diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacadePy.xml b/src/Mod/Sketcher/App/ExternalGeometryFacadePy.xml index 9694eb09c9..290e9767ce 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryFacadePy.xml +++ b/src/Mod/Sketcher/App/ExternalGeometryFacadePy.xml @@ -43,7 +43,7 @@ - Sets/retuns this geometry as a construction one, which will not be part of a later built shape. + Sets/returns this geometry as a construction one, which will not be part of a later built shape. diff --git a/src/Mod/Sketcher/App/GeometryFacadePy.xml b/src/Mod/Sketcher/App/GeometryFacadePy.xml index ca0d84b9a2..846db8c421 100644 --- a/src/Mod/Sketcher/App/GeometryFacadePy.xml +++ b/src/Mod/Sketcher/App/GeometryFacadePy.xml @@ -51,7 +51,7 @@ - Sets/retuns this geometry as a construction one, which will not be part of a later built shape. + Sets/returns this geometry as a construction one, which will not be part of a later built shape. diff --git a/src/Mod/Sketcher/App/SketchGeometryExtensionPy.xml b/src/Mod/Sketcher/App/SketchGeometryExtensionPy.xml index 6e3d42cc1d..6f3619cd4f 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtensionPy.xml +++ b/src/Mod/Sketcher/App/SketchGeometryExtensionPy.xml @@ -51,7 +51,7 @@ - Sets/retuns this geometry as a construction one, which will not be part of a later built shape. + Sets/returns this geometry as a construction one, which will not be part of a later built shape. diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index bfe5118504..55ffdfa7d0 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -7509,7 +7509,7 @@ void SketchObject::migrateSketch(void) addGeometryState(c); - // Convert B-Spline controlpoints radius/diameter constraints to Weight cosntraints + // Convert B-Spline controlpoints radius/diameter constraints to Weight constraints if(c->Type == InternalAlignment && c->AlignmentType == BSplineControlPoint) { int circlegeoid = c->First; int bsplinegeoid = c->Second; diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index 6fd1577012..f937bbc3c9 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -502,7 +502,7 @@ private: // 1. Upon restore, any migration is handled to set the status for legacy files (backwards compatibility) // 2. Functionality adding constraints (of the relevant type) calls addGeometryState to set the status // 3. Functionality removing constraints (of the relevant type) calls removeGeometryState to remove the status - // 4. Save mechanism will ensure persistance. + // 4. Save mechanism will ensure persistence. void addGeometryState(const Constraint* cstr) const; void removeGeometryState(const Constraint* cstr) const;