Unicode support

[modules/geom.git] / src / GEOMImpl / GEOMImpl_ShapeDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
index b7947fdf7d0ae0c24ec24efd923474dd6149834d..71229e06c1dc8341ce357d160917df42dadf890b 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
@@ -408,7 +408,7 @@ GEOMImpl_ShapeDriver::GEOMImpl_ShapeDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@ -744,7 +744,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
     unsigned int ind, nbshapes = aShapes->Length();
     
     // add faces
-    BOPCol_ListOfShape aLS;
+    TopTools_ListOfShape aLS;
     for (ind = 1; ind <= nbshapes; ind++) {
       Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(ind));
       TopoDS_Shape aShape_i = aRefShape->GetValue();
@@ -770,7 +770,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
     aMV.SetArguments(aLS);
     aMV.SetIntersect(aCI.GetIsIntersect());
     aMV.Perform();
-    if (aMV.ErrorStatus()) return 0;
+    if (aMV.HasErrors()) return 0;
 
     aShape = aMV.Shape();
   }
@@ -1001,7 +1001,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
 
     anExtractor.Perform();
 
-    // Interprete results
+    // Interpret results
     Standard_Integer iErr = anExtractor.ErrorStatus();
 
     // The detailed description of error codes is in GEOMAlgo_Extractor.cxx
@@ -1079,11 +1079,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
 
   aFunction->SetValue(aShape);
 
-#if OCC_VERSION_MAJOR < 7
-  log.SetTouched(Label());
-#else
   log->SetTouched(Label());
-#endif
 
   if (!aWarning.IsEmpty())
     Standard_Failure::Raise(aWarning.ToCString());
@@ -1575,7 +1571,7 @@ TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire,
               const Standard_Real aTol = BRep_Tool::Tolerance(aVtx);
 
               if (aPFirst.IsEqual(aPnt, aTol)) {
-                // The coinsident vertex is found.
+                // The coincident vertex is found.
                 FirstVertex = aVtx;
                 LastVertex  = aVtx;
                 FirstVertex.Orientation(TopAbs_FORWARD);
@@ -2030,7 +2026,7 @@ GetCreationInformation(std::string&             theOperationName,
   return true;
 }
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
 
 //modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f
 #include <TopoDS_Iterator.hxx>