Migration to OCCT 7.0

[plugins/canrecplugin.git] / src / CANRECPLUGINEngine / CANRECPluginImpl_Driver.cxx

diff --git a/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx b/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx
index d7ae257a553c36bb5942e6282be5985bcec2c186..a0f400a0bf5884bf5b2e4661232153db5a75f391 100644 (file)
--- a/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx
+++ b/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx
@@ -103,16 +103,16 @@ CANRECPluginImpl_Driver::~CANRECPluginImpl_Driver()
 {
 }
 
-Standard_Boolean CANRECPluginImpl_Driver::MustExecute( const TFunction_Logbook& ) const
+Standard_Boolean CANRECPluginImpl_Driver::MustExecute( const LOGBOOK& ) const
 {
   return Standard_True;
 }
 
-void CANRECPluginImpl_Driver::Validate( TFunction_Logbook& ) const
+void CANRECPluginImpl_Driver::Validate( LOGBOOK& ) const
 {
 } 
 
-Standard_Integer CANRECPluginImpl_Driver::Execute( TFunction_Logbook& log ) const
+Standard_Integer CANRECPluginImpl_Driver::Execute( LOGBOOK& log ) const
 {
   if ( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -189,7 +189,11 @@ Standard_Integer CANRECPluginImpl_Driver::Execute( TFunction_Logbook& log ) cons
 
   aFunction->SetValue( aResultingShape );
 
+#if OCC_VERSION_MAJOR < 7
   log.SetTouched( Label() );
+#else
+  log->SetTouched( Label() );
+#endif
   
   return 1;
 }
@@ -212,5 +216,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE( CANRECPluginImpl_Driver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( CANRECPluginImpl_Driver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( CANRECPluginImpl_Driver,GEOM_BaseDriver );