diff --git a/src/AIS/AIS_LengthDimension.hxx b/src/AIS/AIS_LengthDimension.hxx index 31162dd219..206904ad89 100755 --- a/src/AIS/AIS_LengthDimension.hxx +++ b/src/AIS/AIS_LengthDimension.hxx @@ -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) diff --git a/src/AIS/AIS_MultipleConnectedInteractive.cxx b/src/AIS/AIS_MultipleConnectedInteractive.cxx index 25e27cdb1e..c22ea9a190 100644 --- a/src/AIS/AIS_MultipleConnectedInteractive.cxx +++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx @@ -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; diff --git a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx index 1b1f3fae85..11dfd45e4c 100644 --- a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx @@ -16,7 +16,6 @@ #define BOPDS_ListOfPaveBlock_HeaderFile #include -class Handle_BOPDS_PaveBlock; typedef NCollection_List BOPDS_ListOfPaveBlock; typedef BOPDS_ListOfPaveBlock::Iterator BOPDS_ListIteratorOfListOfPaveBlock; diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx index d3f6379961..87a236a7ae 100644 --- a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx @@ -29,8 +29,6 @@ #include #include -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. diff --git a/src/BRepFill/BRepFill_MultiLine.hxx b/src/BRepFill/BRepFill_MultiLine.hxx index ae58567807..8969b71936 100644 --- a/src/BRepFill/BRepFill_MultiLine.hxx +++ b/src/BRepFill/BRepFill_MultiLine.hxx @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include class Standard_DomainError; diff --git a/src/BRepGProp/BRepGProp_Gauss.cxx b/src/BRepGProp/BRepGProp_Gauss.cxx index d905f75f97..526d1eacb8 100644 --- a/src/BRepGProp/BRepGProp_Gauss.cxx +++ b/src/BRepGProp/BRepGProp_Gauss.cxx @@ -176,7 +176,7 @@ Standard_Integer BRepGProp_Gauss::MaxSubs(const Standard_Integer theN, //function : Init //purpose : //======================================================================= -void BRepGProp_Gauss::Init(Handle_Vector& theOutVec, +void BRepGProp_Gauss::Init(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(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); diff --git a/src/BRepGProp/BRepGProp_Gauss.hxx b/src/BRepGProp/BRepGProp_Gauss.hxx index 6ded4b8c70..8607820b89 100644 --- a/src/BRepGProp/BRepGProp_Gauss.hxx +++ b/src/BRepGProp/BRepGProp_Gauss.hxx @@ -52,7 +52,6 @@ class BRepGProp_Gauss }; typedef NCollection_Handle< NCollection_Array1 > InertiaArray; - typedef NCollection_Handle 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 diff --git a/src/BRepMesh/BRepMesh.hxx b/src/BRepMesh/BRepMesh.hxx index 80b2ce0420..74c7b7a7bb 100644 --- a/src/BRepMesh/BRepMesh.hxx +++ b/src/BRepMesh/BRepMesh.hxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -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 MapOfIntegerInteger; typedef NCollection_DataMap DMapOfVertexInteger; - typedef NCollection_DataMap DMapOfFaceAttribute; + typedef NCollection_DataMap DMapOfFaceAttribute; typedef NCollection_DataMap DMapOfShapePairOfPolygon; typedef NCollection_DataMap DMapOfIntegerPnt; typedef NCollection_DataMap DMapOfIntegerListOfXY; diff --git a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx index f09dbb5814..8c4b40f77b 100644 --- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx +++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx @@ -20,9 +20,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx index 7ab0d492bc..cd64a38b1f 100644 --- a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx +++ b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx @@ -22,9 +22,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/src/BRepMesh/BRepMesh_FaceAttribute.hxx b/src/BRepMesh/BRepMesh_FaceAttribute.hxx index 8d83108baf..5c99d494be 100644 --- a/src/BRepMesh/BRepMesh_FaceAttribute.hxx +++ b/src/BRepMesh/BRepMesh_FaceAttribute.hxx @@ -21,7 +21,6 @@ #include #include #include -#include class BRepAdaptor_HSurface; diff --git a/src/BRepMesh/BRepMesh_FastDiscret.hxx b/src/BRepMesh/BRepMesh_FastDiscret.hxx index 22fc593d4f..8b66e5cab6 100644 --- a/src/BRepMesh/BRepMesh_FastDiscret.hxx +++ b/src/BRepMesh/BRepMesh_FastDiscret.hxx @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx index bacf6ac15b..17b0ab6eb9 100644 --- a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx +++ b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx @@ -23,8 +23,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/src/BRepMesh/BRepMesh_GeomTool.hxx b/src/BRepMesh/BRepMesh_GeomTool.hxx index 44f72a7ab0..54fbd48014 100644 --- a/src/BRepMesh/BRepMesh_GeomTool.hxx +++ b/src/BRepMesh/BRepMesh_GeomTool.hxx @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx index 0128646028..09c453d96d 100644 --- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx +++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/src/BRepMesh/BRepMesh_PairOfPolygon.hxx b/src/BRepMesh/BRepMesh_PairOfPolygon.hxx index dc38bcd628..f9955ddde9 100644 --- a/src/BRepMesh/BRepMesh_PairOfPolygon.hxx +++ b/src/BRepMesh/BRepMesh_PairOfPolygon.hxx @@ -17,7 +17,6 @@ #include #include #include -#include 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 diff --git a/src/BRepMesh/BRepMesh_ShapeTool.hxx b/src/BRepMesh/BRepMesh_ShapeTool.hxx index 705e0c761c..b65c9d9f11 100644 --- a/src/BRepMesh/BRepMesh_ShapeTool.hxx +++ b/src/BRepMesh/BRepMesh_ShapeTool.hxx @@ -18,10 +18,8 @@ #include #include #include -#include #include #include -#include class TopoDS_Face; class TopoDS_Edge; diff --git a/src/BSplCLib/BSplCLib_Cache.cxx b/src/BSplCLib/BSplCLib_Cache.cxx index 6e188069b4..6a7041bb22 100644 --- a/src/BSplCLib/BSplCLib_Cache.cxx +++ b/src/BSplCLib/BSplCLib_Cache.cxx @@ -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())); diff --git a/src/BSplCLib/BSplCLib_Cache.hxx b/src/BSplCLib/BSplCLib_Cache.hxx index e74c8dbb90..7ff2a52956 100644 --- a/src/BSplCLib/BSplCLib_Cache.hxx +++ b/src/BSplCLib/BSplCLib_Cache.hxx @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include diff --git a/src/BSplSLib/BSplSLib_Cache.cxx b/src/BSplSLib/BSplSLib_Cache.cxx index 069c252963..6946c18853 100644 --- a/src/BSplSLib/BSplSLib_Cache.cxx +++ b/src/BSplSLib/BSplSLib_Cache.cxx @@ -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())); diff --git a/src/BinTObjDrivers/BinTObjDrivers.hxx b/src/BinTObjDrivers/BinTObjDrivers.hxx index 4eaa079746..499a6eac46 100644 --- a/src/BinTObjDrivers/BinTObjDrivers.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers.hxx @@ -21,8 +21,6 @@ #include #include -class Handle(BinMDF_ADriverTable); -class Handle(CDM_MessageDriver); // Class for registering storage/retrieval drivers for TObj Bin persistence // diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx index ff859816ef..d9e318a5d7 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(CDM_MessageDriver); // Retrieval driver of a TObj Bin document // diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx index 158a81122f..29d0c04e8a 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(CDM_MessageDriver); // Block of comments describing class BinTObjDrivers_DocumentStorageDriver // diff --git a/src/BndLib/BndLib_Add2dCurve.cxx b/src/BndLib/BndLib_Add2dCurve.cxx index 105265a4b0..3325c85ee1 100644 --- a/src/BndLib/BndLib_Add2dCurve.cxx +++ b/src/BndLib/BndLib_Add2dCurve.cxx @@ -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; diff --git a/src/CDM/CDM_MetaDataLookUpTable.hxx b/src/CDM/CDM_MetaDataLookUpTable.hxx index a04d5d7974..e94d1b1457 100644 --- a/src/CDM/CDM_MetaDataLookUpTable.hxx +++ b/src/CDM/CDM_MetaDataLookUpTable.hxx @@ -20,7 +20,6 @@ #include #include -class Handle(CDM_MetaData); typedef NCollection_DataMap CDM_MetaDataLookUpTable; typedef NCollection_DataMap::Iterator CDM_DataMapIteratorOfMetaDataLookUpTable; diff --git a/src/Expr/Expr_Array1OfNamedUnknown.hxx b/src/Expr/Expr_Array1OfNamedUnknown.hxx index 2bb95b1feb..24621d3a74 100644 --- a/src/Expr/Expr_Array1OfNamedUnknown.hxx +++ b/src/Expr/Expr_Array1OfNamedUnknown.hxx @@ -17,7 +17,6 @@ #ifndef Expr_Array1OfNamedUnknown_HeaderFile #define Expr_Array1OfNamedUnknown_HeaderFile -#include #include typedef NCollection_Array1 Expr_Array1OfNamedUnknown; diff --git a/src/Graphic3d/Graphic3d_CStructure.hxx b/src/Graphic3d/Graphic3d_CStructure.hxx index 1ad7536910..19ab6fc241 100644 --- a/src/Graphic3d/Graphic3d_CStructure.hxx +++ b/src/Graphic3d/Graphic3d_CStructure.hxx @@ -25,11 +25,8 @@ #include #include #include -#include //! Forward declaration. -class Handle(Graphic3d_StructureManager); -class Handle(Graphic3d_CStructure); //! Low-level graphic structure interface class Graphic3d_CStructure : public Standard_Transient diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx index 3297ee1890..cdeda3c910 100644 --- a/src/Graphic3d/Graphic3d_Camera.hxx +++ b/src/Graphic3d/Graphic3d_Camera.hxx @@ -31,7 +31,6 @@ #include //! Forward declaration -class Handle(Graphic3d_Camera); //! Camera class provides object-oriented approach to setting up projection //! and orientation properties of 3D view. diff --git a/src/Graphic3d/Graphic3d_ClipPlane.hxx b/src/Graphic3d/Graphic3d_ClipPlane.hxx index 14158e2979..ef05c0981a 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.hxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx @@ -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 diff --git a/src/Graphic3d/Graphic3d_MapOfStructure.hxx b/src/Graphic3d/Graphic3d_MapOfStructure.hxx index 6c8b230137..62987252c6 100644 --- a/src/Graphic3d/Graphic3d_MapOfStructure.hxx +++ b/src/Graphic3d/Graphic3d_MapOfStructure.hxx @@ -16,7 +16,6 @@ #ifndef _Graphic3d_MapOfStructure #define _Graphic3d_MapOfStructure -#include #include typedef NCollection_Map Graphic3d_MapOfStructure; diff --git a/src/Graphic3d/Graphic3d_ShaderObject.hxx b/src/Graphic3d/Graphic3d_ShaderObject.hxx index def318ae99..2050720a7b 100755 --- a/src/Graphic3d/Graphic3d_ShaderObject.hxx +++ b/src/Graphic3d/Graphic3d_ShaderObject.hxx @@ -21,7 +21,6 @@ #include //! Forward declaration -class Handle(Graphic3d_ShaderObject); //! This class is responsible for managing shader objects. class Graphic3d_ShaderObject : public Standard_Transient diff --git a/src/IVtkDraw/IVtkDraw.hxx b/src/IVtkDraw/IVtkDraw.hxx index a564db973a..16f3eda0f5 100644 --- a/src/IVtkDraw/IVtkDraw.hxx +++ b/src/IVtkDraw/IVtkDraw.hxx @@ -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 diff --git a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx index 3097ab8828..8b442013d4 100644 --- a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx +++ b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx @@ -23,7 +23,6 @@ #include #endif #ifndef _Handle_MMgt_TShared_HeaderFile -#include #endif #include @@ -123,6 +122,5 @@ private: //! Mapping between OCCT topological shape IDs and their correspondent //! visualization pipelines. typedef NCollection_DataMap ShapePipelineMap; -typedef NCollection_Handle Handle(ShapePipelineMap); #endif diff --git a/src/LDOM/LDOMBasicString.hxx b/src/LDOM/LDOMBasicString.hxx index 0a0e741ac9..feaaa7e603 100644 --- a/src/LDOM/LDOMBasicString.hxx +++ b/src/LDOM/LDOMBasicString.hxx @@ -21,7 +21,6 @@ #include #include -class Handle(LDOM_MemManager); class LDOM_NullPtr; class TCollection_AsciiString; class TCollection_ExtendedString; diff --git a/src/LDOM/LDOMString.hxx b/src/LDOM/LDOMString.hxx index 55823bf125..0ce1cdf47f 100644 --- a/src/LDOM/LDOMString.hxx +++ b/src/LDOM/LDOMString.hxx @@ -17,7 +17,6 @@ #define LDOMString_HeaderFile #include -#include // Class LDOMString // Represents various object types which can be mapped to XML strings diff --git a/src/LDOM/LDOM_Document.hxx b/src/LDOM/LDOM_Document.hxx index 5d15b2eecb..cd671d6812 100644 --- a/src/LDOM/LDOM_Document.hxx +++ b/src/LDOM/LDOM_Document.hxx @@ -17,7 +17,6 @@ #define LDOM_Document_HeaderFile #include -#include #include #include #include diff --git a/src/LDOM/LDOM_MemManager.hxx b/src/LDOM/LDOM_MemManager.hxx index b9673fa3d6..7caf9cbe3c 100644 --- a/src/LDOM/LDOM_MemManager.hxx +++ b/src/LDOM/LDOM_MemManager.hxx @@ -126,6 +126,5 @@ class LDOM_MemManager : public MMgt_TShared DEFINE_STANDARD_RTTI (LDOM_MemManager, MMgt_TShared) }; -#include #endif diff --git a/src/LDOM/LDOM_Node.hxx b/src/LDOM/LDOM_Node.hxx index 6b41449763..85a4a96cce 100644 --- a/src/LDOM/LDOM_Node.hxx +++ b/src/LDOM/LDOM_Node.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class LDOM_BasicNode; diff --git a/src/LDOM/LDOM_OSStream.cxx b/src/LDOM/LDOM_OSStream.cxx index c4f6969144..d7d9980ef5 100644 --- a/src/LDOM/LDOM_OSStream.cxx +++ b/src/LDOM/LDOM_OSStream.cxx @@ -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(theAlloc->Allocate (theLength))), len (0), next(0) diff --git a/src/LDOM/LDOM_OSStream.hxx b/src/LDOM/LDOM_OSStream.hxx index 2648b9253e..4d67a82d07 100644 --- a/src/LDOM/LDOM_OSStream.hxx +++ b/src/LDOM/LDOM_OSStream.hxx @@ -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: diff --git a/src/MeshTest/MeshTest_DrawableMesh.hxx b/src/MeshTest/MeshTest_DrawableMesh.hxx index 9d84918957..4dad2f601b 100644 --- a/src/MeshTest/MeshTest_DrawableMesh.hxx +++ b/src/MeshTest/MeshTest_DrawableMesh.hxx @@ -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; diff --git a/src/MeshVS/MeshVS_DummySensitiveEntity.hxx b/src/MeshVS/MeshVS_DummySensitiveEntity.hxx index 056287a447..f8ab3753b4 100644 --- a/src/MeshVS/MeshVS_DummySensitiveEntity.hxx +++ b/src/MeshVS/MeshVS_DummySensitiveEntity.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class SelectBasics_EntityOwner; diff --git a/src/MeshVS/MeshVS_SensitiveFace.hxx b/src/MeshVS/MeshVS_SensitiveFace.hxx index 07da34551d..ecec9c2ed7 100644 --- a/src/MeshVS/MeshVS_SensitiveFace.hxx +++ b/src/MeshVS/MeshVS_SensitiveFace.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class SelectBasics_EntityOwner; diff --git a/src/MeshVS/MeshVS_SensitiveMesh.hxx b/src/MeshVS/MeshVS_SensitiveMesh.hxx index 43c2cd73f2..b7aab8a9c9 100644 --- a/src/MeshVS/MeshVS_SensitiveMesh.hxx +++ b/src/MeshVS/MeshVS_SensitiveMesh.hxx @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/src/MeshVS/MeshVS_SensitivePolyhedron.hxx b/src/MeshVS/MeshVS_SensitivePolyhedron.hxx index 0adaa8cc05..e1ec427335 100644 --- a/src/MeshVS/MeshVS_SensitivePolyhedron.hxx +++ b/src/MeshVS/MeshVS_SensitivePolyhedron.hxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -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; diff --git a/src/MeshVS/MeshVS_SensitiveSegment.hxx b/src/MeshVS/MeshVS_SensitiveSegment.hxx index ee4fb5b52b..a8eebfa1f3 100644 --- a/src/MeshVS/MeshVS_SensitiveSegment.hxx +++ b/src/MeshVS/MeshVS_SensitiveSegment.hxx @@ -21,7 +21,6 @@ #include #include -#include class SelectBasics_EntityOwner; class gp_Pnt; diff --git a/src/Message/Message_HArrayOfMsg.hxx b/src/Message/Message_HArrayOfMsg.hxx index 8d0e79f437..2fb2db1277 100644 --- a/src/Message/Message_HArrayOfMsg.hxx +++ b/src/Message/Message_HArrayOfMsg.hxx @@ -18,9 +18,7 @@ #include #include -typedef NCollection_Handle Handle(Message_Msg); typedef NCollection_Array1 Message_ArrayOfMsg; -typedef NCollection_Handle Handle(Message_ArrayOfMsg); typedef Handle(Message_ArrayOfMsg) Message_HArrayOfMsg; #endif // _Message_HArrayOfMsg_HeaderFile diff --git a/src/MoniTool/MoniTool_DataMapOfTimer.hxx b/src/MoniTool/MoniTool_DataMapOfTimer.hxx index f00aaa4180..292535291b 100644 --- a/src/MoniTool/MoniTool_DataMapOfTimer.hxx +++ b/src/MoniTool/MoniTool_DataMapOfTimer.hxx @@ -21,7 +21,6 @@ #include #include -class Handle(MoniTool_Timer); typedef NCollection_DataMap MoniTool_DataMapOfTimer; typedef NCollection_DataMap::Iterator MoniTool_DataMapIteratorOfDataMapOfTimer; diff --git a/src/MoniTool/MoniTool_ValueInterpret.hxx b/src/MoniTool/MoniTool_ValueInterpret.hxx index 6116d911e6..c229439cf2 100644 --- a/src/MoniTool/MoniTool_ValueInterpret.hxx +++ b/src/MoniTool/MoniTool_ValueInterpret.hxx @@ -18,7 +18,6 @@ #include -class Handle(MoniTool_TypedValue); typedef Handle(TCollection_HAsciiString) (*MoniTool_ValueInterpret) (const Handle(MoniTool_TypedValue)& typval, const Handle(TCollection_HAsciiString)& val, diff --git a/src/NCollection/NCollection_BaseAllocator.hxx b/src/NCollection/NCollection_BaseAllocator.hxx index 000d2500a8..a58b56bde0 100644 --- a/src/NCollection/NCollection_BaseAllocator.hxx +++ b/src/NCollection/NCollection_BaseAllocator.hxx @@ -31,7 +31,6 @@ #include #include -class Handle(NCollection_BaseAllocator); /** * Purpose: Basic class for memory allocation wizards. diff --git a/src/NCollection/NCollection_HeapAllocator.hxx b/src/NCollection/NCollection_HeapAllocator.hxx index 71c542f9e6..269e2d0300 100644 --- a/src/NCollection/NCollection_HeapAllocator.hxx +++ b/src/NCollection/NCollection_HeapAllocator.hxx @@ -18,7 +18,6 @@ #include -class Handle(NCollection_HeapAllocator); /** * Allocator that uses the global dynamic heap (malloc / free). diff --git a/src/OpenGl/Handle_OpenGl_Context.hxx b/src/OpenGl/Handle_OpenGl_Context.hxx index aa3d34d59a..cd85cec430 100644 --- a/src/OpenGl/Handle_OpenGl_Context.hxx +++ b/src/OpenGl/Handle_OpenGl_Context.hxx @@ -17,7 +17,6 @@ #define _Handle_OpenGl_Context_Header #include -#include class OpenGl_Context; DEFINE_STANDARD_HANDLE(OpenGl_Context, Standard_Transient) diff --git a/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx b/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx index 1dd0e9b71c..ba07b75f11 100644 --- a/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/Handle_OpenGl_GraphicDriver.hxx @@ -17,7 +17,6 @@ #define _Handle_OpenGl_GraphicDriver_Header #include -#include class OpenGl_GraphicDriver; diff --git a/src/OpenGl/Handle_OpenGl_PointSprite.hxx b/src/OpenGl/Handle_OpenGl_PointSprite.hxx index 41650eef65..9d74a80d77 100755 --- a/src/OpenGl/Handle_OpenGl_PointSprite.hxx +++ b/src/OpenGl/Handle_OpenGl_PointSprite.hxx @@ -16,7 +16,6 @@ #ifndef _Handle_OpenGl_PointSprite_Header #define _Handle_OpenGl_PointSprite_Header -#include class OpenGl_PointSprite; DEFINE_STANDARD_HANDLE(OpenGl_PointSprite, OpenGl_Texture) diff --git a/src/OpenGl/Handle_OpenGl_View.hxx b/src/OpenGl/Handle_OpenGl_View.hxx index a9676ccfd6..f2ffc441cd 100644 --- a/src/OpenGl/Handle_OpenGl_View.hxx +++ b/src/OpenGl/Handle_OpenGl_View.hxx @@ -17,7 +17,6 @@ #define _Handle_OpenGl_View_Header #include -#include class OpenGl_View; diff --git a/src/OpenGl/Handle_OpenGl_Window.hxx b/src/OpenGl/Handle_OpenGl_Window.hxx index 5a7315b871..1e230981b1 100644 --- a/src/OpenGl/Handle_OpenGl_Window.hxx +++ b/src/OpenGl/Handle_OpenGl_Window.hxx @@ -17,7 +17,6 @@ #define _Handle_OpenGl_Window_Header #include -#include class OpenGl_Window; diff --git a/src/OpenGl/Handle_OpenGl_Workspace.hxx b/src/OpenGl/Handle_OpenGl_Workspace.hxx index e85e5243b6..8bcfef5703 100644 --- a/src/OpenGl/Handle_OpenGl_Workspace.hxx +++ b/src/OpenGl/Handle_OpenGl_Workspace.hxx @@ -17,7 +17,6 @@ #define _Handle_OpenGl_Workspace_Header #include -#include class OpenGl_Workspace; diff --git a/src/OpenGl/OpenGl_AspectFace.hxx b/src/OpenGl/OpenGl_AspectFace.hxx index 0cafe86a79..0d71ebc778 100644 --- a/src/OpenGl/OpenGl_AspectFace.hxx +++ b/src/OpenGl/OpenGl_AspectFace.hxx @@ -21,9 +21,6 @@ #include #include -#include -#include -#include #include #include diff --git a/src/OpenGl/OpenGl_AspectLine.hxx b/src/OpenGl/OpenGl_AspectLine.hxx index 68b54857b5..c1e12f809a 100644 --- a/src/OpenGl/OpenGl_AspectLine.hxx +++ b/src/OpenGl/OpenGl_AspectLine.hxx @@ -22,7 +22,6 @@ #include #include -#include #include diff --git a/src/OpenGl/OpenGl_AspectMarker.hxx b/src/OpenGl/OpenGl_AspectMarker.hxx index 08292ba53e..1706335e2d 100644 --- a/src/OpenGl/OpenGl_AspectMarker.hxx +++ b/src/OpenGl/OpenGl_AspectMarker.hxx @@ -22,8 +22,6 @@ #include #include -#include -#include #include diff --git a/src/OpenGl/OpenGl_AspectText.hxx b/src/OpenGl/OpenGl_AspectText.hxx index 79ccc8f4d9..baac88e476 100755 --- a/src/OpenGl/OpenGl_AspectText.hxx +++ b/src/OpenGl/OpenGl_AspectText.hxx @@ -25,7 +25,6 @@ #include #include -#include //! Text representation parameters class OpenGl_AspectText : public OpenGl_Element diff --git a/src/OpenGl/OpenGl_CappingAlgo.hxx b/src/OpenGl/OpenGl_CappingAlgo.hxx index c09b6694c1..1c41e9e92e 100755 --- a/src/OpenGl/OpenGl_CappingAlgo.hxx +++ b/src/OpenGl/OpenGl_CappingAlgo.hxx @@ -22,8 +22,6 @@ #include // Forward declaration -class Handle(OpenGl_Workspace); -class Handle(Graphic3d_ClipPlane); DEFINE_STANDARD_HANDLE (OpenGl_CappingAlgoFilter, OpenGl_RenderFilter) diff --git a/src/OpenGl/OpenGl_CappingPlaneResource.hxx b/src/OpenGl/OpenGl_CappingPlaneResource.hxx index 66da667ac7..ecad37682f 100755 --- a/src/OpenGl/OpenGl_CappingPlaneResource.hxx +++ b/src/OpenGl/OpenGl_CappingPlaneResource.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(OpenGl_Context); DEFINE_STANDARD_HANDLE (OpenGl_CappingPlaneResource, OpenGl_Resource) diff --git a/src/OpenGl/OpenGl_Caps.hxx b/src/OpenGl/OpenGl_Caps.hxx index 4d47b43a1b..f4ba9649c6 100755 --- a/src/OpenGl/OpenGl_Caps.hxx +++ b/src/OpenGl/OpenGl_Caps.hxx @@ -18,7 +18,6 @@ #include #include -#include //! Class to define graphic driver capabilities. //! Notice that these options will be ignored if particular functionality does not provided by GL driver diff --git a/src/OpenGl/OpenGl_Clipping.hxx b/src/OpenGl/OpenGl_Clipping.hxx index ab747e293e..8d87a97c12 100755 --- a/src/OpenGl/OpenGl_Clipping.hxx +++ b/src/OpenGl/OpenGl_Clipping.hxx @@ -23,7 +23,6 @@ #include #include #include -#include //! This class contains logics related to tracking and modification of clipping plane //! state for particular OpenGl context. It contains information about enabled diff --git a/src/OpenGl/OpenGl_Context.hxx b/src/OpenGl/OpenGl_Context.hxx index ecdcff65e8..2c8b3d2f21 100644 --- a/src/OpenGl/OpenGl_Context.hxx +++ b/src/OpenGl/OpenGl_Context.hxx @@ -21,11 +21,6 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include @@ -652,11 +647,8 @@ private: // system-dependent fields private: // context info typedef NCollection_DataMap OpenGl_DelayReleaseMap; - typedef NCollection_Handle Handle(OpenGl_DelayReleaseMap); typedef NCollection_DataMap OpenGl_ResourcesMap; - typedef NCollection_Handle Handle(OpenGl_ResourcesMap); typedef NCollection_List OpenGl_ResourcesStack; - typedef NCollection_Handle Handle(OpenGl_ResourcesStack); Handle(OpenGl_ResourcesMap) mySharedResources; //!< shared resources with unique identification key Handle(OpenGl_DelayReleaseMap) myDelayed; //!< shared resources for delayed release diff --git a/src/OpenGl/OpenGl_Element.hxx b/src/OpenGl/OpenGl_Element.hxx index a548298289..eeb4f7fb46 100644 --- a/src/OpenGl/OpenGl_Element.hxx +++ b/src/OpenGl/OpenGl_Element.hxx @@ -16,8 +16,6 @@ #ifndef OpenGl_Element_Header #define OpenGl_Element_Header -#include -#include #include //! Base interface for drawable elements. diff --git a/src/OpenGl/OpenGl_Flipper.hxx b/src/OpenGl/OpenGl_Flipper.hxx index 54cb97b55e..7f159c5db9 100755 --- a/src/OpenGl/OpenGl_Flipper.hxx +++ b/src/OpenGl/OpenGl_Flipper.hxx @@ -16,7 +16,6 @@ #include #include -#include class gp_Ax2; diff --git a/src/OpenGl/OpenGl_FrameBuffer.hxx b/src/OpenGl/OpenGl_FrameBuffer.hxx index c31871ba6a..be79c3a6cf 100644 --- a/src/OpenGl/OpenGl_FrameBuffer.hxx +++ b/src/OpenGl/OpenGl_FrameBuffer.hxx @@ -22,7 +22,6 @@ #include #include -#include //! Class implements FrameBuffer Object (FBO) resource //! intended for off-screen rendering. diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx index adb4cbc3d0..4f8f08b16d 100644 --- a/src/OpenGl/OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/OpenGl_GraphicDriver.hxx @@ -17,7 +17,6 @@ #define _OpenGl_GraphicDriver_HeaderFile #include -#include #include #include @@ -27,8 +26,6 @@ #include #include #include -#include -#include #include #include @@ -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; diff --git a/src/OpenGl/OpenGl_Layer.hxx b/src/OpenGl/OpenGl_Layer.hxx index ed45ed9173..f98cd383f3 100644 --- a/src/OpenGl/OpenGl_Layer.hxx +++ b/src/OpenGl/OpenGl_Layer.hxx @@ -21,14 +21,12 @@ #include -#include #include #include #include #include -class Handle(OpenGl_Workspace); struct OpenGl_GlobalLayerSettings { diff --git a/src/OpenGl/OpenGl_LayerList.hxx b/src/OpenGl/OpenGl_LayerList.hxx index 8d077fa708..41efccdcde 100644 --- a/src/OpenGl/OpenGl_LayerList.hxx +++ b/src/OpenGl/OpenGl_LayerList.hxx @@ -25,7 +25,6 @@ #include class OpenGl_Structure; -class Handle(OpenGl_Workspace); typedef NCollection_Sequence OpenGl_SequenceOfLayers; typedef NCollection_DataMap OpenGl_LayerSeqIds; diff --git a/src/OpenGl/OpenGl_LineAttributes.hxx b/src/OpenGl/OpenGl_LineAttributes.hxx index c70098c1c4..54b26f4148 100644 --- a/src/OpenGl/OpenGl_LineAttributes.hxx +++ b/src/OpenGl/OpenGl_LineAttributes.hxx @@ -23,7 +23,6 @@ #include class OpenGl_Context; -class Handle(OpenGl_Context); class OpenGl_LineAttributes : public OpenGl_Resource { diff --git a/src/OpenGl/OpenGl_PointSprite.hxx b/src/OpenGl/OpenGl_PointSprite.hxx index a841f9ad82..29aac6906b 100755 --- a/src/OpenGl/OpenGl_PointSprite.hxx +++ b/src/OpenGl/OpenGl_PointSprite.hxx @@ -16,7 +16,6 @@ #define _OpenGl_PointSprite_H__ #include -#include //! Point sprite resource. On modern hardware it will be texture with extra parameters. //! On ancient hardware sprites will be drawn using bitmaps. diff --git a/src/OpenGl/OpenGl_PrimitiveArray.hxx b/src/OpenGl/OpenGl_PrimitiveArray.hxx index 261da15002..aa8b083671 100644 --- a/src/OpenGl/OpenGl_PrimitiveArray.hxx +++ b/src/OpenGl/OpenGl_PrimitiveArray.hxx @@ -28,7 +28,6 @@ #include class OpenGl_GraphicDriver; -class Handle(OpenGl_ShaderProgram); //! Class for rendering of arbitrary primitive array. class OpenGl_PrimitiveArray : public OpenGl_Element diff --git a/src/OpenGl/OpenGl_PrinterContext.hxx b/src/OpenGl/OpenGl_PrinterContext.hxx index fbe7dd75f7..f9e9777f95 100644 --- a/src/OpenGl/OpenGl_PrinterContext.hxx +++ b/src/OpenGl/OpenGl_PrinterContext.hxx @@ -18,7 +18,6 @@ #include #include -#include #include //! Class provides specific information for redrawing view to offscreen buffer diff --git a/src/OpenGl/OpenGl_Resource.hxx b/src/OpenGl/OpenGl_Resource.hxx index c4e70ae316..5e908d66db 100644 --- a/src/OpenGl/OpenGl_Resource.hxx +++ b/src/OpenGl/OpenGl_Resource.hxx @@ -19,7 +19,6 @@ #include class Standard_Transient; -class Handle(Standard_Type); class OpenGl_Context; //! Interface for OpenGl resource with following meaning: diff --git a/src/OpenGl/OpenGl_Sampler.hxx b/src/OpenGl/OpenGl_Sampler.hxx index b44060bba7..57319f60cd 100644 --- a/src/OpenGl/OpenGl_Sampler.hxx +++ b/src/OpenGl/OpenGl_Sampler.hxx @@ -17,7 +17,6 @@ #define OPENGL_SAMPLER_H #include -#include //! Class implements OpenGL sampler object resource that //! stores the sampling parameters for a texture access. diff --git a/src/OpenGl/OpenGl_ShaderManager.hxx b/src/OpenGl/OpenGl_ShaderManager.hxx index 999aae5cba..6b4ecb5d7b 100644 --- a/src/OpenGl/OpenGl_ShaderManager.hxx +++ b/src/OpenGl/OpenGl_ShaderManager.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/src/OpenGl/OpenGl_ShaderObject.hxx b/src/OpenGl/OpenGl_ShaderObject.hxx index 6ae9288e0f..432df4dce5 100755 --- a/src/OpenGl/OpenGl_ShaderObject.hxx +++ b/src/OpenGl/OpenGl_ShaderObject.hxx @@ -16,7 +16,6 @@ #ifndef _OpenGl_ShaderObject_Header #define _OpenGl_ShaderObject_Header -#include #include #include #include diff --git a/src/OpenGl/OpenGl_ShaderProgram.hxx b/src/OpenGl/OpenGl_ShaderProgram.hxx index 45b05eeb86..10eb0fddfa 100755 --- a/src/OpenGl/OpenGl_ShaderProgram.hxx +++ b/src/OpenGl/OpenGl_ShaderProgram.hxx @@ -28,7 +28,6 @@ #include #include #include -#include //! The enumeration of OCCT-specific OpenGL/GLSL variables. enum OpenGl_StateVariable diff --git a/src/OpenGl/OpenGl_Text.hxx b/src/OpenGl/OpenGl_Text.hxx index 68d8514a51..f33663ec6a 100755 --- a/src/OpenGl/OpenGl_Text.hxx +++ b/src/OpenGl/OpenGl_Text.hxx @@ -27,7 +27,6 @@ #include #include -class Handle(OpenGl_PrinterContext); //! Text rendering class OpenGl_Text : public OpenGl_Element diff --git a/src/OpenGl/OpenGl_Texture.hxx b/src/OpenGl/OpenGl_Texture.hxx index 6c3c4e521b..20f8f0095d 100644 --- a/src/OpenGl/OpenGl_Texture.hxx +++ b/src/OpenGl/OpenGl_Texture.hxx @@ -17,11 +17,8 @@ #include #include -#include #include -#include -class Handle(OpenGl_Context); class OpenGl_Context; class Image_PixMap; diff --git a/src/OpenGl/OpenGl_View.hxx b/src/OpenGl/OpenGl_View.hxx index 36a4e28a3c..281595e0fb 100644 --- a/src/OpenGl/OpenGl_View.hxx +++ b/src/OpenGl/OpenGl_View.hxx @@ -48,11 +48,6 @@ #include #include -#include -#include -#include -#include -#include 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 diff --git a/src/OpenGl/OpenGl_Window.hxx b/src/OpenGl/OpenGl_Window.hxx index b66b66d07c..3ab376902e 100644 --- a/src/OpenGl/OpenGl_Window.hxx +++ b/src/OpenGl/OpenGl_Window.hxx @@ -20,9 +20,6 @@ #include #include -#include -#include -#include #include diff --git a/src/OpenGl/OpenGl_Workspace.hxx b/src/OpenGl/OpenGl_Workspace.hxx index 1cd74bf913..4256c5dafb 100644 --- a/src/OpenGl/OpenGl_Workspace.hxx +++ b/src/OpenGl/OpenGl_Workspace.hxx @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -29,7 +28,6 @@ #include #include #include -#include #include #include @@ -53,8 +51,6 @@ #include #include -#include -#include #include #include diff --git a/src/Poly/Poly_CoherentTriangulation.hxx b/src/Poly/Poly_CoherentTriangulation.hxx index 72b6cc3e05..8b703185bf 100644 --- a/src/Poly/Poly_CoherentTriangulation.hxx +++ b/src/Poly/Poly_CoherentTriangulation.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(Poly_CoherentTriangulation); class Poly_CoherentTriangulation; template class NCollection_List; diff --git a/src/Poly/Poly_MakeLoops.hxx b/src/Poly/Poly_MakeLoops.hxx index 2feb2b1598..7e954e9525 100644 --- a/src/Poly/Poly_MakeLoops.hxx +++ b/src/Poly/Poly_MakeLoops.hxx @@ -23,7 +23,6 @@ #include #include -class Handle(NCollection_IncAllocator); /** * Make loops from a set of connected links. A link is represented by diff --git a/src/Prs3d/Prs3d_Drawer.hxx b/src/Prs3d/Prs3d_Drawer.hxx index ace291092f..37f96cdce1 100644 --- a/src/Prs3d/Prs3d_Drawer.hxx +++ b/src/Prs3d/Prs3d_Drawer.hxx @@ -18,21 +18,12 @@ #include #include -#include #include #include -#include -#include -#include #include #include #include -#include #include -#include -#include -#include -#include #include #include #include diff --git a/src/Prs3d/Prs3d_WFShape.hxx b/src/Prs3d/Prs3d_WFShape.hxx index 67d4911b74..13d9c1ba0b 100755 --- a/src/Prs3d/Prs3d_WFShape.hxx +++ b/src/Prs3d/Prs3d_WFShape.hxx @@ -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 { diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 2b9e9bf99c..816e6a4fdb 100755 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -1975,7 +1975,6 @@ static Standard_Integer OCC24667 (Draw_Interpretor& di, Standard_Integer n, cons return 0; } -#include #include #include #include @@ -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()) { diff --git a/src/Select3D/Select3D_EntitySequence.hxx b/src/Select3D/Select3D_EntitySequence.hxx index 68e4e3ab5e..d1a22802a1 100644 --- a/src/Select3D/Select3D_EntitySequence.hxx +++ b/src/Select3D/Select3D_EntitySequence.hxx @@ -3,7 +3,6 @@ #include -class Handle(Select3D_SensitiveEntity); typedef NCollection_Sequence Select3D_EntitySequence; typedef NCollection_Sequence::Iterator Select3D_EntitySequenceIter; diff --git a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx index 8742a5d757..b1cc2b8d79 100644 --- a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx +++ b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx @@ -18,7 +18,6 @@ #include -#include #include #include @@ -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 }; diff --git a/src/Select3D/Select3D_SensitiveBox.hxx b/src/Select3D/Select3D_SensitiveBox.hxx index f1c0969d73..2990a47087 100644 --- a/src/Select3D/Select3D_SensitiveBox.hxx +++ b/src/Select3D/Select3D_SensitiveBox.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/Select3D/Select3D_SensitiveCircle.hxx b/src/Select3D/Select3D_SensitiveCircle.hxx index 97ba0f724c..7fb88cb2c0 100644 --- a/src/Select3D/Select3D_SensitiveCircle.hxx +++ b/src/Select3D/Select3D_SensitiveCircle.hxx @@ -25,8 +25,6 @@ #include #include -#include -#include #include #include #include @@ -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 }; diff --git a/src/Select3D/Select3D_SensitiveCurve.hxx b/src/Select3D/Select3D_SensitiveCurve.hxx index 866e7b8fe0..f2a5aa1add 100644 --- a/src/Select3D/Select3D_SensitiveCurve.hxx +++ b/src/Select3D/Select3D_SensitiveCurve.hxx @@ -22,9 +22,7 @@ #include #include -#include #include -#include #include #include #include @@ -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) diff --git a/src/Select3D/Select3D_SensitiveEntity.hxx b/src/Select3D/Select3D_SensitiveEntity.hxx index 435cd7d188..9d6f3126b6 100644 --- a/src/Select3D/Select3D_SensitiveEntity.hxx +++ b/src/Select3D/Select3D_SensitiveEntity.hxx @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -31,7 +30,6 @@ #include class Select3D_SensitiveEntity; -class Handle(Select3D_SensitiveEntity); class SelectBasics_EntityOwner; //! Abstract framework to define 3D sensitive entities. diff --git a/src/Select3D/Select3D_SensitiveFace.hxx b/src/Select3D/Select3D_SensitiveFace.hxx index 9aa6c277d3..85e4e94c43 100644 --- a/src/Select3D/Select3D_SensitiveFace.hxx +++ b/src/Select3D/Select3D_SensitiveFace.hxx @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/src/Select3D/Select3D_SensitiveGroup.hxx b/src/Select3D/Select3D_SensitiveGroup.hxx index 2b583c91d1..beccfc838f 100644 --- a/src/Select3D/Select3D_SensitiveGroup.hxx +++ b/src/Select3D/Select3D_SensitiveGroup.hxx @@ -25,7 +25,6 @@ #include #include #include -#include #include class SelectBasics_EntityOwner; diff --git a/src/Select3D/Select3D_SensitivePoint.hxx b/src/Select3D/Select3D_SensitivePoint.hxx index b11e41698f..7d0acd65d5 100644 --- a/src/Select3D/Select3D_SensitivePoint.hxx +++ b/src/Select3D/Select3D_SensitivePoint.hxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/src/Select3D/Select3D_SensitivePoly.hxx b/src/Select3D/Select3D_SensitivePoly.hxx index 54db03cdb6..23e48b82ce 100644 --- a/src/Select3D/Select3D_SensitivePoly.hxx +++ b/src/Select3D/Select3D_SensitivePoly.hxx @@ -28,7 +28,6 @@ #include #include -#include 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 }; diff --git a/src/Select3D/Select3D_SensitiveSegment.hxx b/src/Select3D/Select3D_SensitiveSegment.hxx index 48882a7777..4a86e7f550 100644 --- a/src/Select3D/Select3D_SensitiveSegment.hxx +++ b/src/Select3D/Select3D_SensitiveSegment.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Select3D/Select3D_SensitiveTriangle.hxx b/src/Select3D/Select3D_SensitiveTriangle.hxx index 2a63c1f052..f1f6af8d3e 100644 --- a/src/Select3D/Select3D_SensitiveTriangle.hxx +++ b/src/Select3D/Select3D_SensitiveTriangle.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/Select3D/Select3D_SensitiveTriangulation.hxx b/src/Select3D/Select3D_SensitiveTriangulation.hxx index 4b3b16410c..a6b2741b6f 100644 --- a/src/Select3D/Select3D_SensitiveTriangulation.hxx +++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -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 }; diff --git a/src/Select3D/Select3D_SensitiveWire.hxx b/src/Select3D/Select3D_SensitiveWire.hxx index 3f510b97ed..792b3bf817 100644 --- a/src/Select3D/Select3D_SensitiveWire.hxx +++ b/src/Select3D/Select3D_SensitiveWire.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -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 diff --git a/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx b/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx index 1ae2dbc153..b95ef5df64 100644 --- a/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx +++ b/src/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx @@ -20,7 +20,6 @@ #include class SelectMgr_EntityOwner; -class Handle(SelectMgr_EntityOwner); typedef NCollection_IndexedMap SelectMgr_IndexedMapOfOwner; typedef NCollection_Handle > Handle(SelectMgr_IndexedMapOfOwner); diff --git a/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx b/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx index 671f99654f..76ccc209c0 100644 --- a/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx +++ b/src/SelectMgr/SelectMgr_SelectableObjectSet.hxx @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/SelectMgr/SelectMgr_Selection.hxx b/src/SelectMgr/SelectMgr_Selection.hxx index 766fe2cf73..51c3ad82d4 100644 --- a/src/SelectMgr/SelectMgr_Selection.hxx +++ b/src/SelectMgr/SelectMgr_Selection.hxx @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx index e58e86e0cc..522fe4dbcf 100644 --- a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx +++ b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx @@ -17,7 +17,6 @@ #define _SelectMgr_SensitiveEntity_HeaderFile #include -#include #include #include diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.hxx b/src/SelectMgr/SelectMgr_ViewerSelector.hxx index 93a8209210..bbe7170118 100644 --- a/src/SelectMgr/SelectMgr_ViewerSelector.hxx +++ b/src/SelectMgr/SelectMgr_ViewerSelector.hxx @@ -36,10 +36,8 @@ #include #include #include -#include #include #include -#include 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 //! 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; diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx index c6fa5c061e..9f0ca22b4b 100644 --- a/src/ShapeFix/ShapeFix_Wire.cxx +++ b/src/ShapeFix/ShapeFix_Wire.cxx @@ -109,7 +109,6 @@ #include #include -#include #include #include #include diff --git a/src/Standard/Standard_Handle.hxx b/src/Standard/Standard_Handle.hxx index 4ada0c8a4a..a89dc29256 100644 --- a/src/Standard/Standard_Handle.hxx +++ b/src/Standard/Standard_Handle.hxx @@ -259,7 +259,7 @@ inline Standard_Integer HashCode (const Handle(T)& theHandle, const Standard_Int return ::HashCode (const_cast(static_cast(theHandle.get())), theUpper); } -//! For compatibility with previous versions of OCCT, defines typedef opencascade::handle Handle_Class +//! For compatibility with previous versions of OCCT, defines typedef opencascade::handle 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) diff --git a/src/StdPrs/StdPrs_ToolShadedShape.hxx b/src/StdPrs/StdPrs_ToolShadedShape.hxx index 650db6bd3c..fe29f3118d 100644 --- a/src/StdPrs/StdPrs_ToolShadedShape.hxx +++ b/src/StdPrs/StdPrs_ToolShadedShape.hxx @@ -17,7 +17,6 @@ #include #include #include -#include #include class TopoDS_Shape; @@ -40,7 +39,7 @@ public: //! @return true if shape is closed manifold Solid or compound of such Solids.
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, diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.hxx b/src/StdSelect/StdSelect_ViewerSelector3d.hxx index 5dbe23e670..7e3260a9fc 100644 --- a/src/StdSelect/StdSelect_ViewerSelector3d.hxx +++ b/src/StdSelect/StdSelect_ViewerSelector3d.hxx @@ -21,13 +21,9 @@ #include #include -#include -#include #include #include #include -#include -#include #include 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; }; diff --git a/src/TDF/TDF_AttributeIndexedMap.hxx b/src/TDF/TDF_AttributeIndexedMap.hxx index b6e99d9e01..a8974f1e86 100644 --- a/src/TDF/TDF_AttributeIndexedMap.hxx +++ b/src/TDF/TDF_AttributeIndexedMap.hxx @@ -16,7 +16,6 @@ #ifndef TDF_AttributeIndexedMap_HeaderFile #define TDF_AttributeIndexedMap_HeaderFile -#include #include #include diff --git a/src/TDF/TDF_LabelNode.hxx b/src/TDF/TDF_LabelNode.hxx index 507984821c..4be1660e60 100644 --- a/src/TDF/TDF_LabelNode.hxx +++ b/src/TDF/TDF_LabelNode.hxx @@ -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 diff --git a/src/TObj/TObj_Application.hxx b/src/TObj/TObj_Application.hxx index ee3eac6596..4d11a55eb2 100644 --- a/src/TObj/TObj_Application.hxx +++ b/src/TObj/TObj_Application.hxx @@ -24,7 +24,6 @@ #include #include -class Handle(TObj_Application); //! //! This is a base class for OCAF based TObj models diff --git a/src/TObj/TObj_Assistant.hxx b/src/TObj/TObj_Assistant.hxx index faaaf9d572..58a907178b 100644 --- a/src/TObj/TObj_Assistant.hxx +++ b/src/TObj/TObj_Assistant.hxx @@ -23,7 +23,6 @@ #include #include -class Handle(TObj_Model); //! This class provides interface to the static data //! to be used during save or load models. diff --git a/src/TObj/TObj_Model.hxx b/src/TObj/TObj_Model.hxx index 412509515d..0a84d38e79 100644 --- a/src/TObj/TObj_Model.hxx +++ b/src/TObj/TObj_Model.hxx @@ -18,20 +18,12 @@ #ifndef TObj_Model_HeaderFile #define TObj_Model_HeaderFile -#include #include #include #include -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. diff --git a/src/TObj/TObj_ModelIterator.hxx b/src/TObj/TObj_ModelIterator.hxx index e85f476810..577021fb4f 100644 --- a/src/TObj/TObj_ModelIterator.hxx +++ b/src/TObj/TObj_ModelIterator.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(TObj_Model); /** * This class provides an iterator by all objects in the model. diff --git a/src/TObj/TObj_Object.hxx b/src/TObj/TObj_Object.hxx index 660149e10d..faa07f74ef 100644 --- a/src/TObj/TObj_Object.hxx +++ b/src/TObj/TObj_Object.hxx @@ -21,21 +21,12 @@ #include #include #include -#include -#include #include #include 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 diff --git a/src/TObj/TObj_ObjectIterator.hxx b/src/TObj/TObj_ObjectIterator.hxx index ed404c3c62..6add161ad7 100644 --- a/src/TObj/TObj_ObjectIterator.hxx +++ b/src/TObj/TObj_ObjectIterator.hxx @@ -20,7 +20,6 @@ #include -class Handle(TObj_Object); /** * This class provides an iterator by objects in a partition. diff --git a/src/TObj/TObj_Partition.hxx b/src/TObj/TObj_Partition.hxx index 80c6a6bf17..6358bef01f 100644 --- a/src/TObj/TObj_Partition.hxx +++ b/src/TObj/TObj_Partition.hxx @@ -21,8 +21,6 @@ #include #include -class Handle(TCollection_HExtendedString); -class Handle(TObj_Partition); /** * This class privides tool handling one of partitions (the set of diff --git a/src/TObj/TObj_Persistence.hxx b/src/TObj/TObj_Persistence.hxx index 70fbe6017d..89590ad767 100644 --- a/src/TObj/TObj_Persistence.hxx +++ b/src/TObj/TObj_Persistence.hxx @@ -21,7 +21,6 @@ #include 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 diff --git a/src/TObj/TObj_SequenceOfObject.hxx b/src/TObj/TObj_SequenceOfObject.hxx index 2902e41727..cb4a039d63 100644 --- a/src/TObj/TObj_SequenceOfObject.hxx +++ b/src/TObj/TObj_SequenceOfObject.hxx @@ -22,7 +22,6 @@ #include #include -#include typedef NCollection_Sequence TObj_SequenceOfObject; diff --git a/src/TObj/TObj_TIntSparseArray.hxx b/src/TObj/TObj_TIntSparseArray.hxx index 921725b54f..212b309ad5 100644 --- a/src/TObj/TObj_TIntSparseArray.hxx +++ b/src/TObj/TObj_TIntSparseArray.hxx @@ -27,9 +27,7 @@ typedef NCollection_SparseArray TObj_TIntSparseArray_VecOfData; typedef NCollection_SparseArray 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. diff --git a/src/TObj/TObj_TModel.hxx b/src/TObj/TObj_TModel.hxx index 60d6b79638..eadfaa770b 100644 --- a/src/TObj/TObj_TModel.hxx +++ b/src/TObj/TObj_TModel.hxx @@ -19,10 +19,7 @@ #define TObj_TModel_HeaderFile #include -#include -class Handle(TDF_RelocationTable); -class Handle(TObj_TModel); /** * Attribute to store OCAF-based models in OCAF tree diff --git a/src/TObj/TObj_TNameContainer.hxx b/src/TObj/TObj_TNameContainer.hxx index c5a2f6a746..e3e861e19b 100644 --- a/src/TObj/TObj_TNameContainer.hxx +++ b/src/TObj/TObj_TNameContainer.hxx @@ -22,8 +22,6 @@ #include #include -class Handle(TCollection_HExtendedString); -class Handle(TObj_TNameContainer); /** * This class provides OCAF Attribute to storing the unique names of object in diff --git a/src/TObj/TObj_TObject.hxx b/src/TObj/TObj_TObject.hxx index 256de8f5ed..891ed08d9f 100644 --- a/src/TObj/TObj_TObject.hxx +++ b/src/TObj/TObj_TObject.hxx @@ -23,10 +23,8 @@ #include -class Handle(TObj_TObject); class Standard_GUID; class TDF_Label; -class Handle(TDF_RelocationTable); /** * Purpose: OCAF Attribute to storing objects (interfaces) of OCAF-based diff --git a/src/TObj/TObj_TReference.hxx b/src/TObj/TObj_TReference.hxx index 3dd32a2016..aa0c5fa8c0 100644 --- a/src/TObj/TObj_TReference.hxx +++ b/src/TObj/TObj_TReference.hxx @@ -22,10 +22,7 @@ #include #include -class Handle(TObj_TReference); -class Handle(TObj_Object); class Standard_GUID; -class Handle(TDF_RelocationTable); /** * Attribute for storing references to the objects which implement diff --git a/src/TObj/TObj_TXYZ.hxx b/src/TObj/TObj_TXYZ.hxx index af5b17ec59..9c7709076d 100644 --- a/src/TObj/TObj_TXYZ.hxx +++ b/src/TObj/TObj_TXYZ.hxx @@ -24,10 +24,8 @@ #include -class Handle(TObj_TXYZ); class Standard_GUID; class TDF_Label; -class Handle(TDF_RelocationTable); /* * Attribute for storing gp_XYZ diff --git a/src/TObjDRAW/TObjDRAW.cxx b/src/TObjDRAW/TObjDRAW.cxx index fa2fea8313..46f5cd20a9 100644 --- a/src/TObjDRAW/TObjDRAW.cxx +++ b/src/TObjDRAW/TObjDRAW.cxx @@ -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 diff --git a/src/ViewerTest/ViewerTest.hxx b/src/ViewerTest/ViewerTest.hxx index 96800dfaba..09c0cec4a8 100644 --- a/src/ViewerTest/ViewerTest.hxx +++ b/src/ViewerTest/ViewerTest.hxx @@ -22,17 +22,11 @@ #include #include #include -#include #include -#include #include #include -#include #include #include -#include -#include -#include #include class TCollection_AsciiString; diff --git a/src/VrmlData/VrmlData_Node.hxx b/src/VrmlData/VrmlData_Node.hxx index c37c1609d9..f869fc4586 100644 --- a/src/VrmlData/VrmlData_Node.hxx +++ b/src/VrmlData/VrmlData_Node.hxx @@ -30,7 +30,6 @@ struct VrmlData_InBuffer; class VrmlData_Scene; class gp_XY; class gp_XYZ; -class Handle(VrmlData_Node); class TCollection_AsciiString; /** diff --git a/src/VrmlData/VrmlData_Scene.hxx b/src/VrmlData/VrmlData_Scene.hxx index 380e284703..6dbde261cb 100644 --- a/src/VrmlData/VrmlData_Scene.hxx +++ b/src/VrmlData/VrmlData_Scene.hxx @@ -29,7 +29,6 @@ #include struct VrmlData_InBuffer; -class Handle(VrmlData_WorldInfo); class VrmlData_DataMapOfShapeAppearance; /** diff --git a/src/VrmlData/VrmlData_ShapeConvert.hxx b/src/VrmlData/VrmlData_ShapeConvert.hxx index fde244378b..cd6cda63f3 100644 --- a/src/VrmlData/VrmlData_ShapeConvert.hxx +++ b/src/VrmlData/VrmlData_ShapeConvert.hxx @@ -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. */ diff --git a/src/XmlTObjDrivers/XmlTObjDrivers.hxx b/src/XmlTObjDrivers/XmlTObjDrivers.hxx index c93ecbe28c..d1c6c72ea0 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers.hxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers.hxx @@ -21,8 +21,6 @@ #include #include -class Handle(XmlMDF_ADriverTable); -class Handle(CDM_MessageDriver); // Class for registering storage/retrieval drivers for TObj XML persistence // diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx index dc7f3ad7e8..4bc126be88 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(CDM_MessageDriver); // Retrieval driver of a TObj XML document // diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx index fb803b71ca..a6496b22f9 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx @@ -22,7 +22,6 @@ #include #include -class Handle(CDM_MessageDriver); // Block of comments describing class XmlTObjDrivers_DocumentStorageDriver //