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/AIS/AIS.cxx
+++ b/src/AIS/AIS.cxx
@@ -77,6 +77,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopoDS.hxx>
+#include <Geom_Surface.hxx>

 const Standard_Real SquareTolerance = Precision::SquareConfusion();

--- a/src/AIS/AIS_AngleDimension.cxx
+++ b/src/AIS/AIS_AngleDimension.cxx
@@ -49,9 +49,9 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard_ProgramError.hxx>
 #include <UnitsAPI.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Plane.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT (AIS_AngleDimension, AIS_Dimension)

 namespace
 {
--- a/src/AIS/AIS_AngleDimension.hxx
+++ b/src/AIS/AIS_AngleDimension.hxx
@@ -28,7 +28,7 @@
 #include <Prs3d_Presentation.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
@@ -209,7 +209,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (AIS_AngleDimension)
+  DEFINE_STANDARD_RTTI (AIS_AngleDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -41,11 +41,8 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_ColoredDrawer, Prs3d_Drawer)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredDrawer, Prs3d_Drawer)

-IMPLEMENT_STANDARD_HANDLE (AIS_ColoredShape, AIS_Shape)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredShape, AIS_Shape)
+

 //=======================================================================
 //function : AIS_ColoredShape
--- a/src/AIS/AIS_ColoredShape.hxx
+++ b/src/AIS/AIS_ColoredShape.hxx
@@ -54,7 +54,7 @@ public:  //! @name list of overridden properties
  Standard_Boolean myHasOwnWidth;

 public:
-  DEFINE_STANDARD_RTTI(AIS_ColoredDrawer);
+  DEFINE_STANDARD_RTTI(AIS_ColoredDrawer, Prs3d_Drawer);

 };

@@ -175,7 +175,7 @@ protected:

 public:

-  DEFINE_STANDARD_RTTI(AIS_ColoredShape);
+  DEFINE_STANDARD_RTTI(AIS_ColoredShape, AIS_Shape);

 };

--- a/src/AIS/AIS_DiameterDimension.cxx
+++ b/src/AIS/AIS_DiameterDimension.cxx
@@ -25,8 +25,6 @@
 #include <gce_MakeDir.hxx>
 #include <Standard_ProgramError.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT (AIS_DiameterDimension, AIS_Dimension)

 namespace
 {
--- a/src/AIS/AIS_DiameterDimension.hxx
+++ b/src/AIS/AIS_DiameterDimension.hxx
@@ -22,7 +22,7 @@
 #include <gp_Circ.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>

 DEFINE_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension)

@@ -129,7 +129,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(AIS_DiameterDimension)
+  DEFINE_STANDARD_RTTI(AIS_DiameterDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_Dimension.cxx
+++ b/src/AIS/AIS_Dimension.cxx
@@ -73,8 +73,6 @@
 #include <UnitsAPI.hxx>
 #include <UnitsAPI_SystemUnits.hxx>

-IMPLEMENT_STANDARD_HANDLE(AIS_Dimension, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Dimension, AIS_InteractiveObject)

 namespace
 {
--- a/src/AIS/AIS_Dimension.hxx
+++ b/src/AIS/AIS_Dimension.hxx
@@ -377,7 +377,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(AIS_Dimension)
+  DEFINE_STANDARD_RTTI(AIS_Dimension, AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -51,6 +51,8 @@
 #include <OSD_Environment.hxx>

 #include <AIS_ListIteratorOfListOfInteractive.hxx>
+#include <AIS_InteractiveObject.hxx>
+#include <SelectMgr_EntityOwner.hxx>

 namespace
 {
--- a/src/AIS/AIS_InteractiveContext_1.cxx
+++ b/src/AIS/AIS_InteractiveContext_1.cxx
@@ -43,6 +43,7 @@

 #include <AIS_MapOfInteractive.hxx>
 #include <AIS_MapIteratorOfMapOfInteractive.hxx>
+#include <AIS_InteractiveObject.hxx>

 //=======================================================================
 //function : MoveTo
--- a/src/AIS/AIS_LengthDimension.cxx
+++ b/src/AIS/AIS_LengthDimension.cxx
@@ -34,8 +34,6 @@
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>

-IMPLEMENT_STANDARD_HANDLE(AIS_LengthDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension, AIS_Dimension)

 //=======================================================================
 //function : Constructor
--- a/src/AIS/AIS_LengthDimension.hxx
+++ b/src/AIS/AIS_LengthDimension.hxx
@@ -29,7 +29,7 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TCollection_ExtendedString.hxx>
@@ -200,7 +200,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(AIS_LengthDimension)
+  DEFINE_STANDARD_RTTI(AIS_LengthDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_LocalContext.cxx
+++ b/src/AIS/AIS_LocalContext.cxx
@@ -38,6 +38,7 @@
 #include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 #include <Visual3d_View.hxx>
+#include <AIS_InteractiveObject.hxx>

 #include <stdio.h>

--- a/src/AIS/AIS_LocalContext_1.cxx
+++ b/src/AIS/AIS_LocalContext_1.cxx
@@ -45,6 +45,8 @@
 #include <AIS_Selection.hxx>
 #include <Aspect_Grid.hxx>
 #include <AIS_Shape.hxx>
+#include <AIS_InteractiveObject.hxx>
+#include <SelectMgr_EntityOwner.hxx>

 static Standard_Integer GetHiMod(const Handle(AIS_InteractiveObject)& IO)
 {
--- a/src/AIS/AIS_MultipleConnectedInteractive.cxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx
@@ -26,6 +26,7 @@
 #include <Select3D_SensitiveEntity.hxx>
 #include <TopLoc_Location.hxx>
 #include <NCollection_DataMap.hxx>
+#include <AIS_InteractiveObject.hxx>

 namespace
 {
--- a/src/AIS/AIS_PointCloud.cxx
+++ b/src/AIS/AIS_PointCloud.cxx
@@ -31,8 +31,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <StdPrs_WFDeflectionRestrictedFace.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_PointCloud, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_PointCloud, AIS_InteractiveObject)

 //==================================================
 // Function: AIS_PointCloud
--- a/src/AIS/AIS_PointCloud.hxx
+++ b/src/AIS/AIS_PointCloud.hxx
@@ -22,7 +22,7 @@
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Quantity_HArray1OfColor.hxx>
 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_Macro.hxx>
 #include <TColgp_HArray1OfDir.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
@@ -121,7 +121,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(AIS_PointCloud)
+  DEFINE_STANDARD_RTTI(AIS_PointCloud, AIS_InteractiveObject)

 };

--- a/src/AIS/AIS_RadiusDimension.cxx
+++ b/src/AIS/AIS_RadiusDimension.cxx
@@ -21,8 +21,6 @@
 #include <ElCLib.hxx>
 #include <gce_MakeDir.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_RadiusDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT (AIS_RadiusDimension, AIS_Dimension)

 namespace
 {
--- a/src/AIS/AIS_RadiusDimension.hxx
+++ b/src/AIS/AIS_RadiusDimension.hxx
@@ -117,7 +117,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (AIS_RadiusDimension)
+  DEFINE_STANDARD_RTTI (AIS_RadiusDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_TextLabel.cxx
+++ b/src/AIS/AIS_TextLabel.cxx
@@ -23,8 +23,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <SelectMgr_EntityOwner.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_TextLabel, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_TextLabel, AIS_InteractiveObject)

 //=======================================================================
 //function : AIS_TextLabel
--- a/src/AIS/AIS_TextLabel.hxx
+++ b/src/AIS/AIS_TextLabel.hxx
@@ -85,7 +85,7 @@ protected:
 public:

  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(AIS_TextLabel);
+  DEFINE_STANDARD_RTTI(AIS_TextLabel, AIS_InteractiveObject);

 };

--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@@ -40,8 +40,6 @@
 #include <StdPrs_WFShape.hxx>
 #include <TopExp_Explorer.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_TexturedShape, AIS_Shape)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_TexturedShape, AIS_Shape)

 //=======================================================================
 //function : AIS_TexturedShape
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@@ -20,7 +20,7 @@
 #include <gp_Pnt2d.hxx>
 #include <Graphic3d_NameOfTexture2D.hxx>
 #include <Image_PixMap.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Texture2Dmanual.hxx>
@@ -206,7 +206,7 @@ protected: //! @name texture mapping properties

 public:

-  DEFINE_STANDARD_RTTI (AIS_TexturedShape)
+  DEFINE_STANDARD_RTTI (AIS_TexturedShape, AIS_Shape)

 };

--- a/src/AIS/AIS_Triangulation.cxx
+++ b/src/AIS/AIS_Triangulation.cxx
@@ -13,7 +13,7 @@

 #include <AIS_Triangulation.hxx>
 #include <AIS_InteractiveObject.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Prs3d_Drawer.hxx>
@@ -28,9 +28,6 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>


-IMPLEMENT_STANDARD_HANDLE(AIS_Triangulation, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Triangulation, AIS_InteractiveObject)
-
 AIS_Triangulation::AIS_Triangulation(const Handle(Poly_Triangulation)& Triangulation)
 {
  myTriangulation = Triangulation;