From 420c2d7c03a17ee6aa4f2ccefa333f3f7f8164ee Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Fri, 4 May 2018 10:31:47 -0400 Subject: [PATCH] Source typos fixes --- src/Gui/DlgCheckableMessageBox.h | 2 +- src/Gui/WidgetFactory.cpp | 4 ++-- src/Gui/WidgetFactory.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderDatum.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderDatumLine.cpp | 6 +++--- src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp | 10 +++++----- src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp | 4 ++-- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Gui/DlgCheckableMessageBox.h b/src/Gui/DlgCheckableMessageBox.h index 8e2f2b6c91..62419dc7fa 100644 --- a/src/Gui/DlgCheckableMessageBox.h +++ b/src/Gui/DlgCheckableMessageBox.h @@ -100,7 +100,7 @@ public: static QMessageBox::StandardButton dialogButtonBoxToMessageBoxButton(QDialogButtonBox::StandardButton); // convenient show method - static void showMessage(const QString& haeder, const QString& message, bool check=false, const QString& checkText = QString::fromLatin1("Don't show me again")); + static void showMessage(const QString& header, const QString& message, bool check=false, const QString& checkText = QString::fromLatin1("Don't show me again")); private Q_SLOTS: void slotClicked(QAbstractButton *b); diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index d1340f9617..3066a3f23c 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -1160,7 +1160,7 @@ PyResource::PyResource() : myDlg(0) PyResource::~PyResource() { delete myDlg; - for (std::vector::iterator it = mySingals.begin(); it != mySingals.end(); ++it) { + for (std::vector::iterator it = mySignals.begin(); it != mySignals.end(); ++it) { SignalConnect* sc = *it; delete sc; } @@ -1264,7 +1264,7 @@ bool PyResource::connect(const char* sender, const char* signal, PyObject* cb) if (objS) { SignalConnect* sc = new SignalConnect(this, cb); - mySingals.push_back(sc); + mySignals.push_back(sc); return QObject::connect(objS, sigStr.toLatin1(), sc, SLOT ( onExecute() ) ); } else diff --git a/src/Gui/WidgetFactory.h b/src/Gui/WidgetFactory.h index 37bca098e2..737a20e849 100644 --- a/src/Gui/WidgetFactory.h +++ b/src/Gui/WidgetFactory.h @@ -421,7 +421,7 @@ public: Py::Object connect(const Py::Tuple&); private: - std::vector mySingals; + std::vector mySignals; QDialog* myDlg; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.h b/src/Mod/PartDesign/Gui/ViewProviderDatum.h index ec306ff602..98854b940b 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.h @@ -103,7 +103,7 @@ public: // Returned default bounding box if relevant is can't be used for some reason static SbBox3f defaultBoundBox (); - // Returns a default marging factor (part of size ) + // Returns a default margin factor (part of size ) static double marginFactor () { return 0.1; }; protected: diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.cpp index 482e7fa73b..60ce751639 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.cpp @@ -85,10 +85,10 @@ void ViewProviderDatumLine::setExtents (Base::BoundBox3d bbox) { // Add origin of the line to the box if it's not bbox.Add ( Base::Vector3d (0, 0, 0) ); - double marging = bbox.LengthZ () * marginFactor (); + double margin = bbox.LengthZ () * marginFactor (); // Display the line pCoords->point.setNum (2); - pCoords->point.set1Value(0, 0, 0, bbox.MaxZ + marging ); - pCoords->point.set1Value(1, 0, 0, bbox.MinZ - marging ); + pCoords->point.set1Value(0, 0, 0, bbox.MaxZ + margin ); + pCoords->point.set1Value(1, 0, 0, bbox.MinZ - margin ); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp index 3f3eb34593..d5f84fb4e4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp @@ -107,14 +107,14 @@ void ViewProviderDatumPlane::setExtents (Base::BoundBox3d bbox) { // Add origin of the plane to the box if it's not bbox.Add ( Base::Vector3d (0, 0, 0) ); - double marging = sqrt(bbox.LengthX ()*bbox.LengthY ()) * marginFactor (); + double margin = sqrt(bbox.LengthX ()*bbox.LengthY ()) * marginFactor (); // Change the coordinates of the line pCoords->point.setNum (4); - pCoords->point.set1Value(0, bbox.MaxX + marging, bbox.MaxY + marging, 0 ); - pCoords->point.set1Value(1, bbox.MinX - marging, bbox.MaxY + marging, 0 ); - pCoords->point.set1Value(2, bbox.MinX - marging, bbox.MinY - marging, 0 ); - pCoords->point.set1Value(3, bbox.MaxX + marging, bbox.MinY - marging, 0 ); + pCoords->point.set1Value(0, bbox.MaxX + margin, bbox.MaxY + margin, 0 ); + pCoords->point.set1Value(1, bbox.MinX - margin, bbox.MaxY + margin, 0 ); + pCoords->point.set1Value(2, bbox.MinX - margin, bbox.MinY - margin, 0 ); + pCoords->point.set1Value(3, bbox.MaxX + margin, bbox.MinY - margin, 0 ); } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp index b587aa599a..06ae22a669 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp @@ -830,7 +830,7 @@ void TaskSketcherConstrains::slotConstraintsChanged(void) bool showDatums = (Filter < 3); bool showNamed = (Filter == 3 && !(constraint->Name.empty())); bool showNonDriving = (Filter == 4 && !constraint->isDriving); - bool hideInternalAligment = this->ui->filterInternalAlignment->isChecked(); + bool hideInternalAlignment = this->ui->filterInternalAlignment->isChecked(); switch(constraint->Type) { case Sketcher::Horizontal: @@ -854,7 +854,7 @@ void TaskSketcherConstrains::slotConstraintsChanged(void) visible = (showDatums || showNamed || showNonDriving); break; case Sketcher::InternalAlignment: - visible = ((showNormal || showNamed) && !hideInternalAligment); + visible = ((showNormal || showNamed) && !hideInternalAlignment); default: break; } diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 2ee26c4289..2265b87d07 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -3172,7 +3172,7 @@ void ViewProviderSketch::drawMergedConstraintIcons(IconQueue iconQueue) } -/// Note: labels, labelColors, and boundignBoxes are all +/// Note: labels, labelColors, and boundingBoxes are all /// assumed to be the same length. QImage ViewProviderSketch::renderConstrIcon(const QString &type, const QColor &iconColor,