diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index 44bde1e15c..8912cdd976 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -74,8 +74,7 @@ void TaskLinearPatternParameters::setupParameterUI(QWidget* widget) QMetaObject::connectSlotsByName(this); // Get the feature data - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); + auto pcLinearPattern = static_cast(getObject()); ui->spinLength->bind(pcLinearPattern->Length); ui->spinOffset->bind(pcLinearPattern->Offset); @@ -110,8 +109,7 @@ void TaskLinearPatternParameters::setupParameterUI(QWidget* widget) if (body) { try { App::Origin* origin = body->getOrigin(); - ViewProviderOrigin* vpOrigin; - vpOrigin = static_cast( + auto vpOrigin = static_cast( Gui::Application::Instance->getViewProvider(origin)); vpOrigin->setTemporaryVisibility(true, false); } @@ -168,10 +166,8 @@ void TaskLinearPatternParameters::updateUI() } blockUpdate = true; - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); - PartDesign::LinearPatternMode mode = - static_cast(pcLinearPattern->Mode.getValue()); + auto pcLinearPattern = static_cast(getObject()); + auto mode = static_cast(pcLinearPattern->Mode.getValue()); bool reverse = pcLinearPattern->Reversed.getValue(); double length = pcLinearPattern->Length.getValue(); @@ -189,7 +185,7 @@ void TaskLinearPatternParameters::updateUI() // Note: This block of code would trigger change signal handlers (e.g. onOccurrences()) // and another updateUI() if we didn't check for blockUpdate ui->checkReverse->setChecked(reverse); - ui->comboMode->setCurrentIndex((long)mode); + ui->comboMode->setCurrentIndex(static_cast(mode)); ui->spinLength->setValue(length); ui->spinOffset->setValue(offset); ui->spinOccurrences->setValue(occurrences); @@ -230,8 +226,7 @@ void TaskLinearPatternParameters::onSelectionChanged(const Gui::SelectionChanges exitSelectionMode(); std::vector directions; App::DocumentObject* selObj = nullptr; - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); + auto pcLinearPattern = static_cast(getObject()); if (pcLinearPattern) { getReferencedSelection(pcLinearPattern, msg, selObj, directions); @@ -257,8 +252,7 @@ void TaskLinearPatternParameters::onCheckReverse(const bool on) if (blockUpdate) { return; } - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); + auto pcLinearPattern = static_cast(getObject()); pcLinearPattern->Reversed.setValue(on); exitSelectionMode(); @@ -270,8 +264,7 @@ void TaskLinearPatternParameters::onModeChanged(const int mode) if (blockUpdate) { return; } - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); + auto pcLinearPattern = static_cast(getObject()); pcLinearPattern->Mode.setValue(mode); adaptVisibilityToMode(); @@ -280,40 +273,37 @@ void TaskLinearPatternParameters::onModeChanged(const int mode) kickUpdateViewTimer(); } -void TaskLinearPatternParameters::onLength(const double l) +void TaskLinearPatternParameters::onLength(const double length) { if (blockUpdate) { return; } - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); - pcLinearPattern->Length.setValue(l); + auto pcLinearPattern = static_cast(getObject()); + pcLinearPattern->Length.setValue(length); exitSelectionMode(); kickUpdateViewTimer(); } -void TaskLinearPatternParameters::onOffset(const double o) +void TaskLinearPatternParameters::onOffset(const double offset) { if (blockUpdate) { return; } - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); - pcLinearPattern->Offset.setValue(o); + auto pcLinearPattern = static_cast(getObject()); + pcLinearPattern->Offset.setValue(offset); exitSelectionMode(); kickUpdateViewTimer(); } -void TaskLinearPatternParameters::onOccurrences(const uint n) +void TaskLinearPatternParameters::onOccurrences(const uint number) { if (blockUpdate) { return; } - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); - pcLinearPattern->Occurrences.setValue(n); + auto pcLinearPattern = static_cast(getObject()); + pcLinearPattern->Occurrences.setValue(number); exitSelectionMode(); kickUpdateViewTimer(); @@ -324,8 +314,7 @@ void TaskLinearPatternParameters::onDirectionChanged(int /*num*/) if (blockUpdate) { return; } - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); + auto pcLinearPattern = static_cast(getObject()); try { if (!dirLinks.getCurrentLink().getValue()) { // enter reference selection mode @@ -353,10 +342,9 @@ void TaskLinearPatternParameters::onUpdateView(bool on) blockUpdate = !on; if (on) { // Do the same like in TaskDlgLinearPatternParameters::accept() but without doCommand - PartDesign::LinearPattern* pcLinearPattern = - static_cast(getObject()); + auto pcLinearPattern = static_cast(getObject()); std::vector directions; - App::DocumentObject* obj; + App::DocumentObject* obj = nullptr; setupTransaction(); getDirection(obj, directions); @@ -410,8 +398,7 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters() PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject()); if (body) { App::Origin* origin = body->getOrigin(); - ViewProviderOrigin* vpOrigin; - vpOrigin = static_cast( + auto vpOrigin = static_cast( Gui::Application::Instance->getViewProvider(origin)); vpOrigin->resetTemporaryVisibility(); } @@ -424,7 +411,7 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters() void TaskLinearPatternParameters::apply() { std::vector directions; - App::DocumentObject* obj; + App::DocumentObject* obj = nullptr; getDirection(obj, directions); std::string direction = buildLinkSingleSubPythonStr(obj, directions); diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index 1d87527f2a..f3baa55ca2 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -65,12 +65,12 @@ protected: private Q_SLOTS: void onUpdateViewTimer(); void onDirectionChanged(int num); - void onCheckReverse(const bool on); - void onModeChanged(const int mode); - void onLength(const double l); - void onOffset(const double o); - void onOccurrences(const uint n); - void onUpdateView(bool) override; + void onCheckReverse(bool on); + void onModeChanged(int mode); + void onLength(double length); + void onOffset(double offset); + void onOccurrences(uint number); + void onUpdateView(bool /*unsused*/) override; private: void setupParameterUI(QWidget* widget) override; diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index fc8e397383..2cb22c42d8 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -90,8 +90,7 @@ void TaskMirroredParameters::setupParameterUI(QWidget* widget) if (body) { try { App::Origin* origin = body->getOrigin(); - ViewProviderOrigin* vpOrigin; - vpOrigin = static_cast( + auto vpOrigin = static_cast( Gui::Application::Instance->getViewProvider(origin)); vpOrigin->setTemporaryVisibility(false, true); } @@ -115,7 +114,7 @@ void TaskMirroredParameters::updateUI() } blockUpdate = true; - PartDesign::Mirrored* pcMirrored = static_cast(getObject()); + auto pcMirrored = static_cast(getObject()); if (planeLinks.setCurrentLink(pcMirrored->MirrorPlane) == -1) { // failed to set current, because the link isn't in the list yet @@ -137,8 +136,8 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg } else { std::vector mirrorPlanes; - App::DocumentObject* selObj; - PartDesign::Mirrored* pcMirrored = static_cast(getObject()); + App::DocumentObject* selObj = nullptr; + auto pcMirrored = static_cast(getObject()); getReferencedSelection(pcMirrored, msg, selObj, mirrorPlanes); if (!selObj) { return; @@ -162,7 +161,7 @@ void TaskMirroredParameters::onPlaneChanged(int /*num*/) return; } setupTransaction(); - PartDesign::Mirrored* pcMirrored = static_cast(getObject()); + auto pcMirrored = static_cast(getObject()); try { if (!planeLinks.getCurrentLink().getValue()) { // enter reference selection mode @@ -190,9 +189,9 @@ void TaskMirroredParameters::onUpdateView(bool on) if (on) { setupTransaction(); // Do the same like in TaskDlgMirroredParameters::accept() but without doCommand - PartDesign::Mirrored* pcMirrored = static_cast(getObject()); + auto pcMirrored = static_cast(getObject()); std::vector mirrorPlanes; - App::DocumentObject* obj; + App::DocumentObject* obj = nullptr; getMirrorPlane(obj, mirrorPlanes); pcMirrored->MirrorPlane.setValue(obj, mirrorPlanes); @@ -212,7 +211,7 @@ void TaskMirroredParameters::getMirrorPlane(App::DocumentObject*& obj, void TaskMirroredParameters::apply() { std::vector mirrorPlanes; - App::DocumentObject* obj; + App::DocumentObject* obj = nullptr; getMirrorPlane(obj, mirrorPlanes); std::string mirrorPlane = buildLinkSingleSubPythonStr(obj, mirrorPlanes); @@ -226,8 +225,7 @@ TaskMirroredParameters::~TaskMirroredParameters() PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject()); if (body) { App::Origin* origin = body->getOrigin(); - ViewProviderOrigin* vpOrigin; - vpOrigin = static_cast( + auto vpOrigin = static_cast( Gui::Application::Instance->getViewProvider(origin)); vpOrigin->resetTemporaryVisibility(); } diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index fd8025f272..bb393833cf 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -64,7 +64,7 @@ protected: private Q_SLOTS: void onPlaneChanged(int num); - void onUpdateView(bool) override; + void onUpdateView(bool /*unused*/) override; private: void setupParameterUI(QWidget* widget) override; diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index c22f524a85..ba5433a029 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -68,7 +68,7 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget) QMetaObject::connectSlotsByName(this); // Create a context menu for the listview of transformation features - QAction* action = new QAction(tr("Edit"), ui->listTransformFeatures); + auto action = new QAction(tr("Edit"), ui->listTransformFeatures); action->connect(action, &QAction::triggered, this, @@ -124,8 +124,7 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget) ui->buttonOK->hide(); // Get the transformFeatures data - PartDesign::MultiTransform* pcMultiTransform = - static_cast(TransformedView->getObject()); + auto pcMultiTransform = static_cast(TransformedView->getObject()); std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); @@ -191,8 +190,7 @@ void TaskMultiTransformParameters::onTransformDelete() return; // Can't delete the hint... } int row = ui->listTransformFeatures->currentIndex().row(); - PartDesign::MultiTransform* pcMultiTransform = - static_cast(TransformedView->getObject()); + auto pcMultiTransform = static_cast(TransformedView->getObject()); std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); @@ -224,8 +222,7 @@ void TaskMultiTransformParameters::onTransformEdit() // without OK'ing first ui->listTransformFeatures->currentItem()->setSelected(true); int row = ui->listTransformFeatures->currentIndex().row(); - PartDesign::MultiTransform* pcMultiTransform = - static_cast(TransformedView->getObject()); + auto pcMultiTransform = static_cast(TransformedView->getObject()); std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); @@ -323,8 +320,7 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern() else { // set Direction value before filling up the combo box to avoid creating an empty item // inside updateUI() - PartDesign::Body* body = - static_cast(Part::BodyBase::findBodyOf(getObject())); + auto body = static_cast(Part::BodyBase::findBodyOf(getObject())); if (body) { FCMD_OBJ_CMD(Feat, "Direction = (" << Gui::Command::getObjectCmd(body->getOrigin()->getX()) @@ -419,8 +415,7 @@ void TaskMultiTransformParameters::finishAdd(std::string& newFeatName) // getOriginals().front()->getNameInDocument().c_str()); setupTransaction(); - PartDesign::MultiTransform* pcMultiTransform = - static_cast(TransformedView->getObject()); + auto pcMultiTransform = static_cast(TransformedView->getObject()); if (editHint) { // Remove hint, first feature is being added ui->listTransformFeatures->model()->removeRow(0); @@ -469,8 +464,7 @@ void TaskMultiTransformParameters::moveTransformFeature(const int increment) { setupTransaction(); int row = ui->listTransformFeatures->currentIndex().row(); - PartDesign::MultiTransform* pcMultiTransform = - static_cast(TransformedView->getObject()); + auto pcMultiTransform = static_cast(TransformedView->getObject()); std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); @@ -480,7 +474,7 @@ void TaskMultiTransformParameters::moveTransformFeature(const int increment) App::DocumentObject* feature = transformFeatures[row]; transformFeatures.erase(transformFeatures.begin() + row); - QListWidgetItem* item = new QListWidgetItem(*(ui->listTransformFeatures->item(row))); + auto item = new QListWidgetItem(*(ui->listTransformFeatures->item(row))); ui->listTransformFeatures->model()->removeRow(row); // After this operation, if we were to insert at index row again, things will remain unchanged @@ -532,8 +526,7 @@ void TaskMultiTransformParameters::onUpdateView(bool on) void TaskMultiTransformParameters::apply() { - PartDesign::MultiTransform* pcMultiTransform = - static_cast(getObject()); + auto pcMultiTransform = static_cast(getObject()); std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); std::stringstream str; @@ -553,8 +546,8 @@ TaskMultiTransformParameters::~TaskMultiTransformParameters() closeSubTask(); } catch (const Py::Exception&) { - Base::PyException e; // extract the Python error text - e.ReportException(); + Base::PyException exc; // extract the Python error text + exc.ReportException(); } } diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index 1f68dc1b04..7f7eea688d 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -80,7 +80,7 @@ private Q_SLOTS: void onMoveDown(); // Note: There is no Cancel button because I couldn't work out how to save the state of // a subFeature so as to revert the changes of an edit operation - void onUpdateView(bool) override; + void onUpdateView(bool /*unsused*/) override; private: void setupParameterUI(QWidget* widget) override; @@ -91,7 +91,7 @@ private: void updateUI(); void closeSubTask(); - void moveTransformFeature(const int increment); + void moveTransformFeature(int increment); void finishAdd(std::string& newFeatName); private: diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index a8d8d59d0b..2f772db673 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -81,7 +81,7 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget* widget) QMetaObject::connectSlotsByName(this); // Get the feature data - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); ui->polarAngle->bind(pcPolarPattern->Angle); ui->angleOffset->bind(pcPolarPattern->Offset); @@ -111,8 +111,7 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget* widget) if (body) { try { App::Origin* origin = body->getOrigin(); - ViewProviderOrigin* vpOrigin; - vpOrigin = static_cast( + auto vpOrigin = static_cast( Gui::Application::Instance->getViewProvider(origin)); vpOrigin->setTemporaryVisibility(true, false); } @@ -169,10 +168,9 @@ void TaskPolarPatternParameters::updateUI() } blockUpdate = true; - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); - PartDesign::PolarPatternMode mode = - static_cast(pcPolarPattern->Mode.getValue()); + auto mode = static_cast(pcPolarPattern->Mode.getValue()); bool reverse = pcPolarPattern->Reversed.getValue(); double angle = pcPolarPattern->Angle.getValue(); double offset = pcPolarPattern->Offset.getValue(); @@ -189,7 +187,7 @@ void TaskPolarPatternParameters::updateUI() // Note: This block of code would trigger change signal handlers (e.g. onOccurrences()) // and another updateUI() if we didn't check for blockUpdate ui->checkReverse->setChecked(reverse); - ui->comboMode->setCurrentIndex((long)mode); + ui->comboMode->setCurrentIndex(static_cast(mode)); ui->polarAngle->setValue(angle); ui->angleOffset->setValue(offset); ui->spinOccurrences->setValue(occurrences); @@ -226,9 +224,8 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges& } else { std::vector axes; - App::DocumentObject* selObj; - PartDesign::PolarPattern* pcPolarPattern = - static_cast(getObject()); + App::DocumentObject* selObj = nullptr; + auto pcPolarPattern = static_cast(getObject()); getReferencedSelection(pcPolarPattern, msg, selObj, axes); if (!selObj) { return; @@ -251,7 +248,7 @@ void TaskPolarPatternParameters::onCheckReverse(const bool on) if (blockUpdate) { return; } - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); pcPolarPattern->Reversed.setValue(on); exitSelectionMode(); @@ -263,7 +260,7 @@ void TaskPolarPatternParameters::onModeChanged(const int mode) if (blockUpdate) { return; } - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); pcPolarPattern->Mode.setValue(mode); adaptVisibilityToMode(); @@ -272,25 +269,25 @@ void TaskPolarPatternParameters::onModeChanged(const int mode) kickUpdateViewTimer(); } -void TaskPolarPatternParameters::onAngle(const double a) +void TaskPolarPatternParameters::onAngle(const double angle) { if (blockUpdate) { return; } - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); - pcPolarPattern->Angle.setValue(a); + auto pcPolarPattern = static_cast(getObject()); + pcPolarPattern->Angle.setValue(angle); exitSelectionMode(); kickUpdateViewTimer(); } -void TaskPolarPatternParameters::onOffset(const double a) +void TaskPolarPatternParameters::onOffset(const double offset) { if (blockUpdate) { return; } - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); - pcPolarPattern->Offset.setValue(a); + auto pcPolarPattern = static_cast(getObject()); + pcPolarPattern->Offset.setValue(offset); exitSelectionMode(); kickUpdateViewTimer(); @@ -301,7 +298,7 @@ void TaskPolarPatternParameters::onOccurrences(const uint n) if (blockUpdate) { return; } - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); pcPolarPattern->Occurrences.setValue(n); exitSelectionMode(); @@ -313,7 +310,7 @@ void TaskPolarPatternParameters::onAxisChanged(int /*num*/) if (blockUpdate) { return; } - PartDesign::PolarPattern* pcPolarPattern = static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); try { if (!axesLinks.getCurrentLink().getValue()) { @@ -341,10 +338,9 @@ void TaskPolarPatternParameters::onUpdateView(bool on) blockUpdate = !on; if (on) { // Do the same like in TaskDlgPolarPatternParameters::accept() but without doCommand - PartDesign::PolarPattern* pcPolarPattern = - static_cast(getObject()); + auto pcPolarPattern = static_cast(getObject()); std::vector axes; - App::DocumentObject* obj; + App::DocumentObject* obj = nullptr; setupTransaction(); getAxis(obj, axes); @@ -393,8 +389,7 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters() PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject()); if (body) { App::Origin* origin = body->getOrigin(); - ViewProviderOrigin* vpOrigin; - vpOrigin = static_cast( + auto vpOrigin = static_cast( Gui::Application::Instance->getViewProvider(origin)); vpOrigin->resetTemporaryVisibility(); } @@ -407,7 +402,7 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters() void TaskPolarPatternParameters::apply() { std::vector axes; - App::DocumentObject* obj; + App::DocumentObject* obj = nullptr; getAxis(obj, axes); std::string axis = buildLinkSingleSubPythonStr(obj, axes); diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index 6bf8a836af..db96f2c84e 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -65,12 +65,12 @@ protected: private Q_SLOTS: void onUpdateViewTimer(); void onAxisChanged(int num); - void onModeChanged(const int mode); - void onCheckReverse(const bool on); - void onAngle(const double a); - void onOffset(const double a); - void onOccurrences(const uint n); - void onUpdateView(bool) override; + void onModeChanged(int mode); + void onCheckReverse(bool on); + void onAngle(double angle); + void onOffset(double offset); + void onOccurrences(uint number); + void onUpdateView(bool /*unsused*/) override; private: void setupParameterUI(QWidget* widget) override; diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index 4d7bc7ef6b..54890804da 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -75,7 +75,7 @@ void TaskScaledParameters::setupParameterUI(QWidget* widget) &TaskScaledParameters::onOccurrences); // Get the feature data - PartDesign::Scaled* pcScaled = static_cast(getObject()); + auto pcScaled = static_cast(getObject()); ui->spinFactor->bind(pcScaled->Factor); ui->spinOccurrences->setMaximum(INT_MAX); @@ -99,7 +99,7 @@ void TaskScaledParameters::updateUI() } blockUpdate = true; - PartDesign::Scaled* pcScaled = static_cast(getObject()); + auto pcScaled = static_cast(getObject()); double factor = pcScaled->Factor.getValue(); unsigned occurrences = pcScaled->Occurrences.getValue(); @@ -110,23 +110,23 @@ void TaskScaledParameters::updateUI() blockUpdate = false; } -void TaskScaledParameters::onFactor(const double f) +void TaskScaledParameters::onFactor(const double factor) { if (blockUpdate) { return; } - PartDesign::Scaled* pcScaled = static_cast(getObject()); - pcScaled->Factor.setValue(f); + auto pcScaled = static_cast(getObject()); + pcScaled->Factor.setValue(factor); recomputeFeature(); } -void TaskScaledParameters::onOccurrences(const uint n) +void TaskScaledParameters::onOccurrences(const uint number) { if (blockUpdate) { return; } - PartDesign::Scaled* pcScaled = static_cast(getObject()); - pcScaled->Occurrences.setValue(n); + auto pcScaled = static_cast(getObject()); + pcScaled->Occurrences.setValue(number); recomputeFeature(); } @@ -135,7 +135,7 @@ void TaskScaledParameters::onUpdateView(bool on) blockUpdate = !on; if (on) { // Do the same like in TaskDlgScaledParameters::accept() but without doCommand - PartDesign::Scaled* pcScaled = static_cast(getObject()); + auto pcScaled = static_cast(getObject()); pcScaled->Factor.setValue(getFactor()); pcScaled->Occurrences.setValue(getOccurrences()); recomputeFeature(); diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index a60ca00d19..a4fcfced0f 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -58,9 +58,9 @@ public: void apply() override; private Q_SLOTS: - void onFactor(const double f); - void onOccurrences(const uint n); - void onUpdateView(bool) override; + void onFactor(double factor); + void onOccurrences(uint number); + void onUpdateView(bool /*unsused*/) override; private: void setupParameterUI(QWidget* widget) override; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index 25fd674181..15c6027a75 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -81,9 +81,7 @@ TaskTransformedParameters::~TaskTransformedParameters() // make sure to remove selection gate in all cases Gui::Selection().rmvSelectionGate(); - if (proxy) { - delete proxy; - } + delete proxy; } void TaskTransformedParameters::setupUI() @@ -103,12 +101,10 @@ void TaskTransformedParameters::setupUI() &TaskTransformedParameters::onButtonRemoveFeature); // Create context menu - QAction* action = new QAction(tr("Remove"), this); + auto action = new QAction(tr("Remove"), this); action->setShortcut(QKeySequence::Delete); -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) // display shortcut behind the context menu entry action->setShortcutVisibleInContextMenu(true); -#endif ui->listWidgetFeatures->addAction(action); connect(action, &QAction::triggered, this, &TaskTransformedParameters::onFeatureDeleted); ui->listWidgetFeatures->setContextMenuPolicy(Qt::ActionsContextMenu); @@ -123,13 +119,13 @@ void TaskTransformedParameters::setupUI() &TaskTransformedParameters::onUpdateView); // Get the feature data - PartDesign::Transformed* pcTransformed = static_cast(getObject()); + auto pcTransformed = static_cast(getObject()); std::vector originals = pcTransformed->Originals.getValues(); // Fill data into dialog elements for (auto obj : originals) { if (obj) { - QListWidgetItem* item = new QListWidgetItem(); + auto item = new QListWidgetItem(); item->setText(QString::fromUtf8(obj->Label.getValue())); item->setData(Qt::UserRole, QString::fromLatin1(obj->getNameInDocument())); ui->listWidgetFeatures->addItem(item); @@ -147,10 +143,10 @@ void TaskTransformedParameters::slotDeletedObject(const Gui::ViewProviderDocumen } } -void TaskTransformedParameters::changeEvent(QEvent* e) +void TaskTransformedParameters::changeEvent(QEvent* event) { - TaskBox::changeEvent(e); - if (e->type() == QEvent::LanguageChange && proxy) { + TaskBox::changeEvent(event); + if (event->type() == QEvent::LanguageChange && proxy) { ui->retranslateUi(proxy); retranslateParameterUI(ui->featureUI); } @@ -184,7 +180,7 @@ void TaskTransformedParameters::addObject(App::DocumentObject* obj) QString label = QString::fromUtf8(obj->Label.getValue()); QString objectName = QString::fromLatin1(obj->getNameInDocument()); - QListWidgetItem* item = new QListWidgetItem(); + auto item = new QListWidgetItem(); item->setText(label); item->setData(Qt::UserRole, objectName); ui->listWidgetFeatures->addItem(item); @@ -213,10 +209,9 @@ bool TaskTransformedParameters::originalSelected(const Gui::SelectionChanges& ms // Do the same like in TaskDlgTransformedParameters::accept() but without doCommand std::vector originals = pcTransformed->Originals.getValues(); - std::vector::iterator o = - std::find(originals.begin(), originals.end(), selectedObject); + auto or_iter = std::find(originals.begin(), originals.end(), selectedObject); if (selectionMode == SelectionMode::AddFeature) { - if (o == originals.end()) { + if (or_iter == originals.end()) { originals.push_back(selectedObject); addObject(selectedObject); } @@ -225,8 +220,8 @@ bool TaskTransformedParameters::originalSelected(const Gui::SelectionChanges& ms } } else { - if (o != originals.end()) { - originals.erase(o); + if (or_iter != originals.end()) { + originals.erase(or_iter); removeObject(selectedObject); } else { @@ -257,14 +252,14 @@ void TaskTransformedParameters::setupTransaction() int tid = 0; App::GetApplication().getActiveTransaction(&tid); - if (tid && tid == transactionID) { + if (tid != 0 && tid == transactionID) { return; } // open a transaction if none is active - std::string n("Edit "); - n += obj->Label.getValue(); - transactionID = App::GetApplication().setActiveTransaction(n.c_str()); + std::string name("Edit "); + name += obj->Label.getValue(); + transactionID = App::GetApplication().setActiveTransaction(name.c_str()); } void TaskTransformedParameters::setEnabledTransaction(bool on) @@ -302,11 +297,11 @@ void TaskTransformedParameters::checkVisibility() } auto inset = feat->getInListEx(true); inset.emplace(feat); - for (auto o : body->Group.getValues()) { - if (!o->Visibility.getValue() || !o->isDerivedFrom(PartDesign::Feature::getClassTypeId())) { + for (auto obj : body->Group.getValues()) { + if (!obj->Visibility.getValue() || !obj->isDerivedFrom(PartDesign::Feature::getClassTypeId())) { continue; } - if (inset.count(o)) { + if (inset.count(obj) > 0) { break; } return; @@ -350,8 +345,7 @@ void TaskTransformedParameters::removeItemFromListWidget(QListWidget* widget, QList items = widget->findItems(itemstr, Qt::MatchExactly); if (!items.empty()) { for (auto item : items) { - QListWidgetItem* it = widget->takeItem(widget->row(item)); - delete it; + delete widget->takeItem(widget->row(item)); } } } @@ -436,15 +430,7 @@ void TaskTransformedParameters::recomputeFeature() PartDesignGui::ViewProviderTransformed* TaskTransformedParameters::getTopTransformedView() const { - PartDesignGui::ViewProviderTransformed* rv; - - if (insideMultiTransform) { - rv = parentTask->TransformedView; - } - else { - rv = TransformedView; - } - return rv; + return insideMultiTransform ? parentTask->TransformedView : TransformedView; } PartDesign::Transformed* TaskTransformedParameters::getTopTransformedObject() const @@ -464,12 +450,10 @@ PartDesign::Transformed* TaskTransformedParameters::getObject() const if (insideMultiTransform) { return parentTask->getSubFeature(); } - else if (TransformedView) { + if (TransformedView) { return static_cast(TransformedView->getObject()); } - else { - return nullptr; - } + return nullptr; } App::DocumentObject* TaskTransformedParameters::getBaseObject() const @@ -544,8 +528,8 @@ void TaskTransformedParameters::exitSelectionMode() Gui::Selection().rmvSelectionGate(); showObject(); } - catch (Base::Exception& e) { - e.ReportException(); + catch (Base::Exception& exc) { + exc.ReportException(); } } @@ -560,7 +544,7 @@ void TaskTransformedParameters::addReferenceSelectionGate(AllowSelectionFlags al void TaskTransformedParameters::indexesMoved() { - QAbstractItemModel* model = qobject_cast(sender()); + auto model = qobject_cast(sender()); if (!model) { return; } @@ -624,7 +608,7 @@ ComboLinks::ComboLinks(QComboBox& combo) _combo->clear(); } -int ComboLinks::addLink(const App::PropertyLinkSub& lnk, QString itemText) +int ComboLinks::addLink(const App::PropertyLinkSub& lnk, QString const& itemText) { if (!_combo) { return 0; @@ -639,7 +623,9 @@ int ComboLinks::addLink(const App::PropertyLinkSub& lnk, QString itemText) return linksInList.size() - 1; } -int ComboLinks::addLink(App::DocumentObject* linkObj, std::string linkSubname, QString itemText) +int ComboLinks::addLink(App::DocumentObject* linkObj, + std::string const& linkSubname, + QString const& itemText) { if (!_combo) { return 0; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index f2df569e52..821995fee7 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -85,8 +85,8 @@ public: * @param itemText * @return */ - int addLink(const App::PropertyLinkSub& lnk, QString itemText); - int addLink(App::DocumentObject* linkObj, std::string linkSubname, QString itemText); + int addLink(const App::PropertyLinkSub& lnk, QString const& itemText); + int addLink(App::DocumentObject* linkObj, std::string const& linkSubname, QString const& itemText); void clear(); App::PropertyLinkSub& getLink(int index) const; @@ -158,7 +158,7 @@ public: * instance that does it already, e.g. TaskDlgMultiTransformParameters. * By default, transactions are enabled. */ - void setEnabledTransaction(bool); + void setEnabledTransaction(bool /*unsused*/); /// Exit the selection mode of the associated task panel void exitSelectionMode(); @@ -215,10 +215,10 @@ protected: void setupTransaction(); private Q_SLOTS: - virtual void onUpdateView(bool) = 0; + virtual void onUpdateView(bool /*unsused*/) = 0; - void onButtonAddFeature(const bool checked); - void onButtonRemoveFeature(const bool checked); + void onButtonAddFeature(bool checked); + void onButtonRemoveFeature(bool checked); void onFeatureDeleted(); void indexesMoved(); @@ -255,7 +255,7 @@ private: */ PartDesign::Transformed* getTopTransformedObject() const; - void changeEvent(QEvent* e) override; + void changeEvent(QEvent* event) override; static void removeItemFromListWidget(QListWidget* widget, const QString& itemstr);