From f5146508bbfdfb8a2605230dd01d9f93323f5d6d Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 6 Dec 2017 11:17:50 -0500 Subject: [PATCH] Misc. typos --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- ChangeLog.txt | 2 +- src/App/Range.cpp | 2 +- src/Doc/Document.mm | 2 +- src/Gui/CommandView.cpp | 2 +- src/Gui/ManualAlignment.cpp | 2 +- src/Mod/Draft/Resources/icons/Draft_Stretch.svg | 2 +- src/Mod/Mesh/App/Core/Algorithm.h | 4 ++-- src/Mod/Mesh/App/Core/TopoAlgorithm.h | 4 ++-- src/Mod/Mesh/App/GTSAlgos.h | 2 +- src/Mod/Mesh/Gui/SoFCMeshFaceSet.h | 2 +- src/Mod/MeshPart/App/CurveProjector.h | 2 +- src/Mod/MeshPart/App/MeshAlgos.h | 2 +- src/Mod/Part/App/TopoShape.cpp | 2 +- src/Mod/Part/App/TopologyPy.h | 4 ++-- src/Mod/Path/App/Area.cpp | 2 +- src/Mod/Path/App/AreaPyImp.cpp | 2 +- src/Mod/Path/PathScripts/PathDressupRampEntry.py | 6 +++--- src/boost_any_1_55.hpp | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4154a336bb..3e8b3831ac 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,6 +5,6 @@ Thank you for creating a pull request to contribute to FreeCAD! To ease integrat - [ ] Commit message is [well-written](https://chris.beams.io/posts/git-commit/) - [ ] Commit message includes `issue #` or `fixes #` where `` is the [associated MantisBT](https://freecadweb.org/wiki/tracker#GitHub_and_MantisBT) issue id if one exists -And please remember to update the Wiki with the features added or changed once this PR once it is merged. +And please remember to update the Wiki with the features added or changed once this PR is merged. --- diff --git a/ChangeLog.txt b/ChangeLog.txt index 18bd01715a..bffc3f2769 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -679,7 +679,7 @@ Version: V0.1B95 Date: Wed Nov 03 17:34:53 2004 +++++++++++++++++++++++++++++++ Version: V0.1B94 Date: Sat Oct 23 18:58:52 2004 +++++++++++++++++++++++++++++++ * finished implementation of the Tip of the day - * splitted several big files in smaller ones + * split several big files in smaller ones * namespace Gui::Kexi for property editor * namespace Gui::Dialog * documentation for most dialogs * use QToolBox provided by Qt instead of StackBar diff --git a/src/App/Range.cpp b/src/App/Range.cpp index 5e101d1e00..62958b2fcd 100644 --- a/src/App/Range.cpp +++ b/src/App/Range.cpp @@ -137,7 +137,7 @@ int App::decodeColumn(const std::string &colstr) } /** - * @brief Determine wheter a row specification is valid or not. + * @brief Determine whether a row specification is valid or not. * * @param rowstr Row specified as a string, with "1" being the first row. * diff --git a/src/Doc/Document.mm b/src/Doc/Document.mm index 02c44dc9b6..98280ebdd7 100644 --- a/src/Doc/Document.mm +++ b/src/Doc/Document.mm @@ -16,7 +16,7 @@ - + diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index b65b84f726..463cdb5705 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -2481,7 +2481,7 @@ static void selectionCallback(void * ud, SoEventCallback * cb) polygon.Add(Base::Vector2d(pt2[0], pt1[1])); // when selecting from right to left then select by intersection - // oterwise if the center is inside the rectangle + // otherwise if the center is inside the rectangle if (picked[0][0] > picked[1][0]) selectionMode = INTERSECT; } diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp index a64c6e8b89..78eeb930d0 100644 --- a/src/Gui/ManualAlignment.cpp +++ b/src/Gui/ManualAlignment.cpp @@ -788,7 +788,7 @@ void ManualAlignment::startAlignment(Base::Type mousemodel) if (myAlignModel.isEmpty()) return; - // create a splitted window for picking the points + // create a split window for picking the points myViewer = new AlignmentView(myDocument,Gui::getMainWindow()); myViewer->setWindowTitle(tr("Alignment[*]")); myViewer->setWindowIcon(QApplication::windowIcon()); diff --git a/src/Mod/Draft/Resources/icons/Draft_Stretch.svg b/src/Mod/Draft/Resources/icons/Draft_Stretch.svg index 34706be07e..2059699adc 100644 --- a/src/Mod/Draft/Resources/icons/Draft_Stretch.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Stretch.svg @@ -272,7 +272,7 @@ - A small square in the bottom left corner of a large dotted box ith an arrow pointing from the top left corner of the inner box to the top left corner of the outer box + A small square in the bottom left corner of a large dotted box with an arrow pointing from the top left corner of the inner box to the top left corner of the outer box diff --git a/src/Mod/Mesh/App/Core/Algorithm.h b/src/Mod/Mesh/App/Core/Algorithm.h index 4881a56b9f..07ff47a024 100644 --- a/src/Mod/Mesh/App/Core/Algorithm.h +++ b/src/Mod/Mesh/App/Core/Algorithm.h @@ -148,8 +148,8 @@ public: */ void GetMeshBorder(unsigned long uFacet, std::list& rBorder) const; /** - * Boundaries that consist of several loops must be splitted in several independent boundaries - * to perfoom e.g. a polygon triangulation algorithm on them. + * Boundaries that consist of several loops must be split in several independent boundaries + * to perform e.g. a polygon triangulation algorithm on them. */ void SplitBoundaryLoops( std::list >& aBorders ); /** diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.h b/src/Mod/Mesh/App/Core/TopoAlgorithm.h index 598804de9f..b1b50cde02 100644 --- a/src/Mod/Mesh/App/Core/TopoAlgorithm.h +++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.h @@ -59,7 +59,7 @@ public: /** @name Topological Operations */ //@{ /** - * Inserts a new vertex in the given triangle so that is splitted into three + * Inserts a new vertex in the given triangle so that is split into three * triangles. The given point must lie inside the triangle not outside or on * an edge. */ @@ -106,7 +106,7 @@ public: * \a rP1 and \a rP2 should lie on two different edges of the facet. This method * splits up the both neighbour facets as well. * If either \a rP1 or \a rP2 (probably due to a previous call of SplitFacet()) - * is coincident with a corner point then the facet is splitted into two facets. + * is coincident with a corner point then the facet is split into two facets. * If both points are coincident with corner points of this facet nothing is done. */ void SplitFacet(unsigned long ulFacetPos, const Base::Vector3f& rP1, diff --git a/src/Mod/Mesh/App/GTSAlgos.h b/src/Mod/Mesh/App/GTSAlgos.h index 7f4e1e7c31..87203fe067 100644 --- a/src/Mod/Mesh/App/GTSAlgos.h +++ b/src/Mod/Mesh/App/GTSAlgos.h @@ -35,7 +35,7 @@ namespace Mesh { -/** The mesh algorithems container class +/** The mesh algorithms container class */ class MeshExport GTSAlgos { diff --git a/src/Mod/Mesh/Gui/SoFCMeshFaceSet.h b/src/Mod/Mesh/Gui/SoFCMeshFaceSet.h index 0a5860ded5..c2faa41829 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshFaceSet.h +++ b/src/Mod/Mesh/Gui/SoFCMeshFaceSet.h @@ -109,7 +109,7 @@ protected: /** * \brief The SoFCMeshFaceSet class renders the mesh data structure. * It does basically the same as SoFCMeshNode by rendering directly the FreeCAD mesh structure whereas this class follows more the Inventor way. - * While SoFCMeshFaceSet has a pointer to the mesh structure as a whole for SoFCMeshFaceSet the mesh is splitted into two nodes: + * While SoFCMeshFaceSet has a pointer to the mesh structure as a whole for SoFCMeshFaceSet the mesh is split into two nodes: * an SoFCMeshVertex has a field that holds a pointer to vertex array and SoFCMeshFacet has a field that holds a pointer to the face array. * * The advantage of separating the mesh structure is higher flexibility. E.g. to render open edges the class SoFCMeshOpenEdgeSet just takes the diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index f26f843dc2..3c68bb40be 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -51,7 +51,7 @@ using MeshCore::MeshGeomFacet; namespace MeshPart { -/** The father of all projection algorithems +/** The father of all projection algorithms */ class MeshPartExport CurveProjector { diff --git a/src/Mod/MeshPart/App/MeshAlgos.h b/src/Mod/MeshPart/App/MeshAlgos.h index 42454d280e..3936464d58 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.h +++ b/src/Mod/MeshPart/App/MeshAlgos.h @@ -47,7 +47,7 @@ using MeshCore::MeshKernel; namespace MeshPart { -/** The mesh algorithems container class +/** The mesh algorithms container class */ class MeshPartExport MeshAlgos { diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 744eca2d02..83e7beecbd 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -2483,7 +2483,7 @@ TopoDS_Shape TopoShape::makeOffset2D(double offset, short joinType, bool fill, b offsetShape = mkOffset.Shape(); if(offsetShape.IsNull()) - throw Base::Exception("makeOffset2D: result of offseting is null!"); + throw Base::Exception("makeOffset2D: result of offsetting is null!"); //Copying shape to fix strange orientation behavior, OCC7.0.0. See bug #2699 // http://www.freecadweb.org/tracker/view.php?id=2699 diff --git a/src/Mod/Part/App/TopologyPy.h b/src/Mod/Part/App/TopologyPy.h index 1fcf96bd47..33a8241ea6 100644 --- a/src/Mod/Part/App/TopologyPy.h +++ b/src/Mod/Part/App/TopologyPy.h @@ -37,8 +37,8 @@ namespace Part { /** The TopoDSShape wrapper class - * This class wrapps the functionality of the Topology package. It wrapps not - * strictly after the OCC rules. It includes also a lot algorithems from oter + * This class wraps the functionality of the Topology package. It wraps not + * strictly after the OCC rules. It also includes a lot of algorithms from other * packages like BRepTools and BRepBuilder. Also iterators and so on. */ class AppPartExport TopoShapePyOld :public Base::PyObjectBase diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index c2c4efb450..7b9ba80913 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -1733,7 +1733,7 @@ TopoDS_Shape Area::getShape(int index) { } // for pocketing, we discard the outer most offset wire in order to achieve - // the effect of offseting shape first than pocket, where the actual offset + // the effect of offsetting shape first than pocket, where the actual offset // path is not wanted. For extra outline profiling, add extra_offset if(front) { areaPocket.add(toShape(*areas.front(),myParams.Fill)); diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/Path/App/AreaPyImp.cpp index b71dba3637..b73751409d 100644 --- a/src/Mod/Path/App/AreaPyImp.cpp +++ b/src/Mod/Path/App/AreaPyImp.cpp @@ -119,7 +119,7 @@ static const PyMethodDef areaOverrides[] = { "\nThe first shape's wires will be unioned together regardless of the op code given\n" "(except for 'Compound'). Subsequent shape's wire will be combined using the op code.\n" "All shape wires shall be coplanar, and are used to determine a working plane for face\n" - "making and offseting. You can call setPlane() to supply a reference shape to determine\n" + "making and offsetting. You can call setPlane() to supply a reference shape to determine\n" "the workplane in case the added shapes are all colinear lines.\n", }, diff --git a/src/Mod/Path/PathScripts/PathDressupRampEntry.py b/src/Mod/Path/PathScripts/PathDressupRampEntry.py index 11929d8470..a9d8ee2a52 100644 --- a/src/Mod/Path/PathScripts/PathDressupRampEntry.py +++ b/src/Mod/Path/PathScripts/PathDressupRampEntry.py @@ -321,7 +321,7 @@ class ObjectDressup: while not done: for i, redge in enumerate(rampedges): if redge.Length >= rampremaining: - # will reach end of ramp within this edge, needs to be splitted + # will reach end of ramp within this edge, needs to be split p1 = self.getSplitPoint(redge, rampremaining) splitEdge = PathGeom.splitEdgeAt(redge, p1) PathLog.debug("Ramp remaining: {}".format(rampremaining)) @@ -387,7 +387,7 @@ class ObjectDressup: while not done: for i, redge in enumerate(rampedges): if redge.Length >= rampremaining: - # will reach end of ramp within this edge, needs to be splitted + # will reach end of ramp within this edge, needs to be split p1 = self.getSplitPoint(redge, rampremaining) splitEdge = PathGeom.splitEdgeAt(redge, p1) PathLog.debug("Got split edge (index: {}) with lengths: {}, {}".format(i, splitEdge[0].Length, splitEdge[1].Length)) @@ -454,7 +454,7 @@ class ObjectDressup: else: for i, redge in enumerate(rampedges): if redge.Length >= rampremaining: - # this edge needs to be splitted + # this edge needs to be split p1 = self.getSplitPoint(redge, rampremaining) splitEdge = PathGeom.splitEdgeAt(redge, p1) PathLog.debug("Got split edges with lengths: {}, {}".format(splitEdge[0].Length, splitEdge[1].Length)) diff --git a/src/boost_any_1_55.hpp b/src/boost_any_1_55.hpp index 3edd2390ff..1e12503d5b 100644 --- a/src/boost_any_1_55.hpp +++ b/src/boost_any_1_55.hpp @@ -120,7 +120,7 @@ namespace boost return *this; } - // move assignement + // move assignment any & operator=(any&& rhs) BOOST_NOEXCEPT { rhs.swap(*this);