remove container::ShapeMatching

hugtalbot · hugtalbot · commit 78da3195bad7 · 2025-06-04T21:48:09.000+02:00
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingForceField.h b/src/ShapeMatchingPlugin/ShapeMatchingForceField.h
@@ -57,7 +57,7 @@ class ShapeMatchingForceField : public core::behavior::ForceField<DataTypes>
     ShapeMatchingForceField();
 
 public:
-    SingleLink<ShapeMatchingForceField<DataTypes>, container::ShapeMatchingRotationFinder<DataTypes>, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_rotationFinder;
+    SingleLink<ShapeMatchingForceField<DataTypes>, ShapeMatchingRotationFinder<DataTypes>, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_rotationFinder;
     Data<Real> d_stiffness;
 
     void init() override;
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingForceField.inl b/src/ShapeMatchingPlugin/ShapeMatchingForceField.inl
@@ -47,7 +47,7 @@ void ShapeMatchingForceField<DataTypes>::init()
 
     if (!l_rotationFinder.get())
     {
-        sofa::core::sptr< container::ShapeMatchingRotationFinder<DataTypes>> rotationFinder;
+        sofa::core::sptr< ShapeMatchingRotationFinder<DataTypes>> rotationFinder;
         this->getContext()->get(rotationFinder);
         if (!rotationFinder)
         {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void ShapeMatchingForceField<DataTypes>::init()`
`47`	`47`
`48`	`48`	`if (!l_rotationFinder.get())`
`49`	`49`	`{`
`50`		`- sofa::core::sptr< container::ShapeMatchingRotationFinder<DataTypes>> rotationFinder;`
	`50`	`+ sofa::core::sptr< ShapeMatchingRotationFinder<DataTypes>> rotationFinder;`
`51`	`51`	`this->getContext()->get(rotationFinder);`
`52`	`52`	`if (!rotationFinder)`
`53`	`53`	`{`