From 072628a8cf484f71a3d79fd72a494e1a6db1737d Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Wed, 11 Mar 2026 08:04:55 +0100 Subject: [PATCH 1/2] [all] Replace `BaseObject::canCreate` by `BaseComponent::canCreate` --- .../src/sofa/component/collision/geometry/LineCollisionModel.h | 2 +- .../src/sofa/component/collision/geometry/PointCollisionModel.h | 2 +- .../sofa/component/collision/geometry/SphereCollisionModel.h | 2 +- .../sofa/component/collision/geometry/TriangleCollisionModel.h | 2 +- .../sofa/component/collision/response/contact/ContactListener.h | 2 +- .../Engine/Select/src/sofa/component/engine/select/PairBoxRoi.h | 2 +- .../Engine/Select/src/sofa/component/engine/select/PlaneROI.h | 2 +- .../Select/src/sofa/component/engine/select/ProximityROI.h | 2 +- .../Select/src/sofa/component/engine/select/SubsetTopology.h | 2 +- .../src/sofa/component/engine/select/ValuesFromPositions.h | 2 +- .../Haptics/src/sofa/component/haptics/LCPForceFeedback.h | 2 +- .../IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h | 2 +- .../linearsolver/preconditioner/PrecomputedWarpPreconditioner.h | 2 +- .../Playback/src/sofa/component/playback/CompareState.h | 2 +- .../Playback/src/sofa/component/playback/CompareTopology.h | 2 +- Sofa/Component/Playback/src/sofa/component/playback/ReadState.h | 2 +- .../Playback/src/sofa/component/playback/ReadTopology.h | 2 +- .../Component/Playback/src/sofa/component/playback/WriteState.h | 2 +- .../Playback/src/sofa/component/playback/WriteTopology.h | 2 +- .../topology/container/dynamic/PointSetGeometryAlgorithms.h | 2 +- .../component/topology/utility/TopologicalChangeProcessor.h | 2 +- .../Core/src/sofa/core/behavior/ConstraintCorrection.h | 2 +- Sofa/framework/Core/src/sofa/core/behavior/ForceField.h | 2 +- .../Core/src/sofa/core/behavior/LagrangianConstraint.h | 2 +- .../Core/src/sofa/core/behavior/ProjectiveConstraintSet.h | 2 +- Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h | 2 +- .../src/BulletCollisionDetection/BulletConvexHullModel.h | 2 +- .../src/CollisionOBBCapsule/geometry/CapsuleModel.h | 2 +- .../src/CollisionOBBCapsule/geometry/OBBModel.h | 2 +- .../src/CollisionOBBCapsule/geometry/RigidCapsuleModel.h | 2 +- .../src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineCollisionModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineCollisionModel.h index 74abc94531b..374569733fa 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineCollisionModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineCollisionModel.h @@ -151,7 +151,7 @@ public : "' found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } sofa::core::topology::BaseMeshTopology* getCollisionTopology() override diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointCollisionModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointCollisionModel.h index 91cebd69ee8..e5ebbec02ba 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointCollisionModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointCollisionModel.h @@ -116,7 +116,7 @@ class PointCollisionModel : public core::CollisionModel "' found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } void computeBBox(const core::ExecParams* params, bool onlyVisible) override; diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereCollisionModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereCollisionModel.h index 8df2d72d4eb..6ba48175cde 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereCollisionModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereCollisionModel.h @@ -134,7 +134,7 @@ class SphereCollisionModel : public core::CollisionModel return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } template diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleCollisionModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleCollisionModel.h index 67673bb5100..712c6db49f6 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleCollisionModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleCollisionModel.h @@ -207,7 +207,7 @@ class TriangleCollisionModel : public core::CollisionModel "' found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } void computeBBox(const core::ExecParams* params, bool onlyVisible=false) override; diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h index 0c5b69de8eb..31833508a30 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h @@ -104,7 +104,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API ContactListener : public vir return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } template diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PairBoxRoi.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PairBoxRoi.h index 13baee0a15a..97c25dccb20 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PairBoxRoi.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PairBoxRoi.h @@ -84,7 +84,7 @@ class PairBoxROI : public core::DataEngine } } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected: diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PlaneROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PlaneROI.h index 9be580b4578..5c2b9a1bb67 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PlaneROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/PlaneROI.h @@ -88,7 +88,7 @@ class PlaneROI : public core::DataEngine } } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected: diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h index 885ae2908a3..fd831fc878a 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h @@ -82,7 +82,7 @@ class ProximityROI : public core::DataEngine } } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } public: diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SubsetTopology.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SubsetTopology.h index eb9dcecde3f..cf25d0d02f9 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SubsetTopology.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SubsetTopology.h @@ -89,7 +89,7 @@ class SubsetTopology : public core::DataEngine } } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected: diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromPositions.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromPositions.h index 4b644b37295..0865772ca9b 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromPositions.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromPositions.h @@ -86,7 +86,7 @@ class ValuesFromPositions : public core::DataEngine } } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected: diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h index 739924ee13a..13f27e86b36 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h @@ -104,7 +104,7 @@ class LCPForceFeedback : public MechanicalStateForceFeedback return false; } - return core::objectmodel::BaseObject::canCreate(obj, context, arg); + return core::objectmodel::sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /// Override method to lock or unlock the force feedback computation. According to parameter, value == true (resp. false) will lock (resp. unlock) mutex @sa lockForce diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h index 785dbfc659b..b9ad9aff559 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h @@ -105,7 +105,7 @@ class SOFA_COMPONENT_IO_MESH_API BlenderExporter: public sofa::simulation::BaseS "' found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } }; diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h index 74ae12683ac..d4ed9d23129 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h @@ -141,7 +141,7 @@ class PrecomputedWarpPreconditioner : public sofa::component::linearsolver::Matr arg->logError(std::string("No mechanical state with the datatype '") + TDataTypes::Name() + "' found in the context node."); return false; } - return sofa::core::objectmodel::BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected : diff --git a/Sofa/Component/Playback/src/sofa/component/playback/CompareState.h b/Sofa/Component/Playback/src/sofa/component/playback/CompareState.h index 3d85f2e450a..7061d38a0d2 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/CompareState.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/CompareState.h @@ -57,7 +57,7 @@ class SOFA_COMPONENT_PLAYBACK_API CompareState: public ReadState arg->logError("No mechanical state found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /// Return the total errors (position and velocity) diff --git a/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.h index f96da0cb725..2ed31ee44f1 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.h @@ -57,7 +57,7 @@ class SOFA_COMPONENT_PLAYBACK_API CompareTopology: public ReadTopology arg->logError("Cannot find a mesh topology in the current context"); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /// Return the total number of errors diff --git a/Sofa/Component/Playback/src/sofa/component/playback/ReadState.h b/Sofa/Component/Playback/src/sofa/component/playback/ReadState.h index 5524c2a91f8..cf5937253a9 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/ReadState.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/ReadState.h @@ -91,7 +91,7 @@ class SOFA_COMPONENT_PLAYBACK_API ReadState: public core::objectmodel::BaseObjec arg->logError("No mechanical state found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } diff --git a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h index a83d0390d4d..27d6c38517a 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h @@ -90,7 +90,7 @@ class SOFA_COMPONENT_PLAYBACK_API ReadTopology: public core::objectmodel::BaseOb return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } diff --git a/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h b/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h index 4cd843b6025..25902684730 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h @@ -103,7 +103,7 @@ class SOFA_COMPONENT_PLAYBACK_API WriteState: public core::objectmodel::BaseObje arg->logError("No mechanical state found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } }; diff --git a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h index 190ebbc175b..a71b5fa20b7 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h @@ -93,7 +93,7 @@ class SOFA_COMPONENT_PLAYBACK_API WriteTopology: public core::objectmodel::BaseO return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } }; diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetGeometryAlgorithms.h index 1be126bdaa8..efd6127be90 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetGeometryAlgorithms.h @@ -101,7 +101,7 @@ class PointSetGeometryAlgorithms : public core::topology::GeometryAlgorithms "' found in the context node."); return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /** \brief Called by the state change callback to initialize added diff --git a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h index 2d7eeff331d..ac48df0f3b4 100644 --- a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h +++ b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h @@ -127,7 +127,7 @@ class SOFA_COMPONENT_TOPOLOGY_UTILITY_API TopologicalChangeProcessor: public cor return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } void draw(const core::visual::VisualParams* vparams) override; diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ConstraintCorrection.h b/Sofa/framework/Core/src/sofa/core/behavior/ConstraintCorrection.h index dbcb378c194..9b36f5b7050 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ConstraintCorrection.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/ConstraintCorrection.h @@ -150,7 +150,7 @@ class ConstraintCorrection : public BaseConstraintCorrection, public virtual Sin return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } void setMState(MechanicalState *_mstate) diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h index 7a06c1ada0c..91e87c4abeb 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h @@ -215,7 +215,7 @@ class ForceField : public BaseForceField, public virtual SingleStateAccessor getBaseConstraintIdentifiers() override final diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ProjectiveConstraintSet.h b/Sofa/framework/Core/src/sofa/core/behavior/ProjectiveConstraintSet.h index 14f01b571d2..65092cdcaa1 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ProjectiveConstraintSet.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/ProjectiveConstraintSet.h @@ -153,7 +153,7 @@ class ProjectiveConstraintSet : public BaseProjectiveConstraintSet, public virtu return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } }; diff --git a/Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h b/Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h index 0b44e292117..b97792a6c41 100644 --- a/Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h +++ b/Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h @@ -152,7 +152,7 @@ class SOFA_CORE_API TopologicalMapping : public virtual objectmodel::BaseObject return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /// Construction method called by ObjectFactory. diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h index 79865ed4602..32e014742e0 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h @@ -111,7 +111,7 @@ class TBulletConvexHullModel : public sofa::core::CollisionModel ,public BulletC { if (dynamic_cast*>(context->getMechanicalState()) == NULL) return false; - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } // -- Bullet interface diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.h index d521b07e0de..41d2553e9d7 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.h @@ -165,7 +165,7 @@ class CapsuleCollisionModel : public core::CollisionModel } } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } sofa::core::topology::BaseMeshTopology* getCollisionTopology() override diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h index bc83980277e..1432c07738f 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h @@ -175,7 +175,7 @@ class OBBCollisionModel : public core::CollisionModel return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /** diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.h index 6c0745b8c16..46bfdd8e0c1 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.h @@ -163,7 +163,7 @@ class CapsuleCollisionModel > : publi return false; } - return BaseObject::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } Data & writeRadii(); diff --git a/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h b/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h index 0502b932261..13bc82a10ae 100644 --- a/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h +++ b/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h @@ -79,7 +79,7 @@ class OglTetrahedralModel< gpu::cuda::CudaVectorTypes > : p { if (dynamic_cast*>(context->getMechanicalState()) == NULL) return false; - return core::objectmodel::BaseObject::canCreate(obj, context, arg); + return core::objectmodel::sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected: From 14c93c7c9c38d5202ec0bffae9d0692981b21cb0 Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Thu, 12 Mar 2026 13:47:41 +0900 Subject: [PATCH 2/2] fix typos --- .../Haptics/src/sofa/component/haptics/LCPForceFeedback.h | 2 +- .../linearsolver/preconditioner/PrecomputedWarpPreconditioner.h | 2 +- .../src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h index 13f27e86b36..a5d10337cc5 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h @@ -104,7 +104,7 @@ class LCPForceFeedback : public MechanicalStateForceFeedback return false; } - return core::objectmodel::sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } /// Override method to lock or unlock the force feedback computation. According to parameter, value == true (resp. false) will lock (resp. unlock) mutex @sa lockForce diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h index d4ed9d23129..bd57f8d29e8 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h @@ -141,7 +141,7 @@ class PrecomputedWarpPreconditioner : public sofa::component::linearsolver::Matr arg->logError(std::string("No mechanical state with the datatype '") + TDataTypes::Name() + "' found in the context node."); return false; } - return sofa::core::objectmodel::sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected : diff --git a/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h b/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h index 13bc82a10ae..2f2b3cf9aa8 100644 --- a/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h +++ b/applications/plugins/VolumetricRendering/extensions/CUDA/src/VolumetricRendering/CUDA/CudaTetrahedralVisualModel.h @@ -79,7 +79,7 @@ class OglTetrahedralModel< gpu::cuda::CudaVectorTypes > : p { if (dynamic_cast*>(context->getMechanicalState()) == NULL) return false; - return core::objectmodel::sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); + return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg); } protected: