0030773: Application Framework - To allow to inherit existing attributes to reuse...

[occt.git] / src / TDataStd / TDataStd_Relation.hxx

diff --git a/src/TDataStd/TDataStd_Relation.hxx b/src/TDataStd/TDataStd_Relation.hxx
index 25387a2..b5cf108 100644 (file)
--- a/src/TDataStd/TDataStd_Relation.hxx
+++ b/src/TDataStd/TDataStd_Relation.hxx
@@ -17,22 +17,10 @@
 #ifndef _TDataStd_Relation_HeaderFile
 #define _TDataStd_Relation_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <TCollection_ExtendedString.hxx>
-#include <TDF_AttributeList.hxx>
-#include <TDF_Attribute.hxx>
-#include <Standard_OStream.hxx>
-class Standard_GUID;
-class TDF_Label;
-class TCollection_ExtendedString;
-class TDF_Attribute;
-class TDF_RelocationTable;
-
+#include <TDataStd_Expression.hxx>
 
 class TDataStd_Relation;
-DEFINE_STANDARD_HANDLE(TDataStd_Relation, TDF_Attribute)
+DEFINE_STANDARD_HANDLE(TDataStd_Relation, TDataStd_Expression)
 
 //! Relation attribute.
 //! ==================
@@ -42,7 +30,7 @@ DEFINE_STANDARD_HANDLE(TDataStd_Relation, TDF_Attribute)
 //!
 //! Warning:  To be consistent,  each  Variable  referenced by  the
 //! relation must have its equivalent in the string
-class TDataStd_Relation : public TDF_Attribute
+class TDataStd_Relation : public TDataStd_Expression
 {
 
 public:
@@ -59,23 +47,12 @@ public:
   
   Standard_EXPORT TDataStd_Relation();
   
-  //! build and return the relation name
-  Standard_EXPORT TCollection_ExtendedString Name() const;
-  
   Standard_EXPORT void SetRelation (const TCollection_ExtendedString& E);
   
   Standard_EXPORT const TCollection_ExtendedString& GetRelation() const;
   
-  Standard_EXPORT TDF_AttributeList& GetVariables();
-  
   Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE;
   
-  Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE;
-  
-  Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
-  
-  Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE;
-  
   Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE;
 
   //! Dumps the content of me into the stream
@@ -83,27 +60,7 @@ public:
 
 
 
-
-  DEFINE_STANDARD_RTTIEXT(TDataStd_Relation,TDF_Attribute)
-
-protected:
-
-
-
-
-private:
-
-
-  TCollection_ExtendedString myRelation;
-  TDF_AttributeList myVariables;
-
-
+  DEFINE_DERIVED_ATTRIBUTE(TDataStd_Relation,TDataStd_Expression)
 };
 
-
-
-
-
-
-
 #endif // _TDataStd_Relation_HeaderFile