Skip to content

Commit 49a04de

Browse files
alxbilgerfredroybakpaul
authored
[all] Another round of renaming of BaseObject to BaseComponent (sofa-framework#6020)
* [all] Another round of renaming of BaseObject to BaseComponent * replace last usages of BaseObjects --------- Co-authored-by: Frederick Roy <froy@lnrobo.com> Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>
1 parent 229ec8e commit 49a04de

File tree

214 files changed

+565
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+565
-566
lines changed

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BaseSubCollisionPipeline.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace sofa::component::collision::detection::algorithm
2929
{
3030

3131
BaseSubCollisionPipeline::BaseSubCollisionPipeline()
32-
: sofa::core::objectmodel::BaseObject()
32+
: sofa::core::objectmodel::BaseComponent()
3333
{
3434

3535
}

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BaseSubCollisionPipeline.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ namespace sofa::component::collision::detection::algorithm
4444
* @see SubCollisionPipeline for a concrete implementation
4545
* @see CompositeCollisionPipeline for the aggregator that manages sub-pipelines
4646
*/
47-
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BaseSubCollisionPipeline : public sofa::core::objectmodel::BaseObject
47+
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BaseSubCollisionPipeline : public sofa::core::objectmodel::BaseComponent
4848
{
4949
public:
50-
SOFA_ABSTRACT_CLASS(BaseSubCollisionPipeline, sofa::core::objectmodel::BaseObject);
50+
SOFA_ABSTRACT_CLASS(BaseSubCollisionPipeline, sofa::core::objectmodel::BaseComponent);
5151

5252
protected:
5353
BaseSubCollisionPipeline();

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceDetection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
namespace sofa::component::collision::detection::algorithm
3030
{
3131

32-
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceDetection final : public sofa::core::objectmodel::BaseObject
32+
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceDetection final : public sofa::core::objectmodel::BaseComponent
3333
{
3434
public:
35-
SOFA_CLASS(BruteForceDetection, sofa::core::objectmodel::BaseObject);
35+
SOFA_CLASS(BruteForceDetection, sofa::core::objectmodel::BaseComponent);
3636

3737
void init() override;
3838

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAP.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
namespace sofa::component::collision::detection::algorithm
3131
{
3232

33-
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAP final : public sofa::core::objectmodel::BaseObject
33+
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAP final : public sofa::core::objectmodel::BaseComponent
3434
{
3535
public:
36-
SOFA_CLASS(DirectSAP, sofa::core::objectmodel::BaseObject);
36+
SOFA_CLASS(DirectSAP, sofa::core::objectmodel::BaseComponent);
3737

3838
void init() override;
3939

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceDetection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ namespace sofa::component::collision::detection::algorithm
3636
* colliding state. It must be used with a TriangleOctreeModel,as an octree is used to traverse the object.
3737
*/
3838
class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API RayTraceDetection final :
39-
public sofa::core::objectmodel::BaseObject
39+
public sofa::core::objectmodel::BaseComponent
4040
{
4141
public:
42-
SOFA_CLASS(RayTraceDetection, sofa::core::objectmodel::BaseObject);
42+
SOFA_CLASS(RayTraceDetection, sofa::core::objectmodel::BaseComponent);
4343

4444
void init() override;
4545

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ using std::string;
2828
#include <sofa/core/fwd.h>
2929
using sofa::core::execparams::defaultInstance;
3030

31-
#include<sofa/core/objectmodel/BaseObject.h>
32-
using sofa::core::objectmodel::BaseObject ;
31+
#include<sofa/core/objectmodel/BaseComponent.h>
32+
using sofa::core::objectmodel::BaseComponent ;
3333

3434
#include <sofa/component/collision/detection/algorithm/CollisionPipeline.h>
3535
using sofa::component::collision::detection::algorithm::CollisionPipeline ;
@@ -117,7 +117,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithNoAttributes()
117117
ASSERT_NE(root.get(), nullptr) ;
118118
root->init(sofa::core::execparams::defaultInstance()) ;
119119

120-
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
120+
sofa::core::objectmodel::BaseComponent* clp = root->getObject("pipeline") ;
121121
ASSERT_NE(clp, nullptr) ;
122122
}
123123

@@ -143,7 +143,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingIntersection()
143143
ASSERT_NE(root.get(), nullptr) ;
144144
root->init(sofa::core::execparams::defaultInstance()) ;
145145

146-
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
146+
sofa::core::objectmodel::BaseComponent* clp = root->getObject("pipeline") ;
147147
ASSERT_NE(clp, nullptr) ;
148148
}
149149

@@ -169,7 +169,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingBroadPhase()
169169
ASSERT_NE(root.get(), nullptr) ;
170170
root->init(sofa::core::execparams::defaultInstance()) ;
171171

172-
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
172+
sofa::core::objectmodel::BaseComponent* clp = root->getObject("pipeline") ;
173173
ASSERT_NE(clp, nullptr) ;
174174
}
175175
void TestCollisionPipeline::checkCollisionPipelineWithMissingNarrowPhase()
@@ -194,7 +194,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingNarrowPhase()
194194
ASSERT_NE(root.get(), nullptr) ;
195195
root->init(sofa::core::execparams::defaultInstance()) ;
196196

197-
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
197+
sofa::core::objectmodel::BaseComponent* clp = root->getObject("pipeline") ;
198198
ASSERT_NE(clp, nullptr) ;
199199
}
200200
void TestCollisionPipeline::checkCollisionPipelineWithMissingContactManager()
@@ -219,7 +219,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingContactManager()
219219
ASSERT_NE(root.get(), nullptr) ;
220220
root->init(sofa::core::execparams::defaultInstance()) ;
221221

222-
BaseObject* clp = root->getObject("pipeline") ;
222+
BaseComponent* clp = root->getObject("pipeline") ;
223223
ASSERT_NE(clp, nullptr) ;
224224

225225
}
@@ -243,7 +243,7 @@ void TestCollisionPipeline::checkCollisionPipelineWithMissingCollisionModel()
243243
ASSERT_NE(root.get(), nullptr) ;
244244
root->init(sofa::core::execparams::defaultInstance()) ;
245245

246-
sofa::core::objectmodel::BaseObject* clp = root->getObject("pipeline") ;
246+
sofa::core::objectmodel::BaseComponent* clp = root->getObject("pipeline") ;
247247
ASSERT_NE(clp, nullptr) ;
248248

249249
}

‎Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineCollisionModel.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void LineCollisionModel<DataTypes>::init()
7878
if (!bmt)
7979
{
8080
msg_error() << "No topology component found at path: " << l_topology.getLinkedPath() << ", nor in current context: " << this->getContext()->name << ". LineCollisionModel<sofa::defaulttype::Vec3Types> requires a MeshTopology";
81-
sofa::core::objectmodel::BaseObject::d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
81+
this->d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
8282
return;
8383
}
8484
resize( bmt->getNbEdges() );

‎Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TetrahedronCollisionModel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void TetrahedronCollisionModel::init()
7171
if (!m_topology)
7272
{
7373
msg_error() << "No topology component found at path: " << l_topology.getLinkedPath() << ", nor in current context: " << this->getContext()->name << ". TetrahedronCollisionModel requires a BaseMeshTopology";
74-
sofa::core::objectmodel::BaseObject::d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
74+
this->d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
7575
return;
7676
}
7777

‎Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleCollisionModel.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void TriangleCollisionModel<DataTypes>::init()
7171
if (!m_topology)
7272
{
7373
msg_error() << "No topology component found at path: " << l_topology.getLinkedPath() << ", nor in current context: " << this->getContext()->name << ". TriangleCollisionModel<sofa::defaulttype::Vec3Types> requires a Triangular Topology";
74-
sofa::core::objectmodel::BaseObject::d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
74+
this->d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
7575
return;
7676
}
7777

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using std::vector;
3030
using std::string;
3131

3232
#include<sofa/core/objectmodel/BaseObject.h>
33-
using sofa::core::objectmodel::BaseObject ;
33+
using sofa::core::objectmodel::BaseComponent ;
3434

3535
#include<sofa/simulation/Node.h>
3636
using sofa::simulation::Node ;
@@ -434,7 +434,7 @@ void checkAttributes()
434434
EXPECT_NE(root.get(), nullptr) ;
435435
root->init(sofa::core::execparams::defaultInstance()) ;
436436

437-
sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
437+
sofa::core::objectmodel::BaseComponent* 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-
sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
465+
sofa::core::objectmodel::BaseComponent* 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-
sofa::core::objectmodel::BaseObject* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
484+
sofa::core::objectmodel::BaseComponent* theSphere = root->getTreeNode("Level 1")->getObject("spheremodel") ;
485485
EXPECT_NE(theSphere, nullptr) ;
486486
}
487487

0 commit comments

Comments
 (0)