Clean-up deprecated OCCT-related code

diff --git a/src/DXFPlugin_ExportDriver.cxx b/src/DXFPlugin_ExportDriver.cxx
index 808a92d677fb93f7f659624a261dc3425a1a2fb2..d214ff9862ea5d71ac347f4b2c7568c05dc0bef7 100644 (file)
--- a/src/DXFPlugin_ExportDriver.cxx
+++ b/src/DXFPlugin_ExportDriver.cxx
@@ -28,7 +28,7 @@
 // GEOM includes
 #include <GEOM_Function.hxx>
 
-// OOCT includes
+// OCCT includes
 #include <IFSelect_ReturnStatus.hxx>
 #include <DxfControl_Writer.hxx>
 #include <TCollection_AsciiString.hxx>
@@ -64,7 +64,7 @@ DXFPlugin_ExportDriver::DXFPlugin_ExportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer DXFPlugin_ExportDriver::Execute( LOGBOOK& log ) const
+Standard_Integer DXFPlugin_ExportDriver::Execute( Handle(TFunction_Logbook)& log ) const
 {
 #ifdef DXF_HASLICENSE
   try {
@@ -120,4 +120,4 @@ GetCreationInformation( std::string&             theOperationName,
   return false;
 }
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ExportDriver,GEOM_BaseDriver )
+IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ExportDriver,GEOM_BaseDriver )

diff --git a/src/DXFPlugin_ExportDriver.hxx b/src/DXFPlugin_ExportDriver.hxx
index a006da2a724be6e9c985370cc3489df621452963..1ff11186c572ddd3717650f4778373abf0ab8bd7 100644 (file)
--- a/src/DXFPlugin_ExportDriver.hxx
+++ b/src/DXFPlugin_ExportDriver.hxx
@@ -32,14 +32,14 @@ public:
   ~DXFPlugin_ExportDriver() {};
 
   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( DXFPlugin_ExportDriver, GEOM_BaseDriver )
+DEFINE_STANDARD_RTTIEXT( DXFPlugin_ExportDriver, GEOM_BaseDriver )
 };
 
 #endif // _DXFPlugin_ExportDriver_HXX

diff --git a/src/DXFPlugin_IOperations_i.cc b/src/DXFPlugin_IOperations_i.cc
index 680ea8c0f18f39eac219abb28703ca8a18a9cd3a..da489d6f15dc32013271529c0227368777df8eb1 100644 (file)
--- a/src/DXFPlugin_IOperations_i.cc
+++ b/src/DXFPlugin_IOperations_i.cc
@@ -66,7 +66,7 @@ void DXFPlugin_IOperations_i::ExportDXF( GEOM::GEOM_Object_ptr theOriginal,
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl( theOriginal );
+  Handle(::GEOM_Object) anOriginal = GetObjectImpl( theOriginal );
   if (anOriginal.IsNull()) return;
 
   //Export the shape to the file
@@ -98,7 +98,7 @@ GEOM::ListOfGO* DXFPlugin_IOperations_i::ImportDXF( 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/DXFPlugin_ImportDriver.cxx b/src/DXFPlugin_ImportDriver.cxx
index 164f8ad952e01e652ac5451b4634f9a30d8a686e..7beeb3623ffd2f0c5f61d6bd6fcb89aefdcba11f 100644 (file)
--- a/src/DXFPlugin_ImportDriver.cxx
+++ b/src/DXFPlugin_ImportDriver.cxx
@@ -29,7 +29,7 @@
 #include <GEOM_Function.hxx>
 #include <GEOMImpl_Types.hxx>
 
-// OOCT includes
+// OCCT includes
 #include <DxfControl_Reader.hxx>
 #include <DxfSection_Block.hxx>
 #include <DxfSection_HSequenceOfObject.hxx>
@@ -81,7 +81,7 @@ DXFPlugin_ImportDriver::DXFPlugin_ImportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer DXFPlugin_ImportDriver::Execute( LOGBOOK& log ) const
+Standard_Integer DXFPlugin_ImportDriver::Execute( Handle(TFunction_Logbook)& log ) const
 {
   if( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -170,11 +170,7 @@ Standard_Integer DXFPlugin_ImportDriver::Execute( LOGBOOK& log ) const
 
   aFunction->SetValue( aResShape );
 
-#if OCC_VERSION_MAJOR < 7
-  log.SetTouched(Label());
-#else
   log->SetTouched(Label());
-#endif
 
   return 1;
 }
@@ -207,4 +203,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ImportDriver, GEOM_BaseDriver );

diff --git a/src/DXFPlugin_ImportDriver.hxx b/src/DXFPlugin_ImportDriver.hxx
index 53ef5ed2a426c7d9bb85f54e8eecd9af1a989a91..062d7428d9e5d339ab3dabee82babafde59fe79d 100644 (file)
--- a/src/DXFPlugin_ImportDriver.hxx
+++ b/src/DXFPlugin_ImportDriver.hxx
@@ -32,14 +32,14 @@ public:
   ~DXFPlugin_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( DXFPlugin_ImportDriver, GEOM_BaseDriver )
+DEFINE_STANDARD_RTTIEXT( DXFPlugin_ImportDriver, GEOM_BaseDriver )
 };
 
 #endif // _DXFPlugin_ImportDriver_HXX