From 192ae4a1520625c32dc160216e7976c38b2786e1 Mon Sep 17 00:00:00 2001 From: bofdahof <172177156+bofdahof@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:47:23 +1000 Subject: [PATCH] Assembly: apply std::ranges --- src/Mod/Assembly/App/AssemblyObject.cpp | 4 ++-- src/Mod/Assembly/Gui/ViewProviderAssembly.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Assembly/App/AssemblyObject.cpp b/src/Mod/Assembly/App/AssemblyObject.cpp index 438dc99332..3c3b20d21e 100644 --- a/src/Mod/Assembly/App/AssemblyObject.cpp +++ b/src/Mod/Assembly/App/AssemblyObject.cpp @@ -259,7 +259,7 @@ void AssemblyObject::preDrag(std::vector 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 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) } diff --git a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp index b9a59e29a0..af793beb07 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp @@ -1061,7 +1061,7 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const auto* subAsmLink = dynamic_cast(obj); auto* link = dynamic_cast(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); } }