0024947: Redesign OCCT legacy type system -- automatic

Automatic upgrade with command "occt_upgdare . -rtti"
2025-08-14 13:30:48 +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/Select3D/Select3D_InteriorSensitivePointSet.cxx
+++ b/src/Select3D/Select3D_InteriorSensitivePointSet.cxx
@@ -78,8 +78,6 @@ private:

 } // anonymous namespace

-IMPLEMENT_STANDARD_HANDLE (Select3D_InteriorSensitivePointSet, Select3D_SensitiveSet)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_InteriorSensitivePointSet, Select3D_SensitiveSet)

 // =======================================================================
 // function : Select3D_InteriorSensitivePointSet
--- a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
+++ b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
@@ -74,7 +74,7 @@ public:
  //! Returns the amount of points in set
  Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_InteriorSensitivePointSet)
+  DEFINE_STANDARD_RTTI(Select3D_InteriorSensitivePointSet, Select3D_SensitiveSet)

 protected:

--- a/src/Select3D/Select3D_SensitiveBox.cxx
+++ b/src/Select3D/Select3D_SensitiveBox.cxx
@@ -20,8 +20,6 @@
 #include <Bnd_Box.hxx>
 #include <ElCLib.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveBox, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveBox, Select3D_SensitiveEntity)

 //==================================================
 // Function: Select3D_SensitiveBox
--- a/src/Select3D/Select3D_SensitiveBox.hxx
+++ b/src/Select3D/Select3D_SensitiveBox.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitiveBox_HeaderFile

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

 #include <Bnd_Box.hxx>
@@ -75,7 +75,7 @@ public:
  //! transformation is set, it will be applied
  Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveBox)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveBox, Select3D_SensitiveEntity)

 private:

--- a/src/Select3D/Select3D_SensitiveCircle.cxx
+++ b/src/Select3D/Select3D_SensitiveCircle.cxx
@@ -22,8 +22,6 @@

 #include <Select3D_SensitiveCircle.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveCircle, Select3D_SensitivePoly)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveCircle, Select3D_SensitivePoly)

 static Standard_Integer GetCircleNbPoints (const Handle(Geom_Circle)& theCircle,
                                           const Standard_Integer theNbPnts)
--- a/src/Select3D/Select3D_SensitiveCircle.hxx
+++ b/src/Select3D/Select3D_SensitiveCircle.hxx
@@ -20,7 +20,7 @@
 #define _Select3D_SensitiveCircle_HeaderFile

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

 #include <Select3D_SensitivePoly.hxx>
@@ -103,7 +103,7 @@ public:
  //! Builds BVH tree for a circle's edge segments if needed
  Standard_EXPORT virtual void BVH() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveCircle)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveCircle, Select3D_SensitivePoly)

 private:

--- a/src/Select3D/Select3D_SensitiveCurve.cxx
+++ b/src/Select3D/Select3D_SensitiveCurve.cxx
@@ -18,8 +18,6 @@
 #include <Precision.hxx>
 #include <TColgp_Array1OfPnt.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveCurve, Select3D_SensitivePoly)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveCurve, Select3D_SensitivePoly)

 //==================================================
 // Function: Creation
--- a/src/Select3D/Select3D_SensitiveCurve.hxx
+++ b/src/Select3D/Select3D_SensitiveCurve.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitiveCurve_HeaderFile

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

 #include <Geom_Curve.hxx>
@@ -70,7 +70,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveCurve)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveCurve, Select3D_SensitivePoly)

 private:

--- a/src/Select3D/Select3D_SensitiveEntity.cxx
+++ b/src/Select3D/Select3D_SensitiveEntity.cxx
@@ -20,8 +20,6 @@
 #include <Select3D_Macro.hxx>
 #include <TopLoc_Location.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveEntity, SelectBasics_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveEntity, SelectBasics_SensitiveEntity)

 //=======================================================================
 //function : Select3D_SensitiveEntity
--- a/src/Select3D/Select3D_SensitiveEntity.hxx
+++ b/src/Select3D/Select3D_SensitiveEntity.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitiveEntity_HeaderFile

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

 #include <SelectBasics_SensitiveEntity.hxx>
 #include <Handle_SelectBasics_EntityOwner.hxx>
@@ -80,7 +80,7 @@ public:
  //! Clears up all resources and memory
  Standard_EXPORT virtual void Clear() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveEntity, SelectBasics_SensitiveEntity)

 protected:

--- a/src/Select3D/Select3D_SensitiveFace.cxx
+++ b/src/Select3D/Select3D_SensitiveFace.cxx
@@ -25,8 +25,6 @@
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveFace, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveFace, Select3D_SensitiveEntity)

 //==================================================
 // Function: Hide this constructor to the next version...
--- a/src/Select3D/Select3D_SensitiveFace.hxx
+++ b/src/Select3D/Select3D_SensitiveFace.hxx
@@ -21,7 +21,7 @@
 #ifndef _Select3D_SensitiveFace_HeaderFile
 #define _Select3D_SensitiveFace_HeaderFile

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

 #include <Select3D_TypeOfSensitivity.hxx>
 #include <Select3D_SensitiveSet.hxx>
@@ -87,7 +87,7 @@ public:
  //! Returns the amount of sub-entities (points or planar convex polygons)
  Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveFace)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveFace, Select3D_SensitiveEntity)

 private:

--- a/src/Select3D/Select3D_SensitiveGroup.cxx
+++ b/src/Select3D/Select3D_SensitiveGroup.cxx
@@ -18,8 +18,6 @@
 #include <Select3D_SensitiveGroup.hxx>
 #include <TopLoc_Location.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveGroup, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveGroup, Select3D_SensitiveEntity)

 //=======================================================================
 //function : Creation
--- a/src/Select3D/Select3D_SensitiveGroup.hxx
+++ b/src/Select3D/Select3D_SensitiveGroup.hxx
@@ -19,7 +19,7 @@
 #define _Select3D_SensitiveGroup_HeaderFile

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

 #include <Select3D_EntitySequence.hxx>
@@ -121,7 +121,7 @@ public:
  //! Returns the length of vector of sensitive entities
  Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveGroup)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveGroup, Select3D_SensitiveSet)

 private:

--- a/src/Select3D/Select3D_SensitivePoint.cxx
+++ b/src/Select3D/Select3D_SensitivePoint.cxx
@@ -18,8 +18,6 @@

 #include <TopLoc_Location.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitivePoint, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitivePoint, Select3D_SensitiveEntity)

 //==================================================
 // Function: Creation
--- a/src/Select3D/Select3D_SensitivePoint.hxx
+++ b/src/Select3D/Select3D_SensitivePoint.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitivePoint_HeaderFile

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

 #include <Select3D_Pnt.hxx>
@@ -62,7 +62,7 @@ public:
  //! transformation is set, it will be applied
  Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitivePoint)
+  DEFINE_STANDARD_RTTI(Select3D_SensitivePoint, Select3D_SensitiveEntity)

 private:

--- a/src/Select3D/Select3D_SensitivePoly.cxx
+++ b/src/Select3D/Select3D_SensitivePoly.cxx
@@ -18,8 +18,6 @@

 #include <Select3D_SensitivePoly.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitivePoly, Select3D_SensitiveSet)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitivePoly, Select3D_SensitiveSet)

 //==================================================
 // Function: Select3D_SensitivePoly
--- a/src/Select3D/Select3D_SensitivePoly.hxx
+++ b/src/Select3D/Select3D_SensitivePoly.hxx
@@ -17,7 +17,7 @@
 #include <NCollection_Handle.hxx>

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

 #include <TColStd_HArray1OfInteger.hxx>
@@ -97,7 +97,7 @@ public:
  Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1,
                                     const Standard_Integer theIdx2) Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI (Select3D_SensitivePoly)
+  DEFINE_STANDARD_RTTI (Select3D_SensitivePoly, Select3D_SensitiveSet)

 private:

--- a/src/Select3D/Select3D_SensitiveSegment.cxx
+++ b/src/Select3D/Select3D_SensitiveSegment.cxx
@@ -19,8 +19,6 @@
 #include <TopLoc_Location.hxx>
 #include <Precision.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveSegment, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveSegment, Select3D_SensitiveEntity)

 //=====================================================
 // Function : Create
--- a/src/Select3D/Select3D_SensitiveSegment.hxx
+++ b/src/Select3D/Select3D_SensitiveSegment.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitiveSegment_HeaderFile

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

 #include <Standard_Integer.hxx>
@@ -76,7 +76,7 @@ public:
  //! transformation is set, it will be applied
  Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveSegment)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveSegment, Select3D_SensitiveEntity)

 private:

--- a/src/Select3D/Select3D_SensitiveSet.cxx
+++ b/src/Select3D/Select3D_SensitiveSet.cxx
@@ -16,8 +16,6 @@
 #include <Select3D_SensitiveSet.hxx>
 #include <Select3D_BVHPrimitiveContent.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveSet, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveSet, Select3D_SensitiveEntity)

 //=======================================================================
 // function : Select3D_SensitiveSet
--- a/src/Select3D/Select3D_SensitiveSet.hxx
+++ b/src/Select3D/Select3D_SensitiveSet.hxx
@@ -17,7 +17,7 @@
 #define _Select3D_SensitiveSet_Header

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

 #include <NCollection_Handle.hxx>
@@ -91,7 +91,7 @@ public:
  Standard_EXPORT Standard_Integer GetLeafNodeSize() const;

 public:
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveSet)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveSet, Select3D_SensitiveEntity)

 protected:

--- a/src/Select3D/Select3D_SensitiveTriangle.cxx
+++ b/src/Select3D/Select3D_SensitiveTriangle.cxx
@@ -21,8 +21,6 @@
 #include <Bnd_Box.hxx>
 #include <TopLoc_Location.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveTriangle, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveTriangle, Select3D_SensitiveEntity)

 //==================================================
 // Function: Creation
--- a/src/Select3D/Select3D_SensitiveTriangle.hxx
+++ b/src/Select3D/Select3D_SensitiveTriangle.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitiveTriangle_HeaderFile

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

 #include <Select3D_TypeOfSensitivity.hxx>
@@ -75,7 +75,7 @@ public:

  virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE { return myCentroid; }

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveTriangle)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveTriangle, Select3D_SensitiveEntity)

 private:

--- a/src/Select3D/Select3D_SensitiveTriangulation.cxx
+++ b/src/Select3D/Select3D_SensitiveTriangulation.cxx
@@ -25,8 +25,6 @@

 #include <Select3D_SensitiveTriangulation.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveTriangulation, Select3D_SensitiveSet)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveTriangulation, Select3D_SensitiveSet)

 static Standard_Integer NbOfFreeEdges (const Handle(Poly_Triangulation)& theTriangulation)
 {
--- a/src/Select3D/Select3D_SensitiveTriangulation.hxx
+++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx
@@ -22,7 +22,7 @@
 #define _Select3D_SensitiveTriangulation_Header

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

 #include <Handle_Poly_Triangulation.hxx>
@@ -111,7 +111,7 @@ public:
  Standard_EXPORT virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE;

 public:
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveTriangulation)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveTriangulation, Select3D_SensitiveSet)

 protected:

--- a/src/Select3D/Select3D_SensitiveWire.cxx
+++ b/src/Select3D/Select3D_SensitiveWire.cxx
@@ -21,8 +21,6 @@

 #include <Select3D_SensitiveSegment.hxx>

-IMPLEMENT_STANDARD_HANDLE (Select3D_SensitiveWire, Select3D_SensitiveEntity)
-IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveWire, Select3D_SensitiveEntity)

 //=====================================================
 // Function : Select3D_SensitiveWire
--- a/src/Select3D/Select3D_SensitiveWire.hxx
+++ b/src/Select3D/Select3D_SensitiveWire.hxx
@@ -18,7 +18,7 @@
 #define _Select3D_SensitiveWire_HeaderFile

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

 #include <Select3D_SensitiveSet.hxx>
@@ -80,7 +80,7 @@ public:
  Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1,
                                     const Standard_Integer theIdx2) Standard_OVERRIDE;

-  DEFINE_STANDARD_RTTI(Select3D_SensitiveWire)
+  DEFINE_STANDARD_RTTI(Select3D_SensitiveWire, Select3D_SensitiveSet)

 protected: