From ebc93ae74f6aecad553e9a4de8ef33db704fcbcb Mon Sep 17 00:00:00 2001 From: kgv Date: Thu, 20 Mar 2014 14:12:12 +0400 Subject: [PATCH] 0024737: Coding - remove
tag from header files Eliminate #ifdefs around #includes, some unnecessary includes and macros --- src/AdvApp2Var/AdvApp2Var_Data.hxx | 3 - .../AdvApp2Var_EvaluatorFunc2Var.hxx | 14 +- src/AdvApprox/AdvApprox_EvaluatorFunction.hxx | 13 +- src/BOPAlgo/BOPAlgo_WireSplitter.lxx | 3 - src/BOPCol/BOPCol_DataMapOfIntegerInteger.hxx | 2 - .../BOPCol_DataMapOfIntegerListOfInteger.hxx | 2 - .../BOPCol_DataMapOfIntegerListOfShape.hxx | 3 - .../BOPCol_DataMapOfIntegerMapOfInteger.hxx | 2 - src/BOPCol/BOPCol_DataMapOfIntegerReal.hxx | 2 - src/BOPCol/BOPCol_DataMapOfIntegerShape.hxx | 10 - src/BOPCol/BOPCol_DataMapOfShapeAddress.hxx | 10 - src/BOPCol/BOPCol_DataMapOfShapeInteger.hxx | 9 - .../BOPCol_DataMapOfShapeListOfShape.hxx | 4 - src/BOPCol/BOPCol_DataMapOfShapeShape.hxx | 3 - .../BOPCol_DataMapOfTransientAddress.hxx | 11 - ...l_IndexedDataMapOfIntegerListOfInteger.hxx | 2 - .../BOPCol_IndexedDataMapOfShapeBox.hxx | 4 - .../BOPCol_IndexedDataMapOfShapeInteger.hxx | 9 - ...OPCol_IndexedDataMapOfShapeListOfShape.hxx | 2 - src/BOPCol/BOPCol_IndexedMapOfInteger.hxx | 2 - src/BOPCol/BOPCol_IndexedMapOfShape.hxx | 5 - src/BOPCol/BOPCol_ListOfInteger.hxx | 7 - src/BOPCol/BOPCol_MapOfInteger.hxx | 11 - src/BOPCol/BOPCol_MapOfOrientedShape.hxx | 3 - src/BOPCol/BOPCol_MapOfShape.hxx | 2 - src/BOPCol/BOPCol_VectorOfInteger.hxx | 8 - .../BOPDS_DataMapOfIntegerListOfPaveBlock.hxx | 11 - .../BOPDS_DataMapOfPassKeyListOfPaveBlock.hxx | 4 - .../BOPDS_DataMapOfPaveBlockCommonBlock.hxx | 4 - .../BOPDS_DataMapOfPaveBlockListOfInteger.hxx | 4 - ...OPDS_DataMapOfPaveBlockListOfPaveBlock.hxx | 4 - ...BOPDS_DataMapOfShapeCoupleOfPaveBlocks.hxx | 3 - ...IndexedDataMapOfPaveBlockListOfInteger.hxx | 4 - ...dexedDataMapOfPaveBlockListOfPaveBlock.hxx | 4 - ...ndexedDataMapOfShapeCoupleOfPaveBlocks.hxx | 3 - src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx | 6 +- src/BOPDS/BOPDS_Interf.hxx | 15 +- src/BOPDS/BOPDS_MapOfCommonBlock.hxx | 4 - src/BOPDS/BOPDS_MapOfPassKey.hxx | 4 - src/BOPDS/BOPDS_MapOfPassKeyBoolean.hxx | 3 - src/BOPDS/BOPDS_MapOfPave.hxx | 5 - src/BOPDS/BOPDS_MapOfPaveBlock.hxx | 4 - src/BOPTools/BOPTools_ConnexityBlock.hxx | 7 - src/BOPTools/BOPTools_DataMapOfShapeSet.hxx | 4 - src/BOPTools/BOPTools_MapOfSet.hxx | 3 - .../BRepBuilderAPI_BndBoxTreeSelector.hxx | 6 - .../BRepBuilderAPI_CellFilter.hxx | 11 - .../BRepBuilderAPI_VertexInspector.hxx | 11 - .../BRepExtrema_DistShapeShape.hxx | 41 +-- src/BRepExtrema/BRepExtrema_DistanceSS.hxx | 26 +- src/BRepExtrema/BRepExtrema_ExtCC.hxx | 25 +- src/BRepExtrema/BRepExtrema_ExtCF.hxx | 35 +- src/BRepExtrema/BRepExtrema_ExtFF.hxx | 31 +- src/BRepExtrema/BRepExtrema_ExtPC.hxx | 25 +- src/BRepExtrema/BRepExtrema_ExtPF.hxx | 30 +- src/BRepExtrema/BRepExtrema_Poly.hxx | 14 +- src/BRepExtrema/BRepExtrema_SeqOfSolution.hxx | 4 - src/BRepExtrema/BRepExtrema_SolutionElem.hxx | 186 +++++----- src/BRepExtrema/BRepExtrema_SupportType.hxx | 4 - src/BRepMesh/BRepMesh_Delaun.hxx | 328 +++++++++--------- src/BRepMesh/BRepMesh_PluginEntryType.hxx | 2 - src/BRepMesh/BRepMesh_Status.hxx | 15 +- src/BRepMesh/BRepMesh_VectorOfVertex.hxx | 4 - src/BRepMesh/BRepMesh_VertexCellFilter.hxx | 8 - src/BRepMesh/BRepMesh_VertexInspector.hxx | 15 - src/BRepPrim/BRepPrim_OneAxis.hxx | 21 +- .../BRepSweep_NumLinearRegularSweep.hxx | 22 +- src/BSplCLib/BSplCLib_EvaluatorFunction.hxx | 10 +- src/DBC/DBC_BaseArray_objs.hxx | 17 +- src/DBC/DBC_DBVArray.hxx | 2 - src/DDF/DDF_IOStream.hxx | 27 -- src/Draw/Draw_Main.hxx | 3 - src/Graphic3d/Graphic3d_Camera.hxx | 2 +- src/Graphic3d/Graphic3d_Vertex.hxx | 109 ++++-- src/IntAna2d/IntAna2d_Outils.hxx | 11 - src/IntImp/IntImp_ZerParFunc.lxx | 7 - src/IntImpParGen/IntImpParGen_Tool.hxx | 15 - src/IntPolyh/IntPolyh_ArrayOfCouples.hxx | 7 - src/IntPolyh/IntPolyh_ArrayOfEdges.hxx | 7 - src/IntPolyh/IntPolyh_ArrayOfPoints.hxx | 7 - src/IntPolyh/IntPolyh_ArrayOfSectionLines.hxx | 7 - src/IntPolyh/IntPolyh_ArrayOfStartPoints.hxx | 7 - src/IntPolyh/IntPolyh_ArrayOfTangentZones.hxx | 7 - src/IntPolyh/IntPolyh_ArrayOfTriangles.hxx | 7 - src/IntSurf/IntSurf_Quadric.lxx | 11 - src/IntWalk/IntWalk_IWLine.lxx | 8 - src/MeshVS/MeshVS_TwoColors.hxx | 11 +- src/Message/Message_Messenger.lxx | 4 - src/NIS/NIS_InteractiveContext.hxx | 40 +-- src/NIS/NIS_InteractiveObject.hxx | 10 +- src/NIS/NIS_SelectFilter.hxx | 11 +- src/OpenGl/OpenGl_AVIWriter.hxx | 6 +- src/OpenGl/OpenGl_GraphicDriver.hxx | 140 ++++---- src/Poly/Poly_CoherentTriangulation.hxx | 110 +++--- src/Standard/Handle_Standard_Persistent.hxx | 11 +- src/Standard/Handle_Standard_Transient.hxx | 12 +- src/Standard/Standard_Address.hxx | 8 - src/Standard/Standard_Boolean.cxx | 4 - src/Standard/Standard_Character.cxx | 5 - src/Standard/Standard_DefineHandle.hxx | 2 - src/Standard/Standard_ExtCharacter.cxx | 5 - src/Standard/Standard_ExtString.hxx | 3 - src/Standard/Standard_IStream.hxx | 3 - src/Standard/Standard_Integer.cxx | 4 - src/Standard/Standard_Integer.hxx | 5 - src/Standard/Standard_MMgrOpt.hxx | 30 +- src/Standard/Standard_MMgrRaw.hxx | 11 - src/Standard/Standard_MMgrRoot.hxx | 10 +- src/Standard/Standard_MMgrTBBalloc.hxx | 11 - src/Standard/Standard_OId.hxx | 5 - src/Standard/Standard_OStream.hxx | 4 - src/Standard/Standard_Persistent_proto.hxx | 13 +- src/Standard/Standard_PrimitiveTypes.hxx | 21 +- src/Standard/Standard_Real.cxx | 4 - src/Standard/Standard_Real.hxx | 12 +- src/Standard/Standard_SStream.hxx | 2 - src/Standard/Standard_ShortReal.cxx | 5 - src/Standard/Standard_ShortReal.hxx | 7 +- src/Standard/Standard_Stream.hxx | 2 - src/Standard/Standard_Time.hxx | 2 - src/Standard/Standard_Transient.hxx | 8 - src/Standard/Standard_Transient_proto.hxx | 6 - src/Standard/Standard_TypeDef.hxx | 2 - src/TColStd/TColStd_PackedMapOfInteger.hxx | 80 ++--- src/TDF/TDF_AttributeIterator.hxx | 23 +- src/V3d/V3d_Plane.hxx | 4 +- src/WNT/FILES | 3 - src/WNT/WNT_Dword.cxx | 27 -- src/WNT/WNT_Uint.cxx | 27 -- src/WNT/WNT_WindowData.cxx | 28 -- 130 files changed, 563 insertions(+), 1555 deletions(-) delete mode 100644 src/WNT/WNT_Dword.cxx delete mode 100644 src/WNT/WNT_Uint.cxx delete mode 100644 src/WNT/WNT_WindowData.cxx diff --git a/src/AdvApp2Var/AdvApp2Var_Data.hxx b/src/AdvApp2Var/AdvApp2Var_Data.hxx index 63a9cb4994..26f82b0ace 100644 --- a/src/AdvApp2Var/AdvApp2Var_Data.hxx +++ b/src/AdvApp2Var/AdvApp2Var_Data.hxx @@ -14,10 +14,7 @@ #ifndef AdvApp2Var_Data_HeaderFile #define AdvApp2Var_Data_HeaderFile -#ifndef _Standard_Macro_HeaderFile #include -#endif - #include // struct mdnombr_1_ { diff --git a/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx b/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx index 36e8eb931b..c4b391a383 100644 --- a/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx +++ b/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx @@ -14,19 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif - #ifndef AdvApp2Var_EvaluatorFunc2Var_HeaderFile #define AdvApp2Var_EvaluatorFunc2Var_HeaderFile +#include +#include +#include + // History - the C function pointer converted to a virtual class // in order to get rid of usage of static functions and static data class AdvApp2Var_EvaluatorFunc2Var diff --git a/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx b/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx index 9331502e18..ae76e172e8 100644 --- a/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx +++ b/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx @@ -14,18 +14,13 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif #ifndef _AdvApprox_EvaluatorFunction_HeaderFile #define _AdvApprox_EvaluatorFunction_HeaderFile +#include +#include +#include + // abv 01.04.2009: the C function pointer converted to a virtual class // in order to get rid of usage of static functions and static data diff --git a/src/BOPAlgo/BOPAlgo_WireSplitter.lxx b/src/BOPAlgo/BOPAlgo_WireSplitter.lxx index 95000ce89c..01fa726fb8 100644 --- a/src/BOPAlgo/BOPAlgo_WireSplitter.lxx +++ b/src/BOPAlgo/BOPAlgo_WireSplitter.lxx @@ -73,15 +73,12 @@ class BOPAlgo_EdgeInfo { typedef NCollection_List BOPAlgo_ListOfEdgeInfo; typedef BOPAlgo_ListOfEdgeInfo::Iterator BOPAlgo_ListIteratorOfListOfEdgeInfo; -#define _NCollection_MapHasher #include #include typedef NCollection_IndexedDataMap BOPAlgo_IndexedDataMapOfShapeListOfEdgeInfo; -#undef _NCollection_MapHasher - //======================================================================= //function : MakeWire diff --git a/src/BOPCol/BOPCol_DataMapOfIntegerInteger.hxx b/src/BOPCol/BOPCol_DataMapOfIntegerInteger.hxx index a0f1a64efa..36d299a1b1 100644 --- a/src/BOPCol/BOPCol_DataMapOfIntegerInteger.hxx +++ b/src/BOPCol/BOPCol_DataMapOfIntegerInteger.hxx @@ -22,6 +22,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfIntegerInteger; typedef BOPCol_DataMapOfIntegerInteger::Iterator BOPCol_DataMapIteratorOfDataMapOfIntegerInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfIntegerListOfInteger.hxx b/src/BOPCol/BOPCol_DataMapOfIntegerListOfInteger.hxx index c92cb137c0..25c55a94d6 100644 --- a/src/BOPCol/BOPCol_DataMapOfIntegerListOfInteger.hxx +++ b/src/BOPCol/BOPCol_DataMapOfIntegerListOfInteger.hxx @@ -24,6 +24,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfIntegerListOfInteger; typedef BOPCol_DataMapOfIntegerListOfInteger::Iterator BOPCol_DataMapIteratorOfDataMapOfIntegerListOfInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfIntegerListOfShape.hxx b/src/BOPCol/BOPCol_DataMapOfIntegerListOfShape.hxx index 6ec2c980d5..d5bd72929b 100644 --- a/src/BOPCol/BOPCol_DataMapOfIntegerListOfShape.hxx +++ b/src/BOPCol/BOPCol_DataMapOfIntegerListOfShape.hxx @@ -23,7 +23,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfIntegerListOfShape; typedef BOPCol_DataMapOfIntegerListOfShape::Iterator BOPCol_DataMapIteratorOfDataMapOfIntegerListOfShape; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfIntegerMapOfInteger.hxx b/src/BOPCol/BOPCol_DataMapOfIntegerMapOfInteger.hxx index 75a12377bb..6d4a2d5b81 100644 --- a/src/BOPCol/BOPCol_DataMapOfIntegerMapOfInteger.hxx +++ b/src/BOPCol/BOPCol_DataMapOfIntegerMapOfInteger.hxx @@ -24,6 +24,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfIntegerMapOfInteger; typedef BOPCol_DataMapOfIntegerMapOfInteger::Iterator BOPCol_DataMapIteratorOfDataMapOfIntegerMapOfInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfIntegerReal.hxx b/src/BOPCol/BOPCol_DataMapOfIntegerReal.hxx index cbf9a4cf34..bd19d7eca6 100644 --- a/src/BOPCol/BOPCol_DataMapOfIntegerReal.hxx +++ b/src/BOPCol/BOPCol_DataMapOfIntegerReal.hxx @@ -22,6 +22,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfIntegerReal; typedef BOPCol_DataMapOfIntegerReal::Iterator BOPCol_DataMapIteratorOfDataMapOfIntegerReal; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfIntegerShape.hxx b/src/BOPCol/BOPCol_DataMapOfIntegerShape.hxx index 3324aab510..f72ec10240 100644 --- a/src/BOPCol/BOPCol_DataMapOfIntegerShape.hxx +++ b/src/BOPCol/BOPCol_DataMapOfIntegerShape.hxx @@ -15,22 +15,12 @@ #ifndef BOPCol_DataMapOfIntegerShape_HeaderFile #define BOPCol_DataMapOfIntegerShape_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include #include - typedef NCollection_DataMap BOPCol_DataMapOfIntegerShape; typedef BOPCol_DataMapOfIntegerShape::Iterator BOPCol_DataMapIteratorOfDataMapOfIntegerShape; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfShapeAddress.hxx b/src/BOPCol/BOPCol_DataMapOfShapeAddress.hxx index 5aaf7a277c..ec2687787b 100644 --- a/src/BOPCol/BOPCol_DataMapOfShapeAddress.hxx +++ b/src/BOPCol/BOPCol_DataMapOfShapeAddress.hxx @@ -15,13 +15,6 @@ #ifndef BOPCol_DataMapOfShapeAddress_HeaderFile #define BOPCol_DataMapOfShapeAddress_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include @@ -30,7 +23,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfShapeAddress; typedef BOPCol_DataMapOfShapeAddress::Iterator BOPCol_DataMapIteratorOfDataMapOfShapeAddress; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfShapeInteger.hxx b/src/BOPCol/BOPCol_DataMapOfShapeInteger.hxx index c84da2420b..8b96f8a185 100644 --- a/src/BOPCol/BOPCol_DataMapOfShapeInteger.hxx +++ b/src/BOPCol/BOPCol_DataMapOfShapeInteger.hxx @@ -15,13 +15,6 @@ #ifndef BOPCol_DataMapOfShapeInteger_HeaderFile #define BOPCol_DataMapOfShapeInteger_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include @@ -30,6 +23,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfShapeInteger; typedef BOPCol_DataMapOfShapeInteger::Iterator BOPCol_DataMapIteratorOfDataMapOfShapeInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfShapeListOfShape.hxx b/src/BOPCol/BOPCol_DataMapOfShapeListOfShape.hxx index e4e4c5af0f..38cc0464d7 100644 --- a/src/BOPCol/BOPCol_DataMapOfShapeListOfShape.hxx +++ b/src/BOPCol/BOPCol_DataMapOfShapeListOfShape.hxx @@ -21,11 +21,7 @@ #include - - typedef NCollection_DataMap BOPCol_DataMapOfShapeListOfShape; typedef BOPCol_DataMapOfShapeListOfShape::Iterator BOPCol_DataMapIteratorOfDataMapOfShapeListOfShape; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfShapeShape.hxx b/src/BOPCol/BOPCol_DataMapOfShapeShape.hxx index 9890d9dc73..a627c9233d 100644 --- a/src/BOPCol/BOPCol_DataMapOfShapeShape.hxx +++ b/src/BOPCol/BOPCol_DataMapOfShapeShape.hxx @@ -23,7 +23,4 @@ typedef NCollection_DataMap BOPCol_DataMapOfShapeShape; typedef BOPCol_DataMapOfShapeShape::Iterator BOPCol_DataMapIteratorOfDataMapOfShapeShape; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_DataMapOfTransientAddress.hxx b/src/BOPCol/BOPCol_DataMapOfTransientAddress.hxx index ae1803be9a..d26d585913 100644 --- a/src/BOPCol/BOPCol_DataMapOfTransientAddress.hxx +++ b/src/BOPCol/BOPCol_DataMapOfTransientAddress.hxx @@ -15,21 +15,10 @@ #ifndef BOPCol_DataMapOfTransientAddress_HeaderFile #define BOPCol_DataMapOfTransientAddress_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - - #include #include typedef NCollection_DataMap BOPCol_DataMapOfTransientAddress; typedef BOPCol_DataMapOfTransientAddress::Iterator BOPCol_DataMapIteratorOfDataMapOfTransientAddress; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_IndexedDataMapOfIntegerListOfInteger.hxx b/src/BOPCol/BOPCol_IndexedDataMapOfIntegerListOfInteger.hxx index aaca62c5c4..694e11aea7 100644 --- a/src/BOPCol/BOPCol_IndexedDataMapOfIntegerListOfInteger.hxx +++ b/src/BOPCol/BOPCol_IndexedDataMapOfIntegerListOfInteger.hxx @@ -23,6 +23,4 @@ typedef NCollection_IndexedDataMap BOPCol_IndexedDataMapOfIntegerListOfInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_IndexedDataMapOfShapeBox.hxx b/src/BOPCol/BOPCol_IndexedDataMapOfShapeBox.hxx index fb1f874eb8..f1179937df 100644 --- a/src/BOPCol/BOPCol_IndexedDataMapOfShapeBox.hxx +++ b/src/BOPCol/BOPCol_IndexedDataMapOfShapeBox.hxx @@ -21,10 +21,6 @@ #include - typedef NCollection_IndexedDataMap BOPCol_IndexedDataMapOfShapeBox; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_IndexedDataMapOfShapeInteger.hxx b/src/BOPCol/BOPCol_IndexedDataMapOfShapeInteger.hxx index bba1201583..9eaf1b489e 100644 --- a/src/BOPCol/BOPCol_IndexedDataMapOfShapeInteger.hxx +++ b/src/BOPCol/BOPCol_IndexedDataMapOfShapeInteger.hxx @@ -15,13 +15,6 @@ #ifndef BOPCol_IndexedDataMapOfShapeInteger_HeaderFile #define BOPCol_IndexedDataMapOfShapeInteger_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include @@ -29,6 +22,4 @@ typedef NCollection_IndexedDataMap BOPCol_IndexedDataMapOfShapeInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_IndexedDataMapOfShapeListOfShape.hxx b/src/BOPCol/BOPCol_IndexedDataMapOfShapeListOfShape.hxx index d6a4f09b97..5986e80094 100644 --- a/src/BOPCol/BOPCol_IndexedDataMapOfShapeListOfShape.hxx +++ b/src/BOPCol/BOPCol_IndexedDataMapOfShapeListOfShape.hxx @@ -23,7 +23,5 @@ #include typedef NCollection_IndexedDataMap BOPCol_IndexedDataMapOfShapeListOfShape; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_IndexedMapOfInteger.hxx b/src/BOPCol/BOPCol_IndexedMapOfInteger.hxx index f1dda9238d..448c1bfe58 100644 --- a/src/BOPCol/BOPCol_IndexedMapOfInteger.hxx +++ b/src/BOPCol/BOPCol_IndexedMapOfInteger.hxx @@ -20,6 +20,4 @@ typedef NCollection_IndexedMap BOPCol_IndexedMapOfInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_IndexedMapOfShape.hxx b/src/BOPCol/BOPCol_IndexedMapOfShape.hxx index 46b6d19947..266b050a25 100644 --- a/src/BOPCol/BOPCol_IndexedMapOfShape.hxx +++ b/src/BOPCol/BOPCol_IndexedMapOfShape.hxx @@ -17,13 +17,8 @@ #include #include - - #include typedef NCollection_IndexedMap BOPCol_IndexedMapOfShape; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_ListOfInteger.hxx b/src/BOPCol/BOPCol_ListOfInteger.hxx index 74e3a03c54..fb3776f54c 100644 --- a/src/BOPCol/BOPCol_ListOfInteger.hxx +++ b/src/BOPCol/BOPCol_ListOfInteger.hxx @@ -15,13 +15,6 @@ #ifndef BOPCol_ListOfInteger_HeaderFile #define BOPCol_ListOfInteger_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include typedef NCollection_List BOPCol_ListOfInteger; diff --git a/src/BOPCol/BOPCol_MapOfInteger.hxx b/src/BOPCol/BOPCol_MapOfInteger.hxx index 42ce1da367..8ecce20858 100644 --- a/src/BOPCol/BOPCol_MapOfInteger.hxx +++ b/src/BOPCol/BOPCol_MapOfInteger.hxx @@ -15,21 +15,10 @@ #ifndef BOPCol_MapOfInteger_HeaderFile #define BOPCol_MapOfInteger_HeaderFile - -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include - #include typedef NCollection_Map BOPCol_MapOfInteger; typedef BOPCol_MapOfInteger::Iterator BOPCol_MapIteratorOfMapOfInteger; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_MapOfOrientedShape.hxx b/src/BOPCol/BOPCol_MapOfOrientedShape.hxx index 68f0bfbc49..ac93163b38 100644 --- a/src/BOPCol/BOPCol_MapOfOrientedShape.hxx +++ b/src/BOPCol/BOPCol_MapOfOrientedShape.hxx @@ -23,7 +23,4 @@ typedef NCollection_Map BOPCol_MapOfOrientedShape; typedef BOPCol_MapOfOrientedShape::Iterator BOPCol_MapIteratorOfMapOfOrientedShape; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPCol/BOPCol_MapOfShape.hxx b/src/BOPCol/BOPCol_MapOfShape.hxx index 804e972621..149f3bd502 100644 --- a/src/BOPCol/BOPCol_MapOfShape.hxx +++ b/src/BOPCol/BOPCol_MapOfShape.hxx @@ -23,6 +23,4 @@ typedef NCollection_Map BOPCol_MapOfShape; typedef BOPCol_MapOfShape::Iterator BOPCol_MapIteratorOfMapOfShape; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPCol/BOPCol_VectorOfInteger.hxx b/src/BOPCol/BOPCol_VectorOfInteger.hxx index c1e3bf4476..5a09194e38 100644 --- a/src/BOPCol/BOPCol_VectorOfInteger.hxx +++ b/src/BOPCol/BOPCol_VectorOfInteger.hxx @@ -15,16 +15,8 @@ #ifndef BOPCol_VectorOfInteger_HeaderFile #define BOPCol_VectorOfInteger_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include typedef BOPCol_Array1 BOPDS_VectorOfInteger; - #endif diff --git a/src/BOPDS/BOPDS_DataMapOfIntegerListOfPaveBlock.hxx b/src/BOPDS/BOPDS_DataMapOfIntegerListOfPaveBlock.hxx index c49bf9e40b..6cd2db3c56 100644 --- a/src/BOPDS/BOPDS_DataMapOfIntegerListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_DataMapOfIntegerListOfPaveBlock.hxx @@ -15,21 +15,10 @@ #ifndef BOPDS_DataMapOfIntegerListOfPaveBlock_HeaderFile #define BOPDS_DataMapOfIntegerListOfPaveBlock_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#define _NCollection_MapHasher #include #include #include typedef NCollection_DataMap BOPDS_DataMapOfIntegerListOfPaveBlock; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPDS/BOPDS_DataMapOfPassKeyListOfPaveBlock.hxx b/src/BOPDS/BOPDS_DataMapOfPassKeyListOfPaveBlock.hxx index 6250ef0096..631e1e8f4e 100644 --- a/src/BOPDS/BOPDS_DataMapOfPassKeyListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_DataMapOfPassKeyListOfPaveBlock.hxx @@ -15,8 +15,6 @@ #ifndef BOPDS_DataMapOfPassKeyListOfPaveBlock_HeaderFile #define BOPDS_DataMapOfPassKeyListOfPaveBlock_HeaderFile - -#define _NCollection_MapHasher #include #include @@ -26,6 +24,4 @@ typedef NCollection_DataMap BOPDS_DataMapOfPassKeyListOfPaveBlock; typedef BOPDS_DataMapOfPassKeyListOfPaveBlock::Iterator BOPDS_DataMapIteratorOfDataMapOfPassKeyListOfPaveBlock; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_DataMapOfPaveBlockCommonBlock.hxx b/src/BOPDS/BOPDS_DataMapOfPaveBlockCommonBlock.hxx index 6c17caed36..0694c8386d 100644 --- a/src/BOPDS/BOPDS_DataMapOfPaveBlockCommonBlock.hxx +++ b/src/BOPDS/BOPDS_DataMapOfPaveBlockCommonBlock.hxx @@ -16,7 +16,6 @@ #ifndef BOPDS_DataMapOfPaveBlockCommonBlock_HeaderFile #define BOPDS_DataMapOfPaveBlockCommonBlock_HeaderFile -#define _NCollection_MapHasher #include #include #include @@ -24,7 +23,4 @@ typedef NCollection_DataMap BOPDS_DataMapOfPaveBlockCommonBlock; typedef BOPDS_DataMapOfPaveBlockCommonBlock::Iterator BOPDS_DataMapIteratorOfDataMapOfPaveBlockCommonBlock; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfInteger.hxx b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfInteger.hxx index ce86dfd0a6..a1438741dd 100644 --- a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfInteger.hxx +++ b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfInteger.hxx @@ -15,15 +15,11 @@ #ifndef BOPDS_DataMapOfPaveBlockListOfInteger_HeaderFile #define BOPDS_DataMapOfPaveBlockListOfInteger_HeaderFile -#define _NCollection_MapHasher #include #include #include typedef NCollection_DataMap BOPDS_DataMapOfPaveBlockListOfInteger; typedef BOPDS_DataMapOfPaveBlockListOfInteger::Iterator BOPDS_DataMapIteratorOfDataMapOfPaveBlockListOfInteger; - -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx index 7f2ae2af72..fa2f68daec 100644 --- a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx @@ -15,7 +15,6 @@ #ifndef BOPDS_DataMapOfPaveBlockListOfPaveBlock_HeaderFile #define BOPDS_DataMapOfPaveBlockListOfPaveBlock_HeaderFile -#define _NCollection_MapHasher #include #include #include @@ -24,7 +23,4 @@ typedef NCollection_DataMap BOPDS_DataMapOfPaveBlockListOfPaveBlock; typedef BOPDS_DataMapOfPaveBlockListOfPaveBlock::Iterator BOPDS_DataMapIteratorOfDataMapOfPaveBlockListOfPaveBlock; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPDS/BOPDS_DataMapOfShapeCoupleOfPaveBlocks.hxx b/src/BOPDS/BOPDS_DataMapOfShapeCoupleOfPaveBlocks.hxx index 6d48413c2f..b34cf3d042 100644 --- a/src/BOPDS/BOPDS_DataMapOfShapeCoupleOfPaveBlocks.hxx +++ b/src/BOPDS/BOPDS_DataMapOfShapeCoupleOfPaveBlocks.hxx @@ -17,13 +17,10 @@ #include -#define _NCollection_MapHasher #include #include typedef NCollection_DataMap BOPDS_DataMapOfShapeCoupleOfPaveBlocks; typedef BOPDS_DataMapOfShapeCoupleOfPaveBlocks::Iterator BOPDS_DataMapIteratorOfDataMapOfShapeCoupleOfPaveBlocks; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfInteger.hxx b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfInteger.hxx index 4065fe4791..01235d9b09 100644 --- a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfInteger.hxx +++ b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfInteger.hxx @@ -15,14 +15,10 @@ #ifndef BOPDS_IndexedDataMapOfPaveBlockListOfInteger_HeaderFile #define BOPDS_IndexedDataMapOfPaveBlockListOfInteger_HeaderFile -#define _NCollection_MapHasher #include #include #include typedef NCollection_IndexedDataMap BOPDS_IndexedDataMapOfPaveBlockListOfInteger; - -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx index 2394fdecb0..c8e0382c41 100644 --- a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx @@ -15,15 +15,11 @@ #ifndef BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock_HeaderFile #define BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock_HeaderFile -#define _NCollection_MapHasher #include #include #include #include typedef NCollection_IndexedDataMap BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock; - -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_IndexedDataMapOfShapeCoupleOfPaveBlocks.hxx b/src/BOPDS/BOPDS_IndexedDataMapOfShapeCoupleOfPaveBlocks.hxx index 0446d83599..dce2513132 100644 --- a/src/BOPDS/BOPDS_IndexedDataMapOfShapeCoupleOfPaveBlocks.hxx +++ b/src/BOPDS/BOPDS_IndexedDataMapOfShapeCoupleOfPaveBlocks.hxx @@ -17,12 +17,9 @@ #include -#define _NCollection_MapHasher #include #include typedef NCollection_IndexedDataMap BOPDS_IndexedDataMapOfShapeCoupleOfPaveBlocks; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx b/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx index 0c9d5782e5..8ed5f34858 100644 --- a/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx @@ -15,14 +15,10 @@ #ifndef BOPDS_IndexedMapOfPaveBlock_HeaderFile #define BOPDS_IndexedMapOfPaveBlock_HeaderFile -#define _NCollection_MapHasher #include #include #include -typedef NCollection_IndexedMap BOPDS_IndexedMapOfPaveBlock; - -#undef _NCollection_MapHasher - +typedef NCollection_IndexedMap BOPDS_IndexedMapOfPaveBlock; #endif diff --git a/src/BOPDS/BOPDS_Interf.hxx b/src/BOPDS/BOPDS_Interf.hxx index 902274813a..2b7eb146d6 100644 --- a/src/BOPDS/BOPDS_Interf.hxx +++ b/src/BOPDS/BOPDS_Interf.hxx @@ -15,24 +15,11 @@ #ifndef BOPDS_Interf_HeaderFile #define BOPDS_Interf_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Standard_Integer_HeaderFile -#include -#endif - -#ifndef _IntTools_CommonPrt_HeaderFile #include -#endif - #include #include #include + /** * The class BOPDS_Interf is is to store the information about * the interference between two shapes. diff --git a/src/BOPDS/BOPDS_MapOfCommonBlock.hxx b/src/BOPDS/BOPDS_MapOfCommonBlock.hxx index 40e7ae51a9..6ab0203832 100644 --- a/src/BOPDS/BOPDS_MapOfCommonBlock.hxx +++ b/src/BOPDS/BOPDS_MapOfCommonBlock.hxx @@ -15,7 +15,6 @@ #ifndef BOPDS_MapOfCommonBlock_HeaderFile #define BOPDS_MapOfCommonBlock_HeaderFile -#define _NCollection_MapHasher #include #include #include @@ -23,7 +22,4 @@ typedef NCollection_Map BOPDS_MapOfCommonBlock; typedef BOPDS_MapOfCommonBlock::Iterator BOPDS_MapIteratorOfMapOfCommonBlock; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPDS/BOPDS_MapOfPassKey.hxx b/src/BOPDS/BOPDS_MapOfPassKey.hxx index 8f1a16b25b..39fcb0a716 100644 --- a/src/BOPDS/BOPDS_MapOfPassKey.hxx +++ b/src/BOPDS/BOPDS_MapOfPassKey.hxx @@ -15,7 +15,6 @@ #ifndef BOPDS_MapOfPassKey_HeaderFile #define BOPDS_MapOfPassKey_HeaderFile -#define _NCollection_MapHasher #include #include #include @@ -24,7 +23,4 @@ typedef NCollection_Map BOPDS_MapOfPassKey; typedef BOPDS_MapOfPassKey::Iterator BOPDS_MapIteratorMapOfPassKey; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPDS/BOPDS_MapOfPassKeyBoolean.hxx b/src/BOPDS/BOPDS_MapOfPassKeyBoolean.hxx index dcbe0c0cf0..1cfe9dd8f3 100644 --- a/src/BOPDS/BOPDS_MapOfPassKeyBoolean.hxx +++ b/src/BOPDS/BOPDS_MapOfPassKeyBoolean.hxx @@ -15,7 +15,6 @@ #ifndef BOPDS_MapOfPassKeyBoolean_HeaderFile #define BOPDS_MapOfPassKeyBoolean_HeaderFile -#define _NCollection_MapHasher #include #include #include @@ -23,6 +22,4 @@ typedef NCollection_Map BOPDS_MapOfPassKeyBoolean; typedef BOPDS_MapOfPassKeyBoolean::Iterator BOPDS_MapIteratorMapOfPassKeyBoolean; -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPDS/BOPDS_MapOfPave.hxx b/src/BOPDS/BOPDS_MapOfPave.hxx index 23e6391c9f..cbe083a5c7 100644 --- a/src/BOPDS/BOPDS_MapOfPave.hxx +++ b/src/BOPDS/BOPDS_MapOfPave.hxx @@ -15,16 +15,11 @@ #ifndef BOPDS_MapOfPave_HeaderFile #define BOPDS_MapOfPave_HeaderFile -#define _NCollection_MapHasher #include #include #include - typedef NCollection_Map BOPDS_MapOfPave; typedef BOPDS_MapOfPave::Iterator BOPDS_MapIteratorMapOfPave; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPDS/BOPDS_MapOfPaveBlock.hxx b/src/BOPDS/BOPDS_MapOfPaveBlock.hxx index b7b9c07735..784e101104 100644 --- a/src/BOPDS/BOPDS_MapOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_MapOfPaveBlock.hxx @@ -15,7 +15,6 @@ #ifndef BOPDS_MapOfPaveBlock_HeaderFile #define BOPDS_MapOfPaveBlock_HeaderFile -#define _NCollection_MapHasher #include #include #include @@ -23,7 +22,4 @@ typedef NCollection_Map BOPDS_MapOfPaveBlock; typedef BOPDS_MapOfPaveBlock::Iterator BOPDS_MapIteratorOfMapOfPaveBlock; -#undef _NCollection_MapHasher - - #endif diff --git a/src/BOPTools/BOPTools_ConnexityBlock.hxx b/src/BOPTools/BOPTools_ConnexityBlock.hxx index 9666ca6439..5a5e54e454 100644 --- a/src/BOPTools/BOPTools_ConnexityBlock.hxx +++ b/src/BOPTools/BOPTools_ConnexityBlock.hxx @@ -15,13 +15,6 @@ #ifndef BOPTools_ConnexityBlock_HeaderFile #define BOPTools_ConnexityBlock_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/BOPTools/BOPTools_DataMapOfShapeSet.hxx b/src/BOPTools/BOPTools_DataMapOfShapeSet.hxx index e3df6238ad..f8e8985c37 100644 --- a/src/BOPTools/BOPTools_DataMapOfShapeSet.hxx +++ b/src/BOPTools/BOPTools_DataMapOfShapeSet.hxx @@ -18,13 +18,9 @@ #include #include -#define _NCollection_MapHasher #include typedef NCollection_DataMap BOPTools_DataMapOfShapeSet; typedef BOPTools_DataMapOfShapeSet::Iterator BOPCol_DataMapIteratorOfDataMapOfShapeSet; - -#undef _NCollection_MapHasher - #endif diff --git a/src/BOPTools/BOPTools_MapOfSet.hxx b/src/BOPTools/BOPTools_MapOfSet.hxx index 30b647e88d..b9a1ea2347 100644 --- a/src/BOPTools/BOPTools_MapOfSet.hxx +++ b/src/BOPTools/BOPTools_MapOfSet.hxx @@ -18,12 +18,9 @@ #include #include -#define _NCollection_MapHasher #include typedef NCollection_Map BOPTools_MapOfSet; typedef BOPTools_MapOfSet::Iterator BOPTools_MapIteratorOfMapOfSet; -#undef _NCollection_MapHasher - #endif diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_BndBoxTreeSelector.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_BndBoxTreeSelector.hxx index 6923e89038..9413ec673c 100644 --- a/src/BRepBuilderAPI/BRepBuilderAPI_BndBoxTreeSelector.hxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_BndBoxTreeSelector.hxx @@ -16,15 +16,9 @@ #ifndef _BRepBuilderAPI_BndBoxTreeSelector_Header #define _BRepBuilderAPI_BndBoxTreeSelector_Header -#ifndef _TColStd_ListOfInteger_HeaderFile #include -#endif -#ifndef _Bnd_Box_HeaderFile #include -#endif -#ifndef NCollection_UBTree_HeaderFile #include -#endif typedef NCollection_UBTree BRepBuilderAPI_BndBoxTree; diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_CellFilter.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_CellFilter.hxx index 3d00935076..a03eb18e91 100644 --- a/src/BRepBuilderAPI/BRepBuilderAPI_CellFilter.hxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_CellFilter.hxx @@ -16,18 +16,7 @@ #ifndef _BRepBuilderAPI_CellFilter_HeaderFile #define _BRepBuilderAPI_CellFilter_HeaderFile -#ifndef _gp_XYZ_HeaderFile -#include -#endif -#ifndef _gp_XY_HeaderFile -#include -#endif -#ifndef NCollection_CellFilter_HeaderFile -#include -#endif -#ifndef _BRepBuilderAPI_VertexInspector_HeaderFile #include -#endif typedef NCollection_CellFilter BRepBuilderAPI_CellFilter; diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_VertexInspector.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_VertexInspector.hxx index 5a9777cf0e..d52372625b 100644 --- a/src/BRepBuilderAPI/BRepBuilderAPI_VertexInspector.hxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_VertexInspector.hxx @@ -16,22 +16,11 @@ #ifndef _BRepBuilderAPI_VertexInspector_Header #define _BRepBuilderAPI_VertexInspector_Header -#ifndef _TColStd_ListOfInteger_HeaderFile #include -#endif -#ifndef NCollection_Vector_HeaderFile #include -#endif -#ifndef _gp_XY_HeaderFile #include -#endif -#ifndef _gp_XYZ_HeaderFile #include -#endif - -#ifndef NCollection_CellFilter_HeaderFile #include -#endif typedef NCollection_Vector VectorOfPoint; diff --git a/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx b/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx index 88d492cf9a..90e9cda76b 100644 --- a/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx +++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx @@ -14,52 +14,17 @@ #ifndef _BRepExtrema_DistShapeShape_HeaderFile #define _BRepExtrema_DistShapeShape_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _BRepExtrema_SeqOfSolution_HeaderFile #include -#endif -#ifndef _BRepExtrema_SolutionElem_HeaderFile #include -#endif -#ifndef _TopoDS_Shape_HeaderFile #include -#endif -#ifndef _TopTools_IndexedMapOfShape_HeaderFile #include -#endif -#ifndef _Extrema_ExtFlag_HeaderFile #include -#endif -#ifndef _Extrema_ExtAlgo_HeaderFile #include -#endif -#ifndef _BRepExtrema_SupportType_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile -#include -#endif -#ifndef _gp_Pnt_HeaderFile #include -#endif +#include +#include + class TopoDS_Shape; class TopTools_IndexedMapOfShape; class Bnd_SeqOfBox; diff --git a/src/BRepExtrema/BRepExtrema_DistanceSS.hxx b/src/BRepExtrema/BRepExtrema_DistanceSS.hxx index 01d483f243..56cd6d2e55 100644 --- a/src/BRepExtrema/BRepExtrema_DistanceSS.hxx +++ b/src/BRepExtrema/BRepExtrema_DistanceSS.hxx @@ -14,34 +14,12 @@ #ifndef _BRepExtrema_DistanceSS_HeaderFile #define _BRepExtrema_DistanceSS_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _BRepExtrema_SeqOfSolution_HeaderFile #include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Extrema_ExtFlag_HeaderFile #include -#endif -#ifndef _Extrema_ExtAlgo_HeaderFile #include -#endif -#ifndef _Precision_HeaderFile #include -#endif +#include + class TopoDS_Shape; class Bnd_Box; class TopoDS_Vertex; diff --git a/src/BRepExtrema/BRepExtrema_ExtCC.hxx b/src/BRepExtrema/BRepExtrema_ExtCC.hxx index a397eb789d..c426ec7f1b 100644 --- a/src/BRepExtrema/BRepExtrema_ExtCC.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtCC.hxx @@ -14,31 +14,10 @@ #ifndef _BRepExtrema_ExtCC_HeaderFile #define _BRepExtrema_ExtCC_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Extrema_ExtCC_HeaderFile #include -#endif -#ifndef _Handle_BRepAdaptor_HCurve_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif +#include + class BRepAdaptor_HCurve; class TopoDS_Edge; class gp_Pnt; diff --git a/src/BRepExtrema/BRepExtrema_ExtCF.hxx b/src/BRepExtrema/BRepExtrema_ExtCF.hxx index 24247e461b..cff941a587 100644 --- a/src/BRepExtrema/BRepExtrema_ExtCF.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtCF.hxx @@ -14,46 +14,15 @@ #ifndef _BRepExtrema_ExtCF_HeaderFile #define _BRepExtrema_ExtCF_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Extrema_ExtCS_HeaderFile #include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _TColStd_SequenceOfReal_HeaderFile #include -#endif -#ifndef _Extrema_SequenceOfPOnSurf_HeaderFile #include -#endif -#ifndef _Extrema_SequenceOfPOnCurv_HeaderFile #include -#endif -#ifndef _Handle_BRepAdaptor_HSurface_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Extrema_POnCurv_HeaderFile #include -#endif -#ifndef _Extrema_POnSurf_HeaderFile #include -#endif +#include + class BRepAdaptor_HSurface; class TopoDS_Edge; class TopoDS_Face; diff --git a/src/BRepExtrema/BRepExtrema_ExtFF.hxx b/src/BRepExtrema/BRepExtrema_ExtFF.hxx index d14c52ca87..05fe925ac4 100644 --- a/src/BRepExtrema/BRepExtrema_ExtFF.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtFF.hxx @@ -14,40 +14,13 @@ #ifndef _BRepExtrema_ExtFF_HeaderFile #define _BRepExtrema_ExtFF_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Extrema_ExtSS_HeaderFile #include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _TColStd_SequenceOfReal_HeaderFile #include -#endif -#ifndef _Extrema_SequenceOfPOnSurf_HeaderFile #include -#endif -#ifndef _Handle_BRepAdaptor_HSurface_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Extrema_POnSurf_HeaderFile #include -#endif +#include + class BRepAdaptor_HSurface; class TopoDS_Face; class gp_Pnt; diff --git a/src/BRepExtrema/BRepExtrema_ExtPC.hxx b/src/BRepExtrema/BRepExtrema_ExtPC.hxx index a0ddc68001..188b10bb04 100644 --- a/src/BRepExtrema/BRepExtrema_ExtPC.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtPC.hxx @@ -14,31 +14,10 @@ #ifndef _BRepExtrema_ExtPC_HeaderFile #define _BRepExtrema_ExtPC_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Extrema_ExtPC_HeaderFile #include -#endif -#ifndef _Handle_BRepAdaptor_HCurve_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif +#include + class BRepAdaptor_HCurve; class TopoDS_Vertex; class TopoDS_Edge; diff --git a/src/BRepExtrema/BRepExtrema_ExtPF.hxx b/src/BRepExtrema/BRepExtrema_ExtPF.hxx index 7a8e70f673..5c50f7e07f 100644 --- a/src/BRepExtrema/BRepExtrema_ExtPF.hxx +++ b/src/BRepExtrema/BRepExtrema_ExtPF.hxx @@ -14,43 +14,15 @@ #ifndef _BRepExtrema_ExtPF_HeaderFile #define _BRepExtrema_ExtPF_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile #include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Extrema_ExtPS_HeaderFile #include -#endif -#ifndef _Standard_Integer_HeaderFile #include -#endif -#ifndef _TColStd_SequenceOfReal_HeaderFile #include -#endif -#ifndef _Extrema_SequenceOfPOnSurf_HeaderFile #include -#endif -#ifndef _BRepAdaptor_Surface_HeaderFile #include -#endif -#ifndef _Extrema_ExtFlag_HeaderFile #include -#endif -#ifndef _Extrema_ExtAlgo_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif + class TopoDS_Vertex; class TopoDS_Face; class gp_Pnt; diff --git a/src/BRepExtrema/BRepExtrema_Poly.hxx b/src/BRepExtrema/BRepExtrema_Poly.hxx index aa5048e8e0..6083f179f7 100644 --- a/src/BRepExtrema/BRepExtrema_Poly.hxx +++ b/src/BRepExtrema/BRepExtrema_Poly.hxx @@ -14,28 +14,16 @@ #ifndef _BRepExtrema_Poly_HeaderFile #define _BRepExtrema_Poly_HeaderFile -#ifndef _Standard_HeaderFile #include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif class TopoDS_Shape; class gp_Pnt; - class BRepExtrema_Poly { public: - //! returns Standard_True if OK.
+ //! returns Standard_True if OK. Standard_EXPORT static Standard_Boolean Distance(const TopoDS_Shape& S1,const TopoDS_Shape& S2,gp_Pnt& P1,gp_Pnt& P2,Standard_Real& dist); }; diff --git a/src/BRepExtrema/BRepExtrema_SeqOfSolution.hxx b/src/BRepExtrema/BRepExtrema_SeqOfSolution.hxx index 0cf81b3be2..8e368ffd27 100644 --- a/src/BRepExtrema/BRepExtrema_SeqOfSolution.hxx +++ b/src/BRepExtrema/BRepExtrema_SeqOfSolution.hxx @@ -19,12 +19,8 @@ #ifndef _BRepExtrema_SeqOfSolution_HeaderFile #define _BRepExtrema_SeqOfSolution_HeaderFile -#ifndef _NCollection_Sequence_HeaderFile #include -#endif -#ifndef _BRepExtrema_SolutionElem_HeaderFile #include -#endif typedef NCollection_Sequence BRepExtrema_SeqOfSolution; diff --git a/src/BRepExtrema/BRepExtrema_SolutionElem.hxx b/src/BRepExtrema/BRepExtrema_SolutionElem.hxx index 5264cf45cc..61dba48bbd 100644 --- a/src/BRepExtrema/BRepExtrema_SolutionElem.hxx +++ b/src/BRepExtrema/BRepExtrema_SolutionElem.hxx @@ -19,130 +19,137 @@ #ifndef _BRepExtrema_SolutionElem_HeaderFile #define _BRepExtrema_SolutionElem_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _gp_Pnt_HeaderFile #include -#endif -#ifndef _BRepExtrema_SupportType_HeaderFile #include -#endif -#ifndef _TopoDS_Vertex_HeaderFile #include -#endif -#ifndef _TopoDS_Edge_HeaderFile #include -#endif -#ifndef _TopoDS_Face_HeaderFile #include -#endif -class gp_Pnt; -class TopoDS_Vertex; -class TopoDS_Edge; -class TopoDS_Face; - -//! This class is used to store information relative to the
-//! minimum distance between two shapes.
+//! This class is used to store information relative to the minimum distance between two shapes. class BRepExtrema_SolutionElem { public: DEFINE_STANDARD_ALLOC - Standard_EXPORT BRepExtrema_SolutionElem() - : myDist(0.), myPoint(0.,0.,0.), mySupType(BRepExtrema_IsVertex), myPar1(0.), myPar2(0.) + //! Empty constructor + BRepExtrema_SolutionElem() + : myDist (0.0), + myPoint (0.0, 0.0, 0.0), + mySupType (BRepExtrema_IsVertex), + myPar1 (0.0), + myPar2 (0.0) { } - //! initialisation of the fields
- //! This constructor is used when the solution of a distance is a Vertex.
- //! The different initialized fields are:
- //! _ the distance d
- //! _ the solution point
- //! _ the type of solution
- //! _ and the Vertex.
- Standard_EXPORT BRepExtrema_SolutionElem(const Standard_Real d,const gp_Pnt& Pt,const BRepExtrema_SupportType SolType,const TopoDS_Vertex& vertex) - : myDist(d), myPoint(Pt), mySupType(SolType), myVertex(vertex), myPar1(0.), myPar2(0.) - { - } - //! initialisation of the fiels.
- //! This constructor is used when the solution of distance is on an Edge.
- //! The different initialized fields are:
- //! _ the distance d,
- //! _ the solution point,
- //! _ the type of solution,
- //! _ the Edge,
- //! _ and the parameter t to locate the solution.
- Standard_EXPORT BRepExtrema_SolutionElem(const Standard_Real d,const gp_Pnt& Pt,const BRepExtrema_SupportType SolType,const TopoDS_Edge& edge,const Standard_Real t) - : myDist(d), myPoint(Pt), mySupType(SolType), myEdge(edge), myPar1(t), myPar2(0.) - { - } - //! initialisation of the fields
- //! This constructor is used when the solution of distance is in
- //! a Face. The different initialized fields are:
- //! _ the distance d,
- //! _ the solution point,
- //! _ the type of solution,
- //! _ the Face,
- //! _ and the parameter u et v to locate the solution.
- Standard_EXPORT BRepExtrema_SolutionElem(const Standard_Real d,const gp_Pnt& Pt,const BRepExtrema_SupportType SolType,const TopoDS_Face& face,const Standard_Real u,const Standard_Real v) - : myDist(d), myPoint(Pt), mySupType(SolType), myFace(face), myPar1(u), myPar2(v) - { - } - //! returns the value of the minimum distance.
- Standard_EXPORT Standard_Real Dist() const + + //! This constructor is used when the solution of a distance is a Vertex. + //! The different initialized fields are: + //! @param theDist the distance + //! @param thePoint the solution point + //! @param theSolType the type of solution + //! @param theVertex and the Vertex + BRepExtrema_SolutionElem (const Standard_Real theDist, + const gp_Pnt& thePoint, + const BRepExtrema_SupportType theSolType, + const TopoDS_Vertex& theVertex) + : myDist (theDist), + myPoint (thePoint), + mySupType (theSolType), + myVertex (theVertex), + myPar1 (0.0), + myPar2 (0.0) {} + + //! This constructor is used when the solution of distance is on an Edge. + //! The different initialized fields are: + //! @param theDist the distance + //! @param thePoint the solution point + //! @param theSolType the type of solution + //! @param theEdge the Edge + //! @param theParam the parameter to locate the solution + BRepExtrema_SolutionElem (const Standard_Real theDist, + const gp_Pnt& thePoint, + const BRepExtrema_SupportType theSolType, + const TopoDS_Edge& theEdge, + const Standard_Real theParam) + : myDist (theDist), + myPoint (thePoint), + mySupType (theSolType), + myEdge (theEdge), + myPar1 (theParam), + myPar2 (0.0) {} + + //! This constructor is used when the solution of distance is in a Face. + //! The different initialized fields are: + //! @param theDist the distance + //! @param thePoint the solution point + //! @param theSolType the type of solution + //! @param theFace the Face + //! @param theU U parameter to locate the solution + //! @param theV V parameter to locate the solution + BRepExtrema_SolutionElem (const Standard_Real theDist, + const gp_Pnt& thePoint, + const BRepExtrema_SupportType theSolType, + const TopoDS_Face& theFace, + const Standard_Real theU, + const Standard_Real theV) + : myDist (theDist), + myPoint (thePoint), + mySupType (theSolType), + myFace (theFace), + myPar1 (theU), + myPar2 (theV) {} + + //! Returns the value of the minimum distance. + Standard_Real Dist() const { return myDist; } - //! returns the solution point.
- Standard_EXPORT const gp_Pnt & Point() const + + //! Returns the solution point. + const gp_Pnt& Point() const { return myPoint; } - //! returns the Support type :
- //! IsVertex => The solution is a vertex.
- //! IsOnEdge => The solution belongs to an Edge.
- //! IsInFace => The solution is inside a Face.
- Standard_EXPORT BRepExtrema_SupportType SupportKind() const + + //! Returns the Support type: + //! IsVertex => The solution is a vertex. + //! IsOnEdge => The solution belongs to an Edge. + //! IsInFace => The solution is inside a Face. + BRepExtrema_SupportType SupportKind() const { return mySupType; } - //! returns the vertex if the solution is a Vertex.
- Standard_EXPORT const TopoDS_Vertex & Vertex() const + + //! Returns the vertex if the solution is a Vertex. + const TopoDS_Vertex& Vertex() const { return myVertex; } - //! returns the vertex if the solution is an Edge.
- Standard_EXPORT const TopoDS_Edge & Edge() const + + //! Returns the vertex if the solution is an Edge. + const TopoDS_Edge& Edge() const { return myEdge; } - //! returns the vertex if the solution is an Face.
- Standard_EXPORT const TopoDS_Face & Face() const + + //! Returns the vertex if the solution is an Face. + const TopoDS_Face& Face() const { return myFace; } - //! returns the parameter t if the solution is on Edge.
- Standard_EXPORT void EdgeParameter(Standard_Real& par1) const + + //! Returns the parameter value if the solution is on Edge. + void EdgeParameter (Standard_Real& theParam) const { - par1 = myPar1; + theParam = myPar1; } - //! returns the parameters u et v if the solution is in a Face.
- Standard_EXPORT void FaceParameter(Standard_Real& par1,Standard_Real& par2) const + + //! Returns the parameters U and V if the solution is in a Face. + void FaceParameter (Standard_Real& theU, + Standard_Real& theV) const { - par1 = myPar1; - par2 = myPar2; + theU = myPar1; + theV = myPar2; } private: @@ -155,6 +162,7 @@ class BRepExtrema_SolutionElem TopoDS_Face myFace; Standard_Real myPar1; Standard_Real myPar2; + }; #endif diff --git a/src/BRepExtrema/BRepExtrema_SupportType.hxx b/src/BRepExtrema/BRepExtrema_SupportType.hxx index ee9114a909..47d475bf4f 100644 --- a/src/BRepExtrema/BRepExtrema_SupportType.hxx +++ b/src/BRepExtrema/BRepExtrema_SupportType.hxx @@ -26,8 +26,4 @@ enum BRepExtrema_SupportType BRepExtrema_IsInFace }; -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif - #endif diff --git a/src/BRepMesh/BRepMesh_Delaun.hxx b/src/BRepMesh/BRepMesh_Delaun.hxx index d683e6be87..f4cfc78b75 100755 --- a/src/BRepMesh/BRepMesh_Delaun.hxx +++ b/src/BRepMesh/BRepMesh_Delaun.hxx @@ -34,91 +34,88 @@ class TColStd_Array1OfInteger; class TColStd_SequenceOfInteger; class TColStd_MapOfInteger; -//! Compute the Delaunay's triangulation with the
-//! algorithm of Watson.
-class BRepMesh_Delaun { +//! Compute the Delaunay's triangulation with the algorithm of Watson. +class BRepMesh_Delaun +{ public: DEFINE_STANDARD_ALLOC - //! Creates the triangulation with an empty Mesh
- //! data structure.
- Standard_EXPORT BRepMesh_Delaun( BRepMesh_Array1OfVertexOfDelaun& theVertices, - const Standard_Boolean isPositive = Standard_True ); + //! Creates the triangulation with an empty Mesh data structure. + Standard_EXPORT BRepMesh_Delaun (BRepMesh_Array1OfVertexOfDelaun& theVertices, + const Standard_Boolean isPositive = Standard_True); - //! Creates the triangulation with and existent
- //! Mesh data structure.
- Standard_EXPORT BRepMesh_Delaun( const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh, + //! Creates the triangulation with an existent Mesh data structure. + Standard_EXPORT BRepMesh_Delaun (const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh, BRepMesh_Array1OfVertexOfDelaun& theVertices, - const Standard_Boolean isPositive = Standard_True ); + const Standard_Boolean isPositive = Standard_True); - //! Creates the triangulation with and existant
- //! Mesh data structure.
- Standard_EXPORT BRepMesh_Delaun( const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh, + //! Creates the triangulation with an existant Mesh data structure. + Standard_EXPORT BRepMesh_Delaun (const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh, TColStd_Array1OfInteger& theVertexIndices, - const Standard_Boolean isPositive = Standard_True ); + const Standard_Boolean isPositive = Standard_True); - //! Initializes the triangulation with an array of
- //! vertices.
- Standard_EXPORT void Init( BRepMesh_Array1OfVertexOfDelaun& theVertices ); + //! Initializes the triangulation with an array of vertices. + Standard_EXPORT void Init (BRepMesh_Array1OfVertexOfDelaun& theVertices); - //! Removes a vertex from the triangulation.
- Standard_EXPORT void RemoveVertex( const BRepMesh_Vertex& theVertex ); + //! Removes a vertex from the triangulation. + Standard_EXPORT void RemoveVertex (const BRepMesh_Vertex& theVertex); - //! Adds some vertices into the triangulation.
- Standard_EXPORT void AddVertices( BRepMesh_Array1OfVertexOfDelaun& theVertices ); + //! Adds some vertices into the triangulation. + Standard_EXPORT void AddVertices (BRepMesh_Array1OfVertexOfDelaun& theVertices); - //! Modify mesh to use the edge. Return True if done.
- Standard_EXPORT Standard_Boolean UseEdge( const Standard_Integer theEdge ); + //! Modify mesh to use the edge. + //! @return True if done + Standard_EXPORT Standard_Boolean UseEdge (const Standard_Integer theEdge); - //! Gives the Mesh data structure.
- Standard_EXPORT const Handle(BRepMesh_DataStructureOfDelaun)& Result() const + //! Gives the Mesh data structure. + const Handle(BRepMesh_DataStructureOfDelaun)& Result() const { return myMeshData; } - //! Gives the list of frontier edges
+ //! Gives the list of frontier edges. inline Handle(BRepMesh_MapOfInteger) Frontier() const { - return getEdgesByType( BRepMesh_Frontier ); + return getEdgesByType (BRepMesh_Frontier); } - //! Gives the list of internal edges
+ //! Gives the list of internal edges. inline Handle(BRepMesh_MapOfInteger) InternalEdges() const { - return getEdgesByType( BRepMesh_Fixed ); + return getEdgesByType (BRepMesh_Fixed); } - //! Gives the list of free edges used only one time
+ //! Gives the list of free edges used only one time inline Handle(BRepMesh_MapOfInteger) FreeEdges() const { - return getEdgesByType( BRepMesh_Free ); - } - - //! Gives vertex with the given index
- inline const BRepMesh_Vertex& GetVertex( const Standard_Integer theIndex ) const - { - return myMeshData->GetNode( theIndex ); + return getEdgesByType (BRepMesh_Free); } - //! Gives edge with the given index
- inline const BRepMesh_Edge& GetEdge( const Standard_Integer theIndex ) const + //! Gives vertex with the given index + inline const BRepMesh_Vertex& GetVertex (const Standard_Integer theIndex) const { - return myMeshData->GetLink( theIndex ); + return myMeshData->GetNode (theIndex); } - //! Gives triangle with the given index
- inline const BRepMesh_Triangle& GetTriangle( const Standard_Integer theIndex ) const + //! Gives edge with the given index + inline const BRepMesh_Edge& GetEdge (const Standard_Integer theIndex) const { - return myMeshData->GetElement( theIndex ); + return myMeshData->GetLink (theIndex); } - //! Test is the given triangle contains the given vertex.
- //! If != 0 the vertex lies onto the edge index
- //! returned through this parameter.
- Standard_EXPORT Standard_Boolean Contains( const Standard_Integer theTriangleId, + //! Gives triangle with the given index + inline const BRepMesh_Triangle& GetTriangle (const Standard_Integer theIndex) const + { + return myMeshData->GetElement (theIndex); + } + + //! Test is the given triangle contains the given vertex. + //! If theEdgeOn != 0 the vertex lies onto the edge index + //! returned through this parameter. + Standard_EXPORT Standard_Boolean Contains (const Standard_Integer theTriangleId, const BRepMesh_Vertex& theVertex, - Standard_Integer& theEdgeOn ) const; + Standard_Integer& theEdgeOn) const; private: @@ -143,42 +140,42 @@ private: typedef NCollection_Handle > HandleOfMapOfInteger; - //! Add boundig box for edge defined by start & end point to
- //! the given vector of bounding boxes for triangulation edges
- void fillBndBox( NCollection_Sequence& theBoxes, + //! Add boundig box for edge defined by start & end point to + //! the given vector of bounding boxes for triangulation edges. + void fillBndBox (NCollection_Sequence& theBoxes, const BRepMesh_Vertex& theV1, - const BRepMesh_Vertex& theV2 ); + const BRepMesh_Vertex& theV2); - //! Gives the list of edges with type defined by the input parameter.
- //! If the given type is BRepMesh_Free returns list of edges
- //! that have number of connected elements less or equal 1
- Handle(BRepMesh_MapOfInteger) getEdgesByType( const BRepMesh_DegreeOfFreedom theEdgeType ) const; + //! Gives the list of edges with type defined by the input parameter. + //! If the given type is BRepMesh_Free returns list of edges + //! that have number of connected elements less or equal 1. + Handle(BRepMesh_MapOfInteger) getEdgesByType (const BRepMesh_DegreeOfFreedom theEdgeType) const; - //! Create super mesh and run triangulation procedure
- void perform( Bnd_Box2d& theBndBox, - TColStd_Array1OfInteger& theVertexIndices ); + //! Create super mesh and run triangulation procedure. + void perform (Bnd_Box2d& theBndBox, + TColStd_Array1OfInteger& theVertexIndices); - //! Build the super mesh.
- void superMesh( const Bnd_Box2d& theBox ); + //! Build the super mesh. + void superMesh (const Bnd_Box2d& theBox); - //! Computes the triangulation and adds the vertices,
- //! edges and triangles to the Mesh data structure.
- void compute( TColStd_Array1OfInteger& theVertexIndices ); + //! Computes the triangulation and adds the vertices, + //! edges and triangles to the Mesh data structure. + void compute (TColStd_Array1OfInteger& theVertexIndices); - //! Adjust the mesh on the frontier.
+ //! Adjust the mesh on the frontier. void frontierAdjust(); - //! Find left polygon of the given edge and call meshPolygon.
- Standard_Boolean meshLeftPolygonOf( const Standard_Integer theEdgeIndex, + //! Find left polygon of the given edge and call meshPolygon. + Standard_Boolean meshLeftPolygonOf (const Standard_Integer theEdgeIndex, const Standard_Boolean isForward, - HandleOfMapOfInteger theSkipped = NULL ); + HandleOfMapOfInteger theSkipped = NULL); - //! Find next link starting from the given node and has maximum
- //! angle respect the given reference link.
- //! Each time the next link is found other neighbor links at the pivot
- //! node are marked as leprous and will be excluded from consideration
- //! next time until a hanging end is occured.
- Standard_Integer findNextPolygonLink( const Standard_Integer& theFirstNode, + //! Find next link starting from the given node and has maximum + //! angle respect the given reference link. + //! Each time the next link is found other neighbor links at the pivot + //! node are marked as leprous and will be excluded from consideration + //! next time until a hanging end is occured. + Standard_Integer findNextPolygonLink (const Standard_Integer& theFirstNode, const Standard_Integer& thePivotNode, const BRepMesh_Vertex& thePivotVertex, const gp_Vec2d& theRefLinkDir, @@ -190,76 +187,72 @@ private: NCollection_Map& theDeadLinks, Standard_Integer& theNextPivotNode, gp_Vec2d& theNextLinkDir, - Bnd_B2d& theNextLinkBndBox ); + Bnd_B2d& theNextLinkBndBox); - //! Check is the given link intersects the polygon boundaries.
- //! Returns bounding box for the given link trough the parameter.
- Standard_Boolean checkIntersection( const BRepMesh_Edge& theLink, + //! Check is the given link intersects the polygon boundaries. + //! Returns bounding box for the given link trough the theLinkBndBox parameter. + Standard_Boolean checkIntersection (const BRepMesh_Edge& theLink, const TColStd_SequenceOfInteger& thePolygon, const NCollection_Sequence& thePolyBoxes, const Standard_Boolean isConsiderEndPointTouch, const Standard_Boolean isConsiderPointOnEdge, const Standard_Boolean isSkipLastEdge, - Bnd_B2d& theLinkBndBox ) const; + Bnd_B2d& theLinkBndBox) const; - //! Triangulatiion of a closed polygon described by the list
- //! of indexes of its edges in the structure.
- //! (negative index means reversed edge)
- void meshPolygon( TColStd_SequenceOfInteger& thePolygon, + //! Triangulatiion of a closed polygon described by the list + //! of indexes of its edges in the structure. + //! (negative index means reversed edge) + void meshPolygon (TColStd_SequenceOfInteger& thePolygon, NCollection_Sequence& thePolyBoxes, - HandleOfMapOfInteger theSkipped = NULL ); + HandleOfMapOfInteger theSkipped = NULL); - //! Triangulatiion of a closed simple polygon (polygon without glued edges and loops)
- //! described by the list of indexes of its edges in the structure.
- //! (negative index means reversed edge)
- void meshSimplePolygon( TColStd_SequenceOfInteger& thePolygon, - NCollection_Sequence& thePolyBoxes ); + //! Triangulatiion of a closed simple polygon (polygon without glued edges and loops) + //! described by the list of indexes of its edges in the structure. + //! (negative index means reversed edge) + void meshSimplePolygon (TColStd_SequenceOfInteger& thePolygon, + NCollection_Sequence& thePolyBoxes); //! Triangulation of closed polygon containing only three edges. - inline Standard_Boolean meshElementaryPolygon( const TColStd_SequenceOfInteger& thePolygon ); + inline Standard_Boolean meshElementaryPolygon (const TColStd_SequenceOfInteger& thePolygon); - //! Creates the triangles beetween the given node
- //! and the given polyline.
- void createTriangles( const Standard_Integer theVertexIndex, - BRepMesh_MapOfIntegerInteger& thePoly ); + //! Creates the triangles beetween the given node and the given polyline. + void createTriangles (const Standard_Integer theVertexIndex, + BRepMesh_MapOfIntegerInteger& thePoly); - //! Add a triangle based on the given oriented edges into mesh
- inline void addTriangle( const Standard_Integer (&theEdgesId)[3], + //! Add a triangle based on the given oriented edges into mesh + inline void addTriangle (const Standard_Integer (&theEdgesId)[3], const Standard_Boolean (&theEdgesOri)[3], - const Standard_Integer (&theNodesId)[3] ); + const Standard_Integer (&theNodesId)[3]); - //! Deletes the triangle with the given index and
- //! adds the free edges into the map.
- //! When an edge is suppressed more than one time
- //! it is destroyed.
- void deleteTriangle( const Standard_Integer theIndex, - BRepMesh_MapOfIntegerInteger& theLoopEdges ); + //! Deletes the triangle with the given index and adds the free edges into the map. + //! When an edge is suppressed more than one time it is destroyed. + void deleteTriangle (const Standard_Integer theIndex, + BRepMesh_MapOfIntegerInteger& theLoopEdges); - //! Returns start and end nodes of the given edge
- //! in respect to its orientation.
- void getOrientedNodes(const BRepMesh_Edge& theEdge, - const Standard_Boolean isForward, - Standard_Integer *theNodes) const; + //! Returns start and end nodes of the given edge in respect to its orientation. + void getOrientedNodes (const BRepMesh_Edge& theEdge, + const Standard_Boolean isForward, + Standard_Integer* theNodes) const; - //! Processes loop within the given polygon formed by range of its
- //! links specified by start and end link indices.
- void processLoop(const Standard_Integer theLinkFrom, - const Standard_Integer theLinkTo, - const TColStd_SequenceOfInteger& thePolygon, - const NCollection_Sequence& thePolyBoxes); + //! Processes loop within the given polygon formed by range of its + //! links specified by start and end link indices. + void processLoop (const Standard_Integer theLinkFrom, + const Standard_Integer theLinkTo, + const TColStd_SequenceOfInteger& thePolygon, + const NCollection_Sequence& thePolyBoxes); //! Creates new link based on the given nodes and updates the given polygon. - Standard_Integer createAndReplacePolygonLink(const Standard_Integer theNodes[], - const gp_Pnt2d thePnts [], - const Standard_Integer theRootIndex, - const ReplaceFlag theReplaceFlag, - TColStd_SequenceOfInteger& thePolygon, - NCollection_Sequence& thePolyBoxes); + Standard_Integer createAndReplacePolygonLink (const Standard_Integer theNodes[], + const gp_Pnt2d thePnts [], + const Standard_Integer theRootIndex, + const ReplaceFlag theReplaceFlag, + TColStd_SequenceOfInteger& thePolygon, + NCollection_Sequence& thePolyBoxes); - //! Creates the triangles on new nodes
- void createTrianglesOnNewVertices( TColStd_Array1OfInteger& theVertexIndices ); + //! Creates the triangles on new nodes. + void createTrianglesOnNewVertices (TColStd_Array1OfInteger& theVertexIndices); - //! Cleanup mesh from the free triangles
+ //! Cleanup mesh from the free triangles. void cleanupMesh(); //! Goes through the neighbour triangles around the given node started @@ -267,83 +260,80 @@ private: //! frontier edge or FALSE elsewhere. //! Stop link is used to prevent cycles. //! Previous element Id is used to identify next neighbor element. - Standard_Boolean isBoundToFrontier(const Standard_Integer theRefNodeId, - const Standard_Integer theRefLinkId, - const Standard_Integer theStopLinkId, - const Standard_Integer thePrevElementId); + Standard_Boolean isBoundToFrontier (const Standard_Integer theRefNodeId, + const Standard_Integer theRefLinkId, + const Standard_Integer theStopLinkId, + const Standard_Integer thePrevElementId); - //! Remove internal triangles from the given polygon
- void cleanupPolygon( const TColStd_SequenceOfInteger& thePolygon, - const NCollection_Sequence& thePolyBoxes ); + //! Remove internal triangles from the given polygon. + void cleanupPolygon (const TColStd_SequenceOfInteger& thePolygon, + const NCollection_Sequence& thePolyBoxes); - //! Checks is the given vertex lies inside the polygon
- Standard_Boolean isVertexInsidePolygon( const Standard_Integer& theVertexId, - const NCollection_Vector& thePolygonVertices ) const; + //! Checks is the given vertex lies inside the polygon. + Standard_Boolean isVertexInsidePolygon (const Standard_Integer& theVertexId, + const NCollection_Vector& thePolygonVertices) const; - //! Remove all triangles and edges that are placed
- //! inside the polygon or crossed it.
- void killTrianglesAroundVertex( const Standard_Integer theZombieNodeId, + //! Remove all triangles and edges that are placed inside the polygon or crossed it. + void killTrianglesAroundVertex (const Standard_Integer theZombieNodeId, const NCollection_Vector& thePolyVertices, const NCollection_Map& thePolyVerticesFindMap, const TColStd_SequenceOfInteger& thePolygon, const NCollection_Sequence& thePolyBoxes, NCollection_Map& theSurvivedLinks, - BRepMesh_MapOfIntegerInteger& theLoopEdges ); + BRepMesh_MapOfIntegerInteger& theLoopEdges); - //! Checks is the given link crosses the polygon boundary.
- //! If yes, kills its triangles and checks neighbor links on
- //! boundary intersection. Does nothing elsewhere.
- void killTrianglesOnIntersectingLinks( const Standard_Integer& theLinkToCheckId, + //! Checks is the given link crosses the polygon boundary. + //! If yes, kills its triangles and checks neighbor links on boundary intersection. Does nothing elsewhere. + void killTrianglesOnIntersectingLinks (const Standard_Integer& theLinkToCheckId, const BRepMesh_Edge& theLinkToCheck, const Standard_Integer& theEndPoint, const TColStd_SequenceOfInteger& thePolygon, const NCollection_Sequence& thePolyBoxes, NCollection_Map& theSurvivedLinks, - BRepMesh_MapOfIntegerInteger& theLoopEdges ); + BRepMesh_MapOfIntegerInteger& theLoopEdges); - //! Kill triangles bound to the given link.
- void killLinkTriangles( const Standard_Integer& theLinkId, - BRepMesh_MapOfIntegerInteger& theLoopEdges ); + //! Kill triangles bound to the given link. + void killLinkTriangles (const Standard_Integer& theLinkId, + BRepMesh_MapOfIntegerInteger& theLoopEdges); - //! Calculates distances between the given point
- //! and edges of triangle.
- Standard_Real calculateDist( const gp_XY theVEdges[3], + //! Calculates distances between the given point and edges of triangle. + Standard_Real calculateDist (const gp_XY theVEdges[3], const gp_XY thePoints[3], const Standard_Integer theEdgesId[3], const BRepMesh_Vertex& theVertex, Standard_Real theDistance[3], Standard_Real theSqModulus[3], - Standard_Integer& theEdgeOn ) const; + Standard_Integer& theEdgeOn) const; - //! Classifies the point in case of coincidence of two vectors.
- //! Returns zero value if point is out of segment and non zero
- //! value if point is between the first and the second point of segment.
- //! thePoint1 - the start point of a segment (base point)
- //! thePoint2 - the end point of a segment
- //! thePointToCheck - the point to classify
- Standard_Integer classifyPoint( const gp_XY& thePoint1, + //! Classifies the point in case of coincidence of two vectors. + //! @param thePoint1 the start point of a segment (base point) + //! @param thePoint2 the end point of a segment + //! @param thePointToCheck the point to classify + //! @returns zero value if point is out of segment and non zero value if point is between the first and the second point of segment + Standard_Integer classifyPoint (const gp_XY& thePoint1, const gp_XY& thePoint2, - const gp_XY& thePointToCheck ) const; + const gp_XY& thePointToCheck) const; - //! Checks intersection between the two segments.
- IntFlag intSegSeg( const BRepMesh_Edge& theEdge1, + //! Checks intersection between the two segments. + IntFlag intSegSeg (const BRepMesh_Edge& theEdge1, const BRepMesh_Edge& theEdge2, const Standard_Boolean isConsiderEndPointTouch, const Standard_Boolean isConsiderPointOnEdge, gp_Pnt2d& theIntPnt) const; - //! Returns area of the loop of the given polygon defined by
- //! indices of its start and end links.
- Standard_Real polyArea( const TColStd_SequenceOfInteger& thePolygon, + //! Returns area of the loop of the given polygon defined by indices of its start and end links. + Standard_Real polyArea (const TColStd_SequenceOfInteger& thePolygon, const Standard_Integer theStartIndex, - const Standard_Integer theEndIndex ) const; + const Standard_Integer theEndIndex) const; + private: - Handle(BRepMesh_DataStructureOfDelaun) myMeshData; - Standard_Boolean myIsPositiveOrientation; - BRepMesh_CircleTool myCircles; - Standard_Integer mySupVert[3]; - BRepMesh_Triangle mySupTrian; + Handle(BRepMesh_DataStructureOfDelaun) myMeshData; + Standard_Boolean myIsPositiveOrientation; + BRepMesh_CircleTool myCircles; + Standard_Integer mySupVert[3]; + BRepMesh_Triangle mySupTrian; + }; #endif diff --git a/src/BRepMesh/BRepMesh_PluginEntryType.hxx b/src/BRepMesh/BRepMesh_PluginEntryType.hxx index f49518dbf1..ad7e873d0e 100644 --- a/src/BRepMesh/BRepMesh_PluginEntryType.hxx +++ b/src/BRepMesh/BRepMesh_PluginEntryType.hxx @@ -14,9 +14,7 @@ #ifndef _BRepMesh_PluginEntryType_HeaderFile #define _BRepMesh_PluginEntryType_HeaderFile -#ifndef _Standard_Real_HeaderFile #include -#endif class TopoDS_Shape; class BRepMesh_DiscretRoot; diff --git a/src/BRepMesh/BRepMesh_Status.hxx b/src/BRepMesh/BRepMesh_Status.hxx index 09f058f9df..a9b4545717 100644 --- a/src/BRepMesh/BRepMesh_Status.hxx +++ b/src/BRepMesh/BRepMesh_Status.hxx @@ -16,13 +16,14 @@ #ifndef _BRepMesh_Status_HeaderFile #define _BRepMesh_Status_HeaderFile -//! Discribes the wires discretisation.
-enum BRepMesh_Status { -BRepMesh_NoError = 0x0, -BRepMesh_OpenWire = 0x1, -BRepMesh_SelfIntersectingWire = 0x2, -BRepMesh_Failure = 0x4, -BRepMesh_ReMesh = 0x8 +//! Discribes the wires discretisation. +enum BRepMesh_Status +{ + BRepMesh_NoError = 0x0, + BRepMesh_OpenWire = 0x1, + BRepMesh_SelfIntersectingWire = 0x2, + BRepMesh_Failure = 0x4, + BRepMesh_ReMesh = 0x8 }; #endif diff --git a/src/BRepMesh/BRepMesh_VectorOfVertex.hxx b/src/BRepMesh/BRepMesh_VectorOfVertex.hxx index dabe48a58f..00bc14b7e4 100644 --- a/src/BRepMesh/BRepMesh_VectorOfVertex.hxx +++ b/src/BRepMesh/BRepMesh_VectorOfVertex.hxx @@ -16,12 +16,8 @@ #ifndef _BRepMesh_VectorOfVertex_HeaderFile #define _BRepMesh_VectorOfVertex_HeaderFile -#ifndef _BRepMesh_Vertex_HeaderFile #include -#endif -#ifndef NCollection_Vector_HeaderFile #include -#endif typedef NCollection_Vector BRepMesh_VectorOfVertex; diff --git a/src/BRepMesh/BRepMesh_VertexCellFilter.hxx b/src/BRepMesh/BRepMesh_VertexCellFilter.hxx index 12ebc23f75..d0a87c33a8 100644 --- a/src/BRepMesh/BRepMesh_VertexCellFilter.hxx +++ b/src/BRepMesh/BRepMesh_VertexCellFilter.hxx @@ -16,18 +16,10 @@ #ifndef _BRepMesh_VertexCellFilter_HeaderFile #define _BRepMesh_VertexCellFilter_HeaderFile -#ifndef _gp_XYZ_HeaderFile #include -#endif -#ifndef _gp_XY_HeaderFile #include -#endif -#ifndef NCollection_CellFilter_HeaderFile #include -#endif -#ifndef _BRepMesh_VertexInspector_HeaderFile #include -#endif typedef NCollection_CellFilter BRepMesh_VertexCellFilter; diff --git a/src/BRepMesh/BRepMesh_VertexInspector.hxx b/src/BRepMesh/BRepMesh_VertexInspector.hxx index 212bf3bb58..be49d66739 100644 --- a/src/BRepMesh/BRepMesh_VertexInspector.hxx +++ b/src/BRepMesh/BRepMesh_VertexInspector.hxx @@ -17,28 +17,13 @@ #define _BRepMesh_VertexInspector_HeaderFile #include -#ifndef _Precision_HeaderFile #include -#endif -#ifndef _gp_XY_HeaderFile #include -#endif -#ifndef _gp_XYZ_HeaderFile #include -#endif - -#ifndef NCollection_CellFilter_HeaderFile #include -#endif -#ifndef _BRepMesh_Vertex_HeaderFile #include -#endif -#ifndef _BRepMesh_VectorOfVertex_HeaderFile #include -#endif -#ifndef _TColStd_Array1OfReal_HeaderFile #include -#endif #include //======================================================================= diff --git a/src/BRepPrim/BRepPrim_OneAxis.hxx b/src/BRepPrim/BRepPrim_OneAxis.hxx index 59e0ccb05d..9643943ee6 100644 --- a/src/BRepPrim/BRepPrim_OneAxis.hxx +++ b/src/BRepPrim/BRepPrim_OneAxis.hxx @@ -14,33 +14,14 @@ #ifndef _BRepPrim_OneAxis_HeaderFile #define _BRepPrim_OneAxis_HeaderFile -#ifndef _BRepPrim_Builder_HeaderFile #include -#endif -#ifndef _gp_Ax2_HeaderFile #include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _TopoDS_Shell_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _TopoDS_Vertex_HeaderFile #include -#endif -#ifndef _TopoDS_Edge_HeaderFile #include -#endif -#ifndef _TopoDS_Wire_HeaderFile #include -#endif -#ifndef _TopoDS_Face_HeaderFile #include -#endif + class Standard_DomainError; class Standard_OutOfRange; class TopoDS_Shell; diff --git a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx index 7a64f23906..1678938e5b 100644 --- a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx +++ b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx @@ -14,36 +14,16 @@ #ifndef _BRepSweep_NumLinearRegularSweep_HeaderFile #define _BRepSweep_NumLinearRegularSweep_HeaderFile -#ifndef _BRepSweep_Builder_HeaderFile #include -#endif -#ifndef _TopoDS_Shape_HeaderFile #include -#endif -#ifndef _Sweep_NumShape_HeaderFile #include -#endif -#ifndef _BRepSweep_Tool_HeaderFile #include -#endif -#ifndef _Sweep_NumShapeTool_HeaderFile #include -#endif -#ifndef _BRepSweep_Array2OfShapesOfNumLinearRegularSweep_HeaderFile #include -#endif -#ifndef _TColStd_Array2OfBoolean_HeaderFile #include -#endif -#ifndef _Handle_BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep_HeaderFile #include -#endif -#ifndef _TopAbs_Orientation_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif + class Standard_NoMoreObject; class Standard_NoSuchObject; class Standard_RangeError; diff --git a/src/BSplCLib/BSplCLib_EvaluatorFunction.hxx b/src/BSplCLib/BSplCLib_EvaluatorFunction.hxx index aaf066aca8..7f40728841 100644 --- a/src/BSplCLib/BSplCLib_EvaluatorFunction.hxx +++ b/src/BSplCLib/BSplCLib_EvaluatorFunction.hxx @@ -17,15 +17,7 @@ #ifndef _BSplCLib_EvaluatorFunction_HeaderFile #define _BSplCLib_EvaluatorFunction_HeaderFile -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif +#include // History - C function pointer converted to a virtual class // in order to get rid of usage of static functions and static data diff --git a/src/DBC/DBC_BaseArray_objs.hxx b/src/DBC/DBC_BaseArray_objs.hxx index 8f7d298694..b1475cef51 100644 --- a/src/DBC/DBC_BaseArray_objs.hxx +++ b/src/DBC/DBC_BaseArray_objs.hxx @@ -15,24 +15,11 @@ #ifndef _DBC_BaseArray_HeaderFile #define _DBC_BaseArray_HeaderFile -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _DBC_DBVArray_HeaderFile #include -#endif -#ifndef _Standard_Storable_HeaderFile #include -#endif -#ifndef _Standard_Address_HeaderFile -#include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif +#include + class Standard_NullObject; class Standard_NegativeValue; class Standard_DimensionMismatch; diff --git a/src/DBC/DBC_DBVArray.hxx b/src/DBC/DBC_DBVArray.hxx index 1dfa470782..c3cea29a32 100644 --- a/src/DBC/DBC_DBVArray.hxx +++ b/src/DBC/DBC_DBVArray.hxx @@ -16,9 +16,7 @@ #define _DBC_DBVArray_HeaderFile #ifdef OBJY -#ifndef _PStandard_ArrayNode_HeaderFile #include -#endif declare(ooVArray,PHandle_PStandard_ArrayNode) typedef ooVArray(PHandle_PStandard_ArrayNode) DBC_DBVArray; #endif diff --git a/src/DDF/DDF_IOStream.hxx b/src/DDF/DDF_IOStream.hxx index deaeb0c41d..38fc0a1b9d 100644 --- a/src/DDF/DDF_IOStream.hxx +++ b/src/DDF/DDF_IOStream.hxx @@ -26,36 +26,9 @@ #include -#ifndef _Storage_BaseDriver_HeaderFile #include -#endif -#ifndef _Storage_Error_HeaderFile #include -#endif -#ifndef _Storage_OpenMode_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Character_HeaderFile -#include -#endif -#ifndef _Standard_ExtCharacter_HeaderFile -#include -#endif -#ifndef _Standard_Real_HeaderFile -#include -#endif -#ifndef _Standard_ShortReal_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif #include class Storage_StreamTypeMismatchError; diff --git a/src/Draw/Draw_Main.hxx b/src/Draw/Draw_Main.hxx index e8e25c3687..ce693a61ff 100644 --- a/src/Draw/Draw_Main.hxx +++ b/src/Draw/Draw_Main.hxx @@ -24,10 +24,7 @@ #ifndef Draw_Main_HeaderFile #define Draw_Main_HeaderFile -#ifndef _Standard_TypeDef_HeaderFile #include -#endif - #include #include diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx index e40e3a9d2e..3f1504181b 100644 --- a/src/Graphic3d/Graphic3d_Camera.hxx +++ b/src/Graphic3d/Graphic3d_Camera.hxx @@ -185,7 +185,7 @@ public: return myUp; } - //! Set camera axial scale.
+ //! Set camera axial scale. //! @param theAxialScale [in] the axial scale vector. Standard_EXPORT void SetAxialScale (const gp_XYZ& theAxialScale); diff --git a/src/Graphic3d/Graphic3d_Vertex.hxx b/src/Graphic3d/Graphic3d_Vertex.hxx index 74fd1672ce..339a7f295b 100644 --- a/src/Graphic3d/Graphic3d_Vertex.hxx +++ b/src/Graphic3d/Graphic3d_Vertex.hxx @@ -21,42 +21,91 @@ #include #include -//! This class represents a graphical 3D point.
+//! This class represents a graphical 3D point. class Graphic3d_Vertex : public TEL_POINT { - public: - //! Creates a point with 0.0, 0.0, 0.0 coordinates.
+public: + + //! Creates a point with 0.0, 0.0, 0.0 coordinates. Graphic3d_Vertex() - { SetCoord(0.f,0.f,0.f); } - //! Creates a point with coordinates identical to .
- Graphic3d_Vertex(const Graphic3d_Vertex& APoint) - { SetCoord(APoint.X(),APoint.Y(),APoint.Z()); } - //! Creates a point with , and coordinates.
- Graphic3d_Vertex(const Standard_ShortReal AX,const Standard_ShortReal AY,const Standard_ShortReal AZ) - { SetCoord(AX,AY,AZ); } - //! Creates a point with , and coordinates.
- Graphic3d_Vertex(const Standard_Real AX,const Standard_Real AY,const Standard_Real AZ) - { SetCoord(AX,AY,AZ); } - //! Modifies the coordinates of the point .
- void SetCoord(const Standard_ShortReal AX,const Standard_ShortReal AY,const Standard_ShortReal AZ) - { xyz[0] = AX, xyz[1] = AY, xyz[2] = AZ; } - //! Modifies the coordinates of the point .
- void SetCoord(const Standard_Real AX,const Standard_Real AY,const Standard_Real AZ) - { xyz[0] = Standard_ShortReal(AX), xyz[1] = Standard_ShortReal(AY), xyz[2] = Standard_ShortReal(AZ); } - //! Returns the coordinates of the point .
- void Coord(Standard_ShortReal& AX,Standard_ShortReal& AY,Standard_ShortReal& AZ) const - { AX = xyz[0], AY = xyz[1], AZ = xyz[2]; } - //! Returns the coordinates of the point .
- void Coord(Standard_Real& AX,Standard_Real& AY,Standard_Real& AZ) const - { AX = xyz[0], AY = xyz[1], AZ = xyz[2]; } - //! Returns the X coordinates of the point .
+ { + SetCoord (0.0f, 0.0f, 0.0f); + } + + //! Creates a point with coordinates identical to thePoint. + Graphic3d_Vertex (const Graphic3d_Vertex& thePoint) + { + SetCoord (thePoint.X(), thePoint.Y(), thePoint.Z()); + } + + //! Creates a point with theX, theY and theZ coordinates. + Graphic3d_Vertex (const Standard_ShortReal theX, + const Standard_ShortReal theY, + const Standard_ShortReal theZ) + { + SetCoord (theX, theY, theZ); + } + + //! Creates a point with theX, theY and theZ coordinates. + Graphic3d_Vertex (const Standard_Real theX, + const Standard_Real theY, + const Standard_Real theZ) + { + SetCoord (theX, theY, theZ); + } + + //! Modifies the coordinates. + void SetCoord (const Standard_ShortReal theX, + const Standard_ShortReal theY, + const Standard_ShortReal theZ) + { + xyz[0] = theX; + xyz[1] = theY; + xyz[2] = theZ; + } + + //! Modifies the coordinates. + void SetCoord (const Standard_Real theX, + const Standard_Real theY, + const Standard_Real theZ) + { + xyz[0] = Standard_ShortReal (theX); + xyz[1] = Standard_ShortReal (theY); + xyz[2] = Standard_ShortReal (theZ); + } + + //! Returns the coordinates. + void Coord (Standard_ShortReal& theX, + Standard_ShortReal& theY, + Standard_ShortReal& theZ) const + { + theX = xyz[0]; + theY = xyz[1]; + theZ = xyz[2]; + } + + //! Returns the coordinates. + void Coord (Standard_Real& theX, + Standard_Real& theY, + Standard_Real& theZ) const + { + theX = xyz[0]; + theY = xyz[1]; + theZ = xyz[2]; + } + + //! Returns the X coordinates. Standard_ShortReal X() const { return xyz[0]; } - //! Returns the Y coordinate of the point .
+ + //! Returns the Y coordinate. Standard_ShortReal Y() const { return xyz[1]; } - //! Returns the Z coordinate of the point .
+ + //! Returns the Z coordinate. Standard_ShortReal Z() const { return xyz[2]; } - //! Returns the distance between and .
- Standard_EXPORT Standard_ShortReal Distance(const Graphic3d_Vertex& AOther) const; + + //! Returns the distance between two points. + Standard_EXPORT Standard_ShortReal Distance (const Graphic3d_Vertex& theOther) const; + }; #endif diff --git a/src/IntAna2d/IntAna2d_Outils.hxx b/src/IntAna2d/IntAna2d_Outils.hxx index 027451a9a6..48d173b594 100644 --- a/src/IntAna2d/IntAna2d_Outils.hxx +++ b/src/IntAna2d/IntAna2d_Outils.hxx @@ -18,21 +18,10 @@ #ifndef IntAna2d_Outil_HeaderFile #define IntAna2d_Outil_HeaderFile -#ifndef math_DirectPolynomialRoots_HeaderFile #include -#endif - -#ifndef math_TrigonometricFunctionRoots_HeaderFile #include -#endif - -#ifndef IntAna2d_IntPoint_HeaderFile #include -#endif - -#ifndef gp_Ax2d_HeaderFile #include -#endif class MyDirectPolynomialRoots { public: diff --git a/src/IntImp/IntImp_ZerParFunc.lxx b/src/IntImp/IntImp_ZerParFunc.lxx index 68a1922089..74fd09aa63 100644 --- a/src/IntImp/IntImp_ZerParFunc.lxx +++ b/src/IntImp/IntImp_ZerParFunc.lxx @@ -14,16 +14,9 @@ #include -#ifndef gp_Pnt_HeaderFile #include -#endif -#ifndef gp_Dir2d_HeaderFile #include -#endif -#ifndef gp_Dir_HeaderFile #include -#endif - inline Standard_Real IntImp_ZerParFunc::Root() const { diff --git a/src/IntImpParGen/IntImpParGen_Tool.hxx b/src/IntImpParGen/IntImpParGen_Tool.hxx index 2fec1d1460..67ee0524f3 100644 --- a/src/IntImpParGen/IntImpParGen_Tool.hxx +++ b/src/IntImpParGen/IntImpParGen_Tool.hxx @@ -17,26 +17,11 @@ #ifndef IntImpParGen_Tool_HeaderFile #define IntImpParGen_Tool_HeaderFile -#ifndef IntRes2d_Domain_HeaderFile #include -#endif - -#ifndef IntRes2d_Position_HeaderFile #include -#endif - -#ifndef IntRes2d_Transition_HeaderFile #include -#endif - -#ifndef gp_Vec2d_HeaderFile #include -#endif - -#ifndef gp_Pnt2d_HeaderFile #include -#endif - Standard_Real NormalizeOnDomain(Standard_Real&,const IntRes2d_Domain&); diff --git a/src/IntPolyh/IntPolyh_ArrayOfCouples.hxx b/src/IntPolyh/IntPolyh_ArrayOfCouples.hxx index c55149aa63..8373cbce74 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfCouples.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfCouples.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfCouples_HeaderFile #define IntPolyh_ArrayOfCouples_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/IntPolyh/IntPolyh_ArrayOfEdges.hxx b/src/IntPolyh/IntPolyh_ArrayOfEdges.hxx index 3deac809c1..87c3bdbead 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfEdges.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfEdges.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfEdges_HeaderFile #define IntPolyh_ArrayOfEdges_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/IntPolyh/IntPolyh_ArrayOfPoints.hxx b/src/IntPolyh/IntPolyh_ArrayOfPoints.hxx index 127870b0cd..92b250a64e 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfPoints.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfPoints.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfPoints_HeaderFile #define IntPolyh_ArrayOfPoints_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/IntPolyh/IntPolyh_ArrayOfSectionLines.hxx b/src/IntPolyh/IntPolyh_ArrayOfSectionLines.hxx index 77d731bd1e..8d9a77ecb0 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfSectionLines.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfSectionLines.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfSectionLines_HeaderFile #define IntPolyh_ArrayOfSectionLines_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/IntPolyh/IntPolyh_ArrayOfStartPoints.hxx b/src/IntPolyh/IntPolyh_ArrayOfStartPoints.hxx index 7806a49769..917111cfa8 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfStartPoints.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfStartPoints.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfStartPoints_HeaderFile #define IntPolyh_ArrayOfStartPoints_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/IntPolyh/IntPolyh_ArrayOfTangentZones.hxx b/src/IntPolyh/IntPolyh_ArrayOfTangentZones.hxx index 0a836eba13..7c5d2a8719 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfTangentZones.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfTangentZones.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfTangentZones_HeaderFile #define IntPolyh_ArrayOfTangentZones_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include #include diff --git a/src/IntPolyh/IntPolyh_ArrayOfTriangles.hxx b/src/IntPolyh/IntPolyh_ArrayOfTriangles.hxx index 7fc9828120..27dc38a8b8 100644 --- a/src/IntPolyh/IntPolyh_ArrayOfTriangles.hxx +++ b/src/IntPolyh/IntPolyh_ArrayOfTriangles.hxx @@ -16,13 +16,6 @@ #ifndef IntPolyh_ArrayOfTriangles_HeaderFile #define IntPolyh_ArrayOfTriangles_HeaderFile -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - #include //#include class IntPolyh_Triangle; diff --git a/src/IntSurf/IntSurf_Quadric.lxx b/src/IntSurf/IntSurf_Quadric.lxx index 4a98db2635..a7d903abe6 100644 --- a/src/IntSurf/IntSurf_Quadric.lxx +++ b/src/IntSurf/IntSurf_Quadric.lxx @@ -12,22 +12,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef gp_Pln_HeaderFile #include -#endif -#ifndef gp_Sphere_HeaderFile #include -#endif -#ifndef gp_Cylinder_HeaderFile #include -#endif -#ifndef gp_Cone_HeaderFile #include -#endif -#ifndef GeomAbs_SurfaceType_HeaderFile #include -#endif - inline GeomAbs_SurfaceType IntSurf_Quadric::TypeQuadric () const { diff --git a/src/IntWalk/IntWalk_IWLine.lxx b/src/IntWalk/IntWalk_IWLine.lxx index d81cd5c7a5..3abae884d6 100644 --- a/src/IntWalk/IntWalk_IWLine.lxx +++ b/src/IntWalk/IntWalk_IWLine.lxx @@ -12,18 +12,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef Standard_DomainError_HeaderFile #include -#endif -#ifndef IntSurf_LineOn2S_HeaderFile #include -#endif -#ifndef IntSurf_Couple_HeaderFile #include -#endif -#ifndef IntSurf_SequenceOfCouple_HeaderFile #include -#endif inline void IntWalk_IWLine::Cut(const Standard_Integer Index) { diff --git a/src/MeshVS/MeshVS_TwoColors.hxx b/src/MeshVS/MeshVS_TwoColors.hxx index 1e7926cd34..b302ca26d3 100644 --- a/src/MeshVS/MeshVS_TwoColors.hxx +++ b/src/MeshVS/MeshVS_TwoColors.hxx @@ -13,15 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef MeshVS_TWOCOLORSHXX -#define MeshVS_TWOCOLORSHXX - -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif +#ifndef MeshVS_TwoColors_HeaderFile +#define MeshVS_TwoColors_HeaderFile #include diff --git a/src/Message/Message_Messenger.lxx b/src/Message/Message_Messenger.lxx index ef4fda4349..f8b6672430 100644 --- a/src/Message/Message_Messenger.lxx +++ b/src/Message/Message_Messenger.lxx @@ -40,12 +40,8 @@ inline Message_SequenceOfPrinters& Message_Messenger::ChangePrinters() //purpose : //======================================================================= -#ifndef _TCollection_HAsciiString_HeaderFile #include -#endif -#ifndef _TCollection_HExtendedString_HeaderFile #include -#endif // CString inline const Handle(Message_Messenger)& diff --git a/src/NIS/NIS_InteractiveContext.hxx b/src/NIS/NIS_InteractiveContext.hxx index 4f917c62da..7f5637fba2 100644 --- a/src/NIS/NIS_InteractiveContext.hxx +++ b/src/NIS/NIS_InteractiveContext.hxx @@ -24,10 +24,9 @@ #include #include -#ifdef WNT +// undefine WinAPI macros #ifdef GetObject -#undef GetObject -#endif + #undef GetObject #endif class NIS_View; @@ -36,13 +35,11 @@ class Bnd_B2f; /** * InteractiveContext is the central NIS structure that stores and manages - * all NIS_InteractiveObject instances as well as the Drawers for their - * visualisation. + * all NIS_InteractiveObject instances as well as the Drawers for their visualisation. * There may be one or more Views referred by an InteractiveContext instance. - * Also there may be one or more InteractiveContext instances referring the same - * View. However the latter case is not typical (see NIS_View description).
- * To add or remove a View in a Context, use methods AttachView() and - * DetachView(). + * Also there may be one or more InteractiveContext instances referring the same View. + * However the latter case is not typical (see NIS_View description). + * To add or remove a View in a Context, use methods AttachView() and DetachView(). * * @section nis_interactivecontext_mgtobjects Management of objects * The main purpose of class NIS_InteractiveContext is allocation and @@ -50,13 +47,10 @@ class Bnd_B2f; *

An InteractiveObject should be added to the Context by a call to method * Display() or DisplayOnTop(). After that (not before) it becomes possible to: *

    - *
  • change the presentation of the InteractiveObject (e.g., modify the color) - *
    • - *
  • make the InteractiveObject visible or invisible, selectable or - * unselectable;
    • + *
  • change the presentation of the InteractiveObject (e.g., modify the color)
    • + *
  • make the InteractiveObject visible or invisible, selectable or unselectable;
    • *
  • set Transparency;
    • - *
  • select InteractiveObject interactively, including the hilighting and - * the dynamic hilighting.
    • + *
  • select InteractiveObject interactively, including the hilighting and the dynamic hilighting.
    • *
* Methods that add/remove/display/hide NIS_InteractiveObject instances have * the optional parameter 'isUpdateViews'. When it is set to True (default), @@ -348,14 +342,11 @@ class NIS_InteractiveContext : public Standard_Transient { mySelectionMode = theMode; } /** - * Set or unset the selected state of the object, also changing its - * hilight status.
- * If mySelectionMode == Mode_NoSelection this method does nothing (returns - * False always).
+ * Set or unset the selected state of the object, also changing its hilight status. + * If mySelectionMode == Mode_NoSelection this method does nothing (returns False always). * If the given object is NULL (e.g., if the mouse was clicked on empty area), - * then the current selection is cleared (modes Normal and Additive only).
- * The selection algorithm with respect to the given object is defined by - * the current selection mode : + * then the current selection is cleared (modes Normal and Additive only). + * The selection algorithm with respect to the given object is defined by the current selection mode: *
    *
  • Mode_Normal - the selection state is toggled
    • *
  • Mode_Additive - the object is always added to the selection
    • @@ -388,8 +379,7 @@ class NIS_InteractiveContext : public Standard_Transient = Standard_False); /** - * Set or unset the selected state of the object, also changing its - * hilight status.
    + * Set or unset the selected state of the object, also changing its hilight status. * This method does not update the views. * @param theObj * Object to be selected or deselected @@ -607,7 +597,7 @@ private: * - #1 - top objects * - #2 - hilighted objects (i.e., selected) * - #3 - transparent objects - *
    Each object can have only one entry in these maps. + * Each object can have only one entry in these maps. */ TColStd_PackedMapOfInteger myMapObjects[4]; diff --git a/src/NIS/NIS_InteractiveObject.hxx b/src/NIS/NIS_InteractiveObject.hxx index 1888e5d25f..ac0c011b89 100644 --- a/src/NIS/NIS_InteractiveObject.hxx +++ b/src/NIS/NIS_InteractiveObject.hxx @@ -160,10 +160,10 @@ class NIS_InteractiveObject : public Standard_Transient /** * Replace the drawer. This method must not be called for Object that - * has not yet been added to a Context (thus has empty drawer).
    + * has not yet been added to a Context (thus has empty drawer). * It is possible to have unassigned myDrawer or a DefaultDrawer as the * parameter value (but not both). The Context where we work is taken - * from theDrawer first, then (if NULL) -- from myDrawer.
    + * from theDrawer first, then (if NULL) -- from myDrawer. * This method matches theDrawer with the available Drawers in the Context * and adds if no match is found. * @return @@ -291,8 +291,7 @@ class NIS_InteractiveObject : public Standard_Transient * Intersect the InteractiveObject geometry with an oriented box. * The default implementation (in this abstract class) always returns True, * signalling that every object pre-selected by its bounding box is - * automatically selected. The specializations should define a more correct - * behaviour.
    + * automatically selected. The specializations should define a more correct behaviour. * The algorithm should transform the InteractiveObject geometry using the * parameter theTrf and then reject it with box theBox, like: * @code @@ -320,8 +319,7 @@ class NIS_InteractiveObject : public Standard_Transient * Intersect the InteractiveObject geometry with a selection polygon. * The default implementation (in this abstract class) always returns True, * signalling that every object pre-selected by its bounding box is - * automatically selected. The specializations should define a more correct - * behaviour.
    + * automatically selected. The specializations should define a more correct behaviour. * The algorithm should transform the InteractiveObject geometry using the * parameter theTrf and then reject it with polygon. * @param thePolygon diff --git a/src/NIS/NIS_SelectFilter.hxx b/src/NIS/NIS_SelectFilter.hxx index f71d6f03d2..25b5fadf5c 100644 --- a/src/NIS/NIS_SelectFilter.hxx +++ b/src/NIS/NIS_SelectFilter.hxx @@ -23,14 +23,11 @@ class NIS_InteractiveObject; class Handle_Standard_Type; /** - * Interface for selection filters. It can be used in NIS_InteractiveContext - * by methods SetFilter and GetFilter.
    - * Unlike in AIS, only one filter can be installed in InteractiveContext. If - * you need more than one filter instance to work together, create a composite - * NIS_SelectFilter specialization that would hold a list of simpler Filter - * instances. + * Interface for selection filters. It can be used in NIS_InteractiveContext by methods SetFilter and GetFilter. + * Unlike in AIS, only one filter can be installed in InteractiveContext. + * If you need more than one filter instance to work together, create a composite + * NIS_SelectFilter specialization that would hold a list of simpler Filter instances. */ - class NIS_SelectFilter : public Standard_Transient { public: diff --git a/src/OpenGl/OpenGl_AVIWriter.hxx b/src/OpenGl/OpenGl_AVIWriter.hxx index 457b4b0919..95a5796644 100644 --- a/src/OpenGl/OpenGl_AVIWriter.hxx +++ b/src/OpenGl/OpenGl_AVIWriter.hxx @@ -30,9 +30,9 @@ * The following tasks are supported: *
      * - *
    1. Creation of AVI data stream: launched by the constructor.
      + *
    2. Creation of AVI data stream: launched by the constructor. * The constructor accepts the filename, FOURCC video code and the frame rate - * setting as parameters.
      + * setting as parameters. * The default codec name used here is MPG4. To use a different codec, pass * its FOURCC value as the input parameter for dwCodec. * For example, @@ -43,7 +43,7 @@ * Also, you can pass just 0 to avoid the codecs altogether. In that case, * the frames would be saved as they are without any compression; However, * the output movie file size would be very huge in that case. - *
      + * * Finally, make sure you have the codec installed on the machine before * passing its Fourcc here. *
      3. diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx index 8f863c834d..e8e52dd138 100644 --- a/src/OpenGl/OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/OpenGl_GraphicDriver.hxx @@ -92,7 +92,7 @@ private: Standard_Size myCounter; }; -//! This class defines an OpenGl graphic driver
      +//! This class defines an OpenGl graphic driver class OpenGl_GraphicDriver : public Graphic3d_GraphicDriver { public: @@ -204,97 +204,101 @@ public: Standard_EXPORT void SetLineAttributes (const Standard_Integer Type,const Standard_ShortReal Width); Standard_EXPORT void SetFlippingOptions (const Graphic3d_CGroup& theCGroup, const Standard_Boolean theIsEnabled, const gp_Ax2& theRefPlane); - //! Set text attributes for under-/overlayer.
      - //! argument defines the name of the font to be used,
      - //! argument defines the display type of the text,
      - //! values define the color of decal or subtitle background.
      - //! To set the color of the text you can use the SetColor method.
      - Standard_EXPORT void SetTextAttributes (const Standard_CString FontName,const Standard_Integer Type,const Standard_ShortReal R,const Standard_ShortReal G,const Standard_ShortReal B); + //! Set text attributes for under-/overlayer. + //! @param theFontName the name of the font to be used + //! @param theType the display type of the text + //! theR theG theB values define the color of decal or subtitle background + //! To set the color of the text you can use the SetColor method. + Standard_EXPORT void SetTextAttributes (const Standard_CString theFontName, + const Standard_Integer theType, + const Standard_ShortReal theR, + const Standard_ShortReal theG, + const Standard_ShortReal theB); Standard_EXPORT void Text (const Standard_CString AText,const Standard_ShortReal X,const Standard_ShortReal Y,const Standard_ShortReal AHeight); Standard_EXPORT void TextSize (const Standard_CString AText,const Standard_ShortReal AHeight,Standard_ShortReal& AWidth,Standard_ShortReal& AnAscent,Standard_ShortReal& ADescent) const; Standard_EXPORT void SetBackFacingModel (const Graphic3d_CView& aView); - //! print the contents of all layers of the view to the printer.
      - //! : Pass the PrinterDeviceContext (HDC),
      - //! : When set to FALSE then print the view without background color
      - //! (background is white)
      - //! else set to TRUE for printing with current background color.
      - //! : If != NULL, then the view will be printed to a file.
      - //! : Select print algorithm: stretch, tile.
      - //! : Scaling coefficient, used internally to scale the
      - //! printings accordingly to the scale factor selected in the printer
      - //! properties dialog.
      - //! Returns Standard_True if the data is passed to the printer, otherwise
      - //! Standard_False if the print operation failed due to the printer errors,
      - //! or lack of system memory. This might be related to insufficient memory
      - //! or some internal errors. All this errors are indicated by the message
      - //! boxes (on level of OpenGl_GraphicDriver).
      - //! Warning: This function can reuse FBO assigned to the view
      - //! Please take it into account if you use it for your purposes;
      - Standard_EXPORT Standard_Boolean Print (const Graphic3d_CView& ACView, const Aspect_CLayer2d& ACUnderLayer, const Aspect_CLayer2d& ACOverLayer, const Aspect_Handle hPrnDC, const Standard_Boolean showBackground, const Standard_CString filename, const Aspect_PrintAlgo printAlgorithm = Aspect_PA_STRETCH, const Standard_Real theScaleFactor = 1.0) const; + + //! Print the contents of all layers of the view to the printer. + //! @param thePrinterDC pass the PrinterDeviceContext (HDC) + //! @param theToShowBackground when set to FALSE then print the view without background color (background is white) else set to TRUE for printing with current background color + //! @param theFileName if != NULL, then the view will be printed to a file + //! @param thePrintAlgorithm select print algorithm: stretch, tile + //! @param theScaleFactor scaling coefficient, used internally to scale the printings accordingly to the scale factor selected in the printer properties dialog + //! @return Standard_True if the data is passed to the printer, otherwise Standard_False if the print operation failed due to the printer errors, + //! or lack of system memory. This might be related to insufficient memory or some internal errors. + //! All this errors are indicated by the message boxes (on level of OpenGl_GraphicDriver). + //! Warning: This function can reuse FBO assigned to the view, please take it into account if you use it for your purposes. + Standard_EXPORT Standard_Boolean Print (const Graphic3d_CView& theCView, + const Aspect_CLayer2d& theCUnderLayer, + const Aspect_CLayer2d& theCOverLayer, + const Aspect_Handle thePrinterDC, + const Standard_Boolean theToShowBackground, + const Standard_CString theFileName, + const Aspect_PrintAlgo thePrintAlgorithm = Aspect_PA_STRETCH, + const Standard_Real theScaleFactor = 1.0) const; Standard_EXPORT void SetDepthTestEnabled (const Graphic3d_CView& view,const Standard_Boolean isEnabled) const; Standard_EXPORT Standard_Boolean IsDepthTestEnabled (const Graphic3d_CView& view) const; - //! Reads depths of shown pixels of the given rectangle (glReadPixels with GL_DEPTH_COMPONENT)
      + + //! Reads depths of shown pixels of the given rectangle (glReadPixels with GL_DEPTH_COMPONENT) Standard_EXPORT void ReadDepths (const Graphic3d_CView& view,const Standard_Integer x,const Standard_Integer y,const Standard_Integer width,const Standard_Integer height,const Standard_Address buffer) const; - //! Generate offscreen FBO (needs OpenGL2+ hardware)
      - //! If not supported on hardware returns NULL.
      + + //! Generate offscreen FBO (needs OpenGL2+ hardware). + //! If not supported on hardware returns NULL. Standard_EXPORT Graphic3d_PtrFrameBuffer FBOCreate (const Graphic3d_CView& view, const Standard_Integer width, const Standard_Integer height); - //! Remove offscreen FBO
      + + //! Remove offscreen FBO Standard_EXPORT void FBORelease (const Graphic3d_CView& view, Graphic3d_PtrFrameBuffer& fboPtr); - //! Dump active rendering buffer into specified memory buffer.
      + + //! Dump active rendering buffer into specified memory buffer. Standard_EXPORT Standard_Boolean BufferDump (const Graphic3d_CView& theCView, Image_PixMap& theImage, const Graphic3d_BufferType& theBufferType); + Standard_EXPORT void SetGLLightEnabled (const Graphic3d_CView& view,const Standard_Boolean isEnabled) const; + Standard_EXPORT Standard_Boolean IsGLLightEnabled (const Graphic3d_CView& view) const; - //! Clear visualization data in graphical driver and stop
      - //! displaying the primitives array of the graphical group .
      - //! This method is internal and should be used by Graphic3d_Group only.
      + Standard_EXPORT Standard_Integer InquirePlaneLimit(); + Standard_EXPORT Standard_ShortReal DefaultTextHeight() const; + Standard_EXPORT void FBOGetDimensions(const Graphic3d_CView& view,const Graphic3d_PtrFrameBuffer fboPtr,Standard_Integer& width,Standard_Integer& height,Standard_Integer& widthMax,Standard_Integer& heightMax); + Standard_EXPORT void FBOChangeViewport(const Graphic3d_CView& view,Graphic3d_PtrFrameBuffer& fboPtr,const Standard_Integer width,const Standard_Integer height); + Standard_EXPORT Standard_Boolean Export(const Standard_CString theFileName,const Graphic3d_ExportFormat theFormat,const Graphic3d_SortType theSortType,const Standard_Integer theWidth,const Standard_Integer theHeight,const Graphic3d_CView& theView,const Aspect_CLayer2d& theLayerUnder,const Aspect_CLayer2d& theLayerOver,const Standard_Real thePrecision = 0.005,const Standard_Address theProgressBarFunc = NULL,const Standard_Address theProgressObject = NULL); - //! Add a new top-level z layer with ID for
      - //! the view. Z layers allow drawing structures in higher layers
      - //! in foreground of structures in lower layers. To add a structure
      - //! to desired layer on display it is necessary to set the layer
      - //! index for the structure.
      - Standard_EXPORT void AddZLayer(const Graphic3d_CView& theCView, - const Standard_Integer theLayerId); + //! Add a new top-level z layer with ID theLayerId for the view. Z layers allow drawing structures in higher layers in foreground of structures in lower layers. + //! To add a structure to desired layer on display it is necessary to set the layer index for the structure. + Standard_EXPORT void AddZLayer (const Graphic3d_CView& theCView, + const Standard_Integer theLayerId); - //! Remove Z layer from the specified view. All structures
      - //! displayed at the moment in layer will be displayed in default layer
      - //! ( the bottom-level z layer ). To unset layer index from associated
      - //! structures use method UnsetZLayer (...).
      - Standard_EXPORT void RemoveZLayer(const Graphic3d_CView& theCView, - const Standard_Integer theLayerId); + //! Remove Z layer from the specified view. + //! All structures displayed at the moment in layer will be displayed in default layer (the bottom-level z layer). + //! To unset layer index from associated structures use method UnsetZLayer (...). + Standard_EXPORT void RemoveZLayer (const Graphic3d_CView& theCView, + const Standard_Integer theLayerId); - //! Unset Z layer ID for all structures. The structure
      - //! indexes will be set to default layer ( the bottom-level z layer with
      - //! ID = 0 ).
      - Standard_EXPORT void UnsetZLayer(const Standard_Integer theLayerId); + //! Unset Z layer ID for all structures. + //! The structure indexes will be set to default layer (the bottom-level z layer with ID = 0). + Standard_EXPORT void UnsetZLayer (const Standard_Integer theLayerId); - //! Change Z layer of a structure. The new z layer ID will
      - //! be used to define the associated layer for structure on display.
      - //! It is recommended to take care of redisplaying the structures already
      - //! presented in view with previously set layer index. This is usually
      - //! done by viewer manager. Z layers allow drawing structures in
      - //! higher layers in foreground of structures in lower layers.
      - Standard_EXPORT void ChangeZLayer(const Graphic3d_CStructure& theCStructure, - const Standard_Integer theLayerId); + //! Change Z layer of a structure. + //! The new z layer ID will be used to define the associated layer for structure on display. + //! It is recommended to take care of redisplaying the structures already presented in view with previously set layer index. + //! This is usually done by viewer manager. Z layers allow drawing structures in higher layers in foreground of structures in lower layers. + Standard_EXPORT void ChangeZLayer (const Graphic3d_CStructure& theCStructure, + const Standard_Integer theLayerId); - //! Change Z layer of a structure already presented in view.
      - //! It is recommended to update z layer of already
      - //! displayed structures with this method before setting new z layer
      - //! index to the structure. This is usually done by viewer manager.
      - Standard_EXPORT void ChangeZLayer(const Graphic3d_CStructure& theCStructure, - const Graphic3d_CView& theCView, - const Standard_Integer theNewLayerId); + //! Change Z layer of a structure already presented in view. + //! It is recommended to update z layer of already displayed structures with this method before setting new z layer index to the structure. + //! This is usually done by viewer manager. + Standard_EXPORT void ChangeZLayer (const Graphic3d_CStructure& theCStructure, + const Graphic3d_CView& theCView, + const Standard_Integer theNewLayerId); - //! Get Z layer ID of the structure. If the structure doesn't exists in
      - //! graphic driver, the method returns -1.
      - Standard_EXPORT Standard_Integer GetZLayer(const Graphic3d_CStructure& theCStructure) const; + //! Get Z layer ID of the structure. If the structure doesn't exists in graphic driver, the method returns -1. + Standard_EXPORT Standard_Integer GetZLayer (const Graphic3d_CStructure& theCStructure) const; public: diff --git a/src/Poly/Poly_CoherentTriangulation.hxx b/src/Poly/Poly_CoherentTriangulation.hxx index 1fa1b2106c..6cd81e5a29 100644 --- a/src/Poly/Poly_CoherentTriangulation.hxx +++ b/src/Poly/Poly_CoherentTriangulation.hxx @@ -41,87 +41,61 @@ DEFINE_STANDARD_HANDLE (Poly_CoherentTriangulation, Standard_Transient) /** * Triangulation structure that allows to: *
        - *
      • Store the connectivity of each triangle with up to 3 neighbouring ones - * and with the corresponding 3rd nodes on them,
        • - *
      • Store the connectivity of each node with all triangles that share this - * node
        • + *
      • Store the connectivity of each triangle with up to 3 neighbouring ones and with the corresponding 3rd nodes on them,
        • + *
      • Store the connectivity of each node with all triangles that share this node
        • *
      • Add nodes and triangles to the structure,
        • *
      • Find all triangles sharing a single or a couple of nodes
        • *
      • Remove triangles from structure
        • - *
      • Optionally create Links between pairs of nodes according to the current - * triangulation. + *
      • Optionally create Links between pairs of nodes according to the current triangulation.
        • *
      • Convert from/to Poly_Triangulation structure.
        • *
      - * This class is useful for algorithms that need to analyse and/or edit a - * triangulated mesh -- for example for mesh refining. The connectivity model - * follows the idea that all Triangles in a mesh should have coherent orientation - * like on a surface of a solid body. Connections between more than 2 triangles - * are not suppoorted. + * + * This class is useful for algorithms that need to analyse and/or edit a triangulated mesh -- for example for mesh refining. + * The connectivity model follows the idea that all Triangles in a mesh should have coherent orientation like on a surface of a solid body. + * Connections between more than 2 triangles are not suppoorted. + * * @section Poly_CoherentTriangulation Architecture * The data types used in this structure are: *
        - *
      • Poly_CoherentNode: Inherits go_XYZ therefore provides the full - * public API of gp_XYZ. Contains references to all incident triangles. You - * can add new nodes but you cannot remove existing ones. However each node - * that has no referenced triangle is considered as "free" (use the method - * IsFreeNode() to check this). Free nodes are not available to further - * processing, particularly they are not exported in Poly_Triangulation. + *
      • Poly_CoherentNode: Inherits go_XYZ therefore provides the full public API of gp_XYZ. + * Contains references to all incident triangles. You can add new nodes but you cannot remove existing ones. + * However each node that has no referenced triangle is considered as "free" (use the method IsFreeNode() to check this). + * Free nodes are not available to further processing, particularly they are not exported in Poly_Triangulation. *
        • - *
      • Poly_CoherentTriangle: Main data type. Refers three Nodes, three - * connected Triangles, three opposite (connected) Nodes and three Links. - * If there is boundary then 1, 2 or 3 references to Triangles/connected - * Nodes/Links are assigned to NULL (for pointers) or -1 (for integer - * node index). - *
        - * You can find a triangle by one node using its triangle iterator or by - * two nodes - creating a temporary Poly_CoherentLink and calling the method - * FindTriangle(). - *
        - * Triangles can be removed but they are never deleted from - * the containing array. Removed triangles have all nodes equal to -1. You - * can use the method IsEmpty() to check that. + *
      • Poly_CoherentTriangle: Main data type. Refers three Nodes, three connected Triangles, three opposite (connected) Nodes and three Links. + * If there is boundary then 1, 2 or 3 references to Triangles/connected Nodes/Links are assigned to NULL (for pointers) or -1 (for integer node index). + * + * You can find a triangle by one node using its triangle iterator or by + * two nodes - creating a temporary Poly_CoherentLink and calling the method FindTriangle(). + * + * Triangles can be removed but they are never deleted from the containing array. Removed triangles have all nodes equal to -1. + * You can use the method IsEmpty() to check that. *
        • - *
      • Poly_CoherentLink: Auxiliary data type. Normally the array of - * Links is empty, because for many algorithms it is sufficient to define - * only Triangles. You can explicitly create the Links at least once, - * calling the method ComputeLinks(). Each Link is oriented couple of - * Poly_CoherentNode (directed to the ascending Node index). It refers - * two connected triangulated Nodes - on the left and on the right, - * therefore a Poly_CoherentLink instance refers the full set of nodes - * that constitute a couple of connected Triangles. A boundary Link has - * either the first (left) or the second (right) connected node index - * equal to -1. - *
        - * When the array of Links is created, all subsequent calls to AddTriangle - * and RemoveTriangle try to preserve the connectivity Triangle-Link in - * addition to the connectivity Triangle-Triangle. Particularly, new Links - * are created by method AddTriangle() and existing ones are removed by - * method RemoveTriangle(), in each case whenever necessary. - *
        - * Similarly to Poly_CoherentTriangle, a Link can be removed but not - * destroyed separately from others. Removed Link can be recogniosed using - * the method IsEmpty(). To destroy all Links, call the method ClearLinks(), - * this method also nullifies Link references in all Triangles. + *
      • Poly_CoherentLink: Auxiliary data type. Normally the array of Links is empty, because for many algorithms it is sufficient to define only Triangles. + * You can explicitly create the Links at least once, calling the method ComputeLinks(). Each Link is oriented couple of Poly_CoherentNode (directed to the ascending Node index). + * It refers two connected triangulated Nodes - on the left and on the right, + * therefore a Poly_CoherentLink instance refers the full set of nodes that constitute a couple of connected Triangles. + * A boundary Link has either the first (left) or the second (right) connected node index equal to -1. + * + * When the array of Links is created, all subsequent calls to AddTriangle and RemoveTriangle try to preserve the connectivity Triangle-Link in addition to the connectivity Triangle-Triangle. + * Particularly, new Links are created by method AddTriangle() and existing ones are removed by method RemoveTriangle(), in each case whenever necessary. + * + * Similarly to Poly_CoherentTriangle, a Link can be removed but not destroyed separately from others. + * Removed Link can be recogniosed using the method IsEmpty(). To destroy all Links, call the method ClearLinks(), + * this method also nullifies Link references in all Triangles. *
        • - * All objects (except for free Nodes and empty Triangles and Links) can be - * visited by the corresponding Iterator. Direct access is provided only for - * Nodes (needed to resolve Node indexed commonly used as reference). Triangles - * and Links can be retrieved by their index only internally, the public API - * provides only references or pointers to C++ objects. If you need a direct - * access to Triangles and Links, you can subclass Poly_CoherentTriangulation - * and use the protected API for your needs. - *
        - * Memory management: All data objects are stored in NCollection_Vector - * containers that prove to be efficient for the performance. In addition - * references to triangles are stored in ring lists, with an instance of such - * list per Poly_CoherentNode. These lists are allocated in a memory allocator - * that is provided in the constructor of Poly_CoherentTriangulation. By default - * the standard OCCT allocator (aka NCollection_BaseAllocator) is used. But if - * you need to increase the performance you can use NCollection_IncAllocator - * instead. + * All objects (except for free Nodes and empty Triangles and Links) can be visited by the corresponding Iterator. + * Direct access is provided only for Nodes (needed to resolve Node indexed commonly used as reference). + * Triangles and Links can be retrieved by their index only internally, the public API provides only references or pointers to C++ objects. + * If you need a direct access to Triangles and Links, you can subclass Poly_CoherentTriangulation and use the protected API for your needs. + * + * Memory management: All data objects are stored in NCollection_Vector containers that prove to be efficient for the performance. + * In addition references to triangles are stored in ring lists, with an instance of such list per Poly_CoherentNode. + * These lists are allocated in a memory allocator that is provided in the constructor of Poly_CoherentTriangulation. + * By default the standard OCCT allocator (aka NCollection_BaseAllocator) is used. + * But if you need to increase the performance you can use NCollection_IncAllocator instead. *
      */ - class Poly_CoherentTriangulation : public Standard_Transient { public: diff --git a/src/Standard/Handle_Standard_Persistent.hxx b/src/Standard/Handle_Standard_Persistent.hxx index 3519514d44..242e1411cb 100644 --- a/src/Standard/Handle_Standard_Persistent.hxx +++ b/src/Standard/Handle_Standard_Persistent.hxx @@ -20,18 +20,9 @@ #ifndef _Handle_Standard_Persistent_HeaderFile #define _Handle_Standard_Persistent_HeaderFile -#ifndef _Standard_DefineAlloc_HeaderFile #include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif -#ifndef _Standard_Persistent_proto_HeaderFile +#include #include -#endif #ifdef _WIN32 // Disable the warning "conversion from 'unsigned int' to Standard_Persistent *" diff --git a/src/Standard/Handle_Standard_Transient.hxx b/src/Standard/Handle_Standard_Transient.hxx index 8b0065fa53..0809fd6888 100644 --- a/src/Standard/Handle_Standard_Transient.hxx +++ b/src/Standard/Handle_Standard_Transient.hxx @@ -14,21 +14,11 @@ #ifndef _Handle_Standard_Transient_HeaderFile #define _Handle_Standard_Transient_HeaderFile -#ifndef _Standard_HeaderFile + #include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile #include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile #include -#endif -#ifndef _Standard_Transient_proto_HeaderFile #include -#endif #ifdef _WIN32 // Disable the warning "conversion from 'unsigned int' to Standard_Transient *" diff --git a/src/Standard/Standard_Address.hxx b/src/Standard/Standard_Address.hxx index 86b5ce0b88..242c9dd93c 100644 --- a/src/Standard/Standard_Address.hxx +++ b/src/Standard/Standard_Address.hxx @@ -26,15 +26,7 @@ # include //typedef void* Standard_Address; - -#ifndef _Standard_TypeDef_HeaderFile -#include -#endif - -#ifndef _Standard_Integer_HeaderFile #include -#endif - class Handle_Standard_Type; diff --git a/src/Standard/Standard_Boolean.cxx b/src/Standard/Standard_Boolean.cxx index 9bc737e44c..519cbf1ff9 100644 --- a/src/Standard/Standard_Boolean.cxx +++ b/src/Standard/Standard_Boolean.cxx @@ -14,12 +14,8 @@ #include #include -#ifndef _Standard_Stream_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif const Handle_Standard_Type& Standard_Boolean_Type_() { diff --git a/src/Standard/Standard_Character.cxx b/src/Standard/Standard_Character.cxx index 15b6baba14..7966ed33ba 100644 --- a/src/Standard/Standard_Character.cxx +++ b/src/Standard/Standard_Character.cxx @@ -21,13 +21,8 @@ #include #include #include -#ifndef _Standard_Stream_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif - #include const Handle_Standard_Type& Standard_Character_Type_() diff --git a/src/Standard/Standard_DefineHandle.hxx b/src/Standard/Standard_DefineHandle.hxx index 587b59e221..e7c518ed94 100644 --- a/src/Standard/Standard_DefineHandle.hxx +++ b/src/Standard/Standard_DefineHandle.hxx @@ -15,9 +15,7 @@ #ifndef _Standard_DefineHandle_HeaderFile #define _Standard_DefineHandle_HeaderFile -#ifndef _Standard_Macro_HeaderFile #include -#endif class Standard_Transient; class Standard_Persistent; diff --git a/src/Standard/Standard_ExtCharacter.cxx b/src/Standard/Standard_ExtCharacter.cxx index 6aa187d3e6..b47058c661 100644 --- a/src/Standard/Standard_ExtCharacter.cxx +++ b/src/Standard/Standard_ExtCharacter.cxx @@ -21,14 +21,9 @@ #include #include #include - #include -#ifndef _Standard_Stream_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif const Handle_Standard_Type& Standard_ExtCharacter_Type_() { diff --git a/src/Standard/Standard_ExtString.hxx b/src/Standard/Standard_ExtString.hxx index d9add9fceb..f808fc3305 100644 --- a/src/Standard/Standard_ExtString.hxx +++ b/src/Standard/Standard_ExtString.hxx @@ -22,10 +22,7 @@ #ifndef _Standard_ExtString_HeaderFile #define _Standard_ExtString_HeaderFile - -#ifndef _Standard_TypeDef_HeaderFile #include -#endif class Handle_Standard_Type; diff --git a/src/Standard/Standard_IStream.hxx b/src/Standard/Standard_IStream.hxx index 0cacd3a402..a87b03fe38 100644 --- a/src/Standard/Standard_IStream.hxx +++ b/src/Standard/Standard_IStream.hxx @@ -15,12 +15,9 @@ #ifndef _Standard_IStream_HeaderFile #define _Standard_IStream_HeaderFile -#ifndef _Standard_Macro_HeaderFile #include -#endif #include - class Handle_Standard_Type; __Standard_API const Handle_Standard_Type& Standard_IStream_Type_(); diff --git a/src/Standard/Standard_Integer.cxx b/src/Standard/Standard_Integer.cxx index 2559dd5625..653e31b9ec 100644 --- a/src/Standard/Standard_Integer.cxx +++ b/src/Standard/Standard_Integer.cxx @@ -16,12 +16,8 @@ #include #include #include -#ifndef _Standard_Stream_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif // ------------------------------------------------------------------ // CharToInt : Converts a character in an integer value diff --git a/src/Standard/Standard_Integer.hxx b/src/Standard/Standard_Integer.hxx index 01ba6a0840..e0f5df1f2e 100755 --- a/src/Standard/Standard_Integer.hxx +++ b/src/Standard/Standard_Integer.hxx @@ -15,13 +15,8 @@ #ifndef _Standard_Integer_HeaderFile #define _Standard_Integer_HeaderFile -#ifndef _Standard_TypeDef_HeaderFile #include -#endif - -#ifndef _Standard_values_HeaderFile # include -#endif class Handle_Standard_Type; diff --git a/src/Standard/Standard_MMgrOpt.hxx b/src/Standard/Standard_MMgrOpt.hxx index 4713cb0cd2..c44688c868 100644 --- a/src/Standard/Standard_MMgrOpt.hxx +++ b/src/Standard/Standard_MMgrOpt.hxx @@ -16,25 +16,8 @@ #ifndef _Standard_MMgrOpt_HeaderFile #define _Standard_MMgrOpt_HeaderFile -#ifndef _Standard_Address_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_MMgrRoot_HeaderFile #include -#endif -#ifndef _Standard_Mutex_HeaderFile #include -#endif -#include /** * @brief Open CASCADE memory manager optimized for speed. @@ -76,7 +59,6 @@ * blocks is usually less costly than directly by malloc since allocation is made * once (when allocating a pool) and overheads induced by malloc are minimized. */ - class Standard_MMgrOpt : public Standard_MMgrRoot { public: @@ -111,13 +93,11 @@ class Standard_MMgrOpt : public Standard_MMgrRoot //! Returns number of actually freed blocks Standard_EXPORT virtual Standard_Integer Purge(Standard_Boolean isDestroyed); - //! Declaration of a type pointer to the callback function that - //! should accept the following arguments:
      - //! theIsAlloc - true if the data is allocated, false if it is freed;
      - //! theStorage - address of the allocated/freed block
      - //! theRoundSize - the real rounded size of the block
      - //! theSize - the size of the block that was requested by application - //! (this value is correct only if theIsAlloc is true) + //! Declaration of a type pointer to the callback function that should accept the following arguments: + //! @param theIsAlloc true if the data is allocated, false if it is freed + //! @param theStorage address of the allocated/freed block + //! @param theRoundSize the real rounded size of the block + //! @param theSize the size of the block that was requested by application (this value is correct only if theIsAlloc is true) typedef void (*TPCallBackFunc)(const Standard_Boolean theIsAlloc, const Standard_Address theStorage, const Standard_Size theRoundSize, diff --git a/src/Standard/Standard_MMgrRaw.hxx b/src/Standard/Standard_MMgrRaw.hxx index 946fe4be22..f301372b2d 100644 --- a/src/Standard/Standard_MMgrRaw.hxx +++ b/src/Standard/Standard_MMgrRaw.hxx @@ -16,18 +16,7 @@ #ifndef _Standard_MMgrRaw_HeaderFile #define _Standard_MMgrRaw_HeaderFile -#ifndef _Standard_Address_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_MMgrRoot_HeaderFile #include -#endif /** * Implementation of raw OCC memory manager which uses standard C diff --git a/src/Standard/Standard_MMgrRoot.hxx b/src/Standard/Standard_MMgrRoot.hxx index 57e27c028c..003b7f222d 100644 --- a/src/Standard/Standard_MMgrRoot.hxx +++ b/src/Standard/Standard_MMgrRoot.hxx @@ -16,15 +16,7 @@ #ifndef _Standard_MMgrRoot_HeaderFile #define _Standard_MMgrRoot_HeaderFile -#ifndef _Standard_Address_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif +#include /** * Root class for Open CASCADE mmemory managers. diff --git a/src/Standard/Standard_MMgrTBBalloc.hxx b/src/Standard/Standard_MMgrTBBalloc.hxx index bd05fb6d66..3c6ce08546 100644 --- a/src/Standard/Standard_MMgrTBBalloc.hxx +++ b/src/Standard/Standard_MMgrTBBalloc.hxx @@ -16,18 +16,7 @@ #ifndef _Standard_MMgrTBBalloc_HeaderFile #define _Standard_MMgrTBBalloc_HeaderFile -#ifndef _Standard_Address_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_MMgrRoot_HeaderFile #include -#endif //! //! Implementation of OCC memory manager which uses Intel TBB diff --git a/src/Standard/Standard_OId.hxx b/src/Standard/Standard_OId.hxx index ca0c0f615e..8efc44dd4a 100644 --- a/src/Standard/Standard_OId.hxx +++ b/src/Standard/Standard_OId.hxx @@ -15,13 +15,8 @@ #ifndef _Standard_OId_HeaderFile #define _Standard_OId_HeaderFile -#ifndef _Standard_Integer_HeaderFile #include -#endif - -#ifndef _Standard_OStream_HeaderFile #include -#endif class Standard_Persistent; typedef Standard_Persistent* Standard_OId; diff --git a/src/Standard/Standard_OStream.hxx b/src/Standard/Standard_OStream.hxx index c8d7ce100b..056d81cbbf 100644 --- a/src/Standard/Standard_OStream.hxx +++ b/src/Standard/Standard_OStream.hxx @@ -15,12 +15,8 @@ #ifndef _Standard_OStream_HeaderFile #define _Standard_OStream_HeaderFile -#ifndef _Standard_Macro_HeaderFile #include -#endif -#ifndef _Standard_Stream_HeaderFile #include -#endif class Handle_Standard_Type; diff --git a/src/Standard/Standard_Persistent_proto.hxx b/src/Standard/Standard_Persistent_proto.hxx index 7e940cc6cf..c9a510845f 100644 --- a/src/Standard/Standard_Persistent_proto.hxx +++ b/src/Standard/Standard_Persistent_proto.hxx @@ -15,18 +15,9 @@ #ifndef _Standard_Persistent_proto_HeaderFile #define _Standard_Persistent_proto_HeaderFile -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_DefineAlloc_HeaderFile -#include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile #include -#endif +#include +#include class Standard_Type; class Handle_Standard_Type; diff --git a/src/Standard/Standard_PrimitiveTypes.hxx b/src/Standard/Standard_PrimitiveTypes.hxx index 2b22908596..6e935f6369 100644 --- a/src/Standard/Standard_PrimitiveTypes.hxx +++ b/src/Standard/Standard_PrimitiveTypes.hxx @@ -24,36 +24,17 @@ class Handle_Standard_Type; class Handle_Standard_Transient; class Standard_Transient; -#ifndef _Standard_Macro_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile + #include -#endif -#ifndef _Standard_Integer_HeaderFile #include -#endif -#ifndef _Standard_Real_HeaderFile #include -#endif -#ifndef _Standard_Character_HeaderFile #include -#endif -#ifndef _Standard_ExtCharacter_HeaderFile #include -#endif -#ifndef _Standard_CString_HeaderFile #include -#endif -#ifndef _Standard_ExtString_HeaderFile #include -#endif -#ifndef _Standard_Address_HeaderFile #include -#endif -#ifndef _Standard_Storable_HeaderFile #include -#endif __Standard_API Standard_Address ShallowCopy(const Standard_Address, const Handle_Standard_Type& ); diff --git a/src/Standard/Standard_Real.cxx b/src/Standard/Standard_Real.cxx index 7a5dc95571..0993656635 100644 --- a/src/Standard/Standard_Real.cxx +++ b/src/Standard/Standard_Real.cxx @@ -17,12 +17,8 @@ #include #include #include -#ifndef _Standard_Stream_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif const Handle_Standard_Type& Standard_Real_Type_() { diff --git a/src/Standard/Standard_Real.hxx b/src/Standard/Standard_Real.hxx index 0521525aae..735f5344e8 100644 --- a/src/Standard/Standard_Real.hxx +++ b/src/Standard/Standard_Real.hxx @@ -17,17 +17,9 @@ #include #include -#ifndef _Standard_values_HeaderFile -# include -#endif - -#ifdef WNT -# include -#endif - -#ifndef _Standard_TypeDef_HeaderFile +#include +#include #include -#endif class Handle_Standard_Type; diff --git a/src/Standard/Standard_SStream.hxx b/src/Standard/Standard_SStream.hxx index fd91ac47ac..147c0ebece 100644 --- a/src/Standard/Standard_SStream.hxx +++ b/src/Standard/Standard_SStream.hxx @@ -17,9 +17,7 @@ #ifndef _Standard_SStream_HeaderFile #define _Standard_SStream_HeaderFile -#ifndef _Standard_Stream_HeaderFile #include -#endif #ifdef USE_STL_STREAM diff --git a/src/Standard/Standard_ShortReal.cxx b/src/Standard/Standard_ShortReal.cxx index 27af611db7..f626628852 100644 --- a/src/Standard/Standard_ShortReal.cxx +++ b/src/Standard/Standard_ShortReal.cxx @@ -15,13 +15,8 @@ #include #include #include - -#ifndef _Standard_Stream_HeaderFile #include -#endif -#ifndef _Standard_OStream_HeaderFile #include -#endif const Handle_Standard_Type& Standard_ShortReal_Type_() { diff --git a/src/Standard/Standard_ShortReal.hxx b/src/Standard/Standard_ShortReal.hxx index 8ec3a41549..891f3af36f 100644 --- a/src/Standard/Standard_ShortReal.hxx +++ b/src/Standard/Standard_ShortReal.hxx @@ -17,14 +17,9 @@ #include #include -#ifndef _Standard_values_HeaderFile -# include -#endif - -#ifndef _Standard_TypeDef_HeaderFile +#include #include -#endif class Handle_Standard_Type; diff --git a/src/Standard/Standard_Stream.hxx b/src/Standard/Standard_Stream.hxx index bce1d9e9ad..0496ebed3f 100644 --- a/src/Standard/Standard_Stream.hxx +++ b/src/Standard/Standard_Stream.hxx @@ -23,9 +23,7 @@ #ifndef _Standard_Stream_HeaderFile #define _Standard_Stream_HeaderFile -#ifndef _Standard_Macro_HeaderFile #include -#endif #ifdef USE_STL_STREAM #undef USE_STL_STREAM diff --git a/src/Standard/Standard_Time.hxx b/src/Standard/Standard_Time.hxx index 3c4772c221..2580189450 100755 --- a/src/Standard/Standard_Time.hxx +++ b/src/Standard/Standard_Time.hxx @@ -14,9 +14,7 @@ #ifndef _Standard_Time_HeaderFile #define _Standard_Time_HeaderFile -#ifndef _Standard_TypeDef_HeaderFile #include -#endif class Handle_Standard_Type; diff --git a/src/Standard/Standard_Transient.hxx b/src/Standard/Standard_Transient.hxx index 2d242e9d8e..94a7b2c1da 100644 --- a/src/Standard/Standard_Transient.hxx +++ b/src/Standard/Standard_Transient.hxx @@ -15,17 +15,9 @@ #ifndef _Standard_Transient_HeaderFile #define _Standard_Transient_HeaderFile -#ifndef _Handle_Standard_Transient_HeaderFile #include -#endif -#ifndef _Standard_PrimitiveTypes_HeaderFile #include -#endif -#ifndef _Standard_Transient_proto_HeaderFile #include -#endif -#ifndef _Standard_Type_HeaderFile #include -#endif #endif diff --git a/src/Standard/Standard_Transient_proto.hxx b/src/Standard/Standard_Transient_proto.hxx index a437209be4..765386fdaf 100644 --- a/src/Standard/Standard_Transient_proto.hxx +++ b/src/Standard/Standard_Transient_proto.hxx @@ -15,15 +15,9 @@ #ifndef _Standard_Transient_proto_HeaderFile #define _Standard_Transient_proto_HeaderFile -#ifndef _Standard_DefineAlloc_HeaderFile #include -#endif -#ifndef _Standard_Macro_HeaderFile #include -#endif -#ifndef _Standard_HeaderFile #include -#endif class Handle_Standard_Transient; class Standard_Type; diff --git a/src/Standard/Standard_TypeDef.hxx b/src/Standard/Standard_TypeDef.hxx index 873d44c7b8..c5792fbc17 100755 --- a/src/Standard/Standard_TypeDef.hxx +++ b/src/Standard/Standard_TypeDef.hxx @@ -52,9 +52,7 @@ #define Standard_False (Standard_Boolean)0 #define Standard_True (Standard_Boolean)1 -#ifndef _Standard_Macro_HeaderFile #include -#endif typedef int Standard_Integer; typedef double Standard_Real; diff --git a/src/TColStd/TColStd_PackedMapOfInteger.hxx b/src/TColStd/TColStd_PackedMapOfInteger.hxx index 1e6080e2b5..47b4f807ba 100644 --- a/src/TColStd/TColStd_PackedMapOfInteger.hxx +++ b/src/TColStd/TColStd_PackedMapOfInteger.hxx @@ -20,10 +20,8 @@ #include /** - * Optimized Map of integer values. Each block of 32 integers is stored in - * 8 bytes in memory. + * Optimized Map of integer values. Each block of 32 integers is stored in 8 bytes in memory. */ - class TColStd_PackedMapOfInteger : private TCollection_BasicMap { public: @@ -80,25 +78,20 @@ class TColStd_PackedMapOfInteger : private TCollection_BasicMap public: //!@name Boolean operations with maps as sets of integers //!@{ - + /** - * Sets this Map to be the result of union (aka addition, fuse, merge, - * boolean OR) operation between two given Maps. - * The new Map contains the values that are contained either in the - * first map or in the second map or in both.
      - * All previous contents of this Map is cleared. This map (result of the - * boolean operation) can also be passed as one of operands.
      + * Sets this Map to be the result of union (aka addition, fuse, merge, boolean OR) operation between two given Maps. + * The new Map contains the values that are contained either in the first map or in the second map or in both. + * All previous contents of this Map is cleared. This map (result of the boolean operation) can also be passed as one of operands. */ Standard_EXPORT void Union (const TColStd_PackedMapOfInteger&, const TColStd_PackedMapOfInteger&); /** - * Apply to this Map the boolean operation union (aka addition, fuse, merge, - * boolean OR) with another (given) Map. - * The result contains the values that were previously contained in - * this map or contained in the given (operand) map.
      + * Apply to this Map the boolean operation union (aka addition, fuse, merge, boolean OR) with another (given) Map. + * The result contains the values that were previously contained in this map or contained in the given (operand) map. * This algorithm is similar to method Union(). - * Returns True if contents of this map is changed. + * @return True if content of this map is changed */ Standard_EXPORT Standard_Boolean Unite (const TColStd_PackedMapOfInteger&); @@ -109,25 +102,19 @@ public: { Unite(MM); return *this; } /** - * Sets this Map to be the result of intersection (aka multiplication, common, - * boolean AND) operation between two given Maps. - * The new Map contains only the values that are contained in both map - * operands.
      - * All previous contents of this Map is cleared. This same map (result of the - * boolean operation) can also be used as one of operands.
      - * The order of operands makes no difference; the method minimizes internally - * the number of iterations using the smallest map for the loop. + * Sets this Map to be the result of intersection (aka multiplication, common, boolean AND) operation between two given Maps. + * The new Map contains only the values that are contained in both map operands. + * All previous contents of this Map is cleared. This same map (result of the boolean operation) can also be used as one of operands. + * The order of operands makes no difference; the method minimizes internally the number of iterations using the smallest map for the loop. */ Standard_EXPORT void Intersection (const TColStd_PackedMapOfInteger&, const TColStd_PackedMapOfInteger&); /** - * Apply to this Map the intersection operation (aka multiplication, common, - * boolean AND) with another (given) Map. - * The result contains only the values that are contained in both this and - * the given maps.
      + * Apply to this Map the intersection operation (aka multiplication, common, boolean AND) with another (given) Map. + * The result contains only the values that are contained in both this and the given maps. * This algorithm is similar to method Intersection(). - * Returns True if contents of this map is changed. + * @return True if content of this map is changed */ Standard_EXPORT Standard_Boolean Intersect (const TColStd_PackedMapOfInteger&); @@ -138,23 +125,20 @@ public: { Intersect(MM); return *this; } /** - * Sets this Map to be the result of subtraction (aka set-theoretic difference, - * relative complement, exclude, cut, boolean NOT) operation between two given Maps. - * The new Map contains only the values that are contained in the first map - * operands and not contained in the second one.
      - * All previous contents of this Map is cleared. This map (result of the - * boolean operation) can also be used as the first operand.
      + * Sets this Map to be the result of subtraction + * (aka set-theoretic difference, relative complement, exclude, cut, boolean NOT) operation between two given Maps. + * The new Map contains only the values that are contained in the first map operands and not contained in the second one. + * All previous contents of this Map is cleared. + * This map (result of the boolean operation) can also be used as the first operand. */ Standard_EXPORT void Subtraction (const TColStd_PackedMapOfInteger&, const TColStd_PackedMapOfInteger&); /** - * Apply to this Map the subtraction (aka set-theoretic difference, relative - * complement, exclude, cut, boolean NOT) operation with another (given) Map. - * The result contains only the values that were previously contained in - * this map and not contained in this map.
      + * Apply to this Map the subtraction (aka set-theoretic difference, relative complement, exclude, cut, boolean NOT) operation with another (given) Map. + * The result contains only the values that were previously contained in this map and not contained in this map. * This algorithm is similar to method Subtract() with two operands. - * Returns True if contents of this map is changed. + * @return True if contents of this map is changed */ Standard_EXPORT Standard_Boolean Subtract (const TColStd_PackedMapOfInteger&); @@ -165,23 +149,19 @@ public: { Subtract(MM); return *this; } /** - * Sets this Map to be the result of symmetric difference (aka exclusive - * disjunction, boolean XOR) operation between two given Maps. - * The new Map contains the values that are contained only in the - * first or the second operand maps but not in both.
      - * All previous contents of this Map is cleared. This map (result of the - * boolean operation) can also be used as one of operands.
      + * Sets this Map to be the result of symmetric difference (aka exclusive disjunction, boolean XOR) operation between two given Maps. + * The new Map contains the values that are contained only in the first or the second operand maps but not in both. + * All previous contents of this Map is cleared. + * This map (result of the boolean operation) can also be used as one of operands. */ Standard_EXPORT void Difference (const TColStd_PackedMapOfInteger&, const TColStd_PackedMapOfInteger&); /** - * Apply to this Map the symmetric difference (aka exclusive - * disjunction, boolean XOR) operation with another (given) Map. - * The result contains the values that are contained only in this - * or the operand map, but not in both.
      + * Apply to this Map the symmetric difference (aka exclusive disjunction, boolean XOR) operation with another (given) Map. + * The result contains the values that are contained only in this or the operand map, but not in both. * This algorithm is similar to method Difference(). - * Returns True if contents of this map is changed. + * @return True if contents of this map is changed */ Standard_EXPORT Standard_Boolean Differ (const TColStd_PackedMapOfInteger&); diff --git a/src/TDF/TDF_AttributeIterator.hxx b/src/TDF/TDF_AttributeIterator.hxx index dae1020c62..9ba62e353d 100644 --- a/src/TDF/TDF_AttributeIterator.hxx +++ b/src/TDF/TDF_AttributeIterator.hxx @@ -19,33 +19,12 @@ //Version Date Purpose // 0.0 Feb 16 1998 Creation - -#ifndef _TDF_Attribute_HeaderFile -#include -#endif -#ifndef _TDF_Label_HeaderFile -#include -#endif - #ifndef TDF_AttributeIterator_HeaderFile #define TDF_AttributeIterator_HeaderFile -#ifndef _Handle_TDF_Attribute_HeaderFile #include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -#ifndef _TDF_LabelNodePtr_HeaderFile +#include #include -#endif -class TDF_Attribute; -class TDF_Label; - - -#ifndef _Standard_Macro_HeaderFile -#include -#endif // This class provides a way to iterates on the // up-to-date (current) valid attributes of a label. diff --git a/src/V3d/V3d_Plane.hxx b/src/V3d/V3d_Plane.hxx index a8c0a1059e..ad24044c7f 100755 --- a/src/V3d/V3d_Plane.hxx +++ b/src/V3d/V3d_Plane.hxx @@ -69,13 +69,13 @@ public: Quantity_Parameter& theC, Quantity_Parameter& theD) const; - //! Returns TRUE when the plane representation is displayed
      + //! Returns TRUE when the plane representation is displayed. Standard_EXPORT Standard_Boolean IsDisplayed() const; //! Use this method to pass clipping plane implementation for //! standard clipping workflow. //! @return clipping plane implementation handle. - Standard_EXPORT const Handle(Graphic3d_ClipPlane)& ClipPlane() const + const Handle(Graphic3d_ClipPlane)& ClipPlane() const { return myPlane; } diff --git a/src/WNT/FILES b/src/WNT/FILES index ee102a6c7d..f9b8188e56 100755 --- a/src/WNT/FILES +++ b/src/WNT/FILES @@ -5,6 +5,3 @@ WNT_WOKUMake.edl WNT_Dword.hxx WNT_Uint.hxx WNT_WindowData.hxx -WNT_Dword.cxx -WNT_Uint.cxx -WNT_WindowData.cxx diff --git a/src/WNT/WNT_Dword.cxx b/src/WNT/WNT_Dword.cxx deleted file mode 100644 index ece729d70a..0000000000 --- a/src/WNT/WNT_Dword.cxx +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 1996-1999 Matra Datavision -// Copyright (c) 1999-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 __WNT_Dword_HeaderFile -# include -#endif // __WNT_Dword_HeaderFile - -const Handle( Standard_Type )& STANDARD_TYPE( WNT_Dword ) { - - static Handle( Standard_Type ) _aType = new Standard_Type ( - "WNT_Dword", sizeof ( WNT_Dword ) - ); - - return _aType; - -} // end function diff --git a/src/WNT/WNT_Uint.cxx b/src/WNT/WNT_Uint.cxx deleted file mode 100644 index 1708ec06d0..0000000000 --- a/src/WNT/WNT_Uint.cxx +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 1996-1999 Matra Datavision -// Copyright (c) 1999-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 __WNT_Uint_HeaderFile -# include -#endif // __WNT_Uint_HeaderFile - -const Handle( Standard_Type )& STANDARD_TYPE( WNT_Uint ) { - - static Handle( Standard_Type ) _aType = new Standard_Type ( - "WNT_Uint", sizeof ( WNT_Uint ) - ); - - return _aType; - -} // end function diff --git a/src/WNT/WNT_WindowData.cxx b/src/WNT/WNT_WindowData.cxx deleted file mode 100644 index 8b22a66a84..0000000000 --- a/src/WNT/WNT_WindowData.cxx +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 1996-1999 Matra Datavision -// Copyright (c) 1999-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 __WNT_WindowData_HeaderFile -# include -#endif // __WNT_WindowData_HeaderFile - -const Handle( Standard_Type )& STANDARD_TYPE( WNT_WindowData ) { - - static Handle( Standard_Type ) _aType = new Standard_Type ( - "WNT_WindowData", - sizeof ( WNT_WindowData ) - ); - - return _aType; - -} // end function