X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_Field_i.cc;h=af1d2b585bba8b7ac6d0886c6d1a59f268af11bb;hb=c00b6875b6dfd412c9b5e1807e6aa37fbb1218ba;hp=2b500edc7d3ad6c184c2d522c99d9aeb57048cc0;hpb=5e3080a50e2ddb3beb564c81d4b8b5aa62fe86e3;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_Field_i.cc b/src/GEOM_I/GEOM_Field_i.cc
index 2b500edc7..af1d2b585 100644
--- a/src/GEOM_I/GEOM_Field_i.cc
+++ b/src/GEOM_I/GEOM_Field_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -39,7 +39,7 @@
 
 GEOM_Field_i::GEOM_Field_i (PortableServer::POA_ptr thePOA,
                             GEOM::GEOM_Gen_ptr      theEngine,
-                            Handle(GEOM_Field)      theImpl):
+                            Handle(::GEOM_Field)      theImpl):
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   _impl( theImpl )
@@ -66,11 +66,10 @@ GEOM_Field_i::~GEOM_Field_i()
 GEOM::GEOM_Object_ptr GEOM_Field_i::GetShape()
 {
   GEOM::GEOM_Object_var shapeVar;
-  Handle(GEOM_Object) shape = _impl->GetShape();
+  Handle(::GEOM_Object) shape = _impl->GetShape();
   if ( !shape.IsNull() )
   {
-    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( shape->GetDocID(),
-                                                        shape->GetEntryString().ToCString());
+    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( shape->GetEntryString().ToCString());
     shapeVar = GEOM::GEOM_Object::_narrow( obj );
   }
   return shapeVar._retn();
@@ -135,11 +134,10 @@ GEOM::string_array* GEOM_Field_i::GetComponents()
 GEOM::GEOM_FieldStep_ptr GEOM_Field_i::AddStep(::CORBA::Long stepID, ::CORBA::Long stamp)
 {
   GEOM::GEOM_FieldStep_var stepVar;
-  Handle(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp );
+  Handle(::GEOM_FieldStep) step = _impl->AddStep( stepID, stamp );
   if ( !step.IsNull() )
   {
-    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(),
-                                                        step->GetEntryString().ToCString());
+    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetEntryString().ToCString());
     stepVar = GEOM::GEOM_FieldStep::_narrow( obj );
   }
   return stepVar._retn();
@@ -175,8 +173,8 @@ CORBA::Long GEOM_Field_i::CountSteps()
 
 GEOM::ListOfLong* GEOM_Field_i::GetSteps()
 {
-  std::list< Handle(GEOM_FieldStep)> stepList = _impl->GetSteps();
-  std::list< Handle(GEOM_FieldStep)>::iterator stp = stepList.begin();
+  std::list< Handle(::GEOM_FieldStep)> stepList = _impl->GetSteps();
+  std::list< Handle(::GEOM_FieldStep)>::iterator stp = stepList.begin();
   
   GEOM::ListOfLong_var stepIds = new GEOM::ListOfLong();
   stepIds->length( stepList.size() );
@@ -198,11 +196,10 @@ GEOM::ListOfLong* GEOM_Field_i::GetSteps()
 GEOM::GEOM_FieldStep_ptr GEOM_Field_i::GetStep(CORBA::Long stepID)
 {
   GEOM::GEOM_FieldStep_var stepVar;
-  Handle(GEOM_FieldStep) step = _impl->GetStep(stepID);
+  Handle(::GEOM_FieldStep) step = _impl->GetStep(stepID);
   if ( !step.IsNull() )
   {
-    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(),
-                                                        step->GetEntryString().ToCString());
+    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetEntryString().ToCString());
     stepVar = GEOM::GEOM_FieldStep::_narrow( obj );
   }
   return stepVar._retn();
@@ -229,7 +226,7 @@ CORBA::Long GEOM_Field_i::GetArraySize()
 
 GEOM_FieldStep_i::GEOM_FieldStep_i(PortableServer::POA_ptr  thePOA,
                                    GEOM::GEOM_Gen_ptr       theEngine,
-                                   Handle(GEOM_FieldStep)   theImpl):
+                                   Handle(::GEOM_FieldStep)   theImpl):
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   _impl( theImpl )
@@ -288,11 +285,10 @@ void GEOM_FieldStep_i::SetStamp(::CORBA::Long stamp)
 GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField()
 {
   GEOM::GEOM_Field_var fieldVar;
-  Handle(GEOM_Field) field = _impl->GetField();
+  Handle(::GEOM_Field) field = _impl->GetField();
   if ( !field.IsNull() )
   {
-    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( field->GetDocID(),
-                                                        field->GetEntryString().ToCString());
+    GEOM::GEOM_BaseObject_var obj = _engine->GetObject( field->GetEntryString().ToCString());
     fieldVar = GEOM::GEOM_Field::_narrow( obj );
   }
   return fieldVar._retn();
@@ -304,7 +300,7 @@ GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField()
  */
 //================================================================================
 
-GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl):
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   GEOM_FieldStep_i( thePOA, theEngine, theImpl )
@@ -355,7 +351,7 @@ GEOM::short_array* GEOM_BoolFieldStep_i::GetValues()
  */
 //================================================================================
 
-GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl):
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   GEOM_FieldStep_i( thePOA, theEngine, theImpl )
@@ -406,7 +402,7 @@ GEOM::ListOfLong* GEOM_IntFieldStep_i::GetValues()
  */
 //================================================================================
 
-GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl):
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   GEOM_FieldStep_i( thePOA, theEngine, theImpl )
@@ -457,7 +453,7 @@ GEOM::ListOfDouble* GEOM_DoubleFieldStep_i::GetValues()
  */
 //================================================================================
 
-GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl):
   SALOME::GenericObj_i( thePOA ),
   GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
   GEOM_FieldStep_i( thePOA, theEngine, theImpl )