From 6802bed99d2589de6db5d8061e0bb3ae13b28258 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Fri, 10 Mar 2023 12:35:18 +0000 Subject: [PATCH] Fix various typos and whitespace --- src/Mod/Draft/DraftVecUtils.py | 4 ++-- src/Mod/Fem/Gui/CMakeLists.txt | 4 ++-- src/Mod/MeshPart/App/MeshFlatteningPy.cpp | 2 +- src/Mod/Part/App/ExtrusionHelper.cpp | 2 +- src/Mod/Part/Gui/DlgFilletEdges.cpp | 2 +- src/Mod/Part/parttests/TopoShapeListTest.py | 6 +++--- src/Mod/PartDesign/App/Feature.cpp | 2 +- src/Mod/PartDesign/Gui/Command.cpp | 2 +- src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp | 2 +- src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui | 4 ++-- src/Tools/embedded/PySide/mainwindow3.py | 6 +++--- tests/src/App/License.cpp | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Mod/Draft/DraftVecUtils.py b/src/Mod/Draft/DraftVecUtils.py index a819117552..82f4a667ba 100644 --- a/src/Mod/Draft/DraftVecUtils.py +++ b/src/Mod/Draft/DraftVecUtils.py @@ -742,12 +742,12 @@ def getPlaneRotation(u, v, _ = None): v : Base::Vector3 Hint for the second vector. _ : Ignored. For backwards compatibility - + Returns ------- Base::Matrix4D The new rotation matrix defining a new coordinate system, - or `None` if `u` or `v` is `None` or + or `None` if `u` or `v` is `None` or if `u` and `v` are parallel. """ if (not u) or (not v): diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index e4ce4ba555..13bf23dd56 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -101,7 +101,7 @@ if(BUILD_FEM_VTK) TaskPostDataAtPoint.ui TaskPostDisplay.ui TaskPostScalarClip.ui - TaskPostWarpVector.ui + TaskPostWarpVector.ui ) endif(BUILD_FEM_VTK) @@ -282,7 +282,7 @@ if(BUILD_FEM_VTK) TaskPostDataAtPoint.ui TaskPostDisplay.ui TaskPostScalarClip.ui - TaskPostWarpVector.ui + TaskPostWarpVector.ui ) endif(BUILD_FEM_VTK) SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes}) diff --git a/src/Mod/MeshPart/App/MeshFlatteningPy.cpp b/src/Mod/MeshPart/App/MeshFlatteningPy.cpp index e81802701a..8ba715cb26 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningPy.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningPy.cpp @@ -34,7 +34,7 @@ # include #endif -// neccessary for the feature despite not all are necessary for compilation +// necessary for the feature despite not all are necessary for compilation #include #include #include diff --git a/src/Mod/Part/App/ExtrusionHelper.cpp b/src/Mod/Part/App/ExtrusionHelper.cpp index 0efaf139f0..1079c332a0 100644 --- a/src/Mod/Part/App/ExtrusionHelper.cpp +++ b/src/Mod/Part/App/ExtrusionHelper.cpp @@ -362,7 +362,7 @@ void ExtrusionHelper::checkInnerWires(std::vector& isInnerWire, const gp_D } if (saveIsInnerWireIterator == *isInnerWireIterator) // nothing was changed and we can remove it from the list to be checked - // but we cannot do this before the foor loop was fully run + // but we cannot do this before the for loop was fully run toDisable[outer] = true; ++isInnerWireIterator; ++toCheckIterator; diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index efe34a6f04..11c7137cfe 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -635,7 +635,7 @@ void DlgFilletEdges::setupFillet(const std::vector& objs) * will do the check * // If sub-objects are already selected then only add the un-selected parts. - // This is impotant to avoid recursive calls of rmvSelection() which + // This is important to avoid recursive calls of rmvSelection() which // invalidates the internal iterator (#0002200). if (selIt != selObj.end()) { std::vector selElements = selIt->getSubNames(); diff --git a/src/Mod/Part/parttests/TopoShapeListTest.py b/src/Mod/Part/parttests/TopoShapeListTest.py index d638d90935..3ad1b24422 100644 --- a/src/Mod/Part/parttests/TopoShapeListTest.py +++ b/src/Mod/Part/parttests/TopoShapeListTest.py @@ -48,14 +48,14 @@ class TopoShapeListTest(unittest.TestCase): self.assertLessEqual(error, maxError, "TopoShapeList entry 1 has wrong volume: {0}".format(boxes[1].Volume)) error = abs(3.0 - boxes[2].Volume) self.assertLessEqual(error, maxError, "TopoShapeList entry 2 has wrong volume: {0}".format(boxes[2].Volume)) - + twoboxes = [boxes[1], boxes[2]] doc.openTransaction("Change shapes") obj.Shapes = twoboxes - doc.commitTransaction() + doc.commitTransaction() self.assertEqual(len(obj.Shapes), 2, "TopoShapeList has wrong entry count (1): {0}".format(len(obj.Shapes))) doc.undo() - + self.assertEqual(len(obj.Shapes), 3, "TopoShapeList has wrong entry count (2): {0}".format(len(obj.Shapes))) diff --git a/src/Mod/PartDesign/App/Feature.cpp b/src/Mod/PartDesign/App/Feature.cpp index fee65f0313..d2a2946947 100644 --- a/src/Mod/PartDesign/App/Feature.cpp +++ b/src/Mod/PartDesign/App/Feature.cpp @@ -256,7 +256,7 @@ App::DocumentObject *Feature::getSubObject(const char *subname, // supposed to be contained inside a body. It makes // little sense to transform its sub-object. So if 'no // transform' is requested, we need to actively apply - // an inverse trasnform. + // an inverse transform. _mat = Placement.getValue().inverse().toMatrix(); if (pmat) *pmat *= _mat; diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 7fae3e3eb5..1c9371cacf 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -729,7 +729,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons // `ProfileBased::getProfileShape()` and other methods will return // just the sub-shapes if they are set. So when whole sketches are - // desired, don not set sub-values. + // desired, don't set sub-values. if (feature->isDerivedFrom(Part::Part2DObject::getClassTypeId()) && subName.compare(0, 6, "Vertex") != 0) runProfileCmd(); diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp index 2d733fda0e..0aec944896 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp @@ -626,7 +626,7 @@ void TaskExtrudeParameters::setDirectionMode(int index) extrude->UseCustomVector.setValue(false); } - // if we dont use custom direction, only allow to show its direction + // if we don't use custom direction, only allow to show its direction if (index != DirectionModes::Custom) { ui->XDirectionEdit->setEnabled(false); ui->YDirectionEdit->setEnabled(false); diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui index c24ad3fc96..3fbbcd9bc0 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui @@ -436,12 +436,12 @@ The grid spacing change if it becomes smaller than this number of pixel.Gui::QuantitySpinBox QAbstractSpinBox
Gui/QuantitySpinBox.h
- + Gui::PrefColorButton Gui::ColorButton
Gui/PrefWidgets.h
- + Gui::ColorButton QPushButton diff --git a/src/Tools/embedded/PySide/mainwindow3.py b/src/Tools/embedded/PySide/mainwindow3.py index c1f6f7fe81..cfbee18c92 100644 --- a/src/Tools/embedded/PySide/mainwindow3.py +++ b/src/Tools/embedded/PySide/mainwindow3.py @@ -15,7 +15,7 @@ class MainWindow(QtGui.QMainWindow): # when setting up the internally used network interface. Doing this before # creating the icons fixes the issue. QtNetwork.QNetworkConfigurationManager() - + @QtCore.Slot() def on_actionEmbed_triggered(self): FreeCADGui.showMainWindow() @@ -33,11 +33,11 @@ class MainWindow(QtGui.QMainWindow): return "Gui::BlankWorkbench" FreeCADGui.addWorkbench(BlankWorkbench) FreeCADGui.activateWorkbench("BlankWorkbench") - + @QtCore.Slot() def on_actionDocument_triggered(self): FreeCAD.newDocument() - + @QtCore.Slot() def on_actionCube_triggered(self): FreeCAD.ActiveDocument.addObject("Part::Box") diff --git a/tests/src/App/License.cpp b/tests/src/App/License.cpp index c6aa3501ae..d3062ce9ff 100644 --- a/tests/src/App/License.cpp +++ b/tests/src/App/License.cpp @@ -24,7 +24,7 @@ TEST(License, direct) TEST(License, findLicenseByIdent) { App::TLicenseArr arr {App::licenseItems.at(App::findLicense("CC_BY_40"))}; - + EXPECT_STREQ(arr.at(App::posnOfIdentifier), "CC_BY_40"); EXPECT_STREQ(arr.at(App::posnOfFullName), "Creative Commons Attribution"); EXPECT_STREQ(arr.at(App::posnOfUrl), "https://creativecommons.org/licenses/by/4.0/");