0024710: Avoid including Handle_Class.hxx headers except where necessary

Includes of Handle*.hxx headers replaced by include of corresponding class (where possible without redesign of the classes).

Minor correction against compiler warning (vc10 64-bit) in BOPAlgo

Remove double header inclusions

Correction of minor mistake

diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx
index 6f9937ccc7150a9a580f3ed255162d53b40d46bd..2d26a7fc99f335dbe9c9f5bc628645cc637100c7 100644 (file)
--- a/src/AIS/AIS_Line.cxx
+++ b/src/AIS/AIS_Line.cxx
@@ -31,10 +31,11 @@
 #include <GeomAdaptor_Curve.hxx>
 #include <AIS_Drawer.hxx>
 #include <GC_MakeSegment.hxx>
-#include <Handle_Geom_Line.hxx>
+#include <Geom_Line.hxx>
 #include <Quantity_Color.hxx>
 #include <AIS_GraphicTool.hxx>
 #include <UnitsAPI.hxx>
+
 //==================================================================
 // function: FindLimits
 // purpose:

diff --git a/src/AIS/AIS_TexturedShape.hxx b/src/AIS/AIS_TexturedShape.hxx
index d6f457bac8f6a366ac76b03fb72d933c6ffef340..8bec8f2a090a8357a4438743d313d2d8772ff0c5 100644 (file)
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@@ -22,10 +22,10 @@
 #include <Image_PixMap.hxx>
 #include <Standard_DefineHandle.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Handle_Graphic3d_AspectFillArea3d.hxx>
-#include <Handle_Graphic3d_Texture2Dmanual.hxx>
-#include <Handle_Prs3d_Presentation.hxx>
-#include <Handle_PrsMgr_PresentationManager3d.hxx>
+#include <Graphic3d_AspectFillArea3d.hxx>
+#include <Graphic3d_Texture2Dmanual.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
 
 class Graphic3d_AspectFillArea3d;
 class Graphic3d_Texture2Dmanual;

diff --git a/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx b/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx
index bae9e9d7b27496068dc2386c8a649ad77875d815..39aa5e86438f538d2359844aae05cb99d4ddd141 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx
+++ b/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx
@@ -22,10 +22,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 
 
 inline Standard_Real Adaptor3d_HSurfaceTool::FirstUParameter(const Handle(Adaptor3d_HSurface)& Surf)

diff --git a/src/Aspect/Aspect_DisplayConnection_Handle.hxx b/src/Aspect/Aspect_DisplayConnection_Handle.hxx
index 528188b88c735a793909125977d73c6438f6ddd2..fa0676fbf7b10423248dbf8d060a955f511fde3d 100755 (executable)
--- a/src/Aspect/Aspect_DisplayConnection_Handle.hxx
+++ b/src/Aspect/Aspect_DisplayConnection_Handle.hxx
@@ -14,7 +14,7 @@
 #ifndef _Aspect_DisplayConnection_Handle_H__
 #define _Aspect_DisplayConnection_Handle_H__
 
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 class Aspect_DisplayConnection;
 DEFINE_STANDARD_HANDLE(Aspect_DisplayConnection, Standard_Transient)

diff --git a/src/Aspect/Aspect_GraphicCallbackProc.hxx b/src/Aspect/Aspect_GraphicCallbackProc.hxx
index 1ff4e494aa55d8ed165e62fb44ddc290d70283a9..adeb3cdc835139a46ef64a41e1fa27b0905257ac 100644 (file)
--- a/src/Aspect/Aspect_GraphicCallbackProc.hxx
+++ b/src/Aspect/Aspect_GraphicCallbackProc.hxx
@@ -17,7 +17,7 @@
 #include <Aspect_Display.hxx>
 #include <Aspect_Drawable.hxx>
 #include <Aspect_RenderingContext.hxx>
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 // The flags below provide additional information to define the moment when
 // callback was invoked in redraw procedure. These flags are bitwise OR'ed

diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
index d2f76b1dd5fc9040f4be0bc399d23de79a5c4846..dca01224fee4ff9b1fa01b7cf072464fddbb1265 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
@@ -115,8 +115,8 @@ class BOPAlgo_EdgeEdgeFunctor {
     : myPVEE(&aVEE) {
   }
   //
-  void operator()( const flexible_range<Standard_Size>& aBR ) const{
-    Standard_Size i, iBeg, iEnd;
+  void operator()( const flexible_range<Standard_Integer>& aBR ) const{
+    Standard_Integer i, iBeg, iEnd;
     //
     BOPAlgo_VectorOfEdgeEdge& aVEE=*myPVEE;
     //
@@ -142,13 +142,13 @@ class BOPAlgo_EdgeEdgeCnt {
                         BOPAlgo_VectorOfEdgeEdge& aVEdgeEdge) {
     //
     BOPAlgo_EdgeEdgeFunctor aEEF(aVEdgeEdge);
-    Standard_Size aNbEE=aVEdgeEdge.Extent();
+    Standard_Integer aNbEE=aVEdgeEdge.Extent();
     //
     if (bRunParallel) {
-      flexible_for(flexible_range<Standard_Size>(0,aNbEE), aEEF);
+      flexible_for(flexible_range<Standard_Integer>(0,aNbEE), aEEF);
     }
     else {
-      aEEF.operator()(flexible_range<Standard_Size>(0,aNbEE));
+      aEEF.operator()(flexible_range<Standard_Integer>(0,aNbEE));
     }
   }
 };

diff --git a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx
index 25d8bb53273359634c0613c4b5164621be6a0e0d..7f2ae2af72a704130bbe05808640e2e96109bfbc 100644 (file)
--- a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_DataMap.hxx>
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 #include <BOPDS_ListOfPaveBlock.hxx>
 
 typedef NCollection_DataMap<Handle(BOPDS_PaveBlock), BOPDS_ListOfPaveBlock, TColStd_MapTransientHasher> BOPDS_DataMapOfPaveBlockListOfPaveBlock; 

diff --git a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx
index 6c7672ed696a92bfa4e53ce0b07d056901e310b8..2394fdecb0a1bdc367b3bae3bbd82ece9c774e33 100644 (file)
--- a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_IndexedDataMap.hxx>
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 #include <BOPDS_ListOfPaveBlock.hxx>
 
 typedef NCollection_IndexedDataMap<Handle(BOPDS_PaveBlock), BOPDS_ListOfPaveBlock, TColStd_MapTransientHasher> BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock; 

diff --git a/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx b/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx
index 05fae2e26f51d92eb8b4d7555d1f9f34d16eb7fc..0c9d5782e5656aea23e83b6049d8db7cd98c66ba 100644 (file)
--- a/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_IndexedMap.hxx>   
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 
 typedef NCollection_IndexedMap<Handle(BOPDS_PaveBlock), TColStd_MapTransientHasher> BOPDS_IndexedMapOfPaveBlock; 
 

diff --git a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx
index 0d60b05cb0ccd8eac123e334054b66e095badd55..88f21a0661ccbce0d046ee0c760d167b32d08dba 100644 (file)
--- a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx
@@ -16,7 +16,7 @@
 #define BOPDS_ListOfPaveBlock_HeaderFile
 
 #include <NCollection_List.hxx>   
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 class BOPDS_PaveBlock;
 
 typedef NCollection_List<Handle(BOPDS_PaveBlock)> BOPDS_ListOfPaveBlock; 

diff --git a/src/BOPDS/BOPDS_MapOfCommonBlock.hxx b/src/BOPDS/BOPDS_MapOfCommonBlock.hxx
index 964ea0920646e230a8374f45168f58b1dd44a01e..40e7ae51a94db03f18512ac11cc985c62e390838 100644 (file)
--- a/src/BOPDS/BOPDS_MapOfCommonBlock.hxx
+++ b/src/BOPDS/BOPDS_MapOfCommonBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_Map.hxx>   
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_CommonBlock.hxx>   
+#include <BOPDS_CommonBlock.hxx>   
 
 typedef NCollection_Map<Handle(BOPDS_CommonBlock), TColStd_MapTransientHasher> BOPDS_MapOfCommonBlock; 
 typedef BOPDS_MapOfCommonBlock::Iterator BOPDS_MapIteratorOfMapOfCommonBlock;  

diff --git a/src/BOPDS/BOPDS_MapOfPaveBlock.hxx b/src/BOPDS/BOPDS_MapOfPaveBlock.hxx
index 80b1c276d06aeb028016de37bdbae9aba3d75e14..b7b9c07735a610d2a2e21c1aa24750b7db3748c9 100644 (file)
--- a/src/BOPDS/BOPDS_MapOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_MapOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_Map.hxx>   
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 
 typedef NCollection_Map<Handle(BOPDS_PaveBlock), TColStd_MapTransientHasher> BOPDS_MapOfPaveBlock; 
 typedef BOPDS_MapOfPaveBlock::Iterator BOPDS_MapIteratorOfMapOfPaveBlock;  

diff --git a/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx b/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx
index 31dc16e6709c9d3bbc48daabe85b7a49c2e0a726..b83e77d488f09919bed9b78f9d0307ec4002176f 100644 (file)
--- a/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx
+++ b/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx
@@ -24,10 +24,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 
 
 

diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx b/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx
index 562f7037081c4f4d09e9260fef02096cde076f4d..b8c4575f0fa52673fce0ef57e36c759137d752a7 100644 (file)
--- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx
+++ b/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx b/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx
index 750b06113b02b72f3ffd83ffcf35744a42a3bd2f..afdd09a99a71c530806ff78fe8fc3c70dbb0449e 100644 (file)
--- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx
+++ b/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr2d.hxx>
 
 
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.gxx b/src/BRepBlend/BRepBlend_HCurveToolGen.gxx
index 9dd43fc7a27e32395eac297cfd8059401406a06a..00b5da8aed75abcfafff592b22caa8ed81ce4c59 100644 (file)
--- a/src/BRepBlend/BRepBlend_HCurveToolGen.gxx
+++ b/src/BRepBlend/BRepBlend_HCurveToolGen.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.lxx b/src/BRepBlend/BRepBlend_HCurveToolGen.lxx
index 6ef8471bfa5678e3559eb729052520eee5f0ce49..789aebdf8769cd7671438412034731b81eaff02e 100644 (file)
--- a/src/BRepBlend/BRepBlend_HCurveToolGen.lxx
+++ b/src/BRepBlend/BRepBlend_HCurveToolGen.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr.hxx>
 
 
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/BRepExtrema/BRepExtrema_ExtCC.hxx b/src/BRepExtrema/BRepExtrema_ExtCC.hxx
index fa2e4316d74e238f9f4a92c762a1a6910f9acd7d..a397eb789d24ec92e93cc937bed98c02665038ef 100644 (file)
--- a/src/BRepExtrema/BRepExtrema_ExtCC.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtCC.hxx
@@ -28,7 +28,7 @@
 #include <Extrema_ExtCC.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HCurve_HeaderFile
-#include <Handle_BRepAdaptor_HCurve.hxx>
+#include <BRepAdaptor_HCurve.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>

diff --git a/src/BRepExtrema/BRepExtrema_ExtCF.hxx b/src/BRepExtrema/BRepExtrema_ExtCF.hxx
index c6d7532f192f0736b960111acd7c4c51c6fbaa62..24247e461b6f0fcab36c1d510011241b89ccd3c3 100644 (file)
--- a/src/BRepExtrema/BRepExtrema_ExtCF.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtCF.hxx
@@ -40,7 +40,7 @@
 #include <Extrema_SequenceOfPOnCurv.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HSurface_HeaderFile
-#include <Handle_BRepAdaptor_HSurface.hxx>
+#include <BRepAdaptor_HSurface.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>

diff --git a/src/BRepExtrema/BRepExtrema_ExtFF.hxx b/src/BRepExtrema/BRepExtrema_ExtFF.hxx
index db8a587c630d94a8aa59c71a07962912b5cad0c6..d14c52ca8774a60fe1bacda4d8cfe420dcc0cd97 100644 (file)
--- a/src/BRepExtrema/BRepExtrema_ExtFF.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtFF.hxx
@@ -37,7 +37,7 @@
 #include <Extrema_SequenceOfPOnSurf.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HSurface_HeaderFile
-#include <Handle_BRepAdaptor_HSurface.hxx>
+#include <BRepAdaptor_HSurface.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>

diff --git a/src/BRepExtrema/BRepExtrema_ExtPC.hxx b/src/BRepExtrema/BRepExtrema_ExtPC.hxx
index 94c7f3ffcdd9fee42ed626b134fbb060f793f33d..a0ddc68001aaf5ec70475283fc4560efd39ff788 100644 (file)
--- a/src/BRepExtrema/BRepExtrema_ExtPC.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtPC.hxx
@@ -28,7 +28,7 @@
 #include <Extrema_ExtPC.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HCurve_HeaderFile
-#include <Handle_BRepAdaptor_HCurve.hxx>
+#include <BRepAdaptor_HCurve.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>

diff --git a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
index 6c5358660de780c6bece39262924c65d1d877469..7a64f23906ff6e00f5527c54d69969b2b122370b 100644 (file)
--- a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
+++ b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
@@ -36,7 +36,7 @@
 #include <TColStd_Array2OfBoolean.hxx>
 #endif
 #ifndef _Handle_BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep_HeaderFile
-#include <Handle_BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep.hxx>
+#include <BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep.hxx>
 #endif
 #ifndef _TopAbs_Orientation_HeaderFile
 #include <TopAbs_Orientation.hxx>

diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
index f4d9856d5bbbf65c29db4d540653ca8b3595e95b..c3084c0552de7c8ed6fbff75e820c5f9c895edb6 100644 (file)
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <BinLDrivers_DocumentRetrievalDriver.hxx>
-#include <Handle_BinMDF_ADriverTable.hxx>
+#include <BinMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);
 

diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
index b17d11bc9e7ec7cc6ba640823892415d985c0a65..c5a4c6bb46667d18cd86b6154a0baaee4280f1ab 100644 (file)
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <BinLDrivers_DocumentStorageDriver.hxx>
-#include <Handle_BinMDF_ADriverTable.hxx>
+#include <BinMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);
 

diff --git a/src/Contap/Contap_HContToolGen.gxx b/src/Contap/Contap_HContToolGen.gxx
index ca9020b53fe403c3fb56be771a0c3fc5b98af09f..0fd0df02b48e30d9fbfc2900e0abf399d763184e 100644 (file)
--- a/src/Contap/Contap_HContToolGen.gxx
+++ b/src/Contap/Contap_HContToolGen.gxx
@@ -20,10 +20,10 @@
 #include <GeomAbs_SurfaceType.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>

diff --git a/src/Contap/Contap_HCurve2dToolGen.gxx b/src/Contap/Contap_HCurve2dToolGen.gxx
index d1093477793ba0764ac49c6d81f1ed0ca86ab148..b50de0c61f31980f0af47857e72d20fc54478751 100644 (file)
--- a/src/Contap/Contap_HCurve2dToolGen.gxx
+++ b/src/Contap/Contap_HCurve2dToolGen.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/Contap/Contap_HCurve2dToolGen.lxx b/src/Contap/Contap_HCurve2dToolGen.lxx
index a8b0f9918fe6e87b6dd2aae43eb42f3fabbd9859..731f33f4e0c392f7189cd44144e47b3171db0478 100644 (file)
--- a/src/Contap/Contap_HCurve2dToolGen.lxx
+++ b/src/Contap/Contap_HCurve2dToolGen.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr2d.hxx>
 
 
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/Font/Font_FTLibrary.hxx b/src/Font/Font_FTLibrary.hxx
index 2798dd282b171aab57ece7cc8d9590ccbf619664..305c9c207bec2a56036ff8b1d96fc6199e632688 100755 (executable)
--- a/src/Font/Font_FTLibrary.hxx
+++ b/src/Font/Font_FTLibrary.hxx
@@ -18,7 +18,6 @@
 
 #include <Standard_DefineHandle.hxx>
 #include <Standard_Transient.hxx>
-#include <Handle_Standard_Transient.hxx>
 
 // inclusion template for FreeType
 #include <ft2build.h>

diff --git a/src/Geom2dInt/Geom2dInt_CurveTool.gxx b/src/Geom2dInt/Geom2dInt_CurveTool.gxx
index cb6bd67694bcb0899d5a6fe77b6dbbc97ce002f5..41d7114e05249cfe2b682bc09738c62f372589c1 100644 (file)
--- a/src/Geom2dInt/Geom2dInt_CurveTool.gxx
+++ b/src/Geom2dInt/Geom2dInt_CurveTool.gxx
@@ -15,8 +15,8 @@
 // commercial license or contractual agreement.
 
 #include <GeomAbs_CurveType.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 

diff --git a/src/GeomAPI/GeomAPI_Interpolate.cxx b/src/GeomAPI/GeomAPI_Interpolate.cxx
index 8dc2a41682928dee2f3d952411b4e51929e4fe8f..e3d28da9795dcb7a1c5695dcf390e09516b0b08e 100644 (file)
--- a/src/GeomAPI/GeomAPI_Interpolate.cxx
+++ b/src/GeomAPI/GeomAPI_Interpolate.cxx
@@ -26,7 +26,7 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_Array1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
+
 //=======================================================================
 //function : CheckPoints
 //purpose  : 

diff --git a/src/GeomLib/GeomLib_Interpolate.cxx b/src/GeomLib/GeomLib_Interpolate.cxx
index 2960a3ca9f3c1c66611af1734f34a94cb9cd5047..aff8f007d266c86b5480553bf4856a1c257556f9 100644 (file)
--- a/src/GeomLib/GeomLib_Interpolate.cxx
+++ b/src/GeomLib/GeomLib_Interpolate.cxx
@@ -25,7 +25,7 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_Array1OfBoolean.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
+#include <TColStd_HArray1OfBoolean.hxx>
 
 //=======================================================================
 //function : GeomLib_Interpolate

diff --git a/src/GeomPlate/GeomPlate_MakeApprox.cxx b/src/GeomPlate/GeomPlate_MakeApprox.cxx
index 4a5421a98cdf32c4ffde440c203b9a22163e5614..e39f6775f7f7aee9e6e2936bb4f1745e2e0d2f40 100644 (file)
--- a/src/GeomPlate/GeomPlate_MakeApprox.cxx
+++ b/src/GeomPlate/GeomPlate_MakeApprox.cxx
@@ -35,8 +35,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray2OfReal.hxx>
 
 #include <AdvApp2Var_Criterion.hxx>
 #include <AdvApp2Var_ApproxAFunc2Var.hxx>

diff --git a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
index e91514e7efbc142e52e2f9e9566c64a8a9d286a3..6b04b3069b0fcadc22b46a88ce1a0b2bef8bcb91 100644 (file)
--- a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
+++ b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
@@ -56,8 +56,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <AppDef_MultiLine.hxx>
 #include <AppDef_TheVariational.hxx>

diff --git a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
index d6669f136f95201e14ddfaa99a14b20588a72ff6..0f0cccbd824a7ae7a1f66644a32efdd8bd9ab273 100644 (file)
--- a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
+++ b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
@@ -48,8 +48,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
 
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <AppParCurves_MultiCurve.hxx>

diff --git a/src/Graphic3d/Graphic3d_CTexture.hxx b/src/Graphic3d/Graphic3d_CTexture.hxx
index 168fa0d81b111f838742ddc97ebf0c94d340d116..33dcb73ef93544a88fbe0d45fb63f3bdbb829bcc 100644 (file)
--- a/src/Graphic3d/Graphic3d_CTexture.hxx
+++ b/src/Graphic3d/Graphic3d_CTexture.hxx
@@ -14,7 +14,7 @@
 #ifndef _Graphic3d_CTexture_HeaderFile
 #define _Graphic3d_CTexture_HeaderFile
 
-#include <Handle_Graphic3d_TextureMap.hxx>
+#include <Graphic3d_TextureMap.hxx>
 #include <Standard_Type.hxx>
 
 class Graphic3d_CTexture

diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx
index 0cd6de1df7b13bba3f9d205a7c56101b64105961..3c49890934e28cfa3a2f827456b4227fcd941c56 100644 (file)
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -16,7 +16,7 @@
 
 #include <InterfaceGraphic_Graphic3d.hxx>
 #include <InterfaceGraphic_Visual3d.hxx>
-#include <Handle_Graphic3d_TextureEnv.hxx>
+#include <Graphic3d_TextureEnv.hxx>
 #include <Graphic3d_Camera.hxx>
 
 #include <Standard_Type.hxx>

diff --git a/src/Graphic3d/Graphic3d_MarkerImage.hxx b/src/Graphic3d/Graphic3d_MarkerImage.hxx
index a432f7fef6c9776eaed997b06236a7013b60714f..fc68e47ac10a7cef89072b0bd89e8726f45823af 100755 (executable)
--- a/src/Graphic3d/Graphic3d_MarkerImage.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx
@@ -18,7 +18,7 @@
 
 #include <Graphic3d_MarkerImage_Handle.hxx>
 
-#include <Handle_TColStd_HArray1OfByte.hxx>
+#include <TColStd_HArray1OfByte.hxx>
 #include <Image_PixMap_Handle.hxx>
 #include <Quantity_Parameter.hxx>
 #include <TCollection_AsciiString.hxx>

diff --git a/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx b/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
index 940fa0b485adc48d05dcffc617dde76ea0f345b8..97a14d23155555f320b1baf3fc2bc8b903b8521d 100755 (executable)
--- a/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
@@ -17,7 +17,7 @@
 #define _Graphic3d_TextureBitMap_Handle_H__
 
 #include <Standard_DefineHandle.hxx>
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 class Graphic3d_TextureBitMap;
 DEFINE_STANDARD_HANDLE(Graphic3d_MarkerImage, Standard_Transient)

diff --git a/src/HLRBRep/HLRBRep_BCurveTool.cxx b/src/HLRBRep/HLRBRep_BCurveTool.cxx
index 3dabf48737349c62a3be95bddb3ba44f4031a1d6..a0cae055cac72ab50a3c298cdc319c56fb876b48 100644 (file)
--- a/src/HLRBRep/HLRBRep_BCurveTool.cxx
+++ b/src/HLRBRep/HLRBRep_BCurveTool.cxx
@@ -17,8 +17,8 @@
 #include <HLRBRep_BCurveTool.ixx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 

diff --git a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx
index c6a800d8b68eb5f1d8618b0016de2fbddca332ff..e37c2e516c970f9c2a3793f94cc4338ef9fe5b7c 100644 (file)
--- a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx
+++ b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx
@@ -22,10 +22,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
 //=======================================================================

diff --git a/src/HLRBRep/HLRBRep_Curve.cxx b/src/HLRBRep/HLRBRep_Curve.cxx
index ac9d533f136d757fe395e9333b236de2bbd4a1cf..3cc51fdb637dc101acde5cd0081805bfc433e7b2 100644 (file)
--- a/src/HLRBRep/HLRBRep_Curve.cxx
+++ b/src/HLRBRep/HLRBRep_Curve.cxx
@@ -26,8 +26,6 @@
 #include <HLRBRep_CLProps.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
 
 //OCC155 // jfa 05.03.2002 // bad vectors projection
 

diff --git a/src/HLRBRep/HLRBRep_CurveTool.cxx b/src/HLRBRep/HLRBRep_CurveTool.cxx
index cb2d1e2c80f47cd433531f49afa0526975fde40f..8841bd1e314da22c2ae079e23541c57e7f357825 100644 (file)
--- a/src/HLRBRep/HLRBRep_CurveTool.cxx
+++ b/src/HLRBRep/HLRBRep_CurveTool.cxx
@@ -18,8 +18,8 @@
 #include <HLRBRep_Curve.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 //=======================================================================

diff --git a/src/HLRBRep/HLRBRep_CurveTool.lxx b/src/HLRBRep/HLRBRep_CurveTool.lxx
index 8b1bdde0b18c4fe35cf514459450f67acfc3fb7a..b8a01437e43b73e4aa12ec762602bd09e40190ca 100644 (file)
--- a/src/HLRBRep/HLRBRep_CurveTool.lxx
+++ b/src/HLRBRep/HLRBRep_CurveTool.lxx
@@ -23,8 +23,8 @@
 #include <gp_Elips2d.hxx>
 #include <gp_Parab2d.hxx>
 #include <gp_Hypr2d.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 #define   IS_C2_COMPOSITE 0

diff --git a/src/HLRBRep/HLRBRep_SurfaceTool.lxx b/src/HLRBRep/HLRBRep_SurfaceTool.lxx
index b82bfd7aa92ac65cd55862f51b56499d2debf496..87172f6513149a9139822e50f6dfbece348f764d 100644 (file)
--- a/src/HLRBRep/HLRBRep_SurfaceTool.lxx
+++ b/src/HLRBRep/HLRBRep_SurfaceTool.lxx
@@ -22,10 +22,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
 inline Standard_Real HLRBRep_SurfaceTool::FirstUParameter(const Standard_Address Surf){  return ((BRepAdaptor_Surface *)Surf)->FirstUParameter(); }

diff --git a/src/IFSelect/IFSelect_ActFunc.hxx b/src/IFSelect/IFSelect_ActFunc.hxx
index 4abb8db76159f362888624f9af28213278535545..f21dde2e60dc9372d1b58bf4344e0c030636a605 100644 (file)
--- a/src/IFSelect/IFSelect_ActFunc.hxx
+++ b/src/IFSelect/IFSelect_ActFunc.hxx
@@ -17,7 +17,7 @@
 #define _IFSelect_ActFunc_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Handle_IFSelect_SessionPilot.hxx>
+#include <IFSelect_SessionPilot.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 
 typedef IFSelect_ReturnStatus (*IFSelect_ActFunc) (const Handle(IFSelect_SessionPilot)&);

diff --git a/src/Image/Image_PixMap_Handle.hxx b/src/Image/Image_PixMap_Handle.hxx
index c06dc8c131a5f8a24c9054140b06a1b4d8f5a062..1a5ee60551c9c270fc1ff67dc5ce22bcc2d08063 100644 (file)
--- a/src/Image/Image_PixMap_Handle.hxx
+++ b/src/Image/Image_PixMap_Handle.hxx
@@ -15,7 +15,7 @@
 #define _Image_PixMap_Handle_H__
 
 #include <Standard_DefineHandle.hxx>
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 class Image_PixMap;
 DEFINE_STANDARD_HANDLE(Image_PixMap, Standard_Transient)

diff --git a/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx b/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx
index d863211293e0925458ad243581796dd682a34aa1..ba68d67cc5ab8544576562b2f3b9b4eaddb72360 100644 (file)
--- a/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx
+++ b/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfBoolean.hxx>

diff --git a/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx b/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx
index b32a082d485fcee52fbcc62e72823c781d7942da..79b18277f6afedb21b2245bc7eff1ac670d7732a 100644 (file)
--- a/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx
+++ b/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr.hxx>
 
 
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx b/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx
index f90e3a8842966e8650185b0dabee2024110357da..b17054975c02f4ff99a8601844e56e63aef1dd18 100644 (file)
--- a/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx
+++ b/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx
@@ -27,10 +27,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 
 
 

diff --git a/src/IntPatch/IntPatch_HCurve2dTool.cxx b/src/IntPatch/IntPatch_HCurve2dTool.cxx
index 441955fe96f848d98ef365bfb9f67b74879362f8..9b047af87b74ceb8b61e6245a661b700ebea2499 100644 (file)
--- a/src/IntPatch/IntPatch_HCurve2dTool.cxx
+++ b/src/IntPatch/IntPatch_HCurve2dTool.cxx
@@ -18,8 +18,8 @@
 
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/IntPatch/IntPatch_HCurve2dTool.lxx b/src/IntPatch/IntPatch_HCurve2dTool.lxx
index 3f9f746acae75a77cc2fbd28ba88cb11a0e1d050..0348595864b4bc0fc9cf01bbe15225e30e92a84c 100644 (file)
--- a/src/IntPatch/IntPatch_HCurve2dTool.lxx
+++ b/src/IntPatch/IntPatch_HCurve2dTool.lxx
@@ -24,8 +24,8 @@
 #include <gp_Parab2d.hxx>
 #include <gp_Hypr2d.hxx>
 
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 

diff --git a/src/IntPatch/IntPatch_HInterTool.cxx b/src/IntPatch/IntPatch_HInterTool.cxx
index b6f4b423526cbfc24b856e95bd65f94e423852dd..ec4da95eaaf371fbc8ad8bc99974939cb8cad3d4 100644 (file)
--- a/src/IntPatch/IntPatch_HInterTool.cxx
+++ b/src/IntPatch/IntPatch_HInterTool.cxx
@@ -22,11 +22,6 @@
 #include <GeomAbs_SurfaceType.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
-
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom2d_BezierCurve.hxx>

diff --git a/src/IntPatch/IntPatch_Intersection.cxx b/src/IntPatch/IntPatch_Intersection.cxx
index d3da07067a4e80d1eb45fa53840018c5c50e99b7..d31cab612a4c870af190a3e9c9559fc22367ca5e 100644 (file)
--- a/src/IntPatch/IntPatch_Intersection.cxx
+++ b/src/IntPatch/IntPatch_Intersection.cxx
@@ -174,7 +174,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)&  S1,
 #include <GeomAdaptor_HCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <Handle_GeomAdaptor_HSurface.hxx>
+#include <GeomAdaptor_HSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <ProjLib_ProjectOnPlane.hxx>
 #include <GeomProjLib.hxx>
@@ -1511,7 +1511,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)&  S1,
 //======================================================================
 #include <IntPatch_IType.hxx>
 #include <IntPatch_LineConstructor.hxx>
-#include <Handle_Adaptor2d_HCurve2d.hxx>
+#include <Adaptor2d_HCurve2d.hxx>
 #define MAXR 200
 
 

diff --git a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx
index 4c3a6da6f4b21c115cd0009200cb990b39a9756d..4491e7fa775f12831dce1d027fec65f7ec4c3667 100644 (file)
--- a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx
+++ b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx
@@ -26,7 +26,6 @@
 
 #include <IntPatch_Line.hxx>
 
-#include <Handle_IntSurf_LineOn2S.hxx>
 #include <IntSurf_PntOn2S.hxx>
 #include <IntSurf_LineOn2S.hxx>
 #include <TColStd_Array1OfReal.hxx>

diff --git a/src/Interface/Interface_StaticSatisfies.hxx b/src/Interface/Interface_StaticSatisfies.hxx
index 097da493a9c5c3eec57edacc2f00f8ca6418459c..5423943c5b4912bb9611ab8abba49251176e7f6e 100644 (file)
--- a/src/Interface/Interface_StaticSatisfies.hxx
+++ b/src/Interface/Interface_StaticSatisfies.hxx
@@ -14,7 +14,7 @@
 #ifndef _Interface_StaticSatisfies_HeaderFile
 #define _Interface_StaticSatisfies_HeaderFile
 
-#include <Handle_TCollection_HAsciiString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 typedef Standard_Boolean (*Interface_StaticSatisfies) (const Handle(TCollection_HAsciiString)& val);
 

diff --git a/src/Interface/Interface_ValueInterpret.hxx b/src/Interface/Interface_ValueInterpret.hxx
index 913dd002cc58c296772908e9c7ca80699e9edadf..84db997382ec6b7a367e249e48713193aeb8b04f 100644 (file)
--- a/src/Interface/Interface_ValueInterpret.hxx
+++ b/src/Interface/Interface_ValueInterpret.hxx
@@ -14,7 +14,7 @@
 #ifndef _Interface_ValueInterpret_HeaderFile
 #define _Interface_ValueInterpret_HeaderFile
 
-#include <Handle_TCollection_HAsciiString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 typedef Handle(TCollection_HAsciiString)  (*Interface_ValueInterpret) (const Handle(Interface_TypedValue)& typval, const Handle(TCollection_HAsciiString)& val, const Standard_Boolean native);
 

diff --git a/src/Interface/Interface_ValueSatisfies.hxx b/src/Interface/Interface_ValueSatisfies.hxx
index b2d543d2f5132959597fa6f2a806e43f77c99e01..50e162a9f60afad251dcbb1bea6f77edf84a4357 100644 (file)
--- a/src/Interface/Interface_ValueSatisfies.hxx
+++ b/src/Interface/Interface_ValueSatisfies.hxx
@@ -14,7 +14,7 @@
 #ifndef _Interface_ValueSatisfies_HeaderFile
 #define _Interface_ValueSatisfies_HeaderFile
 
-#include <Handle_TCollection_HAsciiString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 typedef Standard_Boolean (*Interface_ValueSatisfies) (const Handle(TCollection_HAsciiString)& val);
 

diff --git a/src/MoniTool/MoniTool_ValueInterpret.hxx b/src/MoniTool/MoniTool_ValueInterpret.hxx
index adb4bf330d0b74cdec451d49970f4be6c830d45b..3f16ba52adf486104684c61d0ac442f0a64a765b 100644 (file)
--- a/src/MoniTool/MoniTool_ValueInterpret.hxx
+++ b/src/MoniTool/MoniTool_ValueInterpret.hxx
@@ -18,7 +18,8 @@
 
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
-#include <Handle_MoniTool_TypedValue.hxx>
+
+class Handle(MoniTool_TypedValue);
 
 typedef Handle(TCollection_HAsciiString)  (*MoniTool_ValueInterpret) (const Handle(MoniTool_TypedValue)& typval,
                                                                      const Handle(TCollection_HAsciiString)& val,

diff --git a/src/Poly/FILES b/src/Poly/FILES
index 469fe619a5a93a897b1aa2dc96769bb451c281ca..e4b2681c1e621ac00fa4353c8a7b53bcb7c7e6cb 100755 (executable)
--- a/src/Poly/FILES
+++ b/src/Poly/FILES
@@ -1,4 +1,3 @@
-Handle_Poly_CoherentTriangulation.hxx
 Poly_CoherentTriangulation.hxx
 Poly_CoherentTriangle.hxx
 Poly_CoherentTriPtr.hxx

diff --git a/src/Poly/Handle_Poly_CoherentTriangulation.hxx b/src/Poly/Handle_Poly_CoherentTriangulation.hxx
deleted file mode 100644 (file)
index d6dc2f5..0000000
--- a/src/Poly/Handle_Poly_CoherentTriangulation.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// Created on: 2008-04-23
-// Created by: Alexander GRIGORIEV
-// Copyright (c) 2008-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef Handle_Poly_CoherentTriangulation_HeaderFile
-#define Handle_Poly_CoherentTriangulation_HeaderFile
-
-#include <Standard_DefineHandle.hxx>
-#include <Standard_Transient.hxx>
-
-class Poly_CoherentTriangulation;
-
-//! Definition of HANDLE object using Standard_DefineHandle.hxx
-DEFINE_STANDARD_HANDLE (Poly_CoherentTriangulation, Standard_Transient)
-
-#endif

diff --git a/src/Poly/Poly_CoherentTriangulation.hxx b/src/Poly/Poly_CoherentTriangulation.hxx
index 53141cdbd94ea15a5852a5e70efe89f126a11374..1fa1b2106c39200cef67dec5722c378ad8053a2b 100644 (file)
--- a/src/Poly/Poly_CoherentTriangulation.hxx
+++ b/src/Poly/Poly_CoherentTriangulation.hxx
@@ -16,7 +16,7 @@
 #ifndef Poly_CoherentTriangulation_HeaderFile
 #define Poly_CoherentTriangulation_HeaderFile
 
-#include <Handle_Poly_Triangulation.hxx>
+#include <Poly_Triangulation.hxx>
 #include <Poly_CoherentNode.hxx>
 #include <Poly_CoherentTriangle.hxx>
 #include <Poly_CoherentLink.hxx>
@@ -33,6 +33,11 @@ typedef NCollection_Vector<Poly_CoherentNode>::Iterator
 typedef NCollection_Vector<Poly_CoherentLink>::Iterator
                                 Poly_BaseIteratorOfCoherentLink;
 
+//! Definition of HANDLE object using Standard_DefineHandle.hxx
+#include <Standard_DefineHandle.hxx>
+class Poly_CoherentTriangulation;
+DEFINE_STANDARD_HANDLE (Poly_CoherentTriangulation, Standard_Transient)
+
 /**
  * Triangulation structure that allows to:
  * <ul>
@@ -409,6 +414,6 @@ DEFINE_STANDARD_RTTI (Poly_CoherentTriangulation)
   friend class IteratorOfLink;
 };
 
-#include <Handle_Poly_CoherentTriangulation.hxx>
+#include <Poly_CoherentTriangulation.hxx>
 
 #endif

diff --git a/src/Poly/Poly_ListOfTriangulation.hxx b/src/Poly/Poly_ListOfTriangulation.hxx
index 53c0969de9e10a1c369d7b9d3191a493da19d728..38a6a502e49f830867a2e383b5362e754f1c2aef 100644 (file)
--- a/src/Poly/Poly_ListOfTriangulation.hxx
+++ b/src/Poly/Poly_ListOfTriangulation.hxx
@@ -17,7 +17,7 @@
 #define Poly_ListOfTriangulation_HeaderFile
 
 #include <NCollection_List.hxx>
-#include <Handle_Poly_Triangulation.hxx>
+#include <Poly_Triangulation.hxx>
 
 /**
  * List of Poly_Triangulation instances.

diff --git a/src/ProjLib/ProjLib_ComputeApprox.cxx b/src/ProjLib/ProjLib_ComputeApprox.cxx
index 36f105504bcb2461fd09fba93202913ad753f45a..9871ac4233dcb1454e2fbc8eb72dd5a9b81c4ba3 100644 (file)
--- a/src/ProjLib/ProjLib_ComputeApprox.cxx
+++ b/src/ProjLib/ProjLib_ComputeApprox.cxx
@@ -32,9 +32,7 @@
 #include <Precision.hxx>
 #include <Approx_FitAndDivide2d.hxx>
 #include <AppParCurves_MultiCurve.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_HSurface.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_Array1OfPnt.hxx>

diff --git a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
index 32175f18cba292f0d95a5bc7feeb8283f8f77fe8..013fe7bc46d1eb8a8f34527cd3a730ba31ce5bc6 100644 (file)
--- a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
+++ b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
@@ -52,8 +52,6 @@
 
 #include <GeomAbs_SurfaceType.hxx>
 #include <GeomAbs_CurveType.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_HSurface.hxx>

diff --git a/src/ProjLib/ProjLib_ProjectOnSurface.cxx b/src/ProjLib/ProjLib_ProjectOnSurface.cxx
index d497dae91832101dc1b82a00672b9a4fb0819495..bd4f7e8a3618003d4acba19717ffb365b13d7b02 100644 (file)
--- a/src/ProjLib/ProjLib_ProjectOnSurface.cxx
+++ b/src/ProjLib/ProjLib_ProjectOnSurface.cxx
@@ -25,9 +25,7 @@
 #include <BSplCLib.hxx>
 #include <PLib.hxx>
 #include <Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>

diff --git a/src/ProjLib/ProjLib_ProjectedCurve.cxx b/src/ProjLib/ProjLib_ProjectedCurve.cxx
index b693264e321abbe23c0b7d3a98d084cd9cfb0149..6be1457708c5c16f861d538798b83d2fa018a606 100644 (file)
--- a/src/ProjLib/ProjLib_ProjectedCurve.cxx
+++ b/src/ProjLib/ProjLib_ProjectedCurve.cxx
@@ -25,8 +25,6 @@
 #include <ProjLib_ComputeApproxOnPolarSurface.hxx>
 #include <ProjLib_ComputeApprox.hxx>
 #include <ProjLib_Projector.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HSurface.hxx>
 #include <Approx_CurveOnSurface.hxx>
@@ -36,12 +34,8 @@
 #include <ProjLib_Sphere.hxx>
 #include <ProjLib_Torus.hxx>
 #include <Precision.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Adaptor2d_HCurve2d.hxx>
 #include <gp_Vec2d.hxx>
 #include <StdFail_NotDone.hxx>
 #include <gp_XY.hxx>

diff --git a/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx b/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx
index bf7bec824a7f8b9417b610696a49ff97ad3ca69c..888ac064d703f2d4d55843b82ec4aea9b513afe3 100644 (file)
--- a/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx
+++ b/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx
@@ -17,7 +17,7 @@
 #define _SelectMgr_DataMapOfObjectOwners_HeaderFile
 
 #include <NCollection_DefineDataMap.hxx>
-#include <Handle_SelectMgr_SelectableObject.hxx>
+#include <SelectMgr_SelectableObject.hxx>
 #include <SelectMgr_SequenceOfOwner.hxx>
 
 inline Standard_Boolean IsEqual (const Handle_SelectMgr_SelectableObject& theH1,

diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx
index 20a8c1697ee5a1e34fa9f8d0d642415b84f0550b..592d6444f7d4d42404fe6d3b277d286d59f184aa 100644 (file)
--- a/src/ShapeFix/ShapeFix_Wire.cxx
+++ b/src/ShapeFix/ShapeFix_Wire.cxx
@@ -109,7 +109,6 @@
 #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>

diff --git a/src/ShapeProcess/ShapeProcess_OperFunc.hxx b/src/ShapeProcess/ShapeProcess_OperFunc.hxx
index 86c613cb1875b4833db61528410eaf44eec718ad..23fe51b993b48a0031b27c80d4596dc79a9fab12 100644 (file)
--- a/src/ShapeProcess/ShapeProcess_OperFunc.hxx
+++ b/src/ShapeProcess/ShapeProcess_OperFunc.hxx
@@ -17,7 +17,7 @@
 #define ShapeProcess_OperFunc_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Handle_ShapeProcess_Context.hxx>
+#include <ShapeProcess_Context.hxx>
 
 typedef Standard_Boolean (*ShapeProcess_OperFunc) (const Handle(ShapeProcess_Context)& context);
 

diff --git a/src/Standard/Handle_Standard_Persistent.cxx b/src/Standard/Handle_Standard_Persistent.cxx
index 2fe8c689ce8708a244eaad7c9e2b687e023ac89d..44c48bd668c4d77ce6774a51f28930f357983327 100644 (file)
--- a/src/Standard/Handle_Standard_Persistent.cxx
+++ b/src/Standard/Handle_Standard_Persistent.cxx
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Handle_Standard_Persistent.hxx>
+#include <Standard_Persistent.hxx>
 
 
 

diff --git a/src/Standard/Handle_Standard_Transient.cxx b/src/Standard/Handle_Standard_Transient.cxx
index 6f64d77f658f8b59387865a4b61860b9df74f0f8..efb2d4258d6f14b058c1fa4d8c7a4ce24761bc07 100644 (file)
--- a/src/Standard/Handle_Standard_Transient.cxx
+++ b/src/Standard/Handle_Standard_Transient.cxx
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 #include <Standard_Atomic.hxx>
 
 //============================================================================

diff --git a/src/Standard/Standard_Persistent.cxx b/src/Standard/Standard_Persistent.cxx
index 7501a87710c962a72efe2d7a40d756dfeff9d41b..2006e338c7b648336e635b360b45318ba513c5c0 100644 (file)
--- a/src/Standard/Standard_Persistent.cxx
+++ b/src/Standard/Standard_Persistent.cxx
@@ -12,7 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Handle_Standard_Persistent.hxx>
 #include <Standard_Persistent.hxx>
 
 #include <Standard_Failure.hxx>

diff --git a/src/Standard/Standard_Persistent_proto.hxx b/src/Standard/Standard_Persistent_proto.hxx
index d1a05b2be734d2964112a70d2be595a78bf1521c..7e940cc6cf9fb33fd0fb082c1470a59165645408 100644 (file)
--- a/src/Standard/Standard_Persistent_proto.hxx
+++ b/src/Standard/Standard_Persistent_proto.hxx
@@ -28,7 +28,6 @@
 #include <Standard.hxx>
 #endif
 
-class Handle_Standard_Persistent;
 class Standard_Type;
 class Handle_Standard_Type;
 class Standard_Type;

diff --git a/src/StdPrs/StdPrs_HLRShape.hxx b/src/StdPrs/StdPrs_HLRShape.hxx
index 18b33450d9e2598dbe50a7cd04b9d1e0ec66f2a9..7b2d0020347dadbf0d920758e461d8e96e46afb5 100755 (executable)
--- a/src/StdPrs/StdPrs_HLRShape.hxx
+++ b/src/StdPrs/StdPrs_HLRShape.hxx
@@ -15,9 +15,9 @@
 #define _StdPrs_HLRFace_H__
 
 #include <Prs3d_Root.hxx>
-#include <Handle_Prs3d_Presentation.hxx>
-#include <Handle_Prs3d_Drawer.hxx>
-#include <Handle_Prs3d_Projector.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Prs3d_Projector.hxx>
 
 class StdPrs_HLRShape: public Prs3d_Root
 {

diff --git a/src/TDF/TDF_AttributeIterator.hxx b/src/TDF/TDF_AttributeIterator.hxx
index 6523baf2de0e4f1b28e3297579b347b025d27178..dae1020c62dfc7c2ae0252561e02b81173451079 100644 (file)
--- a/src/TDF/TDF_AttributeIterator.hxx
+++ b/src/TDF/TDF_AttributeIterator.hxx
@@ -31,7 +31,7 @@
 #define TDF_AttributeIterator_HeaderFile
 
 #ifndef _Handle_TDF_Attribute_HeaderFile
-#include <Handle_TDF_Attribute.hxx>
+#include <TDF_Attribute.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>

diff --git a/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx b/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx
index 177f443e705fdde723b462fee4c4efd0d358ed48..3f108d9eca52e7c1e10f262990a979bccef2611a 100644 (file)
--- a/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx
+++ b/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx
@@ -21,7 +21,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <gp_Pnt.hxx>
 

diff --git a/src/TopTools/TopTools_MutexForShapeProvider.hxx b/src/TopTools/TopTools_MutexForShapeProvider.hxx
index 037914a2a329012f693ca6fcb5c71d95162ad727..bb7bb0160739f04157759e1997564b42a67716d1 100644 (file)
--- a/src/TopTools/TopTools_MutexForShapeProvider.hxx
+++ b/src/TopTools/TopTools_MutexForShapeProvider.hxx
@@ -16,7 +16,7 @@
 #ifndef _TopTools_MutexForShapeProvider_HeaderFile
 #define _TopTools_MutexForShapeProvider_HeaderFile
 
-#include <Handle_TopoDS_TShape.hxx>
+#include <TopoDS_TShape.hxx>
 #include <NCollection_DataMap.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 

diff --git a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
index c5d61417bf1834018430bc130ef8642c8336b84c..64616f2d20e3684cd975de9c329dd7701563d427 100644 (file)
--- a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
+++ b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
@@ -17,7 +17,6 @@
 #define VrmlData_DataMapOfShapeAppearance_HeaderFile
 
 #include <NCollection_DataMap.hxx>
-#include <Handle_TopoDS_TShape.hxx>
 #include <VrmlData_Appearance.hxx>
 #include <TopoDS_TShape.hxx>
 

diff --git a/src/VrmlData/VrmlData_Geometry.hxx b/src/VrmlData/VrmlData_Geometry.hxx
index da1e9aafc8a157858fa0cbbfccf45fc3de8573ad..3ad9e2bc049ecc9b37bf951f6574c4395c08d8b3 100644 (file)
--- a/src/VrmlData/VrmlData_Geometry.hxx
+++ b/src/VrmlData/VrmlData_Geometry.hxx
@@ -17,7 +17,7 @@
 #define VrmlData_Geometry_HeaderFile
 
 #include <VrmlData_Node.hxx>
-#include <Handle_TopoDS_TShape.hxx>
+#include <TopoDS_TShape.hxx>
 
 /**
  *  Implementation of the Geometry node.

diff --git a/src/VrmlData/VrmlData_Node.hxx b/src/VrmlData/VrmlData_Node.hxx
index 814befd1852d53f3734861b845dcc935fa17b0ef..f2ec769dc36a6a94a621d97d7251a8435eadb048 100644 (file)
--- a/src/VrmlData/VrmlData_Node.hxx
+++ b/src/VrmlData/VrmlData_Node.hxx
@@ -16,7 +16,7 @@
 #ifndef VrmlData_Node_HeaderFile
 #define VrmlData_Node_HeaderFile
 
-#include <Handle_Standard_Type.hxx>
+#include <Standard_Type.hxx>
 #include <NCollection_List.hxx>
 #include <Standard_DefineHandle.hxx>
 #include <Standard_TypeDef.hxx>

diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
index ac53d2272d2334bd3b7a39d75d9dbfc51875846b..becbb7b4f75d147fe4c21c67e1b183a85343dac8 100644 (file)
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <XmlLDrivers_DocumentRetrievalDriver.hxx>
-#include <Handle_XmlMDF_ADriverTable.hxx>
+#include <XmlMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);
 

diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
index a95887fb4b4b4eeea0c9d9b1fdd3a4cea03c38fa..cdbf9a855463a4098da19091c3ea1b4f155e5865 100644 (file)
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <XmlLDrivers_DocumentStorageDriver.hxx>
-#include <Handle_XmlMDF_ADriverTable.hxx>
+#include <XmlMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);