OCCT 7.0.0 porting

diff --git a/src/ACISPlugin_ExportDriver.cxx b/src/ACISPlugin_ExportDriver.cxx
index 5ce24209079c8b8b3236dcf0c2f18cce3fa9f2d0..4bfc181b5f1bf374d219b109000c28dd95d45a10 100644 (file)
--- a/src/ACISPlugin_ExportDriver.cxx
+++ b/src/ACISPlugin_ExportDriver.cxx
@@ -64,7 +64,7 @@ ACISPlugin_ExportDriver::ACISPlugin_ExportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer ACISPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer ACISPlugin_ExportDriver::Execute( LOGBOOK& log ) const
 {
 #ifdef ACIS_HASLICENSE
     try {
@@ -108,15 +108,6 @@ Standard_Integer ACISPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons
     return 0;
 }
 
-//=======================================================================
-//function : MustExecute
-//purpose  :
-//=======================================================================
-Standard_Boolean ACISPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
-{
-  return Standard_True;
-}
-
 //================================================================================
 /*!
  * \brief Returns a name of creation operation and names and values of creation parameters
@@ -129,5 +120,4 @@ GetCreationInformation( std::string&             theOperationName,
   return false;
 }
 
-IMPLEMENT_STANDARD_HANDLE( ACISPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ExportDriver,GEOM_BaseDriver );

diff --git a/src/ACISPlugin_ExportDriver.hxx b/src/ACISPlugin_ExportDriver.hxx
index 7f102798eae2d25468572b4badbd577be4517e6f..ae4415d348b724e3cf9778691feef94432cefe38 100644 (file)
--- a/src/ACISPlugin_ExportDriver.hxx
+++ b/src/ACISPlugin_ExportDriver.hxx
@@ -23,9 +23,6 @@
 // GEOM includes
 #include <GEOM_BaseDriver.hxx>
 
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
 DEFINE_STANDARD_HANDLE( ACISPlugin_ExportDriver, GEOM_BaseDriver );
 
 class ACISPlugin_ExportDriver : public GEOM_BaseDriver
@@ -35,14 +32,14 @@ public:
   ~ACISPlugin_ExportDriver() {};
 
   static const Standard_GUID& GetID();
-  virtual Standard_Integer    Execute( TFunction_Logbook& log ) const;
-  Standard_Boolean            MustExecute( const TFunction_Logbook& ) const;
-  virtual void                Validate( TFunction_Logbook& ) const {}
+  virtual Standard_Integer    Execute( LOGBOOK& log ) const;
+  Standard_Boolean            MustExecute( const LOGBOOK& ) const { return Standard_True; }
+  virtual void                Validate( LOGBOOK& ) const {}
 
-  virtual bool                GetCreationInformation( std::string& heOperationName,
+  virtual bool                GetCreationInformation( std::string& theOperationName,
                                                       std::vector<GEOM_Param>& params );
 
-DEFINE_STANDARD_RTTI( ACISPlugin_ExportDriver )
+OCCT_DEFINE_STANDARD_RTTIEXT( ACISPlugin_ExportDriver, GEOM_BaseDriver )
 };
 
 #endif // _ACISPlugin_ExportDriver_HXX

diff --git a/src/ACISPlugin_IOperations_i.cc b/src/ACISPlugin_IOperations_i.cc
index 6af817c75ed2821d3297d67d325716809ec49070..d454c3dac46c4f9b75d71f9efe0865c092be8bed 100644 (file)
--- a/src/ACISPlugin_IOperations_i.cc
+++ b/src/ACISPlugin_IOperations_i.cc
@@ -97,7 +97,7 @@ GEOM::ListOfGO* ACISPlugin_IOperations_i::ImportACIS( const char* theFileName )
   Standard_Integer aLength = aHSeq->Length();
   aSeq->length( aLength );
   for( Standard_Integer i = 1; i <= aLength; i++ )
-    aSeq[i-1] = GetObject( Handle(GEOM_Object)::DownCast( aHSeq->Value(i) ) );
+    aSeq[i-1] = GetObject( HANDLE_NAMESPACE(GEOM_Object)::DownCast( aHSeq->Value(i) ) );
 
   return aSeq._retn();
 }

diff --git a/src/ACISPlugin_ImportDriver.cxx b/src/ACISPlugin_ImportDriver.cxx
index 6f8af8ae5482fd8c129ad3c87642abc61fdf5e84..969a3e95fdaef3eadbff69d6ef87df90b8eb46e3 100644 (file)
--- a/src/ACISPlugin_ImportDriver.cxx
+++ b/src/ACISPlugin_ImportDriver.cxx
@@ -78,7 +78,7 @@ ACISPlugin_ImportDriver::ACISPlugin_ImportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer ACISPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer ACISPlugin_ImportDriver::Execute( LOGBOOK& log ) const
 {
   if( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -161,20 +161,15 @@ Standard_Integer ACISPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons
 
   aFunction->SetValue( aResShape );
 
-  log.SetTouched( Label() );
+#if OCC_VERSION_MAJOR < 7
+  log.SetTouched(Label());
+#else
+  log->SetTouched(Label());
+#endif
 
   return 1;
 }
 
-//=======================================================================
-//function : MustExecute
-//purpose  :
-//=======================================================================
-Standard_Boolean ACISPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
-  return Standard_True;
-}
-
 //================================================================================
 /*!
  * \brief Returns a name of creation operation and names and values of creation parameters
@@ -203,5 +198,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE( ACISPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver );

diff --git a/src/ACISPlugin_ImportDriver.hxx b/src/ACISPlugin_ImportDriver.hxx
index e0e0aef7827554427044f9537be020959e4fbe9b..43ff287c6c622682cf275a3244919fc693619f23 100644 (file)
--- a/src/ACISPlugin_ImportDriver.hxx
+++ b/src/ACISPlugin_ImportDriver.hxx
@@ -23,11 +23,6 @@
 // GEOM includes
 #include <GEOM_BaseDriver.hxx>
 
-// OCCT includes
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-
 DEFINE_STANDARD_HANDLE( ACISPlugin_ImportDriver, GEOM_BaseDriver );
 
 class ACISPlugin_ImportDriver : public GEOM_BaseDriver
@@ -37,14 +32,14 @@ public:
   ~ACISPlugin_ImportDriver() {};
 
   static const Standard_GUID& GetID();
-  virtual Standard_Integer    Execute( TFunction_Logbook& log ) const;
-  Standard_Boolean            MustExecute( const TFunction_Logbook& ) const;
-  virtual void                Validate( TFunction_Logbook& ) const {}
+  virtual Standard_Integer    Execute( LOGBOOK& log ) const;
+  Standard_Boolean            MustExecute( const LOGBOOK& ) const { return Standard_True; }
+  virtual void                Validate( LOGBOOK& ) const {}
  
   virtual bool                GetCreationInformation( std::string& theOperationName,
                                                       std::vector<GEOM_Param>& params );
 
-DEFINE_STANDARD_RTTI( ACISPlugin_ImportDriver )
+OCCT_DEFINE_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver )
 };
 
 #endif // _ACISPlugin_ImportDriver_HXX