diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index b67450374c..36a03e7752 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -119,7 +119,7 @@ void copy(Py::Dict sourceRange, OutputIt targetIt) string key; string value; - for (auto keyPy : sourceRange.keys()) { + for (const auto& keyPy : sourceRange.keys()) { key = Py::String(keyPy); value = Py::String(sourceRange[keyPy]); *targetIt = {key, value}; diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp index 3b35c6b294..90a5ba7543 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp +++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp @@ -446,7 +446,7 @@ std::vector DrawProjectSplit::removeDuplicateEdges(std::vector edges, double tol ShapeFix_ShapeTolerance sTol; Handle(ShapeExtend_WireData) wireData = new ShapeExtend_WireData(); - for (auto e:edges) { + for (const auto& e:edges) { wireData->Add(e); } @@ -315,7 +315,7 @@ std::vector EdgeWalker:: makeUniqueVList(std::vector TopoDS_Vertex v2 = TopExp::LastVertex(e); bool addv1 = true; bool addv2 = true; - for (auto v:uniqueVert) { + for (const auto& v:uniqueVert) { if (DrawUtil::isSamePoint(v,v1,EWTOLERANCE)) addv1 = false; if (DrawUtil::isSamePoint(v,v2,EWTOLERANCE)) @@ -336,7 +336,7 @@ std::vector EdgeWalker::makeWalkerEdges(std::vector edg // Base::Console().Message("TRACE - EW::makeWalkerEdges()\n"); m_saveInEdges = edges; std::vector walkerEdges; - for (auto e:edges) { + for (const auto& e:edges) { TopoDS_Vertex ev1 = TopExp::FirstVertex(e); TopoDS_Vertex ev2 = TopExp::LastVertex(e); int v1dx = findUniqueVert(ev1, verts); diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 944573eb3f..f5a78c143b 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -1140,8 +1140,8 @@ void CmdTechDrawSymbol::activated(int iMsg) QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), QString(), QString::fromLatin1("%1 (*.svg *.svgz);;%2 (*.*)"). - arg(QObject::tr("Scalable Vector Graphic")). - arg(QObject::tr("All Files"))); + arg(QObject::tr("Scalable Vector Graphic"), + QObject::tr("All Files"))); if (!filename.isEmpty()) { diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp index af5d968160..4188e3b047 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp @@ -2306,7 +2306,7 @@ namespace TechDrawGui { // get subNames and coordinates of all selected vertexes std::vector vertexes; dimVertex nextVertex; - for (std::string name : subNames) { + for (const std::string& name : subNames) { std::string geoType = TechDraw::DrawUtil::getGeomTypeFromName(name); if (geoType == "Vertex") { int geoId = TechDraw::DrawUtil::getIndexFromName(name); diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp index 48366f6a59..6d59947a2e 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp @@ -110,7 +110,7 @@ namespace TechDrawGui { return; const std::vector SubNames = selection[0].getSubNames(); std::vector Circles; - for (std::string Name : SubNames) { + for (const std::string& Name : SubNames) { int GeoId = TechDraw::DrawUtil::getIndexFromName(Name); std::string GeoType = TechDraw::DrawUtil::getGeomTypeFromName(Name); TechDraw::BaseGeomPtr geom = objFeat->getGeomByIndex(GeoId); @@ -138,7 +138,7 @@ namespace TechDrawGui { std::string bigCircleTag = objFeat->addCosmeticEdge(bigCircle); TechDraw::CosmeticEdge* ceCircle = objFeat->getCosmeticEdge(bigCircleTag); _setLineAttributes(ceCircle); - for (TechDraw::CirclePtr oneCircle : Circles) { + for (const TechDraw::CirclePtr& oneCircle : Circles) { Base::Vector3d oneCircleCenter = oneCircle->center; float oneRadius = oneCircle->radius; Base::Vector3d delta = (oneCircle->center - bigCenter).Normalize() * (oneRadius + 2); @@ -201,7 +201,7 @@ void execCircleCenterLines(Gui::Command* cmd) { Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Circle Centerlines")); double scale = objFeat->getScale(); const std::vector SubNames = selection[0].getSubNames(); - for (std::string Name : SubNames) { + for (const std::string& Name : SubNames) { int GeoId = TechDraw::DrawUtil::getIndexFromName(Name); TechDraw::BaseGeomPtr geom = objFeat->getGeomByIndex(GeoId); std::string GeoType = TechDraw::DrawUtil::getGeomTypeFromName(Name); @@ -476,7 +476,7 @@ void execThreadHoleBottom(Gui::Command* cmd) { return; Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Thread Hole Bottom")); const std::vector SubNames = selection[0].getSubNames(); - for (std::string Name : SubNames) { + for (const std::string& Name : SubNames) { _createThreadCircle(Name, objFeat, 1.177f); } cmd->getSelection().clearSelection(); @@ -527,7 +527,7 @@ void execThreadBoltBottom(Gui::Command* cmd) { return; Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Thread Bolt Bottom")); const std::vector SubNames = selection[0].getSubNames(); - for (std::string Name : SubNames) { + for (const std::string& Name : SubNames) { _createThreadCircle(Name, objFeat, 0.85f); } cmd->getSelection().clearSelection(); @@ -763,7 +763,7 @@ void CmdTechDrawExtensionChangeLineAttributes::activated(int iMsg) { return; Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Change Line Attributes")); const std::vector subNames = selection[0].getSubNames(); - for (std::string name : subNames) { + for (const std::string& name : subNames) { int num = DrawUtil::getIndexFromName(name); BaseGeomPtr baseGeo = objFeat->getGeomByIndex(num); if (baseGeo) { @@ -1767,7 +1767,7 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg) int idx = TechDraw::DrawUtil::getIndexFromName(name); std::vector faceEdges = objFeat->getFaceEdgesByIndex(idx); // We filter arcs, circles etc. which are not allowed. - for (TechDraw::BaseGeomPtr geoPtr : faceEdges) + for (const TechDraw::BaseGeomPtr& geoPtr : faceEdges) if (geoPtr->geomType != TechDraw::GENERIC) throw Base::TypeError("CmdTechDrawAreaAnnotation - forbidden border element found\n"); // We create a list of all points along the boundary of the face. @@ -1923,7 +1923,7 @@ namespace TechDrawGui { std::vector _getVertexPoints(std::vector SubNames, TechDraw::DrawViewPart* objFeat) { // get vertex points as Vector3d std::vector vertexPoints; - for (std::string Name : SubNames) { + for (const std::string& Name : SubNames) { std::string GeoType = TechDraw::DrawUtil::getGeomTypeFromName(Name); if (GeoType == "Vertex") { int GeoId = TechDraw::DrawUtil::getIndexFromName(Name); diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp index f54780d1ae..47318b9638 100644 --- a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp +++ b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp @@ -74,7 +74,7 @@ void DlgPageChooser::fillList(std::vector labels, std::vectorlwPages); item->setData(Qt::UserRole, qName); } diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp index 9cb11eacea..cc6ddcae86 100644 --- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp +++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp @@ -128,7 +128,6 @@ TechDraw::DrawPage* DrawGuiUtil::findPage(Gui::Command* cmd) Gui::MDIView* mv = w->activeWindow(); MDIViewPage* mvp = dynamic_cast(mv); if (mvp) { - QString windowTitle = mvp->windowTitle(); QGSPage* qp = mvp->getQGSPage(); page = qp->getDrawPage(); } diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp index 7a670b3742..f6a0139496 100644 --- a/src/Mod/TechDraw/Gui/Grabber3d.cpp +++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp @@ -179,7 +179,6 @@ double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc, Base::Console().Error("G3D::copyActiveViewToSvgFile - can not open file - %s/n", fileSpec.c_str()); return result; } - QColor dbColor(Qt::blue); execVectorizeAction(viewerSvg, va.get(), outWidth, outHeight, diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 2bf751164d..7be18f100d 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -1101,7 +1101,7 @@ void MDIViewPage::sceneSelectionManager() //add to m_qgSceneSelected anything that is in q_sceneSel for (auto qts: sceneSel) { bool found = false; - for (auto ms: m_qgSceneSelected) { + for (auto ms: qAsConst(m_qgSceneSelected)) { if ( qts == ms ) { found = true; break; @@ -1115,7 +1115,7 @@ void MDIViewPage::sceneSelectionManager() //remove items from m_qgSceneSelected that are not in q_sceneSel QList m_new; - for (auto m: m_qgSceneSelected) { + for (auto m: qAsConst(m_qgSceneSelected)) { for (auto q: sceneSel) { if (m == q) { m_new.push_back(m); @@ -1455,7 +1455,7 @@ Py::Object MDIViewPagePy::getattr(const char * attr) if (name == "__dict__" || name == "__class__") { Py::Dict dict_self(BaseType::getattr("__dict__")); Py::Dict dict_base(base.getattr("__dict__")); - for (auto it : dict_base) { + for (const auto& it : dict_base) { dict_self.setItem(it.first, it.second); } return dict_self; diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp index 1c9cd8cb98..9287289cdb 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp @@ -208,7 +208,6 @@ void QGIRichAnno::setTextItem() if (!getExporting()) { //convert point font sizes to (Rez,mm) font sizes QRegExp rxFontSize(QString::fromUtf8("font-size:([0-9]*)pt;")); - QString match; double mmPerPoint = 0.353; double sizeConvert = Rez::getRezFactor() * mmPerPoint; int pos = 0; diff --git a/src/Mod/TechDraw/Gui/QGSPage.cpp b/src/Mod/TechDraw/Gui/QGSPage.cpp index ac1ec6f372..6d7db4feea 100644 --- a/src/Mod/TechDraw/Gui/QGSPage.cpp +++ b/src/Mod/TechDraw/Gui/QGSPage.cpp @@ -397,7 +397,6 @@ void QGSPage::createBalloon(QPointF origin, DrawViewPart *parent) balloon->Y.setValue(appOrigin.y() + textOffset); int idx = getDrawPage()->getNextBalloonIndex(); - QString labelText = QString::number(idx); balloon->Text.setValue(std::to_string(idx).c_str()); Command::doCommand(Command::Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", pageName.c_str(), featName.c_str()); diff --git a/src/Mod/TechDraw/Gui/QGTracker.h b/src/Mod/TechDraw/Gui/QGTracker.h index 3a7652e2f6..1295564278 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.h +++ b/src/Mod/TechDraw/Gui/QGTracker.h @@ -78,8 +78,8 @@ public: QPointF snapToAngle(QPointF pt); Q_SIGNALS: - void drawingFinished(std::vector pts, QGIView* qgParent); - void qViewPicked(QPointF pos, QGIView* qgParent); + void drawingFinished(std::vector pts, TechDrawGui::QGIView* qgParent); + void qViewPicked(QPointF pos, TechDrawGui::QGIView* qgParent); protected: virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h index 0e0116837a..9c8b126ad0 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.h +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h @@ -68,7 +68,7 @@ public: public Q_SLOTS: void onTrackerClicked(bool b); - void onTrackerFinished(std::vector pts, QGIView* qgParent); + void onTrackerFinished(std::vector pts, TechDrawGui::QGIView* qgParent); public: virtual bool accept(); diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h index 8e6694ae75..bf14926b38 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h @@ -71,7 +71,7 @@ public: public Q_SLOTS: void onTrackerClicked(bool b); void onCancelEditClicked(bool b); - void onTrackerFinished(std::vector pts, QGIView* qgParent); + void onTrackerFinished(std::vector pts, TechDrawGui::QGIView* qgParent); public: virtual bool accept(); diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index 124cf41bb7..1d08a11652 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -192,7 +192,7 @@ void TaskProjGroup::viewToggled(bool toggle) bool changed = false; // Obtain name of checkbox QString viewName = sender()->objectName(); - int index = viewName.mid(7).toInt(); + int index = viewName.midRef(7).toInt(); const char *viewNameCStr = viewChkIndexToCStr(index); if ( toggle && !multiView->hasProjection( viewNameCStr ) ) { Gui::Command::doCommand(Gui::Command::Doc, @@ -498,9 +498,9 @@ void TaskProjGroup::setUiPrimary() QString TaskProjGroup::formatVector(Base::Vector3d v) { QString data = QString::fromLatin1("[%1 %2 %3]") - .arg(QLocale().toString(v.x, 'f', 2)) - .arg(QLocale().toString(v.y, 'f', 2)) - .arg(QLocale().toString(v.z, 'f', 2)); + .arg(QLocale().toString(v.x, 'f', 2), + QLocale().toString(v.y, 'f', 2), + QLocale().toString(v.z, 'f', 2)); return data; } diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp index 279839af99..7b9489dbe7 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp @@ -209,7 +209,7 @@ void TaskSurfaceFinishSymbols::setUiEdit() // QComboBox showing RA values cbRA = new(QComboBox); cbRA->resize(90,20); - for (std::string nextValue : raValues) + for (const std::string& nextValue : raValues) cbRA->addItem(QString::fromStdString(nextValue)); cbRA->setToolTip(QObject::tr("Average roughness")); proxyRA = symbolScene->addWidget(cbRA); @@ -224,7 +224,7 @@ void TaskSurfaceFinishSymbols::setUiEdit() // QComboBox showing lay symbol cbLay = new(QComboBox); cbLay->resize(40,20); - for (std::string nextLay : laySymbols) + for (const std::string& nextLay : laySymbols) cbLay->addItem(QString::fromStdString(nextLay)); cbLay->setToolTip(QObject::tr("Lay symbol")); QGraphicsProxyWidget* proxyLay = symbolScene->addWidget(cbLay); @@ -232,7 +232,7 @@ void TaskSurfaceFinishSymbols::setUiEdit() // QComboBox showing minimal roughness grade cbMinRought = new(QComboBox); cbMinRought->resize(55,20); - for (std::string nextGrade : roughGrades) + for (const std::string& nextGrade : roughGrades) cbMinRought->addItem(QString::fromStdString(nextGrade)); cbMinRought->setToolTip(QObject::tr("Minimum roughness grade number")); proxyMinRough = symbolScene->addWidget(cbMinRought); @@ -242,7 +242,7 @@ void TaskSurfaceFinishSymbols::setUiEdit() // QComboBox showing maximal roughness grade cbMaxRought = new(QComboBox); cbMaxRought->resize(55,20); - for (std::string nextGrade : roughGrades) + for (const std::string& nextGrade : roughGrades) cbMaxRought->addItem(QString::fromStdString(nextGrade)); cbMaxRought->setToolTip(QObject::tr("Maximum roughness grade number")); proxyMaxRough = symbolScene->addWidget(cbMaxRought); diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index bf777f9964..02abdaabcc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -182,7 +182,7 @@ bool ViewProviderProjGroup::onDelete(const std::vector &) bodyMessageStream << qApp->translate("Std_Delete", "The group cannot be deleted because its items have the following\nsection or detail views, or leader lines that would get broken:"); bodyMessageStream << '\n'; - for (auto ListIterator : ViewList) + for (const auto& ListIterator : ViewList) bodyMessageStream << '\n' << QString::fromUtf8(ListIterator.c_str()); QMessageBox::warning(Gui::getMainWindow(), qApp->translate("Std_Delete", "Object dependencies"), bodyMessage, diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp index 1512e895d1..b7a4445a8d 100644 --- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp +++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp @@ -201,7 +201,8 @@ MRichTextEdit::MRichTextEdit(QWidget *parent, QString textIn) : QWidget(parent) // font size QFontDatabase db; - for(int size: db.standardSizes()) { + const auto sizes = db.standardSizes(); + for(int size: sizes) { f_fontsize->addItem(QString::number(size)); } //TODO: void QComboBox::setEditText(const QString &text) to " " when multiple select diff --git a/src/Mod/TechDraw/Gui/mtextedit.cpp b/src/Mod/TechDraw/Gui/mtextedit.cpp index 4fa6ac3ec4..cd59e98095 100644 --- a/src/Mod/TechDraw/Gui/mtextedit.cpp +++ b/src/Mod/TechDraw/Gui/mtextedit.cpp @@ -20,6 +20,7 @@ ** ** $QT_END_LICENSE$ */ +// clazy:excludeall=qstring-arg #include "PreCompiled.h" #include "mtextedit.h"