From b4ef5d2c11d80533aa12418080303089b7d9b438 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Tue, 2 Oct 2018 08:39:13 -0400 Subject: [PATCH] Misc. typo fixes Found via `codespell -q 3 --skip="*.po,*.ts,./.git,./src/3rdParty,./src/CXX,./src/zipios++,./src/Mod/Assembly/App/opendcm" -I ../fc-word-whitelist.txt` --- src/Gui/ProgressBar.cpp | 12 ++++++------ src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp | 5 ++--- src/Mod/Sandbox/exportDRAWEXE.py | 4 ++-- .../TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg | 4 ++-- .../TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg | 4 ++-- .../TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg | 4 ++-- .../TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg | 4 ++-- .../TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg | 4 ++-- .../TechDraw/Templates/A4_Portrait_ISO7200Pep.svg | 4 ++-- src/Tools/fcbt/DistBin.py | 10 +++++----- 10 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp index 329c4cfed7..443c761b17 100644 --- a/src/Gui/ProgressBar.cpp +++ b/src/Gui/ProgressBar.cpp @@ -287,7 +287,7 @@ void Sequencer::resetData() } else { d->bar->reset(); - // Note: Under Qt 4.1.4 this forces to run QWindowsStyle::eventFilter() twice + // Note: Under Qt 4.1.4 this forces to run QWindowsStyle::eventFilter() twice // handling the same event thus a warning is printed. Possibly, this is a bug // in Qt. The message is QEventDispatcherUNIX::unregisterTimer: invalid argument. d->bar->hide(); @@ -398,7 +398,7 @@ void ProgressBar::delayedShow() bool ProgressBar::canAbort() const { int ret = QMessageBox::question(getMainWindow(),tr("Aborting"), - tr("Do you really want to abort the operation?"), QMessageBox::Yes, + tr("Do you really want to abort the operation?"), QMessageBox::Yes, QMessageBox::No|QMessageBox::Default); return (ret == QMessageBox::Yes) ? true : false; @@ -464,7 +464,7 @@ bool ProgressBar::eventFilter(QObject* o, QEvent* e) return true; } break; - // ignore alle these events + // ignore all these events case QEvent::KeyRelease: case QEvent::Enter: case QEvent::Leave: @@ -473,15 +473,15 @@ bool ProgressBar::eventFilter(QObject* o, QEvent* e) { return true; } break; - - // special case if the main window's close button was pressed + + // special case if the main window's close button was pressed case QEvent::Close: { // avoid to exit while app is working // note: all other widget types are allowed to be closed anyway if (o == getMainWindow()) { e->ignore(); - return true; + return true; } } break; diff --git a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp index 2ede437e51..070ec08f06 100644 --- a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp +++ b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp @@ -460,7 +460,7 @@ void TaskAssemblyConstraints::setPossibleOptions() { // } // }; - // if(isCombination(g1,g2, dcm::geometry::line, dcm::geometry::plane) || + // if(isCombination(g1,g2,easier dcm::geometry::line, dcm::geometry::plane) || // isCombination(g1,g2, dcm::geometry::plane, dcm::geometry::cylinder)) { // ui->perpendicular->setEnabled(true); @@ -486,7 +486,7 @@ void TaskAssemblyConstraints::setPossibleOptions() { void TaskAssemblyConstraints::setPossibleConstraints() { - ////diasble all constraints for easyer enabling + ////diasble all constraints for easier enabling //ui->fix->setEnabled(false); //ui->distance->setEnabled(false); //ui->orientation->setEnabled(false); @@ -632,4 +632,3 @@ bool TaskAssemblyConstraints::isCombination(boost::shared_ptr g1, bo #include "moc_TaskAssemblyConstraints.cpp" - diff --git a/src/Mod/Sandbox/exportDRAWEXE.py b/src/Mod/Sandbox/exportDRAWEXE.py index 89e307ab0c..0ad033075d 100644 --- a/src/Mod/Sandbox/exportDRAWEXE.py +++ b/src/Mod/Sandbox/exportDRAWEXE.py @@ -61,7 +61,7 @@ def f2s(n,angle=False,axis=False): return s def ax2_xdir(normal): - #adaped from gp_Ax2.ccc (c) OpenCascade SAS LGPL 2.1+ + #adapted from gp_Ax2.ccc (c) OpenCascade SAS LGPL 2.1+ xa=abs(normal.x) ya=abs(normal.y) @@ -211,7 +211,7 @@ def isDraftWire(ob): if isinstance(ob.Proxy,Draft._Wire): #only return true if we support all options #"Closed" append last point at the end - #"MakeFace" + #"MakeFace" #"Points" data we need # the usage of 'start' and 'end' is not clear if ob.Base is None and ob.Tool is None and \ diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg index 6538831487..a296cc519b 100644 --- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg +++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg @@ -153,11 +153,11 @@ - + - + diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg index 98ed456413..4b2c0c9c64 100644 --- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg +++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg @@ -113,11 +113,11 @@ - + - + diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg index 24c84953c5..afb6a2cf26 100644 --- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg +++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg @@ -85,11 +85,11 @@ - + - + diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg index 085412dce9..532f2e0ff7 100644 --- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg +++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg @@ -65,11 +65,11 @@ - + - + diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg index 1693000f72..5d5645f186 100644 --- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg +++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg @@ -8,11 +8,11 @@ - + - + diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg index cf92a640dd..999a67f7e5 100644 --- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg +++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg @@ -8,11 +8,11 @@ - + - + diff --git a/src/Tools/fcbt/DistBin.py b/src/Tools/fcbt/DistBin.py index be6c84eb5e..26c56fda32 100644 --- a/src/Tools/fcbt/DistBin.py +++ b/src/Tools/fcbt/DistBin.py @@ -6,7 +6,7 @@ import os,sys import DistTools, FileTools -# line separator +# line separator ls = os.linesep # path separator ps = os.pathsep @@ -26,13 +26,13 @@ if (DistTools.EnsureDir(DistDir+DistBin) == 1): raise "Dist path already there!!" #==================================================================== -# copy src +# copy src sys.stdout.write( 'Copy src Tree ...\n') DistTools.EnsureDir(DistDir+DistBin+'/src') FileTools.cpallWithFilter('../../src',DistDir+DistBin+'/src',FileTools.SetUpFilter(DistTools.SrcFilter)) #==================================================================== -# copy bin and lib +# copy bin and lib sys.stdout.write( 'Copy bin and lib Tree ...\n') DistTools.EnsureDir(DistDir+DistBin+'/bin') FileTools.cpallWithFilter('../../bin',DistDir+DistBin+'/bin',FileTools.SetUpFilter(DistTools.BinFilter)) @@ -55,8 +55,8 @@ FileTools.cpallWithFilter('../../src/Mod',DistDir+DistBin+'/Mod',FileTools.SetUp #DistTools.cpfile("../Tools/BuildTool.py",DistDir+DistBin+"/BuildTool.py") #==================================================================== -# ziping a archiv +# zipping an archive #os.popen("rar.exe a "+DistDir+DistBin+".rar "+ DistDir+DistBin) os.popen("7z a -tzip "+DistDir+DistBin+".zip "+ DistDir+DistBin+ " -mx9") -FileTools.rmall(DistDir+DistBin) \ No newline at end of file +FileTools.rmall(DistDir+DistBin)