[all] cleaning namespace (#38)

* [all] cleaning namespace * [all] cleaning namespace
SofaDefrost · Jul 26, 2024 · ea25020 · ea25020
1 parent 8a67fca
commit ea25020
Show file tree

Hide file tree

Showing 21 changed files with 10 additions and 143 deletions.
diff --git a/src/SoftRobots.Inverse/component/behavior/Actuator.h b/src/SoftRobots.Inverse/component/behavior/Actuator.h
@@ -73,10 +73,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API Actuator<sofa::defaulttype::Ri
 #endif
 
 } // namespace
-
-namespace sofa::core::behavior
-{
-    template <class DataTypes>
-    using Actuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::behavior::Actuator<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/behavior/Effector.h b/src/SoftRobots.Inverse/component/behavior/Effector.h
@@ -76,10 +76,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API Effector<sofa::defaulttype::Ve
 extern template class SOFA_SOFTROBOTS_INVERSE_API Effector<sofa::defaulttype::Rigid3Types>;
 #endif
 } // namespace
-
-namespace sofa::core::behavior
-{
-    template <class DataTypes>
-    using Effector SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::behavior::Effector<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/behavior/Equality.h b/src/SoftRobots.Inverse/component/behavior/Equality.h
@@ -67,10 +67,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API Equality<sofa::defaulttype::Ri
 #endif
 
 } // namespace
-
-namespace sofa::core::behavior
-{
-    template <class DataTypes>
-    using Equality SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::behavior::Equality<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/behavior/Sensor.h b/src/SoftRobots.Inverse/component/behavior/Sensor.h
@@ -67,10 +67,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API Sensor<sofa::defaulttype::Rigi
 #endif
 
 } // namespace
-
-namespace sofa::core::behavior
-{
-    template <class DataTypes>
-    using Sensor SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::behavior::Sensor<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/config.h.in b/src/SoftRobots.Inverse/component/config.h.in
@@ -32,10 +32,6 @@
 #  define SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
 #else
 #  define SOFA_SOFTROBOTS_INVERSE_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#  define SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE() \
-    SOFA_ATTRIBUTE_DEPRECATED( \
-        "v23.06", "v23.12", \
-        "Namespace in the plugin SoftRobots.Inverse is now 'softrobotsinverse'.")
 #endif
 
 namespace softrobotsinverse

diff --git a/src/SoftRobots.Inverse/component/constraint/BarycentricCenterEffector.h b/src/SoftRobots.Inverse/component/constraint/BarycentricCenterEffector.h
@@ -32,7 +32,7 @@
 
 namespace softrobotsinverse::constraint
 {
-    using sofa::core::behavior::Effector ;
+    using softrobotsinverse::behavior::Effector ;
     using sofa::core::ConstraintParams ;
     using sofa::linearalgebra::BaseVector ;
     using sofa::core::visual::VisualParams ;
@@ -145,9 +145,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API BarycentricCenterEffector<sofa
 
 } // namespace
 
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using BarycentricCenterEffector SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::BarycentricCenterEffector<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/CableActuator.h b/src/SoftRobots.Inverse/component/constraint/CableActuator.h
@@ -36,7 +36,7 @@
 namespace softrobotsinverse::constraint
 {
 
-using sofa::core::behavior::Actuator;
+using softrobotsinverse::behavior::Actuator;
 using sofa::helper::ReadAccessor;
 using sofa::core::VecCoordId;
 using sofa::core::ConstraintParams;
@@ -128,10 +128,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API CableActuator<sofa::defaulttyp
 
 } // namespace
 
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using CableActuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::CableActuator<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/CableEffector.h b/src/SoftRobots.Inverse/component/constraint/CableEffector.h
@@ -102,10 +102,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API CableEffector<sofa::defaulttyp
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using CableEffector SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::CableEffector<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/CableEquality.h b/src/SoftRobots.Inverse/component/constraint/CableEquality.h
@@ -113,9 +113,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API CableEquality<sofa::defaulttyp
 
 } // namespace
 
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using CableEquality SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::CableEquality<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/CableSensor.h b/src/SoftRobots.Inverse/component/constraint/CableSensor.h
@@ -85,10 +85,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API CableSensor<sofa::defaulttype:
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using CableSensor SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::CableSensor<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/ForcePointActuator.h b/src/SoftRobots.Inverse/component/constraint/ForcePointActuator.h
@@ -35,7 +35,7 @@
 
 namespace softrobotsinverse::constraint
 {
-    using sofa::core::behavior::Actuator;
+    using softrobotsinverse::behavior::Actuator;
     using sofa::core::topology::BaseMeshTopology;
     using sofa::core::visual::VisualParams;
     using sofa::core::ConstraintParams;
@@ -52,7 +52,7 @@ template< class DataTypes >
 class ForcePointActuator : public Actuator<DataTypes>
 {
 public:
-    SOFA_CLASS(SOFA_TEMPLATE(ForcePointActuator,DataTypes), SOFA_TEMPLATE(sofa::core::behavior::Actuator,DataTypes));
+    SOFA_CLASS(SOFA_TEMPLATE(ForcePointActuator,DataTypes), SOFA_TEMPLATE(softrobotsinverse::behavior::Actuator,DataTypes));
 
     typedef typename DataTypes::VecCoord                    VecCoord;
     typedef typename DataTypes::VecDeriv                    VecDeriv;
@@ -157,10 +157,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API ForcePointActuator<sofa::defau
 
 } // namespace
 
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using ForcePointActuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::ForcePointActuator<DataTypes>;
-}
-
diff --git a/src/SoftRobots.Inverse/component/constraint/ForceSurfaceActuator.h b/src/SoftRobots.Inverse/component/constraint/ForceSurfaceActuator.h
@@ -35,7 +35,7 @@
 
 namespace softrobotsinverse::constraint
 {
-    using sofa::core::behavior::Actuator;
+    using softrobotsinverse::behavior::Actuator;
     using sofa::core::topology::BaseMeshTopology;
     using sofa::core::visual::VisualParams;
     using sofa::core::ConstraintParams;
@@ -197,10 +197,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API ForceSurfaceActuator<sofa::def
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using ForceSurfaceActuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::ForceSurfaceActuator<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/JointActuator.h b/src/SoftRobots.Inverse/component/constraint/JointActuator.h
@@ -35,7 +35,7 @@
 
 namespace softrobotsinverse::constraint
 {
-    using sofa::core::behavior::Actuator;
+    using softrobotsinverse::behavior::Actuator;
     using sofa::core::topology::BaseMeshTopology;
     using sofa::core::visual::VisualParams;
     using sofa::core::ConstraintParams;
@@ -53,7 +53,7 @@ template< class DataTypes >
 class JointActuator : public Actuator<DataTypes>
 {
 public:
-    SOFA_CLASS(SOFA_TEMPLATE(JointActuator,DataTypes), SOFA_TEMPLATE(sofa::core::behavior::Actuator,DataTypes));
+    SOFA_CLASS(SOFA_TEMPLATE(JointActuator,DataTypes), SOFA_TEMPLATE(softrobotsinverse::behavior::Actuator,DataTypes));
 
     typedef typename DataTypes::VecCoord                    VecCoord;
     typedef typename DataTypes::VecDeriv                    VecDeriv;
@@ -155,10 +155,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API JointActuator<sofa::defaulttyp
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using JointActuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::JointActuator<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/PositionEffector.h b/src/SoftRobots.Inverse/component/constraint/PositionEffector.h
@@ -35,7 +35,7 @@
 
 namespace softrobotsinverse::constraint
 {
-using sofa::core::behavior::Effector ;
+using softrobotsinverse::behavior::Effector ;
 
 /**
  * The "PositionEffector" component is used to constrain one or several points of a model
@@ -95,10 +95,4 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API PositionEffector<sofa::default
 
 } // namespace
 
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using PositionEffector SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::PositionEffector<DataTypes>;
-}
 
diff --git a/src/SoftRobots.Inverse/component/constraint/SlidingActuator.h b/src/SoftRobots.Inverse/component/constraint/SlidingActuator.h
@@ -34,7 +34,7 @@
 namespace softrobotsinverse::constraint
 {
 
-using sofa::core::behavior::Actuator;
+using softrobotsinverse::behavior::Actuator;
 using sofa::helper::ReadAccessor;
 using sofa::core::VecCoordId;
 using sofa::core::ConstraintParams;
@@ -155,10 +155,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API SlidingActuator<sofa::defaultt
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using SlidingActuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::SlidingActuator<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/SurfacePressureActuator.h b/src/SoftRobots.Inverse/component/constraint/SurfacePressureActuator.h
@@ -122,10 +122,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API SurfacePressureActuator<sofa::
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using SurfacePressureActuator SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::SurfacePressureActuator<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/SurfacePressureEquality.h b/src/SoftRobots.Inverse/component/constraint/SurfacePressureEquality.h
@@ -106,11 +106,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API SurfacePressureEquality<sofa::
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using SurfacePressureEquality SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::SurfacePressureEquality<DataTypes>;
-}
-
diff --git a/src/SoftRobots.Inverse/component/constraint/SurfacePressureSensor.h b/src/SoftRobots.Inverse/component/constraint/SurfacePressureSensor.h
@@ -94,10 +94,3 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API SurfacePressureSensor<sofa::de
 #endif
 
 } // namespace
-
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using SurfacePressureSensor SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::SurfacePressureSensor<DataTypes>;
-}
diff --git a/src/SoftRobots.Inverse/component/constraint/VolumeEffector.h b/src/SoftRobots.Inverse/component/constraint/VolumeEffector.h
@@ -109,10 +109,4 @@ extern template class SOFA_SOFTROBOTS_INVERSE_API VolumeEffector<sofa::defaultty
 
 } // namespace
 
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using VolumeEffector SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::constraint::VolumeEffector<DataTypes>;
-}
 
diff --git a/src/SoftRobots.Inverse/component/constraint/YoungModulusActuator.h b/src/SoftRobots.Inverse/component/constraint/YoungModulusActuator.h
@@ -39,7 +39,7 @@ namespace sofa::component::constraintset
     using sofa::core::visual::VisualParams ;
     using sofa::linearalgebra::BaseVector ;
     using sofa::core::ConstraintParams ;
-    using sofa::core::behavior::Actuator ;
+    using softrobotsinverse::behavior::Actuator ;
     using sofa::component::solidmechanics::fem::elastic::TetrahedronFEMForceField ;
 
 /**

diff --git a/src/SoftRobots.Inverse/component/solver/QPInverseProblemSolver.h b/src/SoftRobots.Inverse/component/solver/QPInverseProblemSolver.h
@@ -202,9 +202,3 @@ class SOFA_SOFTROBOTS_INVERSE_API QPInverseProblemSolver : public sofa::componen
 
 } // namespace
 
-namespace sofa::component::constraintset
-{
-    template <class DataTypes>
-    using QPInverseProblemSolver SOFA_ATTRIBUTE_DEPRECATED__RENAME_NAMESPACE_SOFTROBOTS_INVERSE()
-        = softrobotsinverse::solver::QPInverseProblemSolver;
-}