From 857ffd5e57f198ef3d238b16913a8f5a385258b2 Mon Sep 17 00:00:00 2001 From: abv Date: Wed, 9 Apr 2014 18:48:28 +0400 Subject: [PATCH] 0024814: Avoid using explicit names of Handle classes Sources corrected replacing Handle_XXX by Handle(XXX) --- src/AIS/AIS_AttributeFilter.cxx | 2 +- src/AIS/AIS_Axis.cxx | 4 +- src/AIS/AIS_Chamf2dDimension.cxx | 4 +- src/AIS/AIS_Chamf3dDimension.cxx | 4 +- src/AIS/AIS_Circle.cxx | 8 +- src/AIS/AIS_ConcentricRelation.cxx | 4 +- src/AIS/AIS_ConnectedInteractive.cxx | 12 +-- src/AIS/AIS_Drawer.cxx | 2 +- src/AIS/AIS_EqualRadiusRelation.cxx | 8 +- src/AIS/AIS_FixRelation.cxx | 8 +- src/AIS/AIS_IdenticRelation.cxx | 4 +- src/AIS/AIS_InteractiveContext.cxx | 6 +- src/AIS/AIS_InteractiveContext.lxx | 2 +- src/AIS/AIS_Line.cxx | 4 +- src/AIS/AIS_MaxRadiusDimension.cxx | 8 +- src/AIS/AIS_MidPointRelation.cxx | 8 +- src/AIS/AIS_MinRadiusDimension.cxx | 8 +- src/AIS/AIS_MultipleConnectedInteractive.cxx | 14 +-- src/AIS/AIS_MultipleConnectedShape.cxx | 4 +- src/AIS/AIS_ParallelRelation.cxx | 4 +- src/AIS/AIS_PerpendicularRelation.cxx | 4 +- src/AIS/AIS_Plane.cxx | 2 +- src/AIS/AIS_PlaneTrihedron.cxx | 4 +- src/AIS/AIS_Point.cxx | 8 +- src/AIS/AIS_SymmetricRelation.cxx | 8 +- src/AIS/AIS_TangentRelation.cxx | 8 +- src/AIS/AIS_Trihedron.cxx | 8 +- src/AIS/AIS_TypeFilter.cxx | 2 +- src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx | 4 +- src/AdvApprox/AdvApprox_ApproxAFunction.cxx | 12 +-- src/AppDef/AppDef_MultiPointConstraint.cxx | 8 +- src/AppParCurves/AppParCurves_MultiPoint.cxx | 4 +- src/BOPAlgo/BOPAlgo_Builder_2.cxx | 4 +- src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx | 6 +- src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx | 4 +- src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx | 4 +- src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx | 4 +- src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx | 4 +- src/BOPCol/BOPCol_BaseAllocator.hxx | 2 +- src/BOPCol/BOPCol_NCVector.hxx | 2 +- src/BOPDS/BOPDS_Curve.lxx | 2 +- src/BRep/BRep_CurveOn2Surfaces.cxx | 4 +- src/BRep/BRep_CurveRepresentation.cxx | 4 +- src/BRepAdaptor/BRepAdaptor_Curve.cxx | 4 +- src/BRepApprox/BRepApprox_SurfaceTool.lxx | 4 +- src/BRepBlend/BRepBlend_Extremity.lxx | 2 +- src/BRepBlend/BRepBlend_PointOnRst.lxx | 2 +- src/BRepExtrema/BRepExtrema_ExtCC.hxx | 2 +- src/BRepExtrema/BRepExtrema_ExtCF.hxx | 2 +- src/BRepExtrema/BRepExtrema_ExtFF.hxx | 2 +- src/BRepExtrema/BRepExtrema_ExtPC.hxx | 2 +- src/BRepFill/BRepFill_ApproxSeewing.cxx | 6 +- src/BRepMesh/BRepMesh_BaseAllocator.hxx | 2 +- src/BRepOffset/BRepOffset_Tool.cxx | 6 +- src/BRepTest/BRepTest_MatCommands.cxx | 4 +- src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx | 8 +- .../BinLDrivers_DocumentStorageDriver.cxx | 2 +- src/Bisector/Bisector_BisecAna.cxx | 2 +- src/Bisector/Bisector_BisecPC.cxx | 2 +- src/Bnd/Bnd_BoundSortBox2d.cxx | 2 +- src/ChFi3d/ChFi3d_Builder_0.cxx | 2 +- src/ChFiDS/ChFiDS_Stripe.cxx | 2 +- src/ChFiKPart/ChFiKPart_ComputeData.cxx | 4 +- src/Contap/Contap_Contour.cxx | 2 +- src/Contap/Contap_HContTool.cxx | 6 +- src/Contap/Contap_Point.lxx | 4 +- src/Contap/Contap_SurfFunction.lxx | 2 +- src/Convert/Convert_CompPolynomialToPoles.cxx | 14 +-- src/DBC/DBC_BaseArray.cxx | 2 +- src/DBC/DBC_DBVArray.hxx | 2 +- src/Draft/Draft_EdgeInfo.cxx | 4 +- src/Dynamic/Dynamic_DynamicInstance.cxx | 4 +- src/Dynamic/Dynamic_FuzzyClass.cxx | 10 +- src/Dynamic/Dynamic_FuzzyInstance.gxx | 2 +- .../Dynamic_MethodDefinitionsDictionary.cxx | 2 +- src/Expr/Expr_BinaryExpression.cxx | 2 +- src/Extrema/Extrema_GenExtPS.cxx | 2 +- src/FilletSurf/FilletSurf_InternalBuilder.cxx | 6 +- src/Geom2dAPI/Geom2dAPI_Interpolate.cxx | 12 +-- src/Geom2dAPI/Geom2dAPI_PointsToBSpline.cxx | 2 +- src/Geom2dLProp/Geom2dLProp_Curve2dTool.cxx | 14 +-- src/GeomAPI/GeomAPI_Interpolate.cxx | 12 +-- src/GeomAPI/GeomAPI_PointsToBSpline.cxx | 2 +- .../GeomAPI_PointsToBSplineSurface.cxx | 2 +- src/GeomFill/GeomFill_BoundWithSurf.cxx | 2 +- src/GeomFill/GeomFill_ConstrainedFilling.cxx | 8 +- src/GeomFill/GeomFill_CoonsAlgPatch.cxx | 4 +- src/GeomFill/GeomFill_NSections.cxx | 2 +- src/GeomFill/GeomFill_SectionGenerator.cxx | 2 +- src/GeomFill/GeomFill_SimpleBound.cxx | 2 +- src/GeomLProp/GeomLProp_CurveTool.cxx | 14 +-- src/GeomLProp/GeomLProp_SurfaceTool.cxx | 12 +-- src/GeomLib/GeomLib.cxx | 2 +- src/GeomPlate/GeomPlate_BuildPlateSurface.cxx | 12 +-- src/GeomPlate/GeomPlate_CurveConstraint.cxx | 6 +- .../GeometryTest_ConstraintCommands.cxx | 6 +- .../GeometryTest_CurveCommands.cxx | 2 +- src/HLRBRep/HLRBRep_BSurfaceTool.lxx | 4 +- src/HLRBRep/HLRBRep_SurfaceTool.lxx | 4 +- src/IFSelect/IFSelect_WorkSession.cxx | 2 +- src/IntPatch/IntPatch_ALineToWLine.cxx | 6 +- src/IntPatch/IntPatch_CSFunction.cxx | 4 +- src/IntPatch/IntPatch_HInterTool.cxx | 2 +- src/IntPatch/IntPatch_Intersection.cxx | 40 ++++---- src/IntPatch/IntPatch_PrmPrmIntersection.cxx | 6 +- src/IntSurf/IntSurf_Allocator.hxx | 2 +- src/Interface/Interface_EntityCluster.cxx | 2 +- src/Law/Law_Interpolate.cxx | 2 +- src/MAT/MAT_Arc.cxx | 2 +- src/MAT/MAT_BasicElt.cxx | 4 +- src/MAT2d/MAT2d_Circuit.cxx | 2 +- .../Materials_MaterialDefinition.cxx | 2 +- src/MeshVS/MeshVS_DeformedDataSource.cxx | 2 +- src/MoniTool/MoniTool_TransientElem.cxx | 2 +- .../NCollection_BaseCollection.hxx | 2 +- src/NCollection/NCollection_Handle.hxx | 6 +- src/NCollection/NCollection_HeapAllocator.cxx | 2 +- src/NCollection/NCollection_HeapAllocator.hxx | 4 +- src/NCollection/NCollection_StdBase.hxx | 2 +- src/NCollection/NCollection_UBTree.hxx | 2 +- src/NCollection/NCollection_UBTreeFiller.hxx | 2 +- src/NCollection/NCollection_Vector.hxx | 2 +- src/NIS/NIS_DrawList.cxx | 8 +- src/NIS/NIS_DrawList.hxx | 14 +-- src/NIS/NIS_Drawer.cxx | 20 ++-- src/NIS/NIS_Drawer.hxx | 28 +++--- src/NIS/NIS_InteractiveContext.cxx | 98 +++++++++---------- src/NIS/NIS_InteractiveContext.hxx | 60 ++++++------ src/NIS/NIS_InteractiveObject.cxx | 10 +- src/NIS/NIS_InteractiveObject.hxx | 20 ++-- src/NIS/NIS_ObjectsIterator.cxx | 2 +- src/NIS/NIS_ObjectsIterator.hxx | 10 +- src/NIS/NIS_SelectFilter.cxx | 2 +- src/NIS/NIS_SelectFilter.hxx | 4 +- src/NIS/NIS_Surface.cxx | 16 +-- src/NIS/NIS_Surface.hxx | 16 +-- src/NIS/NIS_SurfaceDrawer.cxx | 8 +- src/NIS/NIS_SurfaceDrawer.hxx | 8 +- src/NIS/NIS_Triangulated.cxx | 4 +- src/NIS/NIS_Triangulated.hxx | 10 +- src/NIS/NIS_TriangulatedDrawer.cxx | 6 +- src/NIS/NIS_TriangulatedDrawer.hxx | 6 +- src/NIS/NIS_View.cxx | 10 +- src/NIS/NIS_View.hxx | 14 +-- src/OpenGl/OpenGl_CView.hxx | 4 +- src/OpenGl/OpenGl_Context.hxx | 2 +- src/PMMgt/PMMgt_PManaged.cxx | 4 +- src/PNaming/PNaming_Name.lxx | 4 +- src/PNaming/PNaming_Name_1.lxx | 4 +- src/PNaming/PNaming_Name_2.lxx | 4 +- src/Plate/Plate_Plate.cxx | 2 +- src/Poly/Poly_CoherentNode.cxx | 6 +- src/Poly/Poly_CoherentNode.hxx | 6 +- src/Poly/Poly_CoherentTriPtr.cxx | 8 +- src/Poly/Poly_CoherentTriPtr.hxx | 8 +- src/Poly/Poly_CoherentTriangulation.cxx | 14 +-- src/Poly/Poly_CoherentTriangulation.hxx | 24 ++--- src/Poly/Poly_ListOfTriangulation.hxx | 2 +- src/Poly/Poly_MakeLoops.cxx | 12 +-- src/Poly/Poly_MakeLoops.hxx | 16 +-- .../ProjLib_ComputeApproxOnPolarSurface.cxx | 2 +- src/Prs3d/Prs3d_Drawer.cxx | 2 +- src/Prs3d/Prs3d_Presentation.cxx | 10 +- src/QABugs/QABugs_11.cxx | 8 +- src/QABugs/QABugs_12.cxx | 4 +- src/QABugs/QABugs_17.cxx | 52 +++++----- src/QABugs/QABugs_19.cxx | 6 +- src/QABugs/QABugs_3.cxx | 28 +++--- src/QABugs/QABugs_4.cxx | 8 +- src/QABugs/QABugs_8.cxx | 8 +- src/QABugs/QABugs_9.cxx | 4 +- src/QABugs/QABugs_MyText.cxx | 2 +- src/QABugs/QABugs_PresentableObject.cxx | 2 +- src/QANCollection/QANCollection4.cxx | 2 +- src/RWStl/RWStl.cxx | 6 +- src/Select3D/Select3D_SensitiveCircle.cxx | 2 +- src/Select3D/Select3D_SensitiveWire.cxx | 2 +- src/SelectBasics/SelectBasics_SortAlgo.cxx | 4 +- .../SelectMgr_DataMapOfObjectOwners.hxx | 4 +- .../ShapeAnalysis_FreeBoundData.lxx | 2 +- src/Standard/Standard_Persistent.cxx | 12 +-- src/Standard/Standard_Transient.cxx | 4 +- src/Standard/Standard_Type.cxx | 2 +- src/StdSelect/StdSelect_Shape.cxx | 10 +- src/TDF/TDF_HAllocator.hxx | 2 +- src/TDF/TDF_LabelNode.hxx | 2 +- src/TNaming/TNaming_Identifier.cxx | 2 +- src/TObj/TObj_Container.hxx | 2 +- src/TObj/TObj_SequenceOfObject.hxx | 2 +- src/TPrsStd/TPrsStd_ConstraintTools.cxx | 8 +- src/TestTopOpe/TestTopOpe_BOOP.hxx | 4 +- src/TestTopOpe/TestTopOpe_BOOPCommands.cxx | 4 +- src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx | 4 +- .../TopTools_MutexForShapeProvider.hxx | 2 +- src/Units/Units_UnitsDictionary.cxx | 2 +- src/Units/Units_UnitsSystem.cxx | 2 +- src/V3d/V3d_View.cxx | 2 +- src/ViewerTest/ViewerTest_ObjectCommands.cxx | 14 +-- src/Visual3d/Visual3d_ContextView.cxx | 2 +- src/Visual3d/Visual3d_View.cxx | 2 +- .../VrmlData_DataMapOfShapeAppearance.hxx | 18 ++-- src/VrmlData/VrmlData_ListOfNode.hxx | 2 +- src/VrmlData/VrmlData_MapOfNode.hxx | 2 +- src/VrmlData/VrmlData_Node.hxx | 4 +- src/VrmlData/VrmlData_Scene.cxx | 2 +- src/VrmlData/VrmlData_Scene.hxx | 10 +- src/VrmlData/VrmlData_ShapeConvert.cxx | 10 +- src/VrmlData/VrmlData_ShapeConvert.hxx | 20 ++-- src/XSDRAW/XSDRAW.cxx | 2 +- src/XmlDrivers/XmlDrivers.cxx | 2 +- src/XmlLDrivers/XmlLDrivers.cxx | 2 +- 211 files changed, 697 insertions(+), 697 deletions(-) diff --git a/src/AIS/AIS_AttributeFilter.cxx b/src/AIS/AIS_AttributeFilter.cxx index 3dcdcb88d7..bdd0411737 100644 --- a/src/AIS/AIS_AttributeFilter.cxx +++ b/src/AIS/AIS_AttributeFilter.cxx @@ -42,7 +42,7 @@ Standard_Boolean AIS_AttributeFilter::IsOk(const Handle(SelectMgr_EntityOwner)& Standard_Boolean okstat = Standard_True; //#ifndef DEB - Handle_SelectMgr_SelectableObject aSelectable = anObj->Selectable() ; + Handle(SelectMgr_SelectableObject) aSelectable = anObj->Selectable() ; if( hasC && ((Handle(AIS_InteractiveObject)&) aSelectable)->HasColor() ) //#else // if(hasC && ((Handle(AIS_InteractiveObject)&) anObj->Selectable())->HasColor()) diff --git a/src/AIS/AIS_Axis.cxx b/src/AIS/AIS_Axis.cxx index f1be5fe121..7f7d5112e9 100644 --- a/src/AIS/AIS_Axis.cxx +++ b/src/AIS/AIS_Axis.cxx @@ -178,9 +178,9 @@ void AIS_Axis::Compute(const Handle(PrsMgr_PresentationManager3d)&, } -void AIS_Axis::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_Axis::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Axis::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Axis::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_Chamf2dDimension.cxx b/src/AIS/AIS_Chamf2dDimension.cxx index 06376b652e..c52292a162 100644 --- a/src/AIS/AIS_Chamf2dDimension.cxx +++ b/src/AIS/AIS_Chamf2dDimension.cxx @@ -237,9 +237,9 @@ void AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_Chamf2dDimension::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Chamf2dDimension::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_Chamf3dDimension.cxx b/src/AIS/AIS_Chamf3dDimension.cxx index 7e97558d4f..52e6b63d31 100644 --- a/src/AIS/AIS_Chamf3dDimension.cxx +++ b/src/AIS/AIS_Chamf3dDimension.cxx @@ -212,9 +212,9 @@ void AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_Chamf3dDimension::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Chamf3dDimension::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_Circle.cxx b/src/AIS/AIS_Circle.cxx index 1e0e0a48f7..c2a3bda326 100644 --- a/src/AIS/AIS_Circle.cxx +++ b/src/AIS/AIS_Circle.cxx @@ -87,11 +87,11 @@ void AIS_Circle::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresenta //purpose : //======================================================================= -void AIS_Circle::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_Circle::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Circle::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Circle::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_ConcentricRelation.cxx b/src/AIS/AIS_ConcentricRelation.cxx index 53e296d5fc..9fb1036b24 100644 --- a/src/AIS/AIS_ConcentricRelation.cxx +++ b/src/AIS/AIS_ConcentricRelation.cxx @@ -86,9 +86,9 @@ void AIS_ConcentricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)& } } -void AIS_ConcentricRelation::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_ConcentricRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_ConcentricRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_ConcentricRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_ConnectedInteractive.cxx b/src/AIS/AIS_ConnectedInteractive.cxx index d268a06413..a6a81ae4a5 100644 --- a/src/AIS/AIS_ConnectedInteractive.cxx +++ b/src/AIS/AIS_ConnectedInteractive.cxx @@ -135,15 +135,15 @@ void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3 thePrs->ReCompute(); } -void AIS_ConnectedInteractive::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_ConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_ConnectedInteractive::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_ConnectedInteractive::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } -void AIS_ConnectedInteractive::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Prs3d_Presentation& aPresentation) +void AIS_ConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_ConnectedInteractive::Compute(const Handle_Prs3d_Projector&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_ConnectedInteractive::Compute(const Handle(Prs3d_Projector)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } @@ -196,8 +196,8 @@ void AIS_ConnectedInteractive::UpdateLocation(const Handle(SelectMgr_Selection)& // Standard_NotImplemented::Raise("AIS_ConnectedInteractive::UpdateLocation(const Handle(SelectMgr_Selection)& Sel)"); SelectMgr_SelectableObject::UpdateLocation(Sel) ; } -/*void AIS_ConnectedInteractive::UpdateLocation(const Handle_Prs3d_Presentation& aPresentation) +/*void AIS_ConnectedInteractive::UpdateLocation(const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_ConnectedInteractive::UpdateLocation(const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_ConnectedInteractive::UpdateLocation(const Handle(Prs3d_Presentation)&)"); SelectMgr_SelectableObject::UpdateLocation(aPresentation) ; }*/ diff --git a/src/AIS/AIS_Drawer.cxx b/src/AIS/AIS_Drawer.cxx index 3afcc034ba..df2ea40096 100644 --- a/src/AIS/AIS_Drawer.cxx +++ b/src/AIS/AIS_Drawer.cxx @@ -390,7 +390,7 @@ void AIS_Drawer::SetFaceBoundaryAspect (const Handle(Prs3d_LineAspect)& theAspec // function : FaceBoundaryAspect // purpose : // ======================================================================= -Handle_Prs3d_LineAspect AIS_Drawer::FaceBoundaryAspect() +Handle(Prs3d_LineAspect) AIS_Drawer::FaceBoundaryAspect() { if (!IsOwnFaceBoundaryAspect ()) { diff --git a/src/AIS/AIS_EqualRadiusRelation.cxx b/src/AIS/AIS_EqualRadiusRelation.cxx index 60612ed3e7..fdcdb3eb38 100644 --- a/src/AIS/AIS_EqualRadiusRelation.cxx +++ b/src/AIS/AIS_EqualRadiusRelation.cxx @@ -164,11 +164,11 @@ void AIS_EqualRadiusRelation::Compute( const Handle( Prs3d_Projector )& /*aProje //purpose : //======================================================================= -void AIS_EqualRadiusRelation::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_EqualRadiusRelation::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_EqualRadiusRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_EqualRadiusRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_FixRelation.cxx b/src/AIS/AIS_FixRelation.cxx index b507fa6007..8bff4c35a0 100644 --- a/src/AIS/AIS_FixRelation.cxx +++ b/src/AIS/AIS_FixRelation.cxx @@ -231,11 +231,11 @@ void AIS_FixRelation::Compute(const Handle(Prs3d_Projector)& aProjector, //purpose : //======================================================================= -void AIS_FixRelation::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_FixRelation::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_FixRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_FixRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_IdenticRelation.cxx b/src/AIS/AIS_IdenticRelation.cxx index 23d9a8c17f..2b6bb99b27 100644 --- a/src/AIS/AIS_IdenticRelation.cxx +++ b/src/AIS/AIS_IdenticRelation.cxx @@ -373,9 +373,9 @@ void AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)& aProjector, PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_IdenticRelation::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_IdenticRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index 56c56bd5fe..1a84aaca44 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -2580,7 +2580,7 @@ Standard_Boolean AIS_InteractiveContext::IsoOnPlane() const //purpose : //======================================================================= -void AIS_InteractiveContext::SetSelectionMode(const Handle_AIS_InteractiveObject&, const Standard_Integer ) +void AIS_InteractiveContext::SetSelectionMode(const Handle(AIS_InteractiveObject)&, const Standard_Integer ) { } @@ -2589,7 +2589,7 @@ void AIS_InteractiveContext::SetSelectionMode(const Handle_AIS_InteractiveObject //purpose : //======================================================================= -void AIS_InteractiveContext::UnsetSelectionMode(const Handle_AIS_InteractiveObject&) +void AIS_InteractiveContext::UnsetSelectionMode(const Handle(AIS_InteractiveObject)&) { } @@ -2676,7 +2676,7 @@ Standard_Integer AIS_InteractiveContext::PixelTolerance() const { //purpose : //======================================================================= -Standard_Boolean AIS_InteractiveContext::IsInLocal(const Handle_AIS_InteractiveObject& anIObj, +Standard_Boolean AIS_InteractiveContext::IsInLocal(const Handle(AIS_InteractiveObject)& anIObj, Standard_Integer& TheIndex) const { if(anIObj.IsNull()) return Standard_False; diff --git a/src/AIS/AIS_InteractiveContext.lxx b/src/AIS/AIS_InteractiveContext.lxx index 0f5ec81c7f..5fba823974 100644 --- a/src/AIS/AIS_InteractiveContext.lxx +++ b/src/AIS/AIS_InteractiveContext.lxx @@ -76,7 +76,7 @@ inline const Handle(PrsMgr_PresentationManager3d)& AIS_InteractiveContext::MainP inline Standard_Boolean AIS_InteractiveContext::HasOpenedContext() const {return myCurLocalIndex != 0;} -inline Handle_AIS_LocalContext AIS_InteractiveContext::LocalContext() const +inline Handle(AIS_LocalContext) AIS_InteractiveContext::LocalContext() const { return (myCurLocalIndex > 0) ? myLocalContexts(myCurLocalIndex) : NULL; } inline const TCollection_AsciiString& AIS_InteractiveContext::CurrentName() const diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx index 2d26a7fc99..1ef85041ea 100644 --- a/src/AIS/AIS_Line.cxx +++ b/src/AIS/AIS_Line.cxx @@ -124,9 +124,9 @@ void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&, } -void AIS_Line::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_Line::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Line::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Line::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ; } diff --git a/src/AIS/AIS_MaxRadiusDimension.cxx b/src/AIS/AIS_MaxRadiusDimension.cxx index 907afbbff5..df7f38828c 100644 --- a/src/AIS/AIS_MaxRadiusDimension.cxx +++ b/src/AIS/AIS_MaxRadiusDimension.cxx @@ -146,11 +146,11 @@ void AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector, //purpose : //======================================================================= -void AIS_MaxRadiusDimension::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_MaxRadiusDimension::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_MidPointRelation.cxx b/src/AIS/AIS_MidPointRelation.cxx index 32f8f1bc70..be2f5440bb 100644 --- a/src/AIS/AIS_MidPointRelation.cxx +++ b/src/AIS/AIS_MidPointRelation.cxx @@ -150,11 +150,11 @@ void AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)& /*aProjector*/ // PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_MidPointRelation::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { - Standard_NotImplemented::Raise("AIS_MidPointRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); + Standard_NotImplemented::Raise("AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_MinRadiusDimension.cxx b/src/AIS/AIS_MinRadiusDimension.cxx index 5b99be62bd..2b0b9f3978 100644 --- a/src/AIS/AIS_MinRadiusDimension.cxx +++ b/src/AIS/AIS_MinRadiusDimension.cxx @@ -148,11 +148,11 @@ void AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector, //purpose : //======================================================================= -void AIS_MinRadiusDimension::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_MinRadiusDimension::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_MultipleConnectedInteractive.cxx b/src/AIS/AIS_MultipleConnectedInteractive.cxx index fba2ca1522..10ba1c1e38 100644 --- a/src/AIS/AIS_MultipleConnectedInteractive.cxx +++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx @@ -161,10 +161,10 @@ void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_Presentation //purpose : //======================================================================= -void AIS_MultipleConnectedInteractive::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_MultipleConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_MultipleConnectedInteractive::Compute(const Handle_Prs3d_Projector&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_MultipleConnectedInteractive::Compute(const Handle(Prs3d_Projector)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } @@ -173,11 +173,11 @@ void AIS_MultipleConnectedInteractive::Compute(const Handle_Prs3d_Projector& aPr //purpose : //======================================================================= -void AIS_MultipleConnectedInteractive::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_MultipleConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_MultipleConnectedInteractive::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_MultipleConnectedInteractive::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_MultipleConnectedShape.cxx b/src/AIS/AIS_MultipleConnectedShape.cxx index cd5b20690e..4fef33c0e2 100644 --- a/src/AIS/AIS_MultipleConnectedShape.cxx +++ b/src/AIS/AIS_MultipleConnectedShape.cxx @@ -160,8 +160,8 @@ void AIS_MultipleConnectedShape::Compute(const Handle(Prs3d_Projector)& aProject //purpose : //======================================================================= -void AIS_MultipleConnectedShape::Compute(const Handle_PrsMgr_PresentationManager3d& aPresentationManager3d, - const Handle_Prs3d_Presentation& aPresentation, +void AIS_MultipleConnectedShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager3d, + const Handle(Prs3d_Presentation)& aPresentation, const int anint) { AIS_MultipleConnectedInteractive::Compute( aPresentationManager3d , aPresentation , anint ) ; diff --git a/src/AIS/AIS_ParallelRelation.cxx b/src/AIS/AIS_ParallelRelation.cxx index 068a0f52a9..da7775883f 100644 --- a/src/AIS/AIS_ParallelRelation.cxx +++ b/src/AIS/AIS_ParallelRelation.cxx @@ -140,9 +140,9 @@ void AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)& aProjector, PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_ParallelRelation::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_ParallelRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_PerpendicularRelation.cxx b/src/AIS/AIS_PerpendicularRelation.cxx index 44e42f422f..5ef137afc9 100644 --- a/src/AIS/AIS_PerpendicularRelation.cxx +++ b/src/AIS/AIS_PerpendicularRelation.cxx @@ -124,9 +124,9 @@ void AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)& aProjecto PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_PerpendicularRelation::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_PerpendicularRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_Plane.cxx b/src/AIS/AIS_Plane.cxx index 4400f35fae..145c45071e 100644 --- a/src/AIS/AIS_Plane.cxx +++ b/src/AIS/AIS_Plane.cxx @@ -296,7 +296,7 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& , } } -void AIS_Plane::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_Plane::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { PrsMgr_PresentableObject::Compute(aProjector, aTransformation, aPresentation); } diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx index 6d71dbc0a5..2170e8208b 100644 --- a/src/AIS/AIS_PlaneTrihedron.cxx +++ b/src/AIS/AIS_PlaneTrihedron.cxx @@ -212,9 +212,9 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&, aPresentation->SetInfiniteState (Standard_True); } -void AIS_PlaneTrihedron::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) +void AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_PlaneTrihedron::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ; } diff --git a/src/AIS/AIS_Point.cxx b/src/AIS/AIS_Point.cxx index 540cb2e061..f5500f4e2e 100644 --- a/src/AIS/AIS_Point.cxx +++ b/src/AIS/AIS_Point.cxx @@ -102,11 +102,11 @@ void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat //purpose : //======================================================================= -void AIS_Point::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_Point::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Point::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Point::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ; } diff --git a/src/AIS/AIS_SymmetricRelation.cxx b/src/AIS/AIS_SymmetricRelation.cxx index 0f539a3c36..fa1c2144b6 100644 --- a/src/AIS/AIS_SymmetricRelation.cxx +++ b/src/AIS/AIS_SymmetricRelation.cxx @@ -136,11 +136,11 @@ void AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)& /*aProjector* // PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_SymmetricRelation::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { - Standard_NotImplemented::Raise("AIS_SymmetricRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); + Standard_NotImplemented::Raise("AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_TangentRelation.cxx b/src/AIS/AIS_TangentRelation.cxx index 1625e0f17d..a86fa6a512 100644 --- a/src/AIS/AIS_TangentRelation.cxx +++ b/src/AIS/AIS_TangentRelation.cxx @@ -124,11 +124,11 @@ void AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)& aProjector, PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; } -void AIS_TangentRelation::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_TangentRelation::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; } diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx index d7ded1fac9..1cc77c89c9 100644 --- a/src/AIS/AIS_Trihedron.cxx +++ b/src/AIS/AIS_Trihedron.cxx @@ -291,11 +291,11 @@ void AIS_Trihedron::Compute( //purpose : //======================================================================= -void AIS_Trihedron::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Geom_Transformation& aTransformation, - const Handle_Prs3d_Presentation& aPresentation) +void AIS_Trihedron::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Geom_Transformation)& aTransformation, + const Handle(Prs3d_Presentation)& aPresentation) { -// Standard_NotImplemented::Raise("AIS_Trihedron::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)"); +// Standard_NotImplemented::Raise("AIS_Trihedron::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)"); PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ; } diff --git a/src/AIS/AIS_TypeFilter.cxx b/src/AIS/AIS_TypeFilter.cxx index b2ec81f771..819524bc57 100644 --- a/src/AIS/AIS_TypeFilter.cxx +++ b/src/AIS/AIS_TypeFilter.cxx @@ -26,7 +26,7 @@ Standard_Boolean AIS_TypeFilter::IsOk(const Handle(SelectMgr_EntityOwner)& anObj return Standard_False; //#ifndef DEB - Handle_SelectMgr_SelectableObject aSelectableObject = anObj->Selectable() ; + Handle(SelectMgr_SelectableObject) aSelectableObject = anObj->Selectable() ; return ((Handle(AIS_InteractiveObject)&) aSelectableObject)->Type()== myKind; //#else // return ((Handle(AIS_InteractiveObject)&)anObj->Selectable())->Type()== myKind; diff --git a/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx b/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx index 39aa5e8643..2d4483a742 100644 --- a/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx +++ b/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx @@ -72,7 +72,7 @@ inline void Adaptor3d_HSurfaceTool::VIntervals(const Handle(Adaptor3d_HSurface)& Surf->VIntervals(Tab,S); } -inline Handle_Adaptor3d_HSurface Adaptor3d_HSurfaceTool::UTrim(const Handle(Adaptor3d_HSurface)& Surf, +inline Handle(Adaptor3d_HSurface) Adaptor3d_HSurfaceTool::UTrim(const Handle(Adaptor3d_HSurface)& Surf, const Standard_Real F, const Standard_Real L, const Standard_Real Tol) @@ -80,7 +80,7 @@ inline Handle_Adaptor3d_HSurface Adaptor3d_HSurfaceTool::UTrim(const Handle(Adap return Surf->UTrim(F,L,Tol); } -inline Handle_Adaptor3d_HSurface Adaptor3d_HSurfaceTool::VTrim(const Handle(Adaptor3d_HSurface)& Surf, +inline Handle(Adaptor3d_HSurface) Adaptor3d_HSurfaceTool::VTrim(const Handle(Adaptor3d_HSurface)& Surf, const Standard_Real F, const Standard_Real L, const Standard_Real Tol) diff --git a/src/AdvApprox/AdvApprox_ApproxAFunction.cxx b/src/AdvApprox/AdvApprox_ApproxAFunction.cxx index 9125e871ee..e83c3b3298 100644 --- a/src/AdvApprox/AdvApprox_ApproxAFunction.cxx +++ b/src/AdvApprox/AdvApprox_ApproxAFunction.cxx @@ -622,9 +622,9 @@ AdvApprox_ApproxAFunction:: AdvApprox_ApproxAFunction(const Standard_Integer Num1DSS, const Standard_Integer Num2DSS, const Standard_Integer Num3DSS, - const Handle_TColStd_HArray1OfReal& OneDTol, - const Handle_TColStd_HArray1OfReal& TwoDTol, - const Handle_TColStd_HArray1OfReal& ThreeDTol, + const Handle(TColStd_HArray1OfReal)& OneDTol, + const Handle(TColStd_HArray1OfReal)& TwoDTol, + const Handle(TColStd_HArray1OfReal)& ThreeDTol, const Standard_Real First, const Standard_Real Last, const GeomAbs_Shape Continuity, @@ -651,9 +651,9 @@ AdvApprox_ApproxAFunction:: AdvApprox_ApproxAFunction(const Standard_Integer Num1DSS, const Standard_Integer Num2DSS, const Standard_Integer Num3DSS, - const Handle_TColStd_HArray1OfReal& OneDTol, - const Handle_TColStd_HArray1OfReal& TwoDTol, - const Handle_TColStd_HArray1OfReal& ThreeDTol, + const Handle(TColStd_HArray1OfReal)& OneDTol, + const Handle(TColStd_HArray1OfReal)& TwoDTol, + const Handle(TColStd_HArray1OfReal)& ThreeDTol, const Standard_Real First, const Standard_Real Last, const GeomAbs_Shape Continuity, diff --git a/src/AppDef/AppDef_MultiPointConstraint.cxx b/src/AppDef/AppDef_MultiPointConstraint.cxx index a40d2116c1..f397fcd12a 100644 --- a/src/AppDef/AppDef_MultiPointConstraint.cxx +++ b/src/AppDef/AppDef_MultiPointConstraint.cxx @@ -24,10 +24,10 @@ #include -#define tabTang (*(Handle_TColgp_HArray1OfVec*)&ttabTang) -#define tabCurv (*(Handle_TColgp_HArray1OfVec*)&ttabCurv) -#define tabTang2d (*(Handle_TColgp_HArray1OfVec2d*)&ttabTang2d) -#define tabCurv2d (*(Handle_TColgp_HArray1OfVec2d*)&ttabCurv2d) +#define tabTang (*(Handle(TColgp_HArray1OfVec)*)&ttabTang) +#define tabCurv (*(Handle(TColgp_HArray1OfVec)*)&ttabCurv) +#define tabTang2d (*(Handle(TColgp_HArray1OfVec2d)*)&ttabTang2d) +#define tabCurv2d (*(Handle(TColgp_HArray1OfVec2d)*)&ttabCurv2d) diff --git a/src/AppParCurves/AppParCurves_MultiPoint.cxx b/src/AppParCurves/AppParCurves_MultiPoint.cxx index e45d5c10c3..12fef12342 100644 --- a/src/AppParCurves/AppParCurves_MultiPoint.cxx +++ b/src/AppParCurves/AppParCurves_MultiPoint.cxx @@ -18,8 +18,8 @@ #include -#define tabPoint (*(Handle_TColgp_HArray1OfPnt*)&ttabPoint) -#define tabPoint2d (*(Handle_TColgp_HArray1OfPnt2d*)&ttabPoint2d) +#define tabPoint (*(Handle(TColgp_HArray1OfPnt)*)&ttabPoint) +#define tabPoint2d (*(Handle(TColgp_HArray1OfPnt2d)*)&ttabPoint2d) AppParCurves_MultiPoint::AppParCurves_MultiPoint() {} diff --git a/src/BOPAlgo/BOPAlgo_Builder_2.cxx b/src/BOPAlgo/BOPAlgo_Builder_2.cxx index 0754b5b629..57248f94c8 100644 --- a/src/BOPAlgo/BOPAlgo_Builder_2.cxx +++ b/src/BOPAlgo/BOPAlgo_Builder_2.cxx @@ -249,13 +249,13 @@ typedef BOPCol_NCVector BOPAlgo_VectorOfVFI; typedef BOPCol_TBBContextFunctor BOPAlgo_VFIFunctor; // typedef BOPCol_TBBContextCnt BOPAlgo_VFICnt; + Handle(BOPInt_Context)> BOPAlgo_VFICnt; // //======================================================================= //function : FillImagesFaces diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx index 1d65993ca4..f72f5f77cf 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx @@ -116,13 +116,13 @@ typedef BOPCol_NCVector typedef BOPCol_TBBContextFunctor BOPAlgo_VertexEdgeFunctor; // typedef BOPCol_TBBContextCnt BOPAlgo_VertexEdgeCnt; + Handle(BOPInt_Context)> BOPAlgo_VertexEdgeCnt; // //======================================================================= // function: PerformVE @@ -215,7 +215,7 @@ void BOPAlgo_PaveFiller::PerformVE() myDS->AddInterf(nV, nE); // 3 BOPDS_ListOfPaveBlock& aLPB=myDS->ChangePaveBlocks(nE); - Handle(BOPDS_PaveBlock)& aPB=*((Handle_BOPDS_PaveBlock*)&aLPB.First()); + Handle(BOPDS_PaveBlock)& aPB=*((Handle(BOPDS_PaveBlock)*)&aLPB.First()); // aPave.SetIndex(nVx); aPave.SetParameter(aT); diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx index 44ecfd7415..c94d3c9641 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx @@ -245,13 +245,13 @@ typedef BOPCol_NCVector typedef BOPCol_TBBContextFunctor BOPAlgo_PVEFunctor; // typedef BOPCol_TBBContextCnt BOPAlgo_PVECnt; + Handle(BOPInt_Context)> BOPAlgo_PVECnt; ///////////////////////////////////////////////////////////////////////// //======================================================================= // function: PerformEE diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx index 4dd6020352..26fe9052fb 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx @@ -124,13 +124,13 @@ typedef BOPCol_NCVector typedef BOPCol_TBBContextFunctor BOPAlgo_VertexFaceFunctor; // typedef BOPCol_TBBContextCnt BOPAlgo_VertexFaceCnt; + Handle(BOPInt_Context)> BOPAlgo_VertexFaceCnt; // //======================================================================= // function: PerformVF diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx index 4d1d23842a..6b1aeb444a 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx @@ -110,13 +110,13 @@ typedef BOPCol_NCVector BOPAlgo_VectorOfEdgeFace; typedef BOPCol_TBBContextFunctor BOPAlgo_EdgeFaceFunctor; // typedef BOPCol_TBBContextCnt BOPAlgo_EdgeFaceCnt; + Handle(BOPInt_Context)> BOPAlgo_EdgeFaceCnt; // //======================================================================= //function : PerformEF diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx index 9a0d01daaa..88e0a7fbdf 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_9.cxx @@ -78,13 +78,13 @@ typedef BOPCol_NCVector typedef BOPCol_TBBContextFunctor BOPAlgo_ShrunkRangeFunctor; // typedef BOPCol_TBBContextCnt BOPAlgo_ShrunkRangeCnt; + Handle(BOPInt_Context)> BOPAlgo_ShrunkRangeCnt; // //======================================================================= // function: FillShrunkData diff --git a/src/BOPCol/BOPCol_BaseAllocator.hxx b/src/BOPCol/BOPCol_BaseAllocator.hxx index 26ce9fbbfa..6c4e0e6673 100644 --- a/src/BOPCol/BOPCol_BaseAllocator.hxx +++ b/src/BOPCol/BOPCol_BaseAllocator.hxx @@ -17,6 +17,6 @@ #include -typedef Handle_NCollection_BaseAllocator BOPCol_BaseAllocator; +typedef Handle(NCollection_BaseAllocator) BOPCol_BaseAllocator; #endif diff --git a/src/BOPCol/BOPCol_NCVector.hxx b/src/BOPCol/BOPCol_NCVector.hxx index 01af8c745a..588f5a3c10 100755 --- a/src/BOPCol/BOPCol_NCVector.hxx +++ b/src/BOPCol/BOPCol_NCVector.hxx @@ -29,7 +29,7 @@ template class BOPCol_NCVector { public: BOPCol_NCVector(const Standard_Integer theIncrement=256, - const Handle_NCollection_BaseAllocator& theAlloc = NULL) + const Handle(NCollection_BaseAllocator)& theAlloc = NULL) : NCollection_Vector(theIncrement, theAlloc) { }; // diff --git a/src/BOPDS/BOPDS_Curve.lxx b/src/BOPDS/BOPDS_Curve.lxx index 3158540e55..2550867e9c 100644 --- a/src/BOPDS/BOPDS_Curve.lxx +++ b/src/BOPDS/BOPDS_Curve.lxx @@ -104,7 +104,7 @@ //======================================================================= inline Handle(BOPDS_PaveBlock)& BOPDS_Curve::ChangePaveBlock1() { - Handle_BOPDS_PaveBlock* pPB=(Handle_BOPDS_PaveBlock*)&myPaveBlocks.First(); + Handle(BOPDS_PaveBlock)* pPB=(Handle(BOPDS_PaveBlock)*)&myPaveBlocks.First(); return *pPB; } //======================================================================= diff --git a/src/BRep/BRep_CurveOn2Surfaces.cxx b/src/BRep/BRep_CurveOn2Surfaces.cxx index cb643a3e86..59533013d0 100644 --- a/src/BRep/BRep_CurveOn2Surfaces.cxx +++ b/src/BRep/BRep_CurveOn2Surfaces.cxx @@ -63,8 +63,8 @@ Standard_Boolean BRep_CurveOn2Surfaces::IsRegularity()const //======================================================================= Standard_Boolean BRep_CurveOn2Surfaces::IsRegularity - (const Handle_Geom_Surface& S1, - const Handle_Geom_Surface& S2, + (const Handle(Geom_Surface)& S1, + const Handle(Geom_Surface)& S2, const TopLoc_Location& L1, const TopLoc_Location& L2)const { diff --git a/src/BRep/BRep_CurveRepresentation.cxx b/src/BRep/BRep_CurveRepresentation.cxx index 2e27b66799..2c7c0a4733 100644 --- a/src/BRep/BRep_CurveRepresentation.cxx +++ b/src/BRep/BRep_CurveRepresentation.cxx @@ -125,7 +125,7 @@ Standard_Boolean BRep_CurveRepresentation::IsPolygonOnTriangulation() const //======================================================================= Standard_Boolean BRep_CurveRepresentation::IsPolygonOnTriangulation - (const Handle_Poly_Triangulation&, const TopLoc_Location&) const + (const Handle(Poly_Triangulation)&, const TopLoc_Location&) const { return Standard_False; } @@ -168,7 +168,7 @@ Standard_Boolean BRep_CurveRepresentation::IsPolygonOnSurface() const //======================================================================= Standard_Boolean BRep_CurveRepresentation::IsPolygonOnSurface - (const Handle_Geom_Surface&, + (const Handle(Geom_Surface)&, const TopLoc_Location&) const { return Standard_False; diff --git a/src/BRepAdaptor/BRepAdaptor_Curve.cxx b/src/BRepAdaptor/BRepAdaptor_Curve.cxx index 6aefb7c1e5..e131fe67a9 100644 --- a/src/BRepAdaptor/BRepAdaptor_Curve.cxx +++ b/src/BRepAdaptor/BRepAdaptor_Curve.cxx @@ -283,10 +283,10 @@ Handle(Adaptor3d_HCurve) BRepAdaptor_Curve::Trim(const Standard_Real First, } else { Handle(Adaptor3d_HCurveOnSurface) sav = myConSurf; - *((Handle_Adaptor3d_HCurveOnSurface*) (void*) &myConSurf) = + *((Handle(Adaptor3d_HCurveOnSurface)*) (void*) &myConSurf) = Handle(Adaptor3d_HCurveOnSurface)::DownCast(myConSurf->Trim(First,Last,Tol)); res->ChangeCurve() = *this; - *((Handle_Adaptor3d_HCurveOnSurface*) (void*) &myConSurf) = sav; + *((Handle(Adaptor3d_HCurveOnSurface)*) (void*) &myConSurf) = sav; } return res; } diff --git a/src/BRepApprox/BRepApprox_SurfaceTool.lxx b/src/BRepApprox/BRepApprox_SurfaceTool.lxx index a0bede9f6f..d48bf3ef7a 100644 --- a/src/BRepApprox/BRepApprox_SurfaceTool.lxx +++ b/src/BRepApprox/BRepApprox_SurfaceTool.lxx @@ -56,14 +56,14 @@ inline void BRepApprox_SurfaceTool::VIntervals(const BRepAdaptor_Surface& Surf, } -inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceTool::UTrim(const BRepAdaptor_Surface& Surf, +inline Handle(Adaptor3d_HSurface) BRepApprox_SurfaceTool::UTrim(const BRepAdaptor_Surface& Surf, const Standard_Real F, const Standard_Real L, const Standard_Real Tol) { return Surf.UTrim(F,L,Tol); } -inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceTool::VTrim(const BRepAdaptor_Surface& Surf, +inline Handle(Adaptor3d_HSurface) BRepApprox_SurfaceTool::VTrim(const BRepAdaptor_Surface& Surf, const Standard_Real F, const Standard_Real L, const Standard_Real Tol) { diff --git a/src/BRepBlend/BRepBlend_Extremity.lxx b/src/BRepBlend/BRepBlend_Extremity.lxx index e98eb38040..2488ec6f32 100644 --- a/src/BRepBlend/BRepBlend_Extremity.lxx +++ b/src/BRepBlend/BRepBlend_Extremity.lxx @@ -55,7 +55,7 @@ inline Standard_Boolean BRepBlend_Extremity::IsVertex() const } -inline const Handle_Adaptor3d_HVertex& BRepBlend_Extremity::Vertex () const +inline const Handle(Adaptor3d_HVertex)& BRepBlend_Extremity::Vertex () const { if (!isvtx) {Standard_DomainError::Raise();} return vtx; diff --git a/src/BRepBlend/BRepBlend_PointOnRst.lxx b/src/BRepBlend/BRepBlend_PointOnRst.lxx index e47d82260e..fb36b4dce5 100644 --- a/src/BRepBlend/BRepBlend_PointOnRst.lxx +++ b/src/BRepBlend/BRepBlend_PointOnRst.lxx @@ -14,7 +14,7 @@ #include -inline const Handle_Adaptor2d_HCurve2d& BRepBlend_PointOnRst::Arc () const +inline const Handle(Adaptor2d_HCurve2d)& BRepBlend_PointOnRst::Arc () const { return arc; } diff --git a/src/BRepExtrema/BRepExtrema_ExtCC.hxx b/src/BRepExtrema/BRepExtrema_ExtCC.hxx index c426ec7f1b..7b6d673734 100644 --- a/src/BRepExtrema/BRepExtrema_ExtCC.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtCC.hxx @@ -75,7 +75,7 @@ class BRepExtrema_ExtCC private: Extrema_ExtCC myExtCC; - Handle_BRepAdaptor_HCurve myHC; + Handle(BRepAdaptor_HCurve) myHC; }; #endif diff --git a/src/BRepExtrema/BRepExtrema_ExtCF.hxx b/src/BRepExtrema/BRepExtrema_ExtCF.hxx index b820c788f1..1138571b0c 100644 --- a/src/BRepExtrema/BRepExtrema_ExtCF.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtCF.hxx @@ -92,7 +92,7 @@ class BRepExtrema_ExtCF TColStd_SequenceOfReal mySqDist; Extrema_SequenceOfPOnSurf myPointsOnS; Extrema_SequenceOfPOnCurv myPointsOnC; - Handle_BRepAdaptor_HSurface myHS; + Handle(BRepAdaptor_HSurface) myHS; }; #endif diff --git a/src/BRepExtrema/BRepExtrema_ExtFF.hxx b/src/BRepExtrema/BRepExtrema_ExtFF.hxx index 05fe925ac4..150cc8af6e 100644 --- a/src/BRepExtrema/BRepExtrema_ExtFF.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtFF.hxx @@ -90,7 +90,7 @@ class BRepExtrema_ExtFF TColStd_SequenceOfReal mySqDist; Extrema_SequenceOfPOnSurf myPointsOnS1; Extrema_SequenceOfPOnSurf myPointsOnS2; - Handle_BRepAdaptor_HSurface myHS; + Handle(BRepAdaptor_HSurface) myHS; }; #endif diff --git a/src/BRepExtrema/BRepExtrema_ExtPC.hxx b/src/BRepExtrema/BRepExtrema_ExtPC.hxx index 188b10bb04..decad91cd1 100644 --- a/src/BRepExtrema/BRepExtrema_ExtPC.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtPC.hxx @@ -82,7 +82,7 @@ class BRepExtrema_ExtPC private: Extrema_ExtPC myExtPC; - Handle_BRepAdaptor_HCurve myHC; + Handle(BRepAdaptor_HCurve) myHC; }; #endif diff --git a/src/BRepFill/BRepFill_ApproxSeewing.cxx b/src/BRepFill/BRepFill_ApproxSeewing.cxx index 2fa4ae1a99..dabf203107 100644 --- a/src/BRepFill/BRepFill_ApproxSeewing.cxx +++ b/src/BRepFill/BRepFill_ApproxSeewing.cxx @@ -202,7 +202,7 @@ Standard_Boolean BRepFill_ApproxSeewing::IsDone() const //======================================================================= -//function : Handle_Geom_Curve& +//function : Handle(Geom_Curve)& //purpose : //======================================================================= @@ -215,7 +215,7 @@ const Handle(Geom_Curve)& BRepFill_ApproxSeewing::Curve() const //======================================================================= -//function : Handle_Geom2d_Curve& +//function : Handle(Geom2d_Curve)& //purpose : //======================================================================= @@ -228,7 +228,7 @@ const Handle(Geom2d_Curve)& BRepFill_ApproxSeewing::CurveOnF1() const //======================================================================= -//function : Handle_Geom2d_Curve& +//function : Handle(Geom2d_Curve)& //purpose : //======================================================================= diff --git a/src/BRepMesh/BRepMesh_BaseAllocator.hxx b/src/BRepMesh/BRepMesh_BaseAllocator.hxx index cc9fa7da7f..1fbdc5b178 100644 --- a/src/BRepMesh/BRepMesh_BaseAllocator.hxx +++ b/src/BRepMesh/BRepMesh_BaseAllocator.hxx @@ -13,4 +13,4 @@ #include -typedef Handle_NCollection_IncAllocator BRepMesh_BaseAllocator; +typedef Handle(NCollection_IncAllocator) BRepMesh_BaseAllocator; diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx index c47a4a9614..95cac099d3 100644 --- a/src/BRepOffset/BRepOffset_Tool.cxx +++ b/src/BRepOffset/BRepOffset_Tool.cxx @@ -249,7 +249,7 @@ static void PutInBounds (const TopoDS_Face& F, Handle (Geom_Surface) S = BRep_Tool::Surface(F,L); if (S->IsInstance(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) { - S = (*(Handle_Geom_RectangularTrimmedSurface*)&S)->BasisSurface(); + S = (*(Handle(Geom_RectangularTrimmedSurface)*)&S)->BasisSurface(); } //--------------- // Recadre en U. @@ -2597,7 +2597,7 @@ static void MakeFace(const Handle(Geom_Surface)& S, Standard_Boolean vmindegen = isVminDegen, vmaxdegen = isVmaxDegen; Handle(Geom_Surface) theSurf = S; if (S->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) - theSurf = (*(Handle_Geom_RectangularTrimmedSurface*)&S)->BasisSurface(); + theSurf = (*(Handle(Geom_RectangularTrimmedSurface)*)&S)->BasisSurface(); if (theSurf->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface)) { Handle(Geom_ConicalSurface) ConicalS = *((Handle(Geom_ConicalSurface)*) &theSurf); @@ -3265,7 +3265,7 @@ Standard_Boolean BRepOffset_Tool::EnLargeFace //Special treatment for conical surfaces Handle(Geom_Surface) theSurf = S; if (S->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) - theSurf = (*(Handle_Geom_RectangularTrimmedSurface*)&S)->BasisSurface(); + theSurf = (*(Handle(Geom_RectangularTrimmedSurface)*)&S)->BasisSurface(); if (theSurf->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface)) { Handle(Geom_ConicalSurface) ConicalS = *((Handle(Geom_ConicalSurface)*) &theSurf); diff --git a/src/BRepTest/BRepTest_MatCommands.cxx b/src/BRepTest/BRepTest_MatCommands.cxx index 25ba2e3ea6..cc47a85220 100644 --- a/src/BRepTest/BRepTest_MatCommands.cxx +++ b/src/BRepTest/BRepTest_MatCommands.cxx @@ -191,10 +191,10 @@ void DrawCurve(const Handle(Geom2d_Curve)& aCurve, Draw_Color Couleur; if (type == STANDARD_TYPE(Geom2d_TrimmedCurve)) { - curve = (*(Handle_Geom2d_TrimmedCurve*)&aCurve)->BasisCurve(); + curve = (*(Handle(Geom2d_TrimmedCurve)*)&aCurve)->BasisCurve(); type = curve->DynamicType(); if (type == STANDARD_TYPE(Bisector_BisecAna)) { - curve =(*(Handle_Bisector_BisecAna*)&curve)->Geom2dCurve(); + curve =(*(Handle(Bisector_BisecAna)*)&curve)->Geom2dCurve(); type = curve->DynamicType(); } // PB of representation of semi_infinite curves. diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx index 443e705f1c..1bc8d5d178 100644 --- a/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx +++ b/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx @@ -65,22 +65,22 @@ void BRepTopAdaptor_Tool::Init(const Handle(Adaptor3d_HSurface)& surface, myloaded=Standard_True; } -Handle_BRepTopAdaptor_TopolTool BRepTopAdaptor_Tool::GetTopolTool() { +Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool() { if(myloaded) { return(myTopolTool); } else { - cout<<"\n*** Error ds Handle_BRepTopAdaptor_TopolTool BRepTopAdaptor_Tool::GetTopolTool()\n"<DynamicType(); if (type == STANDARD_TYPE(Geom2d_TrimmedCurve)) { - curve = (*(Handle_Geom2d_TrimmedCurve*)&afirstcurve)->BasisCurve(); + curve = (*(Handle(Geom2d_TrimmedCurve)*)&afirstcurve)->BasisCurve(); } else { curve = afirstcurve; diff --git a/src/Bisector/Bisector_BisecPC.cxx b/src/Bisector/Bisector_BisecPC.cxx index e0c6481485..59872e7dd2 100644 --- a/src/Bisector/Bisector_BisecPC.cxx +++ b/src/Bisector/Bisector_BisecPC.cxx @@ -794,7 +794,7 @@ static void Indent(const Standard_Integer Offset) { //function : Init // purpose : //============================================================================= -void Bisector_BisecPC::Init (const Handle_Geom2d_Curve& Curve, +void Bisector_BisecPC::Init (const Handle(Geom2d_Curve)& Curve, const gp_Pnt2d& Point, const Standard_Real Sign, const TColStd_SequenceOfReal& StartIntervals, diff --git a/src/Bnd/Bnd_BoundSortBox2d.cxx b/src/Bnd/Bnd_BoundSortBox2d.cxx index ca130b02e0..a373c59332 100644 --- a/src/Bnd/Bnd_BoundSortBox2d.cxx +++ b/src/Bnd/Bnd_BoundSortBox2d.cxx @@ -95,7 +95,7 @@ void Bnd_BoundSortBox2d::Initialize(const Bnd_Box2d& CompleteBox, //purpose : //======================================================================= -void Bnd_BoundSortBox2d::Initialize(const Handle_Bnd_HArray1OfBox2d& SetOfBox) +void Bnd_BoundSortBox2d::Initialize(const Handle(Bnd_HArray1OfBox2d)& SetOfBox) { myBndComponents=SetOfBox; discrX=SetOfBox->Length(); diff --git a/src/ChFi3d/ChFi3d_Builder_0.cxx b/src/ChFi3d/ChFi3d_Builder_0.cxx index a034b75382..8ff1aa7148 100644 --- a/src/ChFi3d/ChFi3d_Builder_0.cxx +++ b/src/ChFi3d/ChFi3d_Builder_0.cxx @@ -1701,7 +1701,7 @@ void ChFi3d_ComputeArete(const ChFiDS_CommonPoint& P1, bs.Update(umin,vmin,umax,vmax); Standard_Boolean aIN = Standard_True; for(Standard_Integer ii = 1; ii <= 4 && aIN; ii++) { - if(bs.IsOut((*((Handle_Geom2d_BezierCurve*) &Pcurv))->Pole(ii))) { + if(bs.IsOut((*((Handle(Geom2d_BezierCurve)*) &Pcurv))->Pole(ii))) { aIN = Standard_False; TColgp_Array1OfPnt2d qoles(1,2); qoles(1)=UV1; diff --git a/src/ChFiDS/ChFiDS_Stripe.cxx b/src/ChFiDS/ChFiDS_Stripe.cxx index 703933a348..c3bfe5b20c 100644 --- a/src/ChFiDS/ChFiDS_Stripe.cxx +++ b/src/ChFiDS/ChFiDS_Stripe.cxx @@ -86,7 +86,7 @@ void ChFiDS_Stripe::SetCurve(const Standard_Integer Index, //======================================================================= -//function : Handle_Geom2d_Curve& +//function : Handle(Geom2d_Curve)& //purpose : //======================================================================= diff --git a/src/ChFiKPart/ChFiKPart_ComputeData.cxx b/src/ChFiKPart/ChFiKPart_ComputeData.cxx index 74039efbf3..f6a2c4aa06 100644 --- a/src/ChFiKPart/ChFiKPart_ComputeData.cxx +++ b/src/ChFiKPart/ChFiKPart_ComputeData.cxx @@ -92,8 +92,8 @@ Standard_Boolean ChFiKPart_ComputeData::Compute (TopOpeBRepDS_DataStructure& DStr, Handle(ChFiDS_SurfData)& Data, - const Handle_Adaptor3d_HSurface& S1, - const Handle_Adaptor3d_HSurface& S2, + const Handle(Adaptor3d_HSurface)& S1, + const Handle(Adaptor3d_HSurface)& S2, const TopAbs_Orientation Or1, const TopAbs_Orientation Or2, const Handle(ChFiDS_Spine)& Sp, diff --git a/src/Contap/Contap_Contour.cxx b/src/Contap/Contap_Contour.cxx index 74f2124bc3..ec9a8b01cb 100644 --- a/src/Contap/Contap_Contour.cxx +++ b/src/Contap/Contap_Contour.cxx @@ -1015,7 +1015,7 @@ void ComputeInternalPointsOnRstr return; } - const Handle_Adaptor2d_HCurve2d& thearc = Line.Arc(); + const Handle(Adaptor2d_HCurve2d)& thearc = Line.Arc(); const Handle(Adaptor3d_HSurface)& Surf = SFunc.Surface(); Contap_TFunction TypeFunc(SFunc.FunctionType()); diff --git a/src/Contap/Contap_HContTool.cxx b/src/Contap/Contap_HContTool.cxx index ab0498d9b7..9b23602465 100644 --- a/src/Contap/Contap_HContTool.cxx +++ b/src/Contap/Contap_HContTool.cxx @@ -41,7 +41,7 @@ Standard_Integer Contap_HContTool::NbSamplesV break; case GeomAbs_BSplineSurface: { - //-- Handle_Geom_BSplineSurface& HBS=S->BSpline(); + //-- Handle(Geom_BSplineSurface)& HBS=S->BSpline(); nbs = S->NbVKnots(); nbs*= S->VDegree(); if(nbs < 2) nbs=2; @@ -88,7 +88,7 @@ Standard_Integer Contap_HContTool::NbSamplesU break; case GeomAbs_BSplineSurface: { - //-- Handle_Geom_BSplineSurface& HBS=S->BSpline(); + //-- Handle(Geom_BSplineSurface)& HBS=S->BSpline(); nbs = S->NbUKnots(); nbs*= S->UDegree(); if(nbs < 2) nbs=2; @@ -233,7 +233,7 @@ Standard_Integer Contap_HContTool::NbSamplesOnArc nbsOnC = A->NbPoles(); break; case GeomAbs_BSplineCurve: { - //-- Handle_Geom2d_BSplineCurve& BSC=A->BSpline(); + //-- Handle(Geom2d_BSplineCurve)& BSC=A->BSpline(); nbsOnC = 2 + A->NbKnots() * A->Degree(); break; } diff --git a/src/Contap/Contap_Point.lxx b/src/Contap/Contap_Point.lxx index 8684a5ae3c..89a5252d67 100644 --- a/src/Contap/Contap_Point.lxx +++ b/src/Contap/Contap_Point.lxx @@ -94,7 +94,7 @@ inline Standard_Boolean Contap_Point::IsOnArc () const{ return onarc; } -inline const Handle_Adaptor2d_HCurve2d& Contap_Point::Arc () const { +inline const Handle(Adaptor2d_HCurve2d)& Contap_Point::Arc () const { if (!onarc) {Standard_DomainError::Raise();} return arc; @@ -122,7 +122,7 @@ inline Standard_Boolean Contap_Point::IsVertex () const { return isvtx; } -inline const Handle_Adaptor3d_HVertex& Contap_Point::Vertex () const { +inline const Handle(Adaptor3d_HVertex)& Contap_Point::Vertex () const { if (!isvtx) {Standard_DomainError::Raise();} return vtx; diff --git a/src/Contap/Contap_SurfFunction.lxx b/src/Contap/Contap_SurfFunction.lxx index 2e819ff5d0..bad8a0560c 100644 --- a/src/Contap/Contap_SurfFunction.lxx +++ b/src/Contap/Contap_SurfFunction.lxx @@ -80,7 +80,7 @@ inline const gp_Dir2d& Contap_SurfFunction::Direction2d() return d2d; } -inline const Handle_Adaptor3d_HSurface& Contap_SurfFunction::Surface() const +inline const Handle(Adaptor3d_HSurface)& Contap_SurfFunction::Surface() const { return mySurf; } diff --git a/src/Convert/Convert_CompPolynomialToPoles.cxx b/src/Convert/Convert_CompPolynomialToPoles.cxx index 9e0ac4b067..6ef7febb63 100644 --- a/src/Convert/Convert_CompPolynomialToPoles.cxx +++ b/src/Convert/Convert_CompPolynomialToPoles.cxx @@ -43,10 +43,10 @@ Convert_CompPolynomialToPoles::Convert_CompPolynomialToPoles( const Standard_Integer Continuity, const Standard_Integer Dimension, const Standard_Integer MaxDegree, - const Handle_TColStd_HArray1OfInteger& NumCoeffPerCurve, - const Handle_TColStd_HArray1OfReal& Coefficients, - const Handle_TColStd_HArray2OfReal& PolynomialIntervals, - const Handle_TColStd_HArray1OfReal& TrueIntervals) + const Handle(TColStd_HArray1OfInteger)& NumCoeffPerCurve, + const Handle(TColStd_HArray1OfReal)& Coefficients, + const Handle(TColStd_HArray2OfReal)& PolynomialIntervals, + const Handle(TColStd_HArray1OfReal)& TrueIntervals) : myDone(Standard_False) { Standard_Integer ii, delta; @@ -319,7 +319,7 @@ Standard_Integer Convert_CompPolynomialToPoles::NbPoles() const //======================================================================= void Convert_CompPolynomialToPoles::Poles( - Handle_TColStd_HArray2OfReal& P) const + Handle(TColStd_HArray2OfReal)& P) const { if (myDone) { P = myPoles ; } } @@ -342,7 +342,7 @@ Standard_Integer Convert_CompPolynomialToPoles::NbKnots() const //======================================================================= void Convert_CompPolynomialToPoles::Knots( - Handle_TColStd_HArray1OfReal& K) const + Handle(TColStd_HArray1OfReal)& K) const { if (myDone) { K = myKnots ; } } @@ -353,7 +353,7 @@ void Convert_CompPolynomialToPoles::Knots( //======================================================================= void Convert_CompPolynomialToPoles::Multiplicities( - Handle_TColStd_HArray1OfInteger& M) const + Handle(TColStd_HArray1OfInteger)& M) const { if (myDone) { M = myMults ; } } diff --git a/src/DBC/DBC_BaseArray.cxx b/src/DBC/DBC_BaseArray.cxx index 50c2927b8e..d7372449bb 100644 --- a/src/DBC/DBC_BaseArray.cxx +++ b/src/DBC/DBC_BaseArray.cxx @@ -74,7 +74,7 @@ static PStandard_ArrayNode DBC_tmpItem; // should be d_Varray for 4.6 // Use an Collection of StandardDB_O2Handle // for none primitive type to avoid to import -// Handle_Standard_Persistent. +// Handle(Standard_Persistent). // -------------------------------------------------------------------- // Last revision : January 1996 JMS/CLE // portage OBJY 3.8 diff --git a/src/DBC/DBC_DBVArray.hxx b/src/DBC/DBC_DBVArray.hxx index c3cea29a32..f0141dad72 100644 --- a/src/DBC/DBC_DBVArray.hxx +++ b/src/DBC/DBC_DBVArray.hxx @@ -23,7 +23,7 @@ typedef ooVArray(PHandle_PStandard_ArrayNode) DBC_DBVArray; #ifdef CSFDB #include -//typedef Handle_PStandard_ArrayNode* DBC_DBVArray; +//typedef Handle(PStandard_ArrayNode)* DBC_DBVArray; typedef void* DBC_DBVArray; #endif diff --git a/src/Draft/Draft_EdgeInfo.cxx b/src/Draft/Draft_EdgeInfo.cxx index 9030eb6478..660c467db0 100644 --- a/src/Draft/Draft_EdgeInfo.cxx +++ b/src/Draft/Draft_EdgeInfo.cxx @@ -154,7 +154,7 @@ Handle(Geom_Curve)& Draft_EdgeInfo::ChangeGeometry() } //======================================================================= -//function : Handle_Geom2d_Curve& +//function : Handle(Geom2d_Curve)& //purpose : //======================================================================= @@ -165,7 +165,7 @@ const Handle(Geom2d_Curve)& Draft_EdgeInfo::FirstPC() const //======================================================================= -//function : Handle_Geom2d_Curve& +//function : Handle(Geom2d_Curve)& //purpose : //======================================================================= diff --git a/src/Dynamic/Dynamic_DynamicInstance.cxx b/src/Dynamic/Dynamic_DynamicInstance.cxx index d03450c44e..729f0852e2 100644 --- a/src/Dynamic/Dynamic_DynamicInstance.cxx +++ b/src/Dynamic/Dynamic_DynamicInstance.cxx @@ -166,7 +166,7 @@ void Dynamic_DynamicInstance::Execute(const Standard_CString amethod) const Handle(Dynamic_CompiledMethod) method_1 = Handle(Dynamic_CompiledMethod)::DownCast(method); typedef void (*function)(const Handle(Dynamic_DynamicInstance)&); -// ((function)((*(Handle_Dynamic_CompiledMethod*)&method)->Function().ToCString()))(me); +// ((function)((*(Handle(Dynamic_CompiledMethod)*)&method)->Function().ToCString()))(me); ((function)(method_1->Function().ToCString()))(me); } else @@ -174,7 +174,7 @@ void Dynamic_DynamicInstance::Execute(const Standard_CString amethod) const /* Standard_Integer argc = 2; char* argv[2]; argv[0] = "source"; - argv[1] = (*(Handle_Dynamic_InterpretedMethod*)&method)->Function(); + argv[1] = (*(Handle(Dynamic_InterpretedMethod)*)&method)->Function(); source(argc,argv);*/ } } diff --git a/src/Dynamic/Dynamic_FuzzyClass.cxx b/src/Dynamic/Dynamic_FuzzyClass.cxx index 6c55ab8931..f277f42713 100644 --- a/src/Dynamic/Dynamic_FuzzyClass.cxx +++ b/src/Dynamic/Dynamic_FuzzyClass.cxx @@ -226,7 +226,7 @@ Standard_Boolean Dynamic_FuzzyClass::Value(const Standard_CString aparameter, parameter = parameternode->Object(); if(parameter->Name() == aparameter) { - avalue = (*(Handle_Dynamic_BooleanParameter*)¶meter)->Value(); + avalue = (*(Handle(Dynamic_BooleanParameter)*)¶meter)->Value(); return Standard_True; } parameternode = parameternode->Next(); @@ -253,7 +253,7 @@ Standard_Boolean Dynamic_FuzzyClass::Value(const Standard_CString aparameter, parameter = parameternode->Object(); if(parameter->Name() == aparameter) { - avalue = (*(Handle_Dynamic_IntegerParameter*)¶meter)->Value(); + avalue = (*(Handle(Dynamic_IntegerParameter)*)¶meter)->Value(); return Standard_True; } parameternode = parameternode->Next(); @@ -280,7 +280,7 @@ Standard_Boolean Dynamic_FuzzyClass::Value(const Standard_CString aparameter, parameter = parameternode->Object(); if(parameter->Name() == aparameter) { - avalue = (*(Handle_Dynamic_RealParameter*)¶meter)->Value(); + avalue = (*(Handle(Dynamic_RealParameter)*)¶meter)->Value(); return Standard_True; } parameternode = parameternode->Next(); @@ -307,7 +307,7 @@ Standard_Boolean Dynamic_FuzzyClass::Value(const Standard_CString aparameter, parameter = parameternode->Object(); if(parameter->Name() == aparameter) { - avalue = (*(Handle_Dynamic_StringParameter*)¶meter)->Value(); + avalue = (*(Handle(Dynamic_StringParameter)*)¶meter)->Value(); return Standard_True; } parameternode = parameternode->Next(); @@ -334,7 +334,7 @@ Standard_Boolean Dynamic_FuzzyClass::Value(const Standard_CString aparameter, parameter = parameternode->Object(); if(parameter->Name() == aparameter) { - anobject = (*(Handle_Dynamic_ObjectParameter*)¶meter)->Value(); + anobject = (*(Handle(Dynamic_ObjectParameter)*)¶meter)->Value(); return Standard_True; } parameternode = parameternode->Next(); diff --git a/src/Dynamic/Dynamic_FuzzyInstance.gxx b/src/Dynamic/Dynamic_FuzzyInstance.gxx index 5e4110b21a..0b6ecbcc73 100644 --- a/src/Dynamic/Dynamic_FuzzyInstance.gxx +++ b/src/Dynamic/Dynamic_FuzzyInstance.gxx @@ -78,7 +78,7 @@ Handle(Dynamic_FuzzyClass) Dynamic_FuzzyInstance::Definition() const } else { - definition = *(Handle_Dynamic_FuzzyInstance*)&thedefinition; + definition = *(Handle(Dynamic_FuzzyInstance)*)&thedefinition; return definition->Definition(); } } diff --git a/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx b/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx index 1e272c18f6..19fd061af8 100644 --- a/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx +++ b/src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx @@ -196,7 +196,7 @@ Standard_Boolean Dynamic_MethodDefinitionsDictionary::Definition(const Handle(Dy Handle(Dynamic_MethodDefinition) methoddefinition; if(adefinition->IsKind(STANDARD_TYPE(Dynamic_MethodDefinition))) { - methoddefinition = *(Handle_Dynamic_MethodDefinition*)&adefinition; + methoddefinition = *(Handle(Dynamic_MethodDefinition)*)&adefinition; thesequenceofmethoddefinitions->Append(methoddefinition); return Standard_True; } diff --git a/src/Expr/Expr_BinaryExpression.cxx b/src/Expr/Expr_BinaryExpression.cxx index cb43954fde..bbe25e29bb 100644 --- a/src/Expr/Expr_BinaryExpression.cxx +++ b/src/Expr/Expr_BinaryExpression.cxx @@ -74,7 +74,7 @@ const Handle(Expr_GeneralExpression)& Expr_BinaryExpression::SubExpression (cons Standard_OutOfRange::Raise(); } } - return *( ( Handle_Expr_GeneralExpression* )NULL ); + return *( ( Handle(Expr_GeneralExpression)* )NULL ); } Standard_Boolean Expr_BinaryExpression::ContainsUnknowns () const diff --git a/src/Extrema/Extrema_GenExtPS.cxx b/src/Extrema/Extrema_GenExtPS.cxx index 2780e7edf1..d8af103d38 100644 --- a/src/Extrema/Extrema_GenExtPS.cxx +++ b/src/Extrema/Extrema_GenExtPS.cxx @@ -369,7 +369,7 @@ inline static void fillParams(const TColStd_Array1OfReal& theKnots, Standard_Integer theDegree, Standard_Real theParMin, Standard_Real theParMax, - Handle_TColStd_HArray1OfReal& theParams, + Handle(TColStd_HArray1OfReal)& theParams, Standard_Integer theSample) { NCollection_Vector aParams; diff --git a/src/FilletSurf/FilletSurf_InternalBuilder.cxx b/src/FilletSurf/FilletSurf_InternalBuilder.cxx index a472fa5972..35d58dbc7f 100644 --- a/src/FilletSurf/FilletSurf_InternalBuilder.cxx +++ b/src/FilletSurf/FilletSurf_InternalBuilder.cxx @@ -414,17 +414,17 @@ Standard_Boolean return Standard_True; } -void FilletSurf_InternalBuilder::PerformSurf(ChFiDS_SequenceOfSurfData&, const Handle_ChFiDS_HElSpine&, const Handle_ChFiDS_Spine&, const int, const Handle_BRepAdaptor_HSurface&, const Handle_Adaptor3d_TopolTool&, const Handle_BRepAdaptor_HCurve2d&, const Handle_BRepAdaptor_HSurface&, const Handle_BRepAdaptor_HCurve2d&, unsigned int&, const Handle_BRepAdaptor_HSurface&, const Handle_Adaptor3d_TopolTool&, const TopAbs_Orientation, const double, const double, const double, double&, double&, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const math_Vector&) +void FilletSurf_InternalBuilder::PerformSurf(ChFiDS_SequenceOfSurfData&, const Handle(ChFiDS_HElSpine)&, const Handle(ChFiDS_Spine)&, const int, const Handle(BRepAdaptor_HSurface)&, const Handle(Adaptor3d_TopolTool)&, const Handle(BRepAdaptor_HCurve2d)&, const Handle(BRepAdaptor_HSurface)&, const Handle(BRepAdaptor_HCurve2d)&, unsigned int&, const Handle(BRepAdaptor_HSurface)&, const Handle(Adaptor3d_TopolTool)&, const TopAbs_Orientation, const double, const double, const double, double&, double&, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const math_Vector&) { Standard_DomainError::Raise("BlendFunc_CSConstRad::Section : Not implemented"); } -void FilletSurf_InternalBuilder::PerformSurf(ChFiDS_SequenceOfSurfData&, const Handle_ChFiDS_HElSpine&, const Handle_ChFiDS_Spine&, const int, const Handle_BRepAdaptor_HSurface&, const Handle_Adaptor3d_TopolTool&, const Handle_BRepAdaptor_HCurve2d&, const Handle_BRepAdaptor_HSurface&, const Handle_BRepAdaptor_HCurve2d&, unsigned int&, const TopAbs_Orientation, const Handle_BRepAdaptor_HSurface&, const Handle_Adaptor3d_TopolTool&, const Handle_BRepAdaptor_HCurve2d&, const Handle_BRepAdaptor_HSurface&, const Handle_BRepAdaptor_HCurve2d&, unsigned int&, const TopAbs_Orientation, const double, const double, const double, double&, double&, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const math_Vector&) +void FilletSurf_InternalBuilder::PerformSurf(ChFiDS_SequenceOfSurfData&, const Handle(ChFiDS_HElSpine)&, const Handle(ChFiDS_Spine)&, const int, const Handle(BRepAdaptor_HSurface)&, const Handle(Adaptor3d_TopolTool)&, const Handle(BRepAdaptor_HCurve2d)&, const Handle(BRepAdaptor_HSurface)&, const Handle(BRepAdaptor_HCurve2d)&, unsigned int&, const TopAbs_Orientation, const Handle(BRepAdaptor_HSurface)&, const Handle(Adaptor3d_TopolTool)&, const Handle(BRepAdaptor_HCurve2d)&, const Handle(BRepAdaptor_HSurface)&, const Handle(BRepAdaptor_HCurve2d)&, unsigned int&, const TopAbs_Orientation, const double, const double, const double, double&, double&, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const math_Vector&) { Standard_DomainError::Raise("BlendFunc_CSConstRad::Section : Not implemented"); } -void FilletSurf_InternalBuilder::PerformSurf(ChFiDS_SequenceOfSurfData&, const Handle_ChFiDS_HElSpine&, const Handle_ChFiDS_Spine&, const int, const Handle_BRepAdaptor_HSurface&, const Handle_Adaptor3d_TopolTool&, const TopAbs_Orientation, const Handle_BRepAdaptor_HSurface&, const Handle_Adaptor3d_TopolTool&, const Handle_BRepAdaptor_HCurve2d&, const Handle_BRepAdaptor_HSurface&, const Handle_BRepAdaptor_HCurve2d&, unsigned int&, const double, const double, const double, double&, double&, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const math_Vector&) +void FilletSurf_InternalBuilder::PerformSurf(ChFiDS_SequenceOfSurfData&, const Handle(ChFiDS_HElSpine)&, const Handle(ChFiDS_Spine)&, const int, const Handle(BRepAdaptor_HSurface)&, const Handle(Adaptor3d_TopolTool)&, const TopAbs_Orientation, const Handle(BRepAdaptor_HSurface)&, const Handle(Adaptor3d_TopolTool)&, const Handle(BRepAdaptor_HCurve2d)&, const Handle(BRepAdaptor_HSurface)&, const Handle(BRepAdaptor_HCurve2d)&, unsigned int&, const double, const double, const double, double&, double&, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const unsigned int, const math_Vector&) { Standard_DomainError::Raise("BlendFunc_CSConstRad::Section : Not implemented"); } diff --git a/src/Geom2dAPI/Geom2dAPI_Interpolate.cxx b/src/Geom2dAPI/Geom2dAPI_Interpolate.cxx index bcafdc12c6..c1858fa4d9 100644 --- a/src/Geom2dAPI/Geom2dAPI_Interpolate.cxx +++ b/src/Geom2dAPI/Geom2dAPI_Interpolate.cxx @@ -96,7 +96,7 @@ static Standard_Boolean CheckParameters(const //======================================================================= static void BuildParameters(const Standard_Boolean PeriodicFlag, const TColgp_Array1OfPnt2d& PointsArray, - Handle_TColStd_HArray1OfReal& ParametersPtr) + Handle(TColStd_HArray1OfReal)& ParametersPtr) { Standard_Integer ii, index ; @@ -310,7 +310,7 @@ static void ScaleTangents(const TColgp_Array1OfPnt2d& PointsArray, //======================================================================= Geom2dAPI_Interpolate::Geom2dAPI_Interpolate - (const Handle_TColgp_HArray1OfPnt2d& PointsPtr, + (const Handle(TColgp_HArray1OfPnt2d)& PointsPtr, const Standard_Boolean PeriodicFlag, const Standard_Real Tolerance) : myTolerance(Tolerance), @@ -352,8 +352,8 @@ myTangentRequest(Standard_False) //======================================================================= Geom2dAPI_Interpolate::Geom2dAPI_Interpolate - (const Handle_TColgp_HArray1OfPnt2d& PointsPtr, - const Handle_TColStd_HArray1OfReal& ParametersPtr, + (const Handle(TColgp_HArray1OfPnt2d)& PointsPtr, + const Handle(TColStd_HArray1OfReal)& ParametersPtr, const Standard_Boolean PeriodicFlag, const Standard_Real Tolerance) : myTolerance(Tolerance), @@ -404,7 +404,7 @@ myTangentRequest(Standard_False) void Geom2dAPI_Interpolate::Load( const TColgp_Array1OfVec2d& Tangents, - const Handle_TColStd_HArray1OfBoolean& TangentFlagsPtr) + const Handle(TColStd_HArray1OfBoolean)& TangentFlagsPtr) { Standard_Boolean result ; @@ -891,7 +891,7 @@ void Geom2dAPI_Interpolate::PerformNonPeriodic() } } //======================================================================= -//function : Handle_Geom2d_BSplineCurve& +//function : Handle(Geom2d_BSplineCurve)& //purpose : //======================================================================= diff --git a/src/Geom2dAPI/Geom2dAPI_PointsToBSpline.cxx b/src/Geom2dAPI/Geom2dAPI_PointsToBSpline.cxx index 3b1f218433..e88bf71043 100644 --- a/src/Geom2dAPI/Geom2dAPI_PointsToBSpline.cxx +++ b/src/Geom2dAPI/Geom2dAPI_PointsToBSpline.cxx @@ -460,7 +460,7 @@ void Geom2dAPI_PointsToBSpline::Init } //======================================================================= -//function : Handle_Geom2d_BSplineCurve& +//function : Handle(Geom2d_BSplineCurve)& //purpose : //======================================================================= diff --git a/src/Geom2dLProp/Geom2dLProp_Curve2dTool.cxx b/src/Geom2dLProp/Geom2dLProp_Curve2dTool.cxx index b107118e96..5e8b3ceee4 100644 --- a/src/Geom2dLProp/Geom2dLProp_Curve2dTool.cxx +++ b/src/Geom2dLProp/Geom2dLProp_Curve2dTool.cxx @@ -18,31 +18,31 @@ #include #include -void Geom2dLProp_Curve2dTool::Value(const Handle_Geom2d_Curve& C, +void Geom2dLProp_Curve2dTool::Value(const Handle(Geom2d_Curve)& C, const Standard_Real U, gp_Pnt2d& P) { P = C->Value(U); } -void Geom2dLProp_Curve2dTool::D1(const Handle_Geom2d_Curve& C, +void Geom2dLProp_Curve2dTool::D1(const Handle(Geom2d_Curve)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) { C->D1(U, P, V1); } -void Geom2dLProp_Curve2dTool::D2(const Handle_Geom2d_Curve& C, +void Geom2dLProp_Curve2dTool::D2(const Handle(Geom2d_Curve)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) { C->D2(U, P, V1, V2); } -void Geom2dLProp_Curve2dTool::D3(const Handle_Geom2d_Curve& C, +void Geom2dLProp_Curve2dTool::D3(const Handle(Geom2d_Curve)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) { C->D3(U, P, V1, V2, V3); } -Standard_Integer Geom2dLProp_Curve2dTool::Continuity(const Handle_Geom2d_Curve& C) +Standard_Integer Geom2dLProp_Curve2dTool::Continuity(const Handle(Geom2d_Curve)& C) { GeomAbs_Shape s = C->Continuity(); switch (s) { @@ -64,12 +64,12 @@ Standard_Integer Geom2dLProp_Curve2dTool::Continuity(const Handle_Geom2d_Curve& return 0; } -Standard_Real Geom2dLProp_Curve2dTool::FirstParameter(const Handle_Geom2d_Curve& C) +Standard_Real Geom2dLProp_Curve2dTool::FirstParameter(const Handle(Geom2d_Curve)& C) { return C->FirstParameter(); } -Standard_Real Geom2dLProp_Curve2dTool::LastParameter(const Handle_Geom2d_Curve& C) +Standard_Real Geom2dLProp_Curve2dTool::LastParameter(const Handle(Geom2d_Curve)& C) { return C->LastParameter(); } diff --git a/src/GeomAPI/GeomAPI_Interpolate.cxx b/src/GeomAPI/GeomAPI_Interpolate.cxx index e3d28da979..673ded3be5 100644 --- a/src/GeomAPI/GeomAPI_Interpolate.cxx +++ b/src/GeomAPI/GeomAPI_Interpolate.cxx @@ -96,7 +96,7 @@ static Standard_Boolean CheckParameters(const //======================================================================= static void BuildParameters(const Standard_Boolean PeriodicFlag, const TColgp_Array1OfPnt& PointsArray, - Handle_TColStd_HArray1OfReal& ParametersPtr) + Handle(TColStd_HArray1OfReal)& ParametersPtr) { Standard_Integer ii, index ; @@ -310,7 +310,7 @@ static void ScaleTangents(const TColgp_Array1OfPnt& PointsArray, //======================================================================= GeomAPI_Interpolate::GeomAPI_Interpolate - (const Handle_TColgp_HArray1OfPnt& PointsPtr, + (const Handle(TColgp_HArray1OfPnt)& PointsPtr, const Standard_Boolean PeriodicFlag, const Standard_Real Tolerance) : myTolerance(Tolerance), @@ -351,8 +351,8 @@ myTangentRequest(Standard_False) //======================================================================= GeomAPI_Interpolate::GeomAPI_Interpolate - (const Handle_TColgp_HArray1OfPnt& PointsPtr, - const Handle_TColStd_HArray1OfReal& ParametersPtr, + (const Handle(TColgp_HArray1OfPnt)& PointsPtr, + const Handle(TColStd_HArray1OfReal)& ParametersPtr, const Standard_Boolean PeriodicFlag, const Standard_Real Tolerance) : myTolerance(Tolerance), @@ -403,7 +403,7 @@ myTangentRequest(Standard_False) void GeomAPI_Interpolate::Load( const TColgp_Array1OfVec& Tangents, - const Handle_TColStd_HArray1OfBoolean& TangentFlagsPtr, + const Handle(TColStd_HArray1OfBoolean)& TangentFlagsPtr, const Standard_Boolean Scale ) { @@ -898,7 +898,7 @@ void GeomAPI_Interpolate::PerformNonPeriodic() } } //======================================================================= -//function : Handle_Geom_BSplineCurve& +//function : Handle(Geom_BSplineCurve)& //purpose : //======================================================================= diff --git a/src/GeomAPI/GeomAPI_PointsToBSpline.cxx b/src/GeomAPI/GeomAPI_PointsToBSpline.cxx index 2c839322bf..656ee1dc62 100644 --- a/src/GeomAPI/GeomAPI_PointsToBSpline.cxx +++ b/src/GeomAPI/GeomAPI_PointsToBSpline.cxx @@ -339,7 +339,7 @@ void GeomAPI_PointsToBSpline::Init //======================================================================= -//function : Handle_Geom_BSplineCurve& +//function : Handle(Geom_BSplineCurve)& //purpose : //======================================================================= diff --git a/src/GeomAPI/GeomAPI_PointsToBSplineSurface.cxx b/src/GeomAPI/GeomAPI_PointsToBSplineSurface.cxx index a1c5f2b510..6642897249 100644 --- a/src/GeomAPI/GeomAPI_PointsToBSplineSurface.cxx +++ b/src/GeomAPI/GeomAPI_PointsToBSplineSurface.cxx @@ -657,7 +657,7 @@ void GeomAPI_PointsToBSplineSurface::Init(const TColStd_Array2OfReal& ZPoints, //======================================================================= -//function : Handle_Geom_BSplineSurface& +//function : Handle(Geom_BSplineSurface)& //purpose : //======================================================================= diff --git a/src/GeomFill/GeomFill_BoundWithSurf.cxx b/src/GeomFill/GeomFill_BoundWithSurf.cxx index d19a337197..643371476c 100644 --- a/src/GeomFill/GeomFill_BoundWithSurf.cxx +++ b/src/GeomFill/GeomFill_BoundWithSurf.cxx @@ -175,7 +175,7 @@ void GeomFill_BoundWithSurf::Reparametrize(const Standard_Real First, HasDF,HasDL,DF,DL, Rev,30); myPar = new Law_BSpFunc(); - (*((Handle_Law_BSpFunc*) &myPar))->SetCurve(curve); + (*((Handle(Law_BSpFunc)*) &myPar))->SetCurve(curve); } //======================================================================= diff --git a/src/GeomFill/GeomFill_ConstrainedFilling.cxx b/src/GeomFill/GeomFill_ConstrainedFilling.cxx index 7e7f9e494a..a74b8a1f12 100644 --- a/src/GeomFill/GeomFill_ConstrainedFilling.cxx +++ b/src/GeomFill/GeomFill_ConstrainedFilling.cxx @@ -394,8 +394,8 @@ void GeomFill_ConstrainedFilling::Init(const Handle(GeomFill_Boundary)& B1, if(!CheckTgte(i)) { Handle(Law_Function) fu1,fu2; ptch->Func(fu1,fu2); - fu1 = Law::MixBnd(*((Handle_Law_Linear*) &fu1)); - fu2 = Law::MixBnd(*((Handle_Law_Linear*) &fu2)); + fu1 = Law::MixBnd(*((Handle(Law_Linear)*) &fu1)); + fu2 = Law::MixBnd(*((Handle(Law_Linear)*) &fu2)); ptch->Func(fu1,fu2); break; } @@ -475,8 +475,8 @@ void GeomFill_ConstrainedFilling::Init(const Handle(GeomFill_Boundary)& B1, if(!CheckTgte(i)) { Handle(Law_Function) fu1,fu2; ptch->Func(fu1,fu2); - Handle(Law_Function) ffu1 = Law::MixBnd(*((Handle_Law_Linear*) &fu1)); - Handle(Law_Function) ffu2 = Law::MixBnd(*((Handle_Law_Linear*) &fu2)); + Handle(Law_Function) ffu1 = Law::MixBnd(*((Handle(Law_Linear)*) &fu1)); + Handle(Law_Function) ffu2 = Law::MixBnd(*((Handle(Law_Linear)*) &fu2)); ptch->SetFunc(ffu1,ffu2); break; } diff --git a/src/GeomFill/GeomFill_CoonsAlgPatch.cxx b/src/GeomFill/GeomFill_CoonsAlgPatch.cxx index dc8d81c4f9..046408b6dd 100644 --- a/src/GeomFill/GeomFill_CoonsAlgPatch.cxx +++ b/src/GeomFill/GeomFill_CoonsAlgPatch.cxx @@ -33,10 +33,10 @@ GeomFill_CoonsAlgPatch::GeomFill_CoonsAlgPatch Standard_Real deb0, deb1, fin0, fin1; B2->Bounds(deb1,fin1); a[0] = new Law_Linear(); - (*((Handle_Law_Linear*) &a[0]))->Set(deb1,1.,fin1,0.); + (*((Handle(Law_Linear)*) &a[0]))->Set(deb1,1.,fin1,0.); B1->Bounds(deb0,fin0); a[1] = new Law_Linear(); - (*((Handle_Law_Linear*) &a[1]))->Set(deb0,0.,fin0,1.); + (*((Handle(Law_Linear)*) &a[1]))->Set(deb0,0.,fin0,1.); gp_XYZ temp; temp = B4->Value(deb1).XYZ().Added(B1->Value(deb0).XYZ()); diff --git a/src/GeomFill/GeomFill_NSections.cxx b/src/GeomFill/GeomFill_NSections.cxx index dc7a8314e5..061d61e712 100644 --- a/src/GeomFill/GeomFill_NSections.cxx +++ b/src/GeomFill/GeomFill_NSections.cxx @@ -147,7 +147,7 @@ Standard_Boolean verifD2(const TColgp_Array1OfVec& DP1, #endif // fonction d'evaluation des poles et des poids de mySurface pour D1 et D2 -static void ResultEval(const Handle_Geom_BSplineSurface& surf, +static void ResultEval(const Handle(Geom_BSplineSurface)& surf, const Standard_Real V, const Standard_Integer deriv, TColStd_Array1OfReal& Result) diff --git a/src/GeomFill/GeomFill_SectionGenerator.cxx b/src/GeomFill/GeomFill_SectionGenerator.cxx index b707ac435a..b4a947f67d 100644 --- a/src/GeomFill/GeomFill_SectionGenerator.cxx +++ b/src/GeomFill/GeomFill_SectionGenerator.cxx @@ -43,7 +43,7 @@ GeomFill_SectionGenerator::GeomFill_SectionGenerator() //purpose : //======================================================================= -void GeomFill_SectionGenerator::SetParam(const Handle_TColStd_HArray1OfReal & Params) +void GeomFill_SectionGenerator::SetParam(const Handle(TColStd_HArray1OfReal) & Params) { Standard_Integer ii, L = Params->Upper()-Params->Lower()+1; myParams = Params; diff --git a/src/GeomFill/GeomFill_SimpleBound.cxx b/src/GeomFill/GeomFill_SimpleBound.cxx index 955c8e65a0..3eb8f098a6 100644 --- a/src/GeomFill/GeomFill_SimpleBound.cxx +++ b/src/GeomFill/GeomFill_SimpleBound.cxx @@ -77,7 +77,7 @@ void GeomFill_SimpleBound::Reparametrize(const Standard_Real First, HasDF,HasDL,DF,DL, Rev,30); myPar = new Law_BSpFunc(); - (*((Handle_Law_BSpFunc*) &myPar))->SetCurve(curve); + (*((Handle(Law_BSpFunc)*) &myPar))->SetCurve(curve); } //======================================================================= diff --git a/src/GeomLProp/GeomLProp_CurveTool.cxx b/src/GeomLProp/GeomLProp_CurveTool.cxx index 2e6bee69ae..a66317f631 100644 --- a/src/GeomLProp/GeomLProp_CurveTool.cxx +++ b/src/GeomLProp/GeomLProp_CurveTool.cxx @@ -18,31 +18,31 @@ #include #include -void GeomLProp_CurveTool::Value(const Handle_Geom_Curve& C, +void GeomLProp_CurveTool::Value(const Handle(Geom_Curve)& C, const Standard_Real U, gp_Pnt& P) { P = C->Value(U); } -void GeomLProp_CurveTool::D1(const Handle_Geom_Curve& C, +void GeomLProp_CurveTool::D1(const Handle(Geom_Curve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1) { C->D1(U, P, V1); } -void GeomLProp_CurveTool::D2(const Handle_Geom_Curve& C, +void GeomLProp_CurveTool::D2(const Handle(Geom_Curve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) { C->D2(U, P, V1, V2); } -void GeomLProp_CurveTool::D3(const Handle_Geom_Curve& C, +void GeomLProp_CurveTool::D3(const Handle(Geom_Curve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) { C->D3(U, P, V1, V2, V3); } -Standard_Integer GeomLProp_CurveTool::Continuity(const Handle_Geom_Curve& C) +Standard_Integer GeomLProp_CurveTool::Continuity(const Handle(Geom_Curve)& C) { GeomAbs_Shape s = C->Continuity(); switch (s) { @@ -64,12 +64,12 @@ Standard_Integer GeomLProp_CurveTool::Continuity(const Handle_Geom_Curve& C) return 0; } -Standard_Real GeomLProp_CurveTool::FirstParameter(const Handle_Geom_Curve& C) +Standard_Real GeomLProp_CurveTool::FirstParameter(const Handle(Geom_Curve)& C) { return C->FirstParameter(); } -Standard_Real GeomLProp_CurveTool::LastParameter(const Handle_Geom_Curve& C) +Standard_Real GeomLProp_CurveTool::LastParameter(const Handle(Geom_Curve)& C) { return C->LastParameter(); } diff --git a/src/GeomLProp/GeomLProp_SurfaceTool.cxx b/src/GeomLProp/GeomLProp_SurfaceTool.cxx index 7cf845c2eb..e4850e3707 100644 --- a/src/GeomLProp/GeomLProp_SurfaceTool.cxx +++ b/src/GeomLProp/GeomLProp_SurfaceTool.cxx @@ -19,20 +19,20 @@ #include -void GeomLProp_SurfaceTool::Value(const Handle_Geom_Surface& S, +void GeomLProp_SurfaceTool::Value(const Handle(Geom_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P) { P = S->Value(U, V); } -void GeomLProp_SurfaceTool::D1(const Handle_Geom_Surface& S, +void GeomLProp_SurfaceTool::D1(const Handle(Geom_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) { S->D1(U, V, P, D1U, D1V); } -void GeomLProp_SurfaceTool::D2(const Handle_Geom_Surface& S, +void GeomLProp_SurfaceTool::D2(const Handle(Geom_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& DUV) { @@ -43,7 +43,7 @@ void GeomLProp_SurfaceTool::D2(const Handle_Geom_Surface& S, //function : DN //purpose : //======================================================================= -gp_Vec GeomLProp_SurfaceTool::DN(const Handle_Geom_Surface& S, +gp_Vec GeomLProp_SurfaceTool::DN(const Handle(Geom_Surface)& S, const Standard_Real U, const Standard_Real V, const Standard_Integer IU, @@ -52,7 +52,7 @@ gp_Vec GeomLProp_SurfaceTool::DN(const Handle_Geom_Surface& S, return S->DN(U, V, IU, IV); } -Standard_Integer GeomLProp_SurfaceTool::Continuity(const Handle_Geom_Surface& S) +Standard_Integer GeomLProp_SurfaceTool::Continuity(const Handle(Geom_Surface)& S) { GeomAbs_Shape s = S->Continuity(); switch (s) { @@ -74,7 +74,7 @@ Standard_Integer GeomLProp_SurfaceTool::Continuity(const Handle_Geom_Surface& S return 0; } -void GeomLProp_SurfaceTool::Bounds(const Handle_Geom_Surface& S, +void GeomLProp_SurfaceTool::Bounds(const Handle(Geom_Surface)& S, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) { diff --git a/src/GeomLib/GeomLib.cxx b/src/GeomLib/GeomLib.cxx index cb027e2064..4cff60df63 100644 --- a/src/GeomLib/GeomLib.cxx +++ b/src/GeomLib/GeomLib.cxx @@ -1053,7 +1053,7 @@ void GeomLib::BuildCurve3d(const Standard_Real Tolerance, Adaptor3d_CurveOnSurface& Curve, const Standard_Real FirstParameter, const Standard_Real LastParameter, - Handle_Geom_Curve& NewCurvePtr, + Handle(Geom_Curve)& NewCurvePtr, Standard_Real& MaxDeviation, Standard_Real& AverageDeviation, const GeomAbs_Shape Continuity, diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx index 4069277ce6..e89e94d708 100644 --- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx +++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx @@ -1081,14 +1081,14 @@ Standard_Boolean GeomPlate_BuildPlateSurface::IsDone() const //--------------------------------------------------------- // fonction : Surface //--------------------------------------------------------- -Handle_GeomPlate_Surface GeomPlate_BuildPlateSurface::Surface() const +Handle(GeomPlate_Surface) GeomPlate_BuildPlateSurface::Surface() const { return myGeomPlateSurface ; } //--------------------------------------------------------- // fonction : SurfInit //--------------------------------------------------------- -Handle_Geom_Surface GeomPlate_BuildPlateSurface::SurfInit() const +Handle(Geom_Surface) GeomPlate_BuildPlateSurface::SurfInit() const { return mySurfInit ; } @@ -1096,7 +1096,7 @@ Handle_Geom_Surface GeomPlate_BuildPlateSurface::SurfInit() const //--------------------------------------------------------- // fonction : Sense //--------------------------------------------------------- -Handle_TColStd_HArray1OfInteger GeomPlate_BuildPlateSurface::Sense() const +Handle(TColStd_HArray1OfInteger) GeomPlate_BuildPlateSurface::Sense() const { Standard_Integer NTCurve = myLinCont->Length(); Handle(TColStd_HArray1OfInteger) Sens = new TColStd_HArray1OfInteger(1, NTCurve); @@ -1110,7 +1110,7 @@ Handle_TColStd_HArray1OfInteger GeomPlate_BuildPlateSurface::Sense() const //--------------------------------------------------------- // fonction : Curve2d //--------------------------------------------------------- -Handle_TColGeom2d_HArray1OfCurve GeomPlate_BuildPlateSurface::Curves2d() const +Handle(TColGeom2d_HArray1OfCurve) GeomPlate_BuildPlateSurface::Curves2d() const { Standard_Integer NTCurve = myLinCont->Length(); Handle(TColGeom2d_HArray1OfCurve) C2dfin = new TColGeom2d_HArray1OfCurve(1,NTCurve); @@ -1125,8 +1125,8 @@ Handle_TColGeom2d_HArray1OfCurve GeomPlate_BuildPlateSurface::Curves2d() const //--------------------------------------------------------- //fonction : Order //--------------------------------------------------------- -Handle_TColStd_HArray1OfInteger GeomPlate_BuildPlateSurface::Order() const -{ Handle_TColStd_HArray1OfInteger result= +Handle(TColStd_HArray1OfInteger) GeomPlate_BuildPlateSurface::Order() const +{ Handle(TColStd_HArray1OfInteger) result= new TColStd_HArray1OfInteger(1,myLinCont->Length()); for (Standard_Integer i=1;i<=myLinCont->Length();i++) result->SetValue(myInitOrder->Value(i),i); diff --git a/src/GeomPlate/GeomPlate_CurveConstraint.cxx b/src/GeomPlate/GeomPlate_CurveConstraint.cxx index 3852f9a6ba..f0bf37b27e 100644 --- a/src/GeomPlate/GeomPlate_CurveConstraint.cxx +++ b/src/GeomPlate/GeomPlate_CurveConstraint.cxx @@ -203,14 +203,14 @@ void GeomPlate_CurveConstraint :: D2(const Standard_Real U, //--------------------------------------------------------- // Fonction : SetG0Criterion //--------------------------------------------------------- -void GeomPlate_CurveConstraint :: SetG0Criterion(const Handle_Law_Function &G0Crit) +void GeomPlate_CurveConstraint :: SetG0Criterion(const Handle(Law_Function) &G0Crit) { myG0Crit=G0Crit; myConstG0=Standard_False; } //--------------------------------------------------------- // Fonction : SetG1Criterion //--------------------------------------------------------- -void GeomPlate_CurveConstraint :: SetG1Criterion(const Handle_Law_Function &G1Crit) +void GeomPlate_CurveConstraint :: SetG1Criterion(const Handle(Law_Function) &G1Crit) { if (!my3dCurve.IsNull()) Standard_Failure::Raise("GeomPlate_CurveConstraint.cxx : Curve must be on a Surface"); myG1Crit=G1Crit; @@ -219,7 +219,7 @@ void GeomPlate_CurveConstraint :: SetG1Criterion(const Handle_Law_Function &G1Cr //--------------------------------------------------------- // Fonction : SetG2Criterion //--------------------------------------------------------- -void GeomPlate_CurveConstraint :: SetG2Criterion(const Handle_Law_Function &G2Crit) +void GeomPlate_CurveConstraint :: SetG2Criterion(const Handle(Law_Function) &G2Crit) { if (!my3dCurve.IsNull()) Standard_Failure::Raise("GeomPlate_CurveConstraint.cxx : Curve must be on a Surface"); myG2Crit=G2Crit; diff --git a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx index 61ccd5419b..fad59f76a1 100644 --- a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx +++ b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx @@ -596,7 +596,7 @@ static Standard_Integer interpol (Draw_Interpretor& di,Standard_Integer n, const char dimen[3]; iFile >> dimen; if (!strcmp(dimen,"3d")) { - Handle_TColgp_HArray1OfPnt Point = + Handle(TColgp_HArray1OfPnt) Point = new TColgp_HArray1OfPnt(1, nbp); for (i = 1; i <= nbp; i++) { iFile >> x >> y >> z; @@ -683,7 +683,7 @@ static Standard_Integer tanginterpol (Draw_Interpretor& di, if ( n < num_parameters * 3 + num_read) { return 1 ; } - Handle_TColgp_HArray1OfPnt PointsArrayPtr= + Handle(TColgp_HArray1OfPnt) PointsArrayPtr= new TColgp_HArray1OfPnt(1,num_parameters) ; num_tangents = ((n - num_read) / 3) - num_parameters ; @@ -706,7 +706,7 @@ static Standard_Integer tanginterpol (Draw_Interpretor& di, if (num_tangents > 0) { TColgp_Array1OfVec TangentsArray(1,num_parameters) ; - Handle_TColStd_HArray1OfBoolean + Handle(TColStd_HArray1OfBoolean) TangentFlagsPtr = new TColStd_HArray1OfBoolean(1,num_parameters) ; diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx index 4a34517624..776e06e97f 100644 --- a/src/GeometryTest/GeometryTest_CurveCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx @@ -1068,7 +1068,7 @@ static Standard_Integer EllipsUniformAbscissa (Draw_Interpretor& di, Standard_In return 1; //test nbPoints for Geom_Ellipse - Handle_Geom_Ellipse ellip; + Handle(Geom_Ellipse) ellip; try diff --git a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx index e37c2e516c..c017226706 100644 --- a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx +++ b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx @@ -112,7 +112,7 @@ HLRBRep_BSurfaceTool::VIntervals(const BRepAdaptor_Surface& Surf, //purpose : //======================================================================= -inline Handle_Adaptor3d_HSurface +inline Handle(Adaptor3d_HSurface) HLRBRep_BSurfaceTool::UTrim(const BRepAdaptor_Surface& Surf, const Standard_Real F, const Standard_Real L, @@ -124,7 +124,7 @@ HLRBRep_BSurfaceTool::UTrim(const BRepAdaptor_Surface& Surf, //purpose : //======================================================================= -inline Handle_Adaptor3d_HSurface +inline Handle(Adaptor3d_HSurface) HLRBRep_BSurfaceTool::VTrim(const BRepAdaptor_Surface& Surf, const Standard_Real F, const Standard_Real L, diff --git a/src/HLRBRep/HLRBRep_SurfaceTool.lxx b/src/HLRBRep/HLRBRep_SurfaceTool.lxx index 87172f6513..332039ec6e 100644 --- a/src/HLRBRep/HLRBRep_SurfaceTool.lxx +++ b/src/HLRBRep/HLRBRep_SurfaceTool.lxx @@ -56,14 +56,14 @@ inline void HLRBRep_SurfaceTool::VIntervals(const Standard_Address Surf, } -inline Handle_Adaptor3d_HSurface HLRBRep_SurfaceTool::UTrim(const Standard_Address Surf, +inline Handle(Adaptor3d_HSurface) HLRBRep_SurfaceTool::UTrim(const Standard_Address Surf, const Standard_Real F, const Standard_Real L, const Standard_Real Tol) { return ((BRepAdaptor_Surface *)Surf)->UTrim(F,L,Tol); } -inline Handle_Adaptor3d_HSurface HLRBRep_SurfaceTool::VTrim(const Standard_Address Surf, +inline Handle(Adaptor3d_HSurface) HLRBRep_SurfaceTool::VTrim(const Standard_Address Surf, const Standard_Real F, const Standard_Real L, const Standard_Real Tol) { diff --git a/src/IFSelect/IFSelect_WorkSession.cxx b/src/IFSelect/IFSelect_WorkSession.cxx index 4b99a5031d..5dbafe8f1b 100644 --- a/src/IFSelect/IFSelect_WorkSession.cxx +++ b/src/IFSelect/IFSelect_WorkSession.cxx @@ -2488,7 +2488,7 @@ IFSelect_ReturnStatus IFSelect_WorkSession::SendAll } } else checks = thecopier->SendAll(filename,thegraph->Graph(),thelibrary,theprotocol); - Handle_Interface_Check aMainFail = checks.CCheck(0); + Handle(Interface_Check) aMainFail = checks.CCheck(0); if (!aMainFail.IsNull() && aMainFail->HasFailed ()) { return IFSelect_RetStop; diff --git a/src/IntPatch/IntPatch_ALineToWLine.cxx b/src/IntPatch/IntPatch_ALineToWLine.cxx index 21d61768ef..8438bd7d15 100644 --- a/src/IntPatch/IntPatch_ALineToWLine.cxx +++ b/src/IntPatch/IntPatch_ALineToWLine.cxx @@ -47,8 +47,8 @@ static const Standard_Real AngDef); static - Standard_Boolean SameCurve(const Handle_Adaptor2d_HCurve2d& C1, - const Handle_Adaptor2d_HCurve2d& C2); + Standard_Boolean SameCurve(const Handle(Adaptor2d_HCurve2d)& C1, + const Handle(Adaptor2d_HCurve2d)& C2); static void RecadreMemePeriode(Standard_Real& u1, @@ -904,7 +904,7 @@ gp_Pnt DefineDU(const Handle(IntPatch_ALine)& aline, //function : SameCurve //purpose : //======================================================================= -Standard_Boolean SameCurve(const Handle_Adaptor2d_HCurve2d& C1,const Handle_Adaptor2d_HCurve2d& C2) +Standard_Boolean SameCurve(const Handle(Adaptor2d_HCurve2d)& C1,const Handle(Adaptor2d_HCurve2d)& C2) { Standard_Real C1f = C1->FirstParameter(); Standard_Real C2f = C2->FirstParameter(); diff --git a/src/IntPatch/IntPatch_CSFunction.cxx b/src/IntPatch/IntPatch_CSFunction.cxx index c3fc2b2e49..f8e540b484 100644 --- a/src/IntPatch/IntPatch_CSFunction.cxx +++ b/src/IntPatch/IntPatch_CSFunction.cxx @@ -123,10 +123,10 @@ const gp_Pnt& IntPatch_CSFunction::Point() const { return p;} Standard_Real IntPatch_CSFunction::Root() const { return f;} -const Handle_Adaptor3d_HSurface& IntPatch_CSFunction::AuxillarSurface() const { +const Handle(Adaptor3d_HSurface)& IntPatch_CSFunction::AuxillarSurface() const { return SURFACE1;} -const Handle_Adaptor2d_HCurve2d& IntPatch_CSFunction::AuxillarCurve() const { +const Handle(Adaptor2d_HCurve2d)& IntPatch_CSFunction::AuxillarCurve() const { return CURVE;} #undef SURFACE1 diff --git a/src/IntPatch/IntPatch_HInterTool.cxx b/src/IntPatch/IntPatch_HInterTool.cxx index ec4da95eaa..44c59e06af 100644 --- a/src/IntPatch/IntPatch_HInterTool.cxx +++ b/src/IntPatch/IntPatch_HInterTool.cxx @@ -209,7 +209,7 @@ Standard_Integer IntPatch_HInterTool::NbSamplesOnArc (const Handle(Adaptor2d_HCu nbsOnC = A->NbPoles(); break; case GeomAbs_BSplineCurve: { - //-- Handle_Geom2d_BSplineCurve& BSC=A->BSpline(); + //-- Handle(Geom2d_BSplineCurve)& BSC=A->BSpline(); nbsOnC = 2 + A->NbKnots() * A->Degree(); break; } diff --git a/src/IntPatch/IntPatch_Intersection.cxx b/src/IntPatch/IntPatch_Intersection.cxx index d31cab612a..ce232c068a 100644 --- a/src/IntPatch/IntPatch_Intersection.cxx +++ b/src/IntPatch/IntPatch_Intersection.cxx @@ -304,7 +304,7 @@ static void FUN_GetUiso(const Handle(Geom_Surface)& GS, } else//OffsetSurface { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&GS; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&GS; const Handle(Geom_Surface) bs = gos->BasisSurface(); Handle(Geom_Curve) gcbs = bs->UIso(U); GeomAdaptor_Curve gac(gcbs); @@ -374,7 +374,7 @@ static void FUN_GetViso(const Handle(Geom_Surface)& GS, } else//OffsetSurface { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&GS; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&GS; const Handle(Geom_Surface) bs = gos->BasisSurface(); Handle(Geom_Curve) gcbs = bs->VIso(V); GeomAdaptor_Curve gac(gcbs); @@ -449,7 +449,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1, else if(!S1->IsVPeriodic() && !S1->IsVClosed()) { if(T1 != GeomAbs_OffsetSurface) C1 = gs1->UIso(MS1[0]); else { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs1; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs1; const Handle(Geom_Surface) bs = gos->BasisSurface(); C1 = bs->UIso(MS1[0]); } @@ -459,7 +459,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1, if(!S1->IsUPeriodic() && !S1->IsUClosed()) { if(T1 != GeomAbs_OffsetSurface) C1 = gs1->VIso(MS1[1]); else { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs1; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs1; const Handle(Geom_Surface) bs = gos->BasisSurface(); C1 = bs->VIso(MS1[1]); } @@ -470,7 +470,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1, else if(!S2->IsVPeriodic() && !S2->IsVClosed()) { if(T2 != GeomAbs_OffsetSurface) C2 = gs2->UIso(MS2[0]); else { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs2; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs2; const Handle(Geom_Surface) bs = gos->BasisSurface(); C2 = bs->UIso(MS2[0]); } @@ -480,7 +480,7 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1, if(!S2->IsUPeriodic() && !S2->IsUClosed()) { if(T2 != GeomAbs_OffsetSurface) C2 = gs2->VIso(MS2[1]); else { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs2; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs2; const Handle(Geom_Surface) bs = gos->BasisSurface(); C2 = bs->VIso(MS2[1]); } @@ -546,9 +546,9 @@ static void FUN_PL_Intersection(const Handle(Adaptor3d_HSurface)& S1, GeomProjLib::ProjectOnPlane(C2,GPln,gp_Dir(DV),Standard_True); if(C1Prj.IsNull() || C2Prj.IsNull()) return; Handle(Geom2d_Curve) C1Prj2d = - GeomProjLib::Curve2d(C1Prj,*(Handle_Geom_Surface *)&GPln); + GeomProjLib::Curve2d(C1Prj,*(Handle(Geom_Surface) *)&GPln); Handle(Geom2d_Curve) C2Prj2d = - GeomProjLib::Curve2d(C2Prj,*(Handle_Geom_Surface *)&GPln); + GeomProjLib::Curve2d(C2Prj,*(Handle(Geom_Surface) *)&GPln); Geom2dAPI_InterCurveCurve ICC(C1Prj2d,C2Prj2d,1.0e-7); if(ICC.NbPoints() > 0 ) { @@ -650,14 +650,14 @@ static void FUN_TrimBothSurf(const Handle(Adaptor3d_HSurface)& S1, if(T1 != GeomAbs_OffsetSurface){ visoS1 = gs1->VIso(VM1); uisoS1 = gs1->UIso(UM1); } else { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs1; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs1; const Handle(Geom_Surface) bs = gos->BasisSurface(); visoS1 = bs->VIso(VM1); uisoS1 = bs->UIso(UM1); } if(T2 != GeomAbs_OffsetSurface){ visoS2 = gs2->VIso(VM2); uisoS2 = gs2->UIso(UM2); } else { - const Handle(Geom_OffsetSurface) gos = *(Handle_Geom_OffsetSurface*)&gs2; + const Handle(Geom_OffsetSurface) gos = *(Handle(Geom_OffsetSurface)*)&gs2; const Handle(Geom_Surface) bs = gos->BasisSurface(); visoS2 = bs->VIso(VM2); uisoS2 = bs->UIso(UM2); } @@ -1212,7 +1212,7 @@ void IntPatch_Intersection::ParamParamPerfom(const Handle(Adaptor3d_HSurface)& { gp_Lin lin(sop.Value(ip),gp_Dir(v)); Handle(IntPatch_GLine) gl = new IntPatch_GLine(lin,Standard_False); - slin.Append(*(Handle_IntPatch_Line *)&gl); + slin.Append(*(Handle(IntPatch_Line) *)&gl); } done = Standard_True; @@ -1280,7 +1280,7 @@ void IntPatch_Intersection::GeomGeomPerfom(const Handle(Adaptor3d_HSurface)& the for (Standard_Integer i = 1; i <= interii.NbLines(); i++) { - const Handle_IntPatch_Line& line = interii.Line(i); + const Handle(IntPatch_Line)& line = interii.Line(i); if (line->ArcType() == IntPatch_Analytic) { const GeomAbs_SurfaceType typs1 = theS1->GetType(); @@ -1339,7 +1339,7 @@ void IntPatch_Intersection::GeomGeomPerfom(const Handle(Adaptor3d_HSurface)& the } IntPatch_ALineToWLine AToW(Quad1,Quad2,0.01,0.05,aNbPointsInALine); - Handle(IntPatch_Line) wlin=AToW.MakeWLine((*((Handle_IntPatch_ALine *)(&line)))); + Handle(IntPatch_Line) wlin=AToW.MakeWLine((*((Handle(IntPatch_ALine) *)(&line)))); slin.Append(wlin); } else @@ -1392,7 +1392,7 @@ void IntPatch_Intersection::GeomParamPerfom(const Handle(Adaptor3d_HSurface)& t { gp_Lin lin(sop.Value(ip),gp_Dir(v)); Handle(IntPatch_GLine) gl = new IntPatch_GLine(lin,Standard_False); - slin.Append(*(Handle_IntPatch_Line *)&gl); + slin.Append(*(Handle(IntPatch_Line) *)&gl); } done = Standard_True; @@ -1515,15 +1515,15 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)& S1, #define MAXR 200 -//void IntPatch_Intersection__MAJ_R(Handle_Adaptor2d_HCurve2d *R1, -// Handle_Adaptor2d_HCurve2d *R2, +//void IntPatch_Intersection__MAJ_R(Handle(Adaptor2d_HCurve2d) *R1, +// Handle(Adaptor2d_HCurve2d) *R2, // int *NR1, // int *NR2, // Standard_Integer nbR1, // Standard_Integer nbR2, // const IntPatch_Point& VTX) -void IntPatch_Intersection__MAJ_R(Handle_Adaptor2d_HCurve2d *, - Handle_Adaptor2d_HCurve2d *, +void IntPatch_Intersection__MAJ_R(Handle(Adaptor2d_HCurve2d) *, + Handle(Adaptor2d_HCurve2d) *, int *, int *, Standard_Integer , @@ -1533,7 +1533,7 @@ void IntPatch_Intersection__MAJ_R(Handle_Adaptor2d_HCurve2d *, /* if(VTX.IsOnDomS1()) { - //-- long unsigned ptr= *((long unsigned *)(((Handle_Standard_Transient *)(&(VTX.ArcOnS1()))))); + //-- long unsigned ptr= *((long unsigned *)(((Handle(Standard_Transient) *)(&(VTX.ArcOnS1()))))); for(Standard_Integer i=0; iInit();D1->More() && nbR1Next()) { R1[nbR1]=D1->Value(); diff --git a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx index e43ae3b83b..f4794c55f7 100644 --- a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx +++ b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx @@ -737,7 +737,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& imax++; if(iminAdd(PW.Line()->Value(i)); @@ -905,7 +905,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& imax++; if(iminAdd(PW.Line()->Value(i)); @@ -959,7 +959,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& // function : NewLine // purpose : //================================================================================== -Handle_IntPatch_Line IntPatch_PrmPrmIntersection::NewLine (const Handle(Adaptor3d_HSurface)& Surf1, +Handle(IntPatch_Line) IntPatch_PrmPrmIntersection::NewLine (const Handle(Adaptor3d_HSurface)& Surf1, const Handle(Adaptor3d_HSurface)& Surf2, const Standard_Integer NumLine, const Standard_Integer Low, diff --git a/src/IntSurf/IntSurf_Allocator.hxx b/src/IntSurf/IntSurf_Allocator.hxx index 206f7fcb49..d3bdc9cd69 100755 --- a/src/IntSurf/IntSurf_Allocator.hxx +++ b/src/IntSurf/IntSurf_Allocator.hxx @@ -16,6 +16,6 @@ #include -typedef Handle_NCollection_BaseAllocator IntSurf_Allocator; +typedef Handle(NCollection_BaseAllocator) IntSurf_Allocator; #endif diff --git a/src/Interface/Interface_EntityCluster.cxx b/src/Interface/Interface_EntityCluster.cxx index 14777ccd55..a39b9c985c 100644 --- a/src/Interface/Interface_EntityCluster.cxx +++ b/src/Interface/Interface_EntityCluster.cxx @@ -147,7 +147,7 @@ Standard_Boolean Interface_EntityCluster::IsLocalFull () const { // Solaris Forte C++ compiler insisted it couldn't cast this, // even though it seems to do so elsewhere - Handle_Standard_Transient tmp = Handle_Standard_Transient(theents[3]); + Handle(Standard_Transient) tmp = Handle(Standard_Transient)(theents[3]); return ( !tmp.IsNull() ); } diff --git a/src/Law/Law_Interpolate.cxx b/src/Law/Law_Interpolate.cxx index 4cc3c93618..6dace416bd 100644 --- a/src/Law/Law_Interpolate.cxx +++ b/src/Law/Law_Interpolate.cxx @@ -626,7 +626,7 @@ void Law_Interpolate::PerformNonPeriodic() } //======================================================================= -//function : Handle_Geom_BSplineCurve& +//function : Handle(Geom_BSplineCurve)& //purpose : //======================================================================= diff --git a/src/MAT/MAT_Arc.cxx b/src/MAT/MAT_Arc.cxx index c914b4b4e3..eff6239e64 100644 --- a/src/MAT/MAT_Arc.cxx +++ b/src/MAT/MAT_Arc.cxx @@ -199,7 +199,7 @@ void MAT_Arc::SetFirstNode(const Handle(MAT_Node)& aNode) // function: SetSecondNode // purpose : //======================================================================== -void MAT_Arc::SetSecondNode(const Handle_MAT_Node& aNode) +void MAT_Arc::SetSecondNode(const Handle(MAT_Node)& aNode) { secondNode = aNode; } diff --git a/src/MAT/MAT_BasicElt.cxx b/src/MAT/MAT_BasicElt.cxx index 41e6de6338..cdbeba417c 100644 --- a/src/MAT/MAT_BasicElt.cxx +++ b/src/MAT/MAT_BasicElt.cxx @@ -70,7 +70,7 @@ Standard_Integer MAT_BasicElt::GeomIndex() const // function: SetStartArc // purpose : //======================================================================== -void MAT_BasicElt::SetStartArc(const Handle_MAT_Arc& anArc) +void MAT_BasicElt::SetStartArc(const Handle(MAT_Arc)& anArc) { startLeftArc = anArc.operator->(); } @@ -80,7 +80,7 @@ void MAT_BasicElt::SetStartArc(const Handle_MAT_Arc& anArc) // function: SetEndArc // purpose : //======================================================================== -void MAT_BasicElt::SetEndArc(const Handle_MAT_Arc& anArc) +void MAT_BasicElt::SetEndArc(const Handle(MAT_Arc)& anArc) { endLeftArc = anArc.operator->(); } diff --git a/src/MAT2d/MAT2d_Circuit.cxx b/src/MAT2d/MAT2d_Circuit.cxx index 2e91cab95f..38f3142205 100644 --- a/src/MAT2d/MAT2d_Circuit.cxx +++ b/src/MAT2d/MAT2d_Circuit.cxx @@ -109,7 +109,7 @@ void MAT2d_Circuit::Perform // Detection Lignes ouvertes. //---------------------------- for ( i = 1; i <= NbLines; i++) { - Handle_Geom2d_TrimmedCurve Curve; + Handle(Geom2d_TrimmedCurve) Curve; Curve = Handle(Geom2d_TrimmedCurve)::DownCast(FigItem.Value(i).First()); gp_Pnt2d P1 = Curve->StartPoint(); Curve = Handle(Geom2d_TrimmedCurve)::DownCast(FigItem.Value(i).Last()); diff --git a/src/Materials/Materials_MaterialDefinition.cxx b/src/Materials/Materials_MaterialDefinition.cxx index ea6679de3e..37cff3a23b 100644 --- a/src/Materials/Materials_MaterialDefinition.cxx +++ b/src/Materials/Materials_MaterialDefinition.cxx @@ -71,7 +71,7 @@ Handle(Dynamic_Parameter) Materials_MaterialDefinition::Switch( Atof(value3), Quantity_TOC_RGB)); objectparameter = new Dynamic_ObjectParameter(aname,pcolor); - parameter = *(Handle_Dynamic_Parameter*)&objectparameter; + parameter = *(Handle(Dynamic_Parameter)*)&objectparameter; } else diff --git a/src/MeshVS/MeshVS_DeformedDataSource.cxx b/src/MeshVS/MeshVS_DeformedDataSource.cxx index 09107e4d4e..5f2256adb7 100644 --- a/src/MeshVS/MeshVS_DeformedDataSource.cxx +++ b/src/MeshVS/MeshVS_DeformedDataSource.cxx @@ -215,7 +215,7 @@ void MeshVS_DeformedDataSource::SetNonDeformedDataSource( const Handle(MeshVS_Da // Function : GetNonDeformedDataSource // Purpose : //================================================================ -Handle_MeshVS_DataSource MeshVS_DeformedDataSource::GetNonDeformedDataSource() const +Handle(MeshVS_DataSource) MeshVS_DeformedDataSource::GetNonDeformedDataSource() const { return myNonDeformedDataSource; } diff --git a/src/MoniTool/MoniTool_TransientElem.cxx b/src/MoniTool/MoniTool_TransientElem.cxx index 7000b1f3dd..bd7ebd79e3 100644 --- a/src/MoniTool/MoniTool_TransientElem.cxx +++ b/src/MoniTool/MoniTool_TransientElem.cxx @@ -24,7 +24,7 @@ MoniTool_TransientElem::MoniTool_TransientElem (const Handle(Standard_Transient) { SetHashCode ( TColStd_MapTransientHasher::HashCode (akey, IntegerLast() ) ); } - const Handle_Standard_Transient& MoniTool_TransientElem::Value () const + const Handle(Standard_Transient)& MoniTool_TransientElem::Value () const { return theval; } Standard_Boolean MoniTool_TransientElem::Equates diff --git a/src/NCollection/NCollection_BaseCollection.hxx b/src/NCollection/NCollection_BaseCollection.hxx index f4d9682fb9..a36bac3aa0 100644 --- a/src/NCollection/NCollection_BaseCollection.hxx +++ b/src/NCollection/NCollection_BaseCollection.hxx @@ -105,7 +105,7 @@ template class NCollection_BaseCollection const Handle(NCollection_BaseAllocator)& IterAllocator(void) const { if (myIterAllocator.IsNull()) - (Handle_NCollection_BaseAllocator&) myIterAllocator = + (Handle(NCollection_BaseAllocator)&) myIterAllocator = new NCollection_IncAllocator(64); return myIterAllocator; } diff --git a/src/NCollection/NCollection_Handle.hxx b/src/NCollection/NCollection_Handle.hxx index c95d816674..26c93cd0ac 100644 --- a/src/NCollection/NCollection_Handle.hxx +++ b/src/NCollection/NCollection_Handle.hxx @@ -44,7 +44,7 @@ Standard_EXPORT const Handle(Standard_Type)& STANDARD_TYPE(NCollection_Handle); //! } template -class NCollection_Handle : public Handle_Standard_Transient +class NCollection_Handle : public Handle(Standard_Transient) { private: @@ -73,7 +73,7 @@ class NCollection_Handle : public Handle_Standard_Transient //! Note that additional argument is used to avoid ambiguity with //! public constructor from pointer when Handle is intilialized by 0. NCollection_Handle (Ptr* thePtr, int) - : Handle_Standard_Transient (thePtr) {} + : Handle(Standard_Transient) (thePtr) {} public: @@ -84,7 +84,7 @@ class NCollection_Handle : public Handle_Standard_Transient //! Constructor of handle from pointer on newly allocated object NCollection_Handle (T* theObject) - : Handle_Standard_Transient (theObject ? new Ptr (theObject) : 0) {} + : Handle(Standard_Transient) (theObject ? new Ptr (theObject) : 0) {} //! Cast handle to contained type T* operator -> () { return ((Ptr*)ControlAccess())->myPtr; } diff --git a/src/NCollection/NCollection_HeapAllocator.cxx b/src/NCollection/NCollection_HeapAllocator.cxx index 92b35e3ae9..fc5b399a73 100644 --- a/src/NCollection/NCollection_HeapAllocator.cxx +++ b/src/NCollection/NCollection_HeapAllocator.cxx @@ -54,7 +54,7 @@ void NCollection_HeapAllocator::Free (void * anAddress) //purpose : //======================================================================= -const Handle_NCollection_HeapAllocator& +const Handle(NCollection_HeapAllocator)& NCollection_HeapAllocator::GlobalHeapAllocator() { static Handle(NCollection_HeapAllocator) pAllocator; diff --git a/src/NCollection/NCollection_HeapAllocator.hxx b/src/NCollection/NCollection_HeapAllocator.hxx index 81ec711bd2..4f4fd7237b 100644 --- a/src/NCollection/NCollection_HeapAllocator.hxx +++ b/src/NCollection/NCollection_HeapAllocator.hxx @@ -18,7 +18,7 @@ #include -class Handle_NCollection_HeapAllocator; +class Handle(NCollection_HeapAllocator); /** * Allocator that uses the global dynamic heap (malloc / free). @@ -31,7 +31,7 @@ class NCollection_HeapAllocator : public NCollection_BaseAllocator Standard_EXPORT virtual void* Allocate (const Standard_Size theSize); Standard_EXPORT virtual void Free (void * anAddress); - Standard_EXPORT static const Handle_NCollection_HeapAllocator& + Standard_EXPORT static const Handle(NCollection_HeapAllocator)& GlobalHeapAllocator(); protected: diff --git a/src/NCollection/NCollection_StdBase.hxx b/src/NCollection/NCollection_StdBase.hxx index e6e5e17085..f20e5aa998 100644 --- a/src/NCollection/NCollection_StdBase.hxx +++ b/src/NCollection/NCollection_StdBase.hxx @@ -32,6 +32,6 @@ DEFINE_BASECOLLECTION(NCollection_BaseCollAsciiString , DEFINE_BASECOLLECTION(NCollection_BaseCollExtendedString, TCollection_ExtendedString) DEFINE_BASECOLLECTION(NCollection_BaseCollTransient , - Handle_Standard_Transient) + Handle(Standard_Transient)) #endif diff --git a/src/NCollection/NCollection_UBTree.hxx b/src/NCollection/NCollection_UBTree.hxx index dc2254e189..24a9c759a5 100644 --- a/src/NCollection/NCollection_UBTree.hxx +++ b/src/NCollection/NCollection_UBTree.hxx @@ -449,7 +449,7 @@ class _HUBTREE : public _HPARENT \ \ _HUBTREE () : myTree(new UBTree) {} \ /* Empty constructor */ \ - _HUBTREE (const Handle_NCollection_BaseAllocator& theAlloc) \ + _HUBTREE (const Handle(NCollection_BaseAllocator)& theAlloc) \ : myTree(new UBTree(theAlloc)) {} \ /* Constructor */ \ \ diff --git a/src/NCollection/NCollection_UBTreeFiller.hxx b/src/NCollection/NCollection_UBTreeFiller.hxx index 90e0b6dc6e..71f6d38b24 100644 --- a/src/NCollection/NCollection_UBTreeFiller.hxx +++ b/src/NCollection/NCollection_UBTreeFiller.hxx @@ -66,7 +66,7 @@ template class NCollection_UBTreeFiller * the tree filling is faster due to better utilisation of CPU L1/L2 cache. */ NCollection_UBTreeFiller (UBTree& theTree, - const Handle_NCollection_BaseAllocator& theAlloc=0L, + const Handle(NCollection_BaseAllocator)& theAlloc=0L, const Standard_Boolean isFullRandom = Standard_True) : myTree(theTree), mySeqPtr(1000, theAlloc), mySeed(1), myIsFullRandom (isFullRandom) diff --git a/src/NCollection/NCollection_Vector.hxx b/src/NCollection/NCollection_Vector.hxx index 700ea64c9d..479090391c 100755 --- a/src/NCollection/NCollection_Vector.hxx +++ b/src/NCollection/NCollection_Vector.hxx @@ -108,7 +108,7 @@ public: //! @name public methods //! Constructor NCollection_Vector (const Standard_Integer theIncrement = 256, - const Handle_NCollection_BaseAllocator& theAlloc = NULL) + const Handle(NCollection_BaseAllocator)& theAlloc = NULL) : NCollection_BaseCollection (theAlloc), NCollection_BaseVector (NCollection_BaseCollection::myAllocator, initMemBlocks, sizeof(TheItemType), theIncrement) {} diff --git a/src/NIS/NIS_DrawList.cxx b/src/NIS/NIS_DrawList.cxx index cf1c5d5dfb..1aae559d9e 100644 --- a/src/NIS/NIS_DrawList.cxx +++ b/src/NIS/NIS_DrawList.cxx @@ -46,7 +46,7 @@ NIS_DrawList::NIS_DrawList () //purpose : Constructor //======================================================================= -NIS_DrawList::NIS_DrawList (const Handle_NIS_View& theView) +NIS_DrawList::NIS_DrawList (const Handle(NIS_View)& theView) : myView (theView) { #ifdef ARRAY_LISTS @@ -100,7 +100,7 @@ void NIS_DrawList::ClearListID (const Standard_Integer theType) //purpose : Set myListID to 0. //======================================================================= -void NIS_DrawList::ClearListID (const Handle_NIS_View& theView) +void NIS_DrawList::ClearListID (const Handle(NIS_View)& theView) { #ifdef ARRAY_LISTS if (myListID > 0) @@ -180,10 +180,10 @@ void NIS_DrawList::Call (const Standard_Integer theType) Standard_Boolean NIS_DrawList::SetDynHilighted (const Standard_Boolean isHili, - const Handle_NIS_InteractiveObject& theObj) + const Handle(NIS_InteractiveObject)& theObj) { Standard_Boolean aResult (Standard_False); - NCollection_List::Iterator anIt(myDynHilighted); + NCollection_List::Iterator anIt(myDynHilighted); for (; anIt.More(); anIt.Next()) if (anIt.Value() == theObj) break; diff --git a/src/NIS/NIS_DrawList.hxx b/src/NIS/NIS_DrawList.hxx index 82d4c0224f..aaf1ee7605 100644 --- a/src/NIS/NIS_DrawList.hxx +++ b/src/NIS/NIS_DrawList.hxx @@ -49,7 +49,7 @@ class NIS_DrawList /** * Constructor */ - Standard_EXPORT NIS_DrawList (const Handle_NIS_View& theView); + Standard_EXPORT NIS_DrawList (const Handle(NIS_View)& theView); /** * Destructor. @@ -80,7 +80,7 @@ class NIS_DrawList * @return * Previous value of myListID */ - Standard_EXPORT void ClearListID (const Handle_NIS_View& theView=NULL); + Standard_EXPORT void ClearListID (const Handle(NIS_View)& theView=NULL); /** * This method is called to start recording a new list. It must be eventually @@ -121,14 +121,14 @@ class NIS_DrawList /** * Query if the given list should be processed by Dynamic Hilighting. */ - inline const NCollection_List& + inline const NCollection_List& DynHilightedList() const { return myDynHilighted; } /** * Query the View. */ - inline const Handle_NIS_View& GetView () const + inline const Handle(NIS_View)& GetView () const { return myView; } /** @@ -136,7 +136,7 @@ class NIS_DrawList */ Standard_EXPORT Standard_Boolean SetDynHilighted (const Standard_Boolean isHilight, - const Handle_NIS_InteractiveObject& theObj); + const Handle(NIS_InteractiveObject)& theObj); protected: // ---------- PROTECTED METHODS ---------- @@ -156,14 +156,14 @@ class NIS_DrawList private: // ---------- PRIVATE FIELDS ---------- - Handle_NIS_View myView; + Handle(NIS_View) myView; #ifdef ARRAY_LISTS Standard_Integer myListID; #else Standard_Integer myListID[5]; #endif Standard_Boolean myIsUpdated[5]; - NCollection_List myDynHilighted; + NCollection_List myDynHilighted; }; diff --git a/src/NIS/NIS_Drawer.cxx b/src/NIS/NIS_Drawer.cxx index 16d8b6a12d..2ac3c6b6f9 100644 --- a/src/NIS/NIS_Drawer.cxx +++ b/src/NIS/NIS_Drawer.cxx @@ -41,7 +41,7 @@ NIS_Drawer::~NIS_Drawer () //purpose : //======================================================================= -void NIS_Drawer::Assign (const Handle_NIS_Drawer& theOther) +void NIS_Drawer::Assign (const Handle(NIS_Drawer)& theOther) { if (theOther->IsKind(DynamicType()) == Standard_False) Standard_TypeMismatch::Raise ("NIS_Drawer::Assign"); @@ -67,7 +67,7 @@ Standard_Integer NIS_Drawer::HashCode(const Standard_Integer theN) const //purpose : //======================================================================= -Standard_Boolean NIS_Drawer::IsEqual (const Handle_NIS_Drawer& theOther) const +Standard_Boolean NIS_Drawer::IsEqual (const Handle(NIS_Drawer)& theOther) const { Standard_Boolean aResult (Standard_False); if (theOther.IsNull() == Standard_False) @@ -105,7 +105,7 @@ void NIS_Drawer::AfterDraw (const DrawType, const NIS_DrawList&) //purpose : //======================================================================= -void NIS_Drawer::UpdateExListId (const Handle_NIS_View& theView) const +void NIS_Drawer::UpdateExListId (const Handle(NIS_View)& theView) const { if (theView.IsNull()) { if (myCtx) { @@ -136,7 +136,7 @@ void NIS_Drawer::UpdateExListId (const Handle_NIS_View& theView) const //======================================================================= void NIS_Drawer::redraw (const DrawType theType, - const Handle_NIS_View& theView) + const Handle(NIS_View)& theView) { if (myCtx && myMapID.IsEmpty() == Standard_False && @@ -145,7 +145,7 @@ void NIS_Drawer::redraw (const DrawType theType, NCollection_List::Iterator anIter (myLists); for (; anIter.More(); anIter.Next()) { NIS_DrawList& aDrawList = * anIter.ChangeValue(); - const Handle_NIS_View& aView = aDrawList.GetView(); + const Handle(NIS_View)& aView = aDrawList.GetView(); if (aView == theView || aView.IsNull()) { if (aDrawList.IsUpdated(theType)) { // Get the IDs of objects concerned @@ -251,8 +251,8 @@ void NIS_Drawer::SetUpdated (const DrawType theType1, void NIS_Drawer::SetDynamicHilighted (const Standard_Boolean isHilighted, - const Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_View& theView) + const Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_View)& theView) { if (myCtx && theObj.IsNull() == Standard_False) { NCollection_List::Iterator anIter (myLists); @@ -316,7 +316,7 @@ void NIS_Drawer::addObject (const NIS_InteractiveObject * theObj, if (isShareList) myLists.Append (createDefaultList(NULL)); else { - NCollection_List::Iterator anIter(GetContext()->myViews); + NCollection_List::Iterator anIter(GetContext()->myViews); for (; anIter.More(); anIter.Next()) myLists.Append (createDefaultList(anIter.Value())); } @@ -377,7 +377,7 @@ void NIS_Drawer::prepareList(const NIS_Drawer::DrawType theType, // Dynamic hilighting is treated in a separate loop because the hilighted // instances are contained in the special list rather than in the Context if (theType == NIS_Drawer::Draw_DynHilighted) { - NCollection_List::Iterator + NCollection_List::Iterator anIter (theDrawList.DynHilightedList()); if (anIter.More()) { BeforeDraw (theType, theDrawList); @@ -408,7 +408,7 @@ void NIS_Drawer::prepareList(const NIS_Drawer::DrawType theType, //purpose : //======================================================================= NIS_DrawList* NIS_Drawer::createDefaultList - (const Handle_NIS_View& theView) const + (const Handle(NIS_View)& theView) const { return new NIS_DrawList(theView); } diff --git a/src/NIS/NIS_Drawer.hxx b/src/NIS/NIS_Drawer.hxx index 534567f89d..896236d4b0 100644 --- a/src/NIS/NIS_Drawer.hxx +++ b/src/NIS/NIS_Drawer.hxx @@ -29,9 +29,9 @@ #pragma warning (disable:4480) #endif -class Handle_NIS_InteractiveObject; -class Handle_NIS_View; -class Handle_NIS_Drawer; +class Handle(NIS_InteractiveObject); +class Handle(NIS_View); +class Handle(NIS_Drawer); class NIS_InteractiveContext; class NIS_View; template class NCollection_Vector; @@ -153,7 +153,7 @@ class NIS_Drawer : public Standard_Transient * Copy the relevant information from another instance of Drawer. * raises exception if theOther has incompatible type (test IsKind). */ - Standard_EXPORT virtual void Assign (const Handle_NIS_Drawer& theOther); + Standard_EXPORT virtual void Assign (const Handle(NIS_Drawer)& theOther); /** * Create a3D bounding box of drawn objects. @@ -193,8 +193,8 @@ class NIS_Drawer : public Standard_Transient */ Standard_EXPORT void SetDynamicHilighted (const Standard_Boolean isHilighted, - const Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_View& theView = 0L); + const Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_View)& theView = 0L); /** * Hash value, for Map interface. @@ -206,7 +206,7 @@ class NIS_Drawer : public Standard_Transient * Matching two instances, for Map interface. */ Standard_EXPORT virtual Standard_Boolean - IsEqual (const Handle_NIS_Drawer& theOth) const; + IsEqual (const Handle(NIS_Drawer)& theOth) const; /** * Obtain the iterator of IDs of associated objects. @@ -227,7 +227,7 @@ protected: * Called to add draw list IDs to ex-list Ids of view. These draw lists are * eventually released in the callback function, before anything is displayed */ - Standard_EXPORT void UpdateExListId (const Handle_NIS_View& theView) const; + Standard_EXPORT void UpdateExListId (const Handle(NIS_View)& theView) const; // ---------- PROTECTED METHODS ---------- @@ -248,12 +248,12 @@ protected: /** * Main function: display the given interactive object in the given view. */ - Standard_EXPORT virtual void Draw (const Handle_NIS_InteractiveObject&, + Standard_EXPORT virtual void Draw (const Handle(NIS_InteractiveObject)&, const DrawType theType, const NIS_DrawList& theDrawList)= 0; Standard_EXPORT virtual void redraw (const DrawType theType, - const Handle_NIS_View& theView); + const Handle(NIS_View)& theView); Standard_EXPORT void addObject (const NIS_InteractiveObject * theObj, const Standard_Boolean isShareList, @@ -263,7 +263,7 @@ protected: const Standard_Boolean isUpVws); Standard_EXPORT virtual NIS_DrawList* - createDefaultList (const Handle_NIS_View&) const; + createDefaultList (const Handle(NIS_View)&) const; protected: //! Get the number of interactive objects in this drawer @@ -317,7 +317,7 @@ DEFINE_STANDARD_HANDLE (NIS_Drawer, Standard_Transient) //purpose : //======================================================================= -inline Standard_Integer HashCode (const Handle_NIS_Drawer& theDrawer, +inline Standard_Integer HashCode (const Handle(NIS_Drawer)& theDrawer, const Standard_Integer theN) { return theDrawer.IsNull() ? 0 : theDrawer->HashCode (theN); } @@ -326,8 +326,8 @@ inline Standard_Integer HashCode (const Handle_NIS_Drawer& theDrawer, //purpose : //======================================================================= -inline Standard_Boolean IsEqual (const Handle_NIS_Drawer& theDrawer1, - const Handle_NIS_Drawer& theDrawer2) +inline Standard_Boolean IsEqual (const Handle(NIS_Drawer)& theDrawer1, + const Handle(NIS_Drawer)& theDrawer2) { return theDrawer1.IsNull()? Standard_False: theDrawer1->IsEqual(theDrawer2); } #ifdef WNT diff --git a/src/NIS/NIS_InteractiveContext.cxx b/src/NIS/NIS_InteractiveContext.cxx index 1112be9715..9cf7b4be29 100644 --- a/src/NIS/NIS_InteractiveContext.cxx +++ b/src/NIS/NIS_InteractiveContext.cxx @@ -23,7 +23,7 @@ IMPLEMENT_STANDARD_HANDLE (NIS_InteractiveContext, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT (NIS_InteractiveContext, Standard_Transient) -static void markAllDrawersUpdated (const NCollection_Map&); +static void markAllDrawersUpdated (const NCollection_Map&); //======================================================================= //function : NIS_InteractiveContext() @@ -50,13 +50,13 @@ NIS_InteractiveContext::NIS_InteractiveContext () NIS_InteractiveContext::~NIS_InteractiveContext () { // Unregister this context in all referred views - NCollection_List::Iterator anIterV (myViews); + NCollection_List::Iterator anIterV (myViews); for (; anIterV.More(); anIterV.Next()) if (anIterV.Value().IsNull() == Standard_False) anIterV.Value()->RemoveContext(this); // // Unregister this context in all referred drawers -// NCollection_Map::Iterator anIterD (myDrawers); +// NCollection_Map::Iterator anIterD (myDrawers); // for (; anIterD.More(); anIterD.Next()) // if (anIterD.Value().IsNull() == Standard_False) // anIterD.Value()->myCtx = 0L; @@ -68,17 +68,17 @@ NIS_InteractiveContext::~NIS_InteractiveContext () //purpose : //======================================================================= -void NIS_InteractiveContext::AttachView (const Handle_NIS_View& theView) +void NIS_InteractiveContext::AttachView (const Handle(NIS_View)& theView) { if (theView.IsNull() == Standard_False) { - NCollection_List::Iterator anIter (myViews); + NCollection_List::Iterator anIter (myViews); for (; anIter.More(); anIter.Next()) if (anIter.Value() == theView) break; if (anIter.More() == Standard_False) { myViews.Append (theView); theView->AddContext (this); - NCollection_Map::Iterator anIterD (myDrawers); + NCollection_Map::Iterator anIterD (myDrawers); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) @@ -93,15 +93,15 @@ void NIS_InteractiveContext::AttachView (const Handle_NIS_View& theView) //purpose : //======================================================================= -void NIS_InteractiveContext::DetachView (const Handle_NIS_View& theView) +void NIS_InteractiveContext::DetachView (const Handle(NIS_View)& theView) { if (theView.IsNull() == Standard_False) { - NCollection_List::Iterator anIter (myViews); + NCollection_List::Iterator anIter (myViews); for (; anIter.More(); anIter.Next()) if (anIter.Value() == theView) { myViews.Remove(anIter); theView->RemoveContext(this); - NCollection_Map::Iterator anIterD (myDrawers); + NCollection_Map::Iterator anIterD (myDrawers); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) { @@ -124,12 +124,12 @@ void NIS_InteractiveContext::DetachView (const Handle_NIS_View& theView) //purpose : //======================================================================= -const Handle_NIS_InteractiveObject& NIS_InteractiveContext::GetObject +const Handle(NIS_InteractiveObject)& NIS_InteractiveContext::GetObject (const Standard_Integer theID) const { if (!myObjects.IsBound(theID)) { - static Handle_NIS_InteractiveObject aNull; + static Handle(NIS_InteractiveObject) aNull; return aNull; } return myObjects(theID); @@ -143,7 +143,7 @@ const Handle_NIS_InteractiveObject& NIS_InteractiveContext::GetObject void NIS_InteractiveContext::redraw (const Handle(NIS_View)& theView, const NIS_Drawer::DrawType theType) { - NCollection_Map ::Iterator anIter (myDrawers); + NCollection_Map ::Iterator anIter (myDrawers); for (; anIter.More(); anIter.Next()) if (anIter.Value().IsNull() == Standard_False) anIter.Value()->redraw (theType, theView); @@ -157,7 +157,7 @@ void NIS_InteractiveContext::redraw (const Handle(NIS_View)& theView, void NIS_InteractiveContext::GetBox (Bnd_B3f& theBox, const NIS_View * theView) const { - NCollection_Map ::Iterator anIterD (myDrawers); + NCollection_Map ::Iterator anIterD (myDrawers); for (; anIterD.More(); anIterD.Next()) if (anIterD.Value().IsNull() == Standard_False) theBox.Add(anIterD.Value()->GetBox(theView)); @@ -169,8 +169,8 @@ void NIS_InteractiveContext::GetBox (Bnd_B3f& theBox, //======================================================================= void NIS_InteractiveContext::Display - (Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_Drawer& theDrawer, + (Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_Drawer)& theDrawer, const Standard_Boolean isUpdateViews) { if (theObj.IsNull()) @@ -192,8 +192,8 @@ void NIS_InteractiveContext::Display //======================================================================= void NIS_InteractiveContext::DisplayOnTop - (Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_Drawer& theDrawer, + (Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_Drawer)& theDrawer, const Standard_Boolean isUpdateViews) { if (theObj.IsNull()) @@ -216,7 +216,7 @@ void NIS_InteractiveContext::DisplayOnTop //purpose : //======================================================================= -void NIS_InteractiveContext::Erase (const Handle_NIS_InteractiveObject& theObj, +void NIS_InteractiveContext::Erase (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isUpdateViews) { if (theObj->IsHidden() == Standard_False) { @@ -225,7 +225,7 @@ void NIS_InteractiveContext::Erase (const Handle_NIS_InteractiveObject& theObj, if (aDrawer.IsNull() == Standard_False) { // Unhilight the erased object if (theObj->IsDynHilighted()) { - NCollection_List::Iterator anIterV (myViews); + NCollection_List::Iterator anIterV (myViews); for (; anIterV.More(); anIterV.Next()) if (anIterV.Value().IsNull() == Standard_False) anIterV.Value()->DynamicUnhilight (theObj); @@ -242,7 +242,7 @@ void NIS_InteractiveContext::Erase (const Handle_NIS_InteractiveObject& theObj, //purpose : //======================================================================= -void NIS_InteractiveContext::Remove (const Handle_NIS_InteractiveObject& theObj, +void NIS_InteractiveContext::Remove (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isUpdateViews) { if (theObj.IsNull() == Standard_False) { @@ -252,7 +252,7 @@ void NIS_InteractiveContext::Remove (const Handle_NIS_InteractiveObject& theObj, if (aDrawer->myCtx == this) { // Remove the hilighting if the object has been hilighted if (theObj->IsDynHilighted()) { - NCollection_List::Iterator anIterV (myViews); + NCollection_List::Iterator anIterV (myViews); for (; anIterV.More(); anIterV.Next()) if (anIterV.Value().IsNull() == Standard_False) anIterV.Value()->DynamicUnhilight (theObj); @@ -278,7 +278,7 @@ void NIS_InteractiveContext::Remove (const Handle_NIS_InteractiveObject& theObj, void NIS_InteractiveContext::DisplayAll () { // UnHide all objects in the Context - NCollection_SparseArray ::ConstIterator + NCollection_SparseArray ::ConstIterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { const Handle(NIS_InteractiveObject)& anObj = anIter.Value(); @@ -288,7 +288,7 @@ void NIS_InteractiveContext::DisplayAll () } // Update status of objects in Drawers (particularly cancel dyn. hilighting) - NCollection_Map::Iterator anIterD (myDrawers); + NCollection_Map::Iterator anIterD (myDrawers); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) { @@ -308,7 +308,7 @@ void NIS_InteractiveContext::DisplayAll () void NIS_InteractiveContext::EraseAll () { // Hide all objects in the Context - NCollection_SparseArray ::ConstIterator + NCollection_SparseArray ::ConstIterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { const Handle(NIS_InteractiveObject)& anObj = anIter.Value(); @@ -316,7 +316,7 @@ void NIS_InteractiveContext::EraseAll () if (anObj->IsHidden() == Standard_False) anObj->myIsHidden = Standard_True; if (anObj->IsDynHilighted()) { - NCollection_List::Iterator anIterV (myViews); + NCollection_List::Iterator anIterV (myViews); for (; anIterV.More(); anIterV.Next()) if (anIterV.Value().IsNull() == Standard_False) anIterV.Value()->DynamicUnhilight (anObj); @@ -325,7 +325,7 @@ void NIS_InteractiveContext::EraseAll () } // Update status of objects in Drawers (particularly cancel dyn. hilighting) - NCollection_Map::Iterator anIterD (myDrawers); + NCollection_Map::Iterator anIterD (myDrawers); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) { @@ -350,13 +350,13 @@ void NIS_InteractiveContext::EraseAll () void NIS_InteractiveContext::RemoveAll () { // Remove objects from the Context - NCollection_SparseArray ::Iterator + NCollection_SparseArray ::Iterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { Handle(NIS_InteractiveObject)& anObj = anIter.ChangeValue(); if (anObj.IsNull() == Standard_False) { if (anObj->IsDynHilighted()) { - NCollection_List::Iterator anIterV (myViews); + NCollection_List::Iterator anIterV (myViews); for (; anIterV.More(); anIterV.Next()) if (anIterV.Value().IsNull() == Standard_False) anIterV.Value()->DynamicUnhilight (anObj); @@ -368,7 +368,7 @@ void NIS_InteractiveContext::RemoveAll () } // Mark all draw lists to be removed in the view callback - NCollection_Map::Iterator anIterD (myDrawers); + NCollection_Map::Iterator anIterD (myDrawers); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) { @@ -400,7 +400,7 @@ void NIS_InteractiveContext::RemoveAll () void NIS_InteractiveContext::RebuildViews () { - const Handle_NIS_Allocator aNewAlloc = compactObjects(); + const Handle(NIS_Allocator) aNewAlloc = compactObjects(); // Recalculate all DrawLists in all drawers markAllDrawersUpdated(myDrawers); @@ -410,7 +410,7 @@ void NIS_InteractiveContext::RebuildViews () if (aNewAlloc.IsNull() == Standard_False) myAllocator = aNewAlloc; - NCollection_List::Iterator anIterV(myViews); + NCollection_List::Iterator anIterV(myViews); for (; anIterV.More(); anIterV.Next()) { const Handle(NIS_View)& aView = anIterV.Value(); if (aView.IsNull() == Standard_False) @@ -426,11 +426,11 @@ void NIS_InteractiveContext::RebuildViews () void NIS_InteractiveContext::UpdateViews () { - const Handle_NIS_Allocator aNewAlloc = compactObjects(); + const Handle(NIS_Allocator) aNewAlloc = compactObjects(); if (aNewAlloc.IsNull() == Standard_False) myAllocator = aNewAlloc; - NCollection_List::Iterator anIterV(myViews); + NCollection_List::Iterator anIterV(myViews); for (; anIterV.More(); anIterV.Next()) { const Handle(NIS_View)& aView = anIterV.Value(); if (aView.IsNull() == Standard_False) @@ -444,7 +444,7 @@ void NIS_InteractiveContext::UpdateViews () //======================================================================= Standard_Boolean NIS_InteractiveContext::SetSelected - (const Handle_NIS_InteractiveObject& theObj, + (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isSelected) { Standard_Boolean aResult (Standard_False); @@ -473,7 +473,7 @@ Standard_Boolean NIS_InteractiveContext::SetSelected //======================================================================= Standard_Boolean NIS_InteractiveContext::ProcessSelection - (const Handle_NIS_InteractiveObject& theObj, + (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isMultiple) { Standard_Boolean aResult (Standard_False); @@ -584,7 +584,7 @@ void NIS_InteractiveContext::ProcessSelection //======================================================================= Standard_Boolean NIS_InteractiveContext::IsSelected - (const Handle_NIS_InteractiveObject& theObj) + (const Handle(NIS_InteractiveObject)& theObj) { Standard_Boolean aResult (Standard_False); if (theObj.IsNull() == Standard_False) { @@ -654,7 +654,7 @@ void NIS_InteractiveContext::SetSelected //======================================================================= Standard_Real NIS_InteractiveContext::selectObject - (Handle_NIS_InteractiveObject& theSel, + (Handle(NIS_InteractiveObject)& theSel, NCollection_List& theDetected, const gp_Ax1& theAxis, const Standard_Real theOver, @@ -665,7 +665,7 @@ Standard_Real NIS_InteractiveContext::selectObject if (mySelectionMode != Mode_NoSelection || isOnlySel == Standard_False) { DetectedEnt anEnt; - NCollection_SparseArray ::ConstIterator + NCollection_SparseArray ::ConstIterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { const Handle(NIS_InteractiveObject)& anObj = anIter.Value(); @@ -747,7 +747,7 @@ Standard_Boolean NIS_InteractiveContext::selectObjects { Standard_Boolean aResult (Standard_False); if (mySelectionMode != Mode_NoSelection) { - NCollection_SparseArray ::ConstIterator + NCollection_SparseArray ::ConstIterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { const Handle(NIS_InteractiveObject)& anObj = anIter.Value(); @@ -789,7 +789,7 @@ Standard_Boolean NIS_InteractiveContext::selectObjects Standard_Boolean aResult (Standard_False); if (mySelectionMode != Mode_NoSelection) { - NCollection_SparseArray ::ConstIterator + NCollection_SparseArray ::ConstIterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { @@ -892,9 +892,9 @@ void NIS_InteractiveContext::selectObj //purpose : //======================================================================= -const Handle_NIS_Drawer& NIS_InteractiveContext::drawerForDisplay - (const Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_Drawer& theDrawer) +const Handle(NIS_Drawer)& NIS_InteractiveContext::drawerForDisplay + (const Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_Drawer)& theDrawer) { Handle(NIS_Drawer) aDrawer; if (theDrawer.IsNull() == Standard_False) { @@ -917,7 +917,7 @@ const Handle_NIS_Drawer& NIS_InteractiveContext::drawerForDisplay //======================================================================= void NIS_InteractiveContext::objectForDisplay - (Handle_NIS_InteractiveObject& theObj, + (Handle(NIS_InteractiveObject)& theObj, const NIS_Drawer::DrawType theDrawType) { if (theObj->ID() == 0) { @@ -937,11 +937,11 @@ void NIS_InteractiveContext::objectForDisplay //purpose : //======================================================================= -Handle_NIS_Allocator NIS_InteractiveContext::compactObjects() +Handle(NIS_Allocator) NIS_InteractiveContext::compactObjects() { Handle(NIS_Allocator) aNewAlloc; - NCollection_List::Iterator anIterV; + NCollection_List::Iterator anIterV; // Check if the memory used by objects has to be compacted. const Standard_Size nAllocated = myAllocator->NAllocated(); @@ -959,7 +959,7 @@ Handle_NIS_Allocator NIS_InteractiveContext::compactObjects() // Compact the memory: clone all objects to a new allocator, release // the old allocator instance. aNewAlloc = new NIS_Allocator; - NCollection_SparseArray::Iterator + NCollection_SparseArray::Iterator anIter(myObjects); for (; anIter.More(); anIter.Next()) { if (anIter.Value().IsNull() == Standard_False) { @@ -979,9 +979,9 @@ Handle_NIS_Allocator NIS_InteractiveContext::compactObjects() //purpose : //======================================================================= -void markAllDrawersUpdated (const NCollection_Map& lstDrv) +void markAllDrawersUpdated (const NCollection_Map& lstDrv) { - NCollection_Map::Iterator anIterD (lstDrv); + NCollection_Map::Iterator anIterD (lstDrv); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) { diff --git a/src/NIS/NIS_InteractiveContext.hxx b/src/NIS/NIS_InteractiveContext.hxx index 7f5637fba2..a46685be7a 100644 --- a/src/NIS/NIS_InteractiveContext.hxx +++ b/src/NIS/NIS_InteractiveContext.hxx @@ -147,18 +147,18 @@ class NIS_InteractiveContext : public Standard_Transient /** * Associate this Context with the given View. */ - Standard_EXPORT void AttachView (const Handle_NIS_View& theView); + Standard_EXPORT void AttachView (const Handle(NIS_View)& theView); /** * Stop the association of the Context with the given View. */ - Standard_EXPORT void DetachView (const Handle_NIS_View& theView); + Standard_EXPORT void DetachView (const Handle(NIS_View)& theView); //@} /** * Query the InteractiveObject instance by its ID. */ - Standard_EXPORT const Handle_NIS_InteractiveObject& + Standard_EXPORT const Handle(NIS_InteractiveObject)& GetObject (const Standard_Integer theID) const; /** @@ -183,9 +183,9 @@ class NIS_InteractiveContext : public Standard_Transient * Access to Drawers, can be used for specific operations where it is not * desirale to iterate InteractiveObjects. */ - inline NCollection_Map::Iterator + inline NCollection_Map::Iterator GetDrawers () const - { return NCollection_Map::Iterator(myDrawers); } + { return NCollection_Map::Iterator(myDrawers); } // ================ BEGIN Mangement of Objects ================ ///@name Management of Objects @@ -210,8 +210,8 @@ class NIS_InteractiveContext : public Standard_Transient * to False if you have to make a number of similar calls, then you would * call UpdateViews() in the end. */ - Standard_EXPORT void Display (Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_Drawer& theDrawer = NULL, + Standard_EXPORT void Display (Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_Drawer)& theDrawer = NULL, const Standard_Boolean isUpdateViews = Standard_True); @@ -234,8 +234,8 @@ class NIS_InteractiveContext : public Standard_Transient * to False if you have to make a number of similar calls, then you would * call UpdateViews() in the end. */ - Standard_EXPORT void DisplayOnTop (Handle_NIS_InteractiveObject& theObj, - const Handle_NIS_Drawer& theDrawer = NULL, + Standard_EXPORT void DisplayOnTop (Handle(NIS_InteractiveObject)& theObj, + const Handle(NIS_Drawer)& theDrawer = NULL, const Standard_Boolean isUpdateViews = Standard_True); @@ -249,7 +249,7 @@ class NIS_InteractiveContext : public Standard_Transient * to False if you have to make a number of similar calls, then you would * call UpdateViews() in the end. */ - Standard_EXPORT void Erase (const Handle_NIS_InteractiveObject& theObj, + Standard_EXPORT void Erase (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isUpdateViews = Standard_True); @@ -263,7 +263,7 @@ class NIS_InteractiveContext : public Standard_Transient * to False if you have to make a number of similar calls, then you would * call UpdateViews() in the end. */ - Standard_EXPORT void Remove (const Handle_NIS_InteractiveObject& theObj, + Standard_EXPORT void Remove (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isUpdateViews = Standard_True); @@ -319,14 +319,14 @@ class NIS_InteractiveContext : public Standard_Transient * Query the current selection filter. Use the method SetFilter to install it. * By default returns a NULL handle. */ - inline const Handle_NIS_SelectFilter& + inline const Handle(NIS_SelectFilter)& GetFilter () const { return mySelectFilter; } /** * Install a selection filter. */ - inline void SetFilter (const Handle_NIS_SelectFilter& theFilter) + inline void SetFilter (const Handle(NIS_SelectFilter)& theFilter) { mySelectFilter = theFilter; } /** @@ -361,7 +361,7 @@ class NIS_InteractiveContext : public Standard_Transient * True if the selection status has been changed, False if nothing changed */ Standard_EXPORT Standard_Boolean - ProcessSelection(const Handle_NIS_InteractiveObject& O, + ProcessSelection(const Handle(NIS_InteractiveObject)& O, const Standard_Boolean isMultiple = Standard_False); @@ -389,7 +389,7 @@ class NIS_InteractiveContext : public Standard_Transient * True if the selection status has been changed, False if noithing changed */ Standard_EXPORT Standard_Boolean - SetSelected (const Handle_NIS_InteractiveObject& theObj, + SetSelected (const Handle(NIS_InteractiveObject)& theObj, const Standard_Boolean isSelected = Standard_True); @@ -410,7 +410,7 @@ class NIS_InteractiveContext : public Standard_Transient * Query if the given object is selected. */ Standard_EXPORT Standard_Boolean - IsSelected (const Handle_NIS_InteractiveObject& theOb); + IsSelected (const Handle(NIS_InteractiveObject)& theOb); /** * Reset all previous selection. @@ -467,7 +467,7 @@ class NIS_InteractiveContext : public Standard_Transient // ---------- PROTECTED METHODS ---------- - Standard_EXPORT void redraw (const Handle_NIS_View& theView, + Standard_EXPORT void redraw (const Handle(NIS_View)& theView, const NIS_Drawer::DrawType theType); /** @@ -487,7 +487,7 @@ class NIS_InteractiveContext : public Standard_Transient * The ray distance of the intersection point between the ray and theSel. */ Standard_EXPORT Standard_Real - selectObject (Handle_NIS_InteractiveObject& theSel, + selectObject (Handle(NIS_InteractiveObject)& theSel, NCollection_List& theDet, const gp_Ax1& theAxis, const Standard_Real theOver, @@ -546,20 +546,20 @@ class NIS_InteractiveContext : public Standard_Transient const Standard_Boolean isFullyIn) const; private: - void deselectObj (const Handle_NIS_InteractiveObject&, + void deselectObj (const Handle(NIS_InteractiveObject)&, const Standard_Integer); - void selectObj (const Handle_NIS_InteractiveObject&, + void selectObj (const Handle(NIS_InteractiveObject)&, const Standard_Integer); - const Handle_NIS_Drawer& - drawerForDisplay (const Handle_NIS_InteractiveObject&, - const Handle_NIS_Drawer&); + const Handle(NIS_Drawer)& + drawerForDisplay (const Handle(NIS_InteractiveObject)&, + const Handle(NIS_Drawer)&); - void objectForDisplay (Handle_NIS_InteractiveObject&, + void objectForDisplay (Handle(NIS_InteractiveObject)&, const NIS_Drawer::DrawType); - Handle_NIS_Allocator + Handle(NIS_Allocator) compactObjects (); private: @@ -568,7 +568,7 @@ private: /** * Allocator for all data associated with objects. */ - Handle_NIS_Allocator myAllocator; + Handle(NIS_Allocator) myAllocator; /** * The last added object ID. @@ -577,19 +577,19 @@ private: /** * Container of InteractiveObject instances. */ - NCollection_SparseArray + NCollection_SparseArray myObjects; /** * List of Views. */ - NCollection_List myViews; + NCollection_List myViews; /** * Container of Drawers. There should be one or more Drawers for each type of * contained InteractiveObject. */ - NCollection_Map myDrawers; + NCollection_Map myDrawers; /** * Three maps indicating the state of contained objects: @@ -610,7 +610,7 @@ private: /** * Instance of selection filter used for interactive selections. */ - Handle_NIS_SelectFilter mySelectFilter; + Handle(NIS_SelectFilter) mySelectFilter; /** * Current mode of selection. diff --git a/src/NIS/NIS_InteractiveObject.cxx b/src/NIS/NIS_InteractiveObject.cxx index 54a4d36da3..95abb5083a 100644 --- a/src/NIS/NIS_InteractiveObject.cxx +++ b/src/NIS/NIS_InteractiveObject.cxx @@ -36,7 +36,7 @@ NIS_InteractiveObject::~NIS_InteractiveObject ( ) //purpose : //======================================================================= -const Handle_NIS_Drawer& NIS_InteractiveObject::SetDrawer +const Handle(NIS_Drawer)& NIS_InteractiveObject::SetDrawer (const Handle(NIS_Drawer)& theDrawer, const Standard_Boolean setUpdated) { @@ -146,8 +146,8 @@ const Bnd_B3f& NIS_InteractiveObject::GetBox () //purpose : //======================================================================= -void NIS_InteractiveObject::Clone (const Handle_NCollection_BaseAllocator&, - Handle_NIS_InteractiveObject& theDest) const +void NIS_InteractiveObject::Clone (const Handle(NCollection_BaseAllocator)&, + Handle(NIS_InteractiveObject)& theDest) const { if (theDest.IsNull() == Standard_False) { @@ -171,8 +171,8 @@ void NIS_InteractiveObject::Clone (const Handle_NCollection_BaseAllocator&, //======================================================================= void NIS_InteractiveObject::CloneWithID - (const Handle_NCollection_BaseAllocator& theAlloc, - Handle_NIS_InteractiveObject& theDest) + (const Handle(NCollection_BaseAllocator)& theAlloc, + Handle(NIS_InteractiveObject)& theDest) { Clone(theAlloc, theDest); theDest->myID = myID; diff --git a/src/NIS/NIS_InteractiveObject.hxx b/src/NIS/NIS_InteractiveObject.hxx index ac0c011b89..d57e1c9fcf 100644 --- a/src/NIS/NIS_InteractiveObject.hxx +++ b/src/NIS/NIS_InteractiveObject.hxx @@ -95,8 +95,8 @@ * the virtual method Clone() should be correctly defined for every interactive * object subtype. Supposing that MyIOClass inherits MyBaseIOBase : * @code - * void MyIOCalss::Clone (const Handle_NCollection_BaseAllocator& theAlloc, - * Handle_NIS_InteractiveObject& theDest) const + * void MyIOCalss::Clone (const Handle(NCollection_BaseAllocator)& theAlloc, + * Handle(NIS_InteractiveObject)& theDest) const * { * Handle(MyIOClass) aNewObj; * if (theDest.IsNull()) { @@ -170,15 +170,15 @@ class NIS_InteractiveObject : public Standard_Transient * Reference to the finally stored or found Drawer instance inside * the Context. */ - Standard_EXPORT const Handle_NIS_Drawer& - SetDrawer (const Handle_NIS_Drawer& theDrawer, + Standard_EXPORT const Handle(NIS_Drawer)& + SetDrawer (const Handle(NIS_Drawer)& theDrawer, const Standard_Boolean setUpdated = Standard_True); /** * Query the current drawer. */ - inline const Handle_NIS_Drawer& + inline const Handle(NIS_Drawer)& GetDrawer () const { return myDrawer; } @@ -263,14 +263,14 @@ class NIS_InteractiveObject : public Standard_Transient * [in-out] The target object where the data are copied. */ Standard_EXPORT virtual void - Clone (const Handle_NCollection_BaseAllocator& theAll, - Handle_NIS_InteractiveObject& theDest) const; + Clone (const Handle(NCollection_BaseAllocator)& theAll, + Handle(NIS_InteractiveObject)& theDest) const; /** * The same as Clone() but also copies the ID. */ - Standard_EXPORT void CloneWithID (const Handle_NCollection_BaseAllocator&, - Handle_NIS_InteractiveObject&); + Standard_EXPORT void CloneWithID (const Handle(NCollection_BaseAllocator)&, + Handle(NIS_InteractiveObject)&); /** * Intersect the InteractiveObject geometry with a line/ray. @@ -379,7 +379,7 @@ class NIS_InteractiveObject : public Standard_Transient private: // ---------- PRIVATE FIELDS ---------- - Handle_NIS_Drawer myDrawer; + Handle(NIS_Drawer) myDrawer; Standard_Integer myID; NIS_Drawer::DrawType myDrawType : 3; NIS_Drawer::DrawType myBaseType : 3; diff --git a/src/NIS/NIS_ObjectsIterator.cxx b/src/NIS/NIS_ObjectsIterator.cxx index 0561ad4087..1524e8f0fc 100644 --- a/src/NIS/NIS_ObjectsIterator.cxx +++ b/src/NIS/NIS_ObjectsIterator.cxx @@ -25,7 +25,7 @@ void NIS_ObjectsIterator::Initialize (const Handle(NIS_InteractiveContext)& theCtx) { if (theCtx.IsNull()) - myIter = NCollection_SparseArray ::Iterator(); + myIter = NCollection_SparseArray ::Iterator(); else for (myIter.Init (theCtx->myObjects); myIter.More(); myIter.Next()) if (myIter.Value().IsNull() == Standard_False) diff --git a/src/NIS/NIS_ObjectsIterator.hxx b/src/NIS/NIS_ObjectsIterator.hxx index 145930d210..8a7c15ba6f 100644 --- a/src/NIS/NIS_ObjectsIterator.hxx +++ b/src/NIS/NIS_ObjectsIterator.hxx @@ -19,7 +19,7 @@ #include #include -class Handle_NIS_InteractiveContext; +class Handle(NIS_InteractiveContext); /** * Iterator of objects contained in a NIS_InteractiveContext instance. The @@ -56,7 +56,7 @@ class NIS_ObjectsIterator * @param theCtx * Interactive context that is to be iterated for all objects. */ - inline NIS_ObjectsIterator (const Handle_NIS_InteractiveContext& theCtx) + inline NIS_ObjectsIterator (const Handle(NIS_InteractiveContext)& theCtx) { Initialize (theCtx); } /** @@ -65,7 +65,7 @@ class NIS_ObjectsIterator * Interactive context that is to be iterated for all objects. */ Standard_EXPORT void Initialize - (const Handle_NIS_InteractiveContext& theCtx); + (const Handle(NIS_InteractiveContext)& theCtx); /** * Query if the Iterator has an object (not yet finished the iteration @@ -78,7 +78,7 @@ class NIS_ObjectsIterator * Returns the current object at the iteration pointer. If the iteration is * over (More() == False) this method returns NULL Handle. */ - Standard_EXPORT const Handle_NIS_InteractiveObject& + Standard_EXPORT const Handle(NIS_InteractiveObject)& Value () const; /** @@ -89,7 +89,7 @@ class NIS_ObjectsIterator protected: // ---------- PROTECTED FIELDS ---------- - NCollection_SparseArray ::ConstIterator myIter; + NCollection_SparseArray ::ConstIterator myIter; }; diff --git a/src/NIS/NIS_SelectFilter.cxx b/src/NIS/NIS_SelectFilter.cxx index 5975404c81..909df56b89 100644 --- a/src/NIS/NIS_SelectFilter.cxx +++ b/src/NIS/NIS_SelectFilter.cxx @@ -23,7 +23,7 @@ IMPLEMENT_STANDARD_RTTIEXT (NIS_SelectFilter, Standard_Transient) //purpose : //======================================================================= -Standard_Boolean NIS_SelectFilter::ActsOn (const Handle_Standard_Type&) const +Standard_Boolean NIS_SelectFilter::ActsOn (const Handle(Standard_Type)&) const { return Standard_True; } diff --git a/src/NIS/NIS_SelectFilter.hxx b/src/NIS/NIS_SelectFilter.hxx index 25b5fadf5c..6ef7d00fb5 100644 --- a/src/NIS/NIS_SelectFilter.hxx +++ b/src/NIS/NIS_SelectFilter.hxx @@ -20,7 +20,7 @@ #include class NIS_InteractiveObject; -class Handle_Standard_Type; +class Handle(Standard_Type); /** * Interface for selection filters. It can be used in NIS_InteractiveContext by methods SetFilter and GetFilter. @@ -55,7 +55,7 @@ class NIS_SelectFilter : public Standard_Transient * objects are excluded from Selection before any checking. */ Standard_EXPORT virtual Standard_Boolean - ActsOn (const Handle_Standard_Type& theType) const; + ActsOn (const Handle(Standard_Type)& theType) const; protected: diff --git a/src/NIS/NIS_Surface.cxx b/src/NIS/NIS_Surface.cxx index 6c0dcde832..ed0c27cead 100644 --- a/src/NIS/NIS_Surface.cxx +++ b/src/NIS/NIS_Surface.cxx @@ -45,8 +45,8 @@ IMPLEMENT_STANDARD_RTTIEXT(NIS_Surface, NIS_InteractiveObject) //purpose : Compare two triangulations, for NCollection_Map interface. //======================================================================= -inline Standard_Boolean IsEqual(const Handle_Poly_Triangulation& theT0, - const Handle_Poly_Triangulation& theT1) +inline Standard_Boolean IsEqual(const Handle(Poly_Triangulation)& theT0, + const Handle(Poly_Triangulation)& theT1) { return (theT0 == theT1); } @@ -56,7 +56,7 @@ inline Standard_Boolean IsEqual(const Handle_Poly_Triangulation& theT0, //purpose : //======================================================================= -NIS_Surface::NIS_Surface(const Handle_NCollection_BaseAllocator& theAlloc) +NIS_Surface::NIS_Surface(const Handle(NCollection_BaseAllocator)& theAlloc) : myAlloc (theAlloc), mypNodes (NULL), mypNormals (NULL), @@ -77,7 +77,7 @@ NIS_Surface::NIS_Surface(const Handle_NCollection_BaseAllocator& theAlloc) //======================================================================= NIS_Surface::NIS_Surface (const Handle(Poly_Triangulation)& theTri, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) : myAlloc (theAlloc), mypNodes (NULL), mypNormals (NULL), @@ -149,7 +149,7 @@ NIS_Surface::NIS_Surface (const Handle(Poly_Triangulation)& theTri, NIS_Surface::NIS_Surface (const TopoDS_Shape& theShape, const Standard_Real theDeflection, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) : myAlloc (theAlloc), mypNodes (NULL), mypNormals (NULL), @@ -176,7 +176,7 @@ void NIS_Surface::Init (const TopoDS_Shape& theShape, TopLoc_Location aLoc, aLocSurf; // Count the nodes and triangles in faces - NCollection_Map mapTri; + NCollection_Map mapTri; TopExp_Explorer fexp (theShape, TopAbs_FACE); for (; fexp.More(); fexp.Next()) { @@ -505,8 +505,8 @@ NIS_Surface::DisplayMode NIS_Surface::GetDisplayMode () const //purpose : //======================================================================= -void NIS_Surface::Clone (const Handle_NCollection_BaseAllocator& theAlloc, - Handle_NIS_InteractiveObject& theDest) const +void NIS_Surface::Clone (const Handle(NCollection_BaseAllocator)& theAlloc, + Handle(NIS_InteractiveObject)& theDest) const { Handle(NIS_Surface) aNewObj; if (theDest.IsNull()) { diff --git a/src/NIS/NIS_Surface.hxx b/src/NIS/NIS_Surface.hxx index cbc38d6c63..7f31b97756 100644 --- a/src/NIS/NIS_Surface.hxx +++ b/src/NIS/NIS_Surface.hxx @@ -21,7 +21,7 @@ #include class Quantity_Color; -class Handle_Poly_Triangulation; +class Handle(Poly_Triangulation); class TopoDS_Shape; /** @@ -52,8 +52,8 @@ public: /** * Constructor */ - Standard_EXPORT NIS_Surface(const Handle_Poly_Triangulation& theTri, - const Handle_NCollection_BaseAllocator& + Standard_EXPORT NIS_Surface(const Handle(Poly_Triangulation)& theTri, + const Handle(NCollection_BaseAllocator)& theAlloc =0L); /** * Constructor. Creates the presentation of all faces in 'theShape' object. @@ -66,7 +66,7 @@ public: */ Standard_EXPORT NIS_Surface(const TopoDS_Shape& theShape, const Standard_Real theDeflection, - const Handle_NCollection_BaseAllocator& theAl=0L); + const Handle(NCollection_BaseAllocator)& theAl=0L); /** * Destructor @@ -193,8 +193,8 @@ public: * passed NULL then the target should be created. */ Standard_EXPORT virtual void - Clone (const Handle_NCollection_BaseAllocator& theAll, - Handle_NIS_InteractiveObject& theDest) const; + Clone (const Handle(NCollection_BaseAllocator)& theAll, + Handle(NIS_InteractiveObject)& theDest) const; /** * Intersect the surface shading/wireframe geometry with a line/ray. @@ -251,7 +251,7 @@ protected: /** * Allocator for method Clone(). */ - Standard_EXPORT NIS_Surface (const Handle_NCollection_BaseAllocator& theAl); + Standard_EXPORT NIS_Surface (const Handle(NCollection_BaseAllocator)& theAl); /** * Create a 3D bounding box of the object. @@ -266,7 +266,7 @@ protected: gp_XYZ& theNormal) const; private: - Handle_NCollection_BaseAllocator myAlloc; + Handle(NCollection_BaseAllocator) myAlloc; //! Array of nodes in triangles Standard_ShortReal * mypNodes; //! Array of normals (TriNodes) diff --git a/src/NIS/NIS_SurfaceDrawer.cxx b/src/NIS/NIS_SurfaceDrawer.cxx index e3d1345a3d..887c340dbf 100644 --- a/src/NIS/NIS_SurfaceDrawer.cxx +++ b/src/NIS/NIS_SurfaceDrawer.cxx @@ -65,7 +65,7 @@ void NIS_SurfaceDrawer::SetColor(const Quantity_Color &theColor) //purpose : //======================================================================= -void NIS_SurfaceDrawer::Assign (const Handle_NIS_Drawer& theOther) +void NIS_SurfaceDrawer::Assign (const Handle(NIS_Drawer)& theOther) { if (theOther.IsNull() == Standard_False) { NIS_Drawer::Assign (theOther); @@ -88,7 +88,7 @@ void NIS_SurfaceDrawer::Assign (const Handle_NIS_Drawer& theOther) //======================================================================= Standard_Boolean NIS_SurfaceDrawer::IsEqual - (const Handle_NIS_Drawer& theOther)const + (const Handle(NIS_Drawer)& theOther)const { static const Standard_Real anEpsilon2 (1e-7); Standard_Boolean aResult (Standard_False); @@ -124,7 +124,7 @@ Standard_Boolean NIS_SurfaceDrawer::IsEqual //======================================================================= void NIS_SurfaceDrawer::redraw (const DrawType theType, - const Handle_NIS_View& theView) + const Handle(NIS_View)& theView) { glMatrixMode( GL_MODELVIEW ); glPushMatrix(); @@ -241,7 +241,7 @@ void NIS_SurfaceDrawer::AfterDraw (const DrawType theType, //purpose : //======================================================================= -void NIS_SurfaceDrawer::Draw (const Handle_NIS_InteractiveObject& theObj, +void NIS_SurfaceDrawer::Draw (const Handle(NIS_InteractiveObject)& theObj, const DrawType theType, const NIS_DrawList&) { diff --git a/src/NIS/NIS_SurfaceDrawer.hxx b/src/NIS/NIS_SurfaceDrawer.hxx index c6ba0af322..711341440b 100644 --- a/src/NIS/NIS_SurfaceDrawer.hxx +++ b/src/NIS/NIS_SurfaceDrawer.hxx @@ -90,7 +90,7 @@ class NIS_SurfaceDrawer : public NIS_Drawer * Copy the relevant information from another instance of Drawer. * raises exception if theOther has incompatible type (test IsKind). */ - Standard_EXPORT virtual void Assign (const Handle_NIS_Drawer& theOther); + Standard_EXPORT virtual void Assign (const Handle(NIS_Drawer)& theOther); /** * Called before execution of Draw(), once per group of interactive objects. @@ -107,7 +107,7 @@ class NIS_SurfaceDrawer : public NIS_Drawer /** * Main function: display the given interactive object in the given view. */ - Standard_EXPORT virtual void Draw (const Handle_NIS_InteractiveObject&, + Standard_EXPORT virtual void Draw (const Handle(NIS_InteractiveObject)&, const DrawType theType, const NIS_DrawList& theDrawList); @@ -115,11 +115,11 @@ class NIS_SurfaceDrawer : public NIS_Drawer * Matching two instances, for Map interface. */ Standard_EXPORT virtual Standard_Boolean - IsEqual (const Handle_NIS_Drawer& theOth)const; + IsEqual (const Handle(NIS_Drawer)& theOth)const; protected: Standard_EXPORT virtual void redraw (const DrawType theType, - const Handle_NIS_View& theView); + const Handle(NIS_View)& theView); private: diff --git a/src/NIS/NIS_Triangulated.cxx b/src/NIS/NIS_Triangulated.cxx index 6ca03784a9..ba80a066ec 100644 --- a/src/NIS/NIS_Triangulated.cxx +++ b/src/NIS/NIS_Triangulated.cxx @@ -682,8 +682,8 @@ void NIS_Triangulated::SetLineWidth (const Standard_Real theWidth) //purpose : //======================================================================= -void NIS_Triangulated::Clone (const Handle_NCollection_BaseAllocator& theAlloc, - Handle_NIS_InteractiveObject& theDest) const +void NIS_Triangulated::Clone (const Handle(NCollection_BaseAllocator)& theAlloc, + Handle(NIS_InteractiveObject)& theDest) const { Handle(NIS_Triangulated) aNewObj; if (theDest.IsNull()) { diff --git a/src/NIS/NIS_Triangulated.hxx b/src/NIS/NIS_Triangulated.hxx index b246924abd..cf68bccaf3 100644 --- a/src/NIS/NIS_Triangulated.hxx +++ b/src/NIS/NIS_Triangulated.hxx @@ -19,9 +19,9 @@ #include #include -class Handle_NIS_TriangulatedDrawer; +class Handle(NIS_TriangulatedDrawer); class NCollection_BaseAllocator; -class Handle_NCollection_BaseAllocator; +class Handle(NCollection_BaseAllocator); class NIS_TriangulatedDrawer; /** @@ -92,7 +92,7 @@ class NIS_Triangulated : public NIS_InteractiveObject */ Standard_EXPORT NIS_Triangulated(const Standard_Integer nNodes = 0, const Standard_Boolean is2D = Standard_False, - const Handle_NCollection_BaseAllocator& + const Handle(NCollection_BaseAllocator)& theAlloc = 0L); /** @@ -348,8 +348,8 @@ class NIS_Triangulated : public NIS_InteractiveObject * passed NULL then the target should be created. */ Standard_EXPORT virtual void - Clone (const Handle_NCollection_BaseAllocator& theAll, - Handle_NIS_InteractiveObject& theDest) const; + Clone (const Handle(NCollection_BaseAllocator)& theAll, + Handle(NIS_InteractiveObject)& theDest) const; /** * Intersect the InteractiveObject geometry with a line/ray. diff --git a/src/NIS/NIS_TriangulatedDrawer.cxx b/src/NIS/NIS_TriangulatedDrawer.cxx index a69ea24e11..1afbc75592 100644 --- a/src/NIS/NIS_TriangulatedDrawer.cxx +++ b/src/NIS/NIS_TriangulatedDrawer.cxx @@ -61,7 +61,7 @@ NIS_TriangulatedDrawer::NIS_TriangulatedDrawer //purpose : //======================================================================= -void NIS_TriangulatedDrawer::Assign (const Handle_NIS_Drawer& theOther) +void NIS_TriangulatedDrawer::Assign (const Handle(NIS_Drawer)& theOther) { if (theOther.IsNull() == Standard_False) { NIS_Drawer::Assign (theOther); @@ -86,7 +86,7 @@ static const Standard_Integer nObjPerDrawer = 64; //======================================================================= Standard_Boolean NIS_TriangulatedDrawer::IsEqual - (const Handle_NIS_Drawer& theOther)const + (const Handle(NIS_Drawer)& theOther)const { static const Standard_Real anEpsilon2 (1e-7); Standard_Boolean aResult (Standard_False); @@ -226,7 +226,7 @@ void NIS_TriangulatedDrawer::AfterDraw (const DrawType theType, //purpose : //======================================================================= -void NIS_TriangulatedDrawer::Draw (const Handle_NIS_InteractiveObject& theObj, +void NIS_TriangulatedDrawer::Draw (const Handle(NIS_InteractiveObject)& theObj, const DrawType /*theType*/, const NIS_DrawList&) { diff --git a/src/NIS/NIS_TriangulatedDrawer.hxx b/src/NIS/NIS_TriangulatedDrawer.hxx index 8930ac35ac..6c70ac6852 100644 --- a/src/NIS/NIS_TriangulatedDrawer.hxx +++ b/src/NIS/NIS_TriangulatedDrawer.hxx @@ -43,7 +43,7 @@ class NIS_TriangulatedDrawer : public NIS_Drawer * Copy the relevant information from another instance of Drawer. * raises exception if theOther has incompatible type (test IsKind). */ - Standard_EXPORT virtual void Assign (const Handle_NIS_Drawer& theOther); + Standard_EXPORT virtual void Assign (const Handle(NIS_Drawer)& theOther); /** * Called before execution of Draw(), once per group of interactive objects. @@ -60,7 +60,7 @@ class NIS_TriangulatedDrawer : public NIS_Drawer /** * Main function: display the given interactive object in the given view. */ - Standard_EXPORT virtual void Draw (const Handle_NIS_InteractiveObject&, + Standard_EXPORT virtual void Draw (const Handle(NIS_InteractiveObject)&, const DrawType theType, const NIS_DrawList& theDrawList); @@ -68,7 +68,7 @@ class NIS_TriangulatedDrawer : public NIS_Drawer * Matching two instances, for Map interface. */ Standard_EXPORT virtual Standard_Boolean - IsEqual (const Handle_NIS_Drawer& theOth)const; + IsEqual (const Handle(NIS_Drawer)& theOth)const; protected: /** diff --git a/src/NIS/NIS_View.cxx b/src/NIS/NIS_View.cxx index b5c6c18bce..97faf29056 100644 --- a/src/NIS/NIS_View.cxx +++ b/src/NIS/NIS_View.cxx @@ -90,7 +90,7 @@ void NIS_View::RemoveContext (NIS_InteractiveContext * theCtx) break; } - NCollection_Map::Iterator anIterD (theCtx->GetDrawers ()); + NCollection_Map::Iterator anIterD (theCtx->GetDrawers ()); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); if (aDrawer.IsNull() == Standard_False) { @@ -140,7 +140,7 @@ Bnd_B3f NIS_View::GetBndBox() const Bnd_B3f aBox; NCollection_List::Iterator anIterC (myContexts); for (; anIterC.More(); anIterC.Next()) { - NCollection_Map::Iterator anIterD + NCollection_Map::Iterator anIterD (anIterC.Value()->myDrawers); for (; anIterD.More(); anIterD.Next()) { const Handle(NIS_Drawer)& aDrawer = anIterD.Value(); @@ -366,7 +366,7 @@ void NIS_View::DynamicHilight (const Standard_Integer theX, //purpose : //======================================================================= -void NIS_View::DynamicUnhilight(const Handle_NIS_InteractiveObject& theObj) +void NIS_View::DynamicUnhilight(const Handle(NIS_InteractiveObject)& theObj) { if (theObj == myDynHilighted && theObj.IsNull() == Standard_False) { const Handle(NIS_View) aView (this); @@ -532,7 +532,7 @@ void NIS_View::Select (const NCollection_List &thePolygon, //purpose : //======================================================================= -Handle_NIS_InteractiveObject NIS_View::Pick (const Standard_Integer theX, +Handle(NIS_InteractiveObject) NIS_View::Pick (const Standard_Integer theX, const Standard_Integer theY) { // Find the ray passing through the clicked point in the view window. @@ -554,7 +554,7 @@ Handle_NIS_InteractiveObject NIS_View::Pick (const Standard_Integer theX, //purpose : //======================================================================= -Handle_NIS_InteractiveObject NIS_View::Pick +Handle(NIS_InteractiveObject) NIS_View::Pick (const gp_Ax1& theAxis, const Standard_Real theOver, const Standard_Boolean isOnlySelectable) diff --git a/src/NIS/NIS_View.hxx b/src/NIS/NIS_View.hxx index 14070f5962..40af3f4a0c 100644 --- a/src/NIS/NIS_View.hxx +++ b/src/NIS/NIS_View.hxx @@ -62,13 +62,13 @@ class NIS_View : public V3d_View /** * Attach the view to the window. */ - Standard_EXPORT NIS_View (const Handle_V3d_Viewer& theViewer, - const Handle_Aspect_Window& theWindow = NULL); + Standard_EXPORT NIS_View (const Handle(V3d_Viewer)& theViewer, + const Handle(Aspect_Window)& theWindow = NULL); /** * Attach the view to the window. */ - Standard_EXPORT void SetWindow(const Handle_Aspect_Window &theWindow); + Standard_EXPORT void SetWindow(const Handle(Aspect_Window) &theWindow); /** * Indicate whether to draw hilighted objects on top of all other ones @@ -131,7 +131,7 @@ class NIS_View : public V3d_View * Unhilights the hilighted object if it coincides with the given * object instance. */ - Standard_EXPORT void DynamicUnhilight(const Handle_NIS_InteractiveObject&); + Standard_EXPORT void DynamicUnhilight(const Handle(NIS_InteractiveObject)&); /** * Unhilights the currently hilighted object. @@ -228,7 +228,7 @@ class NIS_View : public V3d_View * the selected object picked by the minimal intersection distance among * all contexts attached to this View. */ - Standard_EXPORT Handle_NIS_InteractiveObject + Standard_EXPORT Handle(NIS_InteractiveObject) Pick (const Standard_Integer theX, const Standard_Integer theY); @@ -247,7 +247,7 @@ class NIS_View : public V3d_View * the selected object picked by the minimal intersection distance among * all contexts attached to this View. */ - Standard_EXPORT Handle_NIS_InteractiveObject + Standard_EXPORT Handle(NIS_InteractiveObject) Pick (const gp_Ax1& theAxis, const Standard_Real theOver, const Standard_Boolean isOnlySel); @@ -285,7 +285,7 @@ class NIS_View : public V3d_View // ---------- PRIVATE FIELDS ---------- NCollection_List myContexts; - Handle_NIS_InteractiveObject myDynHilighted; + Handle(NIS_InteractiveObject) myDynHilighted; Standard_Boolean myIsTopHilight : 1; Standard_Boolean myDoHilightSelected : 1; NCollection_Vector myDetected; diff --git a/src/OpenGl/OpenGl_CView.hxx b/src/OpenGl/OpenGl_CView.hxx index d94f24971e..ec443f7842 100644 --- a/src/OpenGl/OpenGl_CView.hxx +++ b/src/OpenGl/OpenGl_CView.hxx @@ -23,8 +23,8 @@ struct OpenGl_CView { - Handle_OpenGl_Workspace WS; - Handle_OpenGl_View View; + Handle(OpenGl_Workspace) WS; + Handle(OpenGl_View) View; DEFINE_STANDARD_ALLOC }; diff --git a/src/OpenGl/OpenGl_Context.hxx b/src/OpenGl/OpenGl_Context.hxx index f0ce577af5..3de3bfdc45 100644 --- a/src/OpenGl/OpenGl_Context.hxx +++ b/src/OpenGl/OpenGl_Context.hxx @@ -349,7 +349,7 @@ public: public: //! @return messenger instance - inline const Handle_Message_Messenger& Messenger() const + inline const Handle(Message_Messenger)& Messenger() const { return ::Message::DefaultMessenger(); } diff --git a/src/PMMgt/PMMgt_PManaged.cxx b/src/PMMgt/PMMgt_PManaged.cxx index 24a90c6d3f..c7458645a4 100644 --- a/src/PMMgt/PMMgt_PManaged.cxx +++ b/src/PMMgt/PMMgt_PManaged.cxx @@ -22,10 +22,10 @@ PMMgt_PManaged::PMMgt_PManaged() //============================================================================ #ifndef CSFDB class _Oid_PMMgt_PManaged : public Oid_PMMgt_PManaged { - friend class Handle_PMMgt_PManaged; + friend class Handle(PMMgt_PManaged); }; -void Handle_PMMgt_PManaged::Delete() +void Handle(PMMgt_PManaged)::Delete() { // PMMgt_PManaged* aMng; _Oid_PMMgt_PManaged *aOid; diff --git a/src/PNaming/PNaming_Name.lxx b/src/PNaming/PNaming_Name.lxx index d57845568f..8660c651b6 100644 --- a/src/PNaming/PNaming_Name.lxx +++ b/src/PNaming/PNaming_Name.lxx @@ -35,10 +35,10 @@ inline Standard_Integer PNaming_Name::Type() const inline Standard_Integer PNaming_Name::ShapeType() const {return myShapeType;} -inline Handle_PNaming_HArray1OfNamedShape PNaming_Name::Arguments() const +inline Handle(PNaming_HArray1OfNamedShape) PNaming_Name::Arguments() const {return myArgs;} -inline Handle_PNaming_NamedShape PNaming_Name::StopNamedShape() const +inline Handle(PNaming_NamedShape) PNaming_Name::StopNamedShape() const {return myStop;} inline Standard_Integer PNaming_Name::Index() const diff --git a/src/PNaming/PNaming_Name_1.lxx b/src/PNaming/PNaming_Name_1.lxx index 7691fa957d..a8cc09b841 100644 --- a/src/PNaming/PNaming_Name_1.lxx +++ b/src/PNaming/PNaming_Name_1.lxx @@ -34,10 +34,10 @@ inline Standard_Integer PNaming_Name_1::Type() const inline Standard_Integer PNaming_Name_1::ShapeType() const {return myShapeType;} -inline Handle_PNaming_HArray1OfNamedShape PNaming_Name_1::Arguments() const +inline Handle(PNaming_HArray1OfNamedShape) PNaming_Name_1::Arguments() const {return myArgs;} -inline Handle_PNaming_NamedShape PNaming_Name_1::StopNamedShape() const +inline Handle(PNaming_NamedShape) PNaming_Name_1::StopNamedShape() const {return myStop;} inline Standard_Integer PNaming_Name_1::Index() const diff --git a/src/PNaming/PNaming_Name_2.lxx b/src/PNaming/PNaming_Name_2.lxx index 5f861479fc..e9037fa328 100644 --- a/src/PNaming/PNaming_Name_2.lxx +++ b/src/PNaming/PNaming_Name_2.lxx @@ -34,10 +34,10 @@ inline Standard_Integer PNaming_Name_2::Type() const inline Standard_Integer PNaming_Name_2::ShapeType() const {return myShapeType;} -inline Handle_PNaming_HArray1OfNamedShape PNaming_Name_2::Arguments() const +inline Handle(PNaming_HArray1OfNamedShape) PNaming_Name_2::Arguments() const {return myArgs;} -inline Handle_PNaming_NamedShape PNaming_Name_2::StopNamedShape() const +inline Handle(PNaming_NamedShape) PNaming_Name_2::StopNamedShape() const {return myStop;} inline Standard_Integer PNaming_Name_2::Index() const diff --git a/src/Plate/Plate_Plate.cxx b/src/Plate/Plate_Plate.cxx index d2a5e369cb..6e59507fe9 100644 --- a/src/Plate/Plate_Plate.cxx +++ b/src/Plate/Plate_Plate.cxx @@ -1032,7 +1032,7 @@ gp_XYZ Plate_Plate::EvaluateDerivative(const gp_XY& point2d, const Standard_Inte // the polynomial part of the Plate function //======================================================================= - void Plate_Plate::CoefPol(Handle_TColgp_HArray2OfXYZ& Coefs) const + void Plate_Plate::CoefPol(Handle(TColgp_HArray2OfXYZ)& Coefs) const { Coefs = new TColgp_HArray2OfXYZ(0,order-1,0,order-1,gp_XYZ(0.,0.,0.)); Standard_Integer i = n_el; diff --git a/src/Poly/Poly_CoherentNode.cxx b/src/Poly/Poly_CoherentNode.cxx index d9d8c2efaf..05876123ba 100644 --- a/src/Poly/Poly_CoherentNode.cxx +++ b/src/Poly/Poly_CoherentNode.cxx @@ -25,7 +25,7 @@ //purpose : //======================================================================= -void Poly_CoherentNode::Clear (const Handle_NCollection_BaseAllocator& theAlloc) +void Poly_CoherentNode::Clear (const Handle(NCollection_BaseAllocator)& theAlloc) { Poly_CoherentTriPtr::RemoveList (myTriangles, theAlloc); myUV[0] = Precision::Infinite(); @@ -55,7 +55,7 @@ void Poly_CoherentNode::SetNormal (const gp_XYZ& theVector) void Poly_CoherentNode::AddTriangle (const Poly_CoherentTriangle& theTri, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { if (myTriangles == NULL) myTriangles = new (theAlloc) Poly_CoherentTriPtr(theTri); @@ -70,7 +70,7 @@ void Poly_CoherentNode::AddTriangle Standard_Boolean Poly_CoherentNode::RemoveTriangle (const Poly_CoherentTriangle& theTri, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { Standard_Boolean aResult(Standard_False); if (&myTriangles->GetTriangle() == &theTri) { diff --git a/src/Poly/Poly_CoherentNode.hxx b/src/Poly/Poly_CoherentNode.hxx index 4a31d72ab0..c7b0b5372d 100644 --- a/src/Poly/Poly_CoherentNode.hxx +++ b/src/Poly/Poly_CoherentNode.hxx @@ -116,14 +116,14 @@ class Poly_CoherentNode : public gp_XYZ /** * Reset the Node to void. */ - Standard_EXPORT void Clear (const Handle_NCollection_BaseAllocator&); + Standard_EXPORT void Clear (const Handle(NCollection_BaseAllocator)&); /** * Connect a triangle to this Node. */ Standard_EXPORT void AddTriangle (const Poly_CoherentTriangle& theTri, - const Handle_NCollection_BaseAllocator& theA); + const Handle(NCollection_BaseAllocator)& theA); /** * Disconnect a triangle from this Node. @@ -131,7 +131,7 @@ class Poly_CoherentNode : public gp_XYZ Standard_EXPORT Standard_Boolean RemoveTriangle (const Poly_CoherentTriangle& theTri, - const Handle_NCollection_BaseAllocator& theA); + const Handle(NCollection_BaseAllocator)& theA); /** * Create an iterator of incident triangles. diff --git a/src/Poly/Poly_CoherentTriPtr.cxx b/src/Poly/Poly_CoherentTriPtr.cxx index 1b84d8ec9d..abd22e9876 100644 --- a/src/Poly/Poly_CoherentTriPtr.cxx +++ b/src/Poly/Poly_CoherentTriPtr.cxx @@ -37,7 +37,7 @@ void Poly_CoherentTriPtr::Iterator::Next () void Poly_CoherentTriPtr::Append (const Poly_CoherentTriangle * pTri, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { Handle(NCollection_BaseAllocator) anAlloc = theAlloc; if (theAlloc.IsNull()) @@ -56,7 +56,7 @@ void Poly_CoherentTriPtr::Append void Poly_CoherentTriPtr::Prepend (const Poly_CoherentTriangle * pTri, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { Handle(NCollection_BaseAllocator) anAlloc = theAlloc; if (theAlloc.IsNull()) @@ -75,7 +75,7 @@ void Poly_CoherentTriPtr::Prepend void Poly_CoherentTriPtr::Remove (Poly_CoherentTriPtr * thePtr, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { Handle(NCollection_BaseAllocator) anAlloc = theAlloc; if (theAlloc.IsNull()) @@ -96,7 +96,7 @@ void Poly_CoherentTriPtr::Remove void Poly_CoherentTriPtr::RemoveList (Poly_CoherentTriPtr * thePtr, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { Handle(NCollection_BaseAllocator) anAlloc = theAlloc; if (theAlloc.IsNull()) diff --git a/src/Poly/Poly_CoherentTriPtr.hxx b/src/Poly/Poly_CoherentTriPtr.hxx index 8988f28bfb..9f1fd1b2c3 100644 --- a/src/Poly/Poly_CoherentTriPtr.hxx +++ b/src/Poly/Poly_CoherentTriPtr.hxx @@ -125,7 +125,7 @@ class Poly_CoherentTriPtr * Allocator where the new pointer instance is created. */ Standard_EXPORT void Append (const Poly_CoherentTriangle * pTri, - const Handle_NCollection_BaseAllocator& theA); + const Handle(NCollection_BaseAllocator)& theA); /** * Prepend a pointer to triangle into the list before the current instance. @@ -135,7 +135,7 @@ class Poly_CoherentTriPtr * Allocator where the new pointer instance is created. */ Standard_EXPORT void Prepend (const Poly_CoherentTriangle * pTri, - const Handle_NCollection_BaseAllocator& theA); + const Handle(NCollection_BaseAllocator)& theA); /** * Remove a pointer to triangle from its list. @@ -146,14 +146,14 @@ class Poly_CoherentTriPtr */ Standard_EXPORT static void Remove (Poly_CoherentTriPtr * thePtr, - const Handle_NCollection_BaseAllocator& theA); + const Handle(NCollection_BaseAllocator)& theA); /** * Remove the list containing the given pointer to triangle. */ Standard_EXPORT static void RemoveList (Poly_CoherentTriPtr * thePtr, - const Handle_NCollection_BaseAllocator&); + const Handle(NCollection_BaseAllocator)&); protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/Poly/Poly_CoherentTriangulation.cxx b/src/Poly/Poly_CoherentTriangulation.cxx index a6d622daa0..79ec1bcd53 100644 --- a/src/Poly/Poly_CoherentTriangulation.cxx +++ b/src/Poly/Poly_CoherentTriangulation.cxx @@ -33,7 +33,7 @@ IMPLEMENT_STANDARD_RTTIEXT (Poly_CoherentTriangulation, Standard_Transient) //======================================================================= Poly_CoherentTriangulation::Poly_CoherentTriangulation - (const Handle_NCollection_BaseAllocator& theAlloc) + (const Handle(NCollection_BaseAllocator)& theAlloc) : myAlloc (theAlloc.IsNull() ? NCollection_BaseAllocator::CommonBaseAllocator() : theAlloc), myDeflection (0.) @@ -46,7 +46,7 @@ Poly_CoherentTriangulation::Poly_CoherentTriangulation Poly_CoherentTriangulation::Poly_CoherentTriangulation (const Handle(Poly_Triangulation)& theTriangulation, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) : myAlloc (theAlloc.IsNull() ? NCollection_BaseAllocator::CommonBaseAllocator() : theAlloc) { @@ -114,7 +114,7 @@ Poly_CoherentTriangulation::~Poly_CoherentTriangulation () //purpose : //======================================================================= -Handle_Poly_Triangulation Poly_CoherentTriangulation::GetTriangulation() const +Handle(Poly_Triangulation) Poly_CoherentTriangulation::GetTriangulation() const { Handle(Poly_Triangulation) aResult; const Standard_Integer nNodes = NNodes(); @@ -277,7 +277,7 @@ Standard_Boolean Poly_CoherentTriangulation::RemoveDegenerated //======================================================================= Poly_CoherentTriangulation::IteratorOfTriangle::IteratorOfTriangle - (const Handle_Poly_CoherentTriangulation& theTri) + (const Handle(Poly_CoherentTriangulation)& theTri) { if (!theTri.IsNull()) { Init(theTri->myTriangles); @@ -312,7 +312,7 @@ void Poly_CoherentTriangulation::IteratorOfTriangle::Next() //======================================================================= Poly_CoherentTriangulation::IteratorOfNode::IteratorOfNode - (const Handle_Poly_CoherentTriangulation& theTri) + (const Handle(Poly_CoherentTriangulation)& theTri) { if (!theTri.IsNull()) { Init(theTri->myNodes); @@ -345,7 +345,7 @@ void Poly_CoherentTriangulation::IteratorOfNode::Next() //======================================================================= Poly_CoherentTriangulation::IteratorOfLink::IteratorOfLink - (const Handle_Poly_CoherentTriangulation& theTri) + (const Handle(Poly_CoherentTriangulation)& theTri) { if (!theTri.IsNull()) { Init(theTri->myLinks); @@ -731,7 +731,7 @@ void Poly_CoherentTriangulation::ClearLinks () //======================================================================= Handle(Poly_CoherentTriangulation) Poly_CoherentTriangulation::Clone - (const Handle_NCollection_BaseAllocator& theAlloc) const + (const Handle(NCollection_BaseAllocator)& theAlloc) const { Handle(Poly_CoherentTriangulation) newTri; diff --git a/src/Poly/Poly_CoherentTriangulation.hxx b/src/Poly/Poly_CoherentTriangulation.hxx index 6cd81e5a29..6b870ad9d2 100644 --- a/src/Poly/Poly_CoherentTriangulation.hxx +++ b/src/Poly/Poly_CoherentTriangulation.hxx @@ -22,7 +22,7 @@ #include #include -class Handle_Poly_CoherentTriangulation; +class Handle(Poly_CoherentTriangulation); class Poly_CoherentTriangulation; template class NCollection_List; @@ -108,7 +108,7 @@ class Poly_CoherentTriangulation : public Standard_Transient public: //! Constructor Standard_EXPORT IteratorOfTriangle - (const Handle_Poly_CoherentTriangulation& theTri); + (const Handle(Poly_CoherentTriangulation)& theTri); //! Make step Standard_EXPORT virtual void Next (); }; @@ -121,7 +121,7 @@ class Poly_CoherentTriangulation : public Standard_Transient public: //! Constructor Standard_EXPORT IteratorOfNode - (const Handle_Poly_CoherentTriangulation& theTri); + (const Handle(Poly_CoherentTriangulation)& theTri); //! Make step Standard_EXPORT virtual void Next (); }; @@ -134,7 +134,7 @@ class Poly_CoherentTriangulation : public Standard_Transient public: //! Constructor Standard_EXPORT IteratorOfLink - (const Handle_Poly_CoherentTriangulation& theTri); + (const Handle(Poly_CoherentTriangulation)& theTri); //! Make step Standard_EXPORT virtual void Next (); }; @@ -157,15 +157,15 @@ class Poly_CoherentTriangulation : public Standard_Transient * Empty constructor. */ Standard_EXPORT Poly_CoherentTriangulation - (const Handle_NCollection_BaseAllocator& theAlloc = 0L); + (const Handle(NCollection_BaseAllocator)& theAlloc = 0L); /** * Constructor. It does not create Links, you should call ComputeLinks * following this constructor if you need these links. */ Standard_EXPORT Poly_CoherentTriangulation - (const Handle_Poly_Triangulation& theTriangulation, - const Handle_NCollection_BaseAllocator& theAlloc = 0L); + (const Handle(Poly_Triangulation)& theTriangulation, + const Handle(NCollection_BaseAllocator)& theAlloc = 0L); /** * Destructor. @@ -175,7 +175,7 @@ class Poly_CoherentTriangulation : public Standard_Transient /** * Create an instance of Poly_Triangulation from this object. */ - Standard_EXPORT Handle_Poly_Triangulation + Standard_EXPORT Handle(Poly_Triangulation) GetTriangulation () const; /** @@ -349,7 +349,7 @@ class Poly_CoherentTriangulation : public Standard_Transient * Query the allocator of elements, this allocator can be used for other * objects */ - inline const Handle_NCollection_BaseAllocator& + inline const Handle(NCollection_BaseAllocator)& Allocator () const { return myAlloc; @@ -357,8 +357,8 @@ class Poly_CoherentTriangulation : public Standard_Transient /** * Create a copy of this Triangulation, using the given allocator. */ - Standard_EXPORT Handle_Poly_CoherentTriangulation Clone - (const Handle_NCollection_BaseAllocator& theAlloc) const; + Standard_EXPORT Handle(Poly_CoherentTriangulation) Clone + (const Handle(NCollection_BaseAllocator)& theAlloc) const; /** * Debugging output. @@ -376,7 +376,7 @@ class Poly_CoherentTriangulation : public Standard_Transient NCollection_Vector myTriangles; NCollection_Vector myNodes; NCollection_Vector myLinks; - Handle_NCollection_BaseAllocator myAlloc; + Handle(NCollection_BaseAllocator) myAlloc; Standard_Real myDeflection; public: diff --git a/src/Poly/Poly_ListOfTriangulation.hxx b/src/Poly/Poly_ListOfTriangulation.hxx index 38a6a502e4..f5af44b3e5 100644 --- a/src/Poly/Poly_ListOfTriangulation.hxx +++ b/src/Poly/Poly_ListOfTriangulation.hxx @@ -23,6 +23,6 @@ * List of Poly_Triangulation instances. */ -typedef NCollection_List Poly_ListOfTriangulation; +typedef NCollection_List Poly_ListOfTriangulation; #endif diff --git a/src/Poly/Poly_MakeLoops.cxx b/src/Poly/Poly_MakeLoops.cxx index b009f657ea..ea1192593b 100644 --- a/src/Poly/Poly_MakeLoops.cxx +++ b/src/Poly/Poly_MakeLoops.cxx @@ -29,7 +29,7 @@ static Standard_Integer doDebug = 0; //======================================================================= Poly_MakeLoops::Poly_MakeLoops(const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) : myHelper (theHelper), myAlloc (theAlloc), myMapLink (4000, myAlloc), @@ -45,7 +45,7 @@ Poly_MakeLoops::Poly_MakeLoops(const Helper* theHelper, void Poly_MakeLoops::Reset (const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) { myHelper = theHelper; myMapLink.Clear(); @@ -245,8 +245,8 @@ Standard_Integer Poly_MakeLoops::Perform() Standard_Integer Poly_MakeLoops::findContour (Standard_Integer theIndexS, NCollection_IndexedMap &theContour, - const Handle_NCollection_BaseAllocator& theTempAlloc, - const Handle_NCollection_IncAllocator& theTempAlloc1) const + const Handle(NCollection_BaseAllocator)& theTempAlloc, + const Handle(NCollection_IncAllocator)& theTempAlloc1) const { theContour.Clear(); Standard_Integer aStartIndex = 0; @@ -579,7 +579,7 @@ void Poly_MakeLoops::GetHangingLinks(ListOfLink& theLinks) const //======================================================================= Poly_MakeLoops3D::Poly_MakeLoops3D(const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) : Poly_MakeLoops (theHelper, theAlloc) { } @@ -651,7 +651,7 @@ Standard_Integer Poly_MakeLoops3D::chooseLeftWay Poly_MakeLoops2D::Poly_MakeLoops2D(const Standard_Boolean theLeftWay, const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc) + const Handle(NCollection_BaseAllocator)& theAlloc) : Poly_MakeLoops (theHelper, theAlloc), myRightWay(!theLeftWay) { diff --git a/src/Poly/Poly_MakeLoops.hxx b/src/Poly/Poly_MakeLoops.hxx index 61e8d6dc1f..f1a23cf1c0 100644 --- a/src/Poly/Poly_MakeLoops.hxx +++ b/src/Poly/Poly_MakeLoops.hxx @@ -23,7 +23,7 @@ #include #include -class Handle_NCollection_IncAllocator; +class Handle(NCollection_IncAllocator); /** * Make loops from a set of connected links. A link is represented by @@ -154,12 +154,12 @@ public: //! Constructor. If helper is NULL then the algorithm will //! probably return a wrong result Standard_EXPORT Poly_MakeLoops(const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc = 0L); + const Handle(NCollection_BaseAllocator)& theAlloc = 0L); //! It is to reset the algorithm to the initial state. Standard_EXPORT void Reset (const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc = 0L); + const Handle(NCollection_BaseAllocator)& theAlloc = 0L); //! Adds a link to the set. theOrient defines which orientations of the link //! are allowed. @@ -233,8 +233,8 @@ protected: private: int findContour(Standard_Integer theIndexS, NCollection_IndexedMap& theContour, - const Handle_NCollection_BaseAllocator& theTempAlloc, - const Handle_NCollection_IncAllocator& theTempAlloc1) const; + const Handle(NCollection_BaseAllocator)& theTempAlloc, + const Handle(NCollection_IncAllocator)& theTempAlloc1) const; void acceptContour(const NCollection_IndexedMap& theContour, Standard_Integer theStartNumber); Standard_Integer getFirstNode(Standard_Integer theIndexS) const; @@ -244,7 +244,7 @@ private: // FIELDS const Helper* myHelper; - Handle_NCollection_BaseAllocator myAlloc; + Handle(NCollection_BaseAllocator) myAlloc; NCollection_IndexedMap myMapLink; NCollection_Sequence myLoops; HeapOfInteger myStartIndices; @@ -300,7 +300,7 @@ public: //! Constructor. If helper is NULL then the algorithm will //! probably return a wrong result Standard_EXPORT Poly_MakeLoops3D(const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc); + const Handle(NCollection_BaseAllocator)& theAlloc); protected: Standard_EXPORT virtual Standard_Integer chooseLeftWay @@ -341,7 +341,7 @@ public: //! probably return a wrong result Standard_EXPORT Poly_MakeLoops2D(const Standard_Boolean theLeftWay, const Helper* theHelper, - const Handle_NCollection_BaseAllocator& theAlloc); + const Handle(NCollection_BaseAllocator)& theAlloc); protected: Standard_EXPORT virtual Standard_Integer chooseLeftWay diff --git a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx index 347fd4aef1..39b53eb01b 100644 --- a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx +++ b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx @@ -410,7 +410,7 @@ ProjLib_ComputeApproxOnPolarSurface::ProjLib_ComputeApproxOnPolarSurface { myTolerance = tol3d; //OCC217 //myTolerance = Max(tolerance,Precision::PApproximation()); - const Handle_Adaptor2d_HCurve2d InitCurve2d ; + const Handle(Adaptor2d_HCurve2d) InitCurve2d ; myBSpline = Perform(InitCurve2d,Curve,S); } diff --git a/src/Prs3d/Prs3d_Drawer.cxx b/src/Prs3d/Prs3d_Drawer.cxx index 50d1b54e7c..1a08a2bc4f 100644 --- a/src/Prs3d/Prs3d_Drawer.cxx +++ b/src/Prs3d/Prs3d_Drawer.cxx @@ -548,7 +548,7 @@ void Prs3d_Drawer::SetFaceBoundaryAspect (const Handle(Prs3d_LineAspect)& theAsp // function : FaceBoundaryAspect // purpose : // ======================================================================= -Handle_Prs3d_LineAspect Prs3d_Drawer::FaceBoundaryAspect () +Handle(Prs3d_LineAspect) Prs3d_Drawer::FaceBoundaryAspect () { if (myFaceBoundaryAspect.IsNull ()) { diff --git a/src/Prs3d/Prs3d_Presentation.cxx b/src/Prs3d/Prs3d_Presentation.cxx index 5742471be2..76bce4714e 100644 --- a/src/Prs3d/Prs3d_Presentation.cxx +++ b/src/Prs3d/Prs3d_Presentation.cxx @@ -303,8 +303,8 @@ Handle(Graphic3d_Structure) Prs3d_Presentation:: //purpose : //======================================================================= -void Prs3d_Presentation::Compute(const Handle_Graphic3d_DataStructureManager& aDataStruct, - Handle_Graphic3d_Structure& aStruct) +void Prs3d_Presentation::Compute(const Handle(Graphic3d_DataStructureManager)& aDataStruct, + Handle(Graphic3d_Structure)& aStruct) { Graphic3d_Structure::Compute(aDataStruct,aStruct ); } @@ -314,7 +314,7 @@ void Prs3d_Presentation::Compute(const Handle_Graphic3d_DataStructureManager& aD //purpose : //======================================================================= -Handle_Graphic3d_Structure Prs3d_Presentation::Compute(const Handle_Graphic3d_DataStructureManager& aDataStruc, +Handle(Graphic3d_Structure) Prs3d_Presentation::Compute(const Handle(Graphic3d_DataStructureManager)& aDataStruc, const TColStd_Array2OfReal& anArray) { return Graphic3d_Structure::Compute(aDataStruc,anArray); @@ -325,9 +325,9 @@ Handle_Graphic3d_Structure Prs3d_Presentation::Compute(const Handle_Graphic3d_Da //purpose : //======================================================================= -void Prs3d_Presentation::Compute(const Handle_Graphic3d_DataStructureManager& aDataStruc, +void Prs3d_Presentation::Compute(const Handle(Graphic3d_DataStructureManager)& aDataStruc, const TColStd_Array2OfReal& anArray, - Handle_Graphic3d_Structure& aStruc) + Handle(Graphic3d_Structure)& aStruc) { Graphic3d_Structure::Compute(aDataStruc,anArray,aStruc); } diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index 9efdd19ec7..f962a08d65 100644 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -2136,7 +2136,7 @@ TopoDS_Shape OCC1077_boolbl(BRepAlgoAPI_BooleanOperation& aBoolenaOperation,cons TopoDS_Shape ShapeCut = aBoolenaOperation.Shape(); //#ifdef OCC40 -// Handle_TopOpeBRepBuild_HBuilder build = aBoolenaOperation.Builder(); +// Handle(TopOpeBRepBuild_HBuilder) build = aBoolenaOperation.Builder(); //#endif TopTools_ListIteratorOfListOfShape its; @@ -2202,7 +2202,7 @@ TopoDS_Shape OCC1077_Bug() TopoDS_Shape theCylinder3 = BRepPrimAPI_MakeCylinder(gp_Ax2(gp_Pnt(0, - 10, 0), gp_Dir(0, 1, 0)), 3, 20).Shape(); TopoDS_Shape theTmp1 = OCC1077_cut_blend(theCommon,theCylinder1,0.7); - Handle_ShapeFix_Shape fixer = new ShapeFix_Shape(theTmp1); + Handle(ShapeFix_Shape) fixer = new ShapeFix_Shape(theTmp1); fixer->Perform(); theTmp1 = fixer->Shape(); TopoDS_Shape theTmp2 = OCC1077_cut_blend(theTmp1,theCylinder2,0.7); @@ -2657,9 +2657,9 @@ static Standard_Integer OCC7141 (Draw_Interpretor& di, Standard_Integer argc, co nCount = Draw::Atoi(argv[1]); TCollection_AsciiString aFilePath = argv[2]; STEPCAFControl_Writer writer; - Handle_TDocStd_Document document; + Handle(TDocStd_Document) document; document = new TDocStd_Document("Pace Test-StepExporter-"); - Handle_XCAFDoc_ShapeTool shapeTool; + Handle(XCAFDoc_ShapeTool) shapeTool; shapeTool = XCAFDoc_DocumentTool::ShapeTool(document->Main()); shapeTool->AddShape(AddTestStructure(nCount), Standard_True); STEPControl_StepModelType mode = STEPControl_AsIs; diff --git a/src/QABugs/QABugs_12.cxx b/src/QABugs/QABugs_12.cxx index 38861eb3ea..df51593fff 100644 --- a/src/QABugs/QABugs_12.cxx +++ b/src/QABugs/QABugs_12.cxx @@ -69,7 +69,7 @@ static Standard_Integer OCC895 (Draw_Interpretor& di, Standard_Integer argc, con gp_Circ circ1 = makeCirc1.Value(); GC_MakeArcOfCircle makeArc1(circ1, 0, M_PI/2, Standard_True); if(!makeArc1.IsDone()) return 1; - Handle_Geom_TrimmedCurve arc1 = makeArc1.Value(); + Handle(Geom_TrimmedCurve) arc1 = makeArc1.Value(); // Create wire 1 BRepBuilderAPI_MakeEdge makeEdge1(arc1, arc1->StartPoint(), arc1->EndPoint()); @@ -89,7 +89,7 @@ static Standard_Integer OCC895 (Draw_Interpretor& di, Standard_Integer argc, con gp_Circ circ2 = makeCirc2.Value(); GC_MakeArcOfCircle makeArc2(circ2, 0, M_PI/2, Standard_True); if(!makeArc2.IsDone()) return 1; - Handle_Geom_TrimmedCurve arc2 = makeArc2.Value(); + Handle(Geom_TrimmedCurve) arc2 = makeArc2.Value(); // Create wire 2 BRepBuilderAPI_MakeEdge makeEdge2(arc2, arc2->StartPoint(), arc2->EndPoint()); diff --git a/src/QABugs/QABugs_17.cxx b/src/QABugs/QABugs_17.cxx index 03aa9a5cda..02d8d63b70 100644 --- a/src/QABugs/QABugs_17.cxx +++ b/src/QABugs/QABugs_17.cxx @@ -217,7 +217,7 @@ static Standard_Integer BUC60970 (Draw_Interpretor& di, Standard_Integer argc, c TopExp_Explorer spineWireExp(spineWire, TopAbs_EDGE); Standard_Real first, last; - Handle_Geom_Curve curl_ = BRep_Tool::Curve(TopoDS::Edge(spineWireExp.Current()), first, last); + Handle(Geom_Curve) curl_ = BRep_Tool::Curve(TopoDS::Edge(spineWireExp.Current()), first, last); gp_Pnt firstPnt; gp_Vec tanVec; curl_->D1(first, firstPnt, tanVec); @@ -391,9 +391,9 @@ static Standard_Integer OCC138 (Draw_Interpretor& di, Standard_Integer /*argc*/ BRepPrimAPI_MakeBox box2(gp_Pnt(120, 120, 120), gp_Pnt(300, 300,300)); BRepPrimAPI_MakeBox box3(gp_Pnt(320, 320, 320), gp_Pnt(500, 500,500)); - Handle_AIS_Shape ais1 = new AIS_Shape(box1.Shape()); - Handle_AIS_Shape ais2 = new AIS_Shape(box2.Shape()); - Handle_AIS_Shape ais3 = new AIS_Shape(box3.Shape()); + Handle(AIS_Shape) ais1 = new AIS_Shape(box1.Shape()); + Handle(AIS_Shape) ais2 = new AIS_Shape(box2.Shape()); + Handle(AIS_Shape) ais3 = new AIS_Shape(box3.Shape()); aContext->Display(ais1); aContext->Display(ais2); @@ -411,7 +411,7 @@ static Standard_Integer OCC138 (Draw_Interpretor& di, Standard_Integer /*argc*/ while(aContext->MoreCurrent()) { di << "\n count is = " << count++; - Handle_AIS_InteractiveObject ais = aContext->Current(); + Handle(AIS_InteractiveObject) ais = aContext->Current(); aContext->AddOrRemoveCurrentObject(ais); aContext->InitCurrent(); } @@ -450,7 +450,7 @@ static Standard_Integer BUC60821(Draw_Interpretor& di, Standard_Integer argc,con static int geom_get_2Dpt_from_3Dpt(const gp_Pnt& pnt3d, const gp_Pln& pln, gp_Pnt2d& pnt2d) { int ret = 0; - Handle_Geom_Plane gpln = new Geom_Plane(pln); + Handle(Geom_Plane) gpln = new Geom_Plane(pln); GeomAdaptor_Surface adsur(gpln); Extrema_ExtPS extps(pnt3d, adsur, 0.001, 0.001); if( extps.IsDone() ) @@ -471,14 +471,14 @@ static int geom_get_2Dpt_from_3Dpt(const gp_Pnt& pnt3d, const gp_Pln& pln, gp_Pn static Standard_Integer OCC353 (Draw_Interpretor& di, Standard_Integer , const char ** ) { gp_Ax2 ax21( gp_Pnt(100,0,0), gp_Dir(0,0,1) ); - Handle_Geom_Circle h_cir1 = new Geom_Circle( ax21, 25 ); + Handle(Geom_Circle) h_cir1 = new Geom_Circle( ax21, 25 ); gp_Ax2 ax22( gp_Pnt(-100,0,0), gp_Dir(0,0,1) ); - Handle_Geom_Circle h_cir2 = new Geom_Circle( ax22, 25 ); + Handle(Geom_Circle) h_cir2 = new Geom_Circle( ax22, 25 ); gp_Pln refpln( gp_Pnt(0,0,0), gp_Dir(0,0,1) ); - Handle_Geom2d_Curve cir2d1 = GeomAPI::To2d(h_cir1, refpln); - Handle_Geom2d_Curve cir2d2 = GeomAPI::To2d(h_cir2, refpln); + Handle(Geom2d_Curve) cir2d1 = GeomAPI::To2d(h_cir1, refpln); + Handle(Geom2d_Curve) cir2d2 = GeomAPI::To2d(h_cir2, refpln); Geom2dAdaptor_Curve adop1(cir2d1); Geom2dAdaptor_Curve adop2(cir2d2); @@ -486,7 +486,7 @@ static Standard_Integer OCC353 (Draw_Interpretor& di, Standard_Integer , const c Geom2dGcc_QualifiedCurve qcur1(adop1, GccEnt_enclosing); Geom2dGcc_QualifiedCurve qcur2(adop2, GccEnt_enclosing); - Handle_Geom_CartesianPoint h_carpt = new Geom_CartesianPoint(0,175,0); + Handle(Geom_CartesianPoint) h_carpt = new Geom_CartesianPoint(0,175,0); gp_Pnt pt3d = h_carpt->Pnt(); gp_Pnt2d pt2d; @@ -500,7 +500,7 @@ static Standard_Integer OCC353 (Draw_Interpretor& di, Standard_Integer , const c st = "pt2d"; DrawTrSurf::Set(st,pt2d); - Handle_Geom2d_CartesianPoint pt = new Geom2d_CartesianPoint(pt2d); + Handle(Geom2d_CartesianPoint) pt = new Geom2d_CartesianPoint(pt2d); Geom2dGcc_Circ2d3Tan sol( qcur1, qcur2, pt, 0.001, 0.0, 0.0); int res = 0; @@ -606,7 +606,7 @@ static Standard_Integer OCC232 (Draw_Interpretor& di, Standard_Integer /*argc*/ builder.Add(comp, cs1); builder.Add(comp, cs2); - Handle_AIS_Shape ais = new AIS_Shape(comp); + Handle(AIS_Shape) ais = new AIS_Shape(comp); aContext->Display(ais); TopExp_Explorer exp(comp, TopAbs_COMPSOLID); @@ -638,9 +638,9 @@ static Standard_Integer OCC138LC (Draw_Interpretor& di, Standard_Integer /*argc BRepPrimAPI_MakeBox box2(gp_Pnt(120, 120, 120), gp_Pnt(300, 300,300)); BRepPrimAPI_MakeBox box3(gp_Pnt(320, 320, 320), gp_Pnt(500, 500,500)); - Handle_AIS_Shape ais1 = new AIS_Shape(box1.Shape()); - Handle_AIS_Shape ais2 = new AIS_Shape(box2.Shape()); - Handle_AIS_Shape ais3 = new AIS_Shape(box3.Shape()); + Handle(AIS_Shape) ais1 = new AIS_Shape(box1.Shape()); + Handle(AIS_Shape) ais2 = new AIS_Shape(box2.Shape()); + Handle(AIS_Shape) ais3 = new AIS_Shape(box3.Shape()); aContext->Display(ais1); aContext->Display(ais2); @@ -658,7 +658,7 @@ static Standard_Integer OCC138LC (Draw_Interpretor& di, Standard_Integer /*argc while(aContext->MoreSelected()) { di << "\n count is = %d" << count++; - Handle_AIS_InteractiveObject ais = aContext->SelectedInteractive(); + Handle(AIS_InteractiveObject) ais = aContext->SelectedInteractive(); aContext->AddOrRemoveSelected(ais); aContext->InitSelected(); } @@ -683,9 +683,9 @@ static Standard_Integer OCC189 (Draw_Interpretor& di, Standard_Integer /*argc*/ BRepPrimAPI_MakeBox box2(gp_Pnt(120, 120, 120), gp_Pnt(300, 300, 300)); BRepPrimAPI_MakeBox box3(gp_Pnt(320, 320, 320), gp_Pnt(500, 500, 500)); - Handle_AIS_Shape ais1 = new AIS_Shape(box1.Shape()); - Handle_AIS_Shape ais2 = new AIS_Shape(box2.Shape()); - Handle_AIS_Shape ais3 = new AIS_Shape(box3.Shape()); + Handle(AIS_Shape) ais1 = new AIS_Shape(box1.Shape()); + Handle(AIS_Shape) ais2 = new AIS_Shape(box2.Shape()); + Handle(AIS_Shape) ais3 = new AIS_Shape(box3.Shape()); aContext1->Display(ais1); aContext1->Display(ais2); @@ -718,7 +718,7 @@ static Standard_Integer OCC189 (Draw_Interpretor& di, Standard_Integer /*argc*/ while(aContext1->MoreCurrent()) { di << "\n count1 is = " << count1++; - Handle_AIS_InteractiveObject ais = aContext1->Current(); + Handle(AIS_InteractiveObject) ais = aContext1->Current(); aContext1->AddOrRemoveCurrentObject(ais); aContext1->InitCurrent(); } @@ -732,7 +732,7 @@ static Standard_Integer OCC189 (Draw_Interpretor& di, Standard_Integer /*argc*/ while(aContext2->MoreCurrent()) { di << "\n count2 is = " << count2++; - Handle_AIS_InteractiveObject ais = aContext2->Current(); + Handle(AIS_InteractiveObject) ais = aContext2->Current(); aContext2->AddOrRemoveCurrentObject(ais); aContext2->InitCurrent(); } @@ -1458,7 +1458,7 @@ static Standard_Integer OCCN1 (Draw_Interpretor& di, Standard_Integer argc, cons BRepBuilderAPI_MakeFace face(twire); TopoDS_Face tface = face.Face(); - ////////Handle_AIS_Shape face_ais = new AIS_Shape( tface ); + ////////Handle(AIS_Shape) face_ais = new AIS_Shape( tface ); ////////aContext->Display(face_ais); TopoDS_Solid box; @@ -1568,14 +1568,14 @@ static Standard_Integer OCC2569 (Draw_Interpretor& di, Standard_Integer argc, co for(int i=1; i<=poles; i++) arr.SetValue(i, gp_Pnt(i+10, i*2+20, i*3+45)); - Handle_Geom_BezierCurve bez = new Geom_BezierCurve(arr); + Handle(Geom_BezierCurve) bez = new Geom_BezierCurve(arr); if(bez.IsNull()) { di << "\n The curve is not created.\n"; } else { di << "\n Degree = " << bez->Degree() << "\n"; } TopoDS_Edge sh = BRepBuilderAPI_MakeEdge(bez).Edge(); - Handle_AIS_Shape ais = new AIS_Shape(sh); + Handle(AIS_Shape) ais = new AIS_Shape(sh); aContext->Display(ais); DrawTrSurf::Set(argv[2],bez); return 0; @@ -1644,7 +1644,7 @@ static Standard_Integer OCC1642 (Draw_Interpretor& di, Standard_Integer argc, co } - Handle_ShapeFix_Wire sfw = new ShapeFix_Wire; + Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire; sfw->Load(TopoDS::Wire(wire)); sfw->SetFace(face); sfw->SetPrecision(Precision::Confusion()); diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 3329b9bb09..c7a58d23ec 100755 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -1198,7 +1198,7 @@ static Standard_Integer OCC24005 (Draw_Interpretor& theDI, Standard_Integer theN return 1; } - Handle_Geom_Plane plane(new Geom_Plane( + Handle(Geom_Plane) plane(new Geom_Plane( gp_Ax3( gp_Pnt(-72.948737453424499, 754.30437716359393, 259.52151854671678), gp_Dir(6.2471473085930200e-007, -0.99999999999980493, 0.00000000000000000), gp_Dir(0.99999999999980493, 6.2471473085930200e-007, 0.00000000000000000)))); @@ -1704,8 +1704,8 @@ static Standard_Integer OCC24533 (Draw_Interpretor& di, Standard_Integer n, cons { if (n != 1) return 1; - DoIsNull(di); - DoIsNull(di); + DoIsNull(di); + DoIsNull(di); return 0; } diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx index 372590cc78..fe4eed3817 100644 --- a/src/QABugs/QABugs_3.cxx +++ b/src/QABugs/QABugs_3.cxx @@ -575,7 +575,7 @@ static Standard_Integer BUC60729 (Draw_Interpretor& /*di*/,Standard_Integer /*ar // Bnd_Box __emptyBox; // Box is void ! -// Handle_Bnd_HArray1OfBox __aSetOfBox = new Bnd_HArray1OfBox( 1, siMaxNbrBox, __emptyBox ); +// Handle(Bnd_HArray1OfBox) __aSetOfBox = new Bnd_HArray1OfBox( 1, siMaxNbrBox, __emptyBox ); for (i=1,aExplorer.ReInit(); aExplorer.More(); aExplorer.Next(),i++ ) { @@ -634,23 +634,23 @@ static Standard_Integer BUC60792(Draw_Interpretor& di, Standard_Integer /*argc*/ gp_Pnt pt3d(0, 20, 150); gp_Ax2 anAx2(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0), gp_Dir(0, 0, 1)); gp_Circ circ(anAx2, 50.0); - Handle_Geom_Circle gcir = new Geom_Circle(circ); - Handle_Geom_Plane pln = new Geom_Plane(gp_Ax3(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0))); - Handle_Geom2d_Curve gcir1 = GeomAPI::To2d(gcir, pln->Pln()); + Handle(Geom_Circle) gcir = new Geom_Circle(circ); + Handle(Geom_Plane) pln = new Geom_Plane(gp_Ax3(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0))); + Handle(Geom2d_Curve) gcir1 = GeomAPI::To2d(gcir, pln->Pln()); TopoDS_Shape sh1 = BRepBuilderAPI_MakeEdge(gcir1, pln).Shape(); - Handle_AIS_Shape ais1 = new AIS_Shape(sh1); + Handle(AIS_Shape) ais1 = new AIS_Shape(sh1); aContext->SetColor(ais1, Quantity_NOC_INDIANRED); aContext->Display(ais1); DBRep::Set("sh0",sh1); gp_Pnt2d thepoint; // local_get_2Dpointfrom3Dpoint(pt3d, pln->Pln(), thepoint); thepoint = ProjLib::Project(pln->Pln(),pt3d); - Handle_Geom2d_CartesianPoint ThePoint = new Geom2d_CartesianPoint(thepoint); + Handle(Geom2d_CartesianPoint) ThePoint = new Geom2d_CartesianPoint(thepoint); Geom2dAdaptor_Curve acur1(gcir1) ; Geom2dGcc_QualifiedCurve qcur1(acur1, GccEnt_outside) ; Geom2dGcc_Circ2d2TanRad cirtanrad(qcur1, ThePoint, 200.0, 0.0001); printf("\n No. of solutions = %d\n", cirtanrad.NbSolutions()); - Handle_Geom2d_Circle gccc; + Handle(Geom2d_Circle) gccc; if( cirtanrad.NbSolutions() ) { for( int i = 1; i<=cirtanrad.NbSolutions(); i++) { gp_Circ2d ccc = cirtanrad.ThisSolution(i); @@ -659,7 +659,7 @@ static Standard_Integer BUC60792(Draw_Interpretor& di, Standard_Integer /*argc*/ Standard_Character aStr[5]; Sprintf(aStr,"sh%d",i); DBRep::Set(aStr,sh); - Handle_AIS_Shape ais = new AIS_Shape(sh); + Handle(AIS_Shape) ais = new AIS_Shape(sh); if( i ==1 ) aContext->SetColor(ais, Quantity_NOC_GREEN); if( i == 2) @@ -714,7 +714,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co TopoDS_Shape FP1; TopoDS_Solid solid; Handle(AIS_Shape) ais1; - Handle_AIS_Shape ais2; + Handle(AIS_Shape) ais2; Handle(Geom_BezierSurface) BZ1; TColgp_Array2OfPnt array1(1,3,1,3); array1.SetValue(1,1,gp_Pnt(0,100,0)); @@ -773,11 +773,11 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co DBRep::Set("FP",FP); //step 2. offseting the surface. - Handle_Geom_OffsetSurface offsurf; + Handle(Geom_OffsetSurface) offsurf; offsurf = new Geom_OffsetSurface(BZ1, -100); BRepBuilderAPI_MakeFace bzf2( offsurf, Precision::Confusion() ); TopoDS_Face F2= bzf2.Face(); - Handle_AIS_Shape ais22 = new AIS_Shape(F2); + Handle(AIS_Shape) ais22 = new AIS_Shape(F2); aContext->Display(ais22); DBRep::Set("F2",F2); @@ -811,12 +811,12 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co { TopoDS_Edge e1 = TopoDS::Edge(Ex.Current()); Standard_Real f = 0.0, l = 0.0; - Handle_Geom_Curve newBSplin = BRep_Tool::Curve(e1, f, l); + Handle(Geom_Curve) newBSplin = BRep_Tool::Curve(e1, f, l); newBSplin = new Geom_TrimmedCurve(newBSplin, f, l); Handle(Geom_Curve) projCurve = GeomProjLib::Project(newBSplin,offsurf); myWire->Add((BRepBuilderAPI_MakeEdge(projCurve)).Edge()); } - Handle_AIS_Shape ais33 = new AIS_Shape( myWire->Wire() ); + Handle(AIS_Shape) ais33 = new AIS_Shape( myWire->Wire() ); aContext->Display(ais33); DBRep::Set("Wire",myWire->Wire()); @@ -1335,7 +1335,7 @@ static Standard_Integer BUC60841(Draw_Interpretor& di, Standard_Integer argc, co } DBRep::Set("fsh2",fsh2); - Handle_AIS_Shape aisp1 = new AIS_Shape(fsh2); + Handle(AIS_Shape) aisp1 = new AIS_Shape(fsh2); // aContext->Display(aisp1); return 0; } diff --git a/src/QABugs/QABugs_4.cxx b/src/QABugs/QABugs_4.cxx index 2e7ceef2e1..71a8099cb2 100644 --- a/src/QABugs/QABugs_4.cxx +++ b/src/QABugs/QABugs_4.cxx @@ -41,15 +41,15 @@ static Standard_Integer BUC60738 (Draw_Interpretor& di, Standard_Integer /*argc* } TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(-40,0,0),20).Shape(); - Handle_AIS_Shape theAISShape = new AIS_Shape(theSphere); + Handle(AIS_Shape) theAISShape = new AIS_Shape(theSphere); //display mode = Shading theAISShape->SetDisplayMode(1); //get the drawer - Handle_AIS_Drawer theDrawer = theAISShape->Attributes(); - Handle_Prs3d_ShadingAspect theShadingAspect = theDrawer->ShadingAspect(); - Handle_Graphic3d_AspectFillArea3d theAspectFillArea3d = theShadingAspect->Aspect(); + Handle(AIS_Drawer) theDrawer = theAISShape->Attributes(); + Handle(Prs3d_ShadingAspect) theShadingAspect = theDrawer->ShadingAspect(); + Handle(Graphic3d_AspectFillArea3d) theAspectFillArea3d = theShadingAspect->Aspect(); //allow to display the edges theAspectFillArea3d->SetEdgeOn(); diff --git a/src/QABugs/QABugs_8.cxx b/src/QABugs/QABugs_8.cxx index 0848337a93..bdc82ef8bc 100644 --- a/src/QABugs/QABugs_8.cxx +++ b/src/QABugs/QABugs_8.cxx @@ -96,9 +96,9 @@ static Standard_Integer OCC204 (Draw_Interpretor& di, Standard_Integer argc, co BRepPrimAPI_MakeBox box2(gp_Pnt(120, 120 + deltaY, 120), gp_Pnt(300, 300 + deltaY,300)); BRepPrimAPI_MakeBox box3(gp_Pnt(320, 320 + deltaY, 320), gp_Pnt(500, 500 + deltaY,500)); - Handle_AIS_Shape ais1 = new AIS_Shape(box1.Shape()); - Handle_AIS_Shape ais2 = new AIS_Shape(box2.Shape()); - Handle_AIS_Shape ais3 = new AIS_Shape(box3.Shape()); + Handle(AIS_Shape) ais1 = new AIS_Shape(box1.Shape()); + Handle(AIS_Shape) ais2 = new AIS_Shape(box2.Shape()); + Handle(AIS_Shape) ais3 = new AIS_Shape(box3.Shape()); aContext->Display(ais1); aContext->Display(ais2); @@ -116,7 +116,7 @@ static Standard_Integer OCC204 (Draw_Interpretor& di, Standard_Integer argc, co while(aContext->MoreCurrent()) { //printf("\n count is = %d", count++); - Handle_AIS_InteractiveObject ais = aContext->Current(); + Handle(AIS_InteractiveObject) ais = aContext->Current(); aContext->Remove(ais, UpdateViewer); aContext->InitCurrent(); } diff --git a/src/QABugs/QABugs_9.cxx b/src/QABugs/QABugs_9.cxx index 3a02f6ee67..37dd2223af 100644 --- a/src/QABugs/QABugs_9.cxx +++ b/src/QABugs/QABugs_9.cxx @@ -166,8 +166,8 @@ static Standard_Integer OCC24303(Draw_Interpretor& di, Standard_Integer n, const gp_Elips2d ellipse1 = gp_Elips2d( gp_Ax2d(p0,gp::DX2d()),majorRadius, minorRadius,true); gp_Elips2d ellipse2 = gp_Elips2d( gp_Ax2d(p1,gp::DX2d()),majorRadius, minorRadius,true); - Handle_Geom2d_Curve curve1 = new Geom2d_Ellipse(ellipse1); - Handle_Geom2d_Curve curve2 = new Geom2d_Ellipse(ellipse2); + Handle(Geom2d_Curve) curve1 = new Geom2d_Ellipse(ellipse1); + Handle(Geom2d_Curve) curve2 = new Geom2d_Ellipse(ellipse2); DrawTrSurf::Set("c1", curve1); DrawTrSurf::Set("c2", curve2); //Expected tangent diff --git a/src/QABugs/QABugs_MyText.cxx b/src/QABugs/QABugs_MyText.cxx index 37769cd6aa..5fca3dced5 100644 --- a/src/QABugs/QABugs_MyText.cxx +++ b/src/QABugs/QABugs_MyText.cxx @@ -53,7 +53,7 @@ void QABugs_MyText::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPrese const Standard_Integer /*aMode*/ ) { aPresentation->Clear(); - Handle_Prs3d_TextAspect asp = myDrawer->TextAspect(); + Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect(); asp->SetFont(myNameOfFont); asp->SetColor(myNameOfColor); diff --git a/src/QABugs/QABugs_PresentableObject.cxx b/src/QABugs/QABugs_PresentableObject.cxx index 96cfbbdc75..6f2e305902 100644 --- a/src/QABugs/QABugs_PresentableObject.cxx +++ b/src/QABugs/QABugs_PresentableObject.cxx @@ -36,7 +36,7 @@ void QABugs_PresentableObject::Compute(const Handle(PrsMgr_PresentationManager3d { Handle(Graphic3d_Structure) aStructure = Handle(Graphic3d_Structure)::DownCast (thePrs); Handle(Graphic3d_Group) aGroup = aStructure->NewGroup(); - Handle_Prs3d_ShadingAspect anAspect = myDrawer->ShadingAspect(); + Handle(Prs3d_ShadingAspect) anAspect = myDrawer->ShadingAspect(); Graphic3d_MaterialAspect aMat = anAspect->Aspect()->FrontMaterial(); aMat.SetReflectionModeOff (Graphic3d_TOR_AMBIENT); aMat.SetReflectionModeOff (Graphic3d_TOR_DIFFUSE); diff --git a/src/QANCollection/QANCollection4.cxx b/src/QANCollection/QANCollection4.cxx index 26c7319d27..e112d72882 100644 --- a/src/QANCollection/QANCollection4.cxx +++ b/src/QANCollection/QANCollection4.cxx @@ -35,7 +35,7 @@ static Standard_Integer QANColStdAllocator1(Draw_Interpretor& di, Standard_Integ } //type definitions - typedef Handle_Standard_Transient elem_type; + typedef Handle(Standard_Transient) elem_type; typedef NCollection_StdAllocator allocator_type; Standard_STATIC_ASSERT (sizeof (allocator_type::value_type) == sizeof (elem_type)); Standard_STATIC_ASSERT (sizeof (allocator_type::pointer) == sizeof (void*)); diff --git a/src/RWStl/RWStl.cxx b/src/RWStl/RWStl.cxx index d8e6463a01..39fe02b559 100644 --- a/src/RWStl/RWStl.cxx +++ b/src/RWStl/RWStl.cxx @@ -282,7 +282,7 @@ Standard_Boolean RWStl::WriteAscii (const Handle(StlMesh_Mesh)& theMesh, //Warning : //======================================================================= -Handle_StlMesh_Mesh RWStl::ReadFile (const OSD_Path& thePath, +Handle(StlMesh_Mesh) RWStl::ReadFile (const OSD_Path& thePath, const Handle(Message_ProgressIndicator)& theProgInd) { OSD_File file (thePath); @@ -320,7 +320,7 @@ Handle_StlMesh_Mesh RWStl::ReadFile (const OSD_Path& thePath, //Warning : //======================================================================= -Handle_StlMesh_Mesh RWStl::ReadBinary (const OSD_Path& thePath, +Handle(StlMesh_Mesh) RWStl::ReadBinary (const OSD_Path& thePath, const Handle(Message_ProgressIndicator)& /*theProgInd*/) { Standard_Integer NBFACET; @@ -397,7 +397,7 @@ Handle_StlMesh_Mesh RWStl::ReadBinary (const OSD_Path& thePath, //Warning : //======================================================================= -Handle_StlMesh_Mesh RWStl::ReadAscii (const OSD_Path& thePath, +Handle(StlMesh_Mesh) RWStl::ReadAscii (const OSD_Path& thePath, const Handle(Message_ProgressIndicator)& theProgInd) { TCollection_AsciiString filename; diff --git a/src/Select3D/Select3D_SensitiveCircle.cxx b/src/Select3D/Select3D_SensitiveCircle.cxx index 0ed30f6d76..d7883b4ee2 100644 --- a/src/Select3D/Select3D_SensitiveCircle.cxx +++ b/src/Select3D/Select3D_SensitiveCircle.cxx @@ -477,7 +477,7 @@ Handle(Select3D_SensitiveEntity) Select3D_SensitiveCircle::GetConnected(const To //purpose : //======================================================================= -void Select3D_SensitiveCircle::Project(const Handle_Select3D_Projector &aProjector) +void Select3D_SensitiveCircle::Project(const Handle(Select3D_Projector) &aProjector) { Select3D_SensitivePoly::Project(aProjector); gp_Pnt2d aCenter; diff --git a/src/Select3D/Select3D_SensitiveWire.cxx b/src/Select3D/Select3D_SensitiveWire.cxx index 5888ee6b69..e95478f9ae 100644 --- a/src/Select3D/Select3D_SensitiveWire.cxx +++ b/src/Select3D/Select3D_SensitiveWire.cxx @@ -286,7 +286,7 @@ Handle(Select3D_SensitiveEntity) Select3D_SensitiveWire::GetLastDetected() const //purpose : //======================================================================= -void Select3D_SensitiveWire::Set(const Handle_SelectBasics_EntityOwner &TheOwnerId) +void Select3D_SensitiveWire::Set(const Handle(SelectBasics_EntityOwner) &TheOwnerId) { Select3D_SensitiveEntity::Set(TheOwnerId); diff --git a/src/SelectBasics/SelectBasics_SortAlgo.cxx b/src/SelectBasics/SelectBasics_SortAlgo.cxx index fee432e5e9..a6883bf6bd 100644 --- a/src/SelectBasics/SelectBasics_SortAlgo.cxx +++ b/src/SelectBasics/SelectBasics_SortAlgo.cxx @@ -34,7 +34,7 @@ SelectBasics_SortAlgo::SelectBasics_SortAlgo() SelectBasics_SortAlgo::SelectBasics_SortAlgo (const Bnd_Box2d& ClippingRectangle, const Standard_Real sizeOfSensitiveArea, - const Handle_Bnd_HArray1OfBox2d& theRectangles) + const Handle(Bnd_HArray1OfBox2d)& theRectangles) : clipRect(ClippingRectangle), sizeArea(sizeOfSensitiveArea) { sortedRect.Initialize(clipRect, theRectangles); @@ -46,7 +46,7 @@ SelectBasics_SortAlgo::SelectBasics_SortAlgo //======================================================================= void SelectBasics_SortAlgo::Initialize(const Bnd_Box2d& ClippingRectangle, const Standard_Real sizeOfSensitiveArea, - const Handle_Bnd_HArray1OfBox2d& theRectangles) + const Handle(Bnd_HArray1OfBox2d)& theRectangles) { clipRect=ClippingRectangle; sizeArea=sizeOfSensitiveArea; diff --git a/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx b/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx index 888ac064d7..6636e36415 100644 --- a/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx +++ b/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx @@ -20,8 +20,8 @@ #include #include -inline Standard_Boolean IsEqual (const Handle_SelectMgr_SelectableObject& theH1, - const Handle_SelectMgr_SelectableObject& theH2) +inline Standard_Boolean IsEqual (const Handle(SelectMgr_SelectableObject)& theH1, + const Handle(SelectMgr_SelectableObject)& theH2) { return (theH1 == theH2); } diff --git a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.lxx b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.lxx index bb6089fa11..cd3a1e5bbb 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.lxx +++ b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.lxx @@ -137,7 +137,7 @@ inline Standard_Integer ShapeAnalysis_FreeBoundData::NbNotches() const //purpose : Returns sequence of notches on the contour //======================================================================= -inline Handle_TopTools_HSequenceOfShape ShapeAnalysis_FreeBoundData::Notches() const +inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_FreeBoundData::Notches() const { return myNotches; } diff --git a/src/Standard/Standard_Persistent.cxx b/src/Standard/Standard_Persistent.cxx index 0fb2fde648..7a3c0003a4 100644 --- a/src/Standard/Standard_Persistent.cxx +++ b/src/Standard/Standard_Persistent.cxx @@ -23,10 +23,10 @@ #include // The Initialization of the Standard_Persistent variables -const Handle_Standard_Type& Standard_Persistent_Type_() +const Handle(Standard_Type)& Standard_Persistent_Type_() { - static const Handle_Standard_Type _Ancestors[]={NULL}; - static Handle_Standard_Type _aType + static const Handle(Standard_Type) _Ancestors[]={NULL}; + static Handle(Standard_Type) _aType = new Standard_Type("Standard_Persistent", sizeof(Standard_Persistent), 0, @@ -42,9 +42,9 @@ const Handle_Standard_Type& Standard_Persistent_Type_() // The Method This // -Handle_Standard_Persistent Standard_Persistent::This() const +Handle(Standard_Persistent) Standard_Persistent::This() const { - Handle_Standard_Persistent aHand(this); + Handle(Standard_Persistent) aHand(this); return aHand; } @@ -108,7 +108,7 @@ Handle(Standard_Persistent)::~Handle(Standard_Persistent)() EndScope(); } -void Handle_Standard_Persistent::RaiseNullObject(const Standard_CString S) const +void Handle(Standard_Persistent)::RaiseNullObject(const Standard_CString S) const { Standard_NullObject::Raise(S); } diff --git a/src/Standard/Standard_Transient.cxx b/src/Standard/Standard_Transient.cxx index ff7d191b31..40687e51e2 100644 --- a/src/Standard/Standard_Transient.cxx +++ b/src/Standard/Standard_Transient.cxx @@ -28,9 +28,9 @@ IMPLEMENT_STANDARD_RTTI(Standard_Transient) // The Method This // -Handle_Standard_Transient Standard_Transient::This() const +Handle(Standard_Transient) Standard_Transient::This() const { - return Handle_Standard_Transient(this); + return Handle(Standard_Transient)(this); } // Empty Destructor diff --git a/src/Standard/Standard_Type.cxx b/src/Standard/Standard_Type.cxx index 320b8aa2bc..1887a80c15 100644 --- a/src/Standard/Standard_Type.cxx +++ b/src/Standard/Standard_Type.cxx @@ -167,7 +167,7 @@ Standard_Address Standard_Type::Ancestors()const } //============================================================================ -Standard_Boolean Standard_Type::SubType(const Handle_Standard_Type& anOther)const +Standard_Boolean Standard_Type::SubType(const Handle(Standard_Type)& anOther)const { // Among ancestors of the type of this, there is the type of anOther return anOther == this || diff --git a/src/StdSelect/StdSelect_Shape.cxx b/src/StdSelect/StdSelect_Shape.cxx index 89d090b9ab..90e8ea2bf2 100644 --- a/src/StdSelect/StdSelect_Shape.cxx +++ b/src/StdSelect/StdSelect_Shape.cxx @@ -58,16 +58,16 @@ void StdSelect_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*PM*/ StdPrs_WFShape::Add(P,mysh,DRWR); } -void StdSelect_Shape::Compute(const Handle_Prs3d_Projector& aProjector , - const Handle_Geom_Transformation& aGeomTrans, - const Handle_Prs3d_Presentation& aPresentation ) +void StdSelect_Shape::Compute(const Handle(Prs3d_Projector)& aProjector , + const Handle(Geom_Transformation)& aGeomTrans, + const Handle(Prs3d_Presentation)& aPresentation ) { PrsMgr_PresentableObject::Compute(aProjector,aGeomTrans,aPresentation); } -void StdSelect_Shape::Compute(const Handle_Prs3d_Projector& aProjector, - const Handle_Prs3d_Presentation& aPresentation) +void StdSelect_Shape::Compute(const Handle(Prs3d_Projector)& aProjector, + const Handle(Prs3d_Presentation)& aPresentation) { PrsMgr_PresentableObject::Compute(aProjector,aPresentation); } diff --git a/src/TDF/TDF_HAllocator.hxx b/src/TDF/TDF_HAllocator.hxx index 958065df6f..fd14a522f9 100644 --- a/src/TDF/TDF_HAllocator.hxx +++ b/src/TDF/TDF_HAllocator.hxx @@ -18,6 +18,6 @@ #include -typedef Handle_NCollection_BaseAllocator TDF_HAllocator; +typedef Handle(NCollection_BaseAllocator) TDF_HAllocator; #endif diff --git a/src/TDF/TDF_LabelNode.hxx b/src/TDF/TDF_LabelNode.hxx index fe78776131..1c86fe9091 100644 --- a/src/TDF/TDF_LabelNode.hxx +++ b/src/TDF/TDF_LabelNode.hxx @@ -26,7 +26,7 @@ class TDF_Attribute; class TDF_AttributeIterator; class TDF_ChildIterator; class TDF_Data; -class Handle_TDF_Data; +class Handle(TDF_Data); class TDF_Label; #define KEEP_LOCAL_ROOT diff --git a/src/TNaming/TNaming_Identifier.cxx b/src/TNaming/TNaming_Identifier.cxx index f99f63142b..6e17315588 100644 --- a/src/TNaming/TNaming_Identifier.cxx +++ b/src/TNaming/TNaming_Identifier.cxx @@ -253,7 +253,7 @@ TopoDS_Shape TNaming_Identifier::ShapeContext() const //======================================================================= -//function : Handle_TNaming_NamedShape +//function : Handle(TNaming_NamedShape) //purpose : //======================================================================= diff --git a/src/TObj/TObj_Container.hxx b/src/TObj/TObj_Container.hxx index 36ffe4ab98..ceb7a02772 100644 --- a/src/TObj/TObj_Container.hxx +++ b/src/TObj/TObj_Container.hxx @@ -42,7 +42,7 @@ DEFINE_DATAMAP (TObj_DataMapOfNameLabel, TObj_CollectionOfLabel, DEFINE_DATAMAP (TObj_DataMapOfObjectHSequenceOcafObjects, TObj_CollectionOfHSeqOfObject, - Handle_TObj_Object,Handle_TObj_HSequenceOfObject) + Handle(TObj_Object),Handle(TObj_HSequenceOfObject)) DEFINE_DATAMAP(TObj_DataMapOfStringPointer,TObj_CollectionOfPointer, TCollection_AsciiString,Standard_Address) diff --git a/src/TObj/TObj_SequenceOfObject.hxx b/src/TObj/TObj_SequenceOfObject.hxx index aedf85ac66..f6dd3d9846 100644 --- a/src/TObj/TObj_SequenceOfObject.hxx +++ b/src/TObj/TObj_SequenceOfObject.hxx @@ -25,7 +25,7 @@ #include #include -DEFINE_BASECOLLECTION (TObj_CollectionOfObject,Handle_TObj_Object) +DEFINE_BASECOLLECTION (TObj_CollectionOfObject,Handle(TObj_Object)) DEFINE_SEQUENCE (TObj_SequenceOfObject, TObj_CollectionOfObject,Handle(TObj_Object)) diff --git a/src/TPrsStd/TPrsStd_ConstraintTools.cxx b/src/TPrsStd/TPrsStd_ConstraintTools.cxx index 464896d834..08d87b4c3e 100644 --- a/src/TPrsStd/TPrsStd_ConstraintTools.cxx +++ b/src/TPrsStd/TPrsStd_ConstraintTools.cxx @@ -296,7 +296,7 @@ void TPrsStd_ConstraintTools::ComputeDistance (const Handle(TDataXtd_Constraint) GetGoodShape(shape3); const TopoDS_Edge& E = TopoDS::Edge(shape3); BRepAdaptor_Curve CURVE(E); - Handle_Geom_Geometry aGeomGeometry = CURVE.Curve().Curve()->Transformed(CURVE.Trsf()) ; + Handle(Geom_Geometry) aGeomGeometry = CURVE.Curve().Curve()->Transformed(CURVE.Trsf()) ; gp_Dir Dir = ((Handle(Geom_Line)&) aGeomGeometry)->Lin().Direction(); gp_Dir xdir(aplane->Pln().Position().XDirection()); if (Dir.IsParallel(xdir,Precision::Confusion())) @@ -1787,7 +1787,7 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& if (CURVE.GetType() == GeomAbs_Line) { // Works only with line !! //#ifndef DEB - Handle_Geom_Geometry aGeomGeometry = CURVE.Curve().Curve()->Transformed(CURVE.Trsf()) ; + Handle(Geom_Geometry) aGeomGeometry = CURVE.Curve().Curve()->Transformed(CURVE.Trsf()) ; gp_Lin OLin = ((Handle(Geom_Line)&) aGeomGeometry)->Lin(); //#else // gp_Lin OLin = ((Handle(Geom_Line)&) CURVE.Curve().Curve()->Transformed(CURVE.Trsf()))->Lin(); @@ -1818,7 +1818,7 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& else if (CURVE.GetType() == GeomAbs_Circle) { //#ifndef DEB - Handle_Geom_Geometry aGeomGeometry = CURVE.Curve().Curve()->Transformed(CURVE.Trsf()) ; + Handle(Geom_Geometry) aGeomGeometry = CURVE.Curve().Curve()->Transformed(CURVE.Trsf()) ; gp_Ax1 ax = ((Handle(Geom_Circle)&) aGeomGeometry)->Circ().Axis(); //#else // gp_Ax1 ax = ((Handle(Geom_Circle)&) CURVE.Curve().Curve()->Transformed(CURVE.Trsf()))->Circ().Axis(); @@ -1844,7 +1844,7 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& BRepBuilderAPI_MakeFace MkF (w1,Standard_True); if (MkF.IsDone()) { //#ifndef DEB - Handle_Geom_Surface aGeomSurface = BRep_Tool::Surface(MkF.Face()); + Handle(Geom_Surface) aGeomSurface = BRep_Tool::Surface(MkF.Face()); aplane = (Handle(Geom_Plane)&) aGeomSurface ; //#else // aplane = ((Handle(Geom_Plane)&) BRep_Tool::Surface(MkF.Face())); diff --git a/src/TestTopOpe/TestTopOpe_BOOP.hxx b/src/TestTopOpe/TestTopOpe_BOOP.hxx index b321374593..285cf6da45 100644 --- a/src/TestTopOpe/TestTopOpe_BOOP.hxx +++ b/src/TestTopOpe/TestTopOpe_BOOP.hxx @@ -115,8 +115,8 @@ private: const char* mykeys[TESTTOPOPE_NKEYS]; const char* myresnamdef; VarsTopo myVarsTopo; - Handle_TopOpeBRepDS_HDataStructure myHDS; - Handle_TopOpeBRepBuild_HBuilder myHB; + Handle(TopOpeBRepDS_HDataStructure) myHDS; + Handle(TopOpeBRepBuild_HBuilder) myHB; TCollection_AsciiString mynameS1,mynameS2; TopoDS_Shape myS1,myS2; TopAbs_ShapeEnum myS1type,myS2type; diff --git a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx index fb4b92502f..5d0686768d 100644 --- a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx @@ -170,8 +170,8 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c else if (!strcmp(a[ia],"-AB")) outAB = Standard_True; } - Handle_TopOpeBRepBuild_HBuilder HB = PBOOP->HBuilder(); - Handle_TopOpeBRepDS_HDataStructure HDS = HB->DataStructure(); + Handle(TopOpeBRepBuild_HBuilder) HB = PBOOP->HBuilder(); + Handle(TopOpeBRepDS_HDataStructure) HDS = HB->DataStructure(); const TopOpeBRepDS_DataStructure& BDS = HDS->DS(); const TopTools_ListOfShape& loe = HB->Section(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx index 9b5447fccb..7767bc1b47 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx @@ -35,8 +35,8 @@ public: Standard_Boolean GetI(const Standard_Integer i) const; void Allocate(); protected: - Handle_TopOpeBRepDS_HDataStructure myHDS; - Standard_Integer myne; Handle_TColStd_HArray1OfBoolean myhe; + Handle(TopOpeBRepDS_HDataStructure) myHDS; + Standard_Integer myne; Handle(TColStd_HArray1OfBoolean) myhe; }; class TopOpeBRepDS_traceCURVE : public TopOpeBRepDS_traceDS { diff --git a/src/TopTools/TopTools_MutexForShapeProvider.hxx b/src/TopTools/TopTools_MutexForShapeProvider.hxx index bb7bb01607..0d3ec7d7b5 100644 --- a/src/TopTools/TopTools_MutexForShapeProvider.hxx +++ b/src/TopTools/TopTools_MutexForShapeProvider.hxx @@ -54,7 +54,7 @@ private: TopTools_MutexForShapeProvider & operator = (const TopTools_MutexForShapeProvider &); - NCollection_DataMap myMap; + NCollection_DataMap myMap; }; diff --git a/src/Units/Units_UnitsDictionary.cxx b/src/Units/Units_UnitsDictionary.cxx index d3f2abab44..8e619b240e 100644 --- a/src/Units/Units_UnitsDictionary.cxx +++ b/src/Units/Units_UnitsDictionary.cxx @@ -286,7 +286,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename) if(move) { Standard_Integer last = theunitssequence->Length(); unit = theunitssequence->Value(last); - shiftedunit = *(Handle_Units_ShiftedUnit*)&unit; + shiftedunit = *(Handle(Units_ShiftedUnit)*)&unit; shiftedunit->Move(move); } } diff --git a/src/Units/Units_UnitsSystem.cxx b/src/Units/Units_UnitsSystem.cxx index 9379a99d7a..ca1bbecbaf 100644 --- a/src/Units/Units_UnitsSystem.cxx +++ b/src/Units/Units_UnitsSystem.cxx @@ -408,7 +408,7 @@ Standard_Real Units_UnitsSystem::ConvertUserSystemValueToSI void Units_UnitsSystem::Dump() const { Handle(Standard_Transient) transient = This(); - Handle(Units_UnitsSystem) unitssystem = *(Handle_Units_UnitsSystem*)&transient; + Handle(Units_UnitsSystem) unitssystem = *(Handle(Units_UnitsSystem)*)&transient; Units_Explorer explorer(unitssystem); cout<<" UNITSSYSTEM : "<Clear(); @@ -2011,7 +2011,7 @@ void FilledCircle::Compute(const Handle_PrsMgr_PresentationManager3d &/*thePrese StdPrs_ShadedShape::Add(thePresentation, aFace, myDrawer); } -void FilledCircle::ComputeSelection(const Handle_SelectMgr_Selection &theSelection, +void FilledCircle::ComputeSelection(const Handle(SelectMgr_Selection) &theSelection, const Standard_Integer /*theMode*/) { Handle(SelectMgr_EntityOwner) anEntityOwner = new SelectMgr_EntityOwner(this); @@ -2523,7 +2523,7 @@ void MyTextClass::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresent aPresentation->Clear(); - Handle_Prs3d_TextAspect asp = myDrawer->TextAspect(); + Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect(); asp->SetFont(aFont.ToCString()); asp->SetColor(aColor); @@ -4241,8 +4241,8 @@ SegmentObject::SegmentObject (const gp_Pnt& thePnt1, const gp_Pnt& thePnt2) myPoint2 = thePnt2; } -void SegmentObject::Compute (const Handle_PrsMgr_PresentationManager3d &/*thePresentationManager*/, - const Handle_Prs3d_Presentation &thePresentation, +void SegmentObject::Compute (const Handle(PrsMgr_PresentationManager3d) &/*thePresentationManager*/, + const Handle(Prs3d_Presentation) &thePresentation, const Standard_Integer /*theMode*/) { thePresentation->Clear(); @@ -4254,7 +4254,7 @@ void SegmentObject::Compute (const Handle_PrsMgr_PresentationManager3d &/*thePre StdPrs_Curve::Add(thePresentation, aCurveAdaptor, myDrawer); } -void SegmentObject::ComputeSelection (const Handle_SelectMgr_Selection &theSelection, +void SegmentObject::ComputeSelection (const Handle(SelectMgr_Selection) &theSelection, const Standard_Integer /*theMode*/) { Handle(SelectMgr_EntityOwner) anOwner = new SelectMgr_EntityOwner(this); diff --git a/src/Visual3d/Visual3d_ContextView.cxx b/src/Visual3d/Visual3d_ContextView.cxx index 6b1202b039..86f1693c46 100644 --- a/src/Visual3d/Visual3d_ContextView.cxx +++ b/src/Visual3d/Visual3d_ContextView.cxx @@ -319,7 +319,7 @@ void Visual3d_ContextView::SetTextureEnv(const Handle(Graphic3d_TextureEnv)& ATe } -Handle_Graphic3d_TextureEnv Visual3d_ContextView::TextureEnv() const +Handle(Graphic3d_TextureEnv) Visual3d_ContextView::TextureEnv() const { return MyTextureEnv; } diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx index a21e8bc21a..32ca2cd9cd 100644 --- a/src/Visual3d/Visual3d_View.cxx +++ b/src/Visual3d/Visual3d_View.cxx @@ -1306,7 +1306,7 @@ Standard_Boolean Visual3d_View::DisplayImmediate (const Handle(Graphic3d_Structu if (theIsSingleView) { - Handle_Visual3d_HSetOfView aViews = MyViewManager->DefinedView(); + Handle(Visual3d_HSetOfView) aViews = MyViewManager->DefinedView(); for (Visual3d_SetIteratorOfSetOfView aViewIter (aViews->Set()); aViewIter.More(); aViewIter.Next()) { if (aViewIter.Value().Access() != this) diff --git a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx index 64616f2d20..c0613fdae8 100644 --- a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx +++ b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx @@ -25,27 +25,27 @@ * and the corresponding Appearance. */ class VrmlData_DataMapOfShapeAppearance - : public NCollection_DataMap + : public NCollection_DataMap { public: //! Constructor inline VrmlData_DataMapOfShapeAppearance (const Standard_Integer NbBuckets=1, const Handle(NCollection_BaseAllocator)& theAllocator = 0L) - : NCollection_DataMap (NbBuckets, theAllocator) + : NCollection_DataMap (NbBuckets, theAllocator) {} //! Copy constructor inline VrmlData_DataMapOfShapeAppearance (const VrmlData_DataMapOfShapeAppearance& theOther) - : NCollection_DataMap (theOther) + : NCollection_DataMap (theOther) {} - friend Standard_Boolean IsEqual (const Handle_TopoDS_TShape& one, - const Handle_TopoDS_TShape& two); + friend Standard_Boolean IsEqual (const Handle(TopoDS_TShape)& one, + const Handle(TopoDS_TShape)& two); }; @@ -53,8 +53,8 @@ public: //function : IsEqual //purpose : for NCollection_DataMap interface //======================================================================= -inline Standard_Boolean IsEqual (const Handle_TopoDS_TShape& one, - const Handle_TopoDS_TShape& two) +inline Standard_Boolean IsEqual (const Handle(TopoDS_TShape)& one, + const Handle(TopoDS_TShape)& two) { return one == two; } diff --git a/src/VrmlData/VrmlData_ListOfNode.hxx b/src/VrmlData/VrmlData_ListOfNode.hxx index 5a1609a91a..3973881c38 100644 --- a/src/VrmlData/VrmlData_ListOfNode.hxx +++ b/src/VrmlData/VrmlData_ListOfNode.hxx @@ -23,6 +23,6 @@ * Container of List type, holding handles to VrmlData_Node objects */ -typedef NCollection_List VrmlData_ListOfNode; +typedef NCollection_List VrmlData_ListOfNode; #endif diff --git a/src/VrmlData/VrmlData_MapOfNode.hxx b/src/VrmlData/VrmlData_MapOfNode.hxx index a9bc386b29..4a7a74cb34 100644 --- a/src/VrmlData/VrmlData_MapOfNode.hxx +++ b/src/VrmlData/VrmlData_MapOfNode.hxx @@ -23,6 +23,6 @@ * Container of Map type, holding handles to VrmlData_Node objects */ -typedef NCollection_Map VrmlData_MapOfNode; +typedef NCollection_Map VrmlData_MapOfNode; #endif diff --git a/src/VrmlData/VrmlData_Node.hxx b/src/VrmlData/VrmlData_Node.hxx index f2ec769dc3..c530beeddf 100644 --- a/src/VrmlData/VrmlData_Node.hxx +++ b/src/VrmlData/VrmlData_Node.hxx @@ -30,7 +30,7 @@ struct VrmlData_InBuffer; class VrmlData_Scene; class gp_XY; class gp_XYZ; -class Handle_VrmlData_Node; +class Handle(VrmlData_Node); class TCollection_AsciiString; /** @@ -202,7 +202,7 @@ class VrmlData_Node : public Standard_Transient // Definition of HANDLE object using Standard_DefineHandle.hxx DEFINE_STANDARD_HANDLE (VrmlData_Node, Standard_Transient) -Standard_EXPORT Standard_Integer HashCode(const Handle_VrmlData_Node& theNode, +Standard_EXPORT Standard_Integer HashCode(const Handle(VrmlData_Node)& theNode, const Standard_Integer theUpper); Standard_EXPORT Standard_Boolean IsEqual (const Handle(VrmlData_Node)& theOne, const Handle(VrmlData_Node)& theTwo); diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx index 3a0432dc53..a8fbd536e4 100644 --- a/src/VrmlData/VrmlData_Scene.cxx +++ b/src/VrmlData/VrmlData_Scene.cxx @@ -185,7 +185,7 @@ void VrmlData_Scene::SetVrmlDir (const TCollection_ExtendedString& theDir) //purpose : //======================================================================= -const Handle_VrmlData_WorldInfo& VrmlData_Scene::WorldInfo() const +const Handle(VrmlData_WorldInfo)& VrmlData_Scene::WorldInfo() const { return myWorldInfo; } diff --git a/src/VrmlData/VrmlData_Scene.hxx b/src/VrmlData/VrmlData_Scene.hxx index 51bcca67d2..5d5418098b 100644 --- a/src/VrmlData/VrmlData_Scene.hxx +++ b/src/VrmlData/VrmlData_Scene.hxx @@ -28,7 +28,7 @@ #include struct VrmlData_InBuffer; -class Handle_VrmlData_WorldInfo; +class Handle(VrmlData_WorldInfo); class VrmlData_DataMapOfShapeAppearance; /** @@ -182,7 +182,7 @@ class VrmlData_Scene /** * Query the WorldInfo member. */ - Standard_EXPORT const Handle_VrmlData_WorldInfo& + Standard_EXPORT const Handle(VrmlData_WorldInfo)& WorldInfo() const; /** @@ -314,7 +314,7 @@ class VrmlData_Scene */ Standard_EXPORT VrmlData_ErrorStatus WriteNode (const char * thePrefix, - const Handle_VrmlData_Node&) const; + const Handle(VrmlData_Node)&) const; /** * Query if the current write operation is dummy, i.e., for the purpose of @@ -371,8 +371,8 @@ class VrmlData_Scene VrmlData_ListOfNode myLstNodes; ///! top-level nodes VrmlData_ListOfNode myAllNodes; ///! all nodes VrmlData_ErrorStatus myStatus; - Handle_NCollection_IncAllocator myAllocator; - Handle_VrmlData_WorldInfo myWorldInfo; + Handle(NCollection_IncAllocator) myAllocator; + Handle(VrmlData_WorldInfo) myWorldInfo; VrmlData_MapOfNode myNamedNodes; // read from stream diff --git a/src/VrmlData/VrmlData_ShapeConvert.cxx b/src/VrmlData/VrmlData_ShapeConvert.cxx index fac485c972..94e7e50afb 100644 --- a/src/VrmlData/VrmlData_ShapeConvert.cxx +++ b/src/VrmlData/VrmlData_ShapeConvert.cxx @@ -330,10 +330,10 @@ void VrmlData_ShapeConvert::Convert (const Standard_Boolean theExtractFaces, //purpose : //======================================================================= -Handle_VrmlData_Geometry VrmlData_ShapeConvert::triToIndexedFaceSet - (const Handle_Poly_Triangulation& theTri, +Handle(VrmlData_Geometry) VrmlData_ShapeConvert::triToIndexedFaceSet + (const Handle(Poly_Triangulation)& theTri, const TopoDS_Face& theFace, - const Handle_VrmlData_Coordinate& theCoord) + const Handle(VrmlData_Coordinate)& theCoord) { Standard_Integer i; const Standard_Integer nNodes (theTri->NbNodes()); @@ -486,8 +486,8 @@ Handle_VrmlData_Geometry VrmlData_ShapeConvert::triToIndexedFaceSet //purpose : single polygon3D => IndexedLineSet //======================================================================= -Handle_VrmlData_Geometry VrmlData_ShapeConvert::polToIndexedLineSet - (const Handle_Poly_Polygon3D& thePol) +Handle(VrmlData_Geometry) VrmlData_ShapeConvert::polToIndexedLineSet + (const Handle(Poly_Polygon3D)& thePol) { Standard_Integer i; const Standard_Integer nNodes (thePol->NbNodes()); diff --git a/src/VrmlData/VrmlData_ShapeConvert.hxx b/src/VrmlData/VrmlData_ShapeConvert.hxx index ea1a73a32d..fde244378b 100644 --- a/src/VrmlData/VrmlData_ShapeConvert.hxx +++ b/src/VrmlData/VrmlData_ShapeConvert.hxx @@ -23,9 +23,9 @@ class VrmlData_Scene; class TopoDS_Face; -class Handle_Poly_Triangulation; -class Handle_Poly_Polygon3D; -class Handle_VrmlData_Coordinate; +class Handle(Poly_Triangulation); +class Handle(Poly_Polygon3D); +class Handle(VrmlData_Coordinate); /** * Algorithm converting one shape or a set of shapes to VrmlData_Scene. */ @@ -87,17 +87,17 @@ class VrmlData_ShapeConvert protected: // ---------- PROTECTED METHODS ---------- - Handle_VrmlData_Geometry triToIndexedFaceSet - (const Handle_Poly_Triangulation&, + Handle(VrmlData_Geometry) triToIndexedFaceSet + (const Handle(Poly_Triangulation)&, const TopoDS_Face&, - const Handle_VrmlData_Coordinate&); + const Handle(VrmlData_Coordinate)&); - Handle_VrmlData_Geometry polToIndexedLineSet - (const Handle_Poly_Polygon3D&); + Handle(VrmlData_Geometry) polToIndexedLineSet + (const Handle(Poly_Polygon3D)&); - Handle_VrmlData_Appearance defaultMaterialFace () const; + Handle(VrmlData_Appearance) defaultMaterialFace () const; - Handle_VrmlData_Appearance defaultMaterialEdge () const; + Handle(VrmlData_Appearance) defaultMaterialEdge () const; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx index 08ef887ef5..4beef35c98 100644 --- a/src/XSDRAW/XSDRAW.cxx +++ b/src/XSDRAW/XSDRAW.cxx @@ -255,7 +255,7 @@ void XSDRAW::LoadDraw (Draw_Interpretor& theCommands) // FONCTION POUR LE DEBUG -Standard_Integer XSDRAW_WHAT (const Handle_Standard_Transient& ent) +Standard_Integer XSDRAW_WHAT (const Handle(Standard_Transient)& ent) { if (ent.IsNull()) { cout<<"(Null Handle)"<