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/TObj/TObj_Application.cxx
+++ b/src/TObj/TObj_Application.cxx
@@ -25,8 +25,6 @@
 #include <Message_Msg.hxx>
 #include <stdio.h>

-IMPLEMENT_STANDARD_HANDLE(TObj_Application,TDocStd_Application)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_Application,TDocStd_Application)

 //=======================================================================
 //function : GetInstance
--- a/src/TObj/TObj_Application.hxx
+++ b/src/TObj/TObj_Application.hxx
@@ -118,7 +118,7 @@ public:

 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Application)
+  DEFINE_STANDARD_RTTI(TObj_Application, TDocStd_Application)
 };


--- a/src/TObj/TObj_Assistant.cxx
+++ b/src/TObj/TObj_Assistant.cxx
@@ -22,6 +22,7 @@
 #include <TColStd_SequenceOfTransient.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 #include <TColStd_IndexedMapOfTransient.hxx>
+#include <Standard_Type.hxx>

 //=======================================================================
 //function : getModels
@@ -151,14 +152,12 @@ class TObj_Assistant_UnknownType : public MMgt_TShared
    // Empty constructor
  
  // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Assistant_UnknownType)
+  DEFINE_STANDARD_RTTI(TObj_Assistant_UnknownType, MMgt_TShared)
 };

 // Define handle class for TObj_Assistant_UnknownType
 DEFINE_STANDARD_HANDLE(TObj_Assistant_UnknownType,MMgt_TShared)

-IMPLEMENT_STANDARD_HANDLE(TObj_Assistant_UnknownType,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_Assistant_UnknownType,MMgt_TShared)

 //=======================================================================
 //function : BindType
--- a/src/TObj/TObj_CheckModel.cxx
+++ b/src/TObj/TObj_CheckModel.cxx
@@ -22,8 +22,6 @@
 #include <Message_Status.hxx>
 #include <Message_Messenger.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_CheckModel,Message_Algorithm)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_CheckModel,Message_Algorithm)

 //=======================================================================
 //function : Perform
--- a/src/TObj/TObj_CheckModel.hxx
+++ b/src/TObj/TObj_CheckModel.hxx
@@ -74,7 +74,7 @@ private:

 public:
  //! Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (TObj_CheckModel)
+  DEFINE_STANDARD_RTTI (TObj_CheckModel, Message_Algorithm)
 };

 //! Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/TObj/TObj_Common.hxx
+++ b/src/TObj/TObj_Common.hxx
@@ -22,7 +22,7 @@
 #define TObj_Common_HeaderFile

 //! Basic CASCADE definitions
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_Type.hxx>
 #include <MMgt_TShared.hxx>
 #include <TCollection_ExtendedString.hxx>
--- a/src/TObj/TObj_HiddenPartition.cxx
+++ b/src/TObj/TObj_HiddenPartition.cxx
@@ -17,8 +17,7 @@

 #include <TObj_HiddenPartition.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_HiddenPartition, TObj_Partition)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_HiddenPartition, TObj_Partition)
+
 IMPLEMENT_TOBJOCAF_PERSISTENCE(TObj_HiddenPartition)
  
 //=======================================================================
--- a/src/TObj/TObj_HiddenPartition.hxx
+++ b/src/TObj/TObj_HiddenPartition.hxx
@@ -38,7 +38,7 @@ class TObj_HiddenPartition : public TObj_Partition
  DECLARE_TOBJOCAF_PERSISTENCE(TObj_HiddenPartition,TObj_Partition)
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_HiddenPartition)
+  DEFINE_STANDARD_RTTI(TObj_HiddenPartition, TObj_Partition)
 };

 //! Define handle class for TObj_HiddenPartition
--- a/src/TObj/TObj_LabelIterator.cxx
+++ b/src/TObj/TObj_LabelIterator.cxx
@@ -17,9 +17,7 @@

 #include <TObj_LabelIterator.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_LabelIterator,TObj_ObjectIterator)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_LabelIterator,TObj_ObjectIterator)
-     
+
 //=======================================================================
 //function : TObj_LabelIterator
 //purpose  : 
--- a/src/TObj/TObj_LabelIterator.hxx
+++ b/src/TObj/TObj_LabelIterator.hxx
@@ -99,7 +99,7 @@ class TObj_LabelIterator : public TObj_ObjectIterator
  
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_LabelIterator)
+  DEFINE_STANDARD_RTTI(TObj_LabelIterator, TObj_ObjectIterator)
 };

 //! Define handle class for TObj_LabelIterator
--- a/src/TObj/TObj_Model.cxx
+++ b/src/TObj/TObj_Model.cxx
@@ -49,8 +49,6 @@
  #include <unistd.h>
 #endif

-IMPLEMENT_STANDARD_HANDLE(TObj_Model,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_Model,MMgt_TShared)

 //=======================================================================
 //function : TObj_Model
--- a/src/TObj/TObj_Model.hxx
+++ b/src/TObj/TObj_Model.hxx
@@ -356,7 +356,7 @@ class TObj_Model : public MMgt_TShared

 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Model)
+  DEFINE_STANDARD_RTTI(TObj_Model, MMgt_TShared)
 };

 //! The Model Handle is defined in a separate header file
--- a/src/TObj/TObj_ModelIterator.cxx
+++ b/src/TObj/TObj_ModelIterator.cxx
@@ -19,8 +19,6 @@

 #include <TObj_Model.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_ModelIterator,TObj_ObjectIterator)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_ModelIterator,TObj_ObjectIterator)

 //=======================================================================
 //function : Constructor
--- a/src/TObj/TObj_ModelIterator.hxx
+++ b/src/TObj/TObj_ModelIterator.hxx
@@ -69,7 +69,7 @@ class TObj_ModelIterator : public TObj_ObjectIterator
    
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_ModelIterator)
+  DEFINE_STANDARD_RTTI(TObj_ModelIterator, TObj_ObjectIterator)
 };

 //! Define handle class for TObj_ObjectIterator
--- a/src/TObj/TObj_Object.cxx
+++ b/src/TObj/TObj_Object.cxx
@@ -51,11 +51,9 @@
 #include <TDataStd_RealArray.hxx>
 #include <TDocStd_Document.hxx>
 #include <TDocStd_Owner.hxx>
+#include <TDF_TagSource.hxx>


-IMPLEMENT_STANDARD_HANDLE(TObj_Object,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_Object,MMgt_TShared)
-
 //=======================================================================
 //function : Constructor
 //purpose  :
--- a/src/TObj/TObj_Object.hxx
+++ b/src/TObj/TObj_Object.hxx
@@ -627,7 +627,7 @@ class TObj_Object : public MMgt_TShared

 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Object)
+  DEFINE_STANDARD_RTTI(TObj_Object, MMgt_TShared)
 };

 //! Define handle in separate file
--- a/src/TObj/TObj_ObjectIterator.cxx
+++ b/src/TObj/TObj_ObjectIterator.cxx
@@ -19,9 +19,6 @@
 #include <TObj_Object.hxx>


-IMPLEMENT_STANDARD_HANDLE(TObj_ObjectIterator,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_ObjectIterator,MMgt_TShared)
-
 //=======================================================================
 //function : More
 //purpose  : 
--- a/src/TObj/TObj_ObjectIterator.hxx
+++ b/src/TObj/TObj_ObjectIterator.hxx
@@ -49,7 +49,7 @@ class TObj_ObjectIterator : public MMgt_TShared

 public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_ObjectIterator)
+  DEFINE_STANDARD_RTTI(TObj_ObjectIterator, MMgt_TShared)
 };

 //! Define handle class for TObj_ObjectIterator
--- a/src/TObj/TObj_OcafObjectIterator.cxx
+++ b/src/TObj/TObj_OcafObjectIterator.cxx
@@ -19,9 +19,6 @@
 #include <TObj_Object.hxx>


-IMPLEMENT_STANDARD_HANDLE(TObj_OcafObjectIterator,TObj_LabelIterator)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_OcafObjectIterator,TObj_LabelIterator)
-
 //=======================================================================
 //function : TObj_OcafObjectIterator
 //purpose  :
--- a/src/TObj/TObj_OcafObjectIterator.hxx
+++ b/src/TObj/TObj_OcafObjectIterator.hxx
@@ -56,7 +56,7 @@ class TObj_OcafObjectIterator : public TObj_LabelIterator
  
 public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_OcafObjectIterator)
+  DEFINE_STANDARD_RTTI(TObj_OcafObjectIterator, TObj_LabelIterator)
 };

 //! Define handle class for TObj_OcafObjectIterator
--- a/src/TObj/TObj_Partition.cxx
+++ b/src/TObj/TObj_Partition.cxx
@@ -22,8 +22,7 @@

 #include <TDataStd_Name.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_Partition,TObj_Object)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_Partition,TObj_Object)
+
 IMPLEMENT_TOBJOCAF_PERSISTENCE(TObj_Partition)

 //=======================================================================
--- a/src/TObj/TObj_Partition.hxx
+++ b/src/TObj/TObj_Partition.hxx
@@ -146,7 +146,7 @@ class TObj_Partition : public TObj_Object

 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Partition)
+  DEFINE_STANDARD_RTTI(TObj_Partition, TObj_Object)

 public:
  friend class TObj_Model;
--- a/src/TObj/TObj_ReferenceIterator.cxx
+++ b/src/TObj/TObj_ReferenceIterator.cxx
@@ -19,8 +19,6 @@
 #include <TObj_ReferenceIterator.hxx>
 #include <TObj_TReference.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_ReferenceIterator,TObj_LabelIterator)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_ReferenceIterator,TObj_LabelIterator)

 //=======================================================================
 //function : TObj_ObjectIterator
--- a/src/TObj/TObj_ReferenceIterator.hxx
+++ b/src/TObj/TObj_ReferenceIterator.hxx
@@ -51,7 +51,7 @@ class TObj_ReferenceIterator : public TObj_LabelIterator
  
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_ReferenceIterator)
+  DEFINE_STANDARD_RTTI(TObj_ReferenceIterator, TObj_LabelIterator)
 };

 //! Define handle class for TObj_ReferenceIterator
--- a/src/TObj/TObj_SequenceIterator.cxx
+++ b/src/TObj/TObj_SequenceIterator.cxx
@@ -19,8 +19,6 @@

 #include <TObj_Object.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_SequenceIterator,TObj_ObjectIterator)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_SequenceIterator,TObj_ObjectIterator)

 //=======================================================================
 //function : TObj_SequenceIterator
--- a/src/TObj/TObj_SequenceIterator.hxx
+++ b/src/TObj/TObj_SequenceIterator.hxx
@@ -70,7 +70,7 @@ class TObj_SequenceIterator : public TObj_ObjectIterator

 public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_SequenceIterator)
+  DEFINE_STANDARD_RTTI(TObj_SequenceIterator, TObj_ObjectIterator)
 };

 //! Define handle class for TObj_SequenceIterator
--- a/src/TObj/TObj_SequenceOfObject.cxx
+++ b/src/TObj/TObj_SequenceOfObject.cxx
@@ -17,4 +17,3 @@

 #include <TObj_SequenceOfObject.hxx>

-IMPLEMENT_HSEQUENCE(TObj_HSequenceOfObject)
--- a/src/TObj/TObj_TIntSparseArray.cxx
+++ b/src/TObj/TObj_TIntSparseArray.cxx
@@ -22,8 +22,6 @@
 #include <TDF_AttributeDelta.hxx>
 #include <TDF_DeltaOnModification.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_TIntSparseArray,TDF_Attribute)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_TIntSparseArray,TDF_Attribute)

 //=======================================================================
 //function : TObj_TIntSparseArray
--- a/src/TObj/TObj_TIntSparseArray.hxx
+++ b/src/TObj/TObj_TIntSparseArray.hxx
@@ -148,7 +148,7 @@ class TObj_TIntSparseArray : public TDF_Attribute

 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TIntSparseArray)
+  DEFINE_STANDARD_RTTI(TObj_TIntSparseArray, TDF_Attribute)
 };

 //! Define handle class for TObj_TIntSparseArray
--- a/src/TObj/TObj_TModel.cxx
+++ b/src/TObj/TObj_TModel.cxx
@@ -20,8 +20,6 @@
 #include <Standard_GUID.hxx>
 #include <TDF_RelocationTable.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_TModel,TDF_Attribute)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_TModel,TDF_Attribute)

 //=======================================================================
 //function : GetID
--- a/src/TObj/TObj_TModel.hxx
+++ b/src/TObj/TObj_TModel.hxx
@@ -77,7 +77,7 @@ class TObj_TModel : public TDF_Attribute
  
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TModel)
+  DEFINE_STANDARD_RTTI(TObj_TModel, TDF_Attribute)
 };

 //! Define handle class for TObj_TModel
--- a/src/TObj/TObj_TNameContainer.cxx
+++ b/src/TObj/TObj_TNameContainer.cxx
@@ -18,8 +18,6 @@
 #include <TObj_TNameContainer.hxx>
 #include <Standard_GUID.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_TNameContainer,TDF_Attribute)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_TNameContainer,TDF_Attribute)

 //=======================================================================
 //function : TObj_TNameContainer
--- a/src/TObj/TObj_TNameContainer.hxx
+++ b/src/TObj/TObj_TNameContainer.hxx
@@ -97,7 +97,7 @@ class TObj_TNameContainer : public TDF_Attribute
  
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TNameContainer)
+  DEFINE_STANDARD_RTTI(TObj_TNameContainer, TDF_Attribute)
 };

 //! Define handle class for TObj_TObject
--- a/src/TObj/TObj_TObject.cxx
+++ b/src/TObj/TObj_TObject.cxx
@@ -21,8 +21,6 @@
 #include <TDF_AttributeDelta.hxx>
 #include <TDF_ChildIterator.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_TObject,TDF_Attribute)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_TObject,TDF_Attribute)

 //=======================================================================
 //function : TObj_TObject
--- a/src/TObj/TObj_TObject.hxx
+++ b/src/TObj/TObj_TObject.hxx
@@ -97,7 +97,7 @@ class TObj_TObject : public TDF_Attribute
  
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TObject)
+  DEFINE_STANDARD_RTTI(TObj_TObject, TDF_Attribute)
 };

 //! Define handle class for TObj_TObject
--- a/src/TObj/TObj_TReference.cxx
+++ b/src/TObj/TObj_TReference.cxx
@@ -22,9 +22,8 @@
 #include <Standard_GUID.hxx>
 #include <TDF_RelocationTable.hxx>
 #include <TDF_DeltaOnAddition.hxx>
+#include <TDF_DeltaOnRemoval.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_TReference,TDF_Attribute)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_TReference,TDF_Attribute)

 //=======================================================================
 //function : TObj_TReference
--- a/src/TObj/TObj_TReference.hxx
+++ b/src/TObj/TObj_TReference.hxx
@@ -124,7 +124,7 @@ class TObj_TReference : public TDF_Attribute

 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TReference)
+  DEFINE_STANDARD_RTTI(TObj_TReference, TDF_Attribute)
 };

 //! Define handle class for TObj_TReference
--- a/src/TObj/TObj_TXYZ.cxx
+++ b/src/TObj/TObj_TXYZ.cxx
@@ -19,8 +19,6 @@
 #include <Standard_GUID.hxx>
 #include <TDF_Label.hxx>

-IMPLEMENT_STANDARD_HANDLE(TObj_TXYZ,TDF_Attribute)
-IMPLEMENT_STANDARD_RTTIEXT(TObj_TXYZ,TDF_Attribute)

 //=======================================================================
 //function : TObj_TXYZ
--- a/src/TObj/TObj_TXYZ.hxx
+++ b/src/TObj/TObj_TXYZ.hxx
@@ -87,7 +87,7 @@ class TObj_TXYZ : public TDF_Attribute
  
 public:
  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TXYZ)
+  DEFINE_STANDARD_RTTI(TObj_TXYZ, TDF_Attribute)
 };

 //! Define handle class for TObj_TXYZ