sofa-framework · alxbilger · Dec 12, 2025
diff --git a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp
@@ -111,7 +111,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithNoAttributes()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getObject("pipeline") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
     ASSERT_NE(clp, nullptr) ;
 }
 
@@ -133,7 +133,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingIntersection()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getObject("pipeline") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
     ASSERT_NE(clp, nullptr) ;
 }
 
@@ -155,7 +155,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingBroadPhase()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getObject("pipeline") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
     ASSERT_NE(clp, nullptr) ;
 }
 void TestCollisionPipeline::checkCollisionPipelineWithMissingNarrowPhase()
@@ -176,7 +176,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingNarrowPhase()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getObject("pipeline") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
     ASSERT_NE(clp, nullptr) ;
 }
 void TestCollisionPipeline::checkCollisionPipelineWithMissingContactManager()
@@ -197,7 +197,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingContactManager()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getObject("pipeline") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
     ASSERT_NE(clp, nullptr) ;
 
 }

diff --git a/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp b/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp
@@ -434,7 +434,7 @@ void checkAttributes()
     EXPECT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
+    sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
     EXPECT_NE(theSphere, nullptr) ;
 
     /// List of the supported attributes the user expect to find
@@ -462,7 +462,7 @@ void checkSceneWithVec3MechanicalModel()
     EXPECT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
+    sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
     EXPECT_NE(theSphere, nullptr) ;
 }
 
@@ -481,7 +481,7 @@ void checkSceneWithRigid3dMechanicalModel()
     EXPECT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
+    sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
     EXPECT_NE(theSphere, nullptr) ;
 }
 

diff --git a/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp b/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp
@@ -133,7 +133,7 @@ struct BoxROITest :  public sofa::testing::BaseTest
         EXPECT_NE(root.get(), nullptr);
         root->init(sofa::core::execparams::defaultInstance());
 
-        BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
+        sofa::core::objectmodel::BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
         EXPECT_NE(boxroi, nullptr);
 
         EXPECT_EQ(boxroi->getComponentState(), ComponentState::Invalid ) << "The component cannot be initialized because it is missing a MechanicalObject. "
@@ -202,7 +202,7 @@ struct BoxROITest :  public sofa::testing::BaseTest
         const Node::SPtr root = SceneLoaderXML::loadFromMemory("testscene", scene.c_str());
         EXPECT_NE(root.get(), nullptr);
         root->init(sofa::core::execparams::defaultInstance());
-        BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
+        sofa::core::objectmodel::BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
 
         EXPECT_NE(boxroi, nullptr);
         EXPECT_EQ(boxroi->getComponentState(), ComponentState::Valid ) << "The component should succeed in being initialized because there is a MeshLoader and a TopologyContainer in the current context. ";

diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h
@@ -49,10 +49,10 @@ enum class VTKDatasetFormat { IMAGE_DATA, STRUCTURED_POINTS,
                               POLYDATA, UNSTRUCTURED_GRID
                             };
 
-class BaseVTKReader : public BaseObject
+class BaseVTKReader : public sofa::core::objectmodel::BaseObject
 {
 public:
-    class BaseVTKDataIO : public BaseObject
+    class BaseVTKDataIO : public sofa::core::objectmodel::BaseObject
     {
     public:
         string name;

diff --git a/Sofa/Component/Mass/tests/DiagonalMass_test.cpp b/Sofa/Component/Mass/tests/DiagonalMass_test.cpp
@@ -115,7 +115,7 @@ class DiagonalMass_test : public BaseTest
             sofa::simulation::node::unload(root);
     }
 
-    void createSceneGraph(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms)
+    void createSceneGraph(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms)
     {
         node = root->createChild("node");
         mstate = New<MechanicalObject<DataTypes> >();
@@ -143,7 +143,7 @@ class DiagonalMass_test : public BaseTest
             EXPECT_NEAR(expectedMass[i], mass->d_vertexMass.getValue()[i], 1e-4);
     }
 
-    void runTest(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms,
+    void runTest(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms,
                  MassType expectedTotalMass, const VecMass& expectedMass)
     {
         createSceneGraph(positions, topologyContainer, geometryAlgorithms);

diff --git a/Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp b/Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp
@@ -118,7 +118,7 @@ class MeshMatrixMass_test : public BaseTest
             sofa::simulation::node::unload(root);
     }
 
-    void createSceneGraph(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms)
+    void createSceneGraph(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms)
     {
         node = root->createChild("node");
         mstate = New<MechanicalObject<DataTypes> >();
@@ -161,7 +161,7 @@ class MeshMatrixMass_test : public BaseTest
         }
     }
 
-    void runTest(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms,
+    void runTest(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms,
                  MassType expectedTotalMass, MassType expectedMassDensity, const VecMass& expectedVMass, const VecMass& expectedEMass)
     {
         createSceneGraph(positions, topologyContainer, geometryAlgorithms);

diff --git a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/APIVersion.h b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/APIVersion.h
@@ -30,11 +30,11 @@ using sofa::core::objectmodel::BaseObject ;
 namespace sofa::component::sceneutility::_apiversion_
 {
 
-class SOFA_COMPONENT_SCENEUTILITY_API APIVersion : public BaseObject
+class SOFA_COMPONENT_SCENEUTILITY_API APIVersion : public sofa::core::objectmodel::BaseObject
 {
 
 public:
-    SOFA_CLASS(APIVersion, BaseObject);
+    SOFA_CLASS(APIVersion, sofa::core::objectmodel::BaseObject);
 
     const std::string& getApiLevel() ;
     void init() override ;

diff --git a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h
@@ -36,10 +36,10 @@ using sofa::core::objectmodel::BaseObject ;
 
 /// Despite this component does absolutely nothing... it is very useful as it can be used to
 /// retain information scene graph.
-class SOFA_COMPONENT_SCENEUTILITY_API InfoComponent : public BaseObject
+class SOFA_COMPONENT_SCENEUTILITY_API InfoComponent : public sofa::core::objectmodel::BaseObject
 {
 public:
-    SOFA_CLASS(InfoComponent, BaseObject);
+    SOFA_CLASS(InfoComponent, sofa::core::objectmodel::BaseObject);
 
     InfoComponent() {}
     ~InfoComponent() override{}

diff --git a/Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp b/Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp
@@ -76,7 +76,7 @@ class OglLabelTest : public BaseTest
         root->init(sofa::core::execparams::defaultInstance()) ;
 
 
-        BaseObject* lm = root->getObject("label1") ;
+        sofa::core::objectmodel::BaseObject* lm = root->getObject("label1") ;
         ASSERT_NE(nullptr, lm) ;
 
         OglLabel* ogllabel = dynamic_cast<OglLabel*>(lm);
@@ -106,7 +106,7 @@ class OglLabelTest : public BaseTest
         ASSERT_NE(nullptr, root.get()) ;
         root->init(sofa::core::execparams::defaultInstance()) ;
 
-        BaseObject* lm = root->getObject("label1") ;
+        sofa::core::objectmodel::BaseObject* lm = root->getObject("label1") ;
         ASSERT_NE(nullptr, lm) ;
 
         OglLabel* ogllabel = dynamic_cast<OglLabel*>(lm);
@@ -133,7 +133,7 @@ class OglLabelTest : public BaseTest
         ASSERT_NE(root.get(), nullptr) ;
         root->init(sofa::core::execparams::defaultInstance()) ;
 
-        BaseObject* lm = root->getObject("label1") ;
+        sofa::core::objectmodel::BaseObject* lm = root->getObject("label1") ;
         ASSERT_NE(lm, nullptr) ;
 
         /// List of the supported attributes the user expect to find

diff --git a/Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp b/Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp
@@ -89,7 +89,7 @@ void TestClipPlane::checkClipPlaneValidAttributes()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
     ASSERT_NE(clp, nullptr) ;
 
     /// List of the supported attributes the user expect to find
@@ -121,7 +121,7 @@ void TestClipPlane::checkClipPlaneAttributesValues(const std::string& dataname,
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
+    sofa::core::objectmodel::BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
     ASSERT_NE(clp, nullptr) ;
 
     sofa::simulation::node::unload(root);

diff --git a/Sofa/GL/Component/Shader/tests/LightManager_test.cpp b/Sofa/GL/Component/Shader/tests/LightManager_test.cpp
@@ -77,7 +77,7 @@ void checkAttributes()
     EXPECT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
+    sofa::core::objectmodel::BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
     EXPECT_NE(lm, nullptr) ;
 
     /// List of the supported attributes the user expect to find

diff --git a/Sofa/GL/Component/Shader/tests/Light_test.cpp b/Sofa/GL/Component/Shader/tests/Light_test.cpp
@@ -80,7 +80,7 @@ void TestLight::checkLightMissingLightManager(const std::string& lighttype)
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* lm = root->getTreeNode("Level 1")->getObject("light1") ;
+    sofa::core::objectmodel::BaseObject* lm = root->getTreeNode("Level 1")->getObject("light1") ;
     ASSERT_NE(lm, nullptr) ;
 
     sofa::simulation::node::unload(root);
@@ -105,10 +105,10 @@ void TestLight::checkPositionalLightValidAttributes()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
+    sofa::core::objectmodel::BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
     ASSERT_NE(lm, nullptr) ;
 
-    BaseObject* light = root->getTreeNode("Level 1")->getObject("light1") ;
+    sofa::core::objectmodel::BaseObject* light = root->getTreeNode("Level 1")->getObject("light1") ;
     ASSERT_NE(light, nullptr) ;
 
     /// List of the supported attributes the user expect to find
@@ -146,10 +146,10 @@ void TestLight::checkDirectionalLightValidAttributes()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
+    sofa::core::objectmodel::BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
     ASSERT_NE(lm, nullptr) ;
 
-    BaseObject* light = root->getTreeNode("Level 1")->getObject("light1") ;
+    sofa::core::objectmodel::BaseObject* light = root->getTreeNode("Level 1")->getObject("light1") ;
     ASSERT_NE(light, nullptr) ;
 
     /// List of the supported attributes the user expect to find
@@ -187,10 +187,10 @@ void TestLight::checkSpotLightValidAttributes()
     ASSERT_NE(root.get(), nullptr) ;
     root->init(sofa::core::execparams::defaultInstance()) ;
 
-    BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
+    sofa::core::objectmodel::BaseObject* lm = root->getTreeNode("Level 1")->getObject("lightmanager") ;
     ASSERT_NE(lm, nullptr) ;
 
-    BaseObject* light = root->getTreeNode("Level 1")->getObject("light1") ;
+    sofa::core::objectmodel::BaseObject* light = root->getTreeNode("Level 1")->getObject("light1") ;
     ASSERT_NE(light, nullptr) ;
 
     /// List of the supported attributes the user expect to find

diff --git a/Sofa/framework/Core/simutest/objectmodel/Base_test.cpp b/Sofa/framework/Core/simutest/objectmodel/Base_test.cpp
@@ -38,17 +38,17 @@ using sofa::defaulttype::Vec3Types;
 
 namespace customns
 {
-class CustomBaseObject : public BaseObject
+class CustomBaseObject : public sofa::core::objectmodel::BaseObject
 {
 public:
-    SOFA_CLASS(CustomBaseObject, BaseObject);
+    SOFA_CLASS(CustomBaseObject, sofa::core::objectmodel::BaseObject);
 };
 
 template<class D>
-class CustomBaseObjectT : public BaseObject
+class CustomBaseObjectT : public sofa::core::objectmodel::BaseObject
 {
 public:
-    SOFA_CLASS(SOFA_TEMPLATE(CustomBaseObjectT, D), BaseObject);
+    SOFA_CLASS(SOFA_TEMPLATE(CustomBaseObjectT, D), sofa::core::objectmodel::BaseObject);
 
     static const std::string GetCustomClassName() { return "MyFakeClassName"; }
 };
@@ -100,9 +100,9 @@ TEST_F(Base_test , testComponentState )
 
 TEST_F(Base_test , testBaseClass)
 {
-    EXPECT_EQ(CustomBaseObject::GetClass()->className, "CustomBaseObject");
-    EXPECT_EQ(CustomBaseObject::GetClass()->templateName, "");
-    EXPECT_EQ(CustomBaseObject::GetClass()->shortName, "customBaseObject");
+    EXPECT_EQ(customns::CustomBaseObject::GetClass()->className, "CustomBaseObject");
+    EXPECT_EQ(customns::CustomBaseObject::GetClass()->templateName, "");
+    EXPECT_EQ(customns::CustomBaseObject::GetClass()->shortName, "customBaseObject");
 
     EXPECT_EQ(CustomBaseObjectT<Rigid3Types>::GetClass()->className, "MyFakeClassName");
     EXPECT_EQ(CustomBaseObjectT<Rigid3Types>::GetClass()->templateName, Rigid3Types::Name());
@@ -115,7 +115,7 @@ TEST_F(Base_test , testBaseClass)
 
 TEST_F(Base_test , testGetClassName)
 {
-    const CustomBaseObject o;
+    const customns::CustomBaseObject o;
     EXPECT_EQ(o.getClassName(), "CustomBaseObject");
     EXPECT_EQ(o.getTemplateName(), "");
     EXPECT_EQ(o.getTypeName(), "CustomBaseObject");

diff --git a/Sofa/framework/Core/simutest/objectmodel/PathResolver_simutest.cpp b/Sofa/framework/Core/simutest/objectmodel/PathResolver_simutest.cpp
@@ -84,13 +84,13 @@ TEST_P(PathResolverToBaseObject, CheckPathToBaseObject)
     auto& t = GetParam();
     if(t[2]=="true")
     {
-        ASSERT_TRUE(PathResolver::CheckPath(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
-        ASSERT_TRUE(PathResolver::CheckPaths(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_TRUE(PathResolver::CheckPath(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_TRUE(PathResolver::CheckPaths(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
     }
     else
     {
-        ASSERT_FALSE(PathResolver::CheckPath(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
-        ASSERT_FALSE(PathResolver::CheckPaths(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_FALSE(PathResolver::CheckPath(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_FALSE(PathResolver::CheckPaths(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
     }
 }
 
@@ -111,13 +111,13 @@ TEST_F(PathResolverToBaseObject, DISABLED_CheckPathToBaseObject_tofix)
 
     if (t[2] == "true")
     {
-        ASSERT_TRUE(PathResolver::CheckPath(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
-        ASSERT_TRUE(PathResolver::CheckPaths(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_TRUE(PathResolver::CheckPath(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_TRUE(PathResolver::CheckPaths(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
     }
     else
     {
-        ASSERT_FALSE(PathResolver::CheckPath(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
-        ASSERT_FALSE(PathResolver::CheckPaths(node, BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_FALSE(PathResolver::CheckPath(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
+        ASSERT_FALSE(PathResolver::CheckPaths(node, sofa::core::objectmodel::BaseObject::GetClass(), t[0])) << t[1] << " " << t[2];
     }
 }