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/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
@@ -21,14 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_Buffer, NCollection_Buffer)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Buffer, NCollection_Buffer)

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_BoundBuffer, NCollection_Buffer)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_BoundBuffer, NCollection_Buffer)

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_IndexBuffer, Graphic3d_Buffer)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_IndexBuffer, Graphic3d_Buffer)
+
+

 Graphic3d_ArrayOfPrimitives::Graphic3d_ArrayOfPrimitives (const Graphic3d_TypeOfPrimitiveArray theType,
                                                          const Standard_Integer               theMaxVertexs,
--- a/src/Graphic3d/Graphic3d_BoundBuffer.hxx
+++ b/src/Graphic3d/Graphic3d_BoundBuffer.hxx
@@ -65,7 +65,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_BoundBuffer) // Type definition
+  DEFINE_STANDARD_RTTI(Graphic3d_BoundBuffer, NCollection_Buffer) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_Buffer.hxx
+++ b/src/Graphic3d/Graphic3d_Buffer.hxx
@@ -203,7 +203,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI(Graphic3d_Buffer, NCollection_Buffer) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_CStructure.cxx
+++ b/src/Graphic3d/Graphic3d_CStructure.cxx
@@ -18,8 +18,6 @@
 #include <Graphic3d_StructureManager.hxx>
 #include <Graphic3d_TransModeFlags.hxx>

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_CStructure, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CStructure, Standard_Transient)

 //=============================================================================
 //function : Graphic3d_CStructure
--- a/src/Graphic3d/Graphic3d_CStructure.hxx
+++ b/src/Graphic3d/Graphic3d_CStructure.hxx
@@ -163,7 +163,7 @@ protected:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_CStructure) // Type definition
+  DEFINE_STANDARD_RTTI(Graphic3d_CStructure, Standard_Transient) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_Camera.cxx
+++ b/src/Graphic3d/Graphic3d_Camera.cxx
@@ -24,8 +24,6 @@

 #include <NCollection_Sequence.hxx>

-IMPLEMENT_STANDARD_HANDLE(Graphic3d_Camera, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Camera, Standard_Transient)

 namespace
 {
--- a/src/Graphic3d/Graphic3d_Camera.hxx
+++ b/src/Graphic3d/Graphic3d_Camera.hxx
@@ -619,7 +619,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_Camera);
+  DEFINE_STANDARD_RTTI(Graphic3d_Camera, Standard_Transient);

 };

--- a/src/Graphic3d/Graphic3d_ClipPlane.cxx
+++ b/src/Graphic3d/Graphic3d_ClipPlane.cxx
@@ -18,8 +18,6 @@
 #include <gp_Pln.hxx>
 #include <Standard_Atomic.hxx>

-IMPLEMENT_STANDARD_HANDLE(Graphic3d_ClipPlane, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ClipPlane, Standard_Transient)

 namespace
 {
--- a/src/Graphic3d/Graphic3d_ClipPlane.hxx
+++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx
@@ -220,7 +220,7 @@ private:

 public:

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

 DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient)
--- a/src/Graphic3d/Graphic3d_IndexBuffer.hxx
+++ b/src/Graphic3d/Graphic3d_IndexBuffer.hxx
@@ -72,7 +72,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_IndexBuffer) // Type definition
+  DEFINE_STANDARD_RTTI(Graphic3d_IndexBuffer, Graphic3d_Buffer) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_MarkerImage.cxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx
@@ -24,8 +24,6 @@ namespace
  static volatile Standard_Integer THE_MARKER_IMAGE_COUNTER = 0;
 };

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_MarkerImage, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_MarkerImage, Standard_Transient)

 // =======================================================================
 // function : Graphic3d_MarkerImage
--- a/src/Graphic3d/Graphic3d_MarkerImage.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx
@@ -77,7 +77,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_MarkerImage) // Type definition
+  DEFINE_STANDARD_RTTI(Graphic3d_MarkerImage, Standard_Transient) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_ShaderObject.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderObject.cxx
@@ -24,8 +24,6 @@ namespace
  static volatile Standard_Integer THE_SHADER_OBJECT_COUNTER = 0;
 };

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_ShaderObject, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderObject, Standard_Transient)

 // =======================================================================
 // function : Graphic3d_ShaderObject
--- a/src/Graphic3d/Graphic3d_ShaderObject.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderObject.hxx
@@ -61,7 +61,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderObject)
+  DEFINE_STANDARD_RTTI (Graphic3d_ShaderObject, Standard_Transient)

 protected:

--- a/src/Graphic3d/Graphic3d_ShaderProgram.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderProgram.cxx
@@ -29,8 +29,6 @@ namespace
  static volatile Standard_Integer THE_PROGRAM_OBJECT_COUNTER = 0;
 };

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_ShaderProgram, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderProgram, Standard_Transient)

 // =======================================================================
 // function : ShadersFolder
--- a/src/Graphic3d/Graphic3d_ShaderProgram.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderProgram.hxx
@@ -100,7 +100,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderProgram)
+  DEFINE_STANDARD_RTTI (Graphic3d_ShaderProgram, Standard_Transient)

 private:

--- a/src/Graphic3d/Graphic3d_ShaderVariable.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderVariable.cxx
@@ -17,8 +17,6 @@

 #include <Graphic3d_ShaderVariable.hxx>

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_ShaderVariable, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderVariable, Standard_Transient)

 // Specific instantiations of struct templates to avoid compilation warnings
 template struct Graphic3d_UniformValue<Standard_Integer>;
--- a/src/Graphic3d/Graphic3d_ShaderVariable.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderVariable.hxx
@@ -144,7 +144,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderVariable)
+  DEFINE_STANDARD_RTTI (Graphic3d_ShaderVariable, Standard_Transient)

 protected:

--- a/src/Graphic3d/Graphic3d_ViewAffinity.cxx
+++ b/src/Graphic3d/Graphic3d_ViewAffinity.cxx
@@ -15,5 +15,4 @@

 #include <Graphic3d_ViewAffinity.hxx>

-IMPLEMENT_STANDARD_HANDLE (Graphic3d_ViewAffinity, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ViewAffinity, Standard_Transient)
+
--- a/src/Graphic3d/Graphic3d_ViewAffinity.hxx
+++ b/src/Graphic3d/Graphic3d_ViewAffinity.hxx
@@ -18,7 +18,7 @@

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

 //! Structure display state.
 class Graphic3d_ViewAffinity : public Standard_Transient
@@ -59,7 +59,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_ViewAffinity)
+  DEFINE_STANDARD_RTTI(Graphic3d_ViewAffinity, Standard_Transient)

 };