Migration to OCCT 7.0

[modules/geom.git] / src / GEOMImpl / GEOMImpl_MarkerDriver.hxx

diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
index b1632a9d607ade532b976730b3a0676451650f86..4ee615bb88a41d2474d05cad9832947e742ce684 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
@@ -26,41 +26,7 @@
 #ifndef _GEOMImpl_MarkerDriver_HeaderFile
 #define _GEOMImpl_MarkerDriver_HeaderFile
 
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
 
 DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver );
 
@@ -68,20 +34,19 @@ class GEOMImpl_MarkerDriver : public GEOM_BaseDriver {
 
 public:
 
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_MarkerDriver();
-Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_MarkerDriver() {};
+  Standard_EXPORT GEOMImpl_MarkerDriver();
+  Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+  Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+  Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+  Standard_EXPORT static const Standard_GUID& GetID();
+  Standard_EXPORT ~GEOMImpl_MarkerDriver() {};
 
   Standard_EXPORT virtual
   bool GetCreationInformation(std::string&             theOperationName,
                               std::vector<GEOM_Param>& params);
 
-DEFINE_STANDARD_RTTI( GEOMImpl_MarkerDriver )
+  OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver)
 };
 
 #endif