0024947: Redesign OCCT legacy type system

Templates for CDL extraction corrected according to changes made for #24947 in OCCT

diff --git a/src/CPPExt/CPPExt_Template.edl b/src/CPPExt/CPPExt_Template.edl
index 5853640e18ac648ffb7a73316d0f61e39d2ec781..8357558a35d35e81d648b41f1b2585112bd70dec 100755 (executable)
--- a/src/CPPExt/CPPExt_Template.edl
+++ b/src/CPPExt/CPPExt_Template.edl
@@ -17,13 +17,9 @@ $
 $#ifndef _Handle_%HTName_HeaderFile
 $#define _Handle_%HTName_HeaderFile
 $
-$#include <Standard.hxx>
 $#include <Standard_DefineHandle.hxx>
 $#include <Handle_%HTInherits.hxx>
 $
-$class Standard_Transient;
-$class Handle(Standard_Type);
-$class Handle(%HTInherits);
 $class %HTName;
 $
 $DEFINE_STANDARD_HANDLE(%HTName, %HTInherits)
@@ -58,8 +54,7 @@ $
 $#ifndef _%Class_HeaderFile
 $#define _%Class_HeaderFile
 $
-$#include <Standard.hxx>
-$#include <Standard_DefineHandle.hxx>
+$#include <Standard_Type.hxx>
 $#include <Handle_%Class.hxx>
 $
 $%TICIncludes
@@ -120,11 +115,10 @@ $#ifndef _%Class_HeaderFile
 $#define _%Class_HeaderFile
 $
 $#include <Standard.hxx>
-$#include <Standard_DefineHandle.hxx>
+$#include <Standard_Type.hxx>
 $
 $%TICIncludes
 $
-$class Handle(%Inherits);
 $class %Class;
 $DEFINE_STANDARD_HANDLE(%Class, %Inherits)
 $
@@ -290,8 +284,6 @@ $#include <Standard_Macro.hxx>
 $
 $%TICIncludes
 $
-$Standard_EXPORT const Handle(Standard_Type)& STANDARD_TYPE(%Class);
-$
 $%ClassComment
 $class %Class %Inherits
 ${
@@ -352,8 +344,6 @@ $
 $#ifndef _%Class_HeaderFile
 $#define _%Class_HeaderFile
 $
-$#include <Standard_PrimitiveTypes.hxx>
-$
 $%EnumComment
 $enum %Class
 ${
@@ -384,8 +374,6 @@ $
 $typedef %Inherits %Class;
 $%HandleTypedef
 $
-$#define %Class_Type_() %Inherits_Type_()
-$
 $#endif // _%Class_HeaderFile
 @end;
 
@@ -420,8 +408,7 @@ $
 $#ifndef _%Class_HeaderFile
 $#define _%Class_HeaderFile
 $
-$#include <Standard.hxx>
-$#include <Standard_DefineHandle.hxx>
+$#include <Standard_Type.hxx>
 $#include <Standard_DefineException.hxx>
 $#include <Standard_SStream.hxx>
 $#include <%Inherits.hxx>
@@ -472,7 +459,6 @@ $#define Handle_%DName Handle_%DValue
 
 @template ItemHandleDefine (%DName,%DValue) is
 $#define Handle_%DName Handle_%DValue
-$#define %DName_Type_() %DValue_Type_()
 @end;
 
 @template Undefine(%DName) is
@@ -490,7 +476,6 @@ $#undef Handle_%DName
 
 @template ItemHandleUndefine(%DName) is
 $#undef Handle_%DName
-$#undef %DName_Type_
 @end;
 
 @template ShortDec(%IClass) is
@@ -561,26 +546,21 @@ $\^
 @end;
 
 @template TypeMgtAncestor(%Nb,%Ancestors) is
-$  STANDARD_TYPE(%Ancestors),
+$
 @end;
 
 @template TypeMgt(%Class,%Inherits,%Ancestors) is
 $
-$IMPLEMENT_STANDARD_TYPE(%Class)
-$IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
-$%Inherits
-$IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
-$IMPLEMENT_STANDARD_TYPE_END(%Class)
 @end;
 
 -- type management : END
 
 @template DownCast(%Class,%IClass) is
-$IMPLEMENT_DOWNCAST(%Class,%IClass)
+$
 @end;
 
 @template DynamicType(%Class) is
-$IMPLEMENT_STANDARD_RTTI(%Class)
+$
 @end;
 
 @template IsKind(%Class,%IClass) is

diff --git a/src/CPPExt/CPPExt_TemplateCSFDB.edl b/src/CPPExt/CPPExt_TemplateCSFDB.edl
index 6e4963613883b2e5d61a7be485e470a2a2dc6b81..c9800c6b660012b570f11e6d67ad38aa04d153a9 100755 (executable)
--- a/src/CPPExt/CPPExt_TemplateCSFDB.edl
+++ b/src/CPPExt/CPPExt_TemplateCSFDB.edl
@@ -18,7 +18,6 @@ $#define _Handle_%HPName_HeaderFile
 $
 $#include <Standard_Macro.hxx>
 $#include <Standard_DefineHandle.hxx>
-$#include <Standard.hxx>
 $#include <Handle_%HPInherits.hxx>
 $
 $class Standard_Persistent;
@@ -54,9 +53,7 @@ $
 $#ifndef _%Class_HeaderFile
 $#define _%Class_HeaderFile
 $
-$#include <Standard_Macro.hxx>
-$#include <Standard_DefineHandle.hxx>
-$#include <Standard.hxx>
+$#include <Standard_Type.hxx>
 $#include <Handle_%Class.hxx>
 $
 $%TICIncludes
@@ -69,7 +66,7 @@ $
 $%TICPublicmets
 $%TICPublicfriends
 $
-$  DEFINE_STANDARD_RTTI(%Class)
+$  DEFINE_STANDARD_RTTI(%Class,%Inherits)
 $
 $protected:
 $

diff --git a/src/CSFDBSchema/CSFDBSchema_Template.edl b/src/CSFDBSchema/CSFDBSchema_Template.edl
index a3e17f3fc241f7b2d60d8bd20689a7680bb990f1..1e2661ec697e71d64772b070a7384f739bc1c4e8 100755 (executable)
--- a/src/CSFDBSchema/CSFDBSchema_Template.edl
+++ b/src/CSFDBSchema/CSFDBSchema_Template.edl
@@ -41,7 +41,7 @@ $public:
 $
 $  Storage_DECLARE_SCHEMA_METHODS(%Schema)
 $
-$  DEFINE_STANDARD_RTTI(%Schema)
+$  DEFINE_STANDARD_RTTI(%Schema,Storage_Schema)
 $};
 $
 $#endif
@@ -65,8 +65,8 @@ $#endif
 $#ifndef _Storage_BaseDriver_HeaderFile
 $#include <Storage_BaseDriver.hxx>
 $#endif
-$#ifndef _Handle_%Type_HeaderFile
-$#include <Handle_%Type.hxx>
+$#ifndef _%Type_HeaderFile
+$#include <%Type.hxx>
 $#endif
 $
 $%Include
@@ -85,7 +85,7 @@ $  Standard_EXPORT void Add(const Handle(Standard_Persistent)&,const Handle(Stor
 $  Standard_EXPORT void Write(const Handle(Standard_Persistent)&,Storage_BaseDriver&,const Handle(Storage_Schema)&) const;
 $  Standard_EXPORT void Read(const Handle(Standard_Persistent)&,Storage_BaseDriver&,const Handle(Storage_Schema)&) const;
 $
-$  DEFINE_STANDARD_RTTI(%Schema_%Type)
+$  DEFINE_STANDARD_RTTI(%Schema_%Type,Storage_CallBack)
 $};
 $#endif
 @end;