Clean-up deprecated OCCT-related code

diff --git a/src/XTPlugin_IOperations_i.cc b/src/XTPlugin_IOperations_i.cc
index b3c651a25e0aa15a4fab05607dd5c9a739c6be5c..b9255386dbb18dadec38e6437246a7a776d3aeb0 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_NAMESPACE(GEOM_Object)::DownCast( aHSeq->Value(i) ) );
+    aSeq[i-1] = GetObject( Handle(::GEOM_Object)::DownCast( aHSeq->Value(i) ) );
 
   return aSeq._retn();
 }

diff --git a/src/XTPlugin_ImportDriver.cxx b/src/XTPlugin_ImportDriver.cxx
index 33a8c360900d03f700d3ca73f4d7a09aa50df3bd..09d2148e2aecf5aa6e5d24c9facc24516785844a 100644 (file)
--- a/src/XTPlugin_ImportDriver.cxx
+++ b/src/XTPlugin_ImportDriver.cxx
@@ -30,7 +30,7 @@
 #include <GEOM_Function.hxx>
 #include <GEOMImpl_Types.hxx>
 
-// OOCT includes
+// OCCT includes
 #include <IFSelect_ReturnStatus.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Label.hxx>
@@ -87,7 +87,7 @@ XTPlugin_ImportDriver::XTPlugin_ImportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer XTPlugin_ImportDriver::Execute( LOGBOOK& log ) const
+Standard_Integer XTPlugin_ImportDriver::Execute( Handle(TFunction_Logbook)& log ) const
 {
   if( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -220,11 +220,7 @@ Standard_Integer XTPlugin_ImportDriver::Execute( LOGBOOK& log ) const
 
   aFunction->SetValue( aResShape );
 
-#if OCC_VERSION_MAJOR < 7
-  log.SetTouched(Label());
-#else
   log->SetTouched(Label());
-#endif
 
   return 1;
 }
@@ -257,4 +253,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver );

diff --git a/src/XTPlugin_ImportDriver.hxx b/src/XTPlugin_ImportDriver.hxx
index 57c9a961049e027a93ef44d54c1e1b91c4557a8b..ead5d09731bb5b8838830d739b937732a166b153 100644 (file)
--- a/src/XTPlugin_ImportDriver.hxx
+++ b/src/XTPlugin_ImportDriver.hxx
@@ -32,14 +32,14 @@ public:
   ~XTPlugin_ImportDriver() {};
 
   static const Standard_GUID& GetID();
-  virtual Standard_Integer    Execute( LOGBOOK& log ) const;
-  Standard_Boolean            MustExecute( const LOGBOOK& ) const { return Standard_True; }
-  virtual void                Validate( LOGBOOK& ) const {}
+  virtual Standard_Integer    Execute( Handle(TFunction_Logbook)& log ) const;
+  Standard_Boolean            MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+  virtual void                Validate( Handle(TFunction_Logbook)& ) const {}
  
   virtual bool                GetCreationInformation( std::string& theOperationName,
                                                       std::vector<GEOM_Param>& params );
 
-OCCT_DEFINE_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver )
+DEFINE_STANDARD_RTTIEXT( XTPlugin_ImportDriver, GEOM_BaseDriver )
 };
 
 #endif // _XTPlugin_ImportDriver_HXX