Skip to content

Commit 6dff21c

Browse files
alxbilgeralxbilger
committed
add namespace to all BaseObject relying on using declarations
1 parent 77c76fc commit 6dff21c

File tree

30 files changed

+160
-160
lines changed

30 files changed

+160
-160
lines changed

‎Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithNoAttributes()
111111
ASSERT_NE(root.get(), nullptr) ;
112112
root->init(sofa::core::execparams::defaultInstance()) ;
113113

114-
BaseObject* clp = root->getObject("pipeline") ;
114+
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
115115
ASSERT_NE(clp, nullptr) ;
116116
}
117117

@@ -133,7 +133,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingIntersection()
133133
ASSERT_NE(root.get(), nullptr) ;
134134
root->init(sofa::core::execparams::defaultInstance()) ;
135135

136-
BaseObject* clp = root->getObject("pipeline") ;
136+
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
137137
ASSERT_NE(clp, nullptr) ;
138138
}
139139

@@ -155,7 +155,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingBroadPhase()
155155
ASSERT_NE(root.get(), nullptr) ;
156156
root->init(sofa::core::execparams::defaultInstance()) ;
157157

158-
BaseObject* clp = root->getObject("pipeline") ;
158+
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
159159
ASSERT_NE(clp, nullptr) ;
160160
}
161161
void TestCollisionPipeline::checkCollisionPipelineWithMissingNarrowPhase()
@@ -176,7 +176,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingNarrowPhase()
176176
ASSERT_NE(root.get(), nullptr) ;
177177
root->init(sofa::core::execparams::defaultInstance()) ;
178178

179-
BaseObject* clp = root->getObject("pipeline") ;
179+
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
180180
ASSERT_NE(clp, nullptr) ;
181181
}
182182
void TestCollisionPipeline::checkCollisionPipelineWithMissingContactManager()
@@ -197,7 +197,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingContactManager()
197197
ASSERT_NE(root.get(), nullptr) ;
198198
root->init(sofa::core::execparams::defaultInstance()) ;
199199

200-
BaseObject* clp = root->getObject("pipeline") ;
200+
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
201201
ASSERT_NE(clp, nullptr) ;
202202

203203
}

‎Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ void checkAttributes()
434434
EXPECT_NE(root.get(), nullptr) ;
435435
root->init(sofa::core::execparams::defaultInstance()) ;
436436

437-
BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
437+
sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
438438
EXPECT_NE(theSphere, nullptr) ;
439439

440440
/// List of the supported attributes the user expect to find
@@ -462,7 +462,7 @@ void checkSceneWithVec3MechanicalModel()
462462
EXPECT_NE(root.get(), nullptr) ;
463463
root->init(sofa::core::execparams::defaultInstance()) ;
464464

465-
BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
465+
sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
466466
EXPECT_NE(theSphere, nullptr) ;
467467
}
468468

@@ -481,7 +481,7 @@ void checkSceneWithRigid3dMechanicalModel()
481481
EXPECT_NE(root.get(), nullptr) ;
482482
root->init(sofa::core::execparams::defaultInstance()) ;
483483

484-
BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
484+
sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
485485
EXPECT_NE(theSphere, nullptr) ;
486486
}
487487

‎Sofa/Component/Engine/Select/tests/BoxROI_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ struct BoxROITest : public sofa::testing::BaseTest
133133
EXPECT_NE(root.get(), nullptr);
134134
root->init(sofa::core::execparams::defaultInstance());
135135

136-
BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
136+
sofa::core::objectmodel::BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
137137
EXPECT_NE(boxroi, nullptr);
138138

139139
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
202202
const Node::SPtr root = SceneLoaderXML::loadFromMemory("testscene", scene.c_str());
203203
EXPECT_NE(root.get(), nullptr);
204204
root->init(sofa::core::execparams::defaultInstance());
205-
BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
205+
sofa::core::objectmodel::BaseObject* boxroi = root->getTreeNode("Level 1")->getObject("myBoxROI");
206206

207207
EXPECT_NE(boxroi, nullptr);
208208
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. ";

‎Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ enum class VTKDatasetFormat { IMAGE_DATA, STRUCTURED_POINTS,
4949
POLYDATA, UNSTRUCTURED_GRID
5050
};
5151

52-
class BaseVTKReader : public BaseObject
52+
class BaseVTKReader : public sofa::core::objectmodel::BaseObject
5353
{
5454
public:
55-
class BaseVTKDataIO : public BaseObject
55+
class BaseVTKDataIO : public sofa::core::objectmodel::BaseObject
5656
{
5757
public:
5858
string name;

‎Sofa/Component/Mass/tests/DiagonalMass_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class DiagonalMass_test : public BaseTest
115115
sofa::simulation::node::unload(root);
116116
}
117117

118-
void createSceneGraph(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms)
118+
void createSceneGraph(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms)
119119
{
120120
node = root->createChild("node");
121121
mstate = New<MechanicalObject<DataTypes> >();
@@ -143,7 +143,7 @@ class DiagonalMass_test : public BaseTest
143143
EXPECT_NEAR(expectedMass[i], mass->d_vertexMass.getValue()[i], 1e-4);
144144
}
145145

146-
void runTest(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms,
146+
void runTest(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms,
147147
MassType expectedTotalMass, const VecMass& expectedMass)
148148
{
149149
createSceneGraph(positions, topologyContainer, geometryAlgorithms);

‎Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class MeshMatrixMass_test : public BaseTest
118118
sofa::simulation::node::unload(root);
119119
}
120120

121-
void createSceneGraph(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms)
121+
void createSceneGraph(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms)
122122
{
123123
node = root->createChild("node");
124124
mstate = New<MechanicalObject<DataTypes> >();
@@ -161,7 +161,7 @@ class MeshMatrixMass_test : public BaseTest
161161
}
162162
}
163163

164-
void runTest(VecCoord positions, BaseObject::SPtr topologyContainer, BaseObject::SPtr geometryAlgorithms,
164+
void runTest(VecCoord positions, sofa::core::objectmodel::BaseObject::SPtr topologyContainer, sofa::core::objectmodel::BaseObject::SPtr geometryAlgorithms,
165165
MassType expectedTotalMass, MassType expectedMassDensity, const VecMass& expectedVMass, const VecMass& expectedEMass)
166166
{
167167
createSceneGraph(positions, topologyContainer, geometryAlgorithms);

‎Sofa/Component/SceneUtility/src/sofa/component/sceneutility/APIVersion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ using sofa::core::objectmodel::BaseObject ;
3030
namespace sofa::component::sceneutility::_apiversion_
3131
{
3232

33-
class SOFA_COMPONENT_SCENEUTILITY_API APIVersion : public BaseObject
33+
class SOFA_COMPONENT_SCENEUTILITY_API APIVersion : public sofa::core::objectmodel::BaseObject
3434
{
3535

3636
public:
37-
SOFA_CLASS(APIVersion, BaseObject);
37+
SOFA_CLASS(APIVersion, sofa::core::objectmodel::BaseObject);
3838

3939
const std::string& getApiLevel() ;
4040
void init() override ;

‎Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ using sofa::core::objectmodel::BaseObject ;
3636

3737
/// Despite this component does absolutely nothing... it is very useful as it can be used to
3838
/// retain information scene graph.
39-
class SOFA_COMPONENT_SCENEUTILITY_API InfoComponent : public BaseObject
39+
class SOFA_COMPONENT_SCENEUTILITY_API InfoComponent : public sofa::core::objectmodel::BaseObject
4040
{
4141
public:
42-
SOFA_CLASS(InfoComponent, BaseObject);
42+
SOFA_CLASS(InfoComponent, sofa::core::objectmodel::BaseObject);
4343

4444
InfoComponent() {}
4545
~InfoComponent() override{}

‎Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class OglLabelTest : public BaseTest
7676
root->init(sofa::core::execparams::defaultInstance()) ;
7777

7878

79-
BaseObject* lm = root->getObject("label1") ;
79+
sofa::core::objectmodel::BaseObject* lm = root->getObject("label1") ;
8080
ASSERT_NE(nullptr, lm) ;
8181

8282
OglLabel* ogllabel = dynamic_cast<OglLabel*>(lm);
@@ -106,7 +106,7 @@ class OglLabelTest : public BaseTest
106106
ASSERT_NE(nullptr, root.get()) ;
107107
root->init(sofa::core::execparams::defaultInstance()) ;
108108

109-
BaseObject* lm = root->getObject("label1") ;
109+
sofa::core::objectmodel::BaseObject* lm = root->getObject("label1") ;
110110
ASSERT_NE(nullptr, lm) ;
111111

112112
OglLabel* ogllabel = dynamic_cast<OglLabel*>(lm);
@@ -133,7 +133,7 @@ class OglLabelTest : public BaseTest
133133
ASSERT_NE(root.get(), nullptr) ;
134134
root->init(sofa::core::execparams::defaultInstance()) ;
135135

136-
BaseObject* lm = root->getObject("label1") ;
136+
sofa::core::objectmodel::BaseObject* lm = root->getObject("label1") ;
137137
ASSERT_NE(lm, nullptr) ;
138138

139139
/// List of the supported attributes the user expect to find

‎Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void TestClipPlane::checkClipPlaneValidAttributes()
8989
ASSERT_NE(root.get(), nullptr) ;
9090
root->init(sofa::core::execparams::defaultInstance()) ;
9191

92-
BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
92+
sofa::core::objectmodel::BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
9393
ASSERT_NE(clp, nullptr) ;
9494

9595
/// List of the supported attributes the user expect to find
@@ -121,7 +121,7 @@ void TestClipPlane::checkClipPlaneAttributesValues(const std::string& dataname,
121121
ASSERT_NE(root.get(), nullptr) ;
122122
root->init(sofa::core::execparams::defaultInstance()) ;
123123

124-
BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
124+
sofa::core::objectmodel::BaseObject* clp = root->getTreeNode("Level 1")->getObject("clipplane") ;
125125
ASSERT_NE(clp, nullptr) ;
126126

127127
sofa::simulation::node::unload(root);

0 commit comments

Comments
 (0)