0024023: Revamp the OCCT Handle -- automatic
authorabv <abv@opencascade.com>
Thu, 2 Jul 2015 13:30:15 +0000 (16:30 +0300)
committerabv <abv@opencascade.com>
Sat, 11 Jul 2015 09:08:01 +0000 (12:08 +0300)
Automatic upgrade by command "occt_upgrade . -handle"

139 files changed:
src/AIS/AIS_LengthDimension.hxx
src/AIS/AIS_MultipleConnectedInteractive.cxx
src/BOPDS/BOPDS_ListOfPaveBlock.hxx
src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
src/BRepFill/BRepFill_MultiLine.hxx
src/BRepGProp/BRepGProp_Gauss.cxx
src/BRepGProp/BRepGProp_Gauss.hxx
src/BRepMesh/BRepMesh.hxx
src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
src/BRepMesh/BRepMesh_EdgeTessellator.hxx
src/BRepMesh/BRepMesh_FaceAttribute.hxx
src/BRepMesh/BRepMesh_FastDiscret.hxx
src/BRepMesh/BRepMesh_FastDiscretFace.hxx
src/BRepMesh/BRepMesh_GeomTool.hxx
src/BRepMesh/BRepMesh_IncrementalMesh.hxx
src/BRepMesh/BRepMesh_PairOfPolygon.hxx
src/BRepMesh/BRepMesh_ShapeTool.hxx
src/BSplCLib/BSplCLib_Cache.cxx
src/BSplCLib/BSplCLib_Cache.hxx
src/BSplSLib/BSplSLib_Cache.cxx
src/BinTObjDrivers/BinTObjDrivers.hxx
src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
src/BndLib/BndLib_Add2dCurve.cxx
src/CDM/CDM_MetaDataLookUpTable.hxx
src/Expr/Expr_Array1OfNamedUnknown.hxx
src/Graphic3d/Graphic3d_CStructure.hxx
src/Graphic3d/Graphic3d_Camera.hxx
src/Graphic3d/Graphic3d_ClipPlane.hxx
src/Graphic3d/Graphic3d_MapOfStructure.hxx
src/Graphic3d/Graphic3d_ShaderObject.hxx
src/IVtkDraw/IVtkDraw.hxx
src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
src/LDOM/LDOMBasicString.hxx
src/LDOM/LDOMString.hxx
src/LDOM/LDOM_Document.hxx
src/LDOM/LDOM_MemManager.hxx
src/LDOM/LDOM_Node.hxx
src/LDOM/LDOM_OSStream.cxx
src/LDOM/LDOM_OSStream.hxx
src/MeshTest/MeshTest_DrawableMesh.hxx
src/MeshVS/MeshVS_DummySensitiveEntity.hxx
src/MeshVS/MeshVS_SensitiveFace.hxx
src/MeshVS/MeshVS_SensitiveMesh.hxx
src/MeshVS/MeshVS_SensitivePolyhedron.hxx
src/MeshVS/MeshVS_SensitiveSegment.hxx
src/Message/Message_HArrayOfMsg.hxx
src/MoniTool/MoniTool_DataMapOfTimer.hxx
src/MoniTool/MoniTool_ValueInterpret.hxx
src/NCollection/NCollection_BaseAllocator.hxx
src/NCollection/NCollection_HeapAllocator.hxx
src/OpenGl/Handle_OpenGl_Context.hxx
src/OpenGl/Handle_OpenGl_GraphicDriver.hxx
src/OpenGl/Handle_OpenGl_PointSprite.hxx
src/OpenGl/Handle_OpenGl_View.hxx
src/OpenGl/Handle_OpenGl_Window.hxx
src/OpenGl/Handle_OpenGl_Workspace.hxx
src/OpenGl/OpenGl_AspectFace.hxx
src/OpenGl/OpenGl_AspectLine.hxx
src/OpenGl/OpenGl_AspectMarker.hxx
src/OpenGl/OpenGl_AspectText.hxx
src/OpenGl/OpenGl_CappingAlgo.hxx
src/OpenGl/OpenGl_CappingPlaneResource.hxx
src/OpenGl/OpenGl_Caps.hxx
src/OpenGl/OpenGl_Clipping.hxx
src/OpenGl/OpenGl_Context.hxx
src/OpenGl/OpenGl_Element.hxx
src/OpenGl/OpenGl_Flipper.hxx
src/OpenGl/OpenGl_FrameBuffer.hxx
src/OpenGl/OpenGl_GraphicDriver.hxx
src/OpenGl/OpenGl_Layer.hxx
src/OpenGl/OpenGl_LayerList.hxx
src/OpenGl/OpenGl_LineAttributes.hxx
src/OpenGl/OpenGl_PointSprite.hxx
src/OpenGl/OpenGl_PrimitiveArray.hxx
src/OpenGl/OpenGl_PrinterContext.hxx
src/OpenGl/OpenGl_Resource.hxx
src/OpenGl/OpenGl_Sampler.hxx
src/OpenGl/OpenGl_ShaderManager.hxx
src/OpenGl/OpenGl_ShaderObject.hxx
src/OpenGl/OpenGl_ShaderProgram.hxx
src/OpenGl/OpenGl_Text.hxx
src/OpenGl/OpenGl_Texture.hxx
src/OpenGl/OpenGl_View.hxx
src/OpenGl/OpenGl_Window.hxx
src/OpenGl/OpenGl_Workspace.hxx
src/Poly/Poly_CoherentTriangulation.hxx
src/Poly/Poly_MakeLoops.hxx
src/Prs3d/Prs3d_Drawer.hxx
src/Prs3d/Prs3d_WFShape.hxx
src/QABugs/QABugs_19.cxx
src/Select3D/Select3D_EntitySequence.hxx
src/Select3D/Select3D_InteriorSensitivePointSet.hxx
src/Select3D/Select3D_SensitiveBox.hxx
src/Select3D/Select3D_SensitiveCircle.hxx
src/Select3D/Select3D_SensitiveCurve.hxx
src/Select3D/Select3D_SensitiveEntity.hxx
src/Select3D/Select3D_SensitiveFace.hxx
src/Select3D/Select3D_SensitiveGroup.hxx
src/Select3D/Select3D_SensitivePoint.hxx
src/Select3D/Select3D_SensitivePoly.hxx
src/Select3D/Select3D_SensitiveSegment.hxx
src/Select3D/Select3D_SensitiveTriangle.hxx
src/Select3D/Select3D_SensitiveTriangulation.hxx
src/Select3D/Select3D_SensitiveWire.hxx
src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx
src/SelectMgr/SelectMgr_SelectableObjectSet.hxx
src/SelectMgr/SelectMgr_Selection.hxx
src/SelectMgr/SelectMgr_SensitiveEntity.hxx
src/SelectMgr/SelectMgr_ViewerSelector.hxx
src/ShapeFix/ShapeFix_Wire.cxx
src/Standard/Standard_Handle.hxx
src/StdPrs/StdPrs_ToolShadedShape.hxx
src/StdSelect/StdSelect_ViewerSelector3d.hxx
src/TDF/TDF_AttributeIndexedMap.hxx
src/TDF/TDF_LabelNode.hxx
src/TObj/TObj_Application.hxx
src/TObj/TObj_Assistant.hxx
src/TObj/TObj_Model.hxx
src/TObj/TObj_ModelIterator.hxx
src/TObj/TObj_Object.hxx
src/TObj/TObj_ObjectIterator.hxx
src/TObj/TObj_Partition.hxx
src/TObj/TObj_Persistence.hxx
src/TObj/TObj_SequenceOfObject.hxx
src/TObj/TObj_TIntSparseArray.hxx
src/TObj/TObj_TModel.hxx
src/TObj/TObj_TNameContainer.hxx
src/TObj/TObj_TObject.hxx
src/TObj/TObj_TReference.hxx
src/TObj/TObj_TXYZ.hxx
src/TObjDRAW/TObjDRAW.cxx
src/ViewerTest/ViewerTest.hxx
src/VrmlData/VrmlData_Node.hxx
src/VrmlData/VrmlData_Scene.hxx
src/VrmlData/VrmlData_ShapeConvert.hxx
src/XmlTObjDrivers/XmlTObjDrivers.hxx
src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx

index 31162dd..206904a 100755 (executable)
@@ -48,8 +48,6 @@ class Bnd_Box;
 class gp_Dir;
 class TopoDS_Vertex;
 class Standard_Transient;
-class Handle(Standard_Type);
-class Handle(AIS_Relation);
 class AIS_LengthDimension;
 
 DEFINE_STANDARD_HANDLE (AIS_LengthDimension, AIS_Dimension)
index 25e27cd..c22ea9a 100644 (file)
@@ -48,7 +48,7 @@ namespace
     }
 
     //! Selectable() method modified to return myAssembly.
-    virtual Handle_SelectMgr_SelectableObject Selectable() const;
+    virtual Handle(SelectMgr_SelectableObject) Selectable() const;
 
     Standard_Boolean IsHilighted (const Handle(PrsMgr_PresentationManager)& PM,const Standard_Integer aMode) const;
 
index 1b1f3fa..11dfd45 100644 (file)
@@ -16,7 +16,6 @@
 #define BOPDS_ListOfPaveBlock_HeaderFile
 
 #include <NCollection_List.hxx>   
-class Handle_BOPDS_PaveBlock;
 
 typedef NCollection_List<Handle(BOPDS_PaveBlock)> BOPDS_ListOfPaveBlock; 
 typedef BOPDS_ListOfPaveBlock::Iterator BOPDS_ListIteratorOfListOfPaveBlock;
index d3f6379..87a236a 100644 (file)
@@ -29,8 +29,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
-class Handle(NCollection_IncAllocator);
-class Handle(Geom_Surface);
 
 //! This class performs fast sewing of surfaces (faces). It supposes
 //! that all surfaces are finite and are naturally restricted by their bounds.
index ae58567..8969b71 100644 (file)
@@ -29,8 +29,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_Curve.hxx>
-#include <Handle_Geom_Curve.hxx>
 #include <Standard_Real.hxx>
 
 class Standard_DomainError;
index d905f75..526d1ea 100644 (file)
@@ -176,7 +176,7 @@ Standard_Integer BRepGProp_Gauss::MaxSubs(const Standard_Integer theN,
 //function : Init
 //purpose  : 
 //=======================================================================
-void BRepGProp_Gauss::Init(Handle_Vector&         theOutVec,
+void BRepGProp_Gauss::Init(Handle(Vector)&         theOutVec,
                            const Standard_Real    theValue,
                            const Standard_Integer theFirst,
                            const Standard_Integer theLast)
@@ -227,10 +227,10 @@ Standard_Integer BRepGProp_Gauss::FillIntervalBounds(
   const TColStd_Array1OfReal& theKnots,
   const Standard_Integer      theNumSubs,
   InertiaArray&               theInerts,
-  Handle_Vector&              theParam1,
-  Handle_Vector&              theParam2,
-  Handle_Vector&              theError,
-  Handle_Vector&              theCommonError)
+  Handle(Vector)&              theParam1,
+  Handle(Vector)&              theParam2,
+  Handle(Vector)&              theError,
+  Handle(Vector)&              theCommonError)
 {
   const Standard_Integer aSize =
     Max(theKnots.Upper(), MaxSubs(theKnots.Upper() - 1, theNumSubs));
@@ -550,10 +550,10 @@ Standard_Real BRepGProp_Gauss::Compute(
   InertiaArray anInertiaU = new NCollection_Array1<Inertia>(1, SM);
 
   // Prepare Gauss points and weights
-  Handle_Vector LGaussP[2];
-  Handle_Vector LGaussW[2];
-  Handle_Vector UGaussP[2];
-  Handle_Vector UGaussW[2];
+  Handle(Vector) LGaussP[2];
+  Handle(Vector) LGaussW[2];
+  Handle(Vector) UGaussP[2];
+  Handle(Vector) UGaussW[2];
 
   const Standard_Integer aNbGaussPoint =
     RealToInt(Ceiling(ERROR_ALGEBR_RATIO * GPM));
@@ -568,14 +568,14 @@ Standard_Real BRepGProp_Gauss::Compute(
   UGaussW[0] = new math_Vector(1, GPM);
   UGaussW[1] = new math_Vector(1, aNbGaussPoint);
 
-  Handle_Vector L1 = new math_Vector(1, SM);
-  Handle_Vector L2 = new math_Vector(1, SM);
-  Handle_Vector U1 = new math_Vector(1, SM);
-  Handle_Vector U2 = new math_Vector(1, SM);
+  Handle(Vector) L1 = new math_Vector(1, SM);
+  Handle(Vector) L2 = new math_Vector(1, SM);
+  Handle(Vector) U1 = new math_Vector(1, SM);
+  Handle(Vector) U2 = new math_Vector(1, SM);
 
-  Handle_Vector ErrL  = new math_Vector(1, SM, 0.0);
-  Handle_Vector ErrU  = new math_Vector(1, SM, 0.0);
-  Handle_Vector ErrUL = new math_Vector(1, SM, 0.0);
+  Handle(Vector) ErrL  = new math_Vector(1, SM, 0.0);
+  Handle(Vector) ErrU  = new math_Vector(1, SM, 0.0);
+  Handle(Vector) ErrUL = new math_Vector(1, SM, 0.0);
 
   // Face parametrization in U and V direction
   Standard_Real BV1, BV2, BU1, BU2;
@@ -746,7 +746,7 @@ Standard_Real BRepGProp_Gauss::Compute(
                 if (Abs(u2 - u1) < EPS_PARAM)
                   continue;
 
-                Handle_Vector aDummy;
+                Handle(Vector) aDummy;
                 iUSubEnd = FillIntervalBounds(u1, u2, UKnots, NumSubs, anInertiaU, U1, U2, ErrU, aDummy);
                 UMaxSubs = BRepGProp_Gauss::MaxSubs(iUSubEnd);
 
index 6ded4b8..8607820 100644 (file)
@@ -52,7 +52,6 @@ class BRepGProp_Gauss
   };
 
   typedef NCollection_Handle< NCollection_Array1<Inertia> > InertiaArray;
-  typedef NCollection_Handle<math_Vector>                   Handle_Vector;
   typedef Standard_Real(*BRepGProp_GaussFunc)(const Standard_Real, const Standard_Real);
 
 public: //! @name public API
@@ -252,7 +251,7 @@ private: //! @name private methods
     const Standard_Integer theCoeff = 32);
 
   static void Init(
-    Handle_Vector&         theOutVec,
+    Handle(Vector)&         theOutVec,
     const Standard_Real    theValue,
     const Standard_Integer theFirst = 0,
     const Standard_Integer theLast  = 0);
@@ -269,10 +268,10 @@ private: //! @name private methods
     const TColStd_Array1OfReal& theKnots,
     const Standard_Integer      theNumSubs,
     InertiaArray&               theInerts,
-    Handle_Vector&              theParam1,
-    Handle_Vector&              theParam2,
-    Handle_Vector&              theError,
-    Handle_Vector&              theCommonError);
+    Handle(Vector)&              theParam1,
+    Handle(Vector)&              theParam2,
+    Handle(Vector)&              theError,
+    Handle(Vector)&              theCommonError);
 
 private: //! @name private fields
 
index 80b2ce0..74c7b7a 100644 (file)
@@ -39,7 +39,6 @@
 #include <BRepMesh_PairOfIndex.hxx>
 #include <BRepMesh_Circle.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
-#include <Handle_Poly_Triangulation.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
@@ -48,7 +47,6 @@
 class BRepMesh_Vertex;
 class TopoDS_Edge;
 class TopoDS_Vertex;
-class Handle_BRepMesh_FaceAttribute;
 class BRepMesh_VertexInspector;
 class BRepMesh_CircleInspector;
 class BRepMesh_Classifier;
@@ -99,7 +97,7 @@ namespace BRepMesh
 
   typedef NCollection_DataMap<Standard_Integer, Standard_Integer>                                   MapOfIntegerInteger;
   typedef NCollection_DataMap<TopoDS_Vertex, Standard_Integer, TopTools_ShapeMapHasher>             DMapOfVertexInteger;
-  typedef NCollection_DataMap<TopoDS_Face, Handle_BRepMesh_FaceAttribute, TopTools_ShapeMapHasher>  DMapOfFaceAttribute;
+  typedef NCollection_DataMap<TopoDS_Face, Handle(BRepMesh_FaceAttribute), TopTools_ShapeMapHasher>  DMapOfFaceAttribute;
   typedef NCollection_DataMap<TopoDS_Shape, BRepMesh_PairOfPolygon, TopTools_ShapeMapHasher>        DMapOfShapePairOfPolygon;
   typedef NCollection_DataMap<Standard_Integer, gp_Pnt>                                             DMapOfIntegerPnt;
   typedef NCollection_DataMap<Standard_Integer, ListOfXY>                                           DMapOfIntegerListOfXY;
index f09dbb5..8c4b40f 100644 (file)
@@ -20,9 +20,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <BRepMesh_IEdgeTool.hxx>
 #include <BRepMesh_EdgeParameterProvider.hxx>
-#include <Handle_Geom2d_Curve.hxx>
-#include <Handle_Poly_PolygonOnTriangulation.hxx>
-#include <Handle_Poly_Triangulation.hxx>
 #include <TopLoc_Location.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfInteger.hxx>
index 7ab0d49..cd64a38 100644 (file)
@@ -22,9 +22,6 @@
 #include <BRepMesh_IEdgeTool.hxx>
 #include <BRepMesh_GeomTool.hxx>
 #include <BRepMesh_FaceAttribute.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Handle_Geom2d_Curve.hxx>
-#include <Handle_BRepAdaptor_HSurface.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
index 8d83108..5c99d49 100644 (file)
@@ -21,7 +21,6 @@
 #include <BRepMesh_Status.hxx>
 #include <BRepMesh.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
-#include <Handle_BRepAdaptor_HSurface.hxx>
 
 class BRepAdaptor_HSurface;
 
index 22fc593..8b66e5c 100644 (file)
@@ -24,8 +24,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MutexForShapeProvider.hxx>
 #include <Standard_Transient.hxx>
-#include <Handle_BRepAdaptor_HSurface.hxx>
-#include <Handle_Geom2d_Curve.hxx>
 #include <BRepMesh_Delaun.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <BRepMesh_Triangle.hxx>
index bacf6ac..17b0ab6 100644 (file)
@@ -23,8 +23,6 @@
 #include <Standard_Transient.hxx>
 #include <TopTools_MutexForShapeProvider.hxx>
 #include <TopTools_DataMapOfShapeReal.hxx>
-#include <Handle_BRepAdaptor_HSurface.hxx>
-#include <Handle_Poly_Triangulation.hxx>
 #include <BRepMesh_Delaun.hxx>
 #include <BRepMesh_Triangle.hxx>
 #include <BRepMesh_Classifier.hxx>
index 44f72a7..54fbd48 100644 (file)
@@ -19,7 +19,6 @@
 #include <Standard_Macro.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 #include <GeomAbs_IsoType.hxx>
-#include <Handle_BRepAdaptor_HSurface.hxx>
 #include <TopoDS_Edge.hxx>
 #include <Precision.hxx>
 
index 0128646..09c453d 100644 (file)
@@ -21,7 +21,6 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_DataMapOfShapeReal.hxx>
 #include <BRepMesh_DiscretRoot.hxx>
-#include <Handle_Poly_Triangulation.hxx>
 #include <BRepMesh.hxx>
 
 #include <vector>
index dc38bcd..f9955dd 100644 (file)
@@ -17,7 +17,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Macro.hxx>
-#include <Handle_Poly_PolygonOnTriangulation.hxx>
 
 class Poly_PolygonOnTriangulation;
 
@@ -62,21 +61,21 @@ public:
   }
 
   //! Returns first polygon on triangulation.
-  inline const Handle_Poly_PolygonOnTriangulation& First() const
+  inline const Handle(Poly_PolygonOnTriangulation)& First() const
   {
     return myFirst;
   }
 
   //! Returns last polygon on triangulation.
-  inline const Handle_Poly_PolygonOnTriangulation& Last() const
+  inline const Handle(Poly_PolygonOnTriangulation)& Last() const
   {
     return myLast;
   }
 
 private:
 
-  Handle_Poly_PolygonOnTriangulation myFirst;
-  Handle_Poly_PolygonOnTriangulation myLast;
+  Handle(Poly_PolygonOnTriangulation) myFirst;
+  Handle(Poly_PolygonOnTriangulation) myLast;
 };
 
 #endif
index 705e0c7..b65c9d9 100644 (file)
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Macro.hxx>
-#include <Handle_BRepAdaptor_HSurface.hxx>
 #include <BRepMesh_FaceAttribute.hxx>
 #include <BRepMesh.hxx>
-#include <Handle_Poly_Triangulation.hxx>
 
 class TopoDS_Face;
 class TopoDS_Edge;
index 6e18806..6a7041b 100644 (file)
@@ -23,7 +23,7 @@
 
 
 //! Converts handle of array of Standard_Real into the pointer to Standard_Real
-static Standard_Real* ConvertArray(const Handle_TColStd_HArray2OfReal& theHArray)
+static Standard_Real* ConvertArray(const Handle(TColStd_HArray2OfReal)& theHArray)
 {
   const TColStd_Array2OfReal& anArray = theHArray->Array2();
   return (Standard_Real*) &(anArray(anArray.LowerRow(), anArray.LowerCol()));
index e74c8db..7ff2a52 100644 (file)
@@ -19,8 +19,6 @@
 #include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray2OfReal.hxx>
 
 #include <gp_Pnt2d.hxx>
 #include <gp_Pnt.hxx>
index 069c252..6946c18 100644 (file)
@@ -23,7 +23,7 @@
 
 
 //! Converts handle of array of Standard_Real into the pointer to Standard_Real
-static Standard_Real* ConvertArray(const Handle_TColStd_HArray2OfReal& theHArray)
+static Standard_Real* ConvertArray(const Handle(TColStd_HArray2OfReal)& theHArray)
 {
   const TColStd_Array2OfReal& anArray = theHArray->Array2();
   return (Standard_Real*) &(anArray(anArray.LowerRow(), anArray.LowerCol()));
index 4eaa079..499a6ea 100644 (file)
@@ -21,8 +21,6 @@
 #include <TObj_Common.hxx>
 #include <Standard_GUID.hxx>
 
-class Handle(BinMDF_ADriverTable);
-class Handle(CDM_MessageDriver);
 
 // Class for registering storage/retrieval drivers for TObj Bin persistence
 //
index ff85981..d9e318a 100644 (file)
@@ -22,7 +22,6 @@
 #include <BinLDrivers_DocumentRetrievalDriver.hxx>
 #include <BinMDF_ADriverTable.hxx>
 
-class Handle(CDM_MessageDriver);
 
 // Retrieval driver of a TObj Bin document
 //
index 158a811..29d0c04 100644 (file)
@@ -22,7 +22,6 @@
 #include <BinLDrivers_DocumentStorageDriver.hxx>
 #include <BinMDF_ADriverTable.hxx>
 
-class Handle(CDM_MessageDriver);
 
 //  Block of comments describing class BinTObjDrivers_DocumentStorageDriver
 //
index 105265a..3325c85 100644 (file)
@@ -49,7 +49,7 @@ class BndLib_Box2dCurve  {
 
   void SetCurve(const Handle(Geom2d_Curve)& aC);
 
-  const Handle_Geom2d_Curve& Curve() const;
+  const Handle(Geom2d_Curve)& Curve() const;
 
   void SetRange(const Standard_Real aT1,
                const Standard_Real aT2);
@@ -95,10 +95,10 @@ class BndLib_Box2dCurve  {
   void PerformOnePoint();
   //-----------------------------
  protected:
-  Handle_Geom2d_Curve myCurve;
+  Handle(Geom2d_Curve) myCurve;
   Bnd_Box2d myBox;
   Standard_Integer myErrorStatus;
-  Handle_Geom2d_Curve myCurveBase;
+  Handle(Geom2d_Curve) myCurveBase;
   Standard_Real myOffsetBase;
   Standard_Boolean myOffsetFlag;
   Standard_Real myT1;
index a04d5d7..e94d1b1 100644 (file)
@@ -20,7 +20,6 @@
 #include <TCollection_ExtendedString.hxx>
 #include <NCollection_DataMap.hxx>
 
-class Handle(CDM_MetaData);
 
 typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_MetaData),TCollection_ExtendedString> CDM_MetaDataLookUpTable;
 typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_MetaData),TCollection_ExtendedString>::Iterator CDM_DataMapIteratorOfMetaDataLookUpTable;
index 2bb95b1..24621d3 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef Expr_Array1OfNamedUnknown_HeaderFile
 #define Expr_Array1OfNamedUnknown_HeaderFile
 
-#include <Handle_Expr_NamedUnknown.hxx>
 #include <NCollection_Array1.hxx>
 
 typedef NCollection_Array1<Handle(Expr_NamedUnknown)> Expr_Array1OfNamedUnknown;
index 1ad7536..19ab6fc 100644 (file)
 #include <Graphic3d_Vec3.hxx>
 #include <Graphic3d_ZLayerId.hxx>
 #include <Standard_Transient.hxx>
-#include <Handle_Graphic3d_GraphicDriver.hxx>
 
 //! Forward declaration.
-class Handle(Graphic3d_StructureManager);
-class Handle(Graphic3d_CStructure);
 
 //! Low-level graphic structure interface
 class Graphic3d_CStructure : public Standard_Transient
index 3297ee1..cdeda3c 100644 (file)
@@ -31,7 +31,6 @@
 #include <Bnd_Box.hxx>
 
 //! Forward declaration
-class Handle(Graphic3d_Camera);
 
 //! Camera class provides object-oriented approach to setting up projection
 //! and orientation properties of 3D view.
index 14158e2..ef05c09 100755 (executable)
@@ -26,8 +26,6 @@
 
 class gp_Pln;
 class Graphic3d_AspectFillArea3d;
-class Handle(Graphic3d_AspectFillArea3d);
-class Handle(Graphic3d_ClipPlane);
 
 //! Container for properties describing graphic driver clipping planes.
 //! It is up to application to create instances of this class and specify its
index 6c8b230..6298725 100644 (file)
@@ -16,7 +16,6 @@
 #ifndef _Graphic3d_MapOfStructure
 #define _Graphic3d_MapOfStructure
 
-#include <Handle_Graphic3d_Structure.hxx>
 #include <NCollection_Map.hxx>
 
 typedef NCollection_Map<Handle(Graphic3d_Structure)> Graphic3d_MapOfStructure;
index def318a..2050720 100755 (executable)
@@ -21,7 +21,6 @@
 #include <Graphic3d_TypeOfShaderObject.hxx>
 
 //! Forward declaration
-class Handle(Graphic3d_ShaderObject);
 
 //! This class is responsible for managing shader objects.
 class Graphic3d_ShaderObject : public Standard_Transient
index a564db9..16f3eda 100644 (file)
@@ -38,7 +38,7 @@ public:
   Standard_EXPORT   static  void Commands (Draw_Interpretor& theCommands);
 
 private:
-  Standard_EXPORT   static const Handle_MMgt_TShared& WClass();
+  Standard_EXPORT   static const Handle(MMgt_TShared)& WClass();
 };
 
 #endif
index 3097ab8..8b44201 100644 (file)
@@ -23,7 +23,6 @@
 #include <Standard_Macro.hxx>
 #endif
 #ifndef _Handle_MMgt_TShared_HeaderFile
-#include <Handle_MMgt_TShared.hxx>
 #endif
 
 #include <NCollection_DataMap.hxx>
@@ -123,6 +122,5 @@ private:
 //! Mapping between OCCT topological shape IDs and their correspondent
 //! visualization pipelines.
 typedef NCollection_DataMap<IVtk_IdType, Handle(IVtkDraw_HighlightAndSelectionPipeline)> ShapePipelineMap;
-typedef NCollection_Handle<ShapePipelineMap> Handle(ShapePipelineMap);
 
 #endif
index 0a0e741..feaaa7e 100644 (file)
@@ -21,7 +21,6 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
-class Handle(LDOM_MemManager);
 class LDOM_NullPtr;
 class TCollection_AsciiString;
 class TCollection_ExtendedString;
index 55823bf..0ce1cdf 100644 (file)
@@ -17,7 +17,6 @@
 #define LDOMString_HeaderFile
 
 #include <LDOMBasicString.hxx>
-#include <Handle_LDOM_MemManager.hxx>
 
 //  Class LDOMString
 //  Represents various object types which can be mapped to XML strings
index 5d15b2e..cd671d6 100644 (file)
@@ -17,7 +17,6 @@
 #define LDOM_Document_HeaderFile
 
 #include <LDOM_Element.hxx>
-#include <Handle_LDOM_MemManager.hxx>
 #include <LDOM_Text.hxx>
 #include <LDOM_CDATASection.hxx>
 #include <LDOM_Comment.hxx>
index b9673fa..7caf9cb 100644 (file)
@@ -126,6 +126,5 @@ class LDOM_MemManager : public MMgt_TShared
   DEFINE_STANDARD_RTTI (LDOM_MemManager, MMgt_TShared)
 };
 
-#include <Handle_LDOM_MemManager.hxx>
 
 #endif
index 6b41449..85a4a96 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <Standard_Macro.hxx>
 #include <Standard_TypeDef.hxx>
-#include <Handle_LDOM_MemManager.hxx>
 #include <LDOMString.hxx>
 
 class LDOM_BasicNode;
index c4f6969..d7d9980 100644 (file)
@@ -24,7 +24,7 @@
 //purpose  : Constructor
 //=======================================================================
 LDOM_SBuffer::LDOM_StringElem::LDOM_StringElem
-  ( const int theLength, const Handle_NCollection_BaseAllocator& theAlloc )
+  ( const int theLength, const Handle(NCollection_BaseAllocator)& theAlloc )
 : buf (reinterpret_cast<char*>(theAlloc->Allocate (theLength))),
   len (0),
   next(0)
index 2648b92..4d67a82 100644 (file)
@@ -53,7 +53,7 @@ class LDOM_SBuffer : public streambuf
 
     DEFINE_NCOLLECTION_ALLOC
 
-    LDOM_StringElem(const int, const Handle_NCollection_BaseAllocator&);
+    LDOM_StringElem(const int, const Handle(NCollection_BaseAllocator)&);
     ~LDOM_StringElem();
 
   private:
index 9d84918..4dad2f6 100644 (file)
@@ -49,7 +49,7 @@ public:
   
   Standard_EXPORT void DrawOn(Draw_Display& theDisplay) const;
   
-  Standard_EXPORT virtual Handle_Draw_Drawable3D Copy() const;
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const;
   
   Standard_EXPORT virtual void Dump(Standard_OStream& theStream) const;
   
index 056287a..f8ab375 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <Select3D_BndBox3d.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <SelectBasics_SelectingVolumeManager.hxx>
 
 class SelectBasics_EntityOwner;
index 07da345..ecec9c2 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <gp_Pnt.hxx>
 #include <Select3D_SensitiveFace.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <Select3D_TypeOfSensitivity.hxx>
 
 class SelectBasics_EntityOwner;
index 43c2cd7..b7aab8a 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <Bnd_Box.hxx>
 #include <Select3D_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <Select3D_BndBox3d.hxx>
 
index 0adaa8c..e1ec427 100644 (file)
@@ -25,7 +25,6 @@
 #include <gp_XY.hxx>
 #include <NCollection_List.hxx>
 #include <Select3D_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <Select3D_BndBox3d.hxx>
 
@@ -51,7 +50,7 @@ public:
                                               const TColgp_Array1OfPnt& theNodes,
                                               const Handle(MeshVS_HArray1OfSequenceOfInteger)& theTopo);
 
-  Standard_EXPORT virtual Handle_Select3D_SensitiveEntity GetConnected() Standard_OVERRIDE;
+  Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;
 
   Standard_EXPORT virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
                                                     SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;
index ee4fb5b..a8eebfa 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <gp_Pnt.hxx>
 #include <Select3D_SensitiveSegment.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 
 class SelectBasics_EntityOwner;
 class gp_Pnt;
index 8d0e79f..2fb2db1 100644 (file)
@@ -18,9 +18,7 @@
 #include <NCollection_Array1.hxx>
 #include <NCollection_Handle.hxx>
 
-typedef NCollection_Handle<Message_Msg>         Handle(Message_Msg);
 typedef NCollection_Array1<Handle(Message_Msg)> Message_ArrayOfMsg;
-typedef NCollection_Handle<Message_ArrayOfMsg>  Handle(Message_ArrayOfMsg);
 typedef Handle(Message_ArrayOfMsg)              Message_HArrayOfMsg;
 
 #endif // _Message_HArrayOfMsg_HeaderFile
index f00aaa4..2925352 100644 (file)
@@ -21,7 +21,6 @@
 #include <MoniTool_MTHasher.hxx>
 #include <NCollection_DataMap.hxx>
 
-class Handle(MoniTool_Timer);
 typedef NCollection_DataMap<Standard_CString,Handle(MoniTool_Timer),MoniTool_MTHasher> MoniTool_DataMapOfTimer;
 typedef NCollection_DataMap<Standard_CString,Handle(MoniTool_Timer),MoniTool_MTHasher>::Iterator MoniTool_DataMapIteratorOfDataMapOfTimer;
 
index 6116d91..c229439 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <TCollection_HAsciiString.hxx>
 
-class Handle(MoniTool_TypedValue);
 
 typedef Handle(TCollection_HAsciiString)  (*MoniTool_ValueInterpret) (const Handle(MoniTool_TypedValue)& typval,
                                                                      const Handle(TCollection_HAsciiString)& val,
index 000d250..a58b56b 100644 (file)
@@ -31,7 +31,6 @@
 #include <Standard_Type.hxx>
 #include <NCollection_TypeDef.hxx>
 
-class Handle(NCollection_BaseAllocator);
 
 /**
 * Purpose:     Basic class for memory allocation wizards.
index 71c542f..269e2d0 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <NCollection_BaseAllocator.hxx>
 
-class Handle(NCollection_HeapAllocator);
 
 /**
  * Allocator that uses the global dynamic heap (malloc / free). 
index aa3d34d..cd85cec 100644 (file)
@@ -17,7 +17,6 @@
 #define _Handle_OpenGl_Context_Header
 
 #include <Standard_Type.hxx>
-#include <Handle_Standard_Transient.hxx>
 
 class OpenGl_Context;
 DEFINE_STANDARD_HANDLE(OpenGl_Context, Standard_Transient)
index 1dd0e9b..ba07b75 100644 (file)
@@ -17,7 +17,6 @@
 #define _Handle_OpenGl_GraphicDriver_Header
 
 #include <Standard_Type.hxx>
-#include <Handle_Graphic3d_GraphicDriver.hxx>
 
 class OpenGl_GraphicDriver;
 
index 41650ee..9d74a80 100755 (executable)
@@ -16,7 +16,6 @@
 #ifndef _Handle_OpenGl_PointSprite_Header
 #define _Handle_OpenGl_PointSprite_Header
 
-#include <Handle_OpenGl_Texture.hxx>
 
 class OpenGl_PointSprite;
 DEFINE_STANDARD_HANDLE(OpenGl_PointSprite, OpenGl_Texture)
index a9676cc..f2ffc44 100644 (file)
@@ -17,7 +17,6 @@
 #define _Handle_OpenGl_View_Header
 
 #include <Standard_Type.hxx>
-#include <Handle_MMgt_TShared.hxx>
 
 class OpenGl_View;
 
index 5a7315b..1e23098 100644 (file)
@@ -17,7 +17,6 @@
 #define _Handle_OpenGl_Window_Header
 
 #include <Standard_Type.hxx>
-#include <Handle_MMgt_TShared.hxx>
 
 class OpenGl_Window;
 
index e85e524..8bcfef5 100644 (file)
@@ -17,7 +17,6 @@
 #define _Handle_OpenGl_Workspace_Header
 
 #include <Standard_Type.hxx>
-#include <Handle_OpenGl_Window.hxx>
 
 class OpenGl_Workspace;
 
index 0cafe86..0d71ebc 100644 (file)
@@ -21,9 +21,6 @@
 #include <Aspect_PolygonOffsetMode.hxx>
 #include <TCollection_AsciiString.hxx>
 
-#include <Handle_Graphic3d_TextureParams.hxx>
-#include <Handle_OpenGl_ShaderProgram.hxx>
-#include <Handle_OpenGl_Texture.hxx>
 #include <OpenGl_AspectLine.hxx>
 #include <OpenGl_Element.hxx>
 
index 68b5485..c1e12f8 100644 (file)
@@ -22,7 +22,6 @@
 #include <Aspect_TypeOfLine.hxx>
 #include <Graphic3d_CAspectLine.hxx>
 
-#include <Handle_OpenGl_ShaderProgram.hxx>
 
 #include <OpenGl_Element.hxx>
 
index 08292ba..1706335 100644 (file)
@@ -22,8 +22,6 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <OpenGl_Element.hxx>
-#include <Handle_OpenGl_PointSprite.hxx>
-#include <Handle_OpenGl_ShaderProgram.hxx>
 
 #include <Image_PixMap_Handle.hxx>
 
index 79ccc8f..baac88e 100755 (executable)
@@ -25,7 +25,6 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <OpenGl_Element.hxx>
-#include <Handle_OpenGl_ShaderProgram.hxx>
 
 //! Text representation parameters
 class OpenGl_AspectText : public OpenGl_Element
index c09b669..1c41e9e 100755 (executable)
@@ -22,8 +22,6 @@
 #include <Graphic3d_SequenceOfGroup.hxx>
 
 // Forward declaration
-class Handle(OpenGl_Workspace);
-class Handle(Graphic3d_ClipPlane);
 
 DEFINE_STANDARD_HANDLE (OpenGl_CappingAlgoFilter, OpenGl_RenderFilter)
 
index 66da667..ecad376 100755 (executable)
@@ -22,7 +22,6 @@
 #include <OpenGl_Matrix.hxx>
 #include <Graphic3d_ClipPlane.hxx>
 
-class Handle(OpenGl_Context);
 
 DEFINE_STANDARD_HANDLE (OpenGl_CappingPlaneResource, OpenGl_Resource)
 
index 4d47b43..f4ba964 100755 (executable)
@@ -18,7 +18,6 @@
 
 #include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
-#include <Handle_Standard_Transient.hxx>
 
 //! Class to define graphic driver capabilities.
 //! Notice that these options will be ignored if particular functionality does not provided by GL driver
index ab747e2..8d87a97 100755 (executable)
@@ -23,7 +23,6 @@
 #include <NCollection_Handle.hxx>
 #include <Standard_TypeDef.hxx>
 #include <OpenGl_Matrix.hxx>
-#include <Handle_OpenGl_Workspace.hxx>
 
 //! This class contains logics related to tracking and modification of clipping plane
 //! state for particular OpenGl context. It contains information about enabled
index ecdcff6..2c8b3d2 100644 (file)
 #include <Aspect_Display.hxx>
 #include <Aspect_RenderingContext.hxx>
 #include <Aspect_TypeOfLine.hxx>
-#include <Handle_OpenGl_Context.hxx>
-#include <Handle_OpenGl_FrameBuffer.hxx>
-#include <Handle_OpenGl_Sampler.hxx>
-#include <Handle_OpenGl_ShaderManager.hxx>
-#include <Handle_OpenGl_ShaderProgram.hxx>
 #include <NCollection_DataMap.hxx>
 #include <NCollection_Map.hxx>
 #include <NCollection_Handle.hxx>
@@ -652,11 +647,8 @@ private: // system-dependent fields
 private: // context info
 
   typedef NCollection_DataMap<TCollection_AsciiString, Standard_Integer> OpenGl_DelayReleaseMap;
-  typedef NCollection_Handle<OpenGl_DelayReleaseMap> Handle(OpenGl_DelayReleaseMap);
   typedef NCollection_DataMap<TCollection_AsciiString, Handle(OpenGl_Resource)> OpenGl_ResourcesMap;
-  typedef NCollection_Handle<OpenGl_ResourcesMap> Handle(OpenGl_ResourcesMap);
   typedef NCollection_List<Handle(OpenGl_Resource)> OpenGl_ResourcesStack;
-  typedef NCollection_Handle<OpenGl_ResourcesStack> Handle(OpenGl_ResourcesStack);
 
   Handle(OpenGl_ResourcesMap)    mySharedResources; //!< shared resources with unique identification key
   Handle(OpenGl_DelayReleaseMap) myDelayed;         //!< shared resources for delayed release
index a548298..eeb4f7f 100644 (file)
@@ -16,8 +16,6 @@
 #ifndef OpenGl_Element_Header
 #define OpenGl_Element_Header
 
-#include <Handle_OpenGl_Context.hxx>
-#include <Handle_OpenGl_Workspace.hxx>
 #include <OpenGl_RenderFilter.hxx>
 
 //! Base interface for drawable elements.
index 54cb97b..7f159c5 100755 (executable)
@@ -16,7 +16,6 @@
 
 #include <OpenGl_Element.hxx>
 #include <OpenGl_Vec.hxx>
-#include <Handle_OpenGl_Workspace.hxx>
 
 class gp_Ax2;
 
index c31871b..be79c3a 100644 (file)
@@ -22,7 +22,6 @@
 #include <Standard_Boolean.hxx>
 #include <InterfaceGraphic.hxx>
 
-#include <Handle_OpenGl_FrameBuffer.hxx>
 
 //! Class implements FrameBuffer Object (FBO) resource
 //! intended for off-screen rendering.
index adb4cbc..4f8f08b 100644 (file)
@@ -17,7 +17,6 @@
 #define _OpenGl_GraphicDriver_HeaderFile
 
 #include <Graphic3d_GraphicDriver.hxx>
-#include <Handle_OpenGl_GraphicDriver.hxx>
 #include <OpenGl_Context.hxx>
 #include <OpenGl_PrinterContext.hxx>
 
@@ -27,8 +26,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <Quantity_PlaneAngle.hxx>
 #include <Quantity_NameOfColor.hxx>
-#include <Handle_OpenGl_View.hxx>
-#include <Handle_OpenGl_Workspace.hxx>
 
 #include <Aspect_Display.hxx>
 #include <Aspect_DisplayConnection.hxx>
@@ -66,7 +63,6 @@ class Quantity_Color;
 class Graphic3d_Vertex;
 class TCollection_ExtendedString;
 class Image_PixMap;
-class Handle(OpenGl_Workspace);
 class OpenGl_Element;
 class OpenGl_Structure;
 class OpenGl_Text;
index ed45ed9..f98cd38 100644 (file)
 
 #include <InterfaceGraphic_telem.hxx>
 
-#include <Handle_OpenGl_Workspace.hxx>
 #include <OpenGl_BVHClipPrimitiveSet.hxx>
 #include <OpenGl_BVHTreeSelector.hxx>
 
 #include <Graphic3d_ZLayerSettings.hxx>
 #include <OpenGl_GlCore11.hxx>
 
-class Handle(OpenGl_Workspace);
 
 struct OpenGl_GlobalLayerSettings
 {
index 8d077fa..41efccd 100644 (file)
@@ -25,7 +25,6 @@
 #include <NCollection_DataMap.hxx>
 
 class OpenGl_Structure;
-class Handle(OpenGl_Workspace);
 
 typedef NCollection_Sequence<OpenGl_Layer> OpenGl_SequenceOfLayers;
 typedef NCollection_DataMap<int, int> OpenGl_LayerSeqIds;
index c70098c..54b26f4 100644 (file)
@@ -23,7 +23,6 @@
 #include <Font_FontAspect.hxx>
 
 class OpenGl_Context;
-class Handle(OpenGl_Context);
 
 class OpenGl_LineAttributes : public OpenGl_Resource
 {
index a841f9a..29aac69 100755 (executable)
@@ -16,7 +16,6 @@
 #define _OpenGl_PointSprite_H__
 
 #include <OpenGl_Texture.hxx>
-#include <Handle_OpenGl_PointSprite.hxx>
 
 //! Point sprite resource. On modern hardware it will be texture with extra parameters.
 //! On ancient hardware sprites will be drawn using bitmaps.
index 261da15..aa8b083 100644 (file)
@@ -28,7 +28,6 @@
 #include <OpenGl_Element.hxx>
 
 class OpenGl_GraphicDriver;
-class Handle(OpenGl_ShaderProgram);
 
 //! Class for rendering of arbitrary primitive array.
 class OpenGl_PrimitiveArray : public OpenGl_Element
index fbe7dd7..f9e9777 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <Standard_Type.hxx>
 #include <TColStd_Array2OfReal.hxx>
-#include <Handle_Standard_Transient.hxx>
 #include <OpenGl_Vec.hxx>
 
 //! Class provides specific information for redrawing view to offscreen buffer
index c4e70ae..5e908d6 100644 (file)
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 class Standard_Transient;
-class Handle(Standard_Type);
 class OpenGl_Context;
 
 //! Interface for OpenGl resource with following meaning:
index b44060b..57319f6 100644 (file)
@@ -17,7 +17,6 @@
 #define OPENGL_SAMPLER_H
 
 #include <OpenGl_Context.hxx>
-#include <Handle_OpenGl_Sampler.hxx>
 
 //! Class implements OpenGL sampler object resource that
 //! stores the sampling parameters for a texture access.
index 999aae5..6b4ecb5 100644 (file)
@@ -22,7 +22,6 @@
 #include <NCollection_DataMap.hxx>
 #include <NCollection_Sequence.hxx>
 
-#include <Handle_OpenGl_ShaderManager.hxx>
 #include <OpenGl_SetOfShaderPrograms.hxx>
 #include <OpenGl_ShaderStates.hxx>
 #include <OpenGl_AspectFace.hxx>
index 6ae9288..432df4d 100755 (executable)
@@ -16,7 +16,6 @@
 #ifndef _OpenGl_ShaderObject_Header
 #define _OpenGl_ShaderObject_Header
 
-#include <Handle_OpenGl_ShaderObject.hxx>
 #include <Graphic3d_ShaderObject.hxx>
 #include <OpenGl_GlCore20.hxx>
 #include <OpenGl_Resource.hxx>
index 45b05ee..10eb0fd 100755 (executable)
@@ -28,7 +28,6 @@
 #include <OpenGl_Vec.hxx>
 #include <OpenGl_Matrix.hxx>
 #include <OpenGl_ShaderObject.hxx>
-#include <Handle_OpenGl_ShaderProgram.hxx>
 
 //! The enumeration of OCCT-specific OpenGL/GLSL variables.
 enum OpenGl_StateVariable
index 68d8514..f33663e 100755 (executable)
@@ -27,7 +27,6 @@
 #include <Graphic3d_HorizontalTextAlignment.hxx>
 #include <Graphic3d_VerticalTextAlignment.hxx>
 
-class Handle(OpenGl_PrinterContext);
 
 //! Text rendering
 class OpenGl_Text : public OpenGl_Element
index 6c3c4e5..20f8f00 100644 (file)
 
 #include <OpenGl_GlCore13.hxx>
 #include <OpenGl_Resource.hxx>
-#include <Handle_OpenGl_Texture.hxx>
 #include <Graphic3d_TypeOfTexture.hxx>
-#include <Handle_Graphic3d_TextureParams.hxx>
 
-class Handle(OpenGl_Context);
 class OpenGl_Context;
 class Image_PixMap;
 
index 36a4e28..281595e 100644 (file)
 #include <OpenGl_Trihedron.hxx>
 #include <OpenGl_GraduatedTrihedron.hxx>
 
-#include <Handle_OpenGl_Context.hxx>
-#include <Handle_OpenGl_GraphicDriver.hxx>
-#include <Handle_OpenGl_Workspace.hxx>
-#include <Handle_OpenGl_View.hxx>
-#include <Handle_OpenGl_Texture.hxx>
 
 struct OPENGL_ZCLIP
 {
@@ -76,7 +71,6 @@ struct OPENGL_FOG
 
 struct OpenGl_Matrix;
 class OpenGl_Structure;
-class Handle(OpenGl_PrinterContext);
 class OpenGl_StateCounter;
 
 class OpenGl_View : public MMgt_TShared
index b66b66d..3ab3769 100644 (file)
@@ -20,9 +20,6 @@
 #include <InterfaceGraphic_Aspect.hxx>
 #include <OpenGl_Caps.hxx>
 
-#include <Handle_OpenGl_Context.hxx>
-#include <Handle_OpenGl_Window.hxx>
-#include <Handle_OpenGl_GraphicDriver.hxx>
 
 #include <MMgt_TShared.hxx>
 
index 1cd74bf..4256c5d 100644 (file)
@@ -19,7 +19,6 @@
 #include <map>
 #include <set>
 
-#include <Handle_OpenGl_Workspace.hxx>
 #include <OpenGl_Window.hxx>
 
 #include <TColStd_Array2OfReal.hxx>
@@ -29,7 +28,6 @@
 #include <Graphic3d_TypeOfTexture.hxx>
 #include <Graphic3d_PtrFrameBuffer.hxx>
 #include <Graphic3d_BufferType.hxx>
-#include <Handle_Graphic3d_TextureParams.hxx>
 
 #include <Aspect_CLayer2d.hxx>
 #include <Aspect_Handle.hxx>
@@ -53,8 +51,6 @@
 #include <OpenGl_LineAttributes.hxx>
 #include <OpenGl_CappingAlgo.hxx>
 
-#include <Handle_OpenGl_View.hxx>
-#include <Handle_OpenGl_Texture.hxx>
 
 #include <OpenGl_ShaderObject.hxx>
 #include <OpenGl_ShaderProgram.hxx>
index 72b6cc3..8b70318 100644 (file)
@@ -22,7 +22,6 @@
 #include <Poly_CoherentLink.hxx>
 #include <NCollection_Vector.hxx>
 
-class Handle(Poly_CoherentTriangulation);
 class Poly_CoherentTriangulation;
 template <class A> class NCollection_List;
 
index 2feb2b1..7e954e9 100644 (file)
@@ -23,7 +23,6 @@
 #include <NCollection_BaseAllocator.hxx>
 #include <NCollection_List.hxx>
 
-class Handle(NCollection_IncAllocator);
 
 /**
  * Make loops from a set of connected links. A link is represented by 
index ace2910..37f96cd 100644 (file)
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Handle_Prs3d_IsoAspect.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-#include <Handle_Prs3d_LineAspect.hxx>
-#include <Handle_Prs3d_TextAspect.hxx>
-#include <Handle_Prs3d_ShadingAspect.hxx>
 #include <Quantity_Length.hxx>
 #include <Aspect_TypeOfDeflection.hxx>
 #include <Standard_Real.hxx>
-#include <Handle_Prs3d_PointAspect.hxx>
 #include <Prs3d_VertexDrawMode.hxx>
-#include <Handle_Prs3d_PlaneAspect.hxx>
-#include <Handle_Prs3d_ArrowAspect.hxx>
-#include <Handle_Prs3d_DatumAspect.hxx>
-#include <Handle_Prs3d_DimensionAspect.hxx>
 #include <Prs3d_DimensionUnits.hxx>
 #include <Prs3d_TypeOfHLR.hxx>
 #include <MMgt_TShared.hxx>
index 67d4911..13d9c1b 100755 (executable)
@@ -22,8 +22,6 @@
 class Adaptor3d_Curve;
 class TopoDS_Edge;
 class TopoDS_Shape;
-class Handle(BRepAdaptor_HSurface);
-class Handle(Prs3d_Drawer);
 
 class Prs3d_WFShape : Prs3d_Root
 {
index 2b9e9bf..816e6a4 100755 (executable)
@@ -1975,7 +1975,6 @@ static Standard_Integer OCC24667 (Draw_Interpretor& di, Standard_Integer n, cons
   return 0;
 }
 
-#include <Handle_BRepTools_NurbsConvertModification.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
 #include <BRepTools_NurbsConvertModification.hxx>
@@ -1985,7 +1984,7 @@ static TopoDS_Shape CreateTestShape (int& theShapeNb)
   BRep_Builder aBuilder;
   aBuilder.MakeCompound (aComp);
   //NURBS modifier is used to increase footprint of each shape
-  Handle_BRepTools_NurbsConvertModification aNurbsModif = new BRepTools_NurbsConvertModification;
+  Handle(BRepTools_NurbsConvertModification) aNurbsModif = new BRepTools_NurbsConvertModification;
   TopoDS_Shape aRefShape = BRepPrimAPI_MakeCylinder (50., 100.).Solid();
   BRepTools_Modifier aModifier (aRefShape, aNurbsModif);
   if (aModifier.IsDone()) {
index 68e4e3a..d1a2280 100644 (file)
@@ -3,7 +3,6 @@
 
 #include <NCollection_Sequence.hxx>
 
-class Handle(Select3D_SensitiveEntity);
 
 typedef NCollection_Sequence<Handle(Select3D_SensitiveEntity)> Select3D_EntitySequence;
 typedef NCollection_Sequence<Handle(Select3D_SensitiveEntity)>::Iterator Select3D_EntitySequenceIter;
index 8742a5d..b1cc2b8 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <NCollection_Vector.hxx>
 
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 
@@ -92,7 +91,7 @@ protected:
 protected:
 
   Select3D_VectorOfHPoly          myPlanarPolygons;     //!< Vector of planar polygons
-  Handle_TColStd_HArray1OfInteger myPolygonsIdxs;       //!< Indexes array for BVH calculation
+  Handle(TColStd_HArray1OfInteger) myPolygonsIdxs;       //!< Indexes array for BVH calculation
   gp_Pnt                          myCOG;                //!< Center of the point set
   Select3D_BndBox3d               myBndBox;             //!< Bounding box of the point set
 };
index f1c0969..2990a47 100644 (file)
@@ -24,7 +24,6 @@
 #include <Bnd_Box.hxx>
 #include <gp_Pnt.hxx>
 #include <Select3D_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Standard_OStream.hxx>
 
index 97ba0f7..7fb88cb 100644 (file)
@@ -25,8 +25,6 @@
 
 #include <Select3D_SensitivePoly.hxx>
 #include <Select3D_Pnt.hxx>
-#include <Handle_Geom_Circle.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Select3D_TypeOfSensitivity.hxx>
@@ -112,7 +110,7 @@ private:
 
   Select3D_TypeOfSensitivity mySensType;     //!< True if type of selection is interior, false otherwise
   gp_Pnt                     myCenter3D;       //!< Center of a circle
-  Handle_Geom_Circle         myCircle;         //!< Points of the circle
+  Handle(Geom_Circle)         myCircle;         //!< Points of the circle
   Standard_Real              myStart;          //!< Sensitive arc parameter
   Standard_Real              myEnd;            //!< Sensitive arc parameter
 };
index 866e7b8..f2a5aa1 100644 (file)
@@ -22,9 +22,7 @@
 #include <Standard_Type.hxx>
 
 #include <Geom_Curve.hxx>
-#include <Handle_Geom_Curve.hxx>
 #include <Select3D_SensitivePoly.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <Standard_Boolean.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
@@ -77,7 +75,7 @@ private:
 
 private:
 
-  Handle_Geom_Curve myCurve;     //!< Curve points
+  Handle(Geom_Curve) myCurve;     //!< Curve points
 };
 
 DEFINE_STANDARD_HANDLE(Select3D_SensitiveCurve, Select3D_SensitivePoly)
index 435cd7d..9d6f312 100644 (file)
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <SelectBasics_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
@@ -31,7 +30,6 @@
 #include <TopLoc_Location.hxx>
 
 class Select3D_SensitiveEntity;
-class Handle(Select3D_SensitiveEntity);
 class SelectBasics_EntityOwner;
 
 //!  Abstract framework to define 3D sensitive entities.
index 9aa6c27..85e4e94 100644 (file)
@@ -25,7 +25,6 @@
 
 #include <Select3D_TypeOfSensitivity.hxx>
 #include <Select3D_SensitiveSet.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <Standard_Boolean.hxx>
 #include <SelectBasics_SelectingVolumeManager.hxx>
index 2b583c9..beccfc8 100644 (file)
@@ -25,7 +25,6 @@
 #include <Select3D_EntitySequence.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <Select3D_SensitiveSet.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 
 class SelectBasics_EntityOwner;
index b11e416..7d0acd6 100644 (file)
@@ -23,7 +23,6 @@
 
 #include <Select3D_Pnt.hxx>
 #include <Select3D_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <Standard_Boolean.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Standard_Real.hxx>
index 54db03c..23e48b8 100644 (file)
@@ -28,7 +28,6 @@
 #include <Select3D_SensitiveSet.hxx>
 #include <Select3D_TypeOfSensitivity.hxx>
 
-#include <Handle_SelectBasics_EntityOwner.hxx>
 
 class Standard_ConstructionError;
 class Standard_OutOfRange;
@@ -115,7 +114,7 @@ protected:
 
   Select3D_PointData              myPolyg;              //!< Points of the poly
   mutable gp_Pnt                  myCOG;                //!< Center of the poly
-  Handle_TColStd_HArray1OfInteger mySegmentIndexes;     //!< Segment indexes for BVH tree build
+  Handle(TColStd_HArray1OfInteger) mySegmentIndexes;     //!< Segment indexes for BVH tree build
   Select3D_BndBox3d               myBndBox;             //!< Bounding box of the poly
   mutable Standard_Boolean        myIsComputed;         //!< Is true if all the points and data structures of polygon are initialized
 };
index 48882a7..4a86e7f 100644 (file)
@@ -24,7 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <Select3D_Pnt.hxx>
 #include <Select3D_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <gp_Pnt.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Standard_OStream.hxx>
index 2a63c1f..f1f6af8 100644 (file)
@@ -24,7 +24,6 @@
 #include <Select3D_TypeOfSensitivity.hxx>
 #include <Select3D_Pnt.hxx>
 #include <Select3D_SensitivePoly.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Standard_OStream.hxx>
 
index 4b3b164..a6b2741 100644 (file)
@@ -25,7 +25,6 @@
 #include <Standard_Type.hxx>
 #include <Standard_Type.hxx>
 
-#include <Handle_Poly_Triangulation.hxx>
 #include <TopLoc_Location.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Pnt.hxx>
@@ -34,7 +33,6 @@
 #include <Standard_Boolean.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <Select3D_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_SelectingVolumeManager.hxx>
 #include <Standard_OStream.hxx>
 #include <Select3D_SensitiveSet.hxx>
@@ -45,7 +43,6 @@ class SelectBasics_EntityOwner;
 class TopLoc_Location;
 class gp_Pnt;
 class Select3D_SensitiveEntity;
-class Handle(Select3D_SensitiveEntity);
 
 //! A framework to define selection of a sensitive entity made of a set of triangles.
 class Select3D_SensitiveTriangulation : public Select3D_SensitiveSet
@@ -77,9 +74,9 @@ public:
   //! Returns the amount of nodes in triangulation
   Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
 
-  Standard_EXPORT Handle_Select3D_SensitiveEntity GetConnected() Standard_OVERRIDE;
+  Standard_EXPORT Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;
 
-  const Handle_Poly_Triangulation& Triangulation() const;
+  const Handle(Poly_Triangulation)& Triangulation() const;
 
   Standard_Boolean HasInitLocation() const;
 
@@ -137,14 +134,14 @@ public:
 
 private:
 
-  Handle_Poly_Triangulation       myTriangul;
+  Handle(Poly_Triangulation)       myTriangul;
   TopLoc_Location                 myInitLocation;
   gp_Pnt                          myCDG3D;              //!< Center of the whole triangulation
-  Handle_TColStd_HArray1OfInteger myFreeEdges;
+  Handle(TColStd_HArray1OfInteger) myFreeEdges;
   Standard_Boolean                mySensType;            //!< Type of sensitivity: boundary or interior
   Standard_Integer                myDetectedTr;
   Standard_Integer                myPrimitivesNb;       //!< Amount of free edges or triangles depending on sensitivity type
-  Handle_TColStd_HArray1OfInteger myBVHPrimIndexes;     //!< Indexes of edges or triangles for BVH build
+  Handle(TColStd_HArray1OfInteger) myBVHPrimIndexes;     //!< Indexes of edges or triangles for BVH build
   mutable Select3D_BndBox3d       myBndBox;             //!< Bounding box of the whole triangulation
 };
 
index 3f510b9..792b3bf 100644 (file)
@@ -22,7 +22,6 @@
 #include <Standard_Type.hxx>
 
 #include <Select3D_SensitiveSet.hxx>
-#include <Handle_SelectBasics_EntityOwner.hxx>
 #include <Standard_OStream.hxx>
 #include <NCollection_Sequence.hxx>
 
@@ -55,7 +54,7 @@ public:
   //! Sets the owner for all entities in wire
   Standard_EXPORT void Set (const Handle(SelectBasics_EntityOwner)& theOwnerId);
 
-  Standard_EXPORT Handle_Select3D_SensitiveEntity GetLastDetected() const;
+  Standard_EXPORT Handle(Select3D_SensitiveEntity) GetLastDetected() const;
 
   //! Returns bounding box of the wire. If location
   //! transformation is set, it will be applied
index 1ae2dbc..b95ef5d 100644 (file)
@@ -20,7 +20,6 @@
 #include <NCollection_IndexedMap.hxx>
 
 class SelectMgr_EntityOwner;
-class Handle(SelectMgr_EntityOwner);
 
 typedef NCollection_IndexedMap<Handle(SelectMgr_EntityOwner)> SelectMgr_IndexedMapOfOwner;
 typedef NCollection_Handle<NCollection_IndexedMap<Handle(SelectMgr_EntityOwner)> > Handle(SelectMgr_IndexedMapOfOwner);
index 671f996..76ccc20 100644 (file)
@@ -19,7 +19,6 @@
 #include <BVH_PrimitiveSet.hxx>
 
 #include <Select3D_BndBox3d.hxx>
-#include <Handle_SelectMgr_SelectionManager.hxx>
 #include <SelectMgr_SelectableObject.hxx>
 #include <SelectMgr_VectorTypes.hxx>
 
index 766fe2c..51c3ad8 100644 (file)
@@ -25,7 +25,6 @@
 
 #include <SelectMgr_TypeOfUpdate.hxx>
 #include <MMgt_TShared.hxx>
-#include <Handle_SelectBasics_SensitiveEntity.hxx>
 #include <SelectMgr_SensitiveEntity.hxx>
 #include <SelectMgr_StateOfSelection.hxx>
 #include <SelectMgr_TypeOfBVHUpdate.hxx>
index e58e86e..522fe4d 100644 (file)
@@ -17,7 +17,6 @@
 #define _SelectMgr_SensitiveEntity_HeaderFile
 
 #include <SelectBasics_SensitiveEntity.hxx>
-#include <Handle_SelectBasics_SensitiveEntity.hxx>
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
index 93a8209..bbe7170 100644 (file)
 #include <SelectMgr_Selection.hxx>
 #include <SelectMgr_SelectableObject.hxx>
 #include <SelectMgr_SelectableObjectSet.hxx>
-#include <Handle_SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_StateOfSelection.hxx>
 #include <Standard_OStream.hxx>
-#include <Handle_SelectBasics_SensitiveEntity.hxx>
 
 class SelectMgr_SelectionManager;
 class SelectMgr_Selection;
@@ -150,11 +148,11 @@ public:
   void Next();
 
   //! Returns the current selected entity detected by the selector;
-  Standard_EXPORT Handle_SelectMgr_EntityOwner Picked() const;
+  Standard_EXPORT Handle(SelectMgr_EntityOwner) Picked() const;
 
   //! Returns the picked element with the highest priority,
   //! and which is the closest to the last successful mouse position.
-  Standard_EXPORT Handle_SelectMgr_EntityOwner OnePicked();
+  Standard_EXPORT Handle(SelectMgr_EntityOwner) OnePicked();
 
   //! Set preference of selecting one object for OnePicked() method:
   //! - If True, objects with less depth (distance fron the view plane) are
@@ -170,7 +168,7 @@ public:
 
   //! Returns the  entity which is at rank <aRank>
   //!          in the list of stored ones.
-  Standard_EXPORT Handle_SelectMgr_EntityOwner Picked (const Standard_Integer aRank) const;
+  Standard_EXPORT Handle(SelectMgr_EntityOwner) Picked (const Standard_Integer aRank) const;
 
   Standard_EXPORT Standard_Boolean Contains (const Handle(SelectMgr_SelectableObject)& theObject) const;
 
@@ -306,7 +304,7 @@ protected:
 
 private:
 
-  Handle_TColStd_HArray1OfInteger              myIndexes;
+  Handle(TColStd_HArray1OfInteger)              myIndexes;
   Standard_Integer                             myCurRank;
   Standard_Boolean                             myIsLeftChildQueuedFirst;
   Standard_Integer                             myEntityIdx;
index c6fa5c0..9f0ca22 100644 (file)
 #include <Geom_OffsetCurve.hxx>
 
 #include <TColStd_HSequenceOfReal.hxx>
-#include <Handle_Geom2dAdaptor_HCurve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Geom2dAdaptor_HCurve.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
index 4ada0c8..a89dc29 100644 (file)
@@ -259,7 +259,7 @@ inline Standard_Integer HashCode (const Handle(T)& theHandle, const Standard_Int
   return ::HashCode (const_cast<Standard_Address>(static_cast<const void*>(theHandle.get())), theUpper);
 }
 
-//! For compatibility with previous versions of OCCT, defines typedef opencascade::handle<Class> Handle_Class
+//! For compatibility with previous versions of OCCT, defines typedef opencascade::handle<Class> Handle(Class)
 #define DEFINE_STANDARD_HANDLECLASS(C1,C2,BC) typedef Handle(C1) Handle_##C1;
 #define DEFINE_STANDARD_HANDLE(C1,C2) DEFINE_STANDARD_HANDLECLASS(C1,C2,Standard_Transient)
 #define DEFINE_STANDARD_PHANDLE(C1,C2) DEFINE_STANDARD_HANDLECLASS(C1,C2,Standard_Persistent)
index 650db6b..fe29f31 100644 (file)
@@ -17,7 +17,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Macro.hxx>
-#include <Handle_Poly_Triangulation.hxx>
 #include <TColgp_Array1OfDir.hxx>
 
 class TopoDS_Shape;
@@ -40,7 +39,7 @@ public:
   //! @return true if shape is closed manifold Solid or compound of such Solids. <br>
   Standard_EXPORT static Standard_Boolean IsClosed(const TopoDS_Shape& theShape);
   
-  Standard_EXPORT static Handle_Poly_Triangulation Triangulation(const TopoDS_Face& aFace,
+  Standard_EXPORT static Handle(Poly_Triangulation) Triangulation(const TopoDS_Face& aFace,
                                                  TopLoc_Location& loc);
   
   Standard_EXPORT static void Normal(const TopoDS_Face& aFace,
index 5dbe23e..7e3260a 100644 (file)
 #include <Standard_Type.hxx>
 #include <Standard_Type.hxx>
 
-#include <Handle_Graphic3d_Group.hxx>
-#include <Handle_Graphic3d_Structure.hxx>
 #include <Graphic3d_SequenceOfHClipPlane.hxx>
 #include <SelectMgr_ViewerSelector.hxx>
 #include <SelectMgr_Selection.hxx>
-#include <Handle_V3d_View.hxx>
-#include <Handle_SelectMgr_EntityOwner.hxx>
 #include <NCollection_Handle.hxx>
 
 class Graphic3d_Group;
@@ -103,9 +99,9 @@ private:
 
   void ComputeSensitivePrs (const Handle(SelectMgr_Selection)& theSel, const gp_Trsf& theLoc);
 
-  Handle_Graphic3d_Group myareagroup;
-  Handle_Graphic3d_Group mysensgroup;
-  Handle_Graphic3d_Structure mystruct;
+  Handle(Graphic3d_Group) myareagroup;
+  Handle(Graphic3d_Group) mysensgroup;
+  Handle(Graphic3d_Structure) mystruct;
   Graphic3d_SequenceOfHClipPlane myClipPlanes;
 };
 
index b6e99d9..a8974f1 100644 (file)
@@ -16,7 +16,6 @@
 #ifndef TDF_AttributeIndexedMap_HeaderFile
 #define TDF_AttributeIndexedMap_HeaderFile
 
-#include <Handle_TDF_Attribute.hxx>
 #include <TColStd_MapTransientHasher.hxx>
 #include <NCollection_IndexedMap.hxx>
 
index 5079848..4be1660 100644 (file)
@@ -26,7 +26,6 @@ class TDF_Attribute;
 class TDF_AttributeIterator;
 class TDF_ChildIterator;
 class TDF_Data;
-class Handle(TDF_Data);
 class TDF_Label;
 
 #define KEEP_LOCAL_ROOT
index ee3eac6..4d11a55 100644 (file)
@@ -24,7 +24,6 @@
 #include <Message_Messenger.hxx>
 #include <TColStd_SequenceOfExtendedString.hxx>
 
-class Handle(TObj_Application);
 
 //!
 //! This is a base class for OCAF based TObj models
index faaaf9d..58a9071 100644 (file)
@@ -23,7 +23,6 @@
 #include <TColStd_SequenceOfAsciiString.hxx>
 #include <TColStd_IndexedMapOfTransient.hxx>
 
-class Handle(TObj_Model);
 
 //! This class provides interface to the static data
 //! to be used during save or load models.
index 4125095..0a84d38 100644 (file)
 #ifndef TObj_Model_HeaderFile
 #define TObj_Model_HeaderFile
 
-#include <Handle_TObj_Model.hxx>
 
 #include <TDF_Label.hxx>
 #include <TObj_Partition.hxx>
 #include <Message_Messenger.hxx>
 
-class Handle(TObj_Application);
-class Handle(TObj_TNameContainer);
-class Handle(TObj_Object);
-class Handle(TObj_Partition);
-class Handle(TObj_CheckModel);
 
-class Handle(TCollection_HExtendedString);
-class Handle(TDocStd_Document);
 
 /**
 * Base class for OCAF based models.
index e85f476..577021f 100644 (file)
@@ -22,7 +22,6 @@
 #include <TObj_ObjectIterator.hxx>
 #include <TObj_SequenceOfIterator.hxx>
 
-class Handle(TObj_Model);
 
 /**
 * This class provides an iterator by all objects in the model.
index 660149e..faa07f7 100644 (file)
 #include <TObj_Common.hxx>
 #include <TObj_DeletingMode.hxx>
 #include <TObj_SequenceOfObject.hxx>
-#include <Handle_TObj_Model.hxx>
-#include <Handle_TObj_Object.hxx>
 
 #include <TDF_Label.hxx>
 #include <gp_XYZ.hxx>
 
 class TObj_Persistence;
-class Handle(TObj_ObjectIterator);
-class Handle(TObj_TNameContainer);
-
-class Handle(TCollection_HAsciiString);
-class Handle(TCollection_HExtendedString);
-class Handle(TColStd_HArray1OfReal);
-class Handle(TColStd_HArray1OfInteger);
-class Handle(TColStd_HArray1OfExtendedString);
+
 
 //! Basis class for transient objects in OCAF-based models
 
index ed404c3..6add161 100644 (file)
@@ -20,7 +20,6 @@
 
 #include <TObj_Common.hxx>
 
-class Handle(TObj_Object);
 
 /**
 * This class provides an iterator by objects in a partition.
index 80c6a6b..6358bef 100644 (file)
@@ -21,8 +21,6 @@
 #include <TObj_Object.hxx>
 #include <TObj_Persistence.hxx>
 
-class Handle(TCollection_HExtendedString);
-class Handle(TObj_Partition);
 
 /**
 * This class privides tool handling one of partitions (the set of
index 70fbe60..89590ad 100644 (file)
@@ -21,7 +21,6 @@
 #include <TObj_Container.hxx>
 
 class TDF_Label;
-class Handle(TObj_Object);
 
 /** This class is intended to be a root of tools (one per class)
 *   to manage persistence of objects inherited from TObj_Object
index 2902e41..cb4a039 100644 (file)
@@ -22,7 +22,6 @@
 #include <NCollection_DefineHSequence.hxx>
 
 #include <TObj_Common.hxx>
-#include <Handle_TObj_Object.hxx>
 
 typedef NCollection_Sequence<Handle(TObj_Object)> TObj_SequenceOfObject;
 
index 921725b..212b309 100644 (file)
@@ -27,9 +27,7 @@
 typedef NCollection_SparseArray<Standard_Integer> TObj_TIntSparseArray_VecOfData;
 typedef NCollection_SparseArray<Standard_Integer> TObj_TIntSparseArray_MapOfData;
 
-class Handle(TObj_TIntSparseArray);
 class Standard_GUID;
-class Handle(TDF_RelocationTable);
 
 /**
  * OCAF Attribute to store a set of positive integer values in the OCAF tree.
index 60d6b79..eadfaa7 100644 (file)
 #define TObj_TModel_HeaderFile
 
 #include <TDF_Attribute.hxx>
-#include <Handle_TObj_Model.hxx>
 
-class Handle(TDF_RelocationTable);
-class Handle(TObj_TModel);
 
 /** 
 * Attribute to store OCAF-based models in OCAF tree
index c5a2f6a..e3e861e 100644 (file)
@@ -22,8 +22,6 @@
 #include <TObj_Container.hxx>
 #include <TDF_Attribute.hxx>
 
-class Handle(TCollection_HExtendedString);
-class Handle(TObj_TNameContainer);
 
 /** 
 * This class provides OCAF Attribute to storing the unique names of object in
index 256de8f..891ed08 100644 (file)
 
 #include <TDF_Attribute.hxx>
 
-class Handle(TObj_TObject);
 class Standard_GUID;
 class TDF_Label;
-class Handle(TDF_RelocationTable);
 
 /** 
 * Purpose: OCAF Attribute to storing objects (interfaces) of OCAF-based 
index 3dd32a2..aa0c5fa 100644 (file)
 #include <TDF_Attribute.hxx>
 #include <TDF_Label.hxx>
 
-class Handle(TObj_TReference);
-class Handle(TObj_Object);
 class Standard_GUID;
-class Handle(TDF_RelocationTable);
 
 /**
 * Attribute for storing references to the objects which implement
index af5b17e..9c77090 100644 (file)
 #include <TDF_Attribute.hxx>
 
 
-class Handle(TObj_TXYZ);
 class Standard_GUID;
 class TDF_Label;
-class Handle(TDF_RelocationTable);
 
 /*
 * Attribute for storing gp_XYZ
index fa2fea8..46f5cd2 100644 (file)
@@ -48,7 +48,6 @@
 // Section: General commands
 //=======================================================================
 
-class Handle(TObjDRAW_Model);
 
 //! simple model with redefined pure virtual method
 class TObjDRAW_Model : public TObj_Model
@@ -70,7 +69,6 @@ class TObjDRAW_Model : public TObj_Model
 DEFINE_STANDARD_HANDLE (TObjDRAW_Model,TObj_Model)
 
 
-class Handle(TObjDRAW_Object);
 
 //! simple object to check API and features of TObj_Object
 class TObjDRAW_Object : public TObj_Object
index 96800df..09c0cec 100644 (file)
 #include <Draw_Interpretor.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_CString.hxx>
-#include <Handle_V3d_View.hxx>
 #include <Standard_Boolean.hxx>
-#include <Handle_MMgt_TShared.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopTools_HArray1OfShape.hxx>
-#include <Handle_AIS_InteractiveObject.hxx>
 #include <AIS_KindOfInteractive.hxx>
 #include <TColStd_HArray1OfTransient.hxx>
-#include <Handle_V3d_Viewer.hxx>
-#include <Handle_AIS_InteractiveContext.hxx>
-#include <Handle_ViewerTest_EventManager.hxx>
 #include <Quantity_NameOfColor.hxx>
 
 class TCollection_AsciiString;
index c37c160..f869fc4 100644 (file)
@@ -30,7 +30,6 @@ struct VrmlData_InBuffer;
 class VrmlData_Scene;
 class gp_XY;
 class gp_XYZ;
-class Handle(VrmlData_Node);
 class TCollection_AsciiString;
 
 /**
index 380e284..6dbde26 100644 (file)
@@ -29,7 +29,6 @@
 #include <Standard_Mutex.hxx>
 
 struct VrmlData_InBuffer;
-class Handle(VrmlData_WorldInfo);
 class VrmlData_DataMapOfShapeAppearance;
 
 /**
index fde2443..cd6cda6 100644 (file)
@@ -23,9 +23,6 @@
 
 class VrmlData_Scene;
 class TopoDS_Face;
-class Handle(Poly_Triangulation);
-class Handle(Poly_Polygon3D);
-class Handle(VrmlData_Coordinate);
 /**
  * Algorithm converting one shape or a set of shapes to VrmlData_Scene.
  */
index c93ecbe..d1c6c72 100644 (file)
@@ -21,8 +21,6 @@
 #include <TObj_Common.hxx>
 #include <Standard_GUID.hxx>
 
-class Handle(XmlMDF_ADriverTable);
-class Handle(CDM_MessageDriver);
 
 // Class for registering storage/retrieval drivers for TObj XML persistence
 //
index dc7f3ad..4bc126b 100644 (file)
@@ -22,7 +22,6 @@
 #include <XmlLDrivers_DocumentRetrievalDriver.hxx>
 #include <XmlMDF_ADriverTable.hxx>
 
-class Handle(CDM_MessageDriver);
 
 // Retrieval driver of a TObj XML document
 //
index fb803b7..a6496b2 100644 (file)
@@ -22,7 +22,6 @@
 #include <XmlLDrivers_DocumentStorageDriver.hxx>
 #include <XmlMDF_ADriverTable.hxx>
 
-class Handle(CDM_MessageDriver);
 
 //  Block of comments describing class XmlTObjDrivers_DocumentStorageDriver
 //