[Lifecycle] v26.06 : SOFA_ATTRIBUTE_DISABLED

Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h

@@ -62,9 +62,6 @@ class SOFA_GL_COMPONENT_RENDERING3D_API OglModel : public sofa::component::visua
     Data<bool> lineSmooth; ///< Enable smooth line rendering
     Data<bool> pointSmooth; ///< Enable smooth point rendering
 
-    // SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06")
-    DeprecatedAndRemoved isEnabled;
-
     // primitive types
     Data<sofa::helper::OptionsGroup> primitiveType; ///< Select types of primitives to send (necessary for some shader types such as geometry or tessellation)
 

Sofa/framework/Core/src/sofa/core/VecId.h

@@ -95,15 +95,6 @@ class TStandardVec<V_COORD, vaccess>
         return MyVecId(static_cast<std::underlying_type_t<State>>(v_state));
     }
 
-    SOFA_ATTRIBUTE_DISABLED__POSITION()
-    static constexpr MyVecId position() = delete;
-    SOFA_ATTRIBUTE_DISABLED__REST_POSITION()
-    static constexpr MyVecId restPosition() = delete;
-    SOFA_ATTRIBUTE_DISABLED__FREE_POSITION()
-    static constexpr MyVecId freePosition() = delete;
-    SOFA_ATTRIBUTE_DISABLED__RESET_POSITION()
-    static constexpr MyVecId resetPosition() = delete;
-
     ///< This is the first index used for dynamically allocated vectors
     static constexpr uint8_t V_FIRST_DYNAMIC_INDEX = static_cast<uint8_t>(State::DYNAMIC_INDEX);
 
@@ -174,23 +165,6 @@ class TStandardVec<V_DERIV, vaccess>
         return MyVecId(static_cast<std::underlying_type_t<State>>(v_state));
     }
 
-    SOFA_ATTRIBUTE_DISABLED__VELOCITY()
-    static constexpr MyVecId velocity() = delete;
-    SOFA_ATTRIBUTE_DISABLED__RESET_VELOCITY()
-    static constexpr MyVecId resetVelocity() = delete;
-    SOFA_ATTRIBUTE_DISABLED__FREE_VELOCITY()
-    static constexpr MyVecId freeVelocity() = delete;
-    SOFA_ATTRIBUTE_DISABLED__NORMAL()
-    static constexpr MyVecId normal() = delete;
-    SOFA_ATTRIBUTE_DISABLED__FORCE()
-    static constexpr MyVecId force() = delete;
-    SOFA_ATTRIBUTE_DISABLED__EXTERNAL_FORCE()
-    static constexpr MyVecId externalForce() = delete;
-    SOFA_ATTRIBUTE_DISABLED__DX()
-    static constexpr MyVecId dx() = delete;
-    SOFA_ATTRIBUTE_DISABLED__DFORCE()
-    static constexpr MyVecId dforce() = delete;
-
     ///< This is the first index used for dynamically allocated vectors
     static constexpr uint8_t V_FIRST_DYNAMIC_INDEX = static_cast<uint8_t>(State::DYNAMIC_INDEX);
 
@@ -270,11 +244,6 @@ class TStandardVec<V_MATDERIV, vaccess>
         return MyVecId(static_cast<std::underlying_type_t<State>>(v_state));
     }
 
-    SOFA_ATTRIBUTE_DISABLED__CONSTRAINT_JACOBIAN()
-    static constexpr MyVecId constraintJacobian() = delete;
-    SOFA_ATTRIBUTE_DISABLED__MAPPING_JACOBIAN()
-    static constexpr MyVecId mappingJacobian() = delete;
-
     ///< This is the first index used for dynamically allocated vectors
     static constexpr uint8_t V_FIRST_DYNAMIC_INDEX = static_cast<uint8_t>(State::DYNAMIC_INDEX);
 

Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp

@@ -31,7 +31,6 @@ namespace sofa::core::behavior
 
 BaseForceField::BaseForceField()
     : StateAccessor()
-    , isCompliance(this, "v24.12", "v25.06", "isCompliance", "Consider the component as a compliance, else as a stiffness")
     , rayleighStiffness( initData(&rayleighStiffness, 0_sreal, "rayleighStiffness", "Rayleigh damping - stiffness matrix coefficient"))
 {
 }

Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h

@@ -175,42 +175,6 @@ class SOFA_CORE_API BaseForceField : public virtual StateAccessor
 
 
 
-    /** @name API to consider the ForceField as a constraint as in the "Compliant formulation"
-     * See [M Tournier, M Nesme, B Gilles, F Faure, Stable Constrained Dynamics, Siggraph 2015] for more details.
-     * Each ForceField may be processed either as a traditional force function, or as a compliance (provided that its stiffness matrix is invertible).
-     * If isCompliance==false then the ForceField is handled as a traditional force function.
-     * In this case, the stiffness matrix is used to set up the implicit equation matrix, while addForce is used to set up the right-hand term as usual.
-     * If isCompliance==true, the ForceField is handled as a compliance and getComplianceMatrix must return a non-null pointer for assembled solver and/or
-     * must implement addClambda for a graph-scattered (unassembled) implementation.
-     */
-    /// @{
-
-    /// Considered as compliance, else considered as stiffness (default to false)
-    SOFA_ATTRIBUTE_DISABLED__COMPLIANT()
-    objectmodel::lifecycle::RemovedData isCompliance;
-
-    /// Return a pointer to the compliance matrix C
-    /// \f$ C = K^{-1} \f$
-    SOFA_ATTRIBUTE_DISABLED__COMPLIANT()
-    virtual const sofa::linearalgebra::BaseMatrix* getComplianceMatrix(const MechanicalParams*) = delete;
-
-    /// \brief Accumulate the contribution of the C compliant matrix multiplied
-    /// by the given Lagrange multipliers lambda vector with the given cFactor coefficient.
-    ///
-    /// This method computes
-    /// \f[
-    ///            res += cFactor C \lambda
-    /// \f]
-    /// where C is the Compliant matrix (inverse of the Stiffness matrix \f$ K \f$:
-    /// \f$ C = K^{-1} \f$)
-    ///
-    SOFA_ATTRIBUTE_DISABLED__COMPLIANT()
-    virtual void addClambda(const MechanicalParams* /*mparams*/, MultiVecDerivId /*resId*/, MultiVecDerivId /*lambdaId*/, SReal /*cFactor*/ ) = delete;
-
-    /// @}
-
-
-
     /** @name Rayleigh Damping (stiffness contribution)
      */
     /// @{

Sofa/framework/Core/src/sofa/core/behavior/ForceField.h

@@ -109,14 +109,6 @@ class ForceField : public BaseForceField, public virtual SingleStateAccessor<TDa
     /// @param dx Input vector used to compute \f$ df = kFactor K dx + bFactor B dx \f$
     virtual void addDForce(const MechanicalParams* mparams, DataVecDeriv& df, const DataVecDeriv& dx ) = 0;
 
-    //This is required to tell the compiler addClambda is legitimately overloaded,
-    //and it does not hide the one from BaseForceField.
-    //To be removed once addClambda is disabled
-    using BaseForceField::addClambda;
-
-    SOFA_ATTRIBUTE_DISABLED__COMPLIANT()
-    virtual void addClambda(const MechanicalParams* mparams, DataVecDeriv& df, const DataVecDeriv& lambda, SReal cFactor ) = delete;
-
     /// Get the potential energy associated to this ForceField.
     ///
     /// Used to estimate the total energy of the system by some

Sofa/framework/Core/src/sofa/core/config.h.in

@@ -46,21 +46,6 @@
 #endif // SOFA_CORE_TOPOLOGY_ENABLE_DEPRECATION_MESSAGE
 
 
-#ifdef SOFA_BUILD_SOFA_CORE
-#define SOFA_ATTRIBUTE_DISABLED__COMPLIANT()
-#else
-#define SOFA_ATTRIBUTE_DISABLED__COMPLIANT() \
-    SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Used only by the deprecated Compliant plugin.")
-#endif
-
-#ifdef SOFA_BUILD_SOFA_CORE
-#define SOFA_ATTRIBUTE_DISABLED__UNNECESSARY_PARAMETER_IN_TYPENAME()
-#else
-#define SOFA_ATTRIBUTE_DISABLED__UNNECESSARY_PARAMETER_IN_TYPENAME() \
-    SOFA_ATTRIBUTE_DISABLED( \
-        "v24.12", "v25.06", \
-        "The parameter is not necessary. Use the function without parameter.")
-#endif
 
 #ifdef SOFA_BUILD_SOFA_CORE
 #define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT()
@@ -69,13 +54,6 @@
     SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.")
 #endif
 
-#ifdef SOFA_BUILD_SOFA_CORE
-#define SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS()
-#else
-#define SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS() \
-    SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "This function is not used.")
-#endif
-
 
 #ifdef SOFA_BUILD_SOFA_CORE
 #define SOFA_ATTRIBUTE_DISABLED__DELETED_ARGUMENTS()
@@ -92,47 +70,6 @@
 SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Use getContactDistance or setContactDistance instead.")
 #endif
 
-#ifdef SOFA_BUILD_SOFA_CORE
-
-    #define SOFA_ATTRIBUTE_DISABLED__POSITION()
-    #define SOFA_ATTRIBUTE_DISABLED__REST_POSITION()
-    #define SOFA_ATTRIBUTE_DISABLED__FREE_POSITION()
-    #define SOFA_ATTRIBUTE_DISABLED__RESET_POSITION()
-
-    #define SOFA_ATTRIBUTE_DISABLED__VELOCITY()
-    #define SOFA_ATTRIBUTE_DISABLED__RESET_VELOCITY()
-    #define SOFA_ATTRIBUTE_DISABLED__FREE_VELOCITY()
-    #define SOFA_ATTRIBUTE_DISABLED__NORMAL()
-    #define SOFA_ATTRIBUTE_DISABLED__FORCE()
-    #define SOFA_ATTRIBUTE_DISABLED__EXTERNAL_FORCE()
-    #define SOFA_ATTRIBUTE_DISABLED__DX()
-    #define SOFA_ATTRIBUTE_DISABLED__DFORCE()
-
-    #define SOFA_ATTRIBUTE_DISABLED__CONSTRAINT_JACOBIAN()
-    #define SOFA_ATTRIBUTE_DISABLED__MAPPING_JACOBIAN()
-
-#else
-
-    #define SOFA_ATTRIBUTE_DISABLED__POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::position  or sofa::core::vec_id::write_access::position instead")
-    #define SOFA_ATTRIBUTE_DISABLED__REST_POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::restPosition  or sofa::core::vec_id::write_access::restPosition instead")
-    #define SOFA_ATTRIBUTE_DISABLED__FREE_POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::freePosition  or sofa::core::vec_id::write_access::freePosition instead")
-    #define SOFA_ATTRIBUTE_DISABLED__RESET_POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::resetPosition  or sofa::core::vec_id::write_access::resetPosition instead")
-
-    #define SOFA_ATTRIBUTE_DISABLED__VELOCITY() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::velocity  or sofa::core::vec_id::write_access::velocity instead")
-    #define SOFA_ATTRIBUTE_DISABLED__RESET_VELOCITY() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::resetVelocity  or sofa::core::vec_id::write_access::resetVelocity instead")
-    #define SOFA_ATTRIBUTE_DISABLED__FREE_VELOCITY() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::freeVelocity  or sofa::core::vec_id::write_access::freeVelocity instead")
-    #define SOFA_ATTRIBUTE_DISABLED__NORMAL() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::normal  or sofa::core::vec_id::write_access::normal instead")
-    #define SOFA_ATTRIBUTE_DISABLED__FORCE() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::force  or sofa::core::vec_id::write_access::force instead")
-    #define SOFA_ATTRIBUTE_DISABLED__EXTERNAL_FORCE() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::externalForce  or sofa::core::vec_id::write_access::externalForce instead")
-    #define SOFA_ATTRIBUTE_DISABLED__DX() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::dx  or sofa::core::vec_id::write_access::dx instead")
-    #define SOFA_ATTRIBUTE_DISABLED__DFORCE() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::dforce  or sofa::core::vec_id::write_access::dforce instead")
-
-    #define SOFA_ATTRIBUTE_DISABLED__CONSTRAINT_JACOBIAN() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::constraintJacobian  or sofa::core::vec_id::write_access::constraintJacobian instead")
-    #define SOFA_ATTRIBUTE_DISABLED__MAPPING_JACOBIAN() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::mappingJacobian  or sofa::core::vec_id::write_access::mappingJacobian instead")
-
-#endif
-
-
 #ifdef SOFA_BUILD_SOFA_CORE
 #define SOFA_ATTRIBUTE_DEPRECATED__TOBASECONSTRAINT()
 #else

Sofa/framework/Core/src/sofa/core/objectmodel/Base.h

@@ -176,10 +176,6 @@ class SOFA_CORE_API Base : public IntrusiveObject
     /// Assign the field values stored in the given map of name -> value pairs
     virtual void parseFields ( const std::map<std::string,std::string*>& str );
 
-    /// Write the current field values to the given map of name -> value pairs
-    SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS()
-    void writeDatas (std::map<std::string,std::string*>& str) = delete;
-
     /// Write the current field values to the given output stream
     /// separated with the given separator (" " used by default for XML)
     void writeDatas (std::ostream& out, const std::string& separator = " ");

Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h

@@ -298,9 +298,6 @@ class SOFA_CORE_API BaseData : public DDGNode
         return decodeTypeName(typeid(T));
     }
 
-    template<class T>
-    SOFA_ATTRIBUTE_DISABLED__UNNECESSARY_PARAMETER_IN_TYPENAME() static std::string typeName(const T*) = delete;
-
 protected:
     /// Try to update this Data from the value of its parent in "fast mode";
     bool genericCopyValueFrom(const BaseData* parent);

Sofa/framework/Core/src/sofa/core/visual/VisualModel.h

@@ -63,20 +63,11 @@ class SOFA_CORE_API VisualModel : public virtual objectmodel::BaseObject
      */
     void initVisual(const VisualParams* /*vparams*/);
 
-    // Deprecate the usage of initVisual()
-    // But the final keyword will break the compilation if one does override initVisual anyway.
-    SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use initVisual(const VisualParams*) instead")
-    virtual void initVisual() = delete;
-
     /**
      *  \brief used to update the model if necessary.
      *
      */
     void updateVisual(const VisualParams* /*vparams*/);
-    // Deprecate the usage of updateVisual()
-    // But the final keyword will break the compilation if one does override updateVisual() anyway.
-    SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use updateVisual(const VisualParams*) instead")
-    virtual void updateVisual() = delete;
 
 protected:
     VisualModel();

Sofa/framework/Helper/src/sofa/helper/Utils.h

@@ -36,25 +36,6 @@ class SOFA_HELPER_API Utils
 {
 public:
 
-/// @brief Convert a string to a wstring.
-///
-/// @return The converted string on success, or a empty string on failure.
-SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED()
-static std::wstring widenString(const std::string& s) = delete;
-
-/// @brief Convert a wstring to a string.
-///
-/// @return The converted string on success, or a empty string on failure.
-SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED()
-static std::string narrowString(const std::wstring& ws) = delete;
-
-/// @brief Convert a string to lower case.
-SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED()
-static std::string downcaseString(const std::string& s) = delete;
-
-/// @brief Convert a string to upper case.
-SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED()
-static std::string upcaseString(const std::string& s) = delete;
 
 #if defined WIN32
 

Sofa/framework/Helper/src/sofa/helper/config.h.in

@@ -41,19 +41,6 @@
 #endif
 
 
-
-#define SOFA_ATTRIBUTE_DISABLED__PLUGIN_GETCOMPONENTLIST() \
-    SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06",  \
-    "Using entrypoint GetComponentList() from a plugin has been deprecated. Use the helper function listClassesFromTarget() from ObjectFactory instead.")
-
-#ifdef SOFA_BUILD_SOFA_HELPER
-#define SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED()
-#else
-#define SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() \
-    SOFA_ATTRIBUTE_DISABLED( \
-    "v24.12", "v25.06", "This function is now in StringUtils.h")
-#endif // SOFA_BUILD_SOFA_HELPER
-
 #ifdef SOFA_BUILD_SOFA_HELPER
 #define SOFA_HELPER_FILESYSTEM_FINDORCREATEAVALIDPATH_DISABLED()
 #else

Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h

@@ -98,8 +98,6 @@ class SOFA_HELPER_API Plugin
         typedef const char* (*FuncPtr) ();
         FuncPtr func;
 
-        SOFA_ATTRIBUTE_DISABLED__PLUGIN_GETCOMPONENTLIST()
-        const char* operator() () const = delete;
         GetModuleComponentList():func(nullptr) {}
     } GetModuleComponentList;
 

Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h

@@ -144,14 +144,6 @@ class SOFA_SIMULATION_CORE_API MechanicalOperations
 
     /// @}
 
-
-    SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKDX()
-    void addMBKdx(core::MultiVecDerivId df, SReal m, SReal b, SReal k, bool clear = true, bool accumulate = true) = delete;
-    SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKV()
-    void addMBKv(core::MultiVecDerivId df, SReal m, SReal b, SReal k, bool clear = true, bool accumulate = true) = delete;
-    SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER()
-    void setSystemMBKMatrix(SReal mFact, SReal bFact, SReal kFact, core::behavior::LinearSolver* linearSolver) = delete;
-
 protected:
     VisitorExecuteFunc executeVisitor;
 

Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in

@@ -33,31 +33,6 @@
 #endif
 
 
-
-#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
-#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKDX()
-#else
-#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKDX() \
-    SOFA_ATTRIBUTE_DISABLED( \
-    "v24.12", "v25.06", "Use the other addMBKdx overload instead.")
-#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
-
-#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
-#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKV()
-#else
-#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKV() \
-    SOFA_ATTRIBUTE_DISABLED( \
-    "v24.12", "v25.06", "Use the other addMBKv overload instead.")
-#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
-
-#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
-#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER()
-#else
-#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() \
-    SOFA_ATTRIBUTE_DISABLED( \
-    "v24.12", "v25.06", "Use the other setSystemMBKMatrix overload instead.")
-#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
-
 #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
 #define SOFA_ATTRIBUTE_DEPRECATED_ANIMATEVISITOR()
 #else

Sofa/framework/Type/src/sofa/type/BoundingBox.cpp

@@ -48,11 +48,6 @@ bool BoundingBox::isNegligible() const
            minBBox().z() >= maxBBox().z();
 }
 
-bool BoundingBox::isNegligeable() const
-{
-    return isNegligible();
-}
-
 bool BoundingBox::isValid() const
 {
     return minBBox().x() <= maxBBox().x() &&
@@ -301,7 +296,7 @@ void BoundingBox2D::invalidate()
     this->m_bbox = make_neutralBBox2D();
 }
 
-bool BoundingBox2D::isNegligeable() const
+bool BoundingBox2D::isNegligible() const
 {
     return minBBox().x() >= maxBBox().x() &&
            minBBox().y() >= maxBBox().y();
@@ -522,7 +517,7 @@ void BoundingBox1D::invalidate()
     this->m_bbox = make_neutralBBox1D();
 }
 
-bool BoundingBox1D::isNegligeable() const
+bool BoundingBox1D::isNegligible() const
 {
     return minBBox() >= maxBBox();
 }