Merge master branch into V9_dev.

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

diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx
index 11de7d1352c3be9e738608976524f43bd761a819..00df81bc9781495e9a82e8fd58d4b6bb24b0a390 100644 (file)
--- a/src/GEOM/GEOM_BaseDriver.hxx
+++ b/src/GEOM/GEOM_BaseDriver.hxx
@@ -27,18 +27,19 @@
 #ifndef __GEOM_BaseDriver_HXX__
 #define __GEOM_BaseDriver_HXX__
 
+#include "GEOM_Function.hxx"
+
 #include <TFunction_Driver.hxx>
+#include <TFunction_Logbook.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopAbs_State.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
 
 #include <string>
 #include <vector>
 #include <sstream>
 
-class Handle(GEOM_Function);
-class Handle(TColStd_HSequenceOfTransient);
-class Handle(TColStd_HArray1OfInteger);
-
 struct GEOM_Param
 {
   std::string name;
@@ -67,8 +68,6 @@ struct GEOM_Param
 class GEOM_BaseDriver : public TFunction_Driver
 {
 public:
-  // Returns document id
-  Standard_EXPORT int GetDocID() const;
   
   // Returns a name of creation operation and names and values of creation parameters
   // (Use AddParam() methods declared below to fill params vector while implementing
@@ -98,7 +97,7 @@ public:
     return params.back();
   }
 
-  DEFINE_STANDARD_RTTI (GEOM_BaseDriver)
+  DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
 };
 
 DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);