diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp index 91ae981391..6e48bdc599 100644 --- a/src/Mod/Fem/App/FemConstraint.cpp +++ b/src/Mod/Fem/App/FemConstraint.cpp @@ -197,14 +197,13 @@ void Constraint::onChanged(const App::Property* prop) App::DocumentObject::onChanged(prop); } -void Constraint::slotChangedObject(const App::DocumentObject& obj, const App::Property& prop) +void Constraint::slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) { - if (obj.isDerivedFrom() - && (prop.isDerivedFrom() || obj.isRemoving())) { - auto values = References.getValues(); - for (const auto ref : values) { + if (Obj.isDerivedFrom() + && (Prop.isDerivedFrom() || Obj.isRemoving())) { + for (const auto ref : References.getValues()) { auto v = ref->getInListEx(true); - if ((&obj == ref) || (std::find(v.begin(), v.end(), &obj) != v.end())) { + if ((&Obj == ref) || (std::ranges::find(v, &Obj) != v.end())) { this->touch(); return; } diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 05eed1749f..9802d218cc 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -521,7 +521,7 @@ std::map FemMesh::getccxVolumesByFace(const TopoDS_Face& face) const int missing_node = 0; for (int i = 0; i < 4; i++) { // search for the ID of the volume which is not part of 'element_face_nodes' - if (std::find(element_face_nodes.begin(), element_face_nodes.end(), apair.second[i]) + if (std::ranges::find(element_face_nodes, apair.second[i]) == element_face_nodes.end()) { missing_node = i + 1; break; diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp index 1bb70fe426..1e2bc4f4ac 100644 --- a/src/Mod/Fem/App/FemPostFilter.cpp +++ b/src/Mod/Fem/App/FemPostFilter.cpp @@ -826,8 +826,7 @@ void FemPostContoursFilter::refreshFields() Field.setValue(m_fields); // search if the current field is in the available ones and set it - std::vector::iterator it = - std::find(FieldsArray.begin(), FieldsArray.end(), fieldName); + const auto it = std::ranges::find(FieldsArray, fieldName); if (!fieldName.empty() && it != FieldsArray.end()) { Field.setValue(fieldName.c_str()); } @@ -884,7 +883,7 @@ void FemPostContoursFilter::refreshVectors() VectorMode.setValue(m_vectors); // apply stored name - auto it = std::find(vectorArray.begin(), vectorArray.end(), vectorName); + const auto it = std::ranges::find(vectorArray, vectorName); if (!vectorName.empty() && it != vectorArray.end()) { VectorMode.setValue(vectorName.c_str()); } @@ -1004,8 +1003,7 @@ DocumentObjectExecReturn* FemPostScalarClipFilter::execute() Scalars.setValue(m_scalarFields); // search if the current field is in the available ones and set it - std::vector::iterator it = - std::find(ScalarsArray.begin(), ScalarsArray.end(), val); + const auto it = std::ranges::find(ScalarsArray, val); if (!val.empty() && it != ScalarsArray.end()) { Scalars.setValue(val.c_str()); } @@ -1123,7 +1121,7 @@ DocumentObjectExecReturn* FemPostWarpVectorFilter::execute() Vector.setValue(m_vectorFields); // search if the current field is in the available ones and set it - std::vector::iterator it = std::find(VectorArray.begin(), VectorArray.end(), val); + const auto it = std::ranges::find(VectorArray, val); if (!val.empty() && it != VectorArray.end()) { Vector.setValue(val.c_str()); } diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp index 382ff07455..fabd68b3d8 100644 --- a/src/Mod/Fem/App/FemVTKTools.cpp +++ b/src/Mod/Fem/App/FemVTKTools.cpp @@ -1533,7 +1533,7 @@ void readResults(std::ifstream& ifstr, for (auto it = sub.begin(); it != sub.end(); it += 12, ++countScaPos) { valueFromLine(it, 12, value); // search if value is scalar or vector/matrix component - auto pos = std::find(scalarPos.begin(), scalarPos.end(), countScaPos); + auto pos = std::ranges::find(scalarPos, countScaPos); if (pos == scalarPos.end()) { vecValues.emplace_back(value); } @@ -1552,7 +1552,7 @@ void readResults(std::ifstream& ifstr, for (auto it = sub.begin(); it != sub.end(); it += 12) { valueFromLine(it, 12, value); // search if value is scalar or vector/matrix component - auto pos = std::find(scalarPos.begin(), scalarPos.end(), countScaPos); + auto pos = std::ranges::find(scalarPos, countScaPos); if (pos == scalarPos.end()) { vecValues.emplace_back(value); } diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp index fbf3eb6891..2b49edb781 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp @@ -230,9 +230,7 @@ void TaskFemConstraintContact::addToSelectionSlave() QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked")); return; } - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -279,9 +277,7 @@ void TaskFemConstraintContact::removeFromSelectionSlave() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -359,8 +355,7 @@ void TaskFemConstraintContact::addToSelectionMaster() QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked")); return; } - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); + for (auto itr = std::ranges::find(SubElements.begin(), SubElements.end(), subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), @@ -408,9 +403,7 @@ void TaskFemConstraintContact::removeFromSelectionMaster() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp index 69538df7fe..e4c490860b 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp @@ -254,8 +254,7 @@ void TaskFemConstraintDisplacement::addToSelection() App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); + for (auto itr = std::ranges::find(SubElements.begin(), SubElements.end(), subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), @@ -325,9 +324,7 @@ void TaskFemConstraintDisplacement::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp index 42d6bdbd68..86899e667a 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp @@ -124,9 +124,7 @@ void TaskFemConstraintFixed::addToSelection() ConstraintView->getObject()->getDocument()->getObject(it.getFeatName()); for (const auto& subName : subNames) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -194,9 +192,7 @@ void TaskFemConstraintFixed::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp index fedea39960..ff11970ea9 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp @@ -833,9 +833,7 @@ void TaskFemConstraintFluidBoundary::addToSelection() App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -905,9 +903,7 @@ void TaskFemConstraintFluidBoundary::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp index 41fd4079fa..236fdef904 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp @@ -139,9 +139,7 @@ void TaskFemConstraintForce::addToSelection() App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -210,9 +208,7 @@ void TaskFemConstraintForce::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp index 1afd064fd2..41651983ef 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp @@ -294,8 +294,7 @@ void TaskFemConstraintHeatflux::addToSelection() } for (const auto& subName : subNames) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); + for (auto itr = std::ranges::find(SubElements.begin(), SubElements.end(), subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), @@ -358,9 +357,7 @@ void TaskFemConstraintHeatflux::removeFromSelection() // SubElements } for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp index 66758f3a03..76cbccfc52 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp @@ -171,8 +171,7 @@ void TaskFemConstraintPlaneRotation::addToSelection() return; } } - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), @@ -231,9 +230,7 @@ void TaskFemConstraintPlaneRotation::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -248,7 +245,7 @@ void TaskFemConstraintPlaneRotation::removeFromSelection() } } } - std::sort(itemsToDel.begin(), itemsToDel.end()); + std::ranges::sort(itemsToDel); while (!itemsToDel.empty()) { Objects.erase(Objects.begin() + itemsToDel.back()); SubElements.erase(SubElements.begin() + itemsToDel.back()); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp index 508ca6d262..030cfc9c1c 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp @@ -149,9 +149,7 @@ void TaskFemConstraintPressure::addToSelection() QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked")); return; } - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -198,9 +196,7 @@ void TaskFemConstraintPressure::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -215,7 +211,7 @@ void TaskFemConstraintPressure::removeFromSelection() } } } - std::sort(itemsToDel.begin(), itemsToDel.end()); + std::ranges::sort(itemsToDel); while (!itemsToDel.empty()) { Objects.erase(Objects.begin() + itemsToDel.back()); SubElements.erase(SubElements.begin() + itemsToDel.back()); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp b/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp index a7dc00b416..70da10d875 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp @@ -289,8 +289,7 @@ void TaskFemConstraintRigidBody::addToSelection() for (size_t subIt = 0; subIt < (subNames.size()); ++subIt) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subNames[subIt]); + for (auto itr = std::ranges::find(SubElements, subNames[subIt]); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), @@ -361,8 +360,7 @@ void TaskFemConstraintRigidBody::removeFromSelection() for (size_t subIt = 0; subIt < (subNames.size()); ++subIt) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subNames[subIt]); + for (auto itr = std::ranges::find(SubElements, subNames[subIt]); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp b/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp index 1dace9d2a8..4f09a745b8 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp @@ -147,9 +147,7 @@ void TaskFemConstraintSpring::addToSelection() QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked")); return; } - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -196,9 +194,7 @@ void TaskFemConstraintSpring::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp index defc1a59c9..c989436740 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp @@ -204,9 +204,7 @@ void TaskFemConstraintTemperature::addToSelection() ConstraintView->getObject()->getDocument()->getObject(it.getFeatName()); for (const auto& subName : subNames) { // for every selected sub element bool addMe = true; - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -254,9 +252,7 @@ void TaskFemConstraintTemperature::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -271,7 +267,7 @@ void TaskFemConstraintTemperature::removeFromSelection() } } } - std::sort(itemsToDel.begin(), itemsToDel.end()); + std::ranges::sort(itemsToDel); while (!itemsToDel.empty()) { Objects.erase(Objects.begin() + itemsToDel.back()); SubElements.erase(SubElements.begin() + itemsToDel.back()); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp index 7bba532a29..d53e476f37 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp @@ -349,9 +349,7 @@ void TaskFemConstraintTransform::addToSelection() } } } - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -433,9 +431,7 @@ void TaskFemConstraintTransform::removeFromSelection() const App::DocumentObject* obj = it.getObject(); for (const auto& subName : subNames) { // for every selected sub element - for (std::vector::iterator itr = - std::find(SubElements.begin(), SubElements.end(), subName); - itr != SubElements.end(); + for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end(); itr = std::find(++itr, SubElements.end(), subName)) { // for every sub element in selection that @@ -450,7 +446,7 @@ void TaskFemConstraintTransform::removeFromSelection() } } } - std::sort(itemsToDel.begin(), itemsToDel.end()); + std::ranges::sort(itemsToDel); while (!itemsToDel.empty()) { Objects.erase(Objects.begin() + itemsToDel.back()); SubElements.erase(SubElements.begin() + itemsToDel.back()); diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp index 32b68bf036..9cd98b449d 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp @@ -430,7 +430,7 @@ void ViewProviderFemPostObject::updateProperties() m_coloringEnum.setEnums(colorArrays); Field.setValue(m_coloringEnum); - std::vector::iterator it = std::find(colorArrays.begin(), colorArrays.end(), val); + auto it = std::ranges::find(colorArrays, val); if (!val.empty() && it != colorArrays.end()) { Field.setValue(val.c_str()); } @@ -472,7 +472,7 @@ void ViewProviderFemPostObject::updateProperties() m_vectorEnum.setEnums(colorArrays); VectorMode.setValue(m_vectorEnum); - it = std::find(colorArrays.begin(), colorArrays.end(), val); + it = std::ranges::find(colorArrays, val); if (!val.empty() && it != colorArrays.end()) { VectorMode.setValue(val.c_str()); }