Merge master branch into V9_dev.

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

diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index b7119922008d41c22defb8a5af3dc37efe22285e..511f230e68d17f2d6909faf5f3fb83b646040c9b 100644 (file)
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/src/GEOM_I/GEOM_IOperations_i.cc
@@ -125,7 +125,7 @@ void GEOM_IOperations_i::AbortOperation()
  */
 //=============================================================================
 GEOM::GEOM_BaseObject_ptr
-GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject)
+GEOM_IOperations_i::GetBaseObject(Handle(::GEOM_BaseObject) theObject)
 {
   GEOM::GEOM_BaseObject_var GO;
   if (theObject.IsNull()) return GO._retn();
@@ -140,10 +140,10 @@ GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject)
  *  GetObjectImpl
  */
 //=============================================================================
-HANDLE_NAMESPACE(GEOM_BaseObject)
+Handle(::GEOM_BaseObject)
 GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject)
 {
-  HANDLE_NAMESPACE(GEOM_BaseObject) anImpl;
+  Handle(::GEOM_BaseObject) anImpl;
   if (!CORBA::is_nil(theObject)) {
     CORBA::String_var anEntry = theObject->GetEntry();
     anImpl = GetImpl()->GetEngine()->GetObject( anEntry );
@@ -156,7 +156,7 @@ GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject)
  *  GetObject
  */
 //=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject)
+GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(::GEOM_Object) theObject)
 {
   return GEOM::GEOM_Object::_narrow( GetBaseObject( theObject ));
 }
@@ -166,9 +166,9 @@ GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object
  *  GetObjectImpl
  */
 //=============================================================================
-HANDLE_NAMESPACE(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
+Handle(::GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
 {
-  return HANDLE_NAMESPACE(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject ));
+  return Handle(::GEOM_Object)::DownCast( GetBaseObjectImpl( theObject ));
 }
 
 //=============================================================================
@@ -186,7 +186,7 @@ Handle(TColStd_HSequenceOfTransient) GEOM_IOperations_i::GetListOfObjectsImpl
   int aNbObj = theObjects.length();
 
   for (i = 0; i < aNbObj; i++) {
-    HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
+    Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
 
     if (anObj.IsNull()) {
       aResult.Nullify();
@@ -205,13 +205,13 @@ Handle(TColStd_HSequenceOfTransient) GEOM_IOperations_i::GetListOfObjectsImpl
 //=======================================================================
 
 bool GEOM_IOperations_i::GetListOfObjectsImpl(const GEOM::ListOfGO&             theObjects,
-                                              std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList)
+                                              std::list< Handle(::GEOM_Object) >& theList)
 {
   int i;
   int aNbObj = theObjects.length();
 
   for (i = 0; i < aNbObj; i++) {
-    HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
+    Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
 
     if (anObj.IsNull())
       return false;