X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_IInsertOperations_i.cc;h=944f401450d478abad726845dc4b46c8521f0f7f;hb=d6f16273ade8fc4eba4d41c1ffa0d5d79baaf47b;hp=334000f236120773216e5120de679e377225cdc3;hpb=97c05bd172eb333540395044a41bb3e1160ffc48;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index 334000f23..944f40145 100644
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -36,10 +36,7 @@
 #include "GEOM_BaseObject.hxx"
 #include "GEOMImpl_Types.hxx"
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <TColStd_HSequenceOfAsciiString.hxx>
-
 #include <TColStd_HArray1OfByte.hxx>
 
 //=============================================================================
@@ -79,11 +76,11 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::MakeCopy(GEOM::GEOM_Object_ptr t
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+  Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
   if (anOriginal.IsNull()) return aGEOMObject._retn();
 
   //Create the copy
-  Handle(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
+  Handle(::GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
 
   if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
 
@@ -106,7 +103,7 @@ void GEOM_IInsertOperations_i::Export
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+  Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
   if (anOriginal.IsNull()) return;
 
   //Export the shape to the file
@@ -139,7 +136,7 @@ GEOM::ListOfGBO* GEOM_IInsertOperations_i::ImportFile
 
   aSeq->length(aLength);
   for (Standard_Integer i = 1; i <= aLength; i++)
-    aSeq[i-1] = GetBaseObject(Handle(GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
+    aSeq[i-1] = GetBaseObject(Handle(::GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
 
   return aSeq._retn();
 }
@@ -180,7 +177,7 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::RestoreShape (const SALOMEDS::TM
   char* buf = (char*)theStream.NP_data();
   std::istringstream aStream (buf);
 
-  Handle(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
+  Handle(::GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return aGEOMObject._retn();
 
@@ -213,7 +210,7 @@ CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo
   if ( theTexture.length() > 0 ) {
     aTexture = new TColStd_HArray1OfByte (1, theTexture.length());
 
-    for ( int i = 0; i < theTexture.length(); i++ )
+    for ( CORBA::ULong i = 0; i < theTexture.length(); i++ )
       aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] );
   }
   return GetOperations()->AddTexture( theWidth, theHeight, aTexture );
@@ -280,8 +277,8 @@ CORBA::Boolean GEOM_IInsertOperations_i::TransferData
   }
 
   //Get the reference shape
-  Handle(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
-  Handle(GEOM_Object) aShapeTo   = GetObjectImpl(theObjectTo);
+  Handle(::GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
+  Handle(::GEOM_Object) aShapeTo   = GetObjectImpl(theObjectTo);
 
   if (aShapeFrom.IsNull() || aShapeTo.IsNull())
   {