sofa-framework · fredroy · Mar 26, 2025 · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025
diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h
@@ -52,18 +52,6 @@ namespace sofa::component::constraint::lagrangian::solver
 namespace sofa::component::animationloop
 {
 
-using MechanicalGetConstraintResolutionVisitor
-SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor instead.")
-= sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor;
-
-using MechanicalSetConstraint
-SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix instead.")
-= sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix;
-
-using MechanicalAccumulateConstraint2
-SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv instead.")
-= sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv;
-
 class SOFA_COMPONENT_ANIMATIONLOOP_API ConstraintProblem
 {
 protected:

diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.cpp b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.cpp
@@ -78,8 +78,6 @@ FreeMotionAnimationLoop::FreeMotionAnimationLoop() :
 {
     d_parallelCollisionDetectionAndFreeMotion.setGroup("Multithreading");
     d_parallelODESolving.setGroup("Multithreading");
-
-    m_solveVelocityConstraintFirst.setOriginalData(&d_solveVelocityConstraintFirst);
 }
 
 FreeMotionAnimationLoop::~FreeMotionAnimationLoop()
@@ -173,7 +171,7 @@ void FreeMotionAnimationLoop::step(const sofa::core::ExecParams* params, SReal d
     cparams.setV(freeVel);
     cparams.setDx(l_constraintSolver->getDx());
     cparams.setLambda(l_constraintSolver->getLambda());
-    cparams.setOrder(m_solveVelocityConstraintFirst.getValue() ? core::ConstraintOrder::VEL : core::ConstraintOrder::POS_AND_VEL);
+    cparams.setOrder(d_solveVelocityConstraintFirst.getValue() ? core::ConstraintOrder::VEL : core::ConstraintOrder::POS_AND_VEL);
 
     MultiVecDeriv dx(&vop, core::vec_id::write_access::dx);
     dx.realloc(&vop, !d_threadSafeVisitor.getValue(), true);

diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h
@@ -24,7 +24,6 @@
 
 #include <sofa/simulation/CollisionAnimationLoop.h>
 #include <sofa/core/MultiVecId.h>
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
 
 namespace sofa::core::behavior
 {
@@ -43,10 +42,6 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API FreeMotionAnimationLoop : public sofa::si
     void step (const sofa::core::ExecParams* params, SReal dt) override;
     void init() override;
 
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> m_solveVelocityConstraintFirst;
-
     Data<bool> d_solveVelocityConstraintFirst; ///< solve separately velocity constraint violations before position constraint violations
     Data<bool> d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField.
     Data<bool> d_parallelCollisionDetectionAndFreeMotion; ///< If true, executes free motion step and collision detection step in parallel.

diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.cpp b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.cpp
@@ -53,8 +53,6 @@ MultiStepAnimationLoop::MultiStepAnimationLoop() :
       d_collisionSteps( initData(&d_collisionSteps,1,"collisionSteps", "number of collision steps between each frame rendering") )
     , d_integrationSteps( initData(&d_integrationSteps,1,"integrationSteps", "number of integration steps between each collision detection") )
 {
-    collisionSteps.setOriginalData(&d_collisionSteps);
-    integrationSteps.setOriginalData(&d_integrationSteps);
 }
 
 MultiStepAnimationLoop::~MultiStepAnimationLoop()

diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h
@@ -25,7 +25,6 @@
 
 #include <sofa/core/behavior/BaseAnimationLoop.h>
 #include <sofa/simulation/CollisionAnimationLoop.h>
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
 
 namespace sofa::component::animationloop
 {
@@ -42,12 +41,6 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API MultiStepAnimationLoop : public sofa::sim
 public:
     void step (const sofa::core::ExecParams* params, SReal dt) override;
 
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
-    sofa::core::objectmodel::lifecycle::RenamedData<int> collisionSteps;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
-    sofa::core::objectmodel::lifecycle::RenamedData<int> integrationSteps;
-
     Data<int> d_collisionSteps; ///< number of collision steps between each frame rendering
     Data<int> d_integrationSteps; ///< number of integration steps between each collision detection
 };

diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in
@@ -31,24 +31,6 @@
 #  define SOFA_COMPONENT_ANIMATIONLOOP_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP
-#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
-#else
-#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() \
-    SOFA_ATTRIBUTE_DEPRECATED( \
-        "v24.06", "v24.12", \
-        "Data renamed according to the guidelines")
-#endif
-
-#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP
-#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg)
-#else
-#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg) \
-    SOFA_ATTRIBUTE_DEPRECATED( \
-        "v24.06", "v24.12", \
-        msg)
-#endif
-
 namespace sofa::component::animationloop
 {
 	constexpr const char* MODULE_NAME = "@PROJECT_NAME@";

diff --git a/...ction/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.cpp b/...ction/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.cpp
@@ -37,9 +37,6 @@ void registerBruteForceBroadPhase(sofa::core::ObjectFactory* factory)
 BruteForceBroadPhase::BruteForceBroadPhase()
         : d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored"))
 {
-
-    box.setOriginalData (&d_box);
-
 }
 
 void BruteForceBroadPhase::init()

diff --git a/...tection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h b/...tection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h
@@ -24,7 +24,6 @@
 #include <sofa/component/collision/detection/algorithm/config.h>
 #include <sofa/core/collision/BroadPhaseDetection.h>
 #include <sofa/component/collision/geometry/CubeModel.h>
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
 
 namespace sofa::component::collision::detection::algorithm
 {
@@ -49,10 +48,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceBroadPhase : pu
     ~BruteForceBroadPhase() override = default;
 
 private:
-    ///< if not empty, objects that do not intersect this bounding-box will be ignored
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
-    sofa::core::objectmodel::lifecycle::RenamedData<type::fixed_array<sofa::type::Vec3, 2> > box;
-
     Data<type::fixed_array<sofa::type::Vec3, 2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
 
 

diff --git a/...ollision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp b/...ollision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp
@@ -132,7 +132,6 @@ IncrSAP::IncrSAP()
     :d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored")),
       _nothing_added(true)
 {
-    box.setOriginalData ( &d_box);
 }
 
 

diff --git a/.../Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h b/.../Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h
@@ -42,9 +42,6 @@
 #include <map>
 #include <deque>
 
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
-
-
 namespace sofa::component::collision::detection::algorithm
 {
 
@@ -211,12 +208,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP :
      */
     void purge();
 
-    SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA()
-    core::objectmodel::lifecycle::DeprecatedData bDraw {this, "v24.06", "v24.12", "draw", "This Data was not used"};
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
-    sofa::core::objectmodel::lifecycle::RenamedData< type::fixed_array<type::Vec3,2> > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
-
     Data< type::fixed_array<type::Vec3,2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
 
     collision::geometry::CubeCollisionModel::SPtr boxModel;
@@ -254,10 +245,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP :
     ~IncrSAP() override;
 
 public:
-
-    SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA()
-    void setDraw(bool) {}
-
     void init() override;
     void reinit() override;
 

diff --git a/...ollision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in b/...ollision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in
@@ -31,24 +31,6 @@
 #  define SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM
-#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
-#else
-#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() \
-    SOFA_ATTRIBUTE_DEPRECATED(\
-        "v24.06", "v24.12",\
-        "data renamed according to the guidelines")
-#endif
-
-#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM
-#define SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA()
-#else
-#define SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA() \
-    SOFA_ATTRIBUTE_DEPRECATED(\
-        "v24.06", "v24.12",\
-        "This Data was not used")
-#endif
-
 namespace sofa::component::collision::detection::algorithm
 {
 	constexpr const char* MODULE_NAME = "@PROJECT_NAME@";

diff --git a/...section/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp b/...section/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp
@@ -32,9 +32,6 @@ BaseProximityIntersection::BaseProximityIntersection()
 {
     d_alarmDistance.setRequired(true);
     d_contactDistance.setRequired(true);
-
-    alarmDistance.setOriginalData(&d_alarmDistance);
-    contactDistance.setOriginalData(&d_contactDistance);
 }
 
 

diff --git a/...ersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h b/...ersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h
@@ -25,9 +25,6 @@
 #include <sofa/component/collision/detection/intersection/DiscreteIntersection.h>
 #include <sofa/component/collision/geometry/CubeModel.h>
 
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
-
-
 namespace sofa::component::collision::detection::intersection
 {
 
@@ -40,12 +37,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API BaseProximityIntersect
 {
 public:
     SOFA_ABSTRACT_CLASS(BaseProximityIntersection,DiscreteIntersection);
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<SReal> alarmDistance;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<SReal> contactDistance;
-
 
     Data<SReal> d_alarmDistance; ///< Distance above which the intersection computations ignores the proximity pair. This distance can also be used in some broad phase algorithms to reduce the search area
     Data<SReal> d_contactDistance; ///< Distance below which a contact is created

diff --git a/...ion/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.cpp b/...ion/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.cpp
@@ -58,10 +58,6 @@ LocalMinDistance::LocalMinDistance()
     , d_coneFactor(initData(&d_coneFactor, 0.5, "coneFactor", "Factor for filtering cone angle computation"))
     , d_useLMDFilters(initData(&d_useLMDFilters, false, "useLMDFilters", "Use external cone computation"))
 {
-    filterIntersection.setOriginalData(&d_filterIntersection);
-    angleCone.setOriginalData(&d_angleCone);
-    coneFactor.setOriginalData(&d_coneFactor);
-    useLMDFilters.setOriginalData(&d_useLMDFilters);
 }
 
 void LocalMinDistance::init()

diff --git a/...ction/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h b/...ction/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h
@@ -31,8 +31,6 @@
 #include <sofa/component/collision/geometry/CubeModel.h>
 #include <sofa/component/collision/geometry/RayModel.h>
 
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
-
 namespace sofa::component::collision::detection::intersection
 {
 
@@ -63,19 +61,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API LocalMinDistance : pub
 
     typedef core::collision::IntersectorFactory<LocalMinDistance> IntersectorFactory;
 
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> filterIntersection;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<double> angleCone;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<double> coneFactor;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> useLMDFilters;
-
-
     Data<bool> d_filterIntersection; ///< Activate LMD filter
     Data<double> d_angleCone; ///< Filtering cone extension angle
     Data<double> d_coneFactor; ///< Factor for filtering cone angle computation

diff --git a/...rsection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.cpp b/...rsection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.cpp
@@ -53,11 +53,6 @@ MinProximityIntersection::MinProximityIntersection()
     , d_useLinePoint(initData(&d_useLinePoint, true, "useLinePoint", "activate Line-Point intersection tests"))
     , d_useLineLine(initData(&d_useLineLine, true, "useLineLine", "activate Line-Line  intersection tests"))
 {
-    useSphereTriangle.setOriginalData(&d_useSphereTriangle);
-    usePointPoint.setOriginalData(&d_usePointPoint);
-    useLinePoint.setOriginalData(&d_useLinePoint);
-    useLineLine.setOriginalData(&d_useLineLine);
-    useSurfaceNormals.setOriginalData(&d_useSurfaceNormals);
 }
 
 void MinProximityIntersection::init()

diff --git a/...tersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h b/...tersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h
@@ -24,8 +24,6 @@
 
 #include <sofa/component/collision/detection/intersection/BaseProximityIntersection.h>
 
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
-
 namespace sofa::component::collision::detection::intersection
 {
 
@@ -56,22 +54,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API MinProximityIntersecti
 {
 public:
     SOFA_CLASS(MinProximityIntersection,BaseProximityIntersection);
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> useSphereTriangle;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> usePointPoint;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> useSurfaceNormals;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> useLinePoint;
-
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> useLineLine;
-
-
 
     Data<bool> d_useSphereTriangle; ///< activate Sphere-Triangle intersection tests
     Data<bool> d_usePointPoint; ///< activate Point-Point intersection tests

diff --git a/...rsection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp b/...rsection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp
@@ -48,7 +48,6 @@ NewProximityIntersection::NewProximityIntersection()
     : BaseProximityIntersection()
     , d_useLineLine(initData(&d_useLineLine, false, "useLineLine", "Line-line collision detection enabled"))
 {
-    useLineLine.setOriginalData(&d_useLineLine);
 }
 
 void NewProximityIntersection::init()

diff --git a/...tersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h b/...tersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h
@@ -26,8 +26,6 @@
 
 #include <sofa/component/collision/geometry/CubeModel.h>
 
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
-
 namespace sofa::component::collision::detection::intersection
 {
 
@@ -57,8 +55,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API NewProximityIntersecti
 {
 public:
     SOFA_CLASS(NewProximityIntersection,BaseProximityIntersection);
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> useLineLine;
 
     Data<bool> d_useLineLine; ///< Line-line collision detection enabled
 

diff --git a/...on/Detection/Intersection/src/sofa/component/collision/detection/intersection/config.h.in b/...on/Detection/Intersection/src/sofa/component/collision/detection/intersection/config.h.in
@@ -43,11 +43,3 @@ namespace sofa::component::collision::detection::intersection
 #define SOFA_ATTRIBUTE_DISABLED__COLLISION_DETECTION_INTERSECTION_AS_PARAMETER() \
     SOFA_ATTRIBUTE_DISABLED("v24.06", "v24.12", "Intersection detection methods now needs the Intersection method as a parameter (see PR4916).")
 #endif
-
-#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION
-#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
-#else
-#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() \
-    SOFA_ATTRIBUTE_DEPRECATED("v24.06", "v24.12", \
-    "Data renamed according to the guidelines")
-#endif
diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h
@@ -27,9 +27,6 @@
 #include <sofa/core/topology/BaseMeshTopology.h>
 #include <sofa/defaulttype/VecTypes.h>
 
-#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
-
-
 namespace sofa::component::collision::geometry
 {
 
@@ -144,10 +141,6 @@ public :
 
     int getLineFlags(sofa::Index i);
 
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> bothSide;
-
-
     Data<bool> d_bothSide; ///< activate collision on both side of the line model (when surface normals are defined on these lines)
 
     /// Pre-construction check method called by ObjectFactory.
@@ -171,10 +164,6 @@ public :
 
     void computeBBox(const core::ExecParams* params, bool onlyVisible) override;
 
-    SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
-    sofa::core::objectmodel::lifecycle::RenamedData<bool> m_displayFreePosition;
-
-
     Data<bool> d_displayFreePosition; ///< Display Collision Model Points free position(in green)
 
     /// Link to be set to the topology container in the component graph.
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,7 +132,6 @@ IncrSAP::IncrSAP() @@
         :d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored")),
           _nothing_added(true)
     {
-        box.setOriginalData ( &d_box);
     }
@@ Expand Down @@