Merge branch 'master' of https://github.com/sofa-framework/sofa

Author: SperryBot

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

@@ -151,7 +151,7 @@ public :
                           "' found in the context node.");
             return false;
         }
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
     sofa::core::topology::BaseMeshTopology* getCollisionTopology() override

Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointCollisionModel.h

@@ -116,7 +116,7 @@ class PointCollisionModel : public core::CollisionModel
                           "' found in the context node.");
             return false;
         }
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
     void computeBBox(const core::ExecParams* params, bool onlyVisible) override;

Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereCollisionModel.h

@@ -134,7 +134,7 @@ class SphereCollisionModel : public core::CollisionModel
             return false;
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
     template<class T>

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

@@ -207,7 +207,7 @@ class TriangleCollisionModel : public core::CollisionModel
                           "' found in the context node.");
             return false;
         }
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
     void computeBBox(const core::ExecParams* params, bool onlyVisible=false) override;

Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h

@@ -104,7 +104,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API ContactListener : public vir
             return false;
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
     template<class T>

Sofa/Component/Engine/Select/src/sofa/component/engine/select/PairBoxRoi.h

@@ -84,7 +84,7 @@ class PairBoxROI : public core::DataEngine
             }
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
 protected:

Sofa/Component/Engine/Select/src/sofa/component/engine/select/PlaneROI.h

@@ -88,7 +88,7 @@ class PlaneROI : public core::DataEngine
             }
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
 protected:

Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h

@@ -82,7 +82,7 @@ class ProximityROI : public core::DataEngine
             }
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
 public:

Sofa/Component/Engine/Select/src/sofa/component/engine/select/SubsetTopology.h

@@ -89,7 +89,7 @@ class SubsetTopology : public core::DataEngine
             }
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
 protected:

Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromPositions.h

@@ -86,7 +86,7 @@ class ValuesFromPositions : public core::DataEngine
             }
         }
 
-        return BaseObject::canCreate(obj, context, arg);
+        return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
     }
 
 protected: