0024947: Redesign OCCT legacy type system -- automatic

Automatic upgrade with command "occt_upgdare . -rtti"
2025-08-09 13:22:24 +03:00 · 2015-07-11 11:06:11 +03:00
parent 69ff08ff28
commit ec357c5cbb
816 changed files with 1280 additions and 690 deletions
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
@@ -24,8 +24,6 @@
 #include <BRepTools.hxx>
 #include <Standard_ErrorHandler.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_DataStructureOfDelaun, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_DataStructureOfDelaun, Standard_Transient)

 //=======================================================================
 //function : BRepMesh_DataStructureOfDelaun
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
@@ -15,7 +15,7 @@
 #define _BRepMesh_DataStructureOfDelaun_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <BRepMesh_VertexTool.hxx>
 #include <Standard_Transient.hxx>
 #include <BRepMesh_Triangle.hxx>
@@ -260,7 +260,7 @@ public: //! @name Auxilary API
    clearDeletedNodes();
  }

-  DEFINE_STANDARD_RTTI(BRepMesh_DataStructureOfDelaun)
+  DEFINE_STANDARD_RTTI(BRepMesh_DataStructureOfDelaun, Standard_Transient)

 private: 

--- a/src/BRepMesh/BRepMesh_DiscretRoot.cxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.cxx
@@ -15,8 +15,6 @@

 #include <BRepMesh_DiscretRoot.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_DiscretRoot, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_DiscretRoot, Standard_Transient)

 //=======================================================================
 //function : BRepMesh_DiscretRoot
--- a/src/BRepMesh/BRepMesh_DiscretRoot.hxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.hxx
@@ -15,7 +15,7 @@
 #define _BRepMesh_DiscretRoot_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Transient.hxx>

@@ -73,7 +73,7 @@ public:
  Standard_EXPORT virtual void Perform() = 0;


-  DEFINE_STANDARD_RTTI(BRepMesh_DiscretRoot)
+  DEFINE_STANDARD_RTTI(BRepMesh_DiscretRoot, Standard_Transient)

 protected:
  
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
@@ -19,8 +19,6 @@
 #include <Poly_Triangulation.hxx>
 #include <BRepMesh_ShapeTool.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)

 //=======================================================================
 //function : Constructor
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
@@ -64,7 +64,7 @@ public:
                     gp_Pnt&                thePoint,
                     gp_Pnt2d&              theUV);

-  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellationExtractor)
+  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)

 private:

--- a/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
@@ -31,8 +31,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TColStd_Array1OfReal.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)

 //=======================================================================
 //function : Constructor
--- a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
@@ -66,7 +66,7 @@ public:
                     gp_Pnt&                thePoint,
                     gp_Pnt2d&              theUV);

-  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellator)
+  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)

 private:

--- a/src/BRepMesh/BRepMesh_FaceAttribute.cxx
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.cxx
@@ -19,8 +19,6 @@
 #include <BRepMesh_Classifier.hxx>
 #include <BRepTools.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_FaceAttribute, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FaceAttribute, Standard_Transient)

 //=======================================================================
 //function : Constructor
--- a/src/BRepMesh/BRepMesh_FaceAttribute.hxx
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.hxx
@@ -16,7 +16,7 @@

 #include <Standard.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>

 #include <BRepMesh_Status.hxx>
 #include <BRepMesh.hxx>
@@ -323,7 +323,7 @@ public: //! @name Auxiliary methods
  Standard_EXPORT gp_XY Scale(const gp_XY&           thePoint2d, 
                              const Standard_Boolean isToFaceBasis);

-  DEFINE_STANDARD_RTTI(BRepMesh_FaceAttribute)
+  DEFINE_STANDARD_RTTI(BRepMesh_FaceAttribute, Standard_Transient)

 private:

--- a/src/BRepMesh/BRepMesh_FastDiscret.cxx
+++ b/src/BRepMesh/BRepMesh_FastDiscret.cxx
@@ -75,8 +75,6 @@

 #define UVDEFLECTION 1.e-05

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_FastDiscret, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FastDiscret, Standard_Transient)

 //=======================================================================
 //function : BRepMesh_FastDiscret
--- a/src/BRepMesh/BRepMesh_FastDiscret.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscret.hxx
@@ -15,7 +15,7 @@
 #define _BRepMesh_FastDiscret_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <BRepMesh_FastDiscret.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
@@ -175,7 +175,7 @@ public:
    return myBoundaryPoints->Extent();
  }

-  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscret)
+  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscret, Standard_Transient)

 private:

--- a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
@@ -57,8 +57,6 @@

 #include <algorithm>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_FastDiscretFace, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FastDiscretFace, Standard_Transient)

 static Standard_Real FUN_CalcAverageDUV(TColStd_Array1OfReal& P, const Standard_Integer PLen)
 {
--- a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
@@ -15,7 +15,7 @@
 #define _BRepMesh_FastDiscretFace_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <BRepMesh_FastDiscretFace.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <BRepMesh.hxx>
@@ -64,7 +64,7 @@ public:

  Standard_EXPORT void Perform(const Handle(BRepMesh_FaceAttribute)& theAttribute);

-  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscretFace)
+  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscretFace, Standard_Transient)

 private:

--- a/src/BRepMesh/BRepMesh_IEdgeTool.cxx
+++ b/src/BRepMesh/BRepMesh_IEdgeTool.cxx
@@ -15,5 +15,4 @@

 #include <BRepMesh_IEdgeTool.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_IEdgeTool, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_IEdgeTool, Standard_Transient)
+
--- a/src/BRepMesh/BRepMesh_IEdgeTool.hxx
+++ b/src/BRepMesh/BRepMesh_IEdgeTool.hxx
@@ -38,7 +38,7 @@ public:
                     gp_Pnt&                thePoint,
                     gp_Pnt2d&              theUV) = 0;

-  DEFINE_STANDARD_RTTI(BRepMesh_IEdgeTool)
+  DEFINE_STANDARD_RTTI(BRepMesh_IEdgeTool, Standard_Transient)
 };

 DEFINE_STANDARD_HANDLE(BRepMesh_IEdgeTool, Standard_Transient)
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
@@ -60,8 +60,6 @@ namespace
  static Standard_Boolean IS_IN_PARALLEL = Standard_False;
 };

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)

 //=======================================================================
 //function : Default constructor
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
@@ -15,7 +15,7 @@
 #define _BRepMesh_IncrementalMesh_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>

 #include <BRepMesh_FastDiscret.hxx>
 #include <TopTools_MapOfShape.hxx>
@@ -162,7 +162,7 @@ public: //! @name plugin API
  //! Discret() static method (thus applied only to Mesh Factories).
  Standard_EXPORT static void SetParallelDefault(const Standard_Boolean isInParallel);

-  DEFINE_STANDARD_RTTI(BRepMesh_IncrementalMesh)
+  DEFINE_STANDARD_RTTI(BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)

 protected: