Merge branch 'V9_2_2_BR'

[modules/geom.git] / src / GEOM / GEOM_BaseObject.hxx

diff --git a/src/GEOM/GEOM_BaseObject.hxx b/src/GEOM/GEOM_BaseObject.hxx
index d20cc8eb12c63c782249f206c4f89c79a5e27501..89cffb35b5cb6ab34546f1d369ad00afa7e20698 100644 (file)
--- a/src/GEOM/GEOM_BaseObject.hxx
+++ b/src/GEOM/GEOM_BaseObject.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,11 @@
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Label.hxx>
 #include <TDataStd_TreeNode.hxx>
+#include <TFunction_Driver.hxx>
+
+#include <vector>
 
 class GEOM_BaseObject;
-class Handle(TFunction_Driver);
 class GEOM_Engine;
 
 DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient );
@@ -90,9 +92,6 @@ public:
   Standard_EXPORT void SetTic(int theTic);
   Standard_EXPORT void IncrementTic();
 
-  //Returns an ID of the OCAF document where this GEOM_BaseObject is stored
-  Standard_EXPORT int GetDocID();
-
   //Sets a name of this GEOM_BaseObject
   Standard_EXPORT void SetName(const char* theName);
 
@@ -146,8 +145,8 @@ public:
   //Returns the dependencies of the last function
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetLastDependency();
 
-  //Returns a driver creator of this object
-  Standard_EXPORT Handle(TFunction_Driver) GetCreationDriver();
+  //Returns drivers creators of this object
+  Standard_EXPORT Handle(TFunction_Driver) GetCreationDriver(int funNb);
 
   //###########################################################
   // Internal methods
@@ -161,10 +160,9 @@ public:
   TDF_Label                 _label;
   TCollection_AsciiString   _ior;
   TCollection_AsciiString   _parameters;
-  int                       _docID;
 
 public:
-  DEFINE_STANDARD_RTTI( GEOM_BaseObject );
+  DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient)
 };
 
 #endif