diff --git a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h index 672710715ec..e9d8ba8ded8 100644 --- a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h +++ b/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 lineSmooth; ///< Enable smooth line rendering Data pointSmooth; ///< Enable smooth point rendering - // SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06") - DeprecatedAndRemoved isEnabled; - // primitive types Data primitiveType; ///< Select types of primitives to send (necessary for some shader types such as geometry or tessellation) diff --git a/Sofa/framework/Core/src/sofa/core/VecId.h b/Sofa/framework/Core/src/sofa/core/VecId.h index 0863fc0e0ac..9d29f0d9f44 100644 --- a/Sofa/framework/Core/src/sofa/core/VecId.h +++ b/Sofa/framework/Core/src/sofa/core/VecId.h @@ -95,15 +95,6 @@ class TStandardVec return MyVecId(static_cast>(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(State::DYNAMIC_INDEX); @@ -174,23 +165,6 @@ class TStandardVec return MyVecId(static_cast>(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(State::DYNAMIC_INDEX); @@ -270,11 +244,6 @@ class TStandardVec return MyVecId(static_cast>(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(State::DYNAMIC_INDEX); diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp index d4cc43b94c2..2d7a2781d1c 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp +++ b/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")) { } diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h index 63a704eb319..76c2fc2361b 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h +++ b/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) */ /// @{ diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h index fd493afff0f..7a06c1ada0c 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h @@ -109,14 +109,6 @@ class ForceField : public BaseForceField, public virtual SingleStateAccessor value pairs virtual void parseFields ( const std::map& str ); - /// Write the current field values to the given map of name -> value pairs - SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS() - void writeDatas (std::map& 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 = " "); diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h index eafe21c81ca..f136100ced0 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h +++ b/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 - 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); diff --git a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h index a88b1ad9e1a..0ca085ca292 100644 --- a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h +++ b/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(); diff --git a/Sofa/framework/Helper/src/sofa/helper/Utils.h b/Sofa/framework/Helper/src/sofa/helper/Utils.h index b8bf1ef3b3e..438b1b684f6 100644 --- a/Sofa/framework/Helper/src/sofa/helper/Utils.h +++ b/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 diff --git a/Sofa/framework/Helper/src/sofa/helper/config.h.in b/Sofa/framework/Helper/src/sofa/helper/config.h.in index a35f4ac2374..474c18665af 100644 --- a/Sofa/framework/Helper/src/sofa/helper/config.h.in +++ b/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 diff --git a/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h b/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h index a8a70097a23..7236f9cc76f 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h +++ b/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; diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h index 883607d20c2..787e67fefd7 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h +++ b/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; diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in index 808e6f67a28..cf92b1d03a3 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in +++ b/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 diff --git a/Sofa/framework/Type/src/sofa/type/BoundingBox.cpp b/Sofa/framework/Type/src/sofa/type/BoundingBox.cpp index 05f36a8897e..15bac3cb73d 100644 --- a/Sofa/framework/Type/src/sofa/type/BoundingBox.cpp +++ b/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(); } diff --git a/Sofa/framework/Type/src/sofa/type/BoundingBox.h b/Sofa/framework/Type/src/sofa/type/BoundingBox.h index 3c6b0097647..89df6bf8176 100644 --- a/Sofa/framework/Type/src/sofa/type/BoundingBox.h +++ b/Sofa/framework/Type/src/sofa/type/BoundingBox.h @@ -80,8 +80,6 @@ class SOFA_TYPE_API BoundingBox [[nodiscard]] bool isValid() const; [[nodiscard]] bool isFlat() const; [[nodiscard]] bool isNegligible() const; // !valid || flat - SOFA_ATTRIBUTE_DISABLED__BOUNDINGBOX_TYPO() - [[nodiscard]] bool isNegligeable() const; [[nodiscard]] bool isNull() const; SReal* minBBoxPtr(); @@ -166,7 +164,7 @@ class SOFA_TYPE_API BoundingBox2D void invalidate(); bool isValid() const; bool isFlat() const; - bool isNegligeable() const; // !valid || flat + bool isNegligible() const; // !valid || flat bool isNull() const; SReal* minBBoxPtr(); @@ -236,7 +234,7 @@ class SOFA_TYPE_API BoundingBox1D void invalidate(); bool isValid() const; bool isFlat() const; - bool isNegligeable() const; // !valid || flat + bool isNegligible() const; // !valid || flat bool isNull() const; const SReal& minBBox() const; diff --git a/Sofa/framework/Type/src/sofa/type/config.h.in b/Sofa/framework/Type/src/sofa/type/config.h.in index 31e877a27d7..b34c833ba84 100644 --- a/Sofa/framework/Type/src/sofa/type/config.h.in +++ b/Sofa/framework/Type/src/sofa/type/config.h.in @@ -35,15 +35,6 @@ #endif -#ifdef SOFA_BUILD_SOFA_TYPE -#define SOFA_ATTRIBUTE_DISABLED__BOUNDINGBOX_TYPO() -#else -#define SOFA_ATTRIBUTE_DISABLED__BOUNDINGBOX_TYPO() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v24.12", "v25.06", \ - "Use isNegligible instead.") -#endif - #ifdef SOFA_BUILD_SOFA_TYPE #define SOFA_ATTRIBUTE_DEPRECATED__IS_CONTAINER() #else