mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0028966: Coding Rules - remove Adaptor2d_HCurve2d, Adaptor3d_HCurve and Adaptor3d_HSurface classes
Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface now inherit Standard_Transient. Interfaces Adaptor2d_HCurve2d, Adaptor3d_HCurve, Adaptor3d_HSurface and their subclasses are now aliases to Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface. Removed numerous unsafe reinterpret casts. Generic classes Adaptor3d_GenHCurve, Adaptor3d_GenHSurface, Adaptor2d_GenHCurve2d have been removed. Several redundant .lxx files have been merged into .hxx. Removed obsolete adaptor classes with H suffix.
This commit is contained in:
@@ -17,9 +17,9 @@
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <Geom_Curve.hxx>
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <Adaptor3d_HSurface.hxx>
|
||||
#include <Adaptor3d_Surface.hxx>
|
||||
#include <Adaptor3d_CurveOnSurface.hxx>
|
||||
#include <Adaptor3d_CurveOnSurface.hxx>
|
||||
#include <Adaptor3d_HCurveOnSurface.hxx>
|
||||
#include <GeomAbs_SurfaceType.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <Geom_Line.hxx>
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <gp_Lin.hxx>
|
||||
|
||||
#include <GeomAdaptor_Curve.hxx>
|
||||
#include <GeomAdaptor_HSurface.hxx>
|
||||
#include <GeomAdaptor_Surface.hxx>
|
||||
#include <Precision.hxx>
|
||||
#include <Extrema_ExtCC.hxx>
|
||||
//#include <Extrema_ExtCS.hxx>
|
||||
@@ -68,7 +68,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
static Standard_Boolean IsDegenerated(const Handle(Adaptor3d_HCurveOnSurface)& theCurve);
|
||||
static Standard_Boolean IsDegenerated(const Handle(Adaptor3d_CurveOnSurface)& theCurve);
|
||||
static Standard_Boolean IsDegenerated(const IntSurf_Quadric& theQuadric);
|
||||
|
||||
static void FindVertex (const TheArc&,
|
||||
@@ -174,7 +174,7 @@ void FindVertex (const TheArc& A,
|
||||
}
|
||||
}
|
||||
|
||||
Standard_Boolean IsDegenerated(const Handle(Adaptor3d_HCurveOnSurface)& theCurve)
|
||||
Standard_Boolean IsDegenerated(const Handle(Adaptor3d_CurveOnSurface)& theCurve)
|
||||
{
|
||||
if (theCurve->GetType() == GeomAbs_Circle)
|
||||
{
|
||||
@@ -389,7 +389,7 @@ void BoundedArc (const TheArc& A,
|
||||
if (TypeQuad != GeomAbs_OtherSurface) //intersection of boundary curve and quadric surface
|
||||
{
|
||||
//Exact solution
|
||||
Handle(Adaptor3d_HSurface) aSurf = Func.Surface();
|
||||
Handle(Adaptor3d_Surface) aSurf = Func.Surface();
|
||||
Adaptor3d_CurveOnSurface ConS(A, aSurf);
|
||||
GeomAbs_CurveType TypeConS = ConS.GetType();
|
||||
#ifdef OCCT_DEBUG
|
||||
@@ -440,7 +440,7 @@ void BoundedArc (const TheArc& A,
|
||||
}
|
||||
}
|
||||
#endif
|
||||
Handle(Adaptor3d_HCurveOnSurface) HConS = new Adaptor3d_HCurveOnSurface(ConS);
|
||||
Handle(Adaptor3d_CurveOnSurface) HConS = new Adaptor3d_CurveOnSurface(ConS);
|
||||
Handle(Geom_Surface) QuadSurf;
|
||||
switch (TypeQuad)
|
||||
{
|
||||
@@ -472,7 +472,7 @@ void BoundedArc (const TheArc& A,
|
||||
default:
|
||||
break;
|
||||
}
|
||||
Handle(GeomAdaptor_HSurface) GAHsurf = new GeomAdaptor_HSurface(QuadSurf);
|
||||
Handle(GeomAdaptor_Surface) GAHsurf = new GeomAdaptor_Surface(QuadSurf);
|
||||
|
||||
if ((TypeConS == GeomAbs_Line ||
|
||||
TypeConS == GeomAbs_Circle ||
|
||||
|
Reference in New Issue
Block a user