OCCT 7.0.0 porting

diff --git a/src/XTPlugin_IOperations_i.cc b/src/XTPlugin_IOperations_i.cc
index 964e2e7a00a84eab65e1708b0559cc933591c46f..ea8b8247fef501301498712297781ad86885da5b 100644 (file)
--- a/src/XTPlugin_IOperations_i.cc
+++ b/src/XTPlugin_IOperations_i.cc
@@ -73,7 +73,7 @@ GEOM::ListOfGO* XTPlugin_IOperations_i::ImportXT( 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/XTPlugin_ImportDriver.cxx b/src/XTPlugin_ImportDriver.cxx
index 4ff57d42e750e804bb4bd28bca12e6031837a971..2f2c87ac15da8cac357144e8bf8ba96e5abc3f08 100644 (file)
--- a/src/XTPlugin_ImportDriver.cxx
+++ b/src/XTPlugin_ImportDriver.cxx
@@ -87,7 +87,7 @@ XTPlugin_ImportDriver::XTPlugin_ImportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer XTPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer XTPlugin_ImportDriver::Execute( LOGBOOK& log ) const
 {
   if( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -220,20 +220,15 @@ Standard_Integer XTPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
 
   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 XTPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
-  return Standard_True;
-}
-
 //================================================================================
 /*!
  * \brief Returns a name of creation operation and names and values of creation parameters
@@ -262,5 +257,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE( XTPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver );

diff --git a/src/XTPlugin_ImportDriver.hxx b/src/XTPlugin_ImportDriver.hxx
index 82873f7f717c1d05eef59aa4d54a437aa5f52816..f137de029429cd833a722bcc69cd2710965562f6 100644 (file)
--- a/src/XTPlugin_ImportDriver.hxx
+++ b/src/XTPlugin_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( XTPlugin_ImportDriver, GEOM_BaseDriver );
 
 class XTPlugin_ImportDriver : public GEOM_BaseDriver
@@ -37,14 +32,14 @@ public:
   ~XTPlugin_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( XTPlugin_ImportDriver )
+OCCT_DEFINE_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver )
 };
 
 #endif // _XTPlugin_ImportDriver_HXX