0024399: ICC warnings 3280 "declaration hides..."
authorski <ski@opencascade.com>
Tue, 26 Nov 2013 14:17:10 +0000 (18:17 +0400)
committerbugmaster <bugmaster@opencascade.com>
Thu, 28 Nov 2013 07:36:13 +0000 (11:36 +0400)
Renamed local variables to avoid ICC compiler warnings about repeated names

24 files changed:
src/AppParCurves/AppParCurves_ResolConstraint.gxx
src/BRepAdaptor/BRepAdaptor_CompCurve.cxx
src/BRepBlend/BRepBlend_AppFunc.cxx
src/BRepBlend/BRepBlend_AppFuncRst.cxx
src/BRepBlend/BRepBlend_AppFuncRstRst.cxx
src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
src/BRepTest/BRepTest_FilletCommands.cxx
src/Blend/Blend_Walking_3.gxx
src/ChFi2d/ChFi2d_AnaFilletAlgo.cxx
src/Draw/Draw_VariableCommands.cxx
src/Draw/Draw_Viewer.cxx
src/GeomFill/GeomFill_Fixed.cxx
src/GeomFill/GeomFill_LocFunction.cxx
src/GeomFill/GeomFill_PlanFunc.cxx
src/GeomFill/GeomFill_SweepFunction.cxx
src/GeomLib/GeomLib_LogSample.cxx
src/IFSelect/IFSelect_SignatureList.cxx
src/IntImpParGen/IntImpParGen_Intersector.gxx
src/PCollection/PCollection_HAsciiString.cxx
src/QABugs/QABugs_17.cxx
src/StdSelect/StdSelect_BRepHilighter.cxx
src/gp/gp_Quaternion.lxx
src/math/math_FunctionSetRoot.cxx

index a2e4a5f..2df363e 100755 (executable)
@@ -489,31 +489,31 @@ const
 {
   // Boucle de calcul du nombre de points de passage afin de dimensionner 
   // les matrices.
-  Standard_Integer IncPass, IncTan, IncCurv, CCol;
+  Standard_Integer aIncPass, aIncTan, aIncCurv, aCCol;
   Standard_Integer i;
   AppParCurves_Constraint Cons;
 
-  IncPass = 0;
-  IncTan = 0;
-  IncCurv = 0;
+  aIncPass = 0;
+  aIncTan = 0;
+  aIncCurv = 0;
 
   for (i = TheConstraints->Lower(); i <= TheConstraints->Upper(); i++) {
     Cons = (TheConstraints->Value(i)).Constraint();
     if (Cons >= 1) {
-      IncPass++;                       // IncPass = nbre de points de passage.
+      aIncPass++;                       // IncPass = nbre de points de passage.
     }
     if (Cons >= 2) {
-      IncTan++;                          // IncTan= nbre de points de tangence.
+      aIncTan++;                          // IncTan= nbre de points de tangence.
     }
     if (Cons == 3) {
-      IncCurv++;                      // IncCurv = nbre de pts de courbure.
+      aIncCurv++;                      // IncCurv = nbre de pts de courbure.
     }
   }
   Standard_Integer nb3d = ToolLine::NbP3d(SSP);
   Standard_Integer nb2d = ToolLine::NbP2d(SSP);
-  CCol = nb3d* 3 + nb2d* 2;
+  aCCol = nb3d* 3 + nb2d* 2;
 
-  return CCol*IncPass + IncTan*(CCol-1) + 3*IncCurv;
+  return aCCol*aIncPass + aIncTan*(aCCol-1) + 3*aIncCurv;
 
 }
 
index 9111b08..543aa35 100755 (executable)
@@ -432,7 +432,7 @@ const TopoDS_Wire& BRepAdaptor_CompCurve::Wire() const
 
  void BRepAdaptor_CompCurve::Prepare(Standard_Real& W,
                                     Standard_Real& Delta,
-                                    Standard_Integer& CurIndex) const
+                                    Standard_Integer& theCurIndex) const
 {
   Standard_Real f,l, Wtest, Eps;
   Standard_Integer ii;
@@ -450,26 +450,26 @@ const TopoDS_Wire& BRepAdaptor_CompCurve::Wire() const
 
   // Find the index
   Standard_Boolean Trouve = Standard_False;
-  if (myKnots->Value(CurIndex) > Wtest) {
-    for (ii=CurIndex-1; ii>0 && !Trouve; ii--)
+  if (myKnots->Value(theCurIndex) > Wtest) {
+    for (ii=theCurIndex-1; ii>0 && !Trouve; ii--)
       if (myKnots->Value(ii)<= Wtest) {
-       CurIndex = ii;
+       theCurIndex = ii;
        Trouve = Standard_True;
       }
-    if (!Trouve) CurIndex = 1; // Out of limits...
+    if (!Trouve) theCurIndex = 1; // Out of limits...
   }
 
-  else if (myKnots->Value(CurIndex+1) <= Wtest) {
-    for (ii=CurIndex+1; ii<=myCurves->Length() && !Trouve; ii++)
+  else if (myKnots->Value(theCurIndex+1) <= Wtest) {
+    for (ii=theCurIndex+1; ii<=myCurves->Length() && !Trouve; ii++)
       if (myKnots->Value(ii+1)> Wtest) {
-       CurIndex = ii;
+       theCurIndex = ii;
        Trouve = Standard_True;
       }
-    if (!Trouve) CurIndex = myCurves->Length(); // Out of limits...
+    if (!Trouve) theCurIndex = myCurves->Length(); // Out of limits...
   }
 
   // Invert ?
-  const TopoDS_Edge& E = myCurves->Value(CurIndex).Edge();
+  const TopoDS_Edge& E = myCurves->Value(theCurIndex).Edge();
   TopAbs_Orientation Or = E.Orientation();
   Standard_Boolean Reverse;
   Reverse = (Forward && (Or == TopAbs_REVERSED)) ||
@@ -477,15 +477,15 @@ const TopoDS_Wire& BRepAdaptor_CompCurve::Wire() const
 
   // Calculate the local parameter
   BRep_Tool::Range(E, f, l);
-  Delta = myKnots->Value(CurIndex+1) - myKnots->Value(CurIndex);
+  Delta = myKnots->Value(theCurIndex+1) - myKnots->Value(theCurIndex);
   if (Delta > PTol*1.e-9) Delta = (l-f)/Delta;
 
   if (Reverse) {
     Delta *= -1;
-    W = l + (W-myKnots->Value(CurIndex)) * Delta;
+    W = l + (W-myKnots->Value(theCurIndex)) * Delta;
   }
   else {
-    W = f + (W-myKnots->Value(CurIndex)) * Delta;
+    W = f + (W-myKnots->Value(theCurIndex)) * Delta;
   }
 }
 
index 7eee111..4f2f5e7 100755 (executable)
@@ -31,18 +31,18 @@ BRepBlend_AppFunc::BRepBlend_AppFunc(Handle(BRepBlend_Line)& Line,
 
 void BRepBlend_AppFunc::Point(const Blend_AppFunction& Func,
                              const Standard_Real Param,
-                             const math_Vector& Sol,
+                             const math_Vector& theSol,
                              Blend_Point& Pnt)const
 {
   Pnt.SetValue(Func.Pnt1(), Func.Pnt2(),
               Param,
-              Sol(1), Sol(2), Sol(3), Sol(4));
+              theSol(1), theSol(2), theSol(3), theSol(4));
 }
 
-void BRepBlend_AppFunc::Vec(math_Vector& Sol,
+void BRepBlend_AppFunc::Vec(math_Vector& theSol,
                            const Blend_Point& Pnt)const
 {
-  Pnt.ParametersOnS1(Sol(1),Sol(2));
-  Pnt.ParametersOnS2(Sol(3),Sol(4));
+  Pnt.ParametersOnS1(theSol(1),theSol(2));
+  Pnt.ParametersOnS2(theSol(3),theSol(4));
 }
 
index a945289..eac44ec 100755 (executable)
@@ -32,18 +32,18 @@ BRepBlend_AppFuncRst::BRepBlend_AppFuncRst (Handle(BRepBlend_Line)& Line,
 
 void BRepBlend_AppFuncRst::Point(const Blend_AppFunction& Func,
                                 const Standard_Real Param,
-                                const math_Vector& Sol,
+                                const math_Vector& theSol,
                                 Blend_Point& Pnt)const
 {
   Pnt.SetValue(Func.Pnt1(), Func.Pnt2(),
               Param,
-              Sol(1), Sol(2), Sol(3));
+              theSol(1), theSol(2), theSol(3));
 }
 
-void BRepBlend_AppFuncRst::Vec(math_Vector& Sol,
+void BRepBlend_AppFuncRst::Vec(math_Vector& theSol,
                               const Blend_Point& Pnt)const
 {
-  Pnt.ParametersOnS(Sol(1),Sol(2));
-  Sol(3) = Pnt.ParameterOnC();
+  Pnt.ParametersOnS(theSol(1),theSol(2));
+  theSol(3) = Pnt.ParameterOnC();
 }
 
index 83616d1..c07036c 100755 (executable)
@@ -32,18 +32,18 @@ BRepBlend_AppFuncRstRst::BRepBlend_AppFuncRstRst (Handle(BRepBlend_Line)& Line,
 
 void BRepBlend_AppFuncRstRst::Point(const Blend_AppFunction& Func,
                                    const Standard_Real Param,
-                                   const math_Vector& Sol,
+                                   const math_Vector& theSol,
                                    Blend_Point& Pnt)const
 {
   Pnt.SetValue(Func.Pnt1(), Func.Pnt2(),
               Param,
-              Sol(1), Sol(2));
+              theSol(1), theSol(2));
 }
 
-void BRepBlend_AppFuncRstRst::Vec(math_Vector& Sol,
+void BRepBlend_AppFuncRstRst::Vec(math_Vector& theSol,
                                  const Blend_Point& Pnt)const
 {
-  Sol(1) = Pnt.ParameterOnC1();
-  Sol(2) = Pnt.ParameterOnC2();
+  theSol(1) = Pnt.ParameterOnC1();
+  theSol(2) = Pnt.ParameterOnC2();
 }
 
index 714e771..1f2160e 100755 (executable)
@@ -887,7 +887,7 @@ TColStd_Array1OfReal& DWeigths)
   gp_Vec d1urst,d1vrst;
   gp_Pnt Center,bid;
   
-  Standard_Real norm,ndotns,grosterme,dray;
+  Standard_Real norm,ndotns,grosterme,aDray;
   
   math_Vector sol(1,3),valsol(1,3),secmember(1,3);
   math_Matrix gradsol(1,3,1,3);
@@ -899,9 +899,9 @@ TColStd_Array1OfReal& DWeigths)
   
   tguide->D2(prm,ptgui,d1gui,d2gui);
 
-  tevol->D1(prm,ray,dray);
+  tevol->D1(prm,ray,aDray);
   ray=sg1*ray;
-  dray=sg1*dray;
+  aDray=sg1*aDray;
   normtg = d1gui.Magnitude();
   nplan  = d1gui.Normalized();
   dnplan.SetLinearForm(1./normtg,d2gui,
@@ -944,7 +944,7 @@ TColStd_Array1OfReal& DWeigths)
   resul.SetLinearForm(ray,temp,gp_Vec(ptrst,pts));
 
   //secmember(3) = -2.*ray*(dnw.Dot(resul)); // jag 950105 il manquait ray
-  secmember(3) = -2.*ray*(dnw.Dot(resul)) - 2.*dray*(temp.Dot(resul)) + 2.*ray*dray;
+  secmember(3) = -2.*ray*(dnw.Dot(resul)) - 2.*aDray*(temp.Dot(resul)) + 2.*ray*aDray;
   math_Gauss Resol(gradsol);
   
   if (Resol.IsDone()) {
@@ -985,7 +985,7 @@ TColStd_Array1OfReal& DWeigths)
     ns.SetLinearForm(ndotns/norm,nplan, -1./norm,ns);
     
     dn2w.SetLinearForm(ray, dnw, -1., tgrst, tgs);
-    dn2w.SetLinearForm(dray,ns,dn2w);
+    dn2w.SetLinearForm(aDray,ns,dn2w);
     norm = resul.Magnitude();
     dn2w.Divide(norm);
     ns2 = -resul.Normalized();
@@ -1029,7 +1029,7 @@ TColStd_Array1OfReal& DWeigths)
   // Case of the circle
   Center.SetXYZ(pts.XYZ()+ray*ns.XYZ());
   if (!istgt) {
-    tgct.SetLinearForm(ray,dnw,dray,ns,tgs);
+    tgct.SetLinearForm(ray,dnw,aDray,ns,tgs);
   }
   
   if (ray > 0.) {
@@ -1044,9 +1044,9 @@ TColStd_Array1OfReal& DWeigths)
   }
   if (!istgt) {
     if (ray < 0.) { // to avoid Abs(dray) some lines below
-      rayprim = -dray;
+      rayprim = -aDray;
     }
-    else rayprim = dray;
+    else rayprim = aDray;
 
     return GeomFill::GetCircle(myTConv, 
                               ns, ns2, 
index e72b0e1..f308115 100755 (executable)
@@ -154,7 +154,7 @@ static void Drawsect(const Standard_Real param,
 //=======================================================================
 
 Standard_Integer BRepBlend_SurfRstLineBuilder::
-   ArcToRecadre(const math_Vector& sol,
+   ArcToRecadre(const math_Vector& theSol,
                const Standard_Integer PrevIndex, 
                gp_Pnt2d& lastpt2d,
                gp_Pnt2d& pt2d,
@@ -167,7 +167,7 @@ Standard_Integer BRepBlend_SurfRstLineBuilder::
   Standard_Real uprev = 0.,vprev = 0., prm =  0., dist = 0.;
 
   if(byinter) previousP.ParametersOnS(uprev,vprev);
-  pt2d.SetCoord(sol(1),sol(2));
+  pt2d.SetCoord(theSol(1),theSol(2));
   lastpt2d.SetCoord(uprev,vprev);
   domain1->Init();
 
index 8b092d8..1154b79 100755 (executable)
@@ -488,9 +488,9 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons
    if(edge.ShapeType()!=TopAbs_EDGE) return 1;
     E.Append(edge);
   } 
-  FilletSurf_Builder Rakk(V,E,Rad);
-  if (simul) Rakk.Simulate();
-  else  Rakk.Perform();
+  FilletSurf_Builder aRakk(V,E,Rad);
+  if (simul) aRakk.Simulate();
+  else  aRakk.Perform();
 
   //if (Rakk.IsDone()==FilletSurf_IsNotOk) 
   // { FilletSurf_ErrorTypeStatus err=Rakk.StatusError();
@@ -504,20 +504,20 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons
   // }
   // else {
   //  if (Rakk.IsDone()==FilletSurf_IsPartial) cout <<"resultat partiel"<<endl; 
-  if (Rakk.IsDone()==FilletSurf_IsNotOk) 
-   { FilletSurf_ErrorTypeStatus err=Rakk.StatusError();
+  if (aRakk.IsDone()==FilletSurf_IsNotOk)
+   { FilletSurf_ErrorTypeStatus err=aRakk.StatusError();
      if (err==FilletSurf_EmptyList) di<< "StatusError=EmptyList"<<"\n";
      else if (err==FilletSurf_EdgeNotG1) di<< "StatusError=NotG1"<<"\n";
-     else if (err==FilletSurf_FacesNotG1) di<< "StatusError=facesNotG1"<<"\n";   
-     else if (err==FilletSurf_EdgeNotOnShape) 
+     else if (err==FilletSurf_FacesNotG1) di<< "StatusError=facesNotG1"<<"\n";
+     else if (err==FilletSurf_EdgeNotOnShape)
      di<< "StatusError=edgenotonshape"<<"\n";
      else if (err==FilletSurf_NotSharpEdge ) di<< "StatusError=notsharpedge"<<"\n";
      else if (err==FilletSurf_PbFilletCompute) di <<"StatusError=PBFillet"<<"\n";
    }
    else {
-    if (Rakk.IsDone()==FilletSurf_IsPartial) di <<"partial result"<<"\n"; 
+    if (aRakk.IsDone()==FilletSurf_IsPartial) di <<"partial result"<<"\n";
  
-    nb=Rakk.NbSurface();
+    nb=aRakk.NbSurface();
     char localname [100];
     char *temp; 
     
@@ -525,17 +525,17 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons
     
    if (!simul)
    { 
-    //if (Rakk.StartSectionStatus()==FilletSurf_NoExtremityOnEdge) 
+    //if (Rakk.StartSectionStatus()==FilletSurf_NoExtremityOnEdge)
     //  {cout<<" type deb conges = WLBLOUT"<<endl;}
-    //else if (Rakk.StartSectionStatus()==FilletSurf_OneExtremityOnEdge ) 
+    //else if (Rakk.StartSectionStatus()==FilletSurf_OneExtremityOnEdge )
     //  { cout<<" type deb conges = WLBLSTOP"<<endl;}
     //else if (Rakk.StartSectionStatus()==FilletSurf_TwoExtremityOnEdge)
     //  {cout<<" type deb conges = WLBLEND"<<endl;}
-    if (Rakk.StartSectionStatus()==FilletSurf_NoExtremityOnEdge) 
+    if (aRakk.StartSectionStatus()==FilletSurf_NoExtremityOnEdge)
       {di<<" type start fillets = WLBLOUT"<<"\n";}
-    else if (Rakk.StartSectionStatus()==FilletSurf_OneExtremityOnEdge ) 
+    else if (aRakk.StartSectionStatus()==FilletSurf_OneExtremityOnEdge)
       { di<<" type start fillets = WLBLSTOP"<<"\n";}
-    else if (Rakk.StartSectionStatus()==FilletSurf_TwoExtremityOnEdge)
+    else if (aRakk.StartSectionStatus()==FilletSurf_TwoExtremityOnEdge)
       {di<<" type start fillets = WLBLEND"<<"\n";}
     
     //if (Rakk.EndSectionStatus()==FilletSurf_NoExtremityOnEdge) 
@@ -544,15 +544,15 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons
     //  {cout<<" type fin  conges = WLBLSTOP"<<endl;}
     //else if (Rakk.EndSectionStatus()==FilletSurf_TwoExtremityOnEdge) 
     //  { cout<<" type fin  conges = WLBLEND"<<endl;}
-    if (Rakk.EndSectionStatus()==FilletSurf_NoExtremityOnEdge) 
+    if (aRakk.EndSectionStatus()==FilletSurf_NoExtremityOnEdge)
       {di<<" type end fillets = WLBLOUT"<<"\n";}
-    else if (Rakk.EndSectionStatus()==FilletSurf_OneExtremityOnEdge) 
+    else if (aRakk.EndSectionStatus()==FilletSurf_OneExtremityOnEdge)
       {di<<" type end fillets = WLBLSTOP"<<"\n";}
-    else if (Rakk.EndSectionStatus()==FilletSurf_TwoExtremityOnEdge) 
+    else if (aRakk.EndSectionStatus()==FilletSurf_TwoExtremityOnEdge)
       { di<<" type end fillets = WLBLEND"<<"\n";}
     Standard_Real f,l;
-    f = Rakk.FirstParameter();
-    l = Rakk.LastParameter();
+    f = aRakk.FirstParameter();
+    l = aRakk.LastParameter();
     //cout<<"parameter on edge start : "<<f<<endl;
     //cout<<"parameter on edge end   : "<<l<<endl;
     di<<"parametre on edge start : "<<f<<"\n";
@@ -560,52 +560,52 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons
     for (i=1;i<=nb;i++){
       //precision 
       //cout<<"precision "<< i << "= "<<Rakk.TolApp3d(i)<<endl;
-      di<<"precision "<< i << "= "<<Rakk.TolApp3d(i)<<"\n";
+      di<<"precision "<< i << "= "<<aRakk.TolApp3d(i)<<"\n";
       
       // display resulting surfaces  
       Sprintf(localname, "%s%d" ,ns0,i);
       temp = localname;
-      DrawTrSurf::Set(temp,Rakk.SurfaceFillet(i));
+      DrawTrSurf::Set(temp,aRakk.SurfaceFillet(i));
       di << localname<< " ";
       
       // display curves 3d 
       Sprintf(localname, "%s%d" ,"courb1",i);
       temp =localname; 
-      DrawTrSurf::Set(temp,Rakk.CurveOnFace1(i));
+      DrawTrSurf::Set(temp,aRakk.CurveOnFace1(i));
       di << localname<< " ";
       Sprintf(localname, "%s%d" ,"courb2",i);
       temp =localname;
-      DrawTrSurf::Set(temp,Rakk.CurveOnFace2(i));
+      DrawTrSurf::Set(temp,aRakk.CurveOnFace2(i));
       di << localname<< " ";     
       
       // display supports 
       Sprintf(localname, "%s%d" ,"face1",i);
       temp =localname ;
-      DBRep::Set(temp,Rakk.SupportFace1(i));
+      DBRep::Set(temp,aRakk.SupportFace1(i));
       di << localname<< " ";
       Sprintf(localname, "%s%d" ,"face2",i);
       temp =localname; 
-      DBRep::Set(temp,Rakk.SupportFace2(i));
+      DBRep::Set(temp,aRakk.SupportFace2(i));
       di << localname<< " ";
       
       // display Pcurves on faces 
       Sprintf(localname, "%s%d" ,"pcurveonface1",i);
       temp =localname ;
-      DrawTrSurf::Set(temp,Rakk.PCurveOnFace1(i));
+      DrawTrSurf::Set(temp,aRakk.PCurveOnFace1(i));
       di << localname<< " ";
       Sprintf(localname, "%s%d" ,"pcurveonface2",i);
       temp =localname; 
-      DrawTrSurf::Set(temp,Rakk.PCurveOnFace2(i));
+      DrawTrSurf::Set(temp,aRakk.PCurveOnFace2(i));
       di << localname<< " ";
       
       // display Pcurves on the fillet
       Sprintf(localname, "%s%d" ,"pcurveonconge1",i);
       temp =localname;
-      DrawTrSurf::Set(temp,Rakk.PCurve1OnFillet(i));
+      DrawTrSurf::Set(temp,aRakk.PCurve1OnFillet(i));
       di << localname<< " ";
       Sprintf(localname, "%s%d" ,"pcurveonconge2",i);
       temp =localname; 
-      DrawTrSurf::Set(temp,Rakk.PCurve2OnFillet(i));
+      DrawTrSurf::Set(temp,aRakk.PCurve2OnFillet(i));
       di << localname<< " ";
       
     } }
@@ -613,10 +613,10 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons
    Standard_Integer j;
   
    for (i=1;i<=nb;i++)
-    {Standard_Integer s=Rakk.NbSection(i);
+    {Standard_Integer s=aRakk.NbSection(i);
     for (j=1;j<=s;j++)
      {Handle(Geom_TrimmedCurve Sec);
-     Rakk.Section(i,j,Sec);
+     aRakk.Section(i,j,Sec);
     Sprintf(localname, "%s%d%d" ,"sec",i,j);
      temp =localname;
     DrawTrSurf::Set (temp,Sec);
index 92e5000..c7a6e37 100755 (executable)
@@ -19,7 +19,7 @@
 //26-04-1997 modified by pmn : Initialisation plus fine de la resolution
 
 Standard_Integer Blend_Walking::ArcToRecadre(const Standard_Boolean OnFirst,
-                                            const math_Vector& sol,
+                                            const math_Vector& theSol,
                                             const Standard_Integer PrevIndex,
                                             gp_Pnt2d& lastpt2d,
                                             gp_Pnt2d& pt2d,
@@ -34,12 +34,12 @@ Standard_Integer Blend_Walking::ArcToRecadre(const Standard_Boolean OnFirst,
 
   if (OnFirst) {
     if(byinter) previousP.ParametersOnS1(uprev,vprev);
-    pt2d.SetCoord(sol(1),sol(2));
+    pt2d.SetCoord(theSol(1),theSol(2));
     Iter = recdomain1;
   }
   else {
     if(byinter) previousP.ParametersOnS2(uprev,vprev);
-    pt2d.SetCoord(sol(3),sol(4));
+    pt2d.SetCoord(theSol(3),theSol(4));
     Iter = recdomain2;
   }
   lastpt2d.SetCoord(uprev,vprev);
@@ -75,7 +75,7 @@ Standard_Integer Blend_Walking::ArcToRecadre(const Standard_Boolean OnFirst,
 
 Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
                                        const Standard_Boolean OnFirst,
-                                       const math_Vector& sol,
+                                       const math_Vector& theSol,
                                        math_Vector& solrst,
                                        Standard_Integer& Indexsol,
                                        Standard_Boolean& IsVtx,
@@ -100,7 +100,7 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
   if (OnFirst) Iter = recdomain1;
   else         Iter = recdomain2;
 
-  Indexsol = ArcToRecadre(OnFirst, sol, 0, 
+  Indexsol = ArcToRecadre(OnFirst, theSol, 0,
                          lastpt2d, pt2d, pmin);
   IsVtx = Standard_False;
   if (Indexsol == 0) {
@@ -175,12 +175,12 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
       if (OnFirst) {
        previousP.ParametersOnS2(u,v);
        Pnt1.SetCoord(u, v);
-       Pnt2.SetCoord(sol(3), sol(4));
+       Pnt2.SetCoord(theSol(3), theSol(4));
       }
       else {
        previousP.ParametersOnS1(u,v);
        Pnt1.SetCoord(u, v);
-       Pnt2.SetCoord(sol(1), sol(2));
+       Pnt2.SetCoord(theSol(1), theSol(2));
       }
 
       lambda = Pnt.Distance(lastpt2d);
@@ -196,12 +196,12 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
     solrst(1) = pmin;
     solrst(2) = param; 
     if (OnFirst) {
-      solrst(3) = sol(3);
-      solrst(4) = sol(4);
+      solrst(3) = theSol(3);
+      solrst(4) = theSol(4);
     }
     else {
-      solrst(3) = sol(1);
-      solrst(4) = sol(2);
+      solrst(3) = theSol(1);
+      solrst(4) = theSol(2);
     }
   }
 
@@ -288,7 +288,7 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
   if ((!recadre) && 
       ((Abs(pmin-ulast) < dist) || (Abs(pmin-ufirst) < dist)) ) {
 
-    Indexsol =  ArcToRecadre(OnFirst, sol, Indexsol, 
+    Indexsol =  ArcToRecadre(OnFirst, theSol, Indexsol,
                             lastpt2d, pt2d, pmin);
     if (Indexsol == 0) {
       return Standard_False;
index 8ff6235..3204c0b 100644 (file)
@@ -455,10 +455,10 @@ Standard_Boolean ChFi2d_AnaFilletAlgo::Perform(const Standard_Real radius)
 }
 
 // Retrieves a result (fillet and shrinked neighbours).
-const TopoDS_Edge& ChFi2d_AnaFilletAlgo::Result(TopoDS_Edge& e1, TopoDS_Edge& e2)
+const TopoDS_Edge& ChFi2d_AnaFilletAlgo::Result(TopoDS_Edge& theE1, TopoDS_Edge& theE2)
 {
-  e1 = shrinke1;
-  e2 = shrinke2;
+  theE1 = shrinke1;
+  theE2 = shrinke2;
   return fillet;
 }
 
@@ -868,14 +868,14 @@ Standard_Boolean ChFi2d_AnaFilletAlgo::ArcFilletArc(const Standard_Real radius,
 }
 
 // Cuts intersecting edges of a contour.
-Standard_Boolean ChFi2d_AnaFilletAlgo::Cut(const gp_Pln& plane, TopoDS_Edge& e1, TopoDS_Edge& e2)
+Standard_Boolean ChFi2d_AnaFilletAlgo::Cut(const gp_Pln& thePlane, TopoDS_Edge& theE1, TopoDS_Edge& theE2)
 {
   gp_Pnt p;
   Standard_Boolean found(Standard_False);
   Standard_Real param1 = 0.0, param2 = 0.0;
   Standard_Real f1, l1, f2, l2;
-  Handle(Geom_Curve) c1 = BRep_Tool::Curve(e1, f1, l1);
-  Handle(Geom_Curve) c2 = BRep_Tool::Curve(e2, f2, l2);
+  Handle(Geom_Curve) c1 = BRep_Tool::Curve(theE1, f1, l1);
+  Handle(Geom_Curve) c2 = BRep_Tool::Curve(theE2, f2, l2);
   GeomAPI_ExtremaCurveCurve extrema(c1, c2, f1, l1, f2, l2);
   if (extrema.NbExtrema())
   {
@@ -902,14 +902,14 @@ Standard_Boolean ChFi2d_AnaFilletAlgo::Cut(const gp_Pln& plane, TopoDS_Edge& e1,
     BRepBuilderAPI_MakeEdge mkEdge1(c1, f1, param1);
     if (mkEdge1.IsDone())
     {
-      e1 = mkEdge1.Edge();
+      theE1 = mkEdge1.Edge();
 
       BRepBuilderAPI_MakeEdge mkEdge2(c2, param2, l2);
       if (mkEdge2.IsDone())
       {
-        e2 = mkEdge2.Edge();
+        theE2 = mkEdge2.Edge();
 
-        gp_Pnt2d p2d = ProjLib::Project(plane, p);
+        gp_Pnt2d p2d = ProjLib::Project(thePlane, p);
         p2d.Coord(x12, y12);
         x21 = x12;
         y21 = y12;
index d70b332..bf9ec09 100755 (executable)
@@ -1223,7 +1223,7 @@ extern void (*Draw_AfterCommand)(Standard_Integer);
 //function : Commands
 //purpose  : 
 //=======================================================================
-void  Draw::VariableCommands(Draw_Interpretor& theCommands)
+void  Draw::VariableCommands(Draw_Interpretor& theCommandsArg)
 {
   static Standard_Boolean Done = Standard_False;
   if (Done) return;
@@ -1268,50 +1268,49 @@ void  Draw::VariableCommands(Draw_Interpretor& theCommands)
 
   g = "DRAW Numeric functions";
 
-  theCommands.Add("cos" ,"cos(x)" ,__FILE__,trigo,g);
-  theCommands.Add("sin" ,"sin(x)" ,__FILE__,trigo,g);
-  theCommands.Add("tan" ,"tan(x)" ,__FILE__,trigo,g);
-  theCommands.Add("acos" ,"acos(x)" ,__FILE__,trigo,g);
-  theCommands.Add("asin" ,"asin(x)" ,__FILE__,trigo,g);
-  theCommands.Add("atan2" ,"atan2(x,y)" ,__FILE__,trigo,g);
-  theCommands.Add("sqrt","sqrt(x)",__FILE__,trigo,g);
+  theCommandsArg.Add("cos" ,"cos(x)" ,__FILE__,trigo,g);
+  theCommandsArg.Add("sin" ,"sin(x)" ,__FILE__,trigo,g);
+  theCommandsArg.Add("tan" ,"tan(x)" ,__FILE__,trigo,g);
+  theCommandsArg.Add("acos" ,"acos(x)" ,__FILE__,trigo,g);
+  theCommandsArg.Add("asin" ,"asin(x)" ,__FILE__,trigo,g);
+  theCommandsArg.Add("atan2" ,"atan2(x,y)" ,__FILE__,trigo,g);
+  theCommandsArg.Add("sqrt","sqrt(x)",__FILE__,trigo,g);
 
   g = "DRAW Variables management";
 
-  theCommands.Add("protect","protect name ...",__FILE__,protect,g);
-  theCommands.Add("unprotect","unprotect name ...",__FILE__,protect,g);
+  theCommandsArg.Add("protect","protect name ...",__FILE__,protect,g);
+  theCommandsArg.Add("unprotect","unprotect name ...",__FILE__,protect,g);
 
-  theCommands.Add("bsave","bsave name filename",__FILE__,save,g);
-  theCommands.Add("brestore","brestore filename name",__FILE__,restore,g);
+  theCommandsArg.Add("bsave","bsave name filename",__FILE__,save,g);
+  theCommandsArg.Add("brestore","brestore filename name",__FILE__,restore,g);
 
-  theCommands.Add("isdraw","isdraw var, return 1 if Draw value",__FILE__,isdraw,g);
-  theCommands.Add("isprot","isprot var, return 1 if Draw var is protected",__FILE__,isprot,g);
+  theCommandsArg.Add("isdraw","isdraw var, return 1 if Draw value",__FILE__,isdraw,g);
+  theCommandsArg.Add("isprot","isprot var, return 1 if Draw var is protected",__FILE__,isprot,g);
   
-  theCommands.Add("autodisplay","toggle autodisplay [0/1]",__FILE__,autodisplay,g);
-  theCommands.Add("display","display [name1 name2 ...], no names display all",__FILE__,display,g);
-  theCommands.Add("donly","donly [name1 name2 ...], erase and display",__FILE__,erase,g);
-  theCommands.Add("erase","erase [name1 name2 ...], no names erase all",__FILE__,erase,g);
-  theCommands.Add("draw","draw view mode [name1 name2 ...], draw on view with mode",__FILE__,draw,g);
-  theCommands.Add("clear","clear display",__FILE__,erase,g);
-  theCommands.Add("2dclear","clear display (2d objects)",__FILE__,erase,g);
-  theCommands.Add("repaint","repaint, force redraw",__FILE__,repaintall,g);
-
-  theCommands.Add("dtyp", "dtyp name1 name2",__FILE__,whatis,g);
-  theCommands.Add("dval", "dval name, return value",__FILE__,value,g);
-  theCommands.Add("dname", "dname name, print name",__FILE__,dname,g);
-  theCommands.Add("dump", "dump name1 name2 ...",__FILE__,dump,g);
-  theCommands.Add("copy",  "copy name1 toname1 name2 toname2 ...",__FILE__,copy,g);
+  theCommandsArg.Add("autodisplay","toggle autodisplay [0/1]",__FILE__,autodisplay,g);
+  theCommandsArg.Add("display","display [name1 name2 ...], no names display all",__FILE__,display,g);
+  theCommandsArg.Add("donly","donly [name1 name2 ...], erase and display",__FILE__,erase,g);
+  theCommandsArg.Add("erase","erase [name1 name2 ...], no names erase all",__FILE__,erase,g);
+  theCommandsArg.Add("draw","draw view mode [name1 name2 ...], draw on view with mode",__FILE__,draw,g);
+  theCommandsArg.Add("clear","clear display",__FILE__,erase,g);
+  theCommandsArg.Add("2dclear","clear display (2d objects)",__FILE__,erase,g);
+  theCommandsArg.Add("repaint","repaint, force redraw",__FILE__,repaintall,g);
+
+  theCommandsArg.Add("dtyp", "dtyp name1 name2",__FILE__,whatis,g);
+  theCommandsArg.Add("dval", "dval name, return value",__FILE__,value,g);
+  theCommandsArg.Add("dname", "dname name, print name",__FILE__,dname,g);
+  theCommandsArg.Add("dump", "dump name1 name2 ...",__FILE__,dump,g);
+  theCommandsArg.Add("copy",  "copy name1 toname1 name2 toname2 ...",__FILE__,copy,g);
   // san - 02/08/2002 - `rename` command changed to `renamevar` since it conflicts with 
   // the built-in Tcl command `rename`
   //theCommands.Add("rename","rename name1 toname1 name2 toname2 ...",__FILE__,copy,g);
-  theCommands.Add("renamevar","renamevar name1 toname1 name2 toname2 ...",__FILE__,copy,g);
-  theCommands.Add("dset","var1 value1 vr2 value2 ...",__FILE__,set,g);
+  theCommandsArg.Add("renamevar","renamevar name1 toname1 name2 toname2 ...",__FILE__,copy,g);
+  theCommandsArg.Add("dset","var1 value1 vr2 value2 ...",__FILE__,set,g);
 
   // commands to access C environment variables; see Mantis issue #23197
-  theCommands.Add("dgetenv","var : get value of environment variable in C subsystem",__FILE__,dgetenv,g);
-  theCommands.Add("dsetenv","var [value] : set (unset if value is empty) environment variable in C subsystem",__FILE__,dsetenv,g);
-
-  theCommands.Add("pick","pick id X Y Z b [nowait]",__FILE__,pick,g);
-  theCommands.Add("lastrep","lastrep id X Y [Z] b, return name",__FILE__,lastrep,g);
+  theCommandsArg.Add("dgetenv","var : get value of environment variable in C subsystem",__FILE__,dgetenv,g);
+  theCommandsArg.Add("dsetenv","var [value] : set (unset if value is empty) environment variable in C subsystem",__FILE__,dsetenv,g);
 
+  theCommandsArg.Add("pick","pick id X Y Z b [nowait]",__FILE__,pick,g);
+  theCommandsArg.Add("lastrep","lastrep id X Y [Z] b, return name",__FILE__,lastrep,g);
 }
index adbb8d3..f4efe6d 100755 (executable)
@@ -165,8 +165,8 @@ Draw_View::Draw_View(Standard_Integer i, Draw_Viewer* v,
                        Standard_Integer Y,
                        Standard_Integer W,
                        Standard_Integer H,
-      HWND win) :
-     Draw_Window("Win", X, Y, W, H, win), id(i), viewer(v)
+      HWND theWin) :
+     Draw_Window("Win", X, Y, W, H, theWin), id(i), viewer(v)
 {
   Framex0=Framey0=Framex1=Framey1=0;
 }
index 88b878b..dbff7cc 100755 (executable)
@@ -102,11 +102,11 @@ Handle(GeomFill_TrihedronLaw) GeomFill_Fixed::Copy() const
   return 1;
 }
 
- void GeomFill_Fixed::Intervals(TColStd_Array1OfReal& T,
+ void GeomFill_Fixed::Intervals(TColStd_Array1OfReal& theT,
                                            const GeomAbs_Shape) const
 {
-  T(T.Lower()) = - Precision::Infinite();
-  T(T.Upper()) =   Precision::Infinite();
+  theT(theT.Lower()) = - Precision::Infinite();
+  theT(theT.Upper()) =   Precision::Infinite();
 }
 
  void GeomFill_Fixed::GetAverageLaw(gp_Vec& ATangent,
index 3902ac9..db2eb71 100755 (executable)
@@ -40,12 +40,12 @@ GeomFill_LocFunction::GeomFill_LocFunction(const Handle(GeomFill_LocationLaw)& L
 //                                        const Standard_Real Last) 
                                           const Standard_Real ) 
 {
-  gp_Mat M;
+  gp_Mat aM;
   Standard_Boolean B;
-  B = myLaw->D0(Param, M, V.ChangeValue(1));
-  V(2).SetXYZ(M.Column(1));
-  V(3).SetXYZ(M.Column(2));
-  V(4).SetXYZ(M.Column(3));  
+  B = myLaw->D0(Param, aM, V.ChangeValue(1));
+  V(2).SetXYZ(aM.Column(1));
+  V(3).SetXYZ(aM.Column(2));
+  V(4).SetXYZ(aM.Column(3));
   return B;
 }
 
@@ -57,19 +57,19 @@ GeomFill_LocFunction::GeomFill_LocFunction(const Handle(GeomFill_LocationLaw)& L
 {
   TColgp_Array1OfPnt2d T1(1,1);
   TColgp_Array1OfVec2d T2(1,1);
-  gp_Mat M, DM;
+  gp_Mat aM, aDM;
   Standard_Boolean B;
-  B = myLaw->D1(Param, M, V.ChangeValue(1),
-               DM, DV.ChangeValue(1), 
+  B = myLaw->D1(Param, aM, V.ChangeValue(1),
+               aDM, DV.ChangeValue(1),
                T1, T2);
 
-  V(2).SetXYZ(M.Column(1));
-  V(3).SetXYZ(M.Column(2));
-  V(4).SetXYZ(M.Column(3));
+  V(2).SetXYZ(aM.Column(1));
+  V(3).SetXYZ(aM.Column(2));
+  V(4).SetXYZ(aM.Column(3));
 
-  DV(2).SetXYZ(DM.Column(1));
-  DV(3).SetXYZ(DM.Column(2));
-  DV(4).SetXYZ(DM.Column(3)); 
+  DV(2).SetXYZ(aDM.Column(1));
+  DV(3).SetXYZ(aDM.Column(2));
+  DV(4).SetXYZ(aDM.Column(3));
   return B;
 }
 
@@ -81,24 +81,24 @@ GeomFill_LocFunction::GeomFill_LocFunction(const Handle(GeomFill_LocationLaw)& L
 {
   TColgp_Array1OfPnt2d T1(1,1);
   TColgp_Array1OfVec2d T2(1,1), T3(1,1);
-  gp_Mat M, DM, D2M;
+  gp_Mat aM, aDM, aD2M;
   Standard_Boolean B;
-  B = myLaw->D2(Param, M, V.ChangeValue(1),
-               DM, DV.ChangeValue(1),
-               D2M, D2V.ChangeValue(1), 
+  B = myLaw->D2(Param, aM, V.ChangeValue(1),
+               aDM, DV.ChangeValue(1),
+               aD2M, D2V.ChangeValue(1),
                T1, T2, T3);
-  V(2).SetXYZ(M.Column(1));
-  V(3).SetXYZ(M.Column(2));
-  V(4).SetXYZ(M.Column(3));
+  V(2).SetXYZ(aM.Column(1));
+  V(3).SetXYZ(aM.Column(2));
+  V(4).SetXYZ(aM.Column(3));
 
-  DV(2).SetXYZ(DM.Column(1));
-  DV(3).SetXYZ(DM.Column(2));
-  DV(4).SetXYZ(DM.Column(3)); 
+  DV(2).SetXYZ(aDM.Column(1));
+  DV(3).SetXYZ(aDM.Column(2));
+  DV(4).SetXYZ(aDM.Column(3));
 
 
-  D2V(2).SetXYZ(D2M.Column(1));
-  D2V(3).SetXYZ(D2M.Column(2));
-  D2V(4).SetXYZ(D2M.Column(3)); 
+  D2V(2).SetXYZ(aD2M.Column(1));
+  D2V(3).SetXYZ(aD2M.Column(2));
+  D2V(4).SetXYZ(aD2M.Column(3));
 
   return B;  
 }
index 01de3eb..bbc8cc4 100755 (executable)
 #include <GeomFill_PlanFunc.ixx>
 
 
-GeomFill_PlanFunc::GeomFill_PlanFunc(const gp_Pnt& P,
-                                     const gp_Vec& V,
-                                     const Handle(Adaptor3d_HCurve)& C) :
-                                     myCurve(C)
+GeomFill_PlanFunc::GeomFill_PlanFunc(const gp_Pnt& theP,
+                                     const gp_Vec& theV,
+                                     const Handle(Adaptor3d_HCurve)& theC) :
+                                     myCurve(theC)
 {
-  myPnt = P.XYZ();
-  myVec = V.XYZ();
+  myPnt = theP.XYZ();
+  myVec = theV.XYZ();
 }
 
 
index fb52a02..f299574 100755 (executable)
@@ -356,11 +356,11 @@ void GeomFill_SweepFunction::Resolution(const Standard_Integer Index,
 {
   gp_Pnt Bary;
   gp_Vec Translate;
-  gp_Mat M;
+  gp_Mat aM;
 
   Bary =  mySec->BarycentreOfSurf();
-  myLoc->GetAverageLaw(M, Translate);
-  Bary.ChangeCoord() *= M;
+  myLoc->GetAverageLaw(aM, Translate);
+  Bary.ChangeCoord() *= aM;
   Bary.ChangeCoord() += Translate.XYZ();
 
   return Bary;
index 7870723..2063158 100755 (executable)
@@ -36,14 +36,14 @@ GeomLib_LogSample::GeomLib_LogSample(const Standard_Real A,
 
 Standard_Real GeomLib_LogSample::GetParameter(const Standard_Integer Index) const
 {
-  Standard_Integer n = NbPoints();
+  Standard_Integer aN = NbPoints();
  
 
-  if ((Index >= n) || (Index <= 1)) {
-    Standard_Real a, b;
-    Bounds(a, b);
-    if (Index == 1) return a;
-    else if (Index == n) return b;
+  if ((Index >= aN) || (Index <= 1)) {
+    Standard_Real aA, aB;
+    Bounds(aA, aB);
+    if (Index == 1) return aA;
+    else if (Index == aN) return aB;
     else Standard_OutOfRange::Raise("GeomLib_LogSample::GetParameter");
   }
 
index 6830eb9..615f003 100755 (executable)
@@ -79,13 +79,13 @@ IFSelect_SignatureList::IFSelect_SignatureList
 
     void IFSelect_SignatureList::Init
   (const Standard_CString name,
-   const Handle(Dico_DictionaryOfInteger)&   count,
+   const Handle(Dico_DictionaryOfInteger)&   theCount,
    const Handle(Dico_DictionaryOfTransient)& list,
    const Standard_Integer nbnuls)
 {
   thelastval.Clear();
   thename    = new TCollection_HAsciiString (name);
-  thedicount = count;
+  thedicount = theCount;
   thediclist = list;
   thenbnuls  = nbnuls;
   if (thediclist.IsNull()) thelistat = Standard_False;
index 3806b9a..9947940 100755 (executable)
@@ -64,7 +64,7 @@ void IntImpParGen_Intersector::And_Domaine_Objet1_Intersections(const ImpTool& T
   NbResultats=0;
   
   for(Standard_Integer i=1; i<=Nb_Bornes_Intersection; i+=2) {
-    Standard_Boolean reverse=Standard_False;
+    Standard_Boolean aReverse=Standard_False;
     
     Standard_Real param1=Inter1.Value(i);
     Standard_Real param2=Inter1.Value(i+1);
@@ -76,7 +76,7 @@ void IntImpParGen_Intersector::And_Domaine_Objet1_Intersections(const ImpTool& T
       Standard_Real t=param1; param1=param2; param2=t;
       indice_1=i+1;
       indice_2=i;
-      reverse=Standard_True;
+      aReverse=Standard_True;
     }
 
     gp_Pnt2d Pt1=TheImpTool.Value(param1);
index 33f044a..b72b7fd 100755 (executable)
@@ -482,10 +482,10 @@ Standard_Integer PCollection_HAsciiString::Location
 {
    if (ToIndex > Length() || FromIndex <= 0 || FromIndex > ToIndex ) 
                       Standard_OutOfRange::Raise();
-   for(Standard_Integer i = FromIndex-1, count = 0; i <= ToIndex-1; i++) 
+   for(Standard_Integer i = FromIndex-1, aCount = 0; i <= ToIndex-1; i++)
               if(Data(i) == C) {
-               count++;
-               if ( count == N ) return (i+1);
+               aCount++;
+               if ( aCount == N ) return (i+1);
              }
    return 0 ;
 }
index c0df021..3d0eaee 100755 (executable)
@@ -1182,13 +1182,13 @@ static Standard_Integer OCC884 (Draw_Interpretor& di, Standard_Integer argc, con
   di << "Info: No. of self-intersection points : " << num << "\n";
 
   char str[80];
-  Standard_CString name = str;
+  Standard_CString aName = str;
   for (i = 1; i <= num; ++i)
   { 
     gp_Pnt pt = points3d(i); 
     di << "Info: Intersecting pt : (" << pt.X() << ", " << pt.Y() << ", " << pt.Z() << ")\n";
     Sprintf(str,"p_%d",i);
-    DrawTrSurf::Set(name,pt);
+    DrawTrSurf::Set(aName,pt);
   }
 
   Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire;
index 3c6393e..b048647 100755 (executable)
@@ -136,12 +136,12 @@ Update()
   
   switch(mytype){
   case StdSelect_TOR_MULTIPLE:{
-    TColStd_MapIteratorOfMapOfInteger it;
+    TColStd_MapIteratorOfMapOfInteger aIt;
     if(!myselector->More())
       {
-       for(it.Initialize(myold);it.More();it.Next())
-         {myhimap.FindFromIndex(it.Key())->UnHighlight();
-          myhimap.FindFromIndex(it.Key())->SetVisible(Standard_False);
+       for(aIt.Initialize(myold);aIt.More();aIt.Next())
+         {myhimap.FindFromIndex(aIt.Key())->UnHighlight();
+          myhimap.FindFromIndex(aIt.Key())->SetVisible(Standard_False);
         }
        myold.Clear();
        mynew.Clear();
@@ -168,17 +168,17 @@ Update()
              }
            }
        }
-      for(it.Initialize(myold);it.More();it.Next()){
-       myhimap.FindFromIndex(it.Key())->UnHighlight();
-       myhimap.FindFromIndex(it.Key())->SetVisible(Standard_False);
+      for(aIt.Initialize(myold);aIt.More();aIt.Next()){
+       myhimap.FindFromIndex(aIt.Key())->UnHighlight();
+       myhimap.FindFromIndex(aIt.Key())->SetVisible(Standard_False);
       }
       
       myold = mynew;
       mynew.Clear();
-      for(it.Initialize(myold);it.More();it.Next()){
-       myhimap.FindFromIndex(it.Key())->SetVisible(Standard_True);
-       myhimap.FindFromIndex(it.Key())->SetDisplayPriority(10);
-       myhimap.FindFromIndex(it.Key())->Color(mycolor);
+      for(aIt.Initialize(myold);aIt.More();aIt.Next()){
+       myhimap.FindFromIndex(aIt.Key())->SetVisible(Standard_True);
+       myhimap.FindFromIndex(aIt.Key())->SetDisplayPriority(10);
+       myhimap.FindFromIndex(aIt.Key())->Color(mycolor);
       }
     }
     break;
index 24a350f..7e486a7 100644 (file)
@@ -30,9 +30,9 @@ inline gp_Quaternion::gp_Quaternion()
 //purpose  : 
 //=======================================================================
 
-inline gp_Quaternion::gp_Quaternion (const Standard_Real x, const Standard_Real y, 
-                                     const Standard_Real z, const Standard_Real w)
-: x(x), y(y), z(z), w(w) 
+inline gp_Quaternion::gp_Quaternion (const Standard_Real theX, const Standard_Real theY,
+                                     const Standard_Real theZ, const Standard_Real theW)
+: x(theX), y(theY), z(theZ), w(theW)
 {
 }
 
@@ -42,7 +42,7 @@ inline gp_Quaternion::gp_Quaternion (const Standard_Real x, const Standard_Real
 //=======================================================================
 
 inline gp_Quaternion::gp_Quaternion (const gp_Quaternion& theToCopy)
-: x(theToCopy.x), y(theToCopy.y), z(theToCopy.z), w(theToCopy.w) 
+: x(theToCopy.x), y(theToCopy.y), z(theToCopy.z), w(theToCopy.w)
 {
 }
 
@@ -91,13 +91,13 @@ inline gp_Quaternion::gp_Quaternion (const gp_Mat& theMat)
 //purpose  : 
 //=======================================================================
 
-inline void gp_Quaternion::Set (Standard_Real x, Standard_Real y, 
-                                Standard_Real z, Standard_Real w)
+inline void gp_Quaternion::Set (Standard_Real theX, Standard_Real theY,
+                                Standard_Real theZ, Standard_Real theW)
 {
-  this->x = x; 
-  this->y = y; 
-  this->z = z; 
-  this->w = w;
+  this->x = theX;
+  this->y = theY;
+  this->z = theZ;
+  this->w = theW;
 }
 
 //=======================================================================
index e06513d..9aef4aa 100755 (executable)
@@ -705,16 +705,16 @@ void math_FunctionSetRoot::SetTolerance(const math_Vector& Tolerance)
 
 void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
                                    const math_Vector& StartingPoint,
-                                   const math_Vector& InfBound,
-                                   const math_Vector& SupBound,
+                                   const math_Vector& theInfBound,
+                                   const math_Vector& theSupBound,
                                    Standard_Boolean theStopOnDivergent)
 {
   Standard_Integer Ninc = F.NbVariables(), Neq = F.NbEquations();
 
   if ((Neq <= 0)                      ||
     (StartingPoint.Length()!= Ninc) ||
-    (InfBound.Length() != Ninc)     ||
-    (SupBound.Length() != Ninc))  { Standard_DimensionError:: Raise(); }
+    (theInfBound.Length() != Ninc)     ||
+    (theSupBound.Length() != Ninc))  { Standard_DimensionError:: Raise(); }
 
   Standard_Integer i;
   Standard_Boolean ChangeDirection = Standard_False, Sort = Standard_False, isNewSol = Standard_False;
@@ -724,11 +724,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
   Standard_Real F2, PreviousMinimum, Dy, OldF;
   Standard_Real Ambda, Ambda2, Gnr1, Oldgr;
   math_Vector InvLengthMax(1, Ninc); // Pour bloquer les pas a 1/4 du domaine
-  math_IntegerVector Constraints(1, Ninc); // Pour savoir sur quels bord on se trouve
+  math_IntegerVector aConstraints(1, Ninc); // Pour savoir sur quels bord on se trouve
   for (i = 1; i <= Ninc ; i++) {
     // modified by NIZHNY-MKK  Mon Oct  3 18:03:50 2005
     //      InvLengthMax(i) = 1. / Max(Abs(SupBound(i) - InfBound(i))/4, 1.e-9);
-    InvLengthMax(i) = 1. / Max((SupBound(i) - InfBound(i))/4, 1.e-9);
+    InvLengthMax(i) = 1. / Max((theSupBound(i) - theInfBound(i))/4, 1.e-9);
   }
 
   MyDirFunction F_Dir(Temp1, Temp2, Temp3, Temp4, F);
@@ -742,7 +742,7 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
   myIsDivergent = Standard_False;
   for (i = 1; i <= Ninc; i++)
   {
-    myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+    myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
   }
   if (theStopOnDivergent & myIsDivergent)
   {
@@ -751,8 +751,8 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
   // Verification de la validite des inconnues par rapport aux bornes.
   // Recentrage sur les bornes si pas valide.
   for ( i = 1; i <= Ninc; i++) {
-    if (Sol(i) <= InfBound(i)) Sol(i) = InfBound(i);
-    else if (Sol(i) > SupBound(i)) Sol(i) = SupBound(i);
+    if (Sol(i) <= theInfBound(i)) Sol(i) = theInfBound(i);
+    else if (Sol(i) > theSupBound(i)) Sol(i) = theSupBound(i);
   }
 
   // Calcul de la premiere valeur de F et de son gradient
@@ -817,15 +817,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
     //
     for (i = 1; i <= Ninc; i++)
     {
-      myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+      myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
     }
     if (theStopOnDivergent & myIsDivergent)
     {
       return;
     }
     //
-    Sort = Bounds(InfBound, SupBound, Tol, Sol, SolSave,
-      Constraints, Delta, isNewSol);
+    Sort = Bounds(theInfBound, theSupBound, Tol, Sol, SolSave,
+      aConstraints, Delta, isNewSol);
 
 
     DHSave = GH;
@@ -883,15 +883,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
             //
             for (i = 1; i <= Ninc; i++)
             {
-              myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+              myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
             }
             if (theStopOnDivergent & myIsDivergent)
             {
               return;
             }
             //
-            Stop = Bounds(InfBound, SupBound, Tol, Sol, SolSave, 
-              Constraints, Delta, isNewSol);
+            Stop = Bounds(theInfBound, theSupBound, Tol, Sol, SolSave,
+              aConstraints, Delta, isNewSol);
             FSR_DEBUG(" Augmentation de lambda");
             Ambda *= 1.7;
           }
@@ -921,15 +921,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
                 //
                 for (i = 1; i <= Ninc; i++)
                 {
-                  myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+                  myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
                 }
                 if (theStopOnDivergent & myIsDivergent)
                 {
                   return;
                 }
                 //
-                Sort = Bounds(InfBound, SupBound, Tol, Sol, SolSave,
-                  Constraints, Delta, isNewSol);
+                Sort = Bounds(theInfBound, theSupBound, Tol, Sol, SolSave,
+                  aConstraints, Delta, isNewSol);
               }
               Sort = Standard_False; // On a rejete le point sur la frontiere
             }
@@ -982,7 +982,7 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
             // On essaye de progresser sur le bord
             SolSave = Sol;
             OldF = F2;
-            SearchDirection(DF, GH, FF,  Constraints, Sol, 
+            SearchDirection(DF, GH, FF,  aConstraints, Sol,
               ChangeDirection, InvLengthMax, DH, Dy);
             FSR_DEBUG(" Conditional Direction = " << ChangeDirection);
             if (Dy<-Eps) { //Pour eviter des calculs inutiles et des /0...
@@ -1003,15 +1003,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
               //
               for (i = 1; i <= Ninc; i++)
               {
-                myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+                myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
               }
               if (theStopOnDivergent & myIsDivergent)
               {
                 return;
               }
               //
-              Sortbis = Bounds(InfBound, SupBound, Tol, Sol, SolSave,
-                Constraints, Delta, isNewSol);
+              Sortbis = Bounds(theInfBound, theSupBound, Tol, Sol, SolSave,
+                aConstraints, Delta, isNewSol);
 
               DHSave = GH;
               if (isNewSol) {
@@ -1046,15 +1046,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
                 //
                 for (i = 1; i <= Ninc; i++)
                 {
-                  myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+                  myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
                 }
                 if (theStopOnDivergent & myIsDivergent)
                 {
                   return;
                 }
                 //
-                Sortbis = Bounds(InfBound, SupBound, Tol, Sol, SolSave,
-                  Constraints, Delta, isNewSol);     
+                Sortbis = Bounds(theInfBound, theSupBound, Tol, Sol, SolSave,
+                  aConstraints, Delta, isNewSol);
               }
               DHSave = GH;
               if (isNewSol) {
@@ -1089,15 +1089,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
               //
               for (i = 1; i <= Ninc; i++)
               {
-                myIsDivergent |= (Sol(i) < InfBound(i)) | (SupBound(i) < Sol(i));
+                myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
               }
               if (theStopOnDivergent & myIsDivergent)
               {
                 return;
               }
               //
-              Sort = Bounds(InfBound, SupBound, Tol, Sol, SolSave,
-                Constraints, Delta, isNewSol);
+              Sort = Bounds(theInfBound, theSupBound, Tol, Sol, SolSave,
+                aConstraints, Delta, isNewSol);
               if (isNewSol) {
                 //              F_Dir.Value(Sol, FF, DF, GH, F2, Gnr1);
                 if(!F_Dir.Value(Sol, FF, DF, GH, F2, Gnr1)) {