diff --git a/src/AIS/AIS_AngleDimension.hxx b/src/AIS/AIS_AngleDimension.hxx index a1bb750e0f..1020029d2e 100755 --- a/src/AIS/AIS_AngleDimension.hxx +++ b/src/AIS/AIS_AngleDimension.hxx @@ -34,6 +34,7 @@ #include #include +class AIS_AngleDimension; DEFINE_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension) //! Angle dimension. Can be constructed: diff --git a/src/AIS/AIS_DiameterDimension.hxx b/src/AIS/AIS_DiameterDimension.hxx index 5d6dd8c142..3547b52a00 100644 --- a/src/AIS/AIS_DiameterDimension.hxx +++ b/src/AIS/AIS_DiameterDimension.hxx @@ -24,6 +24,7 @@ #include #include +class AIS_DiameterDimension; DEFINE_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension) //! Diameter dimension. Can be constructued: diff --git a/src/AIS/AIS_Dimension.hxx b/src/AIS/AIS_Dimension.hxx index 07f687e8ad..12de735247 100755 --- a/src/AIS/AIS_Dimension.hxx +++ b/src/AIS/AIS_Dimension.hxx @@ -42,6 +42,7 @@ #include #include +class AIS_Dimension; DEFINE_STANDARD_HANDLE(AIS_Dimension, AIS_InteractiveObject) //! AIS_Dimension is a base class for 2D presentations of linear (length, diameter, radius) diff --git a/src/AIS/AIS_GraphicTool.cxx b/src/AIS/AIS_GraphicTool.cxx index cd0ddf4c81..dbaead1df3 100644 --- a/src/AIS/AIS_GraphicTool.cxx +++ b/src/AIS/AIS_GraphicTool.cxx @@ -28,7 +28,7 @@ #include #include - +#include static Handle(Prs3d_LineAspect) GetLineAspect(const Handle(Prs3d_Drawer)& Dr, const AIS_TypeOfAttribute Att) diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index 7c59a444ed..1111281188 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -395,11 +395,11 @@ void AIS_InteractiveContext::SetViewAffinity (const Handle(AIS_InteractiveObject anAffinity->SetVisible (aCView->ViewId, theIsVisible == Standard_True); if (theIsVisible) { - theView->View()->ChangeHiddenObjects()->Remove (theIObj); + theView->View()->ChangeHiddenObjects()->Remove (theIObj.get()); } else { - theView->View()->ChangeHiddenObjects()->Add (theIObj); + theView->View()->ChangeHiddenObjects()->Add (theIObj.get()); } } @@ -2435,7 +2435,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t myMainVwr->Viewer()->UnregisterObject (theIObj); for (myMainVwr->InitDefinedViews(); myMainVwr->MoreDefinedViews(); myMainVwr->NextDefinedViews()) { - myMainVwr->DefinedView()->View()->ChangeHiddenObjects()->Remove (theIObj); + myMainVwr->DefinedView()->View()->ChangeHiddenObjects()->Remove (theIObj.get()); } if (theToUpdateviewer @@ -2826,7 +2826,7 @@ void AIS_InteractiveContext::Disconnect (const Handle(AIS_InteractiveObject)& th theObj->Disconnect (theObjToDisconnect); mgrSelector->Remove (theObjToDisconnect); } - else if (theAssembly->IsInstance ("AIS_ConnectedInteractive") && theObjToDisconnect == NULL) + else if (theAssembly->IsInstance ("AIS_ConnectedInteractive") && theObjToDisconnect.IsNull()) { const Handle(AIS_ConnectedInteractive)& theObj = Handle(AIS_ConnectedInteractive)::DownCast (theAssembly); diff --git a/src/AIS/AIS_InteractiveContext_2.cxx b/src/AIS/AIS_InteractiveContext_2.cxx index 0fef9640fa..0b58c79f90 100644 --- a/src/AIS/AIS_InteractiveContext_2.cxx +++ b/src/AIS/AIS_InteractiveContext_2.cxx @@ -674,7 +674,7 @@ Standard_Integer AIS_InteractiveContext::PurgeDisplay() //======================================================================= Standard_Integer AIS_InteractiveContext::PurgeViewer(const Handle(V3d_Viewer)& Vwr) { - const Handle(Graphic3d_StructureManager)& GSM = Vwr->Viewer(); + Handle(Graphic3d_StructureManager) GSM = Vwr->Viewer(); Standard_Integer NbCleared(0); Graphic3d_MapOfStructure SOS; GSM->DisplayedStructures(SOS); diff --git a/src/AIS/AIS_MaxRadiusDimension.cxx b/src/AIS/AIS_MaxRadiusDimension.cxx index 695ec44660..cb60705562 100644 --- a/src/AIS/AIS_MaxRadiusDimension.cxx +++ b/src/AIS/AIS_MaxRadiusDimension.cxx @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -323,7 +324,7 @@ void AIS_MaxRadiusDimension::ComputeSelection(const Handle(SelectMgr_Selection)& else parStart = par; - Handle(Geom_TrimmedCurve)TrimCurve; + Handle(Geom_Curve)TrimCurve; if(myIsOffset) { Handle(Geom_Curve) aCurve = myOffsetCurve; diff --git a/src/AIS/AIS_MinRadiusDimension.cxx b/src/AIS/AIS_MinRadiusDimension.cxx index 861f2d0549..b130c9bf07 100644 --- a/src/AIS/AIS_MinRadiusDimension.cxx +++ b/src/AIS/AIS_MinRadiusDimension.cxx @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -325,7 +326,7 @@ void AIS_MinRadiusDimension::ComputeSelection(const Handle(SelectMgr_Selection)& } else parStart = par; - Handle(Geom_TrimmedCurve)TrimCurve; + Handle(Geom_Curve)TrimCurve; if(myIsOffset) { Handle(Geom_Curve) aCurve = myOffsetCurve; diff --git a/src/AIS/AIS_PointCloud.hxx b/src/AIS/AIS_PointCloud.hxx index 18ef98efe2..fa38a5c093 100644 --- a/src/AIS/AIS_PointCloud.hxx +++ b/src/AIS/AIS_PointCloud.hxx @@ -27,6 +27,7 @@ #include #include +class AIS_PointCloud; DEFINE_STANDARD_HANDLE(AIS_PointCloud, AIS_InteractiveObject) //! Interactive object for set of points. diff --git a/src/AIS/AIS_RadiusDimension.hxx b/src/AIS/AIS_RadiusDimension.hxx index 07bb316649..b484a0988a 100644 --- a/src/AIS/AIS_RadiusDimension.hxx +++ b/src/AIS/AIS_RadiusDimension.hxx @@ -22,6 +22,7 @@ #include #include +class AIS_RadiusDimension; DEFINE_STANDARD_HANDLE (AIS_RadiusDimension,AIS_Dimension) //! Radius dimension. Can be constructued: diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx index 850f5828b2..9fa26e3e40 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx @@ -1131,7 +1131,7 @@ void BOPAlgo_PaveFiller::UpdateFaceInfo const BOPDS_Curve& theNC, const Standard_Real theTolR3D, const BOPDS_IndexedMapOfPaveBlock& theMPBOnIn, - Handle(BOPDS_PaveBlock&) aPBOut) + Handle(BOPDS_PaveBlock)& aPBOut) { Standard_Boolean bRet; Standard_Real aT1, aT2, aTm, aTx; diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx index 445f7ec233..2bf9f0615e 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx @@ -516,7 +516,7 @@ void BOPAlgo_PaveFiller::MakePCurves() } // Handle(BOPDS_CommonBlock) aCB=myDS->CommonBlock(aPB); - if (!aCB) { + if (aCB.IsNull()) { continue; } // diff --git a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx index 11dfd45e4c..8692313da8 100644 --- a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx @@ -17,6 +17,7 @@ #include +class BOPDS_PaveBlock; typedef NCollection_List BOPDS_ListOfPaveBlock; typedef BOPDS_ListOfPaveBlock::Iterator BOPDS_ListIteratorOfListOfPaveBlock; diff --git a/src/BOPTools/BOPTools_AlgoTools2D.cxx b/src/BOPTools/BOPTools_AlgoTools2D.cxx index 6b60782026..c371bd7603 100644 --- a/src/BOPTools/BOPTools_AlgoTools2D.cxx +++ b/src/BOPTools/BOPTools_AlgoTools2D.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include diff --git a/src/BRepCheck/BRepCheck_Solid.cxx b/src/BRepCheck/BRepCheck_Solid.cxx index 27312e5a57..3a95e87a47 100644 --- a/src/BRepCheck/BRepCheck_Solid.cxx +++ b/src/BRepCheck/BRepCheck_Solid.cxx @@ -41,7 +41,7 @@ #include #include - +class BRepCheck_HSC; DEFINE_STANDARD_HANDLE(BRepCheck_HSC, MMgt_TShared); //======================================================================= //class : BRepCheck_HSC diff --git a/src/BRepFill/BRepFill_Filling.cxx b/src/BRepFill/BRepFill_Filling.cxx index 56e108abc1..d903b476f2 100644 --- a/src/BRepFill/BRepFill_Filling.cxx +++ b/src/BRepFill/BRepFill_Filling.cxx @@ -60,7 +60,7 @@ #include #include -#include +#include #include #include diff --git a/src/BRepFill/BRepFill_Sweep.cxx b/src/BRepFill/BRepFill_Sweep.cxx index c7aec1750e..d35de2d78d 100644 --- a/src/BRepFill/BRepFill_Sweep.cxx +++ b/src/BRepFill/BRepFill_Sweep.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/BRepGProp/BRepGProp_Gauss.cxx b/src/BRepGProp/BRepGProp_Gauss.cxx index 526d1eacb8..2db9abbc3b 100644 --- a/src/BRepGProp/BRepGProp_Gauss.cxx +++ b/src/BRepGProp/BRepGProp_Gauss.cxx @@ -176,7 +176,7 @@ Standard_Integer BRepGProp_Gauss::MaxSubs(const Standard_Integer theN, //function : Init //purpose : //======================================================================= -void BRepGProp_Gauss::Init(Handle(Vector)& theOutVec, +void BRepGProp_Gauss::Init(NCollection_Handle& theOutVec, const Standard_Real theValue, const Standard_Integer theFirst, const Standard_Integer theLast) @@ -227,10 +227,10 @@ Standard_Integer BRepGProp_Gauss::FillIntervalBounds( const TColStd_Array1OfReal& theKnots, const Standard_Integer theNumSubs, InertiaArray& theInerts, - Handle(Vector)& theParam1, - Handle(Vector)& theParam2, - Handle(Vector)& theError, - Handle(Vector)& theCommonError) + NCollection_Handle& theParam1, + NCollection_Handle& theParam2, + NCollection_Handle& theError, + NCollection_Handle& theCommonError) { const Standard_Integer aSize = Max(theKnots.Upper(), MaxSubs(theKnots.Upper() - 1, theNumSubs)); @@ -550,10 +550,10 @@ Standard_Real BRepGProp_Gauss::Compute( InertiaArray anInertiaU = new NCollection_Array1(1, SM); // Prepare Gauss points and weights - Handle(Vector) LGaussP[2]; - Handle(Vector) LGaussW[2]; - Handle(Vector) UGaussP[2]; - Handle(Vector) UGaussW[2]; + NCollection_Handle LGaussP[2]; + NCollection_Handle LGaussW[2]; + NCollection_Handle UGaussP[2]; + NCollection_Handle UGaussW[2]; const Standard_Integer aNbGaussPoint = RealToInt(Ceiling(ERROR_ALGEBR_RATIO * GPM)); @@ -568,14 +568,14 @@ Standard_Real BRepGProp_Gauss::Compute( UGaussW[0] = new math_Vector(1, GPM); UGaussW[1] = new math_Vector(1, aNbGaussPoint); - Handle(Vector) L1 = new math_Vector(1, SM); - Handle(Vector) L2 = new math_Vector(1, SM); - Handle(Vector) U1 = new math_Vector(1, SM); - Handle(Vector) U2 = new math_Vector(1, SM); + NCollection_Handle L1 = new math_Vector(1, SM); + NCollection_Handle L2 = new math_Vector(1, SM); + NCollection_Handle U1 = new math_Vector(1, SM); + NCollection_Handle U2 = new math_Vector(1, SM); - Handle(Vector) ErrL = new math_Vector(1, SM, 0.0); - Handle(Vector) ErrU = new math_Vector(1, SM, 0.0); - Handle(Vector) ErrUL = new math_Vector(1, SM, 0.0); + NCollection_Handle ErrL = new math_Vector(1, SM, 0.0); + NCollection_Handle ErrU = new math_Vector(1, SM, 0.0); + NCollection_Handle ErrUL = new math_Vector(1, SM, 0.0); // Face parametrization in U and V direction Standard_Real BV1, BV2, BU1, BU2; @@ -746,7 +746,7 @@ Standard_Real BRepGProp_Gauss::Compute( if (Abs(u2 - u1) < EPS_PARAM) continue; - Handle(Vector) aDummy; + NCollection_Handle aDummy; iUSubEnd = FillIntervalBounds(u1, u2, UKnots, NumSubs, anInertiaU, U1, U2, ErrU, aDummy); UMaxSubs = BRepGProp_Gauss::MaxSubs(iUSubEnd); diff --git a/src/BRepGProp/BRepGProp_Gauss.hxx b/src/BRepGProp/BRepGProp_Gauss.hxx index 8607820b89..825b15f00e 100644 --- a/src/BRepGProp/BRepGProp_Gauss.hxx +++ b/src/BRepGProp/BRepGProp_Gauss.hxx @@ -251,7 +251,7 @@ private: //! @name private methods const Standard_Integer theCoeff = 32); static void Init( - Handle(Vector)& theOutVec, + NCollection_Handle& theOutVec, const Standard_Real theValue, const Standard_Integer theFirst = 0, const Standard_Integer theLast = 0); @@ -268,10 +268,10 @@ private: //! @name private methods const TColStd_Array1OfReal& theKnots, const Standard_Integer theNumSubs, InertiaArray& theInerts, - Handle(Vector)& theParam1, - Handle(Vector)& theParam2, - Handle(Vector)& theError, - Handle(Vector)& theCommonError); + NCollection_Handle& theParam1, + NCollection_Handle& theParam2, + NCollection_Handle& theError, + NCollection_Handle& theCommonError); private: //! @name private fields diff --git a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx index d96a6d8f84..4a34d3f05b 100644 --- a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx +++ b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx @@ -30,7 +30,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx index ff505452a1..42c38e040b 100644 --- a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx +++ b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx @@ -613,12 +613,12 @@ void AdjustCurveEnd(Handle(Geom2d_BoundedCurve)& theC2d, const gp_Pnt2d theP, if(isFirst) { gp_Pnt2d aP = theC2d->Value(theC2d->LastParameter()); - theC2d = GCE2d_MakeSegment(theP, aP); + theC2d = GCE2d_MakeSegment(theP, aP).Value(); } else { gp_Pnt2d aP = theC2d->Value(theC2d->FirstParameter()); - theC2d = GCE2d_MakeSegment(aP, theP); + theC2d = GCE2d_MakeSegment(aP, theP).Value(); } } else diff --git a/src/BRepMesh/BRepMesh.hxx b/src/BRepMesh/BRepMesh.hxx index 74c7b7a7bb..e4c4279668 100644 --- a/src/BRepMesh/BRepMesh.hxx +++ b/src/BRepMesh/BRepMesh.hxx @@ -47,6 +47,7 @@ class BRepMesh_Vertex; class TopoDS_Edge; class TopoDS_Vertex; +class BRepMesh_FaceAttribute; class BRepMesh_VertexInspector; class BRepMesh_CircleInspector; class BRepMesh_Classifier; diff --git a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx index 8c4b40f77b..432e075516 100644 --- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx +++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx @@ -28,6 +28,7 @@ class Poly_Triangulation; class Poly_PolygonOnTriangulation; class TopoDS_Edge; class TopoDS_Face; +class Geom2d_Curve; //! Auxiliary class implements functionality retrieving tessellated //! representation of an edge stored in polygon. diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx index 4e443877ee..3db143d9f7 100644 --- a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx +++ b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/src/BRepMesh/BRepMesh_ShapeTool.hxx b/src/BRepMesh/BRepMesh_ShapeTool.hxx index b65c9d9f11..35192a6fdc 100644 --- a/src/BRepMesh/BRepMesh_ShapeTool.hxx +++ b/src/BRepMesh/BRepMesh_ShapeTool.hxx @@ -18,9 +18,11 @@ #include #include #include +#include #include #include +class Poly_Triangulation; class TopoDS_Face; class TopoDS_Edge; class Bnd_Box; diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx index c81c40161f..ee39bcc952 100644 --- a/src/BRepOffset/BRepOffset_Inter2d.cxx +++ b/src/BRepOffset/BRepOffset_Inter2d.cxx @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx index d59481a8e6..e7d65a0b1d 100644 --- a/src/BRepOffset/BRepOffset_MakeOffset.cxx +++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx @@ -92,6 +92,7 @@ #include #include #include +#include #include #include #include diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx index 29fb26e7f5..c566583139 100644 --- a/src/BRepOffset/BRepOffset_Offset.cxx +++ b/src/BRepOffset/BRepOffset_Offset.cxx @@ -186,8 +186,8 @@ static void UpdateEdge (const TopoDS_Edge& E, //======================================================================= static void ComputeCurve3d(TopoDS_Edge Edge, - Handle(Geom2d_Curve) Curve, - Handle(Geom_Surface) Surf, + const Handle(Geom2d_Curve)& Curve, + const Handle(Geom_Surface)& Surf, const TopLoc_Location Loc, Standard_Real Tol) { diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx index db5178fca0..c35f32ff96 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx @@ -55,6 +55,7 @@ #include #include +#include #include #include #include diff --git a/src/BRepTest/BRepTest_BasicCommands.cxx b/src/BRepTest/BRepTest_BasicCommands.cxx index 6b45689c47..13a97aa416 100644 --- a/src/BRepTest/BRepTest_BasicCommands.cxx +++ b/src/BRepTest/BRepTest_BasicCommands.cxx @@ -48,6 +48,7 @@ #include #include +#include #include #include diff --git a/src/BRepTest/BRepTest_FilletCommands.cxx b/src/BRepTest/BRepTest_FilletCommands.cxx index 7fd071035b..c4de2d21ad 100644 --- a/src/BRepTest/BRepTest_FilletCommands.cxx +++ b/src/BRepTest/BRepTest_FilletCommands.cxx @@ -634,7 +634,7 @@ static Standard_Integer blend1(Draw_Interpretor& di, Standard_Integer narg, cons for (i=1;i<=nb;i++) {Standard_Integer s=aRakk.NbSection(i); for (j=1;j<=s;j++) - {Handle(Geom_TrimmedCurve Sec); + {Handle(Geom_TrimmedCurve) Sec; aRakk.Section(i,j,Sec); Sprintf(localname, "%s%d%d" ,"sec",i,j); temp =localname; diff --git a/src/BRepTools/BRepTools_Modifier.cxx b/src/BRepTools/BRepTools_Modifier.cxx index 059eb9a440..b63c2c1868 100644 --- a/src/BRepTools/BRepTools_Modifier.cxx +++ b/src/BRepTools/BRepTools_Modifier.cxx @@ -52,7 +52,7 @@ #include #include #include - +#include //======================================================================= diff --git a/src/BRepTools/BRepTools_ShapeSet.cxx b/src/BRepTools/BRepTools_ShapeSet.cxx index 9bed5ed0de..3f035334b1 100644 --- a/src/BRepTools/BRepTools_ShapeSet.cxx +++ b/src/BRepTools/BRepTools_ShapeSet.cxx @@ -52,6 +52,7 @@ #include #include #include +#include #include #include diff --git a/src/BVH/BVH.cxx b/src/BVH/BVH.cxx index 48fd7c09eb..15844cd07b 100644 --- a/src/BVH/BVH.cxx +++ b/src/BVH/BVH.cxx @@ -21,6 +21,8 @@ #include #include +#include + // Specific instantiations of struct templates to avoid compilation warnings template class BVH_Box; diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx index e56a75239a..22bd57bc1d 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx +++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx @@ -19,11 +19,6 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (BinTObjDrivers_DocumentRetrievalDriver, - BinLDrivers_DocumentRetrievalDriver) -IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_DocumentRetrievalDriver, - BinLDrivers_DocumentRetrievalDriver) - //======================================================================= //function : BinTObjDrivers_DocumentRetrievalDriver //purpose : diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx index dc94d3822b..c0bf4002b2 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx +++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx @@ -19,11 +19,6 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (BinTObjDrivers_DocumentStorageDriver, - BinLDrivers_DocumentStorageDriver) -IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_DocumentStorageDriver, - BinLDrivers_DocumentStorageDriver) - //======================================================================= //function : BinTObjDrivers_DocumentStorageDriver //purpose : diff --git a/src/BinTools/BinTools_ShapeSet.cxx b/src/BinTools/BinTools_ShapeSet.cxx index 6f0eb7a984..731f67aca5 100644 --- a/src/BinTools/BinTools_ShapeSet.cxx +++ b/src/BinTools/BinTools_ShapeSet.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ChFi2d/ChFi2d_ChamferAPI.cxx b/src/ChFi2d/ChFi2d_ChamferAPI.cxx index 8e72cdfbec..9a0224b433 100644 --- a/src/ChFi2d/ChFi2d_ChamferAPI.cxx +++ b/src/ChFi2d/ChFi2d_ChamferAPI.cxx @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ChFi3d/ChFi3d_Builder_2.cxx b/src/ChFi3d/ChFi3d_Builder_2.cxx index 11da929924..86e3c4fc71 100644 --- a/src/ChFi3d/ChFi3d_Builder_2.cxx +++ b/src/ChFi3d/ChFi3d_Builder_2.cxx @@ -34,6 +34,7 @@ #include #include +#include #include #include #include diff --git a/src/ChFi3d/ChFi3d_Builder_C2.cxx b/src/ChFi3d/ChFi3d_Builder_C2.cxx index 9025eb6f07..0030491770 100644 --- a/src/ChFi3d/ChFi3d_Builder_C2.cxx +++ b/src/ChFi3d/ChFi3d_Builder_C2.cxx @@ -93,7 +93,7 @@ static void Reduce(const Standard_Real& p1, { GeomAdaptor_Surface& s1 = hs1->ChangeSurface(); GeomAdaptor_Surface& s2 = hs2->ChangeSurface(); - const Handle(Geom_Surface&) surf = s1.Surface(); + const Handle(Geom_Surface)& surf = s1.Surface(); Standard_Real ud,uf,vd,vf; surf->Bounds(ud,uf,vd,vf); Standard_Real milmoins = 0.51*vd+0.49*vf, milplus = 0.49*vd+0.51*vf; diff --git a/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx b/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx index 3881f49418..f8a8c91dc3 100644 --- a/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx +++ b/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx index 68253f768c..bea362efce 100644 --- a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx +++ b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx @@ -580,7 +580,7 @@ static void FillSD (TopOpeBRepDS_DataStructure& DStr, for(;trouve;) { const HatchGen_PointOnElement& PEtemp = pPH->Point(LeType); IE = PEtemp.Index(); - Handle(BRepAdaptor_HCurve2d) HE = Handle(BRepAdaptor_HCurve2d::DownCast(M(IE))); + Handle(BRepAdaptor_HCurve2d) HE = Handle(BRepAdaptor_HCurve2d)::DownCast(M(IE)); if(!HE.IsNull()) { const TopoDS_Edge& Etemp = HE->ChangeCurve2d().Edge(); TopExp::Vertices(Etemp,V1,V2); diff --git a/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx b/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx index d0a9966fa1..9c41f276de 100644 --- a/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx +++ b/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx @@ -48,6 +48,7 @@ #include #include #include +#include #include #include diff --git a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx index 80f181b114..48b078fbf1 100644 --- a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx +++ b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx b/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx index 78aa137df9..3dd8229b1b 100644 --- a/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx +++ b/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include diff --git a/src/DBRep/DBRep_IsoBuilder.cxx b/src/DBRep/DBRep_IsoBuilder.cxx index 024ad87714..7a9167147e 100644 --- a/src/DBRep/DBRep_IsoBuilder.cxx +++ b/src/DBRep/DBRep_IsoBuilder.cxx @@ -188,7 +188,8 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion, // if U1 and U2 coincide-->do nothing if (Abs (U1 - U2) <= Precision::PConfusion()) continue; Handle (Geom2d_TrimmedCurve) TrimPCurve = new Geom2d_TrimmedCurve (PCurve, U1, U2); - AddElement (TrimPCurve, TopologicalEdge.Orientation()); + Geom2dAdaptor_Curve aGAC (TrimPCurve); + AddElement (aGAC, TopologicalEdge.Orientation()); } } diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx index 9b067ccfe5..e9a37c7ec7 100644 --- a/src/Draw/Draw_VariableCommands.cxx +++ b/src/Draw/Draw_VariableCommands.cxx @@ -527,7 +527,7 @@ static Standard_Integer copy(Draw_Interpretor& , Standard_Integer n, const char* D = D->Copy(); else // clear old name - Draw::Set(a[i],Handle(Draw_Drawable3D())); + Draw::Set(a[i],Handle(Draw_Drawable3D)()); Draw::Set(a[i+1],D); } diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.cxx b/src/DrawFairCurve/DrawFairCurve_Batten.cxx index 332a5d9df0..5155dcec1e 100644 --- a/src/DrawFairCurve/DrawFairCurve_Batten.cxx +++ b/src/DrawFairCurve/DrawFairCurve_Batten.cxx @@ -19,6 +19,7 @@ #include #include #include +#include DrawFairCurve_Batten::DrawFairCurve_Batten(const Standard_Address TheBatten) : DrawTrSurf_BSplineCurve2d( ((FairCurve_Batten*)TheBatten)->Curve()), diff --git a/src/Expr/Expr_Array1OfNamedUnknown.hxx b/src/Expr/Expr_Array1OfNamedUnknown.hxx index 24621d3a74..02b06eb517 100644 --- a/src/Expr/Expr_Array1OfNamedUnknown.hxx +++ b/src/Expr/Expr_Array1OfNamedUnknown.hxx @@ -19,6 +19,7 @@ #include +class Expr_NamedUnknown; typedef NCollection_Array1 Expr_Array1OfNamedUnknown; diff --git a/src/Font/Font_BRepFont.cxx b/src/Font/Font_BRepFont.cxx index 2b82c164be..d25b1557b8 100755 --- a/src/Font/Font_BRepFont.cxx +++ b/src/Font/Font_BRepFont.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/src/Geom/Geom_Axis1Placement.cxx b/src/Geom/Geom_Axis1Placement.cxx index 53be0a2254..b27bbf7856 100644 --- a/src/Geom/Geom_Axis1Placement.cxx +++ b/src/Geom/Geom_Axis1Placement.cxx @@ -17,7 +17,6 @@ #include typedef Geom_Axis1Placement Axis1Placement; -typedef Handle(Geom_Axis1Placement) Handle(Axis1Placement); typedef gp_Ax2 Ax2; typedef gp_Dir Dir; typedef gp_Pnt Pnt; @@ -31,7 +30,7 @@ typedef gp_Vec Vec; Handle(Geom_Geometry) Geom_Axis1Placement::Copy() const { - Handle(Axis1Placement) A1; + Handle(Geom_Axis1Placement) A1; A1 = new Axis1Placement (axis); return A1; } @@ -66,7 +65,7 @@ void Geom_Axis1Placement::Reverse() { axis.Reverse(); } void Geom_Axis1Placement::Transform (const Trsf& T) { axis.Transform (T); } -Handle(Axis1Placement) Geom_Axis1Placement::Reversed() const { +Handle(Geom_Axis1Placement) Geom_Axis1Placement::Reversed() const { gp_Ax1 A1 = axis; A1.Reverse(); diff --git a/src/Geom/Geom_Axis2Placement.cxx b/src/Geom/Geom_Axis2Placement.cxx index 1d374a6e50..6f4652f975 100644 --- a/src/Geom/Geom_Axis2Placement.cxx +++ b/src/Geom/Geom_Axis2Placement.cxx @@ -16,7 +16,6 @@ #include -typedef Handle(Geom_Axis2Placement) Handle(Axis2Placement); typedef Geom_Axis2Placement Axis2Placement; typedef gp_Ax1 Ax1; typedef gp_Dir Dir; @@ -32,7 +31,7 @@ typedef gp_Vec Vec; Handle(Geom_Geometry) Geom_Axis2Placement::Copy() const { - Handle(Axis2Placement) A2; + Handle(Geom_Axis2Placement) A2; A2 = new Axis2Placement (axis.Location(), axis.Direction(), vxdir, vydir); return A2; } diff --git a/src/Geom/Geom_AxisPlacement.cxx b/src/Geom/Geom_AxisPlacement.cxx index 5b8cfbb29b..0a1d02ed76 100644 --- a/src/Geom/Geom_AxisPlacement.cxx +++ b/src/Geom/Geom_AxisPlacement.cxx @@ -16,7 +16,6 @@ #include -typedef Handle(Geom_AxisPlacement) Handle(AxisPlacement); typedef gp_Ax1 Ax1; typedef gp_Dir Dir; typedef gp_Pnt Pnt; @@ -34,7 +33,7 @@ void Geom_AxisPlacement::SetAxis (const Ax1& A1) { axis = A1; } void Geom_AxisPlacement::SetLocation (const Pnt& P) {axis.SetLocation (P);} -Standard_Real Geom_AxisPlacement::Angle (const Handle(AxisPlacement)& Other) const { +Standard_Real Geom_AxisPlacement::Angle (const Handle(Geom_AxisPlacement)& Other) const { return axis.Angle (Other->Axis()); } diff --git a/src/Geom/Geom_CartesianPoint.cxx b/src/Geom/Geom_CartesianPoint.cxx index 4f95be620d..595824a087 100644 --- a/src/Geom/Geom_CartesianPoint.cxx +++ b/src/Geom/Geom_CartesianPoint.cxx @@ -17,14 +17,11 @@ #include typedef Geom_CartesianPoint CartesianPoint; -typedef Handle(Geom_CartesianPoint) Handle(CartesianPoint); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Vec Vec; typedef gp_Trsf Trsf; - - //======================================================================= //function : Geom_CartesianPoint //purpose : @@ -49,7 +46,7 @@ const Standard_Real X, const Standard_Real Y, const Standard_Real Z) : gpPnt (X, Handle(Geom_Geometry) Geom_CartesianPoint::Copy() const { - Handle(CartesianPoint) P; + Handle(Geom_CartesianPoint) P; P = new CartesianPoint (gpPnt); return P; } diff --git a/src/Geom/Geom_Circle.cxx b/src/Geom/Geom_Circle.cxx index c9cc6183fc..34f7ad35dd 100644 --- a/src/Geom/Geom_Circle.cxx +++ b/src/Geom/Geom_Circle.cxx @@ -21,7 +21,6 @@ #include typedef Geom_Circle Circle; -typedef Handle(Geom_Circle) Handle(Circle); typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; @@ -38,7 +37,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_Circle::Copy() const { - Handle(Circle) C; + Handle(Geom_Circle) C; C = new Circle (pos, radius); return C; } diff --git a/src/Geom/Geom_ConicalSurface.cxx b/src/Geom/Geom_ConicalSurface.cxx index b7fe2406a6..9e0cbc7a47 100644 --- a/src/Geom/Geom_ConicalSurface.cxx +++ b/src/Geom/Geom_ConicalSurface.cxx @@ -32,7 +32,6 @@ #include typedef Geom_ConicalSurface ConicalSurface; -typedef Handle(Geom_ConicalSurface) Handle(ConicalSurface); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Ax3 Ax3; @@ -44,9 +43,6 @@ typedef gp_Trsf Trsf; typedef gp_Vec Vec; typedef gp_XYZ XYZ; - - - //======================================================================= //function : Copy //purpose : @@ -54,7 +50,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_ConicalSurface::Copy () const { - Handle(ConicalSurface) Cs; + Handle(Geom_ConicalSurface) Cs; Cs = new ConicalSurface (pos, semiAngle, radius); return Cs; } diff --git a/src/Geom/Geom_Curve.cxx b/src/Geom/Geom_Curve.cxx index 5019f2e5c7..1aa1e52890 100644 --- a/src/Geom/Geom_Curve.cxx +++ b/src/Geom/Geom_Curve.cxx @@ -17,17 +17,15 @@ #include typedef Geom_Curve Curve; -typedef Handle(Geom_Curve) Handle(Curve); - //======================================================================= //function : Reversed //purpose : //======================================================================= -Handle(Curve) Geom_Curve::Reversed () const +Handle(Geom_Curve) Geom_Curve::Reversed () const { - Handle(Curve) C = Handle(Curve)::DownCast(Copy()); + Handle(Geom_Curve) C = Handle(Geom_Curve)::DownCast(Copy()); C->Reverse(); return C; } diff --git a/src/Geom/Geom_CylindricalSurface.cxx b/src/Geom/Geom_CylindricalSurface.cxx index 55e97b7208..2e65565463 100644 --- a/src/Geom/Geom_CylindricalSurface.cxx +++ b/src/Geom/Geom_CylindricalSurface.cxx @@ -31,7 +31,6 @@ #include typedef Geom_CylindricalSurface CylindricalSurface; -typedef Handle(Geom_CylindricalSurface) Handle(CylindricalSurface); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; @@ -53,7 +52,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_CylindricalSurface::Copy () const { - Handle(CylindricalSurface) Cs; + Handle(Geom_CylindricalSurface) Cs; Cs = new CylindricalSurface (pos, radius); return Cs; } diff --git a/src/Geom/Geom_Direction.cxx b/src/Geom/Geom_Direction.cxx index 457acaa58d..db4a5d3c03 100644 --- a/src/Geom/Geom_Direction.cxx +++ b/src/Geom/Geom_Direction.cxx @@ -19,9 +19,7 @@ #include typedef Geom_Direction Direction; -typedef Handle(Geom_Direction) Handle(Direction); typedef Geom_Vector Vector; -typedef Handle(Geom_Vector) Handle(Vector); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; @@ -36,7 +34,7 @@ typedef gp_Trsf Trsf; Handle(Geom_Geometry) Geom_Direction::Copy() const { - Handle(Direction) D; + Handle(Geom_Direction) D; D = new Direction (gpVec); return D; } @@ -95,7 +93,7 @@ void Geom_Direction::SetZ (const Standard_Real Z) { } -void Geom_Direction::Cross (const Handle(Vector)& Other) { +void Geom_Direction::Cross (const Handle(Geom_Vector)& Other) { gp_Dir V (gpVec.Crossed(Other->Vec())); gpVec = V; @@ -103,14 +101,14 @@ void Geom_Direction::Cross (const Handle(Vector)& Other) { void Geom_Direction::CrossCross ( -const Handle(Vector)& V1, const Handle(Vector)& V2) { +const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) { gp_Dir V (gpVec.CrossCrossed (V1->Vec(), V2->Vec())); gpVec = V; } -Handle(Vector) Geom_Direction::Crossed (const Handle(Vector)& Other) +Handle(Geom_Vector) Geom_Direction::Crossed (const Handle(Geom_Vector)& Other) const { gp_Dir V (gpVec.Crossed (Other->Vec())); @@ -118,8 +116,8 @@ const { } -Handle(Vector) Geom_Direction::CrossCrossed ( -const Handle(Vector)& V1, const Handle(Vector)& V2) const { +Handle(Geom_Vector) Geom_Direction::CrossCrossed ( +const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const { gp_Dir V (gpVec.CrossCrossed (V1->Vec(), V2->Vec())); return new Direction (V); diff --git a/src/Geom/Geom_ElementarySurface.cxx b/src/Geom/Geom_ElementarySurface.cxx index e7710716ff..e3bd20802b 100644 --- a/src/Geom/Geom_ElementarySurface.cxx +++ b/src/Geom/Geom_ElementarySurface.cxx @@ -16,12 +16,7 @@ #include - - typedef Geom_ElementarySurface ElementarySurface; -typedef Handle(Geom_ElementarySurface) Handle(ElementarySurface); -typedef Handle(Geom_Surface) Handle(Surface); - typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Ax3 Ax3; @@ -29,9 +24,6 @@ typedef gp_Dir Dir; typedef gp_Pnt Pnt; typedef gp_Vec Vec; - - - //======================================================================= //function : Continuity //purpose : diff --git a/src/Geom/Geom_Ellipse.cxx b/src/Geom/Geom_Ellipse.cxx index 5f0434030e..7c39f5e506 100644 --- a/src/Geom/Geom_Ellipse.cxx +++ b/src/Geom/Geom_Ellipse.cxx @@ -21,7 +21,6 @@ #include typedef Geom_Ellipse Ellipse; -typedef Handle(Geom_Ellipse) Handle(Ellipse); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; @@ -29,10 +28,6 @@ typedef gp_Vec Vec; typedef gp_Trsf Trsf; typedef gp_XYZ XYZ; - - - - //======================================================================= //function : Copy //purpose : @@ -40,7 +35,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_Ellipse::Copy() const { - Handle(Ellipse) E; + Handle(Geom_Ellipse) E; E = new Ellipse (pos, majorRadius, minorRadius); return E; } diff --git a/src/Geom/Geom_Geometry.cxx b/src/Geom/Geom_Geometry.cxx index 5b0ee69575..2eb107cc23 100644 --- a/src/Geom/Geom_Geometry.cxx +++ b/src/Geom/Geom_Geometry.cxx @@ -20,7 +20,6 @@ #include #include -typedef Handle(Geom_Geometry) Handle(Geometry); typedef Geom_Geometry Geometry; typedef gp_Pnt Pnt; typedef gp_Vec Vec; @@ -28,8 +27,6 @@ typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Trsf Trsf; - - Handle(Geom_Geometry) Geom_Geometry::Copy() const { Handle(Geom_Geometry) G; @@ -94,85 +91,69 @@ void Geom_Geometry::Translate (const gp_Pnt& P1, const gp_Pnt& P2) { } -Handle(Geometry) Geom_Geometry::Mirrored (const gp_Pnt& P) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Mirrored (const gp_Pnt& P) const +{ + Handle(Geom_Geometry) G = Copy(); G->Mirror (P); return G; } -Handle(Geometry) Geom_Geometry::Mirrored (const gp_Ax1& A1) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Mirrored (const gp_Ax1& A1) const +{ + Handle(Geom_Geometry) G = Copy(); G->Mirror (A1); return G; } -Handle(Geometry) Geom_Geometry::Mirrored (const gp_Ax2& A2) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Mirrored (const gp_Ax2& A2) const +{ + Handle(Geom_Geometry) G = Copy(); G->Mirror (A2); return G; } -Handle(Geometry) Geom_Geometry::Rotated ( - -const gp_Ax1& A1, -const Standard_Real Ang -) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Rotated (const gp_Ax1& A1, const Standard_Real Ang) const +{ + Handle(Geom_Geometry) G = Copy(); G->Rotate (A1, Ang); return G; } -Handle(Geometry) Geom_Geometry::Scaled (const gp_Pnt& P, const Standard_Real S) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Scaled (const gp_Pnt& P, const Standard_Real S) const +{ + Handle(Geom_Geometry) G = Copy(); G->Scale (P, S); return G; } -Handle(Geometry) Geom_Geometry::Transformed (const gp_Trsf& T) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Transformed (const gp_Trsf& T) const +{ + Handle(Geom_Geometry) G = Copy(); G->Transform (T); return G; } -Handle(Geometry) Geom_Geometry::Translated (const gp_Vec& V) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Translated (const gp_Vec& V) const +{ + Handle(Geom_Geometry) G = Copy(); G->Translate (V); return G; } -Handle(Geometry) Geom_Geometry::Translated ( - -const gp_Pnt& P1, -const gp_Pnt& P2 -) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom_Geometry) Geom_Geometry::Translated (const gp_Pnt& P1, const gp_Pnt& P2) const +{ + Handle(Geom_Geometry) G = Copy(); G->Translate (P1, P2); return G; } diff --git a/src/Geom/Geom_Hyperbola.cxx b/src/Geom/Geom_Hyperbola.cxx index e52f1e5d55..72bcf83fdd 100644 --- a/src/Geom/Geom_Hyperbola.cxx +++ b/src/Geom/Geom_Hyperbola.cxx @@ -24,7 +24,6 @@ typedef Geom_Hyperbola Hyperbola; -typedef Handle(Geom_Hyperbola) Handle(Hyperbola); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; @@ -32,10 +31,6 @@ typedef gp_Vec Vec; typedef gp_Trsf Trsf; typedef gp_XYZ XYZ; - - - - //======================================================================= //function : Copy //purpose : @@ -43,7 +38,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_Hyperbola::Copy() const { - Handle(Hyperbola) H; + Handle(Geom_Hyperbola) H; H = new Hyperbola (pos, majorRadius, minorRadius); return H; } diff --git a/src/Geom/Geom_OffsetCurve.cxx b/src/Geom/Geom_OffsetCurve.cxx index a4a996c512..c80867d117 100644 --- a/src/Geom/Geom_OffsetCurve.cxx +++ b/src/Geom/Geom_OffsetCurve.cxx @@ -42,20 +42,13 @@ #include typedef Geom_OffsetCurve OffsetCurve; -typedef Handle(Geom_OffsetCurve) Handle(OffsetCurve); typedef Geom_Curve Curve; -typedef Handle(Geom_Curve) Handle(Curve); -typedef Handle(Geom_Geometry) Handle(Geometry); - typedef gp_Dir Dir; typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; typedef gp_Vec Vec; typedef gp_XYZ XYZ; - - - //ordre de derivation maximum pour la recherche de la premiere //derivee non nulle static const int maxDerivOrder = 3; @@ -79,7 +72,7 @@ static Standard_Boolean AdjustDerivative( Handle(Geom_Geometry) Geom_OffsetCurve::Copy () const { - Handle(OffsetCurve) C; + Handle(Geom_OffsetCurve) C; C = new OffsetCurve (basisCurve, offsetValue, direction); return C; } @@ -174,12 +167,12 @@ Standard_Real Geom_OffsetCurve::Period () const //purpose : //======================================================================= -void Geom_OffsetCurve::SetBasisCurve (const Handle(Curve)& C, +void Geom_OffsetCurve::SetBasisCurve (const Handle(Geom_Curve)& C, const Standard_Boolean isNotCheckC0) { const Standard_Real aUf = C->FirstParameter(), aUl = C->LastParameter(); - Handle(Curve) aCheckingCurve = Handle(Curve)::DownCast(C->Copy()); + Handle(Geom_Curve) aCheckingCurve = Handle(Geom_Curve)::DownCast(C->Copy()); Standard_Boolean isTrimmed = Standard_False; while(aCheckingCurve->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)) || @@ -255,7 +248,7 @@ void Geom_OffsetCurve::SetBasisCurve (const Handle(Curve)& C, //purpose : //======================================================================= -Handle(Curve) Geom_OffsetCurve::BasisCurve () const +Handle(Geom_Curve) Geom_OffsetCurve::BasisCurve () const { return basisCurve; } diff --git a/src/Geom/Geom_OffsetSurface.cxx b/src/Geom/Geom_OffsetSurface.cxx index 049a5c1387..ae7a26dddc 100644 --- a/src/Geom/Geom_OffsetSurface.cxx +++ b/src/Geom/Geom_OffsetSurface.cxx @@ -71,13 +71,8 @@ #include #include -typedef Handle(Geom_OffsetCurve) Handle(OffsetCurve); typedef Geom_OffsetCurve OffsetCurve; -typedef Handle(Geom_Curve) Handle(Curve); -typedef Handle(Geom_Surface) Handle(Surface); -typedef Handle(Geom_OffsetSurface) Handle(OffsetSurface); typedef Geom_OffsetSurface OffsetSurface; -typedef Handle(Geom_Geometry) Handle(Geometry); typedef gp_Dir Dir; typedef gp_Vec Vec; typedef gp_Pnt Pnt; @@ -210,7 +205,7 @@ static void derivatives(Standard_Integer MaxOrder, Handle(Geom_Geometry) Geom_OffsetSurface::Copy () const { - Handle(OffsetSurface) S; + Handle(Geom_OffsetSurface) S; S = new OffsetSurface (basisSurf, offsetValue); return S; } @@ -240,13 +235,13 @@ Geom_OffsetSurface::Geom_OffsetSurface (const Handle(Geom_Surface)& theSurf, //purpose : //======================================================================= -void Geom_OffsetSurface::SetBasisSurface (const Handle(Surface)& S, +void Geom_OffsetSurface::SetBasisSurface (const Handle(Geom_Surface)& S, const Standard_Boolean isNotCheckC0) { Standard_Real aUf, aUl, aVf, aVl; S->Bounds(aUf, aUl, aVf, aVl); - Handle(Surface) aCheckingSurf = Handle(Surface)::DownCast(S->Copy()); + Handle(Geom_Surface) aCheckingSurf = Handle(Geom_Surface)::DownCast(S->Copy()); Standard_Boolean isTrimmed = Standard_False; while(aCheckingSurf->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface)) || @@ -429,7 +424,7 @@ Standard_Real Geom_OffsetSurface::VReversedParameter( const Standard_Real V) con //purpose : //======================================================================= -Handle(Surface) Geom_OffsetSurface::BasisSurface () const +Handle(Geom_Surface) Geom_OffsetSurface::BasisSurface () const { return basisSurf; } @@ -1280,7 +1275,8 @@ Handle(Geom_Curve) Geom_OffsetSurface::UIso (const Standard_Real UU) const GeomAbs_Shape Cont = GeomAbs_C1; Standard_Integer MaxSeg = 100, MaxDeg =14; - Geom_OffsetSurface_UIsoEvaluator ev (this, UU); + Handle(Geom_OffsetSurface) me (this); + Geom_OffsetSurface_UIsoEvaluator ev (me, UU); AdvApprox_ApproxAFunction Approx(Num1, Num2, Num3, T1, T2, T3, V1, V2, Cont, MaxDeg,MaxSeg, ev); @@ -1347,7 +1343,8 @@ Handle(Geom_Curve) Geom_OffsetSurface::VIso (const Standard_Real VV) const GeomAbs_Shape Cont = GeomAbs_C1; Standard_Integer MaxSeg = 100, MaxDeg =14; - Geom_OffsetSurface_VIsoEvaluator ev (this, VV); + Handle(Geom_OffsetSurface) me (this); + Geom_OffsetSurface_VIsoEvaluator ev (me, VV); AdvApprox_ApproxAFunction Approx (Num1, Num2, Num3, T1, T2, T3, U1, U2, Cont, MaxDeg, MaxSeg, ev); @@ -1447,13 +1444,13 @@ Standard_Real Geom_OffsetSurface::VPeriod() const Standard_Boolean Geom_OffsetSurface::IsUClosed () const { Standard_Boolean UClosed; - Handle(Surface) SBasis = BasisSurface(); + Handle(Geom_Surface) SBasis = BasisSurface(); if (SBasis->IsKind (STANDARD_TYPE(Geom_RectangularTrimmedSurface))) { Handle(Geom_RectangularTrimmedSurface) St = Handle(Geom_RectangularTrimmedSurface)::DownCast(SBasis); - Handle(Surface) S = Handle(Surface)::DownCast(St->BasisSurface()); + Handle(Geom_Surface) S = Handle(Geom_Surface)::DownCast(St->BasisSurface()); if (S->IsKind (STANDARD_TYPE(Geom_ElementarySurface))) { UClosed = SBasis->IsUClosed(); } @@ -1461,7 +1458,7 @@ Standard_Boolean Geom_OffsetSurface::IsUClosed () const { Handle(Geom_SurfaceOfLinearExtrusion) Extru = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(S); - Handle(Curve) C = Extru->BasisCurve(); + Handle(Geom_Curve) C = Extru->BasisCurve(); if (C->IsKind (STANDARD_TYPE(Geom_Circle)) || C->IsKind (STANDARD_TYPE(Geom_Ellipse))) { UClosed = SBasis->IsUClosed(); } @@ -1480,7 +1477,7 @@ Standard_Boolean Geom_OffsetSurface::IsUClosed () const { Handle(Geom_SurfaceOfLinearExtrusion) Extru = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(SBasis); - Handle(Curve) C = Extru->BasisCurve(); + Handle(Geom_Curve) C = Extru->BasisCurve(); UClosed = (C->IsKind(STANDARD_TYPE(Geom_Circle)) || C->IsKind(STANDARD_TYPE(Geom_Ellipse))); } else if (SBasis->IsKind (STANDARD_TYPE(Geom_SurfaceOfRevolution))) { @@ -1500,13 +1497,13 @@ Standard_Boolean Geom_OffsetSurface::IsUClosed () const { Standard_Boolean Geom_OffsetSurface::IsVClosed () const { Standard_Boolean VClosed; - Handle(Surface) SBasis = BasisSurface(); + Handle(Geom_Surface) SBasis = BasisSurface(); if (SBasis->IsKind (STANDARD_TYPE(Geom_RectangularTrimmedSurface))) { Handle(Geom_RectangularTrimmedSurface) St = Handle(Geom_RectangularTrimmedSurface)::DownCast(SBasis); - Handle(Surface) S = Handle(Surface)::DownCast(St->BasisSurface()); + Handle(Geom_Surface) S = Handle(Geom_Surface)::DownCast(St->BasisSurface()); if (S->IsKind (STANDARD_TYPE(Geom_ElementarySurface))) { VClosed = SBasis->IsVClosed(); } diff --git a/src/Geom/Geom_Parabola.cxx b/src/Geom/Geom_Parabola.cxx index 723aecb382..c0ea0263da 100644 --- a/src/Geom/Geom_Parabola.cxx +++ b/src/Geom/Geom_Parabola.cxx @@ -23,7 +23,6 @@ #include typedef Geom_Parabola Parabola; -typedef Handle(Geom_Parabola) Handle(Parabola); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; @@ -31,11 +30,6 @@ typedef gp_Trsf Trsf; typedef gp_Vec Vec; typedef gp_XYZ XYZ; - - - - - //======================================================================= //function : Copy //purpose : @@ -43,7 +37,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_Parabola::Copy() const { - Handle(Parabola) Prb; + Handle(Geom_Parabola) Prb; Prb = new Parabola (pos, focalLength); return Prb; } diff --git a/src/Geom/Geom_Plane.cxx b/src/Geom/Geom_Plane.cxx index 81fd89732b..fbadc272b8 100644 --- a/src/Geom/Geom_Plane.cxx +++ b/src/Geom/Geom_Plane.cxx @@ -28,9 +28,6 @@ #include typedef Geom_Plane Plane; -typedef Handle(Geom_Plane) Handle(Plane); -typedef Handle(Geom_Line) Handle(Line); - typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Ax3 Ax3; @@ -42,8 +39,6 @@ typedef gp_Trsf Trsf; typedef gp_Vec Vec; typedef gp_XYZ XYZ; - - //======================================================================= //function : Copy //purpose : @@ -51,7 +46,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_Plane::Copy () const { - Handle(Plane) Pl = new Plane ( pos); + Handle(Geom_Plane) Pl = new Plane ( pos); return Pl; } diff --git a/src/Geom/Geom_Point.cxx b/src/Geom/Geom_Point.cxx index 7a828d22ce..35be2b66bb 100644 --- a/src/Geom/Geom_Point.cxx +++ b/src/Geom/Geom_Point.cxx @@ -16,12 +16,9 @@ #include - -typedef Handle(Geom_Point) Handle(Point); typedef Geom_Point Point; - -Standard_Real Geom_Point::Distance (const Handle(Point)& Other) const { +Standard_Real Geom_Point::Distance (const Handle(Geom_Point)& Other) const { gp_Pnt P1 = this->Pnt (); gp_Pnt P2 = Other->Pnt (); @@ -29,7 +26,7 @@ Standard_Real Geom_Point::Distance (const Handle(Point)& Other) const { } -Standard_Real Geom_Point::SquareDistance (const Handle(Point)& Other) const { +Standard_Real Geom_Point::SquareDistance (const Handle(Geom_Point)& Other) const { gp_Pnt P1 = this->Pnt (); gp_Pnt P2 = Other->Pnt (); diff --git a/src/Geom/Geom_RectangularTrimmedSurface.cxx b/src/Geom/Geom_RectangularTrimmedSurface.cxx index c247e3124e..64d5fc6fd2 100644 --- a/src/Geom/Geom_RectangularTrimmedSurface.cxx +++ b/src/Geom/Geom_RectangularTrimmedSurface.cxx @@ -42,21 +42,13 @@ #include #include -typedef Handle(Geom_Surface) Handle(Surface); -typedef Handle(Geom_Geometry) Handle(Geometry); typedef Geom_RectangularTrimmedSurface RectangularTrimmedSurface; -typedef Handle(Geom_RectangularTrimmedSurface) Handle(RectangularTrimmedSurface); - typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; typedef gp_Vec Vec; - - - - //======================================================================= //function : Copy //purpose : @@ -64,7 +56,7 @@ typedef gp_Vec Vec; Handle(Geom_Geometry) Geom_RectangularTrimmedSurface::Copy () const { - Handle(RectangularTrimmedSurface) S; + Handle(Geom_RectangularTrimmedSurface) S; if ( isutrimmed && isvtrimmed ) S = new RectangularTrimmedSurface (basisSurf, @@ -91,7 +83,7 @@ Handle(Geom_Geometry) Geom_RectangularTrimmedSurface::Copy () const { Geom_RectangularTrimmedSurface::Geom_RectangularTrimmedSurface ( -const Handle(Surface)& S, +const Handle(Geom_Surface)& S, const Standard_Real U1, const Standard_Real U2, const Standard_Real V1, @@ -111,9 +103,9 @@ const Standard_Boolean VSense) Handle(Geom_RectangularTrimmedSurface) T = Handle(Geom_RectangularTrimmedSurface)::DownCast(S); if (!T.IsNull()) - basisSurf = Handle(Surface)::DownCast(T->BasisSurface()->Copy()); + basisSurf = Handle(Geom_Surface)::DownCast(T->BasisSurface()->Copy()); else - basisSurf = Handle(Surface)::DownCast(S->Copy()); + basisSurf = Handle(Geom_Surface)::DownCast(S->Copy()); Handle(Geom_OffsetSurface) O = Handle(Geom_OffsetSurface)::DownCast(basisSurf); @@ -122,7 +114,7 @@ const Standard_Boolean VSense) Handle(Geom_RectangularTrimmedSurface) S2 = new Geom_RectangularTrimmedSurface( O->BasisSurface(),U1,U2, V1, V2, USense, VSense); Handle(Geom_OffsetSurface) OS = new Geom_OffsetSurface(S2, O->Offset()); - basisSurf = Handle(Surface)::DownCast(OS); + basisSurf = Handle(Geom_Surface)::DownCast(OS); } SetTrim( U1, U2, V1, V2, USense, VSense); @@ -147,9 +139,9 @@ Geom_RectangularTrimmedSurface::Geom_RectangularTrimmedSurface ( Handle(Geom_RectangularTrimmedSurface) T = Handle(Geom_RectangularTrimmedSurface)::DownCast(S); if (!T.IsNull()) - basisSurf = Handle(Surface)::DownCast(T->BasisSurface()->Copy()); + basisSurf = Handle(Geom_Surface)::DownCast(T->BasisSurface()->Copy()); else - basisSurf = Handle(Surface)::DownCast(S->Copy()); + basisSurf = Handle(Geom_Surface)::DownCast(S->Copy()); Handle(Geom_OffsetSurface) O = Handle(Geom_OffsetSurface)::DownCast(basisSurf); @@ -158,7 +150,7 @@ Geom_RectangularTrimmedSurface::Geom_RectangularTrimmedSurface ( Handle(Geom_RectangularTrimmedSurface) S2 = new Geom_RectangularTrimmedSurface( O->BasisSurface(),Param1,Param2, UTrim, Sense); Handle(Geom_OffsetSurface) OS = new Geom_OffsetSurface(S2, O->Offset()); - basisSurf = Handle(Surface)::DownCast(OS); + basisSurf = Handle(Geom_Surface)::DownCast(OS); } SetTrim(Param1, Param2, UTrim, Sense); @@ -380,7 +372,7 @@ Standard_Real Geom_RectangularTrimmedSurface::VReversedParameter( const Standard //purpose : //======================================================================= -Handle(Surface) Geom_RectangularTrimmedSurface::BasisSurface () const +Handle(Geom_Surface) Geom_RectangularTrimmedSurface::BasisSurface () const { return basisSurf; } diff --git a/src/Geom/Geom_SphericalSurface.cxx b/src/Geom/Geom_SphericalSurface.cxx index ffd8307da7..65abe10062 100644 --- a/src/Geom/Geom_SphericalSurface.cxx +++ b/src/Geom/Geom_SphericalSurface.cxx @@ -26,9 +26,6 @@ typedef Geom_Circle Circle; typedef Geom_SphericalSurface SphericalSurface; -typedef Handle(Geom_SphericalSurface) Handle(SphericalSurface); -typedef Handle(Geom_Curve) Handle(Curve); -typedef Handle(Geom_Circle) Handle(Circle); typedef gp_Ax2 Ax2; typedef gp_Ax3 Ax3; typedef gp_Circ Circ; @@ -38,9 +35,6 @@ typedef gp_Trsf Trsf; typedef gp_XYZ XYZ; typedef gp_Vec Vec; - - - //======================================================================= //function : Copy //purpose : @@ -48,7 +42,7 @@ typedef gp_Vec Vec; Handle(Geom_Geometry) Geom_SphericalSurface::Copy () const { - Handle(SphericalSurface) Cs; + Handle(Geom_SphericalSurface) Cs; Cs = new SphericalSurface (pos, radius); return Cs; } @@ -313,7 +307,7 @@ gp_Sphere Geom_SphericalSurface::Sphere () const { //purpose : //======================================================================= -Handle(Curve) Geom_SphericalSurface::UIso (const Standard_Real U) const +Handle(Geom_Curve) Geom_SphericalSurface::UIso (const Standard_Real U) const { Handle(Geom_Circle) GC = new Geom_Circle(ElSLib::SphereUIso(pos,radius,U)); Handle(Geom_TrimmedCurve) iso = new Geom_TrimmedCurve(GC,-M_PI/2.,M_PI/2); @@ -326,7 +320,7 @@ Handle(Curve) Geom_SphericalSurface::UIso (const Standard_Real U) const //purpose : //======================================================================= -Handle(Curve) Geom_SphericalSurface::VIso (const Standard_Real V) const +Handle(Geom_Curve) Geom_SphericalSurface::VIso (const Standard_Real V) const { Handle(Geom_Circle) GC = new Geom_Circle(ElSLib::SphereVIso(pos,radius,V)); diff --git a/src/Geom/Geom_Surface.cxx b/src/Geom/Geom_Surface.cxx index 670a4f41bb..de793ca4d5 100644 --- a/src/Geom/Geom_Surface.cxx +++ b/src/Geom/Geom_Surface.cxx @@ -17,17 +17,15 @@ #include typedef Geom_Surface Surface; -typedef Handle(Geom_Surface) Handle(Surface); - //======================================================================= //function : UReversed //purpose : //======================================================================= -Handle(Surface) Geom_Surface::UReversed () const +Handle(Geom_Surface) Geom_Surface::UReversed () const { - Handle(Surface) S = Handle(Surface)::DownCast(Copy()); + Handle(Geom_Surface) S = Handle(Geom_Surface)::DownCast(Copy()); S->UReverse(); return S; } @@ -38,9 +36,9 @@ Handle(Surface) Geom_Surface::UReversed () const //purpose : //======================================================================= -Handle(Surface) Geom_Surface::VReversed () const +Handle(Geom_Surface) Geom_Surface::VReversed () const { - Handle(Surface) S = Handle(Surface)::DownCast(Copy()); + Handle(Geom_Surface) S = Handle(Geom_Surface)::DownCast(Copy()); S->VReverse(); return S; } diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx b/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx index dfeac3a2e6..aa3a7ccd28 100644 --- a/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx +++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx @@ -44,9 +44,7 @@ #define FMULTS (BSplCLib::NoMults()) typedef Geom_SurfaceOfLinearExtrusion SurfaceOfLinearExtrusion; -typedef Handle(Geom_SurfaceOfLinearExtrusion) Handle(SurfaceOfLinearExtrusion); typedef Geom_Curve Curve; -typedef Handle(Geom_Curve) Handle(Curve); typedef gp_Dir Dir; typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; @@ -131,10 +129,10 @@ Handle(Geom_Geometry) Geom_SurfaceOfLinearExtrusion::Copy () const //======================================================================= Geom_SurfaceOfLinearExtrusion::Geom_SurfaceOfLinearExtrusion - ( const Handle(Curve)& C, + ( const Handle(Geom_Curve)& C, const Dir& V) { - basisCurve = Handle(Curve)::DownCast(C->Copy()); // Copy 10-03-93 + basisCurve = Handle(Geom_Curve)::DownCast(C->Copy()); // Copy 10-03-93 direction = V; smooth = C->Continuity(); } @@ -202,10 +200,10 @@ void Geom_SurfaceOfLinearExtrusion::SetDirection (const Dir& V) { //purpose : //======================================================================= -void Geom_SurfaceOfLinearExtrusion::SetBasisCurve (const Handle(Curve)& C) { +void Geom_SurfaceOfLinearExtrusion::SetBasisCurve (const Handle(Geom_Curve)& C) { smooth = C->Continuity(); - basisCurve = Handle(Curve)::DownCast(C->Copy()); // Copy 10-03-93 + basisCurve = Handle(Geom_Curve)::DownCast(C->Copy()); // Copy 10-03-93 } @@ -491,11 +489,11 @@ Handle(Geom_Curve) Geom_SurfaceOfLinearExtrusion::UIso (const Standard_Real U) c //purpose : //======================================================================= -Handle(Curve) Geom_SurfaceOfLinearExtrusion::VIso (const Standard_Real V) const { +Handle(Geom_Curve) Geom_SurfaceOfLinearExtrusion::VIso (const Standard_Real V) const { Vec Vdir (direction); Vdir.Multiply (V); - Handle(Curve) C; + Handle(Geom_Curve) C; C = Handle(Geom_Curve)::DownCast(basisCurve->Translated(Vdir)); return C; } diff --git a/src/Geom/Geom_SurfaceOfRevolution.cxx b/src/Geom/Geom_SurfaceOfRevolution.cxx index b2fc9ba9c1..d756ce8d9a 100644 --- a/src/Geom/Geom_SurfaceOfRevolution.cxx +++ b/src/Geom/Geom_SurfaceOfRevolution.cxx @@ -38,10 +38,7 @@ #define FMULTS (BSplCLib::NoMults()) typedef Geom_SurfaceOfRevolution SurfaceOfRevolution; -typedef Handle(Geom_SurfaceOfRevolution) Handle(SurfaceOfRevolution); -typedef Handle(Geom_Geometry) Handle(Geometry); typedef Geom_Curve Curve; -typedef Handle(Geom_Curve) Handle(Curve); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Dir Dir; @@ -50,6 +47,7 @@ typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; typedef gp_Vec Vec; typedef gp_XYZ XYZ; + //======================================================================= //function : LocateSide //purpose : This method locates U parameter on basis BSpline curve @@ -135,10 +133,10 @@ Handle(Geom_Geometry) Geom_SurfaceOfRevolution::Copy () const { //======================================================================= Geom_SurfaceOfRevolution::Geom_SurfaceOfRevolution - (const Handle(Curve)& C , + (const Handle(Geom_Curve)& C , const Ax1& A1 ) : loc (A1.Location()) { - basisCurve = Handle(Curve)::DownCast(C->Copy()); + basisCurve = Handle(Geom_Curve)::DownCast(C->Copy()); direction = A1.Direction(); smooth = C->Continuity(); } @@ -300,9 +298,9 @@ void Geom_SurfaceOfRevolution::SetDirection (const Dir& V) { //purpose : //======================================================================= -void Geom_SurfaceOfRevolution::SetBasisCurve (const Handle(Curve)& C) { +void Geom_SurfaceOfRevolution::SetBasisCurve (const Handle(Geom_Curve)& C) { - basisCurve = Handle(Curve)::DownCast(C->Copy()); + basisCurve = Handle(Geom_Curve)::DownCast(C->Copy()); smooth = C->Continuity(); } @@ -1111,9 +1109,9 @@ Ax2 Geom_SurfaceOfRevolution::ReferencePlane() const { //purpose : //======================================================================= -Handle(Curve) Geom_SurfaceOfRevolution::UIso (const Standard_Real U) const { +Handle(Geom_Curve) Geom_SurfaceOfRevolution::UIso (const Standard_Real U) const { - Handle(Curve) C = Handle(Curve)::DownCast(basisCurve->Copy()); + Handle(Geom_Curve) C = Handle(Geom_Curve)::DownCast(basisCurve->Copy()); Ax1 RotAxis = Ax1 (loc, direction); C->Rotate (RotAxis, U); return C; diff --git a/src/Geom/Geom_ToroidalSurface.cxx b/src/Geom/Geom_ToroidalSurface.cxx index 96e2e1baa4..cac1824eb1 100644 --- a/src/Geom/Geom_ToroidalSurface.cxx +++ b/src/Geom/Geom_ToroidalSurface.cxx @@ -28,7 +28,6 @@ #include typedef Geom_ToroidalSurface ToroidalSurface; -typedef Handle(Geom_ToroidalSurface) Handle(ToroidalSurface); typedef TColStd_Array1OfReal Array1OfReal; typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; @@ -49,7 +48,7 @@ typedef gp_XYZ XYZ; Handle(Geom_Geometry) Geom_ToroidalSurface::Copy () const { - Handle(ToroidalSurface) Cs; + Handle(Geom_ToroidalSurface) Cs; Cs = new ToroidalSurface (pos, majorRadius, minorRadius); return Cs; } diff --git a/src/Geom/Geom_Transformation.cxx b/src/Geom/Geom_Transformation.cxx index f9726c02f0..9829fe292f 100644 --- a/src/Geom/Geom_Transformation.cxx +++ b/src/Geom/Geom_Transformation.cxx @@ -16,7 +16,6 @@ #include -typedef Handle(Geom_Transformation) Handle(Transformation); typedef Geom_Transformation Transformation; typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; @@ -25,9 +24,6 @@ typedef gp_Pnt Pnt; typedef gp_TrsfForm TrsfForm; typedef gp_Vec Vec; - - - Geom_Transformation::Geom_Transformation () { } @@ -37,7 +33,7 @@ Geom_Transformation::Geom_Transformation (const gp_Trsf& T) Handle(Geom_Transformation) Geom_Transformation::Copy() const { - Handle(Transformation) T; + Handle(Geom_Transformation) T; T = new Transformation (gpTrsf); return T; } @@ -104,13 +100,13 @@ Standard_Real Geom_Transformation::Value (const Standard_Integer Row, const Stan void Geom_Transformation::Invert () { gpTrsf.Invert(); } -Handle(Transformation) Geom_Transformation::Inverted () const { +Handle(Geom_Transformation) Geom_Transformation::Inverted () const { return new Transformation (gpTrsf.Inverted()); } -Handle(Transformation) Geom_Transformation::Multiplied ( +Handle(Geom_Transformation) Geom_Transformation::Multiplied ( const Handle(Geom_Transformation)& Other) const { return new Transformation (gpTrsf.Multiplied (Other->Trsf())); @@ -126,7 +122,7 @@ void Geom_Transformation::Multiply (const Handle(Geom_Transformation)& Other) { void Geom_Transformation::Power (const Standard_Integer N) { gpTrsf.Power (N); } -Handle(Transformation) Geom_Transformation::Powered (const Standard_Integer N) const { +Handle(Geom_Transformation) Geom_Transformation::Powered (const Standard_Integer N) const { gp_Trsf T = gpTrsf; T.Power (N); diff --git a/src/Geom/Geom_TrimmedCurve.cxx b/src/Geom/Geom_TrimmedCurve.cxx index eac903311f..0caccacdd6 100644 --- a/src/Geom/Geom_TrimmedCurve.cxx +++ b/src/Geom/Geom_TrimmedCurve.cxx @@ -31,11 +31,7 @@ #include #include - -typedef Handle(Geom_TrimmedCurve) Handle(TrimmedCurve); typedef Geom_TrimmedCurve TrimmedCurve; -typedef Handle(Geom_Curve) Handle(Curve); -typedef Handle(Geom_Geometry) Handle(Geometry); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; @@ -49,7 +45,7 @@ typedef gp_Vec Vec; Handle(Geom_Geometry) Geom_TrimmedCurve::Copy () const { - Handle(TrimmedCurve) Tc = new TrimmedCurve (basisCurve, uTrim1, uTrim2); + Handle(Geom_TrimmedCurve) Tc = new TrimmedCurve (basisCurve, uTrim1, uTrim2); return Tc; } @@ -70,9 +66,9 @@ Geom_TrimmedCurve::Geom_TrimmedCurve (const Handle(Geom_Curve)& C, // kill trimmed basis curves Handle(Geom_TrimmedCurve) T = Handle(Geom_TrimmedCurve)::DownCast(C); if (!T.IsNull()) - basisCurve = Handle(Curve)::DownCast(T->BasisCurve()->Copy()); + basisCurve = Handle(Geom_Curve)::DownCast(T->BasisCurve()->Copy()); else - basisCurve = Handle(Curve)::DownCast(C->Copy()); + basisCurve = Handle(Geom_Curve)::DownCast(C->Copy()); SetTrim(U1, U2, Sense, theAdjustPeriodic); } @@ -207,7 +203,7 @@ GeomAbs_Shape Geom_TrimmedCurve::Continuity () const { //purpose : //======================================================================= -Handle(Curve) Geom_TrimmedCurve::BasisCurve () const { +Handle(Geom_Curve) Geom_TrimmedCurve::BasisCurve () const { return basisCurve; } diff --git a/src/Geom/Geom_Vector.cxx b/src/Geom/Geom_Vector.cxx index 409ca79158..3362bdd557 100644 --- a/src/Geom/Geom_Vector.cxx +++ b/src/Geom/Geom_Vector.cxx @@ -17,15 +17,11 @@ #include typedef Geom_Vector Vector; -typedef Handle(Geom_Vector) Handle(Vector); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; - - - void Geom_Vector::Reverse () { gpVec.Reverse(); } Standard_Real Geom_Vector::X () const { return gpVec.X(); } @@ -36,22 +32,22 @@ Standard_Real Geom_Vector::Z () const { return gpVec.Z(); } const gp_Vec& Geom_Vector::Vec () const { return gpVec; } -Handle(Vector) Geom_Vector::Reversed () const +Handle(Geom_Vector) Geom_Vector::Reversed () const { - Handle(Vector) V = Handle(Vector)::DownCast(Copy()); + Handle(Geom_Vector) V = Handle(Geom_Vector)::DownCast(Copy()); V->Reverse(); return V; } -Standard_Real Geom_Vector::Angle (const Handle(Vector)& Other) const { +Standard_Real Geom_Vector::Angle (const Handle(Geom_Vector)& Other) const { return gpVec.Angle (Other->Vec()); } Standard_Real Geom_Vector::AngleWithRef ( -const Handle(Vector)& Other, const Handle(Vector)& VRef) const { +const Handle(Geom_Vector)& Other, const Handle(Geom_Vector)& VRef) const { return gpVec.AngleWithRef (Other->Vec(), VRef->Vec()); } @@ -63,14 +59,14 @@ void Geom_Vector::Coord (Standard_Real& X, Standard_Real& Y, Standard_Real& Z) c } -Standard_Real Geom_Vector::Dot (const Handle(Vector)& Other) const { +Standard_Real Geom_Vector::Dot (const Handle(Geom_Vector)& Other) const { return gpVec.Dot (Other->Vec()); } Standard_Real Geom_Vector::DotCross ( -const Handle(Vector)& V1, const Handle(Vector)& V2) const { +const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const { return gpVec.DotCross (V1->Vec(), V2->Vec()); } diff --git a/src/Geom/Geom_VectorWithMagnitude.cxx b/src/Geom/Geom_VectorWithMagnitude.cxx index 3e4f774f66..da5b329262 100644 --- a/src/Geom/Geom_VectorWithMagnitude.cxx +++ b/src/Geom/Geom_VectorWithMagnitude.cxx @@ -17,18 +17,12 @@ #include typedef Geom_VectorWithMagnitude VectorWithMagnitude; -typedef Handle(Geom_VectorWithMagnitude) Handle(VectorWithMagnitude); typedef Geom_Vector Vector; -typedef Handle(Geom_Vector) Handle(Vector); -typedef Handle(Geom_Geometry) Handle(Geometry); typedef gp_Ax1 Ax1; typedef gp_Ax2 Ax2; typedef gp_Pnt Pnt; typedef gp_Trsf Trsf; - - - //======================================================================= //function : Geom_VectorWithMagnitude //purpose : @@ -63,7 +57,7 @@ const Pnt& P1, const Pnt& P2) { gpVec = gp_Vec (P1, P2); } Handle(Geom_Geometry) Geom_VectorWithMagnitude::Copy() const { - Handle(VectorWithMagnitude) V; + Handle(Geom_VectorWithMagnitude) V; V = new VectorWithMagnitude (gpVec); return V; } @@ -128,7 +122,7 @@ Standard_Real Geom_VectorWithMagnitude::SquareMagnitude () const { //purpose : //======================================================================= -void Geom_VectorWithMagnitude::Add (const Handle(Vector)& Other) { +void Geom_VectorWithMagnitude::Add (const Handle(Geom_Vector)& Other) { gpVec.Add (Other->Vec()); } @@ -139,8 +133,8 @@ void Geom_VectorWithMagnitude::Add (const Handle(Vector)& Other) { //purpose : //======================================================================= -Handle(VectorWithMagnitude) Geom_VectorWithMagnitude::Added ( -const Handle(Vector)& Other) const { +Handle(Geom_VectorWithMagnitude) Geom_VectorWithMagnitude::Added ( +const Handle(Geom_Vector)& Other) const { gp_Vec V1 = gpVec; V1.Add (Other->Vec()); @@ -153,7 +147,7 @@ const Handle(Vector)& Other) const { //purpose : //======================================================================= -void Geom_VectorWithMagnitude::Cross (const Handle(Vector)& Other) { +void Geom_VectorWithMagnitude::Cross (const Handle(Geom_Vector)& Other) { gpVec.Cross (Other->Vec()); } @@ -165,8 +159,8 @@ void Geom_VectorWithMagnitude::Cross (const Handle(Vector)& Other) { //purpose : //======================================================================= -Handle(Vector) Geom_VectorWithMagnitude::Crossed ( -const Handle(Vector)& Other) const { +Handle(Geom_Vector) Geom_VectorWithMagnitude::Crossed ( +const Handle(Geom_Vector)& Other) const { gp_Vec V (gpVec); V.Cross (Other->Vec()); @@ -180,7 +174,7 @@ const Handle(Vector)& Other) const { //======================================================================= void Geom_VectorWithMagnitude::CrossCross ( -const Handle(Vector)& V1, const Handle(Vector)& V2) { +const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) { gpVec.CrossCross (V1->Vec(), V2->Vec()); } @@ -191,8 +185,8 @@ const Handle(Vector)& V1, const Handle(Vector)& V2) { //purpose : //======================================================================= -Handle(Vector) Geom_VectorWithMagnitude::CrossCrossed ( -const Handle(Vector)& V1, const Handle(Vector)& V2) const { +Handle(Geom_Vector) Geom_VectorWithMagnitude::CrossCrossed ( +const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const { gp_Vec V (gpVec); V.CrossCross (V1->Vec(), V2->Vec()); @@ -216,7 +210,7 @@ void Geom_VectorWithMagnitude::Divide (const Standard_Real Scalar) { //purpose : //======================================================================= -Handle(VectorWithMagnitude) Geom_VectorWithMagnitude::Divided ( +Handle(Geom_VectorWithMagnitude) Geom_VectorWithMagnitude::Divided ( const Standard_Real Scalar) const { gp_Vec V (gpVec); @@ -230,7 +224,7 @@ const Standard_Real Scalar) const { //purpose : //======================================================================= -Handle(VectorWithMagnitude) Geom_VectorWithMagnitude::Multiplied ( +Handle(Geom_VectorWithMagnitude) Geom_VectorWithMagnitude::Multiplied ( const Standard_Real Scalar) const { gp_Vec V (gpVec); @@ -263,7 +257,7 @@ void Geom_VectorWithMagnitude::Normalize () { gpVec.Normalize (); } //purpose : //======================================================================= -Handle(VectorWithMagnitude) Geom_VectorWithMagnitude::Normalized () const { +Handle(Geom_VectorWithMagnitude) Geom_VectorWithMagnitude::Normalized () const { gp_Vec V (gpVec); V.Normalize (); @@ -276,7 +270,7 @@ Handle(VectorWithMagnitude) Geom_VectorWithMagnitude::Normalized () const { //purpose : //======================================================================= -void Geom_VectorWithMagnitude::Subtract (const Handle(Vector)& Other) { +void Geom_VectorWithMagnitude::Subtract (const Handle(Geom_Vector)& Other) { gpVec.Subtract (Other->Vec()); } @@ -287,8 +281,8 @@ void Geom_VectorWithMagnitude::Subtract (const Handle(Vector)& Other) { //purpose : //======================================================================= -Handle(VectorWithMagnitude) Geom_VectorWithMagnitude::Subtracted ( -const Handle(Vector)& Other) const { +Handle(Geom_VectorWithMagnitude) Geom_VectorWithMagnitude::Subtracted ( +const Handle(Geom_Vector)& Other) const { gp_Vec V (gpVec); V.Subtract (Other->Vec()); diff --git a/src/Geom2d/Geom2d_AxisPlacement.cxx b/src/Geom2d/Geom2d_AxisPlacement.cxx index a569cc825f..5daf50ac80 100644 --- a/src/Geom2d/Geom2d_AxisPlacement.cxx +++ b/src/Geom2d/Geom2d_AxisPlacement.cxx @@ -19,7 +19,6 @@ typedef Geom2d_AxisPlacement AxisPlacement; -typedef Handle(Geom2d_AxisPlacement) Handle(AxisPlacement); typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; typedef gp_Trsf2d Trsf2d; @@ -30,7 +29,7 @@ typedef gp_Vec2d Vec2d; Handle(Geom2d_Geometry) Geom2d_AxisPlacement::Copy() const { - Handle(AxisPlacement) A; + Handle(Geom2d_AxisPlacement) A; A = new AxisPlacement (axis); return A; } @@ -56,11 +55,11 @@ Pnt2d Geom2d_AxisPlacement::Location () const { return axis.Location(); } void Geom2d_AxisPlacement::Reverse() { axis.Reverse(); } -Handle(AxisPlacement) Geom2d_AxisPlacement::Reversed() const { +Handle(Geom2d_AxisPlacement) Geom2d_AxisPlacement::Reversed() const { gp_Ax2d A = axis; A.Reverse(); - Handle(AxisPlacement) Temp = new AxisPlacement (A); + Handle(Geom2d_AxisPlacement) Temp = new AxisPlacement (A); return Temp; } @@ -76,7 +75,7 @@ void Geom2d_AxisPlacement::SetDirection (const Dir2d& V) { axis.SetDirection(V); } -Standard_Real Geom2d_AxisPlacement::Angle (const Handle(AxisPlacement)& Other) const { +Standard_Real Geom2d_AxisPlacement::Angle (const Handle(Geom2d_AxisPlacement)& Other) const { return axis.Angle (Other->Ax2d()); } diff --git a/src/Geom2d/Geom2d_CartesianPoint.cxx b/src/Geom2d/Geom2d_CartesianPoint.cxx index 36d34cb037..9883047141 100644 --- a/src/Geom2d/Geom2d_CartesianPoint.cxx +++ b/src/Geom2d/Geom2d_CartesianPoint.cxx @@ -17,7 +17,6 @@ #include typedef Geom2d_CartesianPoint CartesianPoint; -typedef Handle(Geom2d_CartesianPoint) Handle(CartesianPoint); typedef gp_Ax2d Ax2d; typedef gp_Vec2d Vec2d; typedef gp_Trsf2d Trsf2d; @@ -33,7 +32,7 @@ Geom2d_CartesianPoint::Geom2d_CartesianPoint (const Standard_Real X, const Stand Handle(Geom2d_Geometry) Geom2d_CartesianPoint::Copy() const { - Handle(CartesianPoint) P; + Handle(Geom2d_CartesianPoint) P; P = new CartesianPoint (gpPnt2d); return P; } diff --git a/src/Geom2d/Geom2d_Circle.cxx b/src/Geom2d/Geom2d_Circle.cxx index db9a337b88..6ba24ee429 100644 --- a/src/Geom2d/Geom2d_Circle.cxx +++ b/src/Geom2d/Geom2d_Circle.cxx @@ -22,7 +22,6 @@ typedef Geom2d_Circle Circle; -typedef Handle(Geom2d_Circle) Handle(Circle); typedef gp_Ax2d Ax2d; typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; @@ -30,13 +29,6 @@ typedef gp_Trsf2d Trsf2d; typedef gp_Vec2d Vec2d; typedef gp_XY XY; - - - - - - - //======================================================================= //function : Copy //purpose : @@ -44,7 +36,7 @@ typedef gp_XY XY; Handle(Geom2d_Geometry) Geom2d_Circle::Copy() const { - Handle(Circle) C; + Handle(Geom2d_Circle) C; C = new Circle (pos, radius); return C; } diff --git a/src/Geom2d/Geom2d_Curve.cxx b/src/Geom2d/Geom2d_Curve.cxx index 814409d289..af01f5b0e8 100644 --- a/src/Geom2d/Geom2d_Curve.cxx +++ b/src/Geom2d/Geom2d_Curve.cxx @@ -19,7 +19,6 @@ typedef Geom2d_Curve Curve; -typedef Handle(Geom2d_Curve) Handle(Curve); //======================================================================= @@ -29,7 +28,7 @@ typedef Handle(Geom2d_Curve) Handle(Curve); Handle(Geom2d_Curve) Geom2d_Curve::Reversed () const { - Handle(Curve) C = Handle(Curve)::DownCast(Copy()); + Handle(Geom2d_Curve) C = Handle(Geom2d_Curve)::DownCast(Copy()); C->Reverse(); return C; } diff --git a/src/Geom2d/Geom2d_Direction.cxx b/src/Geom2d/Geom2d_Direction.cxx index 074fa728f7..bb389246e1 100644 --- a/src/Geom2d/Geom2d_Direction.cxx +++ b/src/Geom2d/Geom2d_Direction.cxx @@ -19,8 +19,6 @@ #include typedef Geom2d_Direction Direction; -typedef Handle(Geom2d_Direction) Handle(Direction); -typedef Handle(Geom2d_Vector) Handle(Vector); typedef gp_Ax2d Ax2d; typedef gp_Pnt2d Pnt2d; typedef gp_Trsf2d Trsf2d; @@ -31,7 +29,7 @@ typedef gp_Trsf2d Trsf2d; Handle(Geom2d_Geometry) Geom2d_Direction::Copy() const { - Handle(Direction) D; + Handle(Geom2d_Direction) D; D = new Direction (gpVec2d); return D; } @@ -88,7 +86,7 @@ Standard_Real Geom2d_Direction::Magnitude () const { return 1.0; } Standard_Real Geom2d_Direction::SquareMagnitude () const { return 1.0; } -Standard_Real Geom2d_Direction::Crossed (const Handle(Vector)& Other) const { +Standard_Real Geom2d_Direction::Crossed (const Handle(Geom2d_Vector)& Other) const { return gpVec2d.Crossed (Other->Vec2d()); } diff --git a/src/Geom2d/Geom2d_Ellipse.cxx b/src/Geom2d/Geom2d_Ellipse.cxx index 0912d2fa6c..38d88c16d1 100644 --- a/src/Geom2d/Geom2d_Ellipse.cxx +++ b/src/Geom2d/Geom2d_Ellipse.cxx @@ -22,9 +22,7 @@ #include #include - typedef Geom2d_Ellipse Ellipse; -typedef Handle(Geom2d_Ellipse) Handle(Ellipse); typedef gp_Ax2d Ax2d; typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; @@ -32,10 +30,6 @@ typedef gp_Vec2d Vec2d; typedef gp_Trsf2d Trsf2d; typedef gp_XY XY; - - - - //======================================================================= //function : Copy //purpose : @@ -43,7 +37,7 @@ typedef gp_XY XY; Handle(Geom2d_Geometry) Geom2d_Ellipse::Copy() const { - Handle(Ellipse) E; + Handle(Geom2d_Ellipse) E; E = new Ellipse (pos, majorRadius, minorRadius); return E; } diff --git a/src/Geom2d/Geom2d_Geometry.cxx b/src/Geom2d/Geom2d_Geometry.cxx index f8dec2ca26..e2f24fdbfa 100644 --- a/src/Geom2d/Geom2d_Geometry.cxx +++ b/src/Geom2d/Geom2d_Geometry.cxx @@ -17,15 +17,12 @@ #include #include -typedef Handle(Geom2d_Geometry) Handle(Geometry); typedef Geom2d_Geometry Geometry; typedef gp_Ax2d Ax2d; typedef gp_Pnt2d Pnt2d; typedef gp_Vec2d Vec2d; typedef gp_Trsf2d Trsf2d; - - void Geom2d_Geometry::Mirror (const gp_Pnt2d& P) { Trsf2d T; @@ -74,67 +71,57 @@ void Geom2d_Geometry::Translate (const gp_Pnt2d& P1, const gp_Pnt2d& P2) { } - Handle(Geometry) Geom2d_Geometry::Mirrored (const gp_Pnt2d& P) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); + Handle(Geom2d_Geometry) Geom2d_Geometry::Mirrored (const gp_Pnt2d& P) const + { + Handle(Geom2d_Geometry) G = Copy(); G->Mirror (P); return G; } -Handle(Geometry) Geom2d_Geometry::Mirrored (const gp_Ax2d& A) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom2d_Geometry) Geom2d_Geometry::Mirrored (const gp_Ax2d& A) const +{ + Handle(Geom2d_Geometry) G = Copy(); G->Mirror (A); return G; } -Handle(Geometry) Geom2d_Geometry::Rotated ( -const gp_Pnt2d& P, const Standard_Real Ang) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom2d_Geometry) Geom2d_Geometry::Rotated (const gp_Pnt2d& P, const Standard_Real Ang) const +{ + Handle(Geom2d_Geometry) G = Copy(); G->Rotate (P, Ang); return G; } -Handle(Geometry) Geom2d_Geometry::Scaled ( -const gp_Pnt2d& P, const Standard_Real S) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom2d_Geometry) Geom2d_Geometry::Scaled (const gp_Pnt2d& P, const Standard_Real S) const +{ + Handle(Geom2d_Geometry) G = Copy(); G->Scale (P, S); return G; } -Handle(Geometry) Geom2d_Geometry::Transformed (const gp_Trsf2d& T) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom2d_Geometry) Geom2d_Geometry::Transformed (const gp_Trsf2d& T) const +{ + Handle(Geom2d_Geometry) G = Copy(); G->Transform (T); return G; } -Handle(Geometry) Geom2d_Geometry::Translated (const gp_Vec2d& V) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom2d_Geometry) Geom2d_Geometry::Translated (const gp_Vec2d& V) const +{ + Handle(Geom2d_Geometry) G = Copy(); G->Translate (V); return G; } -Handle(Geometry) Geom2d_Geometry::Translated ( -const gp_Pnt2d& P1, const gp_Pnt2d& P2) const { - - Handle(Geometry) me = this; - Handle(Geometry) G = me->Copy(); +Handle(Geom2d_Geometry) Geom2d_Geometry::Translated (const gp_Pnt2d& P1, const gp_Pnt2d& P2) const +{ + Handle(Geom2d_Geometry) G = Copy(); G->Translate (P1, P2); return G; } diff --git a/src/Geom2d/Geom2d_Hyperbola.cxx b/src/Geom2d/Geom2d_Hyperbola.cxx index 99e005f841..6e95aa9f7a 100644 --- a/src/Geom2d/Geom2d_Hyperbola.cxx +++ b/src/Geom2d/Geom2d_Hyperbola.cxx @@ -25,10 +25,7 @@ #include #include - - typedef Geom2d_Hyperbola Hyperbola; -typedef Handle(Geom2d_Hyperbola) Handle(Hyperbola); typedef gp_Ax2d Ax2d; typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; @@ -36,10 +33,6 @@ typedef gp_Vec2d Vec2d; typedef gp_Trsf2d Trsf2d; typedef gp_XY XY; - - - - //======================================================================= //function : Copy //purpose : @@ -47,7 +40,7 @@ typedef gp_XY XY; Handle(Geom2d_Geometry) Geom2d_Hyperbola::Copy() const { - Handle(Hyperbola) H; + Handle(Geom2d_Hyperbola) H; H = new Hyperbola (pos, majorRadius, minorRadius); return H; } diff --git a/src/Geom2d/Geom2d_Line.cxx b/src/Geom2d/Geom2d_Line.cxx index 738e7601c3..8ed80bf987 100644 --- a/src/Geom2d/Geom2d_Line.cxx +++ b/src/Geom2d/Geom2d_Line.cxx @@ -21,9 +21,7 @@ #include #include - typedef Geom2d_Line Line; -typedef Handle(Geom2d_Line) Handle(Line); typedef gp_Ax2d Ax2d; typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; @@ -31,10 +29,6 @@ typedef gp_Vec2d Vec2d; typedef gp_Trsf2d Trsf2d; typedef gp_XY XY; - - - - //======================================================================= //function : Copy //purpose : @@ -42,7 +36,7 @@ typedef gp_XY XY; Handle(Geom2d_Geometry) Geom2d_Line::Copy() const { - Handle(Line) L; + Handle(Geom2d_Line) L; L = new Line (pos); return L; } diff --git a/src/Geom2d/Geom2d_OffsetCurve.cxx b/src/Geom2d/Geom2d_OffsetCurve.cxx index 79d86bad0e..82a38185ec 100644 --- a/src/Geom2d/Geom2d_OffsetCurve.cxx +++ b/src/Geom2d/Geom2d_OffsetCurve.cxx @@ -37,10 +37,7 @@ #include #include -typedef Handle(Geom2d_OffsetCurve) Handle(OffsetCurve); typedef Geom2d_OffsetCurve OffsetCurve; -typedef Handle(Geom2d_Geometry) Handle(Geometry); -typedef Handle(Geom2d_Curve) Handle(Curve); typedef Geom2d_Curve Curve; typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; @@ -70,7 +67,7 @@ static Standard_Boolean AdjustDerivative(const Handle(Geom2d_Curve)& theCurve, S Handle(Geom2d_Geometry) Geom2d_OffsetCurve::Copy () const { - Handle(OffsetCurve) C; + Handle(Geom2d_OffsetCurve) C; C = new OffsetCurve (basisCurve, offsetValue); return C; } @@ -116,7 +113,7 @@ Standard_Real Geom2d_OffsetCurve::ReversedParameter( const Standard_Real U) cons //purpose : //======================================================================= -void Geom2d_OffsetCurve::SetBasisCurve (const Handle(Curve)& C, +void Geom2d_OffsetCurve::SetBasisCurve (const Handle(Geom2d_Curve)& C, const Standard_Boolean isNotCheckC0) { const Standard_Real aUf = C->FirstParameter(), @@ -189,7 +186,7 @@ void Geom2d_OffsetCurve::SetOffsetValue (const Standard_Real D) { offsetValue = //purpose : //======================================================================= -Handle(Curve) Geom2d_OffsetCurve::BasisCurve () const +Handle(Geom2d_Curve) Geom2d_OffsetCurve::BasisCurve () const { return basisCurve; } diff --git a/src/Geom2d/Geom2d_Parabola.cxx b/src/Geom2d/Geom2d_Parabola.cxx index ba33179d5e..dfeeb94ff8 100644 --- a/src/Geom2d/Geom2d_Parabola.cxx +++ b/src/Geom2d/Geom2d_Parabola.cxx @@ -24,7 +24,6 @@ #include typedef Geom2d_Parabola Parabola; -typedef Handle(Geom2d_Parabola) Handle(Parabola); typedef gp_Ax2d Ax2d; typedef gp_Dir2d Dir2d; typedef gp_Pnt2d Pnt2d; @@ -32,11 +31,6 @@ typedef gp_Vec2d Vec2d; typedef gp_Trsf2d Trsf2d; typedef gp_XY XY; - - - - - //======================================================================= //function : Copy //purpose : @@ -44,7 +38,7 @@ typedef gp_XY XY; Handle(Geom2d_Geometry) Geom2d_Parabola::Copy() const { - Handle(Parabola) Prb; + Handle(Geom2d_Parabola) Prb; Prb = new Parabola (pos, focalLength); return Prb; } diff --git a/src/Geom2d/Geom2d_Point.cxx b/src/Geom2d/Geom2d_Point.cxx index cd4f9d3588..0d42c13f6e 100644 --- a/src/Geom2d/Geom2d_Point.cxx +++ b/src/Geom2d/Geom2d_Point.cxx @@ -17,10 +17,8 @@ #include typedef Geom2d_Point Point; -typedef Handle(Geom2d_Point) Handle(Point); - -Standard_Real Geom2d_Point::Distance (const Handle(Point)& Other) const { +Standard_Real Geom2d_Point::Distance (const Handle(Geom2d_Point)& Other) const { gp_Pnt2d P1 = this-> Pnt2d (); gp_Pnt2d P2 = Other->Pnt2d (); @@ -28,7 +26,7 @@ Standard_Real Geom2d_Point::Distance (const Handle(Point)& Other) const { } -Standard_Real Geom2d_Point::SquareDistance (const Handle(Point)& Other) const { +Standard_Real Geom2d_Point::SquareDistance (const Handle(Geom2d_Point)& Other) const { gp_Pnt2d P1 = this-> Pnt2d (); gp_Pnt2d P2 = Other->Pnt2d (); diff --git a/src/Geom2d/Geom2d_Transformation.cxx b/src/Geom2d/Geom2d_Transformation.cxx index 4a464236f1..04802a7a6d 100644 --- a/src/Geom2d/Geom2d_Transformation.cxx +++ b/src/Geom2d/Geom2d_Transformation.cxx @@ -18,23 +18,14 @@ typedef Geom2d_Transformation Transformation; -typedef Handle(Geom2d_Transformation) Handle(Transformation); - typedef gp_Ax2d Ax2d; typedef gp_Pnt2d Pnt2d; typedef gp_TrsfForm TrsfForm; typedef gp_Vec2d Vec2d; - - - - - - - Handle(Geom2d_Transformation) Geom2d_Transformation::Copy() const { - Handle(Transformation) T; + Handle(Geom2d_Transformation) T; T = new Transformation (gpTrsf2d); return T; } @@ -49,21 +40,21 @@ Geom2d_Transformation::Geom2d_Transformation (const gp_Trsf2d& T) : gpTrsf2d (T) { } -Handle(Transformation) Geom2d_Transformation::Inverted () const { +Handle(Geom2d_Transformation) Geom2d_Transformation::Inverted () const { return new Transformation (gpTrsf2d.Inverted()); } -Handle(Transformation) Geom2d_Transformation::Multiplied ( +Handle(Geom2d_Transformation) Geom2d_Transformation::Multiplied ( -const Handle(Transformation)& Other) const { +const Handle(Geom2d_Transformation)& Other) const { return new Transformation (gpTrsf2d.Multiplied (Other->Trsf2d())); } -Handle(Transformation) Geom2d_Transformation::Powered (const Standard_Integer N) const{ +Handle(Geom2d_Transformation) Geom2d_Transformation::Powered (const Standard_Integer N) const{ gp_Trsf2d Temp = gpTrsf2d; Temp.Power (N); @@ -168,7 +159,7 @@ void Geom2d_Transformation::Power (const Standard_Integer N) { gpTrsf2d.Power (N void Geom2d_Transformation::PreMultiply ( -const Handle(Transformation)& Other) { +const Handle(Geom2d_Transformation)& Other) { gpTrsf2d.PreMultiply (Other->Trsf2d()); } diff --git a/src/Geom2d/Geom2d_TrimmedCurve.cxx b/src/Geom2d/Geom2d_TrimmedCurve.cxx index ed19ec5c3c..5d259874d0 100644 --- a/src/Geom2d/Geom2d_TrimmedCurve.cxx +++ b/src/Geom2d/Geom2d_TrimmedCurve.cxx @@ -31,19 +31,12 @@ #include -typedef Handle(Geom2d_TrimmedCurve) Handle(TrimmedCurve); typedef Geom2d_TrimmedCurve TrimmedCurve; -typedef Handle(Geom2d_Curve) Handle(Curve); -typedef Handle(Geom2d_Geometry) Handle(Geometry); typedef gp_Ax2d Ax2d; typedef gp_Pnt2d Pnt2d; typedef gp_Trsf2d Trsf2d; typedef gp_Vec2d Vec2d; - - - - //======================================================================= //function : Copy //purpose : @@ -51,7 +44,7 @@ typedef gp_Vec2d Vec2d; Handle(Geom2d_Geometry) Geom2d_TrimmedCurve::Copy () const { - Handle(TrimmedCurve) Tc; + Handle(Geom2d_TrimmedCurve) Tc; Tc = new TrimmedCurve (basisCurve, uTrim1, uTrim2); return Tc; } @@ -73,9 +66,9 @@ Geom2d_TrimmedCurve::Geom2d_TrimmedCurve (const Handle(Geom2d_Curve)& C, // kill trimmed basis curves Handle(Geom2d_TrimmedCurve) T = Handle(Geom2d_TrimmedCurve)::DownCast(C); if (!T.IsNull()) - basisCurve = Handle(Curve)::DownCast(T->BasisCurve()->Copy()); + basisCurve = Handle(Geom2d_Curve)::DownCast(T->BasisCurve()->Copy()); else - basisCurve = Handle(Curve)::DownCast(C->Copy()); + basisCurve = Handle(Geom2d_Curve)::DownCast(C->Copy()); SetTrim(U1, U2, Sense, theAdjustPeriodic); } @@ -160,7 +153,7 @@ void Geom2d_TrimmedCurve::SetTrim (const Standard_Real U1, //purpose : //======================================================================= -Handle(Curve) Geom2d_TrimmedCurve::BasisCurve () const +Handle(Geom2d_Curve) Geom2d_TrimmedCurve::BasisCurve () const { return basisCurve; } diff --git a/src/Geom2d/Geom2d_Vector.cxx b/src/Geom2d/Geom2d_Vector.cxx index c699fa0134..f06c30c01f 100644 --- a/src/Geom2d/Geom2d_Vector.cxx +++ b/src/Geom2d/Geom2d_Vector.cxx @@ -17,12 +17,9 @@ #include typedef Geom2d_Vector Vector; -typedef Handle(Geom2d_Vector) Handle(Vector); typedef gp_Ax2d Ax2d; typedef gp_Pnt2d Pnt2d; - - Standard_Real Geom2d_Vector::Angle ( const Handle(Geom2d_Vector)& Other) const { @@ -39,9 +36,9 @@ Standard_Real Geom2d_Vector::X () const { return gpVec2d.X(); } Standard_Real Geom2d_Vector::Y () const { return gpVec2d.Y(); } -Handle(Vector) Geom2d_Vector::Reversed () const { +Handle(Geom2d_Vector) Geom2d_Vector::Reversed () const { - Handle(Vector) V = Handle(Vector)::DownCast(Copy()); + Handle(Geom2d_Vector) V = Handle(Geom2d_Vector)::DownCast(Copy()); V->Reverse(); return V; } @@ -53,7 +50,7 @@ void Geom2d_Vector::Coord (Standard_Real& X, Standard_Real& Y) const { } -Standard_Real Geom2d_Vector::Dot (const Handle(Vector)& Other) const { +Standard_Real Geom2d_Vector::Dot (const Handle(Geom2d_Vector)& Other) const { return gpVec2d.Dot (Other->Vec2d()); } diff --git a/src/Geom2d/Geom2d_VectorWithMagnitude.cxx b/src/Geom2d/Geom2d_VectorWithMagnitude.cxx index 375d78d535..9a93639d9e 100644 --- a/src/Geom2d/Geom2d_VectorWithMagnitude.cxx +++ b/src/Geom2d/Geom2d_VectorWithMagnitude.cxx @@ -19,15 +19,10 @@ typedef Geom2d_Vector Vector; typedef Geom2d_VectorWithMagnitude VectorWithMagnitude; -typedef Handle(Geom2d_VectorWithMagnitude) Handle(VectorWithMagnitude); -typedef Handle(Geom2d_Vector) Handle(Vector); - typedef gp_Ax2d Ax2d; typedef gp_Pnt2d Pnt2d; typedef gp_Trsf2d Trsf2d; - - Geom2d_VectorWithMagnitude::Geom2d_VectorWithMagnitude (const gp_Vec2d& V) { gpVec2d = V; } @@ -42,7 +37,7 @@ const Pnt2d& P1, const Pnt2d& P2) { gpVec2d = gp_Vec2d (P1, P2); } Handle(Geom2d_Geometry) Geom2d_VectorWithMagnitude::Copy() const { - Handle(VectorWithMagnitude) V; + Handle(Geom2d_VectorWithMagnitude) V; V = new VectorWithMagnitude (gpVec2d); return V; } @@ -74,15 +69,15 @@ Standard_Real Geom2d_VectorWithMagnitude::SquareMagnitude () const { } -void Geom2d_VectorWithMagnitude::Add (const Handle(Vector)& Other) { +void Geom2d_VectorWithMagnitude::Add (const Handle(Geom2d_Vector)& Other) { gpVec2d.Add (Other->Vec2d()); } -Handle(VectorWithMagnitude) Geom2d_VectorWithMagnitude::Added ( +Handle(Geom2d_VectorWithMagnitude) Geom2d_VectorWithMagnitude::Added ( -const Handle(Vector)& Other) const { +const Handle(Geom2d_Vector)& Other) const { gp_Vec2d Temp = Other->Vec2d(); Temp.Add (gpVec2d); @@ -90,7 +85,7 @@ const Handle(Vector)& Other) const { } -Standard_Real Geom2d_VectorWithMagnitude::Crossed (const Handle(Vector)& Other) const{ +Standard_Real Geom2d_VectorWithMagnitude::Crossed (const Handle(Geom2d_Vector)& Other) const{ return gpVec2d.Crossed (Other->Vec2d()); } @@ -102,7 +97,7 @@ void Geom2d_VectorWithMagnitude::Divide (const Standard_Real Scalar) { } -Handle(VectorWithMagnitude) Geom2d_VectorWithMagnitude::Divided ( +Handle(Geom2d_VectorWithMagnitude) Geom2d_VectorWithMagnitude::Divided ( const Standard_Real Scalar) const { gp_Vec2d V (gpVec2d); @@ -111,7 +106,7 @@ const Standard_Real Scalar) const { } -Handle(VectorWithMagnitude) Geom2d_VectorWithMagnitude::Multiplied ( +Handle(Geom2d_VectorWithMagnitude) Geom2d_VectorWithMagnitude::Multiplied ( const Standard_Real Scalar) const { gp_Vec2d V(gpVec2d); @@ -129,7 +124,7 @@ void Geom2d_VectorWithMagnitude::Multiply (const Standard_Real Scalar) { void Geom2d_VectorWithMagnitude::Normalize () { gpVec2d.Normalize (); } -Handle(VectorWithMagnitude) Geom2d_VectorWithMagnitude::Normalized () const { +Handle(Geom2d_VectorWithMagnitude) Geom2d_VectorWithMagnitude::Normalized () const { gp_Vec2d V = gpVec2d; V.Normalized (); @@ -137,14 +132,14 @@ Handle(VectorWithMagnitude) Geom2d_VectorWithMagnitude::Normalized () const { } -void Geom2d_VectorWithMagnitude::Subtract (const Handle(Vector)& Other) { +void Geom2d_VectorWithMagnitude::Subtract (const Handle(Geom2d_Vector)& Other) { gpVec2d.Subtract (Other->Vec2d()); } -Handle(VectorWithMagnitude) Geom2d_VectorWithMagnitude::Subtracted ( -const Handle(Vector)& Other) const { +Handle(Geom2d_VectorWithMagnitude) Geom2d_VectorWithMagnitude::Subtracted ( +const Handle(Geom2d_Vector)& Other) const { gp_Vec2d V = gpVec2d; V.Subtract (Other->Vec2d()); diff --git a/src/Geom2dConvert/Geom2dConvert.cxx b/src/Geom2dConvert/Geom2dConvert.cxx index 911c171937..cffae29d56 100644 --- a/src/Geom2dConvert/Geom2dConvert.cxx +++ b/src/Geom2dConvert/Geom2dConvert.cxx @@ -78,39 +78,24 @@ typedef gp_Hypr2d Hypr2d; typedef gp_Parab2d Parab2d; typedef gp_Pnt2d Pnt2d; typedef gp_Trsf2d Trsf2d; - typedef Geom2d_Curve Curve; typedef Geom2d_BSplineCurve BSplineCurve; -typedef Handle(Geom2d_Curve) Handle(Curve); -typedef Handle(Geom2d_Conic) Handle(Conic); -typedef Handle(Geom2d_Circle) Handle(Circle); -typedef Handle(Geom2d_Ellipse) Handle(Ellipse); -typedef Handle(Geom2d_Hyperbola) Handle(Hyperbola); -typedef Handle(Geom2d_Parabola) Handle(Parabola); -typedef Handle(Geom2d_Geometry) Handle(Geometry); -typedef Handle(Geom2d_BezierCurve) Handle(BezierCurve); -typedef Handle(Geom2d_TrimmedCurve) Handle(TrimmedCurve); -typedef Handle(Geom2d_BSplineCurve) Handle(BSplineCurve); - - typedef TColStd_Array1OfReal Array1OfReal; typedef TColStd_Array1OfInteger Array1OfInteger; typedef TColgp_Array1OfPnt2d Array1OfPnt2d; - - //======================================================================= //function : BSplineCurveBuilder //purpose : //======================================================================= -static Handle(BSplineCurve) BSplineCurveBuilder ( +static Handle(Geom2d_BSplineCurve) BSplineCurveBuilder ( -const Handle(Conic)& TheConic, +const Handle(Geom2d_Conic)& TheConic, const Convert_ConicToBSplineCurve& Convert ) { - Handle(BSplineCurve) TheCurve; + Handle(Geom2d_BSplineCurve) TheCurve; Standard_Integer NbPoles = Convert.NbPoles(); Standard_Integer NbKnots = Convert.NbKnots(); Array1OfPnt2d Poles (1, NbPoles); @@ -140,8 +125,8 @@ const Convert_ConicToBSplineCurve& Convert Trsf2d T; T.SetTransformation (TheConic->XAxis(), gp::OX2d()); - Handle(BSplineCurve) Cres = - Handle(BSplineCurve)::DownCast(TheCurve->Transformed (T)); + Handle(Geom2d_BSplineCurve) Cres = + Handle(Geom2d_BSplineCurve)::DownCast(TheCurve->Transformed (T)); return Cres; } @@ -151,9 +136,9 @@ const Convert_ConicToBSplineCurve& Convert //purpose : //======================================================================= -Handle(BSplineCurve) Geom2dConvert::SplitBSplineCurve ( +Handle(Geom2d_BSplineCurve) Geom2dConvert::SplitBSplineCurve ( -const Handle(BSplineCurve)& C, +const Handle(Geom2d_BSplineCurve)& C, const Standard_Integer FromK1, const Standard_Integer ToK2, const Standard_Boolean SameOrientation @@ -166,7 +151,7 @@ const Standard_Boolean SameOrientation Standard_Integer LastK = Max (FromK1, ToK2); if (FirstK < TheFirst || LastK > TheLast) Standard_OutOfRange::Raise(); - Handle(BSplineCurve) NewCurve = Handle(BSplineCurve)::DownCast(C->Copy()); + Handle(Geom2d_BSplineCurve) NewCurve = Handle(Geom2d_BSplineCurve)::DownCast(C->Copy()); NewCurve->Segment(C->Knot(FirstK),C->Knot(LastK)); @@ -185,9 +170,9 @@ const Standard_Boolean SameOrientation //purpose : //======================================================================= -Handle(BSplineCurve) Geom2dConvert::SplitBSplineCurve ( +Handle(Geom2d_BSplineCurve) Geom2dConvert::SplitBSplineCurve ( -const Handle(BSplineCurve)& C, +const Handle(Geom2d_BSplineCurve)& C, const Standard_Real FromU1, const Standard_Real ToU2, const Standard_Real, // ParametricTolerance, @@ -218,9 +203,9 @@ const Standard_Boolean SameOrientation //purpose : //======================================================================= -Handle(BSplineCurve) Geom2dConvert::CurveToBSplineCurve ( +Handle(Geom2d_BSplineCurve) Geom2dConvert::CurveToBSplineCurve ( -const Handle(Curve)& C, +const Handle(Geom2d_Curve)& C, const Convert_ParameterisationType Parameterisation) { @@ -228,7 +213,7 @@ const Convert_ParameterisationType Parameterisation) if (C->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) { Handle (Curve) Curv; - Handle(TrimmedCurve) Ctrim = Handle(TrimmedCurve)::DownCast(C); + Handle(Geom2d_TrimmedCurve) Ctrim = Handle(Geom2d_TrimmedCurve)::DownCast(C); Curv = Ctrim->BasisCurve(); Standard_Real U1 = Ctrim->FirstParameter(); Standard_Real U2 = Ctrim->LastParameter(); @@ -259,7 +244,7 @@ const Convert_ParameterisationType Parameterisation) } else if (Curv->IsKind(STANDARD_TYPE(Geom2d_Circle))) { - Handle(Circle) TheConic= Handle(Circle)::DownCast(Curv); + Handle(Geom2d_Circle) TheConic= Handle(Geom2d_Circle)::DownCast(Curv); Circ2d C2d (gp::OX2d(), TheConic->Radius()); if(Parameterisation != Convert_RationalC1) { Convert_CircleToBSplineCurve Convert (C2d, @@ -306,7 +291,7 @@ const Convert_ParameterisationType Parameterisation) } else if (Curv->IsKind(STANDARD_TYPE(Geom2d_Ellipse))) { - Handle(Ellipse) TheConic = Handle(Ellipse)::DownCast(Curv); + Handle(Geom2d_Ellipse) TheConic = Handle(Geom2d_Ellipse)::DownCast(Curv); Elips2d E2d (gp::OX2d(), TheConic->MajorRadius(), @@ -356,7 +341,7 @@ const Convert_ParameterisationType Parameterisation) } else if (Curv->IsKind(STANDARD_TYPE(Geom2d_Hyperbola))) { - Handle(Hyperbola) TheConic = Handle(Hyperbola)::DownCast(Curv); + Handle(Geom2d_Hyperbola) TheConic = Handle(Geom2d_Hyperbola)::DownCast(Curv); Hypr2d H2d (gp::OX2d(), TheConic->MajorRadius(), TheConic->MinorRadius()); @@ -365,7 +350,7 @@ const Convert_ParameterisationType Parameterisation) } else if (Curv->IsKind(STANDARD_TYPE(Geom2d_Parabola))) { - Handle(Parabola) TheConic = Handle(Parabola)::DownCast(Curv); + Handle(Geom2d_Parabola) TheConic = Handle(Geom2d_Parabola)::DownCast(Curv); Parab2d Prb2d (gp::OX2d(), TheConic->Focal()); Convert_ParabolaToBSplineCurve Convert (Prb2d, U1, U2); @@ -374,7 +359,7 @@ const Convert_ParameterisationType Parameterisation) else if (Curv->IsKind (STANDARD_TYPE(Geom2d_BezierCurve))) { - Handle(BezierCurve) CBez = Handle(BezierCurve)::DownCast(Curv->Copy()); + Handle(Geom2d_BezierCurve) CBez = Handle(Geom2d_BezierCurve)::DownCast(Curv->Copy()); CBez->Segment (U1, U2); Standard_Integer NbPoles = CBez->NbPoles(); @@ -422,7 +407,7 @@ const Convert_ParameterisationType Parameterisation) else { if (C->IsKind(STANDARD_TYPE(Geom2d_Ellipse))) { - Handle(Ellipse) TheConic = Handle(Ellipse)::DownCast(C); + Handle(Geom2d_Ellipse) TheConic = Handle(Geom2d_Ellipse)::DownCast(C); Elips2d E2d (gp::OX2d(), TheConic->MajorRadius(), TheConic->MinorRadius()); @@ -433,7 +418,7 @@ const Convert_ParameterisationType Parameterisation) } else if (C->IsKind(STANDARD_TYPE(Geom2d_Circle))) { - Handle(Circle) TheConic = Handle(Circle)::DownCast(C); + Handle(Geom2d_Circle) TheConic = Handle(Geom2d_Circle)::DownCast(C); Circ2d C2d (gp::OX2d(), TheConic->Radius()); Convert_CircleToBSplineCurve Convert (C2d, @@ -443,7 +428,7 @@ const Convert_ParameterisationType Parameterisation) } else if (C->IsKind (STANDARD_TYPE(Geom2d_BezierCurve))) { - Handle(BezierCurve) CBez = Handle(BezierCurve)::DownCast(C); + Handle(Geom2d_BezierCurve) CBez = Handle(Geom2d_BezierCurve)::DownCast(C); Standard_Integer NbPoles = CBez->NbPoles(); Standard_Integer Degree = CBez->Degree(); @@ -1477,7 +1462,7 @@ void Geom2dConvert::C0BSplineToC1BSplineCurve(Handle(Geom2d_BSplineCurve)& BS, U2=BSKnots(j); j++; - Handle(Geom2d_BSplineCurve) BSbis=Handle(Geom2d_BSplineCurve::DownCast(BS->Copy())); + Handle(Geom2d_BSplineCurve) BSbis=Handle(Geom2d_BSplineCurve)::DownCast(BS->Copy()); BSbis->Segment(U1,U2); ArrayOfCurves(i)=BSbis; } @@ -1566,7 +1551,7 @@ void Geom2dConvert::C0BSplineToArrayOfC1BSplineCurve(const Handle(Geom2d_BSpline j++; U2=BSKnots(j); j++; - Handle(Geom2d_BSplineCurve) BSbis=Handle(Geom2d_BSplineCurve::DownCast(BS->Copy())); + Handle(Geom2d_BSplineCurve) BSbis=Handle(Geom2d_BSplineCurve)::DownCast(BS->Copy()); BSbis->Segment(U1,U2); ArrayOfCurves(i)=BSbis; } diff --git a/src/Geom2dConvert/Geom2dConvert_BSplineCurveKnotSplitting.cxx b/src/Geom2dConvert/Geom2dConvert_BSplineCurveKnotSplitting.cxx index 3f044d780a..235ed3a686 100644 --- a/src/Geom2dConvert/Geom2dConvert_BSplineCurveKnotSplitting.cxx +++ b/src/Geom2dConvert/Geom2dConvert_BSplineCurveKnotSplitting.cxx @@ -20,17 +20,13 @@ #include -typedef Handle(Geom2d_BSplineCurve) Handle(BSplineCurve); typedef TColStd_Array1OfInteger Array1OfInteger; typedef TColStd_HArray1OfInteger HArray1OfInteger; - - - Geom2dConvert_BSplineCurveKnotSplitting:: Geom2dConvert_BSplineCurveKnotSplitting ( -const Handle(BSplineCurve)& BasisCurve, +const Handle(Geom2d_BSplineCurve)& BasisCurve, const Standard_Integer ContinuityRange ) { diff --git a/src/Geom2dGcc/Geom2dGcc_Circ2dTanCen.cxx b/src/Geom2dGcc/Geom2dGcc_Circ2dTanCen.cxx index 5d9245b579..72a84c30a4 100644 --- a/src/Geom2dGcc/Geom2dGcc_Circ2dTanCen.cxx +++ b/src/Geom2dGcc/Geom2dGcc_Circ2dTanCen.cxx @@ -22,13 +22,14 @@ #include #include #include +#include #include #include #include Geom2dGcc_Circ2dTanCen:: Geom2dGcc_Circ2dTanCen (const Geom2dGcc_QualifiedCurve& Qualified1 , - const Handle(Geom2d_Point&) PCenter , + const Handle(Geom2d_Point)& PCenter , const Standard_Real Tolerance ): cirsol(1,2) , qualifier1(1,2), diff --git a/src/Geom2dGcc/Geom2dGcc_Circ2dTanOnRad.cxx b/src/Geom2dGcc/Geom2dGcc_Circ2dTanOnRad.cxx index 609b48c09c..8e4e5dd71e 100644 --- a/src/Geom2dGcc/Geom2dGcc_Circ2dTanOnRad.cxx +++ b/src/Geom2dGcc/Geom2dGcc_Circ2dTanOnRad.cxx @@ -140,7 +140,7 @@ Geom2dGcc_Circ2dTanOnRad:: } Geom2dGcc_Circ2dTanOnRad:: - Geom2dGcc_Circ2dTanOnRad (const Handle(Geom2d_Point&) Point1 , + Geom2dGcc_Circ2dTanOnRad (const Handle(Geom2d_Point)& Point1 , const Geom2dAdaptor_Curve& OnCurve , const Standard_Real Radius , const Standard_Real Tolerance ): diff --git a/src/GeomConvert/GeomConvert.cxx b/src/GeomConvert/GeomConvert.cxx index 35012a4c91..8f830873bc 100644 --- a/src/GeomConvert/GeomConvert.cxx +++ b/src/GeomConvert/GeomConvert.cxx @@ -1331,7 +1331,7 @@ void GeomConvert::C0BSplineToArrayOfC1BSplineCurve( U2=BSKnots(j); j++; Handle(Geom_BSplineCurve) - BSbis=Handle(Geom_BSplineCurve::DownCast(BS->Copy())); + BSbis=Handle(Geom_BSplineCurve)::DownCast(BS->Copy()); BSbis->Segment(U1,U2); ArrayOfCurves(i)=BSbis; } diff --git a/src/GeomConvert/GeomConvert_1.cxx b/src/GeomConvert/GeomConvert_1.cxx index 601f041c1b..6903378173 100644 --- a/src/GeomConvert/GeomConvert_1.cxx +++ b/src/GeomConvert/GeomConvert_1.cxx @@ -68,47 +68,25 @@ #include #include - - typedef Geom_Surface Surface; typedef Geom_BSplineSurface BSplineSurface; -typedef Handle(Geom_Curve) Handle(Curve); -typedef Handle(Geom_BSplineCurve) Handle(BSplineCurve); -typedef Handle(Geom_BezierSurface) Handle(BezierSurface); -typedef Handle(Geom_Geometry) Handle(Geometry); -typedef Handle(Geom_Surface) Handle(Surface); -typedef Handle(Geom_Plane) Handle(Plane); -typedef Handle(Geom_CylindricalSurface) Handle(CylindricalSurface); -typedef Handle(Geom_ConicalSurface) Handle(ConicalSurface); -typedef Handle(Geom_SphericalSurface) Handle(SphericalSurface); -typedef Handle(Geom_ToroidalSurface) Handle(ToroidalSurface); -typedef Handle(Geom_BSplineSurface) Handle(BSplineSurface); -typedef Handle(Geom_SurfaceOfRevolution) Handle(SurfaceOfRevolution); -typedef Handle(Geom_SurfaceOfLinearExtrusion) Handle(SurfaceOfLinearExtrusion); -typedef Handle(Geom_RectangularTrimmedSurface) - Handle(RectangularTrimmedSurface); - - typedef TColStd_Array1OfReal Array1OfReal; typedef TColStd_Array2OfReal Array2OfReal; typedef TColStd_Array1OfInteger Array1OfInteger; typedef TColStd_Array2OfInteger Array2OfInteger; typedef TColgp_Array2OfPnt Array2OfPnt; typedef TColgp_Array1OfPnt Array1OfPnt; - - typedef gp_Pnt Pnt; - //======================================================================= //function : BSplineSurfaceBuilder //purpose : //======================================================================= -Handle(BSplineSurface) BSplineSurfaceBuilder +Handle(Geom_BSplineSurface) BSplineSurfaceBuilder (const Convert_ElementarySurfaceToBSplineSurface& Convert) { - Handle(BSplineSurface) TheSurface; + Handle(Geom_BSplineSurface) TheSurface; Standard_Integer UDegree = Convert.UDegree (); Standard_Integer VDegree = Convert.VDegree (); Standard_Integer NbUPoles = Convert.NbUPoles(); @@ -148,8 +126,8 @@ Handle(BSplineSurface) BSplineSurfaceBuilder //purpose : //======================================================================= -Handle(BSplineSurface) GeomConvert::SplitBSplineSurface - (const Handle(BSplineSurface)& S, +Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface + (const Handle(Geom_BSplineSurface)& S, const Standard_Integer FromUK1, const Standard_Integer ToUK2, const Standard_Integer FromVK1, @@ -169,7 +147,7 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface if (FirstUK < FirstU || LastUK > LastU || FirstVK < FirstV || LastVK > LastV) { Standard_DomainError::Raise(); } - Handle(BSplineSurface) S1= Handle(BSplineSurface)::DownCast(S->Copy()); + Handle(Geom_BSplineSurface) S1= Handle(Geom_BSplineSurface)::DownCast(S->Copy()); S1->Segment(S1->UKnot(FirstUK),S1->UKnot(LastUK), S1->VKnot(FirstVK),S1->VKnot(LastVK)); @@ -195,8 +173,8 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface //purpose : //======================================================================= -Handle(BSplineSurface) GeomConvert::SplitBSplineSurface - (const Handle(BSplineSurface)& S, +Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface + (const Handle(Geom_BSplineSurface)& S, const Standard_Integer FromK1, const Standard_Integer ToK2, const Standard_Boolean USplit, @@ -205,7 +183,7 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface if (FromK1 == ToK2) Standard_DomainError::Raise(); - Handle(BSplineSurface) S1 = Handle(BSplineSurface)::DownCast(S->Copy()); + Handle(Geom_BSplineSurface) S1 = Handle(Geom_BSplineSurface)::DownCast(S->Copy()); if (USplit) { @@ -258,8 +236,8 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface //purpose : //======================================================================= -Handle(BSplineSurface) GeomConvert::SplitBSplineSurface - (const Handle(BSplineSurface)& S, +Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface + (const Handle(Geom_BSplineSurface)& S, const Standard_Real FromU1, const Standard_Real ToU2, const Standard_Real FromV1, @@ -300,8 +278,8 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface //purpose : //======================================================================= -Handle(BSplineSurface) GeomConvert::SplitBSplineSurface - (const Handle(BSplineSurface)& S, +Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface + (const Handle(Geom_BSplineSurface)& S, const Standard_Real FromParam1, const Standard_Real ToParam2, const Standard_Boolean USplit, @@ -311,7 +289,7 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface if (Abs (FromParam1 - ToParam2) <= Abs(ParametricTolerance)) { Standard_DomainError::Raise(); } - Handle(BSplineSurface) NewSurface + Handle(Geom_BSplineSurface) NewSurface = Handle(Geom_BSplineSurface)::DownCast(S->Copy()); if (USplit) { @@ -356,7 +334,7 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface //======================================================================= Handle(Geom_BSplineSurface) GeomConvert::SurfaceToBSplineSurface - (const Handle(Surface)& Sr) + (const Handle(Geom_Surface)& Sr) { Standard_Real U1, U2, V1, V2; Sr->Bounds (U1, U2, V1, V2); @@ -374,7 +352,7 @@ Handle(Geom_BSplineSurface) GeomConvert::SurfaceToBSplineSurface } Handle(Geom_BSplineSurface) TheSurface; - Handle(Surface) S; + Handle(Geom_Surface) S; Handle(Geom_OffsetSurface) OffsetSur; if (Sr->IsKind(STANDARD_TYPE(Geom_OffsetSurface))) { OffsetSur = *((Handle(Geom_OffsetSurface)*)& Sr); diff --git a/src/GeomConvert/GeomConvert_BSplineCurveKnotSplitting.cxx b/src/GeomConvert/GeomConvert_BSplineCurveKnotSplitting.cxx index 68f2daaf77..8e2b5211dd 100644 --- a/src/GeomConvert/GeomConvert_BSplineCurveKnotSplitting.cxx +++ b/src/GeomConvert/GeomConvert_BSplineCurveKnotSplitting.cxx @@ -20,16 +20,12 @@ #include -typedef Handle(Geom_BSplineCurve) Handle(BSplineCurve); typedef TColStd_Array1OfInteger Array1OfInteger; typedef TColStd_HArray1OfInteger HArray1OfInteger; - - - GeomConvert_BSplineCurveKnotSplitting::GeomConvert_BSplineCurveKnotSplitting ( -const Handle(BSplineCurve)& BasisCurve, +const Handle(Geom_BSplineCurve)& BasisCurve, const Standard_Integer ContinuityRange ) { diff --git a/src/GeomConvert/GeomConvert_BSplineSurfaceKnotSplitting.cxx b/src/GeomConvert/GeomConvert_BSplineSurfaceKnotSplitting.cxx index 519bc4d759..e38cdc5f50 100644 --- a/src/GeomConvert/GeomConvert_BSplineSurfaceKnotSplitting.cxx +++ b/src/GeomConvert/GeomConvert_BSplineSurfaceKnotSplitting.cxx @@ -21,17 +21,14 @@ #include #include -typedef Handle(Geom_BSplineSurface) Handle(BSplineSurface); + typedef TColStd_Array1OfInteger Array1OfInteger; typedef TColStd_HArray1OfInteger HArray1OfInteger; - - - GeomConvert_BSplineSurfaceKnotSplitting:: GeomConvert_BSplineSurfaceKnotSplitting ( -const Handle(BSplineSurface)& BasisSurface, +const Handle(Geom_BSplineSurface)& BasisSurface, const Standard_Integer UContinuityRange, const Standard_Integer VContinuityRange diff --git a/src/GeomFill/GeomFill_ConstrainedFilling.cxx b/src/GeomFill/GeomFill_ConstrainedFilling.cxx index 1f289e602c..b0f7b5fcda 100644 --- a/src/GeomFill/GeomFill_ConstrainedFilling.cxx +++ b/src/GeomFill/GeomFill_ConstrainedFilling.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx index 48ac483978..870cfaddd8 100644 --- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx +++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx @@ -67,6 +67,7 @@ #include #include #include +#include #include #include @@ -75,6 +76,7 @@ #include #include #include +#include #ifdef DRAW #include diff --git a/src/GeomPlate/GeomPlate_CurveConstraint.cxx b/src/GeomPlate/GeomPlate_CurveConstraint.cxx index 1cb0550e94..988865ad37 100644 --- a/src/GeomPlate/GeomPlate_CurveConstraint.cxx +++ b/src/GeomPlate/GeomPlate_CurveConstraint.cxx @@ -31,6 +31,7 @@ #include #include #include +#include //--------------------------------------------------------- // Constructeur vide diff --git a/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx b/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx index 018bde46a9..a729bb984d 100644 --- a/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx +++ b/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx @@ -26,7 +26,8 @@ #include #include #include - +#include +#include //============================================================================= // Creation d' une BoundedCurve de prostep a partir d' une BoundedCurve de Geom diff --git a/src/GeomToStep/GeomToStep_MakeBoundedSurface.cxx b/src/GeomToStep/GeomToStep_MakeBoundedSurface.cxx index 3173e799f9..5745460e90 100644 --- a/src/GeomToStep/GeomToStep_MakeBoundedSurface.cxx +++ b/src/GeomToStep/GeomToStep_MakeBoundedSurface.cxx @@ -17,6 +17,9 @@ #include #include #include +#include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeCircle.cxx b/src/GeomToStep/GeomToStep_MakeCircle.cxx index b25677ec6b..5164956de8 100644 --- a/src/GeomToStep/GeomToStep_MakeCircle.cxx +++ b/src/GeomToStep/GeomToStep_MakeCircle.cxx @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeConic.cxx b/src/GeomToStep/GeomToStep_MakeConic.cxx index a5d63ec6bc..9adffe733c 100644 --- a/src/GeomToStep/GeomToStep_MakeConic.cxx +++ b/src/GeomToStep/GeomToStep_MakeConic.cxx @@ -16,7 +16,10 @@ #include #include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeCurve.cxx b/src/GeomToStep/GeomToStep_MakeCurve.cxx index 33a2af90cf..732727f99f 100644 --- a/src/GeomToStep/GeomToStep_MakeCurve.cxx +++ b/src/GeomToStep/GeomToStep_MakeCurve.cxx @@ -16,7 +16,10 @@ #include #include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeElementarySurface.cxx b/src/GeomToStep/GeomToStep_MakeElementarySurface.cxx index c1315e24bd..1cd0fed314 100644 --- a/src/GeomToStep/GeomToStep_MakeElementarySurface.cxx +++ b/src/GeomToStep/GeomToStep_MakeElementarySurface.cxx @@ -17,6 +17,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeEllipse.cxx b/src/GeomToStep/GeomToStep_MakeEllipse.cxx index c086fe8cfa..1a4a38458f 100644 --- a/src/GeomToStep/GeomToStep_MakeEllipse.cxx +++ b/src/GeomToStep/GeomToStep_MakeEllipse.cxx @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeHyperbola.cxx b/src/GeomToStep/GeomToStep_MakeHyperbola.cxx index 25d05025ed..d69bb52cba 100644 --- a/src/GeomToStep/GeomToStep_MakeHyperbola.cxx +++ b/src/GeomToStep/GeomToStep_MakeHyperbola.cxx @@ -14,6 +14,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeParabola.cxx b/src/GeomToStep/GeomToStep_MakeParabola.cxx index 0d91ace93f..a06a252a57 100644 --- a/src/GeomToStep/GeomToStep_MakeParabola.cxx +++ b/src/GeomToStep/GeomToStep_MakeParabola.cxx @@ -14,6 +14,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeSurface.cxx b/src/GeomToStep/GeomToStep_MakeSurface.cxx index 35785d3657..f9c9e2f007 100644 --- a/src/GeomToStep/GeomToStep_MakeSurface.cxx +++ b/src/GeomToStep/GeomToStep_MakeSurface.cxx @@ -16,7 +16,9 @@ #include #include -#include +#include +#include +#include #include #include #include diff --git a/src/GeomToStep/GeomToStep_MakeSweptSurface.cxx b/src/GeomToStep/GeomToStep_MakeSweptSurface.cxx index 33d1181577..7c223aa0c9 100644 --- a/src/GeomToStep/GeomToStep_MakeSweptSurface.cxx +++ b/src/GeomToStep/GeomToStep_MakeSweptSurface.cxx @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/src/Graphic3d/Graphic3d_CAspectMarker.hxx b/src/Graphic3d/Graphic3d_CAspectMarker.hxx index 2060bfa143..f57b69bda5 100644 --- a/src/Graphic3d/Graphic3d_CAspectMarker.hxx +++ b/src/Graphic3d/Graphic3d_CAspectMarker.hxx @@ -29,8 +29,7 @@ public: : IsDef (0), IsSet (0), MarkerType (Aspect_TOM_POINT), - Scale (0), - MarkerImage (NULL) + Scale (0) { memset (&Color, 0, sizeof(Color)); } diff --git a/src/Graphic3d/Graphic3d_CStructure.hxx b/src/Graphic3d/Graphic3d_CStructure.hxx index 19ab6fc241..90239d6d59 100644 --- a/src/Graphic3d/Graphic3d_CStructure.hxx +++ b/src/Graphic3d/Graphic3d_CStructure.hxx @@ -21,12 +21,11 @@ #include #include #include -#include #include #include -#include -//! Forward declaration. +class Graphic3d_GraphicDriver; +class Graphic3d_StructureManager; //! Low-level graphic structure interface class Graphic3d_CStructure : public Standard_Transient diff --git a/src/Graphic3d/Graphic3d_ClipPlane.cxx b/src/Graphic3d/Graphic3d_ClipPlane.cxx index 549c68d259..2776bcac54 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.cxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.cxx @@ -33,7 +33,6 @@ Graphic3d_ClipPlane::Graphic3d_ClipPlane() myIsOn (Standard_True), myIsCapping (Standard_False), myMaterial (Graphic3d_NOM_DEFAULT), - myTexture (NULL), myHatch (Aspect_HS_HORIZONTAL), myHatchOn (Standard_False), myId(), @@ -52,7 +51,6 @@ Graphic3d_ClipPlane::Graphic3d_ClipPlane(const Equation& theEquation) myIsOn (Standard_True), myIsCapping (Standard_False), myMaterial (Graphic3d_NOM_DEFAULT), - myTexture (NULL), myHatch (Aspect_HS_HORIZONTAL), myHatchOn (Standard_False), myId(), @@ -91,7 +89,6 @@ Graphic3d_ClipPlane::Graphic3d_ClipPlane(const gp_Pln& thePlane) myIsOn (Standard_True), myIsCapping (Standard_False), myMaterial (Graphic3d_NOM_DEFAULT), - myTexture (NULL), myHatch (Aspect_HS_HORIZONTAL), myHatchOn (Standard_False), myId(), diff --git a/src/Graphic3d/Graphic3d_MapOfStructure.hxx b/src/Graphic3d/Graphic3d_MapOfStructure.hxx index 62987252c6..b90cb1cb1c 100644 --- a/src/Graphic3d/Graphic3d_MapOfStructure.hxx +++ b/src/Graphic3d/Graphic3d_MapOfStructure.hxx @@ -18,6 +18,7 @@ #include +class Graphic3d_Structure; typedef NCollection_Map Graphic3d_MapOfStructure; #endif // _Graphic3d_MapOfStructure diff --git a/src/Graphic3d/Graphic3d_MarkerImage.cxx b/src/Graphic3d/Graphic3d_MarkerImage.cxx index 3899367c0a..436494c4ea 100755 --- a/src/Graphic3d/Graphic3d_MarkerImage.cxx +++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx @@ -30,9 +30,7 @@ namespace // purpose : // ======================================================================= Graphic3d_MarkerImage::Graphic3d_MarkerImage (const Handle(Image_PixMap)& theImage) -: myBitMap (NULL), - myImage (theImage), - myImageAlpha (NULL), +: myImage (theImage), myMargin (1), myWidth ((Standard_Integer )theImage->Width()), myHeight ((Standard_Integer )theImage->Height()) @@ -52,8 +50,6 @@ Graphic3d_MarkerImage::Graphic3d_MarkerImage (const Handle(TColStd_HArray1OfByte const Standard_Integer& theWidth, const Standard_Integer& theHeight) : myBitMap (theBitMap), - myImage (NULL), - myImageAlpha (NULL), myMargin (1), myWidth (theWidth), myHeight (theHeight) diff --git a/src/Graphic3d/Graphic3d_MarkerImage.hxx b/src/Graphic3d/Graphic3d_MarkerImage.hxx index 3fabaffef1..75e89a2a8e 100755 --- a/src/Graphic3d/Graphic3d_MarkerImage.hxx +++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx @@ -17,10 +17,11 @@ #define _Graphic3d_MarkerImage_H__ #include -#include #include #include +class Image_PixMap; + //! This class is used to store bitmaps and images for markers rendering. //! It can convert bitmap texture stored in TColStd_HArray1OfByte to Image_PixMap and vice versa. class Graphic3d_MarkerImage : public Standard_Transient diff --git a/src/Graphic3d/Graphic3d_NMapOfTransient.hxx b/src/Graphic3d/Graphic3d_NMapOfTransient.hxx index c661e99e8c..db2ee1359a 100644 --- a/src/Graphic3d/Graphic3d_NMapOfTransient.hxx +++ b/src/Graphic3d/Graphic3d_NMapOfTransient.hxx @@ -17,9 +17,8 @@ #include #include -#include +#include -typedef NCollection_Map Graphic3d_NMapOfTransient; -typedef NCollection_Handle Handle(Graphic3d_NMapOfTransient); +typedef NCollection_Shared< NCollection_Map > Graphic3d_NMapOfTransient; #endif // _Graphic3d_NMapOfTransient_HeaderFile diff --git a/src/Graphic3d/Graphic3d_ShaderProgram.hxx b/src/Graphic3d/Graphic3d_ShaderProgram.hxx index 674836832d..1627308234 100755 --- a/src/Graphic3d/Graphic3d_ShaderProgram.hxx +++ b/src/Graphic3d/Graphic3d_ShaderProgram.hxx @@ -18,6 +18,7 @@ #include #include +#include #include //! List of shader objects. diff --git a/src/IFSelect/IFSelect.cdl b/src/IFSelect/IFSelect.cdl index 0080f62220..7d5f27ce7d 100644 --- a/src/IFSelect/IFSelect.cdl +++ b/src/IFSelect/IFSelect.cdl @@ -128,9 +128,6 @@ is class WorkSession; -- a set of useful facilities deferred class WorkLibrary; -- capability of user extents - alias Option is Option from MoniTool; -- pre-defined values for a field - alias Profile is Profile from MoniTool; -- set of options bound/piloted together - class SessionFile; deferred class SessionDumper; class BasicDumper; diff --git a/src/IFSelect/IFSelect_Activator.cxx b/src/IFSelect/IFSelect_Activator.cxx index 1282a39867..11f3afecd2 100644 --- a/src/IFSelect/IFSelect_Activator.cxx +++ b/src/IFSelect/IFSelect_Activator.cxx @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -29,7 +29,7 @@ static Handle(Dico_DictionaryOfInteger) thedico; // = new Dico_DictionaryOfInteg static TColStd_SequenceOfInteger thenums, themodes; static TColStd_SequenceOfTransient theacts; -static Handle(IFSelect_Profile) thealiases; +static Handle(MoniTool_Profile) thealiases; void IFSelect_Activator::Adding @@ -61,7 +61,6 @@ static Handle(IFSelect_Profile) thealiases; (const Standard_Integer number, const Standard_CString command) const { Adding (this,number,command,1); } - void IFSelect_Activator::Remove (const Standard_CString command) { thedico->RemoveItem(command); } @@ -76,10 +75,10 @@ static Handle(IFSelect_Profile) thealiases; (const Standard_CString conf, const Standard_CString command, const Standard_CString alias) { - if (thealiases.IsNull()) thealiases = new IFSelect_Profile; - Handle(IFSelect_Option) opt = thealiases->Option(command); + if (thealiases.IsNull()) thealiases = new MoniTool_Profile; + Handle(MoniTool_Option) opt = thealiases->Option(command); if (opt.IsNull()) { - opt = new IFSelect_Option(STANDARD_TYPE(TCollection_HAsciiString),command); + opt = new MoniTool_Option(STANDARD_TYPE(TCollection_HAsciiString),command); thealiases->AddOption (opt); } opt->Add (conf,new TCollection_HAsciiString(alias)); @@ -101,7 +100,7 @@ static Handle(IFSelect_Profile) thealiases; Handle(TCollection_HAsciiString) val; if (!thealiases->Value(command,val)) return str; str.AssignCat (val->ToCString()); - return str; + return str; } diff --git a/src/IFSelect/IFSelect_Functions.cxx b/src/IFSelect/IFSelect_Functions.cxx index d207082ab6..032f8fd4c0 100644 --- a/src/IFSelect/IFSelect_Functions.cxx +++ b/src/IFSelect/IFSelect_Functions.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/src/IFSelect/IFSelect_SessionFile.cxx b/src/IFSelect/IFSelect_SessionFile.cxx index b448b7c926..b1bd13a2dc 100644 --- a/src/IFSelect/IFSelect_SessionFile.cxx +++ b/src/IFSelect/IFSelect_SessionFile.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cxx b/src/IGESCAFControl/IGESCAFControl_Writer.cxx index 3014933004..73447d8d26 100644 --- a/src/IGESCAFControl/IGESCAFControl_Writer.cxx +++ b/src/IGESCAFControl/IGESCAFControl_Writer.cxx @@ -46,6 +46,7 @@ #include #include #include +#include namespace { diff --git a/src/IGESControl/IGESControl_ActorWrite.cxx b/src/IGESControl/IGESControl_ActorWrite.cxx index 7e2bfc09e7..3ee5222275 100644 --- a/src/IGESControl/IGESControl_ActorWrite.cxx +++ b/src/IGESControl/IGESControl_ActorWrite.cxx @@ -15,11 +15,13 @@ #include #include #include +#include #include #include #include +#include #include #include #include diff --git a/src/IGESControl/IGESControl_Controller.cxx b/src/IGESControl/IGESControl_Controller.cxx index fddb82c360..974ae11e1d 100644 --- a/src/IGESControl/IGESControl_Controller.cxx +++ b/src/IGESControl/IGESControl_Controller.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/src/IGESControl/IGESControl_Writer.cxx b/src/IGESControl/IGESControl_Writer.cxx index 6a210a539b..5eb4aeb8c2 100644 --- a/src/IGESControl/IGESControl_Writer.cxx +++ b/src/IGESControl/IGESControl_Writer.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/src/IGESData/IGESData_IGESDumper.cxx b/src/IGESData/IGESData_IGESDumper.cxx index 612ad18495..4297918756 100644 --- a/src/IGESData/IGESData_IGESDumper.cxx +++ b/src/IGESData/IGESData_IGESDumper.cxx @@ -18,6 +18,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx b/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx index 5a1f5c2d8e..c7aa727b7d 100644 --- a/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx +++ b/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx @@ -14,6 +14,7 @@ #include #include #include +#include #include diff --git a/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx b/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx index af54ab13ad..957464bd05 100644 --- a/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx +++ b/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx @@ -13,6 +13,7 @@ #include #include +#include #include #define PourDrawing 404 diff --git a/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx b/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx index 614d34a45e..6c81a9a874 100644 --- a/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx +++ b/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx @@ -13,6 +13,7 @@ #include #include +#include #include diff --git a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx index 64e2b42869..521e571f47 100644 --- a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx +++ b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx @@ -14,6 +14,7 @@ #include #include #include +#include #include diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.cxx b/src/IGESSelect/IGESSelect_WorkLibrary.cxx index b7f0aa4902..31f6391e17 100644 --- a/src/IGESSelect/IGESSelect_WorkLibrary.cxx +++ b/src/IGESSelect/IGESSelect_WorkLibrary.cxx @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include diff --git a/src/IGESToBRep/IGESToBRep_CurveAndSurface.lxx b/src/IGESToBRep/IGESToBRep_CurveAndSurface.lxx index 834de02eca..608da83b3b 100644 --- a/src/IGESToBRep/IGESToBRep_CurveAndSurface.lxx +++ b/src/IGESToBRep/IGESToBRep_CurveAndSurface.lxx @@ -14,6 +14,7 @@ // commercial license or contractual agreement. #include +#include //======================================================================= //function : SetEpsilon diff --git a/src/IVtk/IVtk_IShape.hxx b/src/IVtk/IVtk_IShape.hxx index ee250bad18..769b59b98e 100644 --- a/src/IVtk/IVtk_IShape.hxx +++ b/src/IVtk/IVtk_IShape.hxx @@ -19,6 +19,7 @@ #include #include +class IVtk_IShape; DEFINE_STANDARD_HANDLE( IVtk_IShape, IVtk_Interface ) //! @class IVtk_IShape diff --git a/src/IVtk/IVtk_IShapeData.hxx b/src/IVtk/IVtk_IShapeData.hxx index 6f875db763..50bf820c96 100644 --- a/src/IVtk/IVtk_IShapeData.hxx +++ b/src/IVtk/IVtk_IShapeData.hxx @@ -19,6 +19,7 @@ #include #include +class IVtk_IShapeData; DEFINE_STANDARD_HANDLE( IVtk_IShapeData, IVtk_Interface ) //! @class IVtk_IShapeData diff --git a/src/IVtk/IVtk_IShapeMesher.hxx b/src/IVtk/IVtk_IShapeMesher.hxx index 264a534130..4259e8b8d7 100644 --- a/src/IVtk/IVtk_IShapeMesher.hxx +++ b/src/IVtk/IVtk_IShapeMesher.hxx @@ -20,6 +20,7 @@ #include #include +class IVtk_IShapeMesher; DEFINE_STANDARD_HANDLE( IVtk_IShapeMesher, IVtk_Interface ) //! @class IVtk_IShapeMesher diff --git a/src/IVtk/IVtk_IShapePickerAlgo.hxx b/src/IVtk/IVtk_IShapePickerAlgo.hxx index 1feb2e4a42..d7d348cdf2 100644 --- a/src/IVtk/IVtk_IShapePickerAlgo.hxx +++ b/src/IVtk/IVtk_IShapePickerAlgo.hxx @@ -19,6 +19,7 @@ #include #include +class IVtk_IShapePickerAlgo; DEFINE_STANDARD_HANDLE( IVtk_IShapePickerAlgo, IVtk_Interface ) //! @class IVtk_IShapePickerAlgo diff --git a/src/IVtk/IVtk_IView.hxx b/src/IVtk/IVtk_IView.hxx index a212cb83fa..8ba72bcd07 100644 --- a/src/IVtk/IVtk_IView.hxx +++ b/src/IVtk/IVtk_IView.hxx @@ -22,6 +22,7 @@ #include #include +class IVtk_IView; DEFINE_STANDARD_HANDLE( IVtk_IView, IVtk_Interface ) //! @class IVtk_IView diff --git a/src/IVtk/IVtk_Interface.hxx b/src/IVtk/IVtk_Interface.hxx index d2d4725016..3f4f5c736d 100644 --- a/src/IVtk/IVtk_Interface.hxx +++ b/src/IVtk/IVtk_Interface.hxx @@ -19,6 +19,7 @@ #include #include +class IVtk_Interface; DEFINE_STANDARD_HANDLE( IVtk_Interface, Standard_Transient ) //! @class IVtk_Interface diff --git a/src/IVtkDraw/IVtkDraw.cxx b/src/IVtkDraw/IVtkDraw.cxx index 3310415df4..7e9b53c774 100644 --- a/src/IVtkDraw/IVtkDraw.cxx +++ b/src/IVtkDraw/IVtkDraw.cxx @@ -137,7 +137,6 @@ typedef NCollection_DoubleMap DoubleMapOf typedef NCollection_DoubleMap, TCollection_AsciiString> DoubleMapOfActorsAndNames; typedef IVtkDraw_HighlightAndSelectionPipeline PipelinePtr; -typedef Handle(IVtkDraw_HighlightAndSelectionPipeline) Handle(PipelinePtr); //================================================================ // GLOBAL VARIABLES diff --git a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx index 8b442013d4..d667b3f651 100644 --- a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx +++ b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx @@ -16,17 +16,8 @@ #ifndef _IVtkDraw_HighlightAndSelectionPipeline_HeaderFile #define _IVtkDraw_HighlightAndSelectionPipeline_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Handle_MMgt_TShared_HeaderFile -#endif - #include -#include +#include #include #include @@ -43,6 +34,7 @@ typedef NCollection_DataMap > DisplayModeFiltersMap; typedef NCollection_DataMap > SubShapesFiltersMap; +class IVtkDraw_HighlightAndSelectionPipeline; DEFINE_STANDARD_HANDLE(IVtkDraw_HighlightAndSelectionPipeline, Standard_Transient) class IVtkDraw_HighlightAndSelectionPipeline : public Standard_Transient @@ -121,6 +113,6 @@ private: //! Mapping between OCCT topological shape IDs and their correspondent //! visualization pipelines. -typedef NCollection_DataMap ShapePipelineMap; +typedef NCollection_Shared< NCollection_DataMap > ShapePipelineMap; #endif diff --git a/src/IVtkOCC/IVtkOCC_SelectableObject.cxx b/src/IVtkOCC/IVtkOCC_SelectableObject.cxx index c38a7a4a31..50ea5232fe 100644 --- a/src/IVtkOCC/IVtkOCC_SelectableObject.cxx +++ b/src/IVtkOCC/IVtkOCC_SelectableObject.cxx @@ -61,7 +61,7 @@ IVtkOCC_SelectableObject::IVtkOCC_SelectableObject() void IVtkOCC_SelectableObject::SetShape (const IVtkOCC_Shape::Handle& theShape) { myShape = theShape; - if (myShape) + if (! myShape.IsNull()) { myShape->SetSelectableObject (this); } @@ -78,7 +78,7 @@ void IVtkOCC_SelectableObject::SetShape (const IVtkOCC_Shape::Handle& theShape) void IVtkOCC_SelectableObject::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, const Standard_Integer theMode) { - if (!myShape) + if (myShape.IsNull()) { return; } @@ -143,7 +143,7 @@ void IVtkOCC_SelectableObject::ComputeSelection (const Handle(SelectMgr_Selectio //============================================================================ const Bnd_Box& IVtkOCC_SelectableObject::BoundingBox() { - if (!myShape) + if (myShape.IsNull()) { myBndBox.SetVoid(); return myBndBox; diff --git a/src/IVtkOCC/IVtkOCC_Shape.hxx b/src/IVtkOCC/IVtkOCC_Shape.hxx index c3a76649da..44ae5f9b03 100644 --- a/src/IVtkOCC/IVtkOCC_Shape.hxx +++ b/src/IVtkOCC/IVtkOCC_Shape.hxx @@ -21,6 +21,7 @@ #include #include +class IVtkOCC_Shape; DEFINE_STANDARD_HANDLE( IVtkOCC_Shape, IVtk_IShape ) //! @class IVtkOCC_Shape diff --git a/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx b/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx index 811fcba9a9..fe70532906 100644 --- a/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx +++ b/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx b/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx index 0459972854..ae9c213293 100644 --- a/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx +++ b/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx @@ -34,6 +34,7 @@ typedef NCollection_DataMap IVtk_Polyline; typedef NCollection_List IVtk_PolylineList; +class IVtkOCC_ShapeMesher; DEFINE_STANDARD_HANDLE( IVtkOCC_ShapeMesher, IVtk_IShapeMesher ) //! @class IVtkOCC_ShapeMesher diff --git a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx index 5c1a67063e..0648234e1a 100644 --- a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx +++ b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx @@ -57,7 +57,7 @@ IVtk_SelectionModeList IVtkOCC_ShapePickerAlgo::GetSelectionModes ( { IVtk_SelectionModeList aRes; - if (theShape) + if (! theShape.IsNull()) { // Get shape implementation from shape interface. Handle(IVtkOCC_Shape) aShapeImpl = Handle(IVtkOCC_Shape)::DownCast(theShape); @@ -90,7 +90,7 @@ void IVtkOCC_ShapePickerAlgo::SetSelectionMode (const IVtk_IShape::Handle& theSh const IVtk_SelectionMode theMode, const bool theIsTurnOn) { - if (!theShape) + if (theShape.IsNull()) { return; } @@ -305,14 +305,14 @@ bool IVtkOCC_ShapePickerAlgo::processPicked() Handle(IVtkOCC_SelectableObject) aSelectable = Handle(IVtkOCC_SelectableObject)::DownCast (anEntityOwner->Selectable()); - if (!aSelectable) + if (aSelectable.IsNull()) { anOutput << "Error: EntityOwner having null SelectableObject picked!"; continue; } Handle(IVtkOCC_Shape) aSelShape = aSelectable->GetShape(); - if (!aSelShape) + if (aSelShape.IsNull()) { anOutput << "Error: SelectableObject with null OccShape pointer picked!"; continue; diff --git a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx index afed0970e0..924962fbb9 100644 --- a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx +++ b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx @@ -19,6 +19,7 @@ #include #include +class IVtkOCC_ShapePickerAlgo; DEFINE_STANDARD_HANDLE( IVtkOCC_ShapePickerAlgo, IVtk_IShapePickerAlgo ) //! @class IVtkOCC_ShapePickerAlgo diff --git a/src/IVtkTools/IVtkTools_ShapeDataSource.cxx b/src/IVtkTools/IVtkTools_ShapeDataSource.cxx index dda4ec5cb6..f783887b49 100644 --- a/src/IVtkTools/IVtkTools_ShapeDataSource.cxx +++ b/src/IVtkTools/IVtkTools_ShapeDataSource.cxx @@ -170,7 +170,7 @@ vtkSmartPointer IVtkTools_ShapeDataSource::SubShapeIDs() //================================================================ IVtk_IdType IVtkTools_ShapeDataSource::GetId() const { - return myOccShape ? myOccShape->GetId() : -1; + return myOccShape.IsNull() ? -1 : myOccShape->GetId(); } //================================================================ diff --git a/src/IVtkVTK/IVtkVTK_ShapeData.hxx b/src/IVtkVTK/IVtkVTK_ShapeData.hxx index be4bc86b2f..ee99eea05d 100644 --- a/src/IVtkVTK/IVtkVTK_ShapeData.hxx +++ b/src/IVtkVTK/IVtkVTK_ShapeData.hxx @@ -23,6 +23,7 @@ class vtkIdTypeArray; class vtkPolyData; +class IVtkVTK_ShapeData; DEFINE_STANDARD_HANDLE( IVtkVTK_ShapeData, IVtk_IShapeData ) // macros to export static field in class diff --git a/src/IVtkVTK/IVtkVTK_View.hxx b/src/IVtkVTK/IVtkVTK_View.hxx index 038e4922ff..6f86eb661b 100644 --- a/src/IVtkVTK/IVtkVTK_View.hxx +++ b/src/IVtkVTK/IVtkVTK_View.hxx @@ -20,6 +20,7 @@ class vtkRenderer; +class IVtkVTK_View; DEFINE_STANDARD_HANDLE( IVtkVTK_View, IVtk_IView ) //! @class IVtkVTK_View diff --git a/src/IntPatch/IntPatch_RstInt.cxx b/src/IntPatch/IntPatch_RstInt.cxx index e2c909b6e0..2b34977076 100644 --- a/src/IntPatch/IntPatch_RstInt.cxx +++ b/src/IntPatch/IntPatch_RstInt.cxx @@ -189,9 +189,9 @@ static void GetLinePoint2d (const Handle(IntPatch_Line)& L, const Standard_Boolean OnFirst, Standard_Real& U, Standard_Real& V) { + Handle(IntPatch_WLine) wlin = Handle(IntPatch_WLine)::DownCast(L); + Handle(IntPatch_RLine) rlin = Handle(IntPatch_RLine)::DownCast(L); IntPatch_IType typL = L->ArcType(); - const Handle(IntPatch_WLine)& wlin = (const Handle(IntPatch_WLine)&)L; - const Handle(IntPatch_RLine)& rlin = (const Handle(IntPatch_RLine)&)L; Standard_Integer Nbptlin = (typL == IntPatch_Walking ? wlin->NbPnts() : rlin->NbPnts()); @@ -446,7 +446,7 @@ void IntPatch_RstInt::PutVertexOnLine (Handle(IntPatch_Line)& L, const Handle(Adaptor3d_HSurface)& OtherSurf, const Standard_Boolean OnFirst, const Standard_Real Tol, - const Standard_Boolean hasBeenAdded) + const Standard_Boolean hasBeenAdded) { // Domain est le domaine de restriction de la surface Surf. diff --git a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx index 28abdb744e..b7134e993f 100644 --- a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx +++ b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx @@ -202,7 +202,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt Standard_Integer NbSamplesU, NbSamplesV, i, aNbSamplesU1, aNbSamplesV1; Standard_Real u0, u1, v0, v1, aU, aV, dU, dV; // - const Handle(Adaptor3d_HSurface&) MaSurface=(SurfID==1)? MaSurface1 : MaSurface2; + const Handle(Adaptor3d_HSurface)& MaSurface=(SurfID==1)? MaSurface1 : MaSurface2; NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2; NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2; // diff --git a/src/LDOM/FILES b/src/LDOM/FILES index d209063d6d..d9f84384db 100755 --- a/src/LDOM/FILES +++ b/src/LDOM/FILES @@ -41,4 +41,3 @@ LDOMString.cxx LDOMString.hxx LDOM_OSStream.cxx LDOM_OSStream.hxx -Handle_LDOM_MemManager.hxx diff --git a/src/LDOM/Handle_LDOM_MemManager.hxx b/src/LDOM/Handle_LDOM_MemManager.hxx deleted file mode 100644 index bc7baa45bd..0000000000 --- a/src/LDOM/Handle_LDOM_MemManager.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 2002-02-12 -// Created by: Alexander GRIGORIEV -// Copyright (c) 2002-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef Handle_LDOM_MemManager_HeaderFile -#define Handle_LDOM_MemManager_HeaderFile - -#include -#include - -class LDOM_MemManager; - -// Define handle class for LDOM_MemManager -DEFINE_STANDARD_HANDLE (LDOM_MemManager, MMgt_TShared) - -#endif diff --git a/src/LDOM/LDOMString.hxx b/src/LDOM/LDOMString.hxx index 0ce1cdf47f..908d7d2ab7 100644 --- a/src/LDOM/LDOMString.hxx +++ b/src/LDOM/LDOMString.hxx @@ -18,6 +18,8 @@ #include +class LDOM_MemManager; + // Class LDOMString // Represents various object types which can be mapped to XML strings // LDOMString is not an independent type: you must be sure that the owner diff --git a/src/LDOM/LDOM_Document.hxx b/src/LDOM/LDOM_Document.hxx index cd671d6812..fbe48a9f49 100644 --- a/src/LDOM/LDOM_Document.hxx +++ b/src/LDOM/LDOM_Document.hxx @@ -21,6 +21,8 @@ #include #include +class LDOM_MemManager; + // Class LDOM_Document class LDOM_Document diff --git a/src/LDOM/LDOM_MemManager.hxx b/src/LDOM/LDOM_MemManager.hxx index 7caf9cbe3c..f2e15b4093 100644 --- a/src/LDOM/LDOM_MemManager.hxx +++ b/src/LDOM/LDOM_MemManager.hxx @@ -21,6 +21,10 @@ #include class LDOM_BasicElement; +class LDOM_MemManager; + +// Define handle class for LDOM_MemManager +DEFINE_STANDARD_HANDLE (LDOM_MemManager, MMgt_TShared) // Class LDOM_MemManager (underlying structure of LDOM_Document) // diff --git a/src/LDOM/LDOM_Node.hxx b/src/LDOM/LDOM_Node.hxx index 85a4a96cce..008eb98d1f 100644 --- a/src/LDOM/LDOM_Node.hxx +++ b/src/LDOM/LDOM_Node.hxx @@ -24,6 +24,7 @@ #include class LDOM_BasicNode; +class LDOM_MemManager; // LDOM_Node : base class for LDOM interface objects // references LDOM_BasicNode - the real data stored in Document diff --git a/src/Law/Law_BSplineKnotSplitting.cxx b/src/Law/Law_BSplineKnotSplitting.cxx index 82293be4d2..bf38350da6 100644 --- a/src/Law/Law_BSplineKnotSplitting.cxx +++ b/src/Law/Law_BSplineKnotSplitting.cxx @@ -22,22 +22,13 @@ #include -typedef Handle(Law_BSpline) Handle(BSplineCurve); typedef TColStd_Array1OfInteger Array1OfInteger; typedef TColStd_HArray1OfInteger HArray1OfInteger; - - - Law_BSplineKnotSplitting:: -Law_BSplineKnotSplitting ( - -const Handle(BSplineCurve)& BasisCurve, -const Standard_Integer ContinuityRange - -) { - - +Law_BSplineKnotSplitting (const Handle(Law_BSpline)& BasisCurve, + const Standard_Integer ContinuityRange) +{ if (ContinuityRange < 0) Standard_RangeError::Raise(); Standard_Integer FirstIndex = BasisCurve->FirstUKnotIndex(); diff --git a/src/MeshVS/MeshVS_PrsBuilder.cxx b/src/MeshVS/MeshVS_PrsBuilder.cxx index 8d1eb199ad..4c40dd41b4 100644 --- a/src/MeshVS/MeshVS_PrsBuilder.cxx +++ b/src/MeshVS/MeshVS_PrsBuilder.cxx @@ -28,7 +28,7 @@ MeshVS_PrsBuilder::MeshVS_PrsBuilder ( const Handle(MeshVS_Mesh)& Parent, const Standard_Integer Id, const MeshVS_BuilderPriority& Priority ) { - if (Id<0 && Parent!=0 ) + if (Id<0 && ! Parent.IsNull()) myId = Parent->GetFreeId(); else myId = Id; diff --git a/src/Message/Message_Algorithm.cxx b/src/Message/Message_Algorithm.cxx index 8c4a317e69..cb51c23648 100644 --- a/src/Message/Message_Algorithm.cxx +++ b/src/Message/Message_Algorithm.cxx @@ -197,9 +197,9 @@ void Message_Algorithm::SendStatusMessages (const Message_ExecStatus& theStatus, continue; } - Handle(Message_Msg) aMsgCustom = !myReportMessages.IsNull() - ? myReportMessages->Value (i) - : Handle(Message_Msg)(); + NCollection_Handle aMsgCustom; + if (! myReportMessages.IsNull()) + aMsgCustom = myReportMessages->Value (i); if (!aMsgCustom.IsNull()) { // print custom message diff --git a/src/Message/Message_HArrayOfMsg.hxx b/src/Message/Message_HArrayOfMsg.hxx index 2fb2db1277..4114e9c42b 100644 --- a/src/Message/Message_HArrayOfMsg.hxx +++ b/src/Message/Message_HArrayOfMsg.hxx @@ -18,7 +18,7 @@ #include #include -typedef NCollection_Array1 Message_ArrayOfMsg; -typedef Handle(Message_ArrayOfMsg) Message_HArrayOfMsg; +typedef NCollection_Array1 > Message_ArrayOfMsg; +typedef NCollection_Handle Message_HArrayOfMsg; #endif // _Message_HArrayOfMsg_HeaderFile diff --git a/src/MoniTool/MoniTool_DataMapOfTimer.hxx b/src/MoniTool/MoniTool_DataMapOfTimer.hxx index 292535291b..5d246c2b44 100644 --- a/src/MoniTool/MoniTool_DataMapOfTimer.hxx +++ b/src/MoniTool/MoniTool_DataMapOfTimer.hxx @@ -21,6 +21,7 @@ #include #include +class MoniTool_Timer; typedef NCollection_DataMap MoniTool_DataMapOfTimer; typedef NCollection_DataMap::Iterator MoniTool_DataMapIteratorOfDataMapOfTimer; diff --git a/src/MoniTool/MoniTool_ValueInterpret.hxx b/src/MoniTool/MoniTool_ValueInterpret.hxx index c229439cf2..c4ac2d7a02 100644 --- a/src/MoniTool/MoniTool_ValueInterpret.hxx +++ b/src/MoniTool/MoniTool_ValueInterpret.hxx @@ -18,7 +18,7 @@ #include - +class MoniTool_TypedValue; typedef Handle(TCollection_HAsciiString) (*MoniTool_ValueInterpret) (const Handle(MoniTool_TypedValue)& typval, const Handle(TCollection_HAsciiString)& val, const Standard_Boolean native); diff --git a/src/NCollection/NCollection_WinHeapAllocator.cxx b/src/NCollection/NCollection_WinHeapAllocator.cxx index bc8f55dbc3..caf647e5b1 100644 --- a/src/NCollection/NCollection_WinHeapAllocator.cxx +++ b/src/NCollection/NCollection_WinHeapAllocator.cxx @@ -20,11 +20,6 @@ #include #endif -IMPLEMENT_STANDARD_HANDLE (NCollection_WinHeapAllocator, - NCollection_BaseAllocator) -IMPLEMENT_STANDARD_RTTIEXT(NCollection_WinHeapAllocator, - NCollection_BaseAllocator) - //======================================================================= //function : NCollection_WinHeapAllocator //purpose : Main constructor diff --git a/src/OpenGl/FILES b/src/OpenGl/FILES index 963f2d7fe2..f402b379c3 100755 --- a/src/OpenGl/FILES +++ b/src/OpenGl/FILES @@ -1,6 +1,5 @@ EXTERNLIB OpenGl_CMPLRS.edl -Handle_OpenGl_GraphicDriver.hxx OpenGl_GraphicDriver.hxx OpenGl_GraphicDriver.cxx OpenGl_GraphicDriver_4.cxx @@ -30,15 +29,12 @@ OpenGl_TextFormatter.hxx OpenGl_TextFormatter.cxx OpenGl_PointSprite.hxx OpenGl_PointSprite.cxx -Handle_OpenGl_PointSprite.hxx OpenGl_PrimitiveArray.hxx OpenGl_PrimitiveArray.cxx -Handle_OpenGl_Workspace.hxx OpenGl_Workspace.hxx OpenGl_Workspace.cxx OpenGl_Workspace_2.cxx OpenGl_Workspace_5.cxx -Handle_OpenGl_View.hxx OpenGl_View.hxx OpenGl_View.cxx OpenGl_View_2.cxx @@ -56,18 +52,15 @@ OpenGl_PrinterContext.hxx OpenGl_PrinterContext.cxx OpenGl_LineAttributes.hxx OpenGl_LineAttributes.cxx -Handle_OpenGl_Window.hxx OpenGl_Window.hxx OpenGl_Window.cxx OpenGl_Window_1.mm OpenGl_AVIWriter.hxx OpenGl_AVIWriter.cxx -Handle_OpenGl_FrameBuffer.hxx OpenGl_FrameBuffer.hxx OpenGl_FrameBuffer.cxx OpenGl_Texture.cxx OpenGl_Texture.hxx -Handle_OpenGl_Texture.hxx OpenGl_Resource.hxx OpenGl_Resource.cxx OpenGl_telem_util.hxx @@ -78,7 +71,6 @@ OpenGl_Font.cxx OpenGl_tgl_funcs.hxx OpenGl_Caps.hxx OpenGl_Caps.cxx -Handle_OpenGl_Context.hxx OpenGl_Context.hxx OpenGl_Context.cxx OpenGl_Context_1.mm @@ -141,9 +133,6 @@ OpenGl_ShaderManager.hxx OpenGl_ShaderManager.cxx OpenGl_ShaderStates.hxx OpenGl_ShaderStates.cxx -Handle_OpenGl_ShaderObject.hxx -Handle_OpenGl_ShaderProgram.hxx -Handle_OpenGl_ShaderManager.hxx OpenGl_SceneGeometry.hxx OpenGl_SceneGeometry.cxx OpenGl_View_Raytrace.cxx @@ -154,7 +143,6 @@ OpenGl_BVHTreeSelector.cxx OpenGl_BVHClipPrimitiveSet.cxx OpenGl_BVHClipPrimitiveSet.hxx OpenGl_ArbTexBindless.hxx -Handle_OpenGl_Sampler.hxx OpenGl_Sampler.hxx OpenGl_Sampler.cxx OpenGl_Utils.hxx diff --git a/src/OpenGl/Handle_OpenGl_Context.hxx b/src/OpenGl/Handle_OpenGl_Context.hxx deleted file mode 100644 index cd85cec430..0000000000 --- a/src/OpenGl/Handle_OpenGl_Context.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2012-01-26 -// Created by: Kirill GAVRILOV -// Copyright (c) 2012-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_Context_Header -#define _Handle_OpenGl_Context_Header - -#include - -class OpenGl_Context; -DEFINE_STANDARD_HANDLE(OpenGl_Context, Standard_Transient) - -#endif // _Handle_OpenGl_Context_Header diff --git a/src/OpenGl/Handle_OpenGl_FrameBuffer.hxx b/src/OpenGl/Handle_OpenGl_FrameBuffer.hxx deleted file mode 100644 index a6b8972974..0000000000 --- a/src/OpenGl/Handle_OpenGl_FrameBuffer.hxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2015 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_FrameBuffer_Header -#define _Handle_OpenGl_FrameBuffer_Header - -#include - -class OpenGl_FrameBuffer; -DEFINE_STANDARD_HANDLE(OpenGl_FrameBuffer, OpenGl_Resource) - -#endif // _Handle_OpenGl_FrameBuffer_Header diff --git a/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx b/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx deleted file mode 100644 index ba07b75f11..0000000000 --- a/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 2011-10-20 -// Created by: Sergey ZERCHANINOV -// Copyright (c) 2011-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_GraphicDriver_Header -#define _Handle_OpenGl_GraphicDriver_Header - -#include - -class OpenGl_GraphicDriver; - -// Handle definition -// -DEFINE_STANDARD_HANDLE(OpenGl_GraphicDriver,Graphic3d_GraphicDriver) - -#endif //_Handle_OpenGl_GraphicDriver_Header diff --git a/src/OpenGl/Handle_OpenGl_PointSprite.hxx b/src/OpenGl/Handle_OpenGl_PointSprite.hxx deleted file mode 100755 index 9d74a80d77..0000000000 --- a/src/OpenGl/Handle_OpenGl_PointSprite.hxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 2013-08-26 -// Created by: Kirill GAVRILOV -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_PointSprite_Header -#define _Handle_OpenGl_PointSprite_Header - - -class OpenGl_PointSprite; -DEFINE_STANDARD_HANDLE(OpenGl_PointSprite, OpenGl_Texture) - -#endif // _Handle_OpenGl_PointSprite_Header diff --git a/src/OpenGl/Handle_OpenGl_Sampler.hxx b/src/OpenGl/Handle_OpenGl_Sampler.hxx deleted file mode 100644 index 623ae56708..0000000000 --- a/src/OpenGl/Handle_OpenGl_Sampler.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2014-10-17 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_Sampler_HeaderFile -#define _Handle_OpenGl_Sampler_HeaderFile - -#include - -class OpenGl_Sampler; -DEFINE_STANDARD_HANDLE(OpenGl_Sampler, OpenGl_Resource) - -#endif diff --git a/src/OpenGl/Handle_OpenGl_ShaderManager.hxx b/src/OpenGl/Handle_OpenGl_ShaderManager.hxx deleted file mode 100755 index 6c7f618781..0000000000 --- a/src/OpenGl/Handle_OpenGl_ShaderManager.hxx +++ /dev/null @@ -1,22 +0,0 @@ -// Created on: 2013-09-26 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_ShaderManager_HeaderFile -#define _Handle_OpenGl_ShaderManager_HeaderFile - -class OpenGl_ShaderManager; -DEFINE_STANDARD_HANDLE(OpenGl_ShaderManager, Standard_Transient) - -#endif diff --git a/src/OpenGl/Handle_OpenGl_ShaderObject.hxx b/src/OpenGl/Handle_OpenGl_ShaderObject.hxx deleted file mode 100755 index 77255e290c..0000000000 --- a/src/OpenGl/Handle_OpenGl_ShaderObject.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2013-09-19 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_ShaderObject_Header -#define _Handle_OpenGl_ShaderObject_Header - -#include - -class OpenGl_ShaderObject; -DEFINE_STANDARD_HANDLE(OpenGl_ShaderObject, OpenGl_Resource) - -#endif diff --git a/src/OpenGl/Handle_OpenGl_ShaderProgram.hxx b/src/OpenGl/Handle_OpenGl_ShaderProgram.hxx deleted file mode 100755 index 046dc0950b..0000000000 --- a/src/OpenGl/Handle_OpenGl_ShaderProgram.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2013-09-19 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_ShaderProgram_Header -#define _Handle_OpenGl_ShaderProgram_Header - -#include - -class OpenGl_ShaderProgram; -DEFINE_STANDARD_HANDLE(OpenGl_ShaderProgram, OpenGl_Resource) - -#endif diff --git a/src/OpenGl/Handle_OpenGl_Texture.hxx b/src/OpenGl/Handle_OpenGl_Texture.hxx deleted file mode 100644 index 555b78dc5f..0000000000 --- a/src/OpenGl/Handle_OpenGl_Texture.hxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_Texture_Header -#define _Handle_OpenGl_Texture_Header - -#include - -class OpenGl_Texture; -DEFINE_STANDARD_HANDLE(OpenGl_Texture, OpenGl_Resource) - -#endif // _Handle_OpenGl_Texture_Header diff --git a/src/OpenGl/Handle_OpenGl_View.hxx b/src/OpenGl/Handle_OpenGl_View.hxx deleted file mode 100644 index f2ffc441cd..0000000000 --- a/src/OpenGl/Handle_OpenGl_View.hxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 2011-09-20 -// Created by: Sergey ZERCHANINOV -// Copyright (c) 2011-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_View_Header -#define _Handle_OpenGl_View_Header - -#include - -class OpenGl_View; - -// Handle definition -// -DEFINE_STANDARD_HANDLE(OpenGl_View,MMgt_TShared) - - -#endif //_Handle_OpenGl_View_Header diff --git a/src/OpenGl/Handle_OpenGl_Window.hxx b/src/OpenGl/Handle_OpenGl_Window.hxx deleted file mode 100644 index 1e230981b1..0000000000 --- a/src/OpenGl/Handle_OpenGl_Window.hxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 2011-09-20 -// Created by: Sergey ZERCHANINOV -// Copyright (c) 2011-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_Window_Header -#define _Handle_OpenGl_Window_Header - -#include - -class OpenGl_Window; - -// Handle definition -// -DEFINE_STANDARD_HANDLE(OpenGl_Window,MMgt_TShared) - - -#endif //_Handle_OpenGl_Window_Header diff --git a/src/OpenGl/Handle_OpenGl_Workspace.hxx b/src/OpenGl/Handle_OpenGl_Workspace.hxx deleted file mode 100644 index 8bcfef5703..0000000000 --- a/src/OpenGl/Handle_OpenGl_Workspace.hxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 2011-09-20 -// Created by: Sergey ZERCHANINOV -// Copyright (c) 2011-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Handle_OpenGl_Workspace_Header -#define _Handle_OpenGl_Workspace_Header - -#include - -class OpenGl_Workspace; - -// Handle definition -// -DEFINE_STANDARD_HANDLE(OpenGl_Workspace,OpenGl_Window) - - -#endif //_Handle_OpenGl_Workspace_Header diff --git a/src/OpenGl/OpenGl_AspectFace.cxx b/src/OpenGl/OpenGl_AspectFace.cxx index 0aa73662b2..a4252161b8 100644 --- a/src/OpenGl/OpenGl_AspectFace.cxx +++ b/src/OpenGl/OpenGl_AspectFace.cxx @@ -25,9 +25,12 @@ #include #include +#include #include #include +#include + namespace { static OPENGL_SURF_PROP THE_DEFAULT_MATERIAL = diff --git a/src/OpenGl/OpenGl_AspectFace.hxx b/src/OpenGl/OpenGl_AspectFace.hxx index 0d71ebc778..5dc19683af 100644 --- a/src/OpenGl/OpenGl_AspectFace.hxx +++ b/src/OpenGl/OpenGl_AspectFace.hxx @@ -30,6 +30,8 @@ #include #include +class OpenGl_Texture; + #define OPENGL_AMBIENT_MASK (1<<0) #define OPENGL_DIFFUSE_MASK (1<<1) #define OPENGL_SPECULAR_MASK (1<<2) diff --git a/src/OpenGl/OpenGl_AspectLine.hxx b/src/OpenGl/OpenGl_AspectLine.hxx index c1e12f809a..9ce57dbc2d 100644 --- a/src/OpenGl/OpenGl_AspectLine.hxx +++ b/src/OpenGl/OpenGl_AspectLine.hxx @@ -21,10 +21,10 @@ #include #include #include - - #include +class OpenGl_ShaderProgram; + class OpenGl_AspectLine : public OpenGl_Element { public: diff --git a/src/OpenGl/OpenGl_AspectMarker.hxx b/src/OpenGl/OpenGl_AspectMarker.hxx index 1706335e2d..a74227c78e 100644 --- a/src/OpenGl/OpenGl_AspectMarker.hxx +++ b/src/OpenGl/OpenGl_AspectMarker.hxx @@ -23,7 +23,8 @@ #include -#include +class OpenGl_PointSprite; +class OpenGl_ShaderProgram; class OpenGl_AspectMarker : public OpenGl_Element { diff --git a/src/OpenGl/OpenGl_AspectText.hxx b/src/OpenGl/OpenGl_AspectText.hxx index baac88e476..b9efe35bde 100755 --- a/src/OpenGl/OpenGl_AspectText.hxx +++ b/src/OpenGl/OpenGl_AspectText.hxx @@ -26,6 +26,8 @@ #include +class OpenGl_ShaderProgram; + //! Text representation parameters class OpenGl_AspectText : public OpenGl_Element { diff --git a/src/OpenGl/OpenGl_BVHClipPrimitiveSet.cxx b/src/OpenGl/OpenGl_BVHClipPrimitiveSet.cxx index 5ed300708a..ebb5c87a9c 100644 --- a/src/OpenGl/OpenGl_BVHClipPrimitiveSet.cxx +++ b/src/OpenGl/OpenGl_BVHClipPrimitiveSet.cxx @@ -16,6 +16,7 @@ #include #include +#include // ======================================================================= // function : OpenGl_BVHClipPrimitiveSet diff --git a/src/OpenGl/OpenGl_BVHTreeSelector.cxx b/src/OpenGl/OpenGl_BVHTreeSelector.cxx index cac526d811..7fccc89c51 100644 --- a/src/OpenGl/OpenGl_BVHTreeSelector.cxx +++ b/src/OpenGl/OpenGl_BVHTreeSelector.cxx @@ -17,6 +17,7 @@ #include #include +#include // ======================================================================= // function : OpenGl_BVHTreeSelector diff --git a/src/OpenGl/OpenGl_BackgroundArray.cxx b/src/OpenGl/OpenGl_BackgroundArray.cxx index 7857ccbe7f..ac7316b65c 100644 --- a/src/OpenGl/OpenGl_BackgroundArray.cxx +++ b/src/OpenGl/OpenGl_BackgroundArray.cxx @@ -18,6 +18,7 @@ #include #include #include +#include // ======================================================================= // method : Constructor diff --git a/src/OpenGl/OpenGl_CappingAlgo.cxx b/src/OpenGl/OpenGl_CappingAlgo.cxx index 688516f1d4..628cab1432 100755 --- a/src/OpenGl/OpenGl_CappingAlgo.cxx +++ b/src/OpenGl/OpenGl_CappingAlgo.cxx @@ -20,7 +20,7 @@ #include #include #include - +#include namespace { diff --git a/src/OpenGl/OpenGl_CappingAlgo.hxx b/src/OpenGl/OpenGl_CappingAlgo.hxx index 1c41e9e92e..14c28285bb 100755 --- a/src/OpenGl/OpenGl_CappingAlgo.hxx +++ b/src/OpenGl/OpenGl_CappingAlgo.hxx @@ -22,7 +22,7 @@ #include // Forward declaration - +class OpenGl_CappingAlgoFilter; DEFINE_STANDARD_HANDLE (OpenGl_CappingAlgoFilter, OpenGl_RenderFilter) //! Capping surface rendering algorithm. diff --git a/src/OpenGl/OpenGl_CappingPlaneResource.hxx b/src/OpenGl/OpenGl_CappingPlaneResource.hxx index ecad37682f..1a29c331ed 100755 --- a/src/OpenGl/OpenGl_CappingPlaneResource.hxx +++ b/src/OpenGl/OpenGl_CappingPlaneResource.hxx @@ -22,7 +22,7 @@ #include #include - +class OpenGl_CappingPlaneResource; DEFINE_STANDARD_HANDLE (OpenGl_CappingPlaneResource, OpenGl_Resource) //! Container of graphical resources for rendering capping plane diff --git a/src/OpenGl/OpenGl_Clipping.hxx b/src/OpenGl/OpenGl_Clipping.hxx index 8d87a97c12..e7e1f10fc5 100755 --- a/src/OpenGl/OpenGl_Clipping.hxx +++ b/src/OpenGl/OpenGl_Clipping.hxx @@ -24,6 +24,8 @@ #include #include +class OpenGl_Workspace; + //! This class contains logics related to tracking and modification of clipping plane //! state for particular OpenGl context. It contains information about enabled //! clipping planes and provides method to change clippings in context. The methods diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx index 83659c1c23..f4f92b28c0 100644 --- a/src/OpenGl/OpenGl_Context.cxx +++ b/src/OpenGl/OpenGl_Context.cxx @@ -2515,7 +2515,7 @@ void OpenGl_Context::SetTypeOfLine (const Aspect_TypeOfLine theType, } } - if (myActiveProgram != NULL) + if (!myActiveProgram.IsNull()) { myActiveProgram->SetUniform (this, "uPattern", aPattern); myActiveProgram->SetUniform (this, "uFactor", theFactor); diff --git a/src/OpenGl/OpenGl_Context.hxx b/src/OpenGl/OpenGl_Context.hxx index 2c8b3d2f21..d6f024beb1 100644 --- a/src/OpenGl/OpenGl_Context.hxx +++ b/src/OpenGl/OpenGl_Context.hxx @@ -35,6 +35,9 @@ #include #include #include +#include + +#include //! Forward declarations #if defined(__APPLE__) @@ -122,6 +125,13 @@ template struct OpenGl_TmplCore44; typedef OpenGl_TmplCore44 OpenGl_GlCore44Back; typedef OpenGl_TmplCore44 OpenGl_GlCore44; +class OpenGl_ShaderManager; +class OpenGl_Sampler; +class OpenGl_FrameBuffer; + +class OpenGl_Context; +DEFINE_STANDARD_HANDLE(OpenGl_Context, Standard_Transient) + //! This class generalize access to the GL context and available extensions. //! //! Functions related to specific OpenGL version or extension are grouped into structures which can be accessed as fields of this class. @@ -646,9 +656,9 @@ private: // system-dependent fields private: // context info - typedef NCollection_DataMap OpenGl_DelayReleaseMap; - typedef NCollection_DataMap OpenGl_ResourcesMap; - typedef NCollection_List OpenGl_ResourcesStack; + typedef NCollection_Shared< NCollection_DataMap > OpenGl_DelayReleaseMap; + typedef NCollection_Shared< NCollection_DataMap > OpenGl_ResourcesMap; + typedef NCollection_Shared< NCollection_List > OpenGl_ResourcesStack; Handle(OpenGl_ResourcesMap) mySharedResources; //!< shared resources with unique identification key Handle(OpenGl_DelayReleaseMap) myDelayed; //!< shared resources for delayed release diff --git a/src/OpenGl/OpenGl_Element.hxx b/src/OpenGl/OpenGl_Element.hxx index eeb4f7fb46..b3354212b6 100644 --- a/src/OpenGl/OpenGl_Element.hxx +++ b/src/OpenGl/OpenGl_Element.hxx @@ -18,6 +18,9 @@ #include +class OpenGl_Workspace; +class OpenGl_Context; + //! Base interface for drawable elements. class OpenGl_Element { diff --git a/src/OpenGl/OpenGl_FrameBuffer.hxx b/src/OpenGl/OpenGl_FrameBuffer.hxx index be79c3a6cf..0fceeaf989 100644 --- a/src/OpenGl/OpenGl_FrameBuffer.hxx +++ b/src/OpenGl/OpenGl_FrameBuffer.hxx @@ -22,6 +22,8 @@ #include #include +class OpenGl_FrameBuffer; +DEFINE_STANDARD_HANDLE(OpenGl_FrameBuffer, OpenGl_Resource) //! Class implements FrameBuffer Object (FBO) resource //! intended for off-screen rendering. diff --git a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx index 5f5523ca1c..76ef23f112 100755 --- a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx +++ b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx @@ -19,14 +19,11 @@ #include #include -#ifndef _WIN32 - #include -#endif - #include #include #include +#include #include #include #include @@ -35,6 +32,10 @@ #include #include +#ifndef _WIN32 + #include +#endif + namespace { static const OpenGl_TextParam THE_LABEL_PARAMS = diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx index 4f8f08b16d..b610f89512 100644 --- a/src/OpenGl/OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/OpenGl_GraphicDriver.hxx @@ -66,6 +66,7 @@ class Image_PixMap; class OpenGl_Element; class OpenGl_Structure; class OpenGl_Text; +class OpenGl_View; //! Tool class to implement consistent state counter //! for objects inside the same driver instance. @@ -82,6 +83,9 @@ private: Standard_Size myCounter; }; +class OpenGl_GraphicDriver; +DEFINE_STANDARD_HANDLE(OpenGl_GraphicDriver,Graphic3d_GraphicDriver) + //! This class defines an OpenGl graphic driver class OpenGl_GraphicDriver : public Graphic3d_GraphicDriver { diff --git a/src/OpenGl/OpenGl_Group.cxx b/src/OpenGl/OpenGl_Group.cxx index 55a27ce5af..19bca09c77 100644 --- a/src/OpenGl/OpenGl_Group.cxx +++ b/src/OpenGl/OpenGl_Group.cxx @@ -43,7 +43,7 @@ OpenGl_Group::OpenGl_Group (const Handle(Graphic3d_Structure)& theStruct) myIsRaytracable (Standard_False) { Handle(OpenGl_Structure) aStruct = Handle(OpenGl_Structure)::DownCast (myStructure->CStructure()); - if (aStruct == NULL) + if (aStruct.IsNull()) { Graphic3d_GroupDefinitionError::Raise ("OpenGl_Group should be created by OpenGl_Structure!"); } diff --git a/src/OpenGl/OpenGl_Layer.cxx b/src/OpenGl/OpenGl_Layer.cxx index 0859e12b45..b0e850921e 100644 --- a/src/OpenGl/OpenGl_Layer.cxx +++ b/src/OpenGl/OpenGl_Layer.cxx @@ -19,6 +19,7 @@ #include #include #include +#include // ======================================================================= // function : OpenGl_PriorityList diff --git a/src/OpenGl/OpenGl_LayerList.cxx b/src/OpenGl/OpenGl_LayerList.cxx index 1906214be5..6b1c11d650 100644 --- a/src/OpenGl/OpenGl_LayerList.cxx +++ b/src/OpenGl/OpenGl_LayerList.cxx @@ -21,6 +21,7 @@ #include #include +#include //======================================================================= //function : OpenGl_LayerList diff --git a/src/OpenGl/OpenGl_PointSprite.hxx b/src/OpenGl/OpenGl_PointSprite.hxx index 29aac6906b..9b5bf0ff19 100755 --- a/src/OpenGl/OpenGl_PointSprite.hxx +++ b/src/OpenGl/OpenGl_PointSprite.hxx @@ -17,6 +17,9 @@ #include +class OpenGl_PointSprite; +DEFINE_STANDARD_HANDLE(OpenGl_PointSprite, OpenGl_Texture) + //! Point sprite resource. On modern hardware it will be texture with extra parameters. //! On ancient hardware sprites will be drawn using bitmaps. class OpenGl_PointSprite : public OpenGl_Texture diff --git a/src/OpenGl/OpenGl_RenderFilter.hxx b/src/OpenGl/OpenGl_RenderFilter.hxx index 47ace0c451..9be8c0564a 100755 --- a/src/OpenGl/OpenGl_RenderFilter.hxx +++ b/src/OpenGl/OpenGl_RenderFilter.hxx @@ -19,6 +19,7 @@ #include #include +class OpenGl_RenderFilter; DEFINE_STANDARD_HANDLE (OpenGl_RenderFilter, Standard_Transient) class OpenGl_Element; diff --git a/src/OpenGl/OpenGl_Sampler.hxx b/src/OpenGl/OpenGl_Sampler.hxx index 57319f60cd..9489fe9f47 100644 --- a/src/OpenGl/OpenGl_Sampler.hxx +++ b/src/OpenGl/OpenGl_Sampler.hxx @@ -18,6 +18,9 @@ #include +class OpenGl_Sampler; +DEFINE_STANDARD_HANDLE(OpenGl_Sampler, OpenGl_Resource) + //! Class implements OpenGL sampler object resource that //! stores the sampling parameters for a texture access. class OpenGl_Sampler : public OpenGl_Resource diff --git a/src/OpenGl/OpenGl_SceneGeometry.cxx b/src/OpenGl/OpenGl_SceneGeometry.cxx index 1a4fd81069..5ae251340d 100755 --- a/src/OpenGl/OpenGl_SceneGeometry.cxx +++ b/src/OpenGl/OpenGl_SceneGeometry.cxx @@ -23,6 +23,7 @@ #include #include #include +#include //! Use this macro to output BVH profiling info // #define RAY_TRACE_PRINT_INFO diff --git a/src/OpenGl/OpenGl_ShaderManager.hxx b/src/OpenGl/OpenGl_ShaderManager.hxx index 6b4ecb5d7b..f9abcf7ec6 100644 --- a/src/OpenGl/OpenGl_ShaderManager.hxx +++ b/src/OpenGl/OpenGl_ShaderManager.hxx @@ -39,6 +39,9 @@ typedef NCollection_Sequence OpenGl_ShaderProgramL //! Map to declare per-program states of OCCT materials. typedef NCollection_DataMap OpenGl_MaterialStates; +class OpenGl_ShaderManager; +DEFINE_STANDARD_HANDLE(OpenGl_ShaderManager, Standard_Transient) + //! This class is responsible for managing shader programs. class OpenGl_ShaderManager : public Standard_Transient { diff --git a/src/OpenGl/OpenGl_ShaderObject.hxx b/src/OpenGl/OpenGl_ShaderObject.hxx index 432df4dce5..29b4860a3f 100755 --- a/src/OpenGl/OpenGl_ShaderObject.hxx +++ b/src/OpenGl/OpenGl_ShaderObject.hxx @@ -20,6 +20,9 @@ #include #include +class OpenGl_ShaderObject; +DEFINE_STANDARD_HANDLE(OpenGl_ShaderObject, OpenGl_Resource) + //! Wrapper for OpenGL shader object. class OpenGl_ShaderObject : public OpenGl_Resource { diff --git a/src/OpenGl/OpenGl_ShaderProgram.hxx b/src/OpenGl/OpenGl_ShaderProgram.hxx index 10eb0fddfa..b8a4ee622d 100755 --- a/src/OpenGl/OpenGl_ShaderProgram.hxx +++ b/src/OpenGl/OpenGl_ShaderProgram.hxx @@ -29,6 +29,9 @@ #include #include +class OpenGl_ShaderProgram; +DEFINE_STANDARD_HANDLE(OpenGl_ShaderProgram, OpenGl_Resource) + //! The enumeration of OCCT-specific OpenGL/GLSL variables. enum OpenGl_StateVariable { diff --git a/src/OpenGl/OpenGl_StructureShadow.cxx b/src/OpenGl/OpenGl_StructureShadow.cxx index 790058cff6..0025e6411b 100644 --- a/src/OpenGl/OpenGl_StructureShadow.cxx +++ b/src/OpenGl/OpenGl_StructureShadow.cxx @@ -15,6 +15,7 @@ #include +#include //======================================================================= //function : OpenGl_StructureShadow diff --git a/src/OpenGl/OpenGl_Text.cxx b/src/OpenGl/OpenGl_Text.cxx index dcb68db7e5..5310c1e2ab 100644 --- a/src/OpenGl/OpenGl_Text.cxx +++ b/src/OpenGl/OpenGl_Text.cxx @@ -302,7 +302,7 @@ void OpenGl_Text::Release (OpenGl_Context* theCtx) Handle(OpenGl_Context) aCtx = theCtx; const TCollection_AsciiString aKey = myFont->ResourceKey(); myFont.Nullify(); - if (aCtx) + if (! aCtx.IsNull()) aCtx->ReleaseResource (aKey, Standard_True); } } diff --git a/src/OpenGl/OpenGl_Text.hxx b/src/OpenGl/OpenGl_Text.hxx index f33663ec6a..dc755cbc68 100755 --- a/src/OpenGl/OpenGl_Text.hxx +++ b/src/OpenGl/OpenGl_Text.hxx @@ -27,6 +27,7 @@ #include #include +class OpenGl_PrinterContext; //! Text rendering class OpenGl_Text : public OpenGl_Element diff --git a/src/OpenGl/OpenGl_Texture.hxx b/src/OpenGl/OpenGl_Texture.hxx index 20f8f0095d..1a1a0ed955 100644 --- a/src/OpenGl/OpenGl_Texture.hxx +++ b/src/OpenGl/OpenGl_Texture.hxx @@ -20,6 +20,7 @@ #include class OpenGl_Context; +class Graphic3d_TextureParams; class Image_PixMap; //! Selects preferable texture format for specified parameters. @@ -145,6 +146,9 @@ private: }; +class OpenGl_Texture; +DEFINE_STANDARD_HANDLE(OpenGl_Texture, OpenGl_Resource) + //! Texture resource. class OpenGl_Texture : public OpenGl_Resource { diff --git a/src/OpenGl/OpenGl_Trihedron.cxx b/src/OpenGl/OpenGl_Trihedron.cxx index eb19352bee..93c06cee3a 100644 --- a/src/OpenGl/OpenGl_Trihedron.cxx +++ b/src/OpenGl/OpenGl_Trihedron.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/src/OpenGl/OpenGl_View.hxx b/src/OpenGl/OpenGl_View.hxx index 281595e0fb..1bd43b4eac 100644 --- a/src/OpenGl/OpenGl_View.hxx +++ b/src/OpenGl/OpenGl_View.hxx @@ -73,6 +73,9 @@ struct OpenGl_Matrix; class OpenGl_Structure; class OpenGl_StateCounter; +class OpenGl_View; +DEFINE_STANDARD_HANDLE(OpenGl_View,MMgt_TShared) + class OpenGl_View : public MMgt_TShared { public: diff --git a/src/OpenGl/OpenGl_View_2.cxx b/src/OpenGl/OpenGl_View_2.cxx index 8f13fb6317..3bf0162936 100644 --- a/src/OpenGl/OpenGl_View_2.cxx +++ b/src/OpenGl/OpenGl_View_2.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/src/OpenGl/OpenGl_View_Raytrace.cxx b/src/OpenGl/OpenGl_View_Raytrace.cxx index cf34ca2a21..4072437644 100644 --- a/src/OpenGl/OpenGl_View_Raytrace.cxx +++ b/src/OpenGl/OpenGl_View_Raytrace.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/src/OpenGl/OpenGl_Window.cxx b/src/OpenGl/OpenGl_Window.cxx index 12e33188c4..c4e9921fd7 100644 --- a/src/OpenGl/OpenGl_Window.cxx +++ b/src/OpenGl/OpenGl_Window.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #if defined(HAVE_EGL) || defined(__ANDROID__) #include diff --git a/src/OpenGl/OpenGl_Window.hxx b/src/OpenGl/OpenGl_Window.hxx index 3ab376902e..f4f53060fd 100644 --- a/src/OpenGl/OpenGl_Window.hxx +++ b/src/OpenGl/OpenGl_Window.hxx @@ -19,10 +19,9 @@ #include #include #include - - #include + #if defined(__APPLE__) #import #endif @@ -35,6 +34,12 @@ #endif #endif +class OpenGl_Context; +class OpenGl_GraphicDriver; + +class OpenGl_Window; +DEFINE_STANDARD_HANDLE(OpenGl_Window,MMgt_TShared) + //! This class represents low-level wrapper over window with GL context. //! The window itself should be provided to constructor. class OpenGl_Window : public MMgt_TShared diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx index 73e61b81a4..d2619f9f6f 100644 --- a/src/OpenGl/OpenGl_Workspace.cxx +++ b/src/OpenGl/OpenGl_Workspace.cxx @@ -34,6 +34,7 @@ #include #include +#include #if defined(_WIN32) && defined(HAVE_VIDEOCAPTURE) #include diff --git a/src/OpenGl/OpenGl_Workspace.hxx b/src/OpenGl/OpenGl_Workspace.hxx index 4256c5dafb..aa1bca9249 100644 --- a/src/OpenGl/OpenGl_Workspace.hxx +++ b/src/OpenGl/OpenGl_Workspace.hxx @@ -90,6 +90,7 @@ struct OpenGl_Material }; +class OpenGl_RaytraceFilter; DEFINE_STANDARD_HANDLE (OpenGl_RaytraceFilter, OpenGl_RenderFilter) //! Graphical ray-tracing filter. @@ -127,6 +128,9 @@ public: DEFINE_STANDARD_RTTI(OpenGl_RaytraceFilter, OpenGl_RenderFilter) }; +class OpenGl_Workspace; +DEFINE_STANDARD_HANDLE(OpenGl_Workspace,OpenGl_Window) + //! Represents window with GL context. //! Provides methods to render primitives and maintain GL state. class OpenGl_Workspace : public OpenGl_Window diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx index e4171b126a..387b051fa6 100644 --- a/src/OpenGl/OpenGl_Workspace_2.cxx +++ b/src/OpenGl/OpenGl_Workspace_2.cxx @@ -18,6 +18,11 @@ #include #include #include +#include + +#include +#include +#include #if (defined(_WIN32) || defined(__WIN32__)) && defined(HAVE_FREEIMAGE) #include @@ -29,10 +34,6 @@ typedef NCollection_Handle FipHandle; #endif -#include -#include -#include - #ifdef _WIN32 #ifndef HAVE_FREEIMAGE diff --git a/src/OpenGl/OpenGl_Workspace_5.cxx b/src/OpenGl/OpenGl_Workspace_5.cxx index d4b61e4212..485857690b 100644 --- a/src/OpenGl/OpenGl_Workspace_5.cxx +++ b/src/OpenGl/OpenGl_Workspace_5.cxx @@ -24,8 +24,11 @@ #include #include #include +#include + +#include +#include -/* OCC22218 NOTE: project dependency on gl2ps is specified by macro */ #ifdef HAVE_GL2PS #include /* OCC22216 NOTE: linker dependency can be switched off by undefining macro. @@ -35,9 +38,6 @@ #endif #endif -#include -#include - /*----------------------------------------------------------------------*/ static void TelUpdatePolygonOffsets (const TEL_POFFSET_PARAM& theOffsetData) diff --git a/src/Poly/Poly_MakeLoops.hxx b/src/Poly/Poly_MakeLoops.hxx index 7e954e9525..0954319607 100644 --- a/src/Poly/Poly_MakeLoops.hxx +++ b/src/Poly/Poly_MakeLoops.hxx @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include diff --git a/src/Prs3d/Prs3d_Drawer.hxx b/src/Prs3d/Prs3d_Drawer.hxx index 37f96cdce1..19ba6aaf39 100644 --- a/src/Prs3d/Prs3d_Drawer.hxx +++ b/src/Prs3d/Prs3d_Drawer.hxx @@ -39,6 +39,7 @@ class Prs3d_DatumAspect; class Prs3d_DimensionAspect; class TCollection_AsciiString; +class Prs3d_Drawer; DEFINE_STANDARD_HANDLE(Prs3d_Drawer, MMgt_TShared) //! A graphic attribute manager which governs how diff --git a/src/Prs3d/Prs3d_WFShape.hxx b/src/Prs3d/Prs3d_WFShape.hxx index 13d9c1ba0b..cd644b843a 100755 --- a/src/Prs3d/Prs3d_WFShape.hxx +++ b/src/Prs3d/Prs3d_WFShape.hxx @@ -20,8 +20,10 @@ #include class Adaptor3d_Curve; +class BRepAdaptor_HSurface; class TopoDS_Edge; class TopoDS_Shape; +class Prs3d_Drawer; class Prs3d_WFShape : Prs3d_Root { diff --git a/src/PrsMgr/PrsMgr_Presentation.lxx b/src/PrsMgr/PrsMgr_Presentation.lxx index 1d87c8b02e..9be5c66910 100644 --- a/src/PrsMgr/PrsMgr_Presentation.lxx +++ b/src/PrsMgr/PrsMgr_Presentation.lxx @@ -14,6 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + inline void PrsMgr_Presentation::SetUpdateStatus (const Standard_Boolean theUpdateStatus) { myMustBeUpdated = theUpdateStatus; diff --git a/src/PrsMgr/PrsMgr_PresentationManager.lxx b/src/PrsMgr/PrsMgr_PresentationManager.lxx index 9724f0c77f..c84c980d64 100644 --- a/src/PrsMgr/PrsMgr_PresentationManager.lxx +++ b/src/PrsMgr/PrsMgr_PresentationManager.lxx @@ -14,6 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + inline Standard_Boolean PrsMgr_PresentationManager::IsImmediateModeOn() const { return myImmediateModeOn > 0; diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index 03f4090664..7792fd52cf 100644 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -591,7 +591,6 @@ Standard_Integer OCC165(Draw_Interpretor& di , #include #include -#include #include #include diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 816e6a4fdb..dd14e10400 100755 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -1730,7 +1730,7 @@ static void DoIsNull(Draw_Interpretor& di) HT aHandle; // QVERIFY (aHandle.IsNull()); QCOMPARE (aHandle.IsNull(), Standard_True); - const T* p = aHandle.Access(); + const T* p = aHandle.get(); #if OCC_VERSION_HEX > 0x060700 //QVERIFY (!p); //QVERIFY (p == 0); @@ -1741,7 +1741,7 @@ static void DoIsNull(Draw_Interpretor& di) aHandle = new T; //QVERIFY (!aHandle.IsNull()); QCOMPARE (!aHandle.IsNull(), Standard_True); - p = aHandle.Access(); + p = aHandle.get(); //QVERIFY (p); //QVERIFY (p != 0); QCOMPARE (p != NULL, Standard_True); diff --git a/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx b/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx index 1c48b9dc4c..ac8631e832 100644 --- a/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx +++ b/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx @@ -30,13 +30,16 @@ #include #include #include +#include #include #include RWHeaderSection_GeneralModule::RWHeaderSection_GeneralModule () - { Interface_GeneralLib::SetGlobal(this, HeaderSection::Protocol()); } +{ + Interface_GeneralLib::SetGlobal(this, HeaderSection::Protocol()); +} void RWHeaderSection_GeneralModule::FillSharedCase(const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const { diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx index 5c0ede5812..4cd96cea7c 100644 --- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx +++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx @@ -50,7 +50,9 @@ Handle(atype) result = *((Handle(atype)*) &start) #include #include #include +#include #include +#include #include #include #include diff --git a/src/RWStepShape/RWStepShape_RWSeamEdge.cxx b/src/RWStepShape/RWStepShape_RWSeamEdge.cxx index 7cfd2711cc..540dd55212 100644 --- a/src/RWStepShape/RWStepShape_RWSeamEdge.cxx +++ b/src/RWStepShape/RWStepShape_RWSeamEdge.cxx @@ -17,6 +17,7 @@ #include #include +#include #include //======================================================================= diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index 330c672fbb..2f050b2271 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -173,6 +173,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 3a1f3a3998..489d941543 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -96,9 +96,11 @@ #include #include #include +#include +#include +#include #include #include -// #include #include #include #include @@ -113,6 +115,7 @@ #include #include #include +#include #include #include #include diff --git a/src/STEPConstruct/STEPConstruct_AP203Context.cxx b/src/STEPConstruct/STEPConstruct_AP203Context.cxx index 8e460ef9b8..d843763051 100644 --- a/src/STEPConstruct/STEPConstruct_AP203Context.cxx +++ b/src/STEPConstruct/STEPConstruct_AP203Context.cxx @@ -40,6 +40,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/STEPConstruct/STEPConstruct_ContextTool.cxx b/src/STEPConstruct/STEPConstruct_ContextTool.cxx index 073450469f..4c268b852e 100644 --- a/src/STEPConstruct/STEPConstruct_ContextTool.cxx +++ b/src/STEPConstruct/STEPConstruct_ContextTool.cxx @@ -35,7 +35,15 @@ #include //:i3 #include //:j4 #include +#include +#include #include +#include +#include +#include +#include +#include +#include #include "stdio.h" diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx index 40158e1a5b..b265b3adcf 100644 --- a/src/STEPControl/STEPControl_ActorWrite.cxx +++ b/src/STEPControl/STEPControl_ActorWrite.cxx @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/STEPControl/STEPControl_Controller.cxx b/src/STEPControl/STEPControl_Controller.cxx index 8b03d39ef7..776915fbdb 100644 --- a/src/STEPControl/STEPControl_Controller.cxx +++ b/src/STEPControl/STEPControl_Controller.cxx @@ -15,8 +15,8 @@ // gka 05.04.99 S4136: parameters definitions changed #include #include -#include -#include +#include +#include //#include #include @@ -280,14 +280,14 @@ STEPControl_Controller::STEPControl_Controller () // ActorRead : on ajoute le cas Shape possible, a part du default // ainsi, on l a tjrs sous la main - Handle(IFSelect_Option) optacrd = Profile()->Option("tr-read"); + Handle(MoniTool_Option) optacrd = Profile()->Option("tr-read"); optacrd->Add ("shape",theAdaptorRead); // ActorWrite : on ajoute les cas possibles (NB : shape == default) // On garde a part les cas shape compound (= shape traitee globale ou en // assembly), peuvent etre utiles. Tandis que les autres cas sont // susceptibles d etre remplaces si on fait du Model-Editor - Handle(IFSelect_Option) optacwr = Profile()->Option("tr-write"); + Handle(MoniTool_Option) optacwr = Profile()->Option("tr-write"); Handle(STEPControl_ActorWrite) ActWSh = new STEPControl_ActorWrite; ActWSh->SetGroupMode(0); optacwr->Add ("shape",ActWSh); diff --git a/src/STEPEdit/STEPEdit.cxx b/src/STEPEdit/STEPEdit.cxx index 24423ab0dd..ca96f233bf 100644 --- a/src/STEPEdit/STEPEdit.cxx +++ b/src/STEPEdit/STEPEdit.cxx @@ -12,9 +12,9 @@ // commercial license or contractual agreement. #include -//#include + #include -//#include +#include #include diff --git a/src/STEPEdit/STEPEdit_EditContext.cxx b/src/STEPEdit/STEPEdit_EditContext.cxx index 4ef1b917bd..a7e2bc580d 100644 --- a/src/STEPEdit/STEPEdit_EditContext.cxx +++ b/src/STEPEdit/STEPEdit_EditContext.cxx @@ -17,7 +17,7 @@ #include #include - +#include STEPEdit_EditContext::STEPEdit_EditContext () : IFSelect_Editor (5) diff --git a/src/Select3D/Select3D_EntitySequence.hxx b/src/Select3D/Select3D_EntitySequence.hxx index d1a22802a1..c0cc00e8b9 100644 --- a/src/Select3D/Select3D_EntitySequence.hxx +++ b/src/Select3D/Select3D_EntitySequence.hxx @@ -3,7 +3,7 @@ #include - +class Select3D_SensitiveEntity; typedef NCollection_Sequence Select3D_EntitySequence; typedef NCollection_Sequence::Iterator Select3D_EntitySequenceIter; diff --git a/src/SelectMgr/SelectMgr_BaseFrustum.hxx b/src/SelectMgr/SelectMgr_BaseFrustum.hxx index 0efa02be3b..e2e466e7d5 100644 --- a/src/SelectMgr/SelectMgr_BaseFrustum.hxx +++ b/src/SelectMgr/SelectMgr_BaseFrustum.hxx @@ -38,7 +38,7 @@ //! selection. It contains signatures of functions for detection of //! overlap by sensitive entity and initializes some data for building //! the selecting frustum -class SelectMgr_BaseFrustum +class SelectMgr_BaseFrustum : public Standard_Transient { public: @@ -137,6 +137,8 @@ public: virtual Standard_Boolean IsClipped (const Graphic3d_SequenceOfHClipPlane& thePlanes, const Standard_Real theDepth); + DEFINE_STANDARD_RTTI(SelectMgr_BaseFrustum, Standard_Transient) + protected: Standard_Real myPixelTolerance; //!< Pixel tolerance Standard_Boolean myIsOrthographic; //!< Defines if current camera is orthographic diff --git a/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx b/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx index b95ef5df64..f6fc723e9e 100644 --- a/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx +++ b/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx @@ -16,12 +16,11 @@ #ifndef _SelectMgr_IndexedMapOfOwner_HeaderFile #define _SelectMgr_IndexedMapOfOwner_HeaderFile -#include #include +#include class SelectMgr_EntityOwner; -typedef NCollection_IndexedMap SelectMgr_IndexedMapOfOwner; -typedef NCollection_Handle > Handle(SelectMgr_IndexedMapOfOwner); +typedef NCollection_Shared< NCollection_IndexedMap > SelectMgr_IndexedMapOfOwner; #endif // _SelectMgr_IndexedMapOfOwner_HeaderFile diff --git a/src/SelectMgr/SelectMgr_SelectableObject.cxx b/src/SelectMgr/SelectMgr_SelectableObject.cxx index f1515d650c..1ba3da1cfb 100644 --- a/src/SelectMgr/SelectMgr_SelectableObject.cxx +++ b/src/SelectMgr/SelectMgr_SelectableObject.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include diff --git a/src/SelectMgr/SelectMgr_Selection.cxx b/src/SelectMgr/SelectMgr_Selection.cxx index 281dfa3377..7cff2256d9 100644 --- a/src/SelectMgr/SelectMgr_Selection.cxx +++ b/src/SelectMgr/SelectMgr_Selection.cxx @@ -16,9 +16,9 @@ #include +#include #include - //================================================== // Function: SelectMgr_Selection // Purpose : diff --git a/src/SelectMgr/SelectMgr_SelectionManager.cxx b/src/SelectMgr/SelectMgr_SelectionManager.cxx index efde3c025c..1138f572bf 100644 --- a/src/SelectMgr/SelectMgr_SelectionManager.cxx +++ b/src/SelectMgr/SelectMgr_SelectionManager.cxx @@ -522,7 +522,7 @@ void SelectMgr_SelectionManager::ClearSelectionStructures (const Handle(SelectMg if (!theObj->HasOwnPresentations()) return; - if (theSelector == NULL) + if (theSelector.IsNull()) { if (!(myGlobal.Contains (theObj) || myLocal.IsBound(theObj))) return; @@ -582,7 +582,7 @@ void SelectMgr_SelectionManager::RestoreSelectionStructures (const Handle(Select if (!theObj->HasOwnPresentations()) return; - if (theSelector == NULL) + if (theSelector.IsNull()) { if (!(myGlobal.Contains (theObj) || myLocal.IsBound(theObj))) return; @@ -632,7 +632,7 @@ void SelectMgr_SelectionManager::RestoreSelectionStructures (const Handle(Select //======================================================================= void SelectMgr_SelectionManager::rebuildSelectionStructures (const Handle(SelectMgr_ViewerSelector)& theSelector) { - if (theSelector == NULL) + if (theSelector.IsNull()) { Handle(SelectMgr_ViewerSelector) aSelector; for(TColStd_MapIteratorOfMapOfTransient aSelectorsIter (mySelectors); aSelectorsIter.More(); aSelectorsIter.Next()) @@ -840,7 +840,7 @@ void SelectMgr_SelectionManager::loadMode (const Handle(SelectMgr_SelectableObje { Handle(SelectMgr_Selection) aNewSel = new SelectMgr_Selection (theMode); theObject->AddSelection (aNewSel, theMode); - if (theSelector == NULL) + if (theSelector.IsNull()) { if (myGlobal.Contains (theObject)) { diff --git a/src/SelectMgr/SelectMgr_TriangularFrustum.hxx b/src/SelectMgr/SelectMgr_TriangularFrustum.hxx index a94fc7ec04..7dbc48b3cb 100644 --- a/src/SelectMgr/SelectMgr_TriangularFrustum.hxx +++ b/src/SelectMgr/SelectMgr_TriangularFrustum.hxx @@ -81,6 +81,8 @@ public: //! Nullifies the handle to corresponding builder instance to prevent memory leaks void Clear(); + + DEFINE_STANDARD_RTTI(SelectMgr_TriangularFrustum,Standard_Transient) }; #endif // _SelectMgr_TriangularFrustum_HeaderFile diff --git a/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx b/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx index 2ee203bfb4..d0b410435b 100644 --- a/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx +++ b/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx @@ -30,11 +30,6 @@ // ======================================================================= void SelectMgr_TriangularFrustumSet::Build (const TColgp_Array1OfPnt2d& thePoints) { - for (SelectMgr_TriangFrustumsIter anIter (myFrustums); anIter.More(); anIter.Next()) - { - SelectMgr_HTriangularFrustum& aFrust = anIter.ChangeValue(); - aFrust.Nullify(); - } myFrustums.Clear(); Handle(NCollection_IncAllocator) anAllocator = new NCollection_IncAllocator (MEMORY_BLOCK_SIZE); @@ -91,7 +86,7 @@ void SelectMgr_TriangularFrustumSet::Build (const TColgp_Array1OfPnt2d& thePoint aPts[aVertIdx] = aVertex.Coord(); } - SelectMgr_HTriangularFrustum aTrFrustum = new SelectMgr_TriangularFrustum(); + Handle(SelectMgr_TriangularFrustum) aTrFrustum = new SelectMgr_TriangularFrustum(); aTrFrustum->SetBuilder (myBuilder); aTrFrustum->Build (aPts[0], aPts[1], aPts[2]); myFrustums.Append (aTrFrustum); @@ -112,7 +107,7 @@ NCollection_Handle SelectMgr_TriangularFrustumSet::Transf for (SelectMgr_TriangFrustumsIter anIter (myFrustums); anIter.More(); anIter.Next()) { - aRes->myFrustums.Append (NCollection_Handle::DownCast (anIter.Value()->Transform (theTrsf))); + aRes->myFrustums.Append (Handle(SelectMgr_TriangularFrustum)::DownCast (anIter.Value()->Transform (theTrsf))); } return NCollection_Handle (aRes); diff --git a/src/SelectMgr/SelectMgr_TriangularFrustumSet.hxx b/src/SelectMgr/SelectMgr_TriangularFrustumSet.hxx index 8003d4f140..7918ac477e 100644 --- a/src/SelectMgr/SelectMgr_TriangularFrustumSet.hxx +++ b/src/SelectMgr/SelectMgr_TriangularFrustumSet.hxx @@ -22,9 +22,8 @@ #include #include -typedef NCollection_Handle SelectMgr_HTriangularFrustum; -typedef NCollection_List SelectMgr_TriangFrustums; -typedef NCollection_List::Iterator SelectMgr_TriangFrustumsIter; +typedef NCollection_List SelectMgr_TriangFrustums; +typedef NCollection_List::Iterator SelectMgr_TriangFrustumsIter; //! This class is used to handle polyline selection. The main principle of polyline selection //! algorithm is to split the polygon defined by polyline onto triangles. Than each of diff --git a/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx b/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx index 3807ecf4d1..54bb54e20d 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx @@ -765,7 +765,7 @@ static gp_XYZ GetAnyNormal ( gp_XYZ orig ) //purpose : //======================================================================= static void AppendControlPoles (TColgp_SequenceOfPnt& seq, - const Handle(Geom_Curve) curve) + const Handle(Geom_Curve)& curve) { if ( curve->IsKind(STANDARD_TYPE(Geom_Line))) { seq.Append(curve->Value(0)); diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx index 9f0ca22b4b..ca37e7d9db 100644 --- a/src/ShapeFix/ShapeFix_Wire.cxx +++ b/src/ShapeFix/ShapeFix_Wire.cxx @@ -1940,8 +1940,7 @@ static Standard_Boolean RemoveLoop (TopoDS_Edge &E, const TopoDS_Face &face, Seq2d->Append(t1); Seq2d->Append(t2); Seq2d->Append((t1+t2)/2); - Handle(TColStd_HSequenceOfReal) Seq3d = new TColStd_HSequenceOfReal; - Seq3d->Append(SFTP.Perform(Seq2d,Standard_False)); + Handle(TColStd_HSequenceOfReal) Seq3d = SFTP.Perform(Seq2d,Standard_False); Standard_Real dist1 = pcurPnt.Distance(crv->Value(Seq3d->Value(1)));// correting Seq3d already project Standard_Real dist2 = pcurPnt.Distance(crv->Value(Seq3d->Value(2))); @@ -2073,8 +2072,7 @@ static Standard_Boolean RemoveLoop (TopoDS_Edge &E, const TopoDS_Face &face, Seq2d->Append(t1); Seq2d->Append(t2); Seq2d->Append((t1+t2)/2); - Handle (TColStd_HSequenceOfReal) Seq3d = new TColStd_HSequenceOfReal; - Seq3d->Append(SFTP.Perform(Seq2d,Standard_False)); + Handle (TColStd_HSequenceOfReal) Seq3d = SFTP.Perform(Seq2d,Standard_False); Standard_Real dist1 = pcurPnt.Distance(crv->Value(Seq3d->Value(1)));// correting Seq3d already project Standard_Real dist2 = pcurPnt.Distance(crv->Value(Seq3d->Value(2))); diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.cxx index 80a135ae87..f6feb2f427 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.cxx @@ -17,6 +17,7 @@ #include #include #include +#include //======================================================================= //function : ShapeUpgrade_ShapeDivideAngle diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.cxx index df1cb8e747..2d29dc40a5 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.cxx @@ -16,6 +16,7 @@ #include #include +#include //======================================================================= //function : ShapeUpgrade_ShapeDivideClosed diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.cxx index 43ccc39276..4f18150b3d 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.cxx @@ -17,6 +17,7 @@ #include #include #include +#include //======================================================================= //function : ShapeUpgrade_ShapeDivideClosedEdges diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx index a10ee5d9fe..49102b86dd 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx @@ -23,6 +23,7 @@ #include #include +#include //======================================================================= //function : ShapeUpgrade_ShellSewing diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx index f1d6169627..846858578e 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx @@ -57,7 +57,7 @@ ShapeUpgrade_SplitCurve::ShapeUpgrade_SplitCurve() : myStatus(0) //purpose : //======================================================================= - void ShapeUpgrade_SplitCurve::SetSplitValues (const Handle(TColStd_HSequenceOfReal& SplitValues)) + void ShapeUpgrade_SplitCurve::SetSplitValues (const Handle(TColStd_HSequenceOfReal)& SplitValues) { Standard_Real precision = Precision::PConfusion(); if(SplitValues.IsNull()) return; diff --git a/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx b/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx index 45d3d335a7..8efb768b14 100644 --- a/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx +++ b/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx @@ -32,7 +32,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/src/StdPrs/StdPrs_WFRestrictedFace.cxx b/src/StdPrs/StdPrs_WFRestrictedFace.cxx index f84c611987..aef9d1bbd5 100755 --- a/src/StdPrs/StdPrs_WFRestrictedFace.cxx +++ b/src/StdPrs/StdPrs_WFRestrictedFace.cxx @@ -20,7 +20,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/src/StepAP209/StepAP209_Construct.cxx b/src/StepAP209/StepAP209_Construct.cxx index 31c814127b..ab53b73cf1 100644 --- a/src/StepAP209/StepAP209_Construct.cxx +++ b/src/StepAP209/StepAP209_Construct.cxx @@ -60,6 +60,7 @@ #include #include #include +#include #include #include diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx index 7a2073cad1..b9b9fdcb38 100644 --- a/src/StepAP214/StepAP214_Protocol.cxx +++ b/src/StepAP214/StepAP214_Protocol.cxx @@ -21,6 +21,8 @@ static Standard_CString schemaAP214DIS = "AUTOMOTIVE_DESIGN { 1 2 10303 214 0 1 static Standard_CString schemaAP214IS = "AUTOMOTIVE_DESIGN { 1 0 10303 214 1 1 1 1 }"; static Standard_CString schemaAP203 = "CONFIG_CONTROL_DESIGN"; +#include + #include #include #include diff --git a/src/StepData/StepData_DefaultGeneral.cxx b/src/StepData/StepData_DefaultGeneral.cxx index f6340cfb9a..b2e3c60069 100644 --- a/src/StepData/StepData_DefaultGeneral.cxx +++ b/src/StepData/StepData_DefaultGeneral.cxx @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/src/StepToTopoDS/StepToTopoDS_PointPairHasher.cxx b/src/StepToTopoDS/StepToTopoDS_PointPairHasher.cxx index 63451b8fda..0de4d3789f 100644 --- a/src/StepToTopoDS/StepToTopoDS_PointPairHasher.cxx +++ b/src/StepToTopoDS/StepToTopoDS_PointPairHasher.cxx @@ -16,6 +16,8 @@ #include +#include + //======================================================================= //function : HashCode //purpose : diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx index 688318e466..a7e2980a7a 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx index ff61f1f137..5cbe05c928 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx @@ -36,10 +36,10 @@ #include #include #include +#include #include #include #include -//#include #include #include #include diff --git a/src/Storage/Storage_ArrayOfSchema.hxx b/src/Storage/Storage_ArrayOfSchema.hxx index 82f900e827..9661a515de 100644 --- a/src/Storage/Storage_ArrayOfSchema.hxx +++ b/src/Storage/Storage_ArrayOfSchema.hxx @@ -17,9 +17,9 @@ #ifndef Storage_ArrayOfSchema_HeaderFile #define Storage_ArrayOfSchema_HeaderFile -#include #include +class Storage_Schema; typedef NCollection_Array1 Storage_ArrayOfSchema; diff --git a/src/TDF/TDF_AttributeIndexedMap.hxx b/src/TDF/TDF_AttributeIndexedMap.hxx index a8974f1e86..3f785b6dfb 100644 --- a/src/TDF/TDF_AttributeIndexedMap.hxx +++ b/src/TDF/TDF_AttributeIndexedMap.hxx @@ -19,6 +19,7 @@ #include #include +class TDF_Attribute; typedef NCollection_IndexedMap TDF_AttributeIndexedMap; diff --git a/src/TDF/TDF_Label.lxx b/src/TDF/TDF_Label.lxx index 43747a5b51..befb84940b 100644 --- a/src/TDF/TDF_Label.lxx +++ b/src/TDF/TDF_Label.lxx @@ -21,6 +21,7 @@ #include #include +#include inline TDF_Label::TDF_Label() :myLabelNode(NULL) diff --git a/src/TDocStd/TDocStd_ApplicationDelta.cxx b/src/TDocStd/TDocStd_ApplicationDelta.cxx index d0fc691a55..da50f63940 100644 --- a/src/TDocStd/TDocStd_ApplicationDelta.cxx +++ b/src/TDocStd/TDocStd_ApplicationDelta.cxx @@ -37,7 +37,7 @@ void TDocStd_ApplicationDelta::Dump(Standard_OStream& anOS) const { Standard_Integer i; for (i = 1; i <= myDocuments.Length(); i++) { Handle(TDocStd_Document) aDocAddr= myDocuments.Value(i); - anOS << "\"" << ((Standard_Transient*)aDocAddr); + anOS << "\"" << aDocAddr.get(); anOS << "\" "; } anOS << ") "; diff --git a/src/TDocStd/TDocStd_Document.cxx b/src/TDocStd/TDocStd_Document.cxx index 720da3c7f5..b5478dd19d 100644 --- a/src/TDocStd/TDocStd_Document.cxx +++ b/src/TDocStd/TDocStd_Document.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/src/TDocStd/TDocStd_MultiTransactionManager.cxx b/src/TDocStd/TDocStd_MultiTransactionManager.cxx index 4c4ea8b603..6eb249f4d5 100644 --- a/src/TDocStd/TDocStd_MultiTransactionManager.cxx +++ b/src/TDocStd/TDocStd_MultiTransactionManager.cxx @@ -193,7 +193,7 @@ void TDocStd_MultiTransactionManager::DumpTransaction(Standard_OStream& anOS) co anOS << "There are " << myDocuments.Length() << " documents ( "; for(i = 1; i <= myDocuments.Length(); i++) { Handle(Standard_Transient) aDoc = myDocuments.Value(i); - anOS << "\"" << (Standard_Transient*)aDoc; + anOS << "\"" << aDoc.get(); anOS << "\" "; } anOS << ") in the manager " << endl; diff --git a/src/TObj/FILES b/src/TObj/FILES index 16b08d74eb..c8dee17609 100755 --- a/src/TObj/FILES +++ b/src/TObj/FILES @@ -1,5 +1,3 @@ -Handle_TObj_Model.hxx -Handle_TObj_Object.hxx TObj_Application.cxx TObj_Application.hxx TObj_Assistant.cxx diff --git a/src/TObj/Handle_TObj_Model.hxx b/src/TObj/Handle_TObj_Model.hxx deleted file mode 100644 index 4125b1e10f..0000000000 --- a/src/TObj/Handle_TObj_Model.hxx +++ /dev/null @@ -1,37 +0,0 @@ -// Created on: 2004-11-22 -// Created by: Pavel TELKOV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -// The original implementation Copyright: (C) RINA S.p.A - -#ifndef Handle_TObj_Model_HeaderFile -#define Handle_TObj_Model_HeaderFile - -#include - -//! -//! Definition of the handle of TObj_Model -//! to decrease dependances -//! - -class TObj_Model; - -//! Define handle class for TObj_Model -DEFINE_STANDARD_HANDLE(TObj_Model,MMgt_TShared) - -#endif - -#ifdef _MSC_VER -#pragma once -#endif diff --git a/src/TObj/Handle_TObj_Object.hxx b/src/TObj/Handle_TObj_Object.hxx deleted file mode 100644 index e4756b02d3..0000000000 --- a/src/TObj/Handle_TObj_Object.hxx +++ /dev/null @@ -1,37 +0,0 @@ -// Created on: 2004-11-22 -// Created by: Pavel TELKOV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -// The original implementation Copyright: (C) RINA S.p.A - -#ifndef Handle_TObj_Object_HeaderFile -#define Handle_TObj_Object_HeaderFile - -#include - -//! -//! Definition of the handle of TObj_Object -//! to decrease dependances -//! - -class TObj_Object; - -//! Define handle class for TObj_Object -DEFINE_STANDARD_HANDLE(TObj_Object,MMgt_TShared) - -#endif - -#ifdef _MSC_VER -#pragma once -#endif diff --git a/src/TObj/TObj_Assistant.hxx b/src/TObj/TObj_Assistant.hxx index 58a907178b..982a6377a6 100644 --- a/src/TObj/TObj_Assistant.hxx +++ b/src/TObj/TObj_Assistant.hxx @@ -23,6 +23,7 @@ #include #include +class TObj_Model; //! This class provides interface to the static data //! to be used during save or load models. diff --git a/src/TObj/TObj_Model.hxx b/src/TObj/TObj_Model.hxx index 0a84d38e79..1521718a9f 100644 --- a/src/TObj/TObj_Model.hxx +++ b/src/TObj/TObj_Model.hxx @@ -18,12 +18,19 @@ #ifndef TObj_Model_HeaderFile #define TObj_Model_HeaderFile - #include #include #include +class TObj_TNameContainer; +class TObj_Partition; +class TCollection_HExtendedString; +class TDocStd_Document; +class TObj_CheckModel; +class TObj_Application; +class TObj_Model; +DEFINE_STANDARD_HANDLE(TObj_Model,MMgt_TShared) /** * Base class for OCAF based models. diff --git a/src/TObj/TObj_Object.hxx b/src/TObj/TObj_Object.hxx index faa07f74ef..998b5b3eba 100644 --- a/src/TObj/TObj_Object.hxx +++ b/src/TObj/TObj_Object.hxx @@ -25,8 +25,17 @@ #include #include +class TObj_Model; class TObj_Persistence; +class TObj_ObjectIterator; +class TObj_TNameContainer; +class TCollection_HExtendedString; +class TColStd_HArray1OfInteger; +class TColStd_HArray1OfReal; +class TColStd_HArray1OfExtendedString; +class TObj_Object; +DEFINE_STANDARD_HANDLE(TObj_Object,MMgt_TShared) //! Basis class for transient objects in OCAF-based models diff --git a/src/TObj/TObj_ObjectIterator.hxx b/src/TObj/TObj_ObjectIterator.hxx index 6add161ad7..9263ca6295 100644 --- a/src/TObj/TObj_ObjectIterator.hxx +++ b/src/TObj/TObj_ObjectIterator.hxx @@ -20,6 +20,7 @@ #include +class TObj_Object; /** * This class provides an iterator by objects in a partition. diff --git a/src/TObj/TObj_SequenceOfObject.hxx b/src/TObj/TObj_SequenceOfObject.hxx index cb4a039d63..56cfc97aa8 100644 --- a/src/TObj/TObj_SequenceOfObject.hxx +++ b/src/TObj/TObj_SequenceOfObject.hxx @@ -23,6 +23,7 @@ #include +class TObj_Object; typedef NCollection_Sequence TObj_SequenceOfObject; DEFINE_HSEQUENCE (TObj_HSequenceOfObject, TObj_SequenceOfObject) diff --git a/src/TObj/TObj_TModel.hxx b/src/TObj/TObj_TModel.hxx index eadfaa770b..c4b921afd6 100644 --- a/src/TObj/TObj_TModel.hxx +++ b/src/TObj/TObj_TModel.hxx @@ -20,6 +20,8 @@ #include +class TObj_Model; +class TObj_TModel; /** * Attribute to store OCAF-based models in OCAF tree diff --git a/src/TObj/TObj_TNameContainer.hxx b/src/TObj/TObj_TNameContainer.hxx index e3e861e19b..7078ce41de 100644 --- a/src/TObj/TObj_TNameContainer.hxx +++ b/src/TObj/TObj_TNameContainer.hxx @@ -22,6 +22,7 @@ #include #include +class TObj_TNameContainer; /** * This class provides OCAF Attribute to storing the unique names of object in diff --git a/src/TObj/TObj_TReference.hxx b/src/TObj/TObj_TReference.hxx index aa0c5fa8c0..d3d01459d9 100644 --- a/src/TObj/TObj_TReference.hxx +++ b/src/TObj/TObj_TReference.hxx @@ -22,6 +22,7 @@ #include #include +class TObj_Object; class Standard_GUID; /** diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx index 7e18230175..277b2f44cc 100644 --- a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx +++ b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx @@ -325,7 +325,7 @@ TestTopOpeDraw_C3DDisplayer::TestTopOpeDraw_C3DDisplayer() //purpose : //======================================================================= -TestTopOpeDraw_C3DDisplayer::TestTopOpeDraw_C3DDisplayer(const Handle(Geom_Curve& C)) +TestTopOpeDraw_C3DDisplayer::TestTopOpeDraw_C3DDisplayer(const Handle(Geom_Curve)& C) { InitC3DDisplayer(); DisplayC3D(C); @@ -349,7 +349,7 @@ void TestTopOpeDraw_C3DDisplayer::InitC3DDisplayer() //purpose : //======================================================================= -void TestTopOpeDraw_C3DDisplayer::DisplayC3D(const Handle(Geom_Curve& C)) +void TestTopOpeDraw_C3DDisplayer::DisplayC3D(const Handle(Geom_Curve)& C) { if (C.IsNull()) return; Draw_ColorKind col = TestTopOpeDraw_TTOT::GeometryColor(TopOpeBRepDS_CURVE); @@ -377,7 +377,7 @@ TestTopOpeDraw_C2DDisplayer::TestTopOpeDraw_C2DDisplayer() //======================================================================= TestTopOpeDraw_C2DDisplayer::TestTopOpeDraw_C2DDisplayer -(const Handle(Geom2d_Curve& C)) +(const Handle(Geom2d_Curve)& C) { InitC2DDisplayer(); DisplayC2D(C); @@ -405,7 +405,7 @@ void TestTopOpeDraw_C2DDisplayer::InitC2DDisplayer() //purpose : //======================================================================= -void TestTopOpeDraw_C2DDisplayer::DisplayC2D(const Handle(Geom2d_Curve& C)) +void TestTopOpeDraw_C2DDisplayer::DisplayC2D(const Handle(Geom2d_Curve)& C) { if (C.IsNull()) return; Handle(TestTopOpeDraw_DrawableC2D) D = new TestTopOpeDraw_DrawableC2D @@ -421,7 +421,7 @@ void TestTopOpeDraw_C2DDisplayer::DisplayC2D(const Handle(Geom2d_Curve& C)) //======================================================================= void TestTopOpeDraw_C2DDisplayer::DisplayC2D -(const TCollection_AsciiString& namedbrep,const TCollection_AsciiString& namedisp,const Handle(Geom2d_Curve& C)) +(const TCollection_AsciiString& namedbrep,const TCollection_AsciiString& namedisp,const Handle(Geom2d_Curve)& C) { Handle(TestTopOpeDraw_DrawableC2D) D = new TestTopOpeDraw_DrawableC2D (C,myCol,namedisp.ToCString(),myNameColor, @@ -447,7 +447,7 @@ TestTopOpeDraw_SurfaceDisplayer::TestTopOpeDraw_SurfaceDisplayer() //======================================================================= TestTopOpeDraw_SurfaceDisplayer::TestTopOpeDraw_SurfaceDisplayer -(const Handle(Geom_Surface& S)) +(const Handle(Geom_Surface)& S) { InitSurfaceDisplayer(); DisplaySurface(S); @@ -476,7 +476,7 @@ void TestTopOpeDraw_SurfaceDisplayer::InitSurfaceDisplayer() //purpose : //======================================================================= -void TestTopOpeDraw_SurfaceDisplayer::DisplaySurface(const Handle(Geom_Surface& S)) +void TestTopOpeDraw_SurfaceDisplayer::DisplaySurface(const Handle(Geom_Surface)& S) { if (S.IsNull()) return; Handle(TestTopOpeDraw_DrawableSUR) D; diff --git a/src/TopoDS/TopoDS_Shape.lxx b/src/TopoDS/TopoDS_Shape.lxx index 7ff7a32955..3f254f4f7a 100644 --- a/src/TopoDS/TopoDS_Shape.lxx +++ b/src/TopoDS/TopoDS_Shape.lxx @@ -452,7 +452,7 @@ inline TopoDS_Shape TopoDS_Shape::EmptyCopied() const //purpose : //======================================================================= -inline void TopoDS_Shape::TShape (const Handle(TopoDS_TShape& TS)) +inline void TopoDS_Shape::TShape (const Handle(TopoDS_TShape)& TS) { myTShape = TS; } diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx index 6bc1d10424..bb7104f293 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -236,7 +236,7 @@ void TopoDSToStep_MakeStepEdge::Init(const TopoDS_Edge& aEdge, //Points.SetValue(Nbpt, BRep_Tool::Pnt(Vlast)); Mult.SetValue(1,2); Mult.SetValue(Nbpt,2); - Handle(Geom_BSplineCurve) Bs = + Handle(Geom_Curve) Bs = new Geom_BSplineCurve(Points, Knots, Mult, 1); GeomToStep_MakeCurve MkCurve(Bs); Gpms = MkCurve.Value(); diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx index a7a210c562..eeedfb9337 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx index ae41d0ee42..2418519414 100644 --- a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx +++ b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include #include @@ -298,7 +298,7 @@ Standard_Boolean TopoDSToStep_WireframeBuilder:: Points.SetValue(Nbpt, BRep_Tool::Pnt(Vlast)); Mult.SetValue(1,2); Mult.SetValue(Nbpt,2); - Handle(Geom_BSplineCurve) Bs = + Handle(Geom_Curve) Bs = new Geom_BSplineCurve(Points, Knots, Mult, 1); GeomToStep_MakeCurve gtpC(Bs); Gpms = gtpC.Value(); diff --git a/src/Transfer/Transfer_ActorOfFinderProcess.cxx b/src/Transfer/Transfer_ActorOfFinderProcess.cxx index a5e5a92455..c2f65a7a19 100644 --- a/src/Transfer/Transfer_ActorOfFinderProcess.cxx +++ b/src/Transfer/Transfer_ActorOfFinderProcess.cxx @@ -14,6 +14,7 @@ #include #include #include +#include Transfer_ActorOfFinderProcess::Transfer_ActorOfFinderProcess () { themodetrans = 0; } diff --git a/src/Transfer/Transfer_ActorOfTransientProcess.cxx b/src/Transfer/Transfer_ActorOfTransientProcess.cxx index 4ca907b14a..e7e404c678 100644 --- a/src/Transfer/Transfer_ActorOfTransientProcess.cxx +++ b/src/Transfer/Transfer_ActorOfTransientProcess.cxx @@ -13,6 +13,7 @@ #include #include +#include Transfer_ActorOfTransientProcess::Transfer_ActorOfTransientProcess () { } diff --git a/src/V3d/V3d_Plane.cxx b/src/V3d/V3d_Plane.cxx index 3c6d048301..6d454408cf 100755 --- a/src/V3d/V3d_Plane.cxx +++ b/src/V3d/V3d_Plane.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include diff --git a/src/V3d/V3d_Plane.hxx b/src/V3d/V3d_Plane.hxx index de54a9969c..40c1c74695 100755 --- a/src/V3d/V3d_Plane.hxx +++ b/src/V3d/V3d_Plane.hxx @@ -20,6 +20,7 @@ #include #include +class V3d_Plane; DEFINE_STANDARD_HANDLE (V3d_Plane, MMgt_TShared) //! Obsolete clip plane presentation class. diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx index 67b84d20eb..a0f3a6b360 100644 --- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -1927,8 +1927,6 @@ Handle(Geom_Circle) CreateCircle(gp_Pnt theCenter, Standard_Real theRadius) return aCircle; } -DEFINE_STANDARD_HANDLE(FilledCircle, AIS_InteractiveObject) - class FilledCircle : public AIS_InteractiveObject { public: @@ -3134,7 +3132,7 @@ static int VComputeHLR (Draw_Interpretor& di, // This class is a wrap for Graphic3d_ArrayOfPrimitives; it is used for // manipulating and displaying such an array with AIS context -DEFINE_STANDARD_HANDLE(MyPArrayObject, AIS_InteractiveObject) + class MyPArrayObject : public AIS_InteractiveObject { @@ -4329,7 +4327,7 @@ static Standard_Integer VSelectionPrevious(Draw_Interpretor& /*theDI*/, //purpose : creates Triangle based on AIS_InteractiveObject. // This class was implemented for testing Select3D_SensitiveTriangle //=========================================================================== -DEFINE_STANDARD_HANDLE(Triangle, AIS_InteractiveObject) + class Triangle: public AIS_InteractiveObject { public: @@ -4523,7 +4521,7 @@ static Standard_Integer VTriangle (Draw_Interpretor& /*di*/, //class : SegmentObject //purpose: creates segment based on AIS_InteractiveObject. // This class was implemented for testing Select3D_SensitiveCurve -DEFINE_STANDARD_HANDLE(SegmentObject, AIS_InteractiveObject) + class SegmentObject: public AIS_InteractiveObject { public: @@ -4902,7 +4900,7 @@ static Standard_Integer VShowFaceBoundary (Draw_Interpretor& /*di*/, } // This class is used for testing markers. -DEFINE_STANDARD_HANDLE(ViewerTest_MarkersArrayObject, AIS_InteractiveObject) + class ViewerTest_MarkersArrayObject : public AIS_InteractiveObject { diff --git a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx index 3b89902681..738ccc6465 100644 --- a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx +++ b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx @@ -52,11 +52,12 @@ extern Standard_Boolean VDisplayAISObject (const TCollection_AsciiString& theNam Standard_Boolean theReplaceIfExists = Standard_True); extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); +namespace { + //======================================================================= //function : VUserDraw //purpose : Checks availability and operation of UserDraw feature //======================================================================= -DEFINE_STANDARD_HANDLE(VUserDrawObj, AIS_InteractiveObject) class VUserDrawObj : public AIS_InteractiveObject { @@ -126,7 +127,6 @@ private: friend class Element; }; - void VUserDrawObj::Compute(const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer /*theMode*/) @@ -196,6 +196,8 @@ void VUserDrawObj::Render(const Handle(OpenGl_Workspace)& theWorkspace) const glPopAttrib(); } +} // end of anonymous namespace + OpenGl_Element* VUserDrawCallback(const CALL_DEF_USERDRAW * theUserDraw) { Handle(VUserDrawObj) anIObj = (VUserDrawObj*)theUserDraw->Data; diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 6b09f753f2..d616d20415 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -4568,8 +4568,6 @@ static int VZLayer (Draw_Interpretor& di, Standard_Integer argc, const char** ar return 0; } -DEFINE_STANDARD_HANDLE(V3d_TextItem, Visual3d_LayerItem) - // this class provides a presentation of text item in v3d view under-/overlayer class V3d_TextItem : public Visual3d_LayerItem { @@ -4640,8 +4638,6 @@ void V3d_TextItem::RedrawLayerPrs () myLayer->DrawText (myText.ToCString (), myX1, myY1, myHeight); } -DEFINE_STANDARD_HANDLE(V3d_LineItem, Visual3d_LayerItem) - // The Visual3d_LayerItem line item for "vlayerline" command // it provides a presentation of line with user-defined // linewidth, linetype and transparency. diff --git a/src/Visual3d/Visual3d_Layer.cxx b/src/Visual3d/Visual3d_Layer.cxx index e9eee74367..afa1ca8efb 100644 --- a/src/Visual3d/Visual3d_Layer.cxx +++ b/src/Visual3d/Visual3d_Layer.cxx @@ -404,12 +404,12 @@ Aspect_TypeOfLayer Visual3d_Layer::Type () const { } -void Visual3d_Layer::AddLayerItem( const Handle(Visual3d_LayerItem&) Item ) +void Visual3d_Layer::AddLayerItem( const Handle(Visual3d_LayerItem)& Item ) { MyListOfLayerItems.Append( Item ); } -void Visual3d_Layer::RemoveLayerItem( const Handle(Visual3d_LayerItem&) Item ) +void Visual3d_Layer::RemoveLayerItem( const Handle(Visual3d_LayerItem)& Item ) { if ( MyListOfLayerItems.IsEmpty() ) return; diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx index 8b1ede2276..d0c66dd40a 100644 --- a/src/Visual3d/Visual3d_View.cxx +++ b/src/Visual3d/Visual3d_View.cxx @@ -1238,7 +1238,7 @@ Standard_Boolean Visual3d_View::DisplayImmediate (const Handle(Graphic3d_Structu for (Standard_Integer aViewIter = 1; aViewIter <= aViews.Length(); ++aViewIter) { const Handle(Visual3d_View)& aView = aViews.Value (aViewIter); - if (aView.Access() != this) + if (aView != this) { aView->EraseImmediate (theStructure); } diff --git a/src/VrmlData/VrmlData_ShapeConvert.hxx b/src/VrmlData/VrmlData_ShapeConvert.hxx index cd6cda63f3..7251d6b40e 100644 --- a/src/VrmlData/VrmlData_ShapeConvert.hxx +++ b/src/VrmlData/VrmlData_ShapeConvert.hxx @@ -22,7 +22,11 @@ #include class VrmlData_Scene; +class VrmlData_Coordinate; class TopoDS_Face; +class Poly_Polygon3D; +class Poly_Triangulation; + /** * Algorithm converting one shape or a set of shapes to VrmlData_Scene. */ diff --git a/src/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx b/src/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx index 53f727e0d9..5410281017 100644 --- a/src/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx +++ b/src/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx @@ -16,9 +16,9 @@ #ifndef XCAFDoc_GraphNodeSequence_HeaderFile #define XCAFDoc_GraphNodeSequence_HeaderFile -#include #include +class XCAFDoc_GraphNode; typedef NCollection_Sequence XCAFDoc_GraphNodeSequence; diff --git a/src/XSControl/XSControl.cdl b/src/XSControl/XSControl.cdl index f9aad550c9..0bb3e94a12 100644 --- a/src/XSControl/XSControl.cdl +++ b/src/XSControl/XSControl.cdl @@ -20,7 +20,7 @@ package XSControl -- control of a session uses Standard , MMgt, TCollection , TColStd, Dico, - Interface, Transfer, IFSelect, Message, + Interface, Transfer, IFSelect, Message, MoniTool, TopoDS, TopTools, TopAbs , Geom, Geom2d, gp is diff --git a/src/XSControl/XSControl_Controller.cdl b/src/XSControl/XSControl_Controller.cdl index 516557bcdf..efc5c6d8e5 100644 --- a/src/XSControl/XSControl_Controller.cdl +++ b/src/XSControl/XSControl_Controller.cdl @@ -49,7 +49,7 @@ uses CString, AsciiString, SequenceOfTransient, SequenceOfInteger, FinderProcess from Transfer, Shape from TopoDS, WorkLibrary from IFSelect, - Profile from IFSelect, + Profile from MoniTool, WorkSession from XSControl, ReturnStatus from IFSelect @@ -90,7 +90,7 @@ is -- rsc = False (D) : True Name attached to the Norm (long name) -- rsc = True : Name of the ressource set (i.e. short name) - Profile (me) returns Profile from IFSelect; + Profile (me) returns Profile from MoniTool; ---Purpose : Returns the Profile -- It starts with a first configuration Base (empty) and the -- following options : diff --git a/src/XSControl/XSControl_Controller.cxx b/src/XSControl/XSControl_Controller.cxx index 44314eea4a..4ed0128630 100644 --- a/src/XSControl/XSControl_Controller.cxx +++ b/src/XSControl/XSControl_Controller.cxx @@ -16,13 +16,14 @@ #include #include #include -#include +#include #include #include #include #include #include +#include #include #include #include @@ -98,10 +99,10 @@ static TColStd_IndexedMapOfTransient& mapadapt() // Initialisation du Profile - theProfile = new IFSelect_Profile; + theProfile = new MoniTool_Profile; /* essai option sur parametre - Handle(IFSelect_Option) optrdprec = new IFSelect_Option + Handle(MoniTool_Option) optrdprec = new MoniTool_Option (Interface_Static::Static ("read.precision.mode"),"readprecision.mode"); optrdprec->AddBasic("default","File"); optrdprec->AddBasic("Session"); @@ -109,24 +110,24 @@ static TColStd_IndexedMapOfTransient& mapadapt() theProfile->AddOption (optrdprec); */ -// Handle(IFSelect_Option) optproto = new IFSelect_Option +// Handle(MoniTool_Option) optproto = new MoniTool_Option // (STANDARD_TYPE(Interface_Protocol),"protocol"); // theProfile->AddOption (optproto); - Handle(IFSelect_Option) optsign = new IFSelect_Option + Handle(MoniTool_Option) optsign = new MoniTool_Option (STANDARD_TYPE(IFSelect_Signature),"sign-type"); optsign->Add ("default",theSignType); theProfile->AddOption (optsign); -// Handle(IFSelect_Option) optwlib = new IFSelect_Option +// Handle(MoniTool_Option) optwlib = new MoniTool_Option // (STANDARD_TYPE(IFSelect_WorkLibrary),"access"); // theProfile->AddOption (optwlib); - Handle(IFSelect_Option) optactrd = new IFSelect_Option + Handle(MoniTool_Option) optactrd = new MoniTool_Option (STANDARD_TYPE(Transfer_ActorOfTransientProcess),"tr-read"); theProfile->AddOption (optactrd); - Handle(IFSelect_Option) optactwr = new IFSelect_Option + Handle(MoniTool_Option) optactwr = new MoniTool_Option (STANDARD_TYPE(Transfer_ActorOfFinderProcess),"tr-write"); theProfile->AddOption (optactwr); @@ -155,7 +156,7 @@ static TColStd_IndexedMapOfTransient& mapadapt() Standard_Boolean deja; Handle(Standard_Transient)& newadapt = listadapt()->NewItem (name,deja); if (deja) { - Handle(Standard_Transient) thisadapt = this; + Handle(Standard_Transient) thisadapt (this); if (newadapt->IsKind(thisadapt->DynamicType())) { } @@ -177,9 +178,9 @@ static TColStd_IndexedMapOfTransient& mapadapt() Handle(XSControl_Controller) XSControl_Controller::Recorded (const Standard_CString name) { - Handle(XSControl_Controller) recorded; + Handle(Standard_Transient) recorded; if (!listadapt()->GetItem (name,recorded)) recorded.Nullify(); - return recorded; + return Handle(XSControl_Controller)::DownCast (recorded); } Handle(TColStd_HSequenceOfHAsciiString) XSControl_Controller::ListRecorded @@ -211,7 +212,7 @@ static TColStd_IndexedMapOfTransient& mapadapt() // #### PROFILE #### - Handle(IFSelect_Profile) XSControl_Controller::Profile () const + Handle(MoniTool_Profile) XSControl_Controller::Profile () const { return theProfile; } void XSControl_Controller::DefineProfile @@ -226,11 +227,15 @@ static TColStd_IndexedMapOfTransient& mapadapt() { if (!theProfile->SetCurrent (confname)) return Standard_False; + Handle(Standard_Transient) anItem; // theProfile->Value("protocol",theAdaptorProtocol); - theProfile->Value("sign-type",theSignType); + if (theProfile->Value("sign-type",anItem)) + theSignType = Handle(IFSelect_Signature)::DownCast (anItem); // theProfile->Value("access",theAdaptorLibrary); - theProfile->Value("tr-read",theAdaptorRead); - theProfile->Value("tr-write",theAdaptorWrite); + if (theProfile->Value("tr-read",anItem)) + theAdaptorRead = Handle(Transfer_ActorOfTransientProcess)::DownCast (anItem); + if (theProfile->Value("tr-write",anItem)) + theAdaptorWrite = Handle(Transfer_ActorOfFinderProcess)::DownCast (anItem); return SettingProfile (confname); } @@ -249,21 +254,21 @@ static TColStd_IndexedMapOfTransient& mapadapt() theProfile->SetTypedValues(); // SignType - Handle(IFSelect_Signature) signtype; + Handle(Standard_Transient) signtype; theProfile->Value ("sign-type",signtype); - WS->SetSignType (signtype); + WS->SetSignType (Handle(IFSelect_Signature)::DownCast (signtype)); // ActorRead - Handle(Transfer_ActorOfTransientProcess) actrd; + Handle(Standard_Transient) actrd; theProfile->Value ("tr-read",actrd); - WS->TransferReader()->SetActor (actrd); + WS->TransferReader()->SetActor (Handle(Transfer_ActorOfTransientProcess)::DownCast (actrd)); // ActorWrite : dans le Controller meme - Handle(Transfer_ActorOfFinderProcess) actwr; + Handle(Standard_Transient) actwr; theProfile->Value ("tr-write",actwr); - theAdaptorWrite = actwr; + theAdaptorWrite = Handle (Transfer_ActorOfFinderProcess)::DownCast (actwr); return ApplyingProfile (WS,confname); } @@ -557,7 +562,7 @@ static IFSelect_ReturnStatus TransferFinder // Loading Options of the Profile // Available Signatures - Handle(IFSelect_Option) optsign = theProfile->Option ("sign-type"); + Handle(MoniTool_Option) optsign = theProfile->Option ("sign-type"); // Handle(TColStd_HSequenceOfHAsciiString) signs = // WS->ItemNames (STANDARD_TYPE(IFSelect_Signature)); // Standard_Integer isign, nbsign = (signs.IsNull() ? 0 : signs->Length()); @@ -570,12 +575,12 @@ static IFSelect_ReturnStatus TransferFinder optsign->Switch ("default"); // garder courante la definition par defaut ! // Actor Read - Handle(IFSelect_Option) optacrd = theProfile->Option ("tr-read"); + Handle(MoniTool_Option) optacrd = theProfile->Option ("tr-read"); optacrd->Add ("default",theAdaptorRead); optacrd->Switch ("default"); // Actor Write - Handle(IFSelect_Option) optacwr = theProfile->Option ("tr-write"); + Handle(MoniTool_Option) optacwr = theProfile->Option ("tr-write"); optacwr->Add ("default",theAdaptorWrite); optacwr->Switch ("default"); diff --git a/src/XSControl/XSControl_Functions.cxx b/src/XSControl/XSControl_Functions.cxx index 1cbb5f9795..727bf053cb 100644 --- a/src/XSControl/XSControl_Functions.cxx +++ b/src/XSControl/XSControl_Functions.cxx @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -150,7 +150,7 @@ static IFSelect_ReturnStatus XSControl_xprofile(const Handle(IFSelect_SessionPil Handle(XSControl_WorkSession) WS = XSControl::Session(pilot); Handle(XSControl_Controller) control = WS->NormAdaptor(); if (control.IsNull()) return IFSelect_RetFail; - Handle(IFSelect_Profile) prof = control->Profile(); + Handle(MoniTool_Profile) prof = control->Profile(); Handle(Message_Messenger) sout = Message::DefaultMessenger(); sout<<"Current Profile : "<Current().ToCString()<NormAdaptor(); if (control.IsNull()) return IFSelect_RetFail; - Handle(IFSelect_Profile) prof = control->Profile(); + Handle(MoniTool_Profile) prof = control->Profile(); Handle(Message_Messenger) sout = Message::DefaultMessenger(); sout<<"Current Profile : "<Current().ToCString()<Value(iopt); - Handle(IFSelect_Option) opt = prof->Option (optname.ToCString()); + Handle(MoniTool_Option) opt = prof->Option (optname.ToCString()); sout<CaseName()<Option (arg1); + Handle(MoniTool_Option) opt = prof->Option (arg1); if (opt.IsNull()) { sout<<"Not a recorded Option : "<Value(ial); if (!tv.IsNull()) { // TypedValue : on peut afficher la valeur - Handle(TCollection_HAsciiString) str; + Handle(Standard_Transient) str; opt->Item (acase.ToCString(),str); - if (!str.IsNull()) sout<<" - Value:"<ToCString(); + if (!str.IsNull()) sout<<" - Value:"<< Handle(TCollection_HAsciiString)::DownCast(str)->ToCString(); } sout<AddOption (opt); return IFSelect_RetDone; } // xoption optname + case [val] if (argc >= 4 && arg2[0] == '+' && arg2[1] == '\0') { - Handle(IFSelect_Option) opt = prof->Option (arg1); + Handle(MoniTool_Option) opt = prof->Option (arg1); if (opt.IsNull()) { sout<<"Not a recorded Option : "<TypedValue(); if (tv.IsNull()) { sout<<"Option not for a Parameter : "<Option (arg1); + Handle(MoniTool_Option) opt = prof->Option (arg1); if (opt.IsNull()) { sout<<"Not a recorded Option : "<Switch (arg2)) { sout<<"Option : "< #include #include +#include #include #include #include diff --git a/src/XSControl/XSControl_WorkSession.cxx b/src/XSControl/XSControl_WorkSession.cxx index 5bf025adf7..b36c43cf8c 100644 --- a/src/XSControl/XSControl_WorkSession.cxx +++ b/src/XSControl/XSControl_WorkSession.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx index 084d4c5dcb..5b427b8eec 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx @@ -173,7 +173,7 @@ TCollection_ExtendedString XmlLDrivers_DocumentRetrievalDriver::SchemaName() con //purpose : pure virtual method definition //======================================================================= void XmlLDrivers_DocumentRetrievalDriver::Make (const Handle(PCDM_Document)&, - const Handle(CDM_Document&)) + const Handle(CDM_Document)&) { } diff --git a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx index 0cd7dae501..f561ddfda8 100644 --- a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx +++ b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx @@ -61,7 +61,7 @@ IMPLEMENT_DOMSTRING (EvolReplaceString, "replace") //======================================================================= XmlMNaming_NamedShapeDriver::XmlMNaming_NamedShapeDriver - (const Handle(CDM_MessageDriver&) theMessageDriver) + (const Handle(CDM_MessageDriver)& theMessageDriver) : XmlMDF_ADriver (theMessageDriver, NULL), myShapeSet (Standard_False) // triangles mode {} diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx index b8ce4e6c86..bdff10f1f0 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx @@ -19,11 +19,6 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (XmlTObjDrivers_DocumentRetrievalDriver, - XmlLDrivers_DocumentRetrievalDriver) -IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_DocumentRetrievalDriver, - XmlLDrivers_DocumentRetrievalDriver) - //======================================================================= //function : XmlTObjDrivers_DocumentRetrievalDriver //purpose : diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx index 7446b843e1..f4dc39ed6c 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx @@ -19,11 +19,6 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (XmlTObjDrivers_DocumentStorageDriver, - XmlLDrivers_DocumentStorageDriver) -IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_DocumentStorageDriver, - XmlLDrivers_DocumentStorageDriver) - //======================================================================= //function : XmlTObjDrivers_DocumentStorageDriver //purpose :