1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0024814: Avoid using explicit names of Handle classes

Sources corrected replacing Handle_XXX by Handle(XXX)
This commit is contained in:
abv
2014-04-09 18:48:28 +04:00
parent 6fc9d72d9d
commit 857ffd5e57
211 changed files with 697 additions and 697 deletions

View File

@@ -47,8 +47,8 @@ static
const Standard_Real AngDef);
static
Standard_Boolean SameCurve(const Handle_Adaptor2d_HCurve2d& C1,
const Handle_Adaptor2d_HCurve2d& C2);
Standard_Boolean SameCurve(const Handle(Adaptor2d_HCurve2d)& C1,
const Handle(Adaptor2d_HCurve2d)& C2);
static
void RecadreMemePeriode(Standard_Real& u1,
@@ -904,7 +904,7 @@ gp_Pnt DefineDU(const Handle(IntPatch_ALine)& aline,
//function : SameCurve
//purpose :
//=======================================================================
Standard_Boolean SameCurve(const Handle_Adaptor2d_HCurve2d& C1,const Handle_Adaptor2d_HCurve2d& C2)
Standard_Boolean SameCurve(const Handle(Adaptor2d_HCurve2d)& C1,const Handle(Adaptor2d_HCurve2d)& C2)
{
Standard_Real C1f = C1->FirstParameter();
Standard_Real C2f = C2->FirstParameter();

View File

@@ -123,10 +123,10 @@ const gp_Pnt& IntPatch_CSFunction::Point() const { return p;}
Standard_Real IntPatch_CSFunction::Root() const { return f;}
const Handle_Adaptor3d_HSurface& IntPatch_CSFunction::AuxillarSurface() const {
const Handle(Adaptor3d_HSurface)& IntPatch_CSFunction::AuxillarSurface() const {
return SURFACE1;}
const Handle_Adaptor2d_HCurve2d& IntPatch_CSFunction::AuxillarCurve() const {
const Handle(Adaptor2d_HCurve2d)& IntPatch_CSFunction::AuxillarCurve() const {
return CURVE;}
#undef SURFACE1

View File

@@ -209,7 +209,7 @@ Standard_Integer IntPatch_HInterTool::NbSamplesOnArc (const Handle(Adaptor2d_HCu
nbsOnC = A->NbPoles();
break;
case GeomAbs_BSplineCurve: {
//-- Handle_Geom2d_BSplineCurve& BSC=A->BSpline();
//-- Handle(Geom2d_BSplineCurve)& BSC=A->BSpline();
nbsOnC = 2 + A->NbKnots() * A->Degree();
break;
}

View File

@@ -304,7 +304,7 @@ static void FUN_GetUiso(const Handle(Geom_Surface)& GS,
}
else//OffsetSurface
{
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&GS;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&GS;
const Handle(Geom_Surface) bs = gos->BasisSurface();
Handle(Geom_Curve) gcbs = bs->UIso(U);
GeomAdaptor_Curve gac(gcbs);
@@ -374,7 +374,7 @@ static void FUN_GetViso(const Handle(Geom_Surface)& GS,
}
else//OffsetSurface
{
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&GS;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&GS;
const Handle(Geom_Surface) bs = gos->BasisSurface();
Handle(Geom_Curve) gcbs = bs->VIso(V);
GeomAdaptor_Curve gac(gcbs);
@@ -449,7 +449,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1,
else if(!S1->IsVPeriodic() && !S1->IsVClosed()) {
if(T1 != GeomAbs_OffsetSurface) C1 = gs1->UIso(MS1[0]);
else {
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs1;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs1;
const Handle(Geom_Surface) bs = gos->BasisSurface();
C1 = bs->UIso(MS1[0]);
}
@@ -459,7 +459,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1,
if(!S1->IsUPeriodic() && !S1->IsUClosed()) {
if(T1 != GeomAbs_OffsetSurface) C1 = gs1->VIso(MS1[1]);
else {
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs1;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs1;
const Handle(Geom_Surface) bs = gos->BasisSurface();
C1 = bs->VIso(MS1[1]);
}
@@ -470,7 +470,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1,
else if(!S2->IsVPeriodic() && !S2->IsVClosed()) {
if(T2 != GeomAbs_OffsetSurface) C2 = gs2->UIso(MS2[0]);
else {
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs2;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs2;
const Handle(Geom_Surface) bs = gos->BasisSurface();
C2 = bs->UIso(MS2[0]);
}
@@ -480,7 +480,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1,
if(!S2->IsUPeriodic() && !S2->IsUClosed()) {
if(T2 != GeomAbs_OffsetSurface) C2 = gs2->VIso(MS2[1]);
else {
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs2;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs2;
const Handle(Geom_Surface) bs = gos->BasisSurface();
C2 = bs->VIso(MS2[1]);
}
@@ -546,9 +546,9 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1,
GeomProjLib::ProjectOnPlane(C2,GPln,gp_Dir(DV),Standard_True);
if(C1Prj.IsNull() || C2Prj.IsNull()) return;
Handle(Geom2d_Curve) C1Prj2d =
GeomProjLib::Curve2d(C1Prj,*(Handle_Geom_Surface *)&GPln);
GeomProjLib::Curve2d(C1Prj,*(Handle(Geom_Surface) *)&GPln);
Handle(Geom2d_Curve) C2Prj2d =
GeomProjLib::Curve2d(C2Prj,*(Handle_Geom_Surface *)&GPln);
GeomProjLib::Curve2d(C2Prj,*(Handle(Geom_Surface) *)&GPln);
Geom2dAPI_InterCurveCurve ICC(C1Prj2d,C2Prj2d,1.0e-7);
if(ICC.NbPoints() > 0 )
{
@@ -650,14 +650,14 @@ static void FUN_TrimBothSurf(const Handle(Adaptor3d_HSurface)& S1,
if(T1 != GeomAbs_OffsetSurface){ visoS1 = gs1->VIso(VM1); uisoS1 = gs1->UIso(UM1); }
else
{
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs1;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs1;
const Handle(Geom_Surface) bs = gos->BasisSurface();
visoS1 = bs->VIso(VM1); uisoS1 = bs->UIso(UM1);
}
if(T2 != GeomAbs_OffsetSurface){ visoS2 = gs2->VIso(VM2); uisoS2 = gs2->UIso(UM2); }
else
{
const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs2;
const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs2;
const Handle(Geom_Surface) bs = gos->BasisSurface();
visoS2 = bs->VIso(VM2); uisoS2 = bs->UIso(UM2);
}
@@ -1212,7 +1212,7 @@ void IntPatch_Intersection::ParamParamPerfom(const Handle(Adaptor3d_HSurface)&
{
gp_Lin lin(sop.Value(ip),gp_Dir(v));
Handle(IntPatch_GLine) gl = new IntPatch_GLine(lin,Standard_False);
slin.Append(*(Handle_IntPatch_Line *)&gl);
slin.Append(*(Handle(IntPatch_Line) *)&gl);
}
done = Standard_True;
@@ -1280,7 +1280,7 @@ void IntPatch_Intersection::GeomGeomPerfom(const Handle(Adaptor3d_HSurface)& the
for (Standard_Integer i = 1; i <= interii.NbLines(); i++)
{
const Handle_IntPatch_Line& line = interii.Line(i);
const Handle(IntPatch_Line)& line = interii.Line(i);
if (line->ArcType() == IntPatch_Analytic)
{
const GeomAbs_SurfaceType typs1 = theS1->GetType();
@@ -1339,7 +1339,7 @@ void IntPatch_Intersection::GeomGeomPerfom(const Handle(Adaptor3d_HSurface)& the
}
IntPatch_ALineToWLine AToW(Quad1,Quad2,0.01,0.05,aNbPointsInALine);
Handle(IntPatch_Line) wlin=AToW.MakeWLine((*((Handle_IntPatch_ALine *)(&line))));
Handle(IntPatch_Line) wlin=AToW.MakeWLine((*((Handle(IntPatch_ALine) *)(&line))));
slin.Append(wlin);
}
else
@@ -1392,7 +1392,7 @@ void IntPatch_Intersection::GeomParamPerfom(const Handle(Adaptor3d_HSurface)& t
{
gp_Lin lin(sop.Value(ip),gp_Dir(v));
Handle(IntPatch_GLine) gl = new IntPatch_GLine(lin,Standard_False);
slin.Append(*(Handle_IntPatch_Line *)&gl);
slin.Append(*(Handle(IntPatch_Line) *)&gl);
}
done = Standard_True;
@@ -1515,15 +1515,15 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& S1,
#define MAXR 200
//void IntPatch_Intersection__MAJ_R(Handle_Adaptor2d_HCurve2d *R1,
// Handle_Adaptor2d_HCurve2d *R2,
//void IntPatch_Intersection__MAJ_R(Handle(Adaptor2d_HCurve2d) *R1,
// Handle(Adaptor2d_HCurve2d) *R2,
// int *NR1,
// int *NR2,
// Standard_Integer nbR1,
// Standard_Integer nbR2,
// const IntPatch_Point& VTX)
void IntPatch_Intersection__MAJ_R(Handle_Adaptor2d_HCurve2d *,
Handle_Adaptor2d_HCurve2d *,
void IntPatch_Intersection__MAJ_R(Handle(Adaptor2d_HCurve2d) *,
Handle(Adaptor2d_HCurve2d) *,
int *,
int *,
Standard_Integer ,
@@ -1533,7 +1533,7 @@ void IntPatch_Intersection__MAJ_R(Handle_Adaptor2d_HCurve2d *,
/*
if(VTX.IsOnDomS1()) {
//-- long unsigned ptr= *((long unsigned *)(((Handle_Standard_Transient *)(&(VTX.ArcOnS1())))));
//-- long unsigned ptr= *((long unsigned *)(((Handle(Standard_Transient) *)(&(VTX.ArcOnS1())))));
for(Standard_Integer i=0; i<nbR1;i++) {
if(VTX.ArcOnS1()==R1[i]) {
NR1[i]++;
@@ -1560,7 +1560,7 @@ void IntPatch_Intersection::Dump(const Standard_Integer ,
//-- construction de la liste des restrictions & vertex
//--
int NR1[MAXR],NR2[MAXR];
Handle_Adaptor2d_HCurve2d R1[MAXR],R2[MAXR];
Handle(Adaptor2d_HCurve2d) R1[MAXR],R2[MAXR];
Standard_Integer nbR1=0,nbR2=0;
for(D1->Init();D1->More() && nbR1<MAXR; D1->Next()) {
R1[nbR1]=D1->Value();

View File

@@ -737,7 +737,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
imax++;
if(imin<imax) {
Handle_IntSurf_LineOn2S PWLine = new IntSurf_LineOn2S();
Handle(IntSurf_LineOn2S) PWLine = new IntSurf_LineOn2S();
for(i=imin;i<=imax;i++)
PWLine->Add(PW.Line()->Value(i));
@@ -905,7 +905,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
imax++;
if(imin<imax) {
Handle_IntSurf_LineOn2S PWLine = new IntSurf_LineOn2S();
Handle(IntSurf_LineOn2S) PWLine = new IntSurf_LineOn2S();
for(i=imin;i<=imax;i++)
PWLine->Add(PW.Line()->Value(i));
@@ -959,7 +959,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
// function : NewLine
// purpose :
//==================================================================================
Handle_IntPatch_Line IntPatch_PrmPrmIntersection::NewLine (const Handle(Adaptor3d_HSurface)& Surf1,
Handle(IntPatch_Line) IntPatch_PrmPrmIntersection::NewLine (const Handle(Adaptor3d_HSurface)& Surf1,
const Handle(Adaptor3d_HSurface)& Surf2,
const Standard_Integer NumLine,
const Standard_Integer Low,