kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Assembly: apply std::ranges

Browse Source
This commit is contained in:
bofdahof
2025-03-12 17:47:23 +10:00
committed by Chris Hennes
parent e5b06ae736
commit c4eeaa2d11
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Assembly/App/AssemblyObject.cpp
View File

@@ -259,7 +259,7 @@ void AssemblyObject::preDrag(std::vector<App::DocumentObject*> dragParts)
draggedParts.clear();
for (auto part : dragParts) {
// make sure no duplicate
if (std::find(draggedParts.begin(), draggedParts.end(), part) != draggedParts.end()) {
if (std::ranges::find(draggedParts, part) != draggedParts.end()) {
continue;
}
@@ -1493,7 +1493,7 @@ AssemblyObject::makeMbdJoint(App::DocumentObject* joint)
std::vector<App::DocumentObject*> done;
// Add motions if needed
for (auto* motion : motions) {
if (std::find(done.begin(), done.end(), motion) != done.end()) {
if (std::ranges::find(done, motion) != done.end()) {
continue; // don't process twice (can happen in case of cylindrical)
}

4
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@@ -1061,7 +1061,7 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const
auto* subAsmLink = dynamic_cast<AssemblyLink*>(obj);
auto* link = dynamic_cast<App::Link*>(obj);
if (subAsmLink || link) {
if (std::find(objs.begin(), objs.end(), obj) == objs.end()) {
if (std::ranges::find(objs, obj) == objs.end()) {
objs.push_back(obj);
if (subAsmLink && !asmLink->isRigid()) {
addSubComponents(subAsmLink, objs);
@@ -1084,7 +1084,7 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const
}
joints = assemblyPart->getJointsOfPart(obj);
for (auto* joint : joints) {
if (std::find(objToDel.begin(), objToDel.end(), joint) == objToDel.end()) {
if (std::ranges::find(objToDel, joint) == objToDel.end()) {
objToDel.push_back(joint);
}
}