From 45f534bc32bff88b018e53d9d33ddacdd41b4bdb Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 25 Jul 2022 01:14:40 +0200 Subject: [PATCH] Mesh: Fix several clazy issues: * Use multi-arg instead [-Wclazy-qstring-arg] * Q_PROPERTY should have either NOTIFY or CONSTANT [-Wclazy-qproperty-without-notify] * Using copy-ctor but class SbMatrix has a trivial copy-ctor but non trivial assign operator [-Wclazy-rule-of-two-soft] --- src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp | 46 ++++++++++++------------- src/Mod/Mesh/Gui/PropertyEditorMesh.h | 6 ++-- src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp | 8 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp index 78dc4593b5..a5c909e6f9 100644 --- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp +++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp @@ -135,10 +135,10 @@ void DlgRegularSolidImp::on_createSolidButton_clicked() "App.ActiveDocument.%1.Length=%2\n" "App.ActiveDocument.%1.Width=%3\n" "App.ActiveDocument.%1.Height=%4\n")) - .arg(QLatin1String(name.c_str())) - .arg(Base::UnitsApi::toNumber(ui->boxLength->value())) - .arg(Base::UnitsApi::toNumber(ui->boxWidth->value())) - .arg(Base::UnitsApi::toNumber(ui->boxHeight->value())); + .arg(QLatin1String(name.c_str()), + Base::UnitsApi::toNumber(ui->boxLength->value()), + Base::UnitsApi::toNumber(ui->boxWidth->value()), + Base::UnitsApi::toNumber(ui->boxHeight->value())); } else if (ui->comboBox1->currentIndex() == 1) { // cylinder name = doc->getUniqueObjectName("Cylinder"); @@ -149,11 +149,11 @@ void DlgRegularSolidImp::on_createSolidButton_clicked() "App.ActiveDocument.%1.EdgeLength=%4\n" "App.ActiveDocument.%1.Closed=%5\n" "App.ActiveDocument.%1.Sampling=%6\n")) - .arg(QLatin1String(name.c_str())) - .arg(Base::UnitsApi::toNumber(ui->cylinderRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->cylinderLength->value())) - .arg(Base::UnitsApi::toNumber(ui->cylinderEdgeLength->value())) - .arg(QLatin1String((ui->cylinderClosed->isChecked()?"True":"False"))) + .arg(QLatin1String(name.c_str()), + Base::UnitsApi::toNumber(ui->cylinderRadius->value()), + Base::UnitsApi::toNumber(ui->cylinderLength->value()), + Base::UnitsApi::toNumber(ui->cylinderEdgeLength->value()), + QLatin1String((ui->cylinderClosed->isChecked()?"True":"False"))) .arg(ui->cylinderCount->value()); } else if (ui->comboBox1->currentIndex() == 2) { // cone @@ -166,12 +166,12 @@ void DlgRegularSolidImp::on_createSolidButton_clicked() "App.ActiveDocument.%1.EdgeLength=%5\n" "App.ActiveDocument.%1.Closed=%6\n" "App.ActiveDocument.%1.Sampling=%7\n")) - .arg(QLatin1String(name.c_str())) - .arg(Base::UnitsApi::toNumber(ui->coneRadius1->value())) - .arg(Base::UnitsApi::toNumber(ui->coneRadius2->value())) - .arg(Base::UnitsApi::toNumber(ui->coneLength->value())) - .arg(Base::UnitsApi::toNumber(ui->coneEdgeLength->value())) - .arg(QLatin1String((ui->coneClosed->isChecked()?"True":"False"))) + .arg(QLatin1String(name.c_str()), + Base::UnitsApi::toNumber(ui->coneRadius1->value()), + Base::UnitsApi::toNumber(ui->coneRadius2->value()), + Base::UnitsApi::toNumber(ui->coneLength->value()), + Base::UnitsApi::toNumber(ui->coneEdgeLength->value()), + QLatin1String((ui->coneClosed->isChecked()?"True":"False"))) .arg(ui->coneCount->value()); } else if (ui->comboBox1->currentIndex() == 3) { // sphere @@ -180,8 +180,8 @@ void DlgRegularSolidImp::on_createSolidButton_clicked() "App.ActiveDocument.addObject(\"Mesh::Sphere\",\"%1\")\n" "App.ActiveDocument.%1.Radius=%2\n" "App.ActiveDocument.%1.Sampling=%3\n")) - .arg(QLatin1String(name.c_str())) - .arg(Base::UnitsApi::toNumber(ui->sphereRadius->value())) + .arg(QLatin1String(name.c_str()), + Base::UnitsApi::toNumber(ui->sphereRadius->value())) .arg(ui->sphereCount->value()); } else if (ui->comboBox1->currentIndex() == 4) { // ellipsoid @@ -191,9 +191,9 @@ void DlgRegularSolidImp::on_createSolidButton_clicked() "App.ActiveDocument.%1.Radius1=%2\n" "App.ActiveDocument.%1.Radius2=%3\n" "App.ActiveDocument.%1.Sampling=%4\n")) - .arg(QLatin1String(name.c_str())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value())) + .arg(QLatin1String(name.c_str()), + Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value()), + Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value())) .arg(ui->ellipsoidCount->value()); } else if (ui->comboBox1->currentIndex() == 5) { // toroid @@ -203,9 +203,9 @@ void DlgRegularSolidImp::on_createSolidButton_clicked() "App.ActiveDocument.%1.Radius1=%2\n" "App.ActiveDocument.%1.Radius2=%3\n" "App.ActiveDocument.%1.Sampling=%4\n")) - .arg(QLatin1String(name.c_str())) - .arg(Base::UnitsApi::toNumber(ui->toroidRadius1->value())) - .arg(Base::UnitsApi::toNumber(ui->toroidRadius2->value())) + .arg(QLatin1String(name.c_str()), + Base::UnitsApi::toNumber(ui->toroidRadius1->value()), + Base::UnitsApi::toNumber(ui->toroidRadius2->value())) .arg(ui->toroidCount->value()); } diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.h b/src/Mod/Mesh/Gui/PropertyEditorMesh.h index c08228a580..c56f5540b8 100644 --- a/src/Mod/Mesh/Gui/PropertyEditorMesh.h +++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.h @@ -37,9 +37,9 @@ namespace MeshGui { class MeshGuiExport PropertyMeshKernelItem : public Gui::PropertyEditor::PropertyItem { Q_OBJECT - Q_PROPERTY(int Points READ countPoints) - Q_PROPERTY(int Edges READ countEdges) - Q_PROPERTY(int Faces READ countFaces) + Q_PROPERTY(int Points READ countPoints CONSTANT) + Q_PROPERTY(int Edges READ countEdges CONSTANT) + Q_PROPERTY(int Faces READ countFaces CONSTANT) PROPERTYITEM_HEADER virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const; diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp index dc0d90027f..43c00033f4 100644 --- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp +++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp @@ -971,8 +971,8 @@ void SoFCIndexedFaceSet::startSelection(SoAction * action) int bufSize = 5*(this->coordIndex.getNum()/4); // make the buffer big enough this->selectBuf = new GLuint[bufSize]; - SbMatrix view = SoViewingMatrixElement::get(action->getState()); - SbMatrix proj = SoProjectionMatrixElement::get(action->getState()); + SbMatrix view = SoViewingMatrixElement::get(action->getState()); // clazy:exclude=rule-of-two-soft + SbMatrix proj = SoProjectionMatrixElement::get(action->getState()); // clazy:exclude=rule-of-two-soft glSelectBuffer(bufSize, selectBuf); glRenderMode(GL_SELECT); @@ -1054,8 +1054,8 @@ void SoFCIndexedFaceSet::renderSelectionGeometry(const SbVec3f * coords3d) void SoFCIndexedFaceSet::startVisibility(SoAction * action) { - SbMatrix view = SoViewingMatrixElement::get(action->getState()); - SbMatrix proj = SoProjectionMatrixElement::get(action->getState()); + SbMatrix view = SoViewingMatrixElement::get(action->getState()); // clazy:exclude=rule-of-two-soft + SbMatrix proj = SoProjectionMatrixElement::get(action->getState()); // clazy:exclude=rule-of-two-soft glMatrixMode(GL_PROJECTION); glPushMatrix();