revert changes on BaseContext

Author: alxbilger

Sofa/framework/Core/src/sofa/core/objectmodel/BaseContext.h

@@ -188,9 +188,9 @@ class SOFA_CORE_API BaseContext : public virtual Base
     /// Returns a list of object of type passed as a parameter. There should be no
     /// Copy constructor because of Return Value Optimization.
     /// eg:
-    ///    for(BaseComponent* o : context->getObjects() ){ ... }
+    ///    for(BaseObject* o : context->getObjects() ){ ... }
     ///    for(VisualModel* o : context->getObjects<VisualModel>() ){ ... }
-    template<class Object=sofa::core::objectmodel::BaseComponent>
+    template<class Object=sofa::core::objectmodel::BaseObject>
     std::vector<Object*> getObjects(SearchDirection dir = SearchUp){
         std::vector<Object*> o;
         getObjects(o, dir) ;
@@ -338,11 +338,11 @@ class SOFA_CORE_API BaseContext : public virtual Base
     /// @{
 
     /// Mechanical Degrees-of-Freedom
-    virtual void setMechanicalState( BaseComponent* )
+    virtual void setMechanicalState( BaseObject* )
     { }
 
     /// Topology
-    virtual void setTopology( BaseComponent* )
+    virtual void setTopology( BaseObject* )
     { }
 
     /// @}
@@ -362,13 +362,13 @@ class SOFA_CORE_API BaseContext : public virtual Base
     /// @{
 
     /// Add an object, or return false if not supported
-    virtual bool addObject( sptr<BaseComponent> /*obj*/, TypeOfInsertion = TypeOfInsertion::AtEnd)
+    virtual bool addObject( sptr<BaseObject> /*obj*/, TypeOfInsertion = TypeOfInsertion::AtEnd)
     {
         return false;
     }
 
     /// Remove an object, or return false if not supported
-    virtual bool removeObject( sptr<BaseComponent> /*obj*/ )
+    virtual bool removeObject( sptr<BaseObject> /*obj*/ )
     {
         return false;
     }
@@ -393,9 +393,9 @@ class SOFA_CORE_API BaseContext : public virtual Base
     /// @name Notifications for graph change listeners
     /// @{
 
-    virtual void notifyAddSlave(core::objectmodel::BaseComponent* master, core::objectmodel::BaseComponent* slave);
-    virtual void notifyRemoveSlave(core::objectmodel::BaseComponent* master, core::objectmodel::BaseComponent* slave);
-    virtual void notifyMoveSlave(core::objectmodel::BaseComponent* previousMaster, core::objectmodel::BaseComponent* master, core::objectmodel::BaseComponent* slave);
+    virtual void notifyAddSlave(core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave);
+    virtual void notifyRemoveSlave(core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave);
+    virtual void notifyMoveSlave(core::objectmodel::BaseObject* previousMaster, core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave);
 
     /// @}