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/VrmlData/VrmlData_Appearance.hxx
+++ b/src/VrmlData/VrmlData_Appearance.hxx
@@ -116,7 +116,7 @@ class VrmlData_Appearance : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Appearance)
+DEFINE_STANDARD_RTTI (VrmlData_Appearance, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_ArrayVec3d.hxx
+++ b/src/VrmlData/VrmlData_ArrayVec3d.hxx
@@ -120,7 +120,7 @@ class VrmlData_ArrayVec3d : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_ArrayVec3d)
+DEFINE_STANDARD_RTTI (VrmlData_ArrayVec3d, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Box.hxx
+++ b/src/VrmlData/VrmlData_Box.hxx
@@ -93,7 +93,7 @@ class VrmlData_Box : public VrmlData_Geometry

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Box)
+DEFINE_STANDARD_RTTI (VrmlData_Box, VrmlData_Geometry)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Color.hxx
+++ b/src/VrmlData/VrmlData_Color.hxx
@@ -89,7 +89,7 @@ class VrmlData_Color : public VrmlData_ArrayVec3d

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Color)
+DEFINE_STANDARD_RTTI (VrmlData_Color, VrmlData_ArrayVec3d)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Cone.hxx
+++ b/src/VrmlData/VrmlData_Cone.hxx
@@ -134,7 +134,7 @@ class VrmlData_Cone : public VrmlData_Geometry

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Cone)
+DEFINE_STANDARD_RTTI (VrmlData_Cone, VrmlData_Geometry)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Coordinate.hxx
+++ b/src/VrmlData/VrmlData_Coordinate.hxx
@@ -76,7 +76,7 @@ class VrmlData_Coordinate : public VrmlData_ArrayVec3d

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Coordinate)
+DEFINE_STANDARD_RTTI (VrmlData_Coordinate, VrmlData_ArrayVec3d)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Cylinder.hxx
+++ b/src/VrmlData/VrmlData_Cylinder.hxx
@@ -138,7 +138,7 @@ class VrmlData_Cylinder : public VrmlData_Geometry

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Cylinder)
+DEFINE_STANDARD_RTTI (VrmlData_Cylinder, VrmlData_Geometry)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Faceted.hxx
+++ b/src/VrmlData/VrmlData_Faceted.hxx
@@ -112,7 +112,7 @@ class VrmlData_Faceted : public VrmlData_Geometry

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Faceted)
+DEFINE_STANDARD_RTTI (VrmlData_Faceted, VrmlData_Geometry)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -31,32 +31,31 @@
 #include <BRepPrim_Builder.hxx>
 #include <NCollection_Vector.hxx>
 #include <Standard_ErrorHandler.hxx>
+#include <VrmlData_ArrayVec3d.hxx>

 #ifdef WNT
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Geometry, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Geometry, VrmlData_Node)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Box, VrmlData_Geometry)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Box, VrmlData_Geometry)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Cone, VrmlData_Geometry)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Cone, VrmlData_Geometry)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Cylinder, VrmlData_Geometry)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Cylinder, VrmlData_Geometry)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Sphere, VrmlData_Geometry)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Sphere, VrmlData_Geometry)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_ArrayVec3d, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_ArrayVec3d, VrmlData_Node)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Color, VrmlData_ArrayVec3d)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Color, VrmlData_ArrayVec3d)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Coordinate, VrmlData_ArrayVec3d)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Coordinate, VrmlData_ArrayVec3d)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Normal, VrmlData_ArrayVec3d)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Normal, VrmlData_ArrayVec3d)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_TextureCoordinate, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_TextureCoordinate, VrmlData_Node)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 //=======================================================================
 //function : Value
--- a/src/VrmlData/VrmlData_Geometry.hxx
+++ b/src/VrmlData/VrmlData_Geometry.hxx
@@ -74,7 +74,7 @@ class VrmlData_Geometry : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Geometry)
+DEFINE_STANDARD_RTTI (VrmlData_Geometry, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Group.cxx
+++ b/src/VrmlData/VrmlData_Group.cxx
@@ -28,8 +28,6 @@
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Group, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Group, VrmlData_Node)

 //=======================================================================
 //function : VrmlData_Group
--- a/src/VrmlData/VrmlData_Group.hxx
+++ b/src/VrmlData/VrmlData_Group.hxx
@@ -170,7 +170,7 @@ class VrmlData_Group : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Group)
+DEFINE_STANDARD_RTTI (VrmlData_Group, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_ImageTexture.hxx
+++ b/src/VrmlData/VrmlData_ImageTexture.hxx
@@ -75,7 +75,7 @@ class VrmlData_ImageTexture : public VrmlData_Texture

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_ImageTexture)
+DEFINE_STANDARD_RTTI (VrmlData_ImageTexture, VrmlData_Texture)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_IndexedFaceSet.cxx
+++ b/src/VrmlData/VrmlData_IndexedFaceSet.cxx
@@ -34,10 +34,8 @@
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Faceted, VrmlData_Geometry)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Faceted, VrmlData_Geometry)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_IndexedFaceSet, VrmlData_Faceted)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_IndexedFaceSet, VrmlData_Faceted)
+
+

 //=======================================================================
 //function : readData
--- a/src/VrmlData/VrmlData_IndexedFaceSet.hxx
+++ b/src/VrmlData/VrmlData_IndexedFaceSet.hxx
@@ -333,7 +333,7 @@ class VrmlData_IndexedFaceSet : public VrmlData_Faceted

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_IndexedFaceSet)
+DEFINE_STANDARD_RTTI (VrmlData_IndexedFaceSet, VrmlData_Faceted)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_IndexedLineSet.cxx
+++ b/src/VrmlData/VrmlData_IndexedLineSet.cxx
@@ -23,14 +23,14 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
+#include <VrmlData_Color.hxx>
+#include <VrmlData_Coordinate.hxx>

 #ifdef WNT
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_IndexedLineSet, VrmlData_Geometry)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_IndexedLineSet, VrmlData_Geometry)

 //=======================================================================
 //function : GetColor
--- a/src/VrmlData/VrmlData_IndexedLineSet.hxx
+++ b/src/VrmlData/VrmlData_IndexedLineSet.hxx
@@ -197,7 +197,7 @@ class VrmlData_IndexedLineSet : public VrmlData_Geometry

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_IndexedLineSet)
+DEFINE_STANDARD_RTTI (VrmlData_IndexedLineSet, VrmlData_Geometry)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Material.cxx
+++ b/src/VrmlData/VrmlData_Material.cxx
@@ -24,8 +24,6 @@
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Material, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Material, VrmlData_Node)

 //=======================================================================
 //function : VrmlData_Material()
--- a/src/VrmlData/VrmlData_Material.hxx
+++ b/src/VrmlData/VrmlData_Material.hxx
@@ -156,7 +156,7 @@ class VrmlData_Material : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Material)
+DEFINE_STANDARD_RTTI (VrmlData_Material, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Node.cxx
+++ b/src/VrmlData/VrmlData_Node.cxx
@@ -23,26 +23,27 @@
 #include <VrmlData_InBuffer.hxx>
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
+#include <VrmlData_Geometry.hxx>
+#include <VrmlData_TextureTransform.hxx>
+#include <VrmlData_Texture.hxx>

 #ifdef WNT
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Node, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Node, Standard_Transient)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_ShapeNode, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_ShapeNode, VrmlData_Node)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Texture, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Texture, VrmlData_Node)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_TextureTransform, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_TextureTransform, VrmlData_Node)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_ImageTexture, VrmlData_Texture)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_ImageTexture, VrmlData_Texture)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_Appearance, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_Appearance, VrmlData_Node)
-IMPLEMENT_STANDARD_HANDLE  (VrmlData_UnknownNode, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_UnknownNode, VrmlData_Node)
+
+
+
+
+
+
+
+
+
+
+
+

 static VrmlData_Scene MyDefaultScene;

--- a/src/VrmlData/VrmlData_Node.hxx
+++ b/src/VrmlData/VrmlData_Node.hxx
@@ -18,7 +18,7 @@

 #include <Standard_Type.hxx>
 #include <NCollection_List.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_TypeDef.hxx>
 #include <TCollection_AsciiString.hxx> 
 #include <VrmlData_ErrorStatus.hxx>
@@ -196,7 +196,7 @@ class VrmlData_Node : public Standard_Transient

 public:
 // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (VrmlData_Node)
+  DEFINE_STANDARD_RTTI (VrmlData_Node, Standard_Transient)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Normal.hxx
+++ b/src/VrmlData/VrmlData_Normal.hxx
@@ -78,7 +78,7 @@ class VrmlData_Normal : public VrmlData_ArrayVec3d

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Normal)
+DEFINE_STANDARD_RTTI (VrmlData_Normal, VrmlData_ArrayVec3d)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Scene.cxx
+++ b/src/VrmlData/VrmlData_Scene.cxx
@@ -43,6 +43,8 @@
 #include <BRep_Builder.hxx>
 #include <Precision.hxx>
 #include <Standard_Version.hxx>
+#include <VrmlData_WorldInfo.hxx>
+#include <VrmlData_Geometry.hxx>

 #ifdef WNT
 #define _CRT_SECURE_NO_DEPRECATE
--- a/src/VrmlData/VrmlData_ShapeConvert.cxx
+++ b/src/VrmlData/VrmlData_ShapeConvert.cxx
@@ -44,6 +44,7 @@
 #include <TShort_Array1OfShortReal.hxx>
 #include <GeomLib.hxx>
 #include <TShort_HArray1OfShortReal.hxx>
+#include <VrmlData_Appearance.hxx>

 //=======================================================================
 //function : IsEqual
--- a/src/VrmlData/VrmlData_ShapeNode.hxx
+++ b/src/VrmlData/VrmlData_ShapeNode.hxx
@@ -102,7 +102,7 @@ class VrmlData_ShapeNode : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_ShapeNode)
+DEFINE_STANDARD_RTTI (VrmlData_ShapeNode, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Sphere.hxx
+++ b/src/VrmlData/VrmlData_Sphere.hxx
@@ -87,7 +87,7 @@ class VrmlData_Sphere : public VrmlData_Geometry

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Sphere)
+DEFINE_STANDARD_RTTI (VrmlData_Sphere, VrmlData_Geometry)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_Texture.hxx
+++ b/src/VrmlData/VrmlData_Texture.hxx
@@ -83,7 +83,7 @@ class VrmlData_Texture : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Texture)
+DEFINE_STANDARD_RTTI (VrmlData_Texture, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_TextureCoordinate.hxx
+++ b/src/VrmlData/VrmlData_TextureCoordinate.hxx
@@ -92,7 +92,7 @@ class VrmlData_TextureCoordinate : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_TextureCoordinate)
+DEFINE_STANDARD_RTTI (VrmlData_TextureCoordinate, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_TextureTransform.hxx
+++ b/src/VrmlData/VrmlData_TextureTransform.hxx
@@ -96,7 +96,7 @@ class VrmlData_TextureTransform : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_TextureTransform)
+DEFINE_STANDARD_RTTI (VrmlData_TextureTransform, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_UnknownNode.hxx
+++ b/src/VrmlData/VrmlData_UnknownNode.hxx
@@ -69,7 +69,7 @@ class VrmlData_UnknownNode : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_UnknownNode)
+DEFINE_STANDARD_RTTI (VrmlData_UnknownNode, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/VrmlData/VrmlData_WorldInfo.cxx
+++ b/src/VrmlData/VrmlData_WorldInfo.cxx
@@ -22,8 +22,6 @@
 #pragma warning (disable:4996)
 #endif

-IMPLEMENT_STANDARD_HANDLE  (VrmlData_WorldInfo, VrmlData_Node)
-IMPLEMENT_STANDARD_RTTIEXT (VrmlData_WorldInfo, VrmlData_Node)

 //=======================================================================
 //function : VrmlData_WorldInfo::VrmlData_WorldInfo
--- a/src/VrmlData/VrmlData_WorldInfo.hxx
+++ b/src/VrmlData/VrmlData_WorldInfo.hxx
@@ -96,7 +96,7 @@ class VrmlData_WorldInfo : public VrmlData_Node

 public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_WorldInfo)
+DEFINE_STANDARD_RTTI (VrmlData_WorldInfo, VrmlData_Node)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx