X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_TorusDriver.hxx;fp=src%2FGEOMImpl%2FGEOMImpl_TorusDriver.hxx;h=a3469e1b2dc9358a87af8f9a08252d00510f9568;hb=c7ffbf7b4e278a70364de8238ed31121babf9033;hp=40cf9f5b5f195b138298962497c65a50d232b481;hpb=1fc45b2209b0d94d6e7443edbc11547412637620;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx
index 40cf9f5b5..a3469e1b2 100644
--- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx
@@ -47,68 +47,6 @@
 #include <Standard_GUID.hxx>
 #endif 
 
-#ifndef _Handle_TFunction_Driver_HeaderFile
-#include <Handle_TFunction_Driver.hxx>
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(TFunction_Driver);
-class GEOMImpl_TorusDriver;
-
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_TorusDriver);
-
-class Handle(GEOMImpl_TorusDriver) : public Handle(TFunction_Driver) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-
-    Handle(GEOMImpl_TorusDriver)():Handle(TFunction_Driver)() {} 
-    Handle(GEOMImpl_TorusDriver)(const Handle(GEOMImpl_TorusDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) 
-     {
-     }
-
-    Handle(GEOMImpl_TorusDriver)(const GEOMImpl_TorusDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
-     {
-     }
-
-    Handle(GEOMImpl_TorusDriver)& operator=(const Handle(GEOMImpl_TorusDriver)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMImpl_TorusDriver)& operator=(const GEOMImpl_TorusDriver* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMImpl_TorusDriver* operator->() 
-     {
-      return (GEOMImpl_TorusDriver *)ControlAccess();
-     }
-
-    GEOMImpl_TorusDriver* operator->() const 
-     {
-      return (GEOMImpl_TorusDriver *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOMImpl_TorusDriver)() {};
- 
-   Standard_EXPORT static const Handle(GEOMImpl_TorusDriver) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-
 #ifndef _TFunction_Driver_HeaderFile
 #include <TFunction_Driver.hxx>
 #endif
@@ -122,22 +60,13 @@ class Handle(GEOMImpl_TorusDriver) : public Handle(TFunction_Driver) {
 class TColStd_SequenceOfExtendedString;
 
 
-class GEOMImpl_TorusDriver : public TFunction_Driver {
+#include "GEOM_BaseDriver.hxx"
 
-public:
+DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver );
 
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
+class GEOMImpl_TorusDriver : public GEOM_BaseDriver {
+
+public:
 
  // Methods PUBLIC
  // 
@@ -148,14 +77,11 @@ Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { r
 Standard_EXPORT static const Standard_GUID& GetID();
 Standard_EXPORT ~GEOMImpl_TorusDriver() {};
 
+  Standard_EXPORT virtual
+  bool GetCreationInformation(std::string&             theOperationName,
+                              std::vector<GEOM_Param>& params);
 
- // Type management
- //
-Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_TorusDriver_Type_();
-Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_TorusDriver) ; }
-Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_TorusDriver) == AType || TFunction_Driver::IsKind(AType)); } 
-
-
+DEFINE_STANDARD_RTTI( GEOMImpl_TorusDriver )
 };
 
 #endif