Merge pull request #215 from fredroy/follow_sofa_2606

[All] Lifecycle for v26.06

Author: hugtalbot

BeamAdapter_test/component/controller/AdaptiveBeamController_test.cpp

@@ -20,7 +20,7 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #include <gtest/gtest.h>
-#include <sofa/simulation/graph/DAGNode.h>
+#include <sofa/simulation/Node.h>
 #include <sofa/simpleapi/SimpleApi.h>
 #include <sofa/core/ObjectFactory.h>
 

src/BeamAdapter/component/controller/AdaptiveBeamController.h

@@ -37,8 +37,6 @@
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
 #include <sofa/component/controller/MechanicalStateController.h>
 #include <sofa/component/constraint/projective/FixedProjectiveConstraint.h>
-#include <sofa/component/collision/geometry/PointModel.h>
-#include <sofa/component/collision/geometry/LineModel.h>
 
 #include <BeamAdapter/component/BeamInterpolation.h>
 #include <sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.h>

src/BeamAdapter/component/controller/InterventionalRadiologyController.h

@@ -38,8 +38,6 @@
 #include <sofa/defaulttype/SolidTypes.h>
 #include <sofa/component/constraint/projective/FixedProjectiveConstraint.h>
 #include <sofa/core/DataEngine.h>
-#include <sofa/component/collision/geometry/PointModel.h>
-#include <sofa/component/collision/geometry/LineModel.h>
 
 #include <BeamAdapter/utils/BeamActions.h>
 #include <BeamAdapter/component/WireBeamInterpolation.h>

src/BeamAdapter/component/controller/SutureController.h

@@ -38,8 +38,6 @@
 #include <sofa/helper/set.h>
 
 #include <sofa/component/controller/MechanicalStateController.h>
-#include <sofa/component/collision/geometry/PointModel.h>
-#include <sofa/component/collision/geometry/LineModel.h>
 #include <sofa/defaulttype/RigidTypes.h>
 
 #include <BeamAdapter/component/WireBeamInterpolation.h>

src/BeamAdapter/component/mapping/AdaptiveBeamMapping.inl

@@ -44,8 +44,8 @@
 #include <sofa/core/ConstraintParams.h>
 #include <sofa/core/MechanicalParams.h>
 
-#include <sofa/simulation/ParallelForEach.h>
-#include <sofa/simulation/MainTaskSchedulerFactory.h>
+#include <sofa/simulation/task/ParallelForEach.h>
+#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
 
 namespace beamadapter
 {