Increment version: 9.1.0

[modules/geom.git] / src / GEOM_I / GEOM_BaseObject_i.cc

diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc
index 20629cce12a8ddc8fbf76ec6d7bf44e80804cb97..e6d2bb8372d69c2b091051477c8f2ad0568ac20a 100644 (file)
--- a/src/GEOM_I/GEOM_BaseObject_i.cc
+++ b/src/GEOM_I/GEOM_BaseObject_i.cc
@@ -51,7 +51,7 @@
 
 GEOM_BaseObject_i::GEOM_BaseObject_i (PortableServer::POA_ptr thePOA,
                                       GEOM::GEOM_Gen_ptr      theEngine,
-                                      HANDLE_NAMESPACE(GEOM_BaseObject) theImpl)
+                                      Handle(::GEOM_BaseObject) theImpl)
   : SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
 {
 }
@@ -64,7 +64,7 @@ GEOM_BaseObject_i::GEOM_BaseObject_i (PortableServer::POA_ptr thePOA,
 
 GEOM_BaseObject_i::~GEOM_BaseObject_i()
 {
-  MESSAGE("GEOM_BaseObject_i::~GEOM_BaseObject_i");
+  //MESSAGE("GEOM_BaseObject_i::~GEOM_BaseObject_i");
   GEOM_Engine::GetEngine()->RemoveObject(_impl);
 }
 
@@ -83,17 +83,6 @@ char* GEOM_BaseObject_i::GetEntry()
   return CORBA::string_dup(anEntstr);
 }
 
-//=============================================================================
-/*!
- *  GetStudyID
- */
-//=============================================================================
-
-CORBA::Long GEOM_BaseObject_i::GetStudyID()
-{
-   return _impl->GetDocID();
-}
-
 //=============================================================================
 /*!
  *  GetType
@@ -181,10 +170,10 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetDependency()
   TCollection_AsciiString anEntry;
 
   for (int i = 1; i<=aLength; i++) {
-    HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+    Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i));
     if (anObj.IsNull()) continue;
     TDF_Tool::Entry(anObj->GetEntry(), anEntry);
-    GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), (char*) anEntry.ToCString());
+    GEOM::GEOM_BaseObject_var obj = _engine->GetObject((char*) anEntry.ToCString());
     aList[i-1] = obj;
   }
 
@@ -211,10 +200,9 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetLastDependency()
   TCollection_AsciiString anEntry;
 
   for (int i = 1; i<=aLength; i++) {
-     HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+     Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i));
      if (anObj.IsNull()) continue;
-     GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(),
-                                                        anObj->GetEntryString().ToCString());
+     GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetEntryString().ToCString());
      aList[i-1] = GEOM::GEOM_BaseObject::_duplicate( obj );
   }
 
@@ -277,8 +265,8 @@ GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation()
   int nbI = 0;
   for ( int i = 1; i <= nbFun; ++i )
   {
-    HANDLE_NAMESPACE(GEOM_BaseDriver) driver =
-      HANDLE_NAMESPACE(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
+    Handle(::GEOM_BaseDriver) driver =
+      Handle(::GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
     if ( !driver.IsNull() )
     {
       std::vector<GEOM_Param> params;