Salome HOME
projects
/
plugins
/
acisplugin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b43a24a
)
Clean-up deprecated OCCT-related code
author
vsr
<vsr@opencascade.com>
Mon, 25 Sep 2017 14:00:33 +0000
(17:00 +0300)
committer
vsr
<vsr@opencascade.com>
Mon, 25 Sep 2017 14:00:33 +0000
(17:00 +0300)
src/ACISPlugin_ExportDriver.cxx
patch
|
blob
|
history
src/ACISPlugin_ExportDriver.hxx
patch
|
blob
|
history
src/ACISPlugin_IOperations_i.cc
patch
|
blob
|
history
src/ACISPlugin_ImportDriver.cxx
patch
|
blob
|
history
src/ACISPlugin_ImportDriver.hxx
patch
|
blob
|
history
diff --git
a/src/ACISPlugin_ExportDriver.cxx
b/src/ACISPlugin_ExportDriver.cxx
index 7259200711a59096e62713a7417b5974caac610a..d20d8d676f707ef8ec1c8f80c7484f70f32a5ec4 100644
(file)
--- a/
src/ACISPlugin_ExportDriver.cxx
+++ b/
src/ACISPlugin_ExportDriver.cxx
@@
-28,7
+28,7
@@
// GEOM includes
#include <GEOM_Function.hxx>
// GEOM includes
#include <GEOM_Function.hxx>
-// O
O
CT includes
+// O
C
CT includes
#include <IFSelect_ReturnStatus.hxx>
#include <SatControl_Writer.hxx>
#include <TCollection_AsciiString.hxx>
#include <IFSelect_ReturnStatus.hxx>
#include <SatControl_Writer.hxx>
#include <TCollection_AsciiString.hxx>
@@
-64,7
+64,7
@@
ACISPlugin_ExportDriver::ACISPlugin_ExportDriver()
//function : Execute
//purpose :
//=======================================================================
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer ACISPlugin_ExportDriver::Execute(
LOGBOOK
& log ) const
+Standard_Integer ACISPlugin_ExportDriver::Execute(
Handle(TFunction_Logbook)
& log ) const
{
#ifdef ACIS_HASLICENSE
try {
{
#ifdef ACIS_HASLICENSE
try {
@@
-120,4
+120,4
@@
GetCreationInformation( std::string& theOperationName,
return false;
}
return false;
}
-
OCCT_
IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ExportDriver,GEOM_BaseDriver );
diff --git
a/src/ACISPlugin_ExportDriver.hxx
b/src/ACISPlugin_ExportDriver.hxx
index b26445a41157debf6b7d916ec9878605c8deb0f0..879c049d01b8d63fcb8d227aee3d197d2b9949f7 100644
(file)
--- a/
src/ACISPlugin_ExportDriver.hxx
+++ b/
src/ACISPlugin_ExportDriver.hxx
@@
-32,14
+32,14
@@
public:
~ACISPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
~ACISPlugin_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 );
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
-
OCCT_
DEFINE_STANDARD_RTTIEXT( ACISPlugin_ExportDriver, GEOM_BaseDriver )
+
DEFINE_STANDARD_RTTIEXT( ACISPlugin_ExportDriver, GEOM_BaseDriver )
};
#endif // _ACISPlugin_ExportDriver_HXX
};
#endif // _ACISPlugin_ExportDriver_HXX
diff --git
a/src/ACISPlugin_IOperations_i.cc
b/src/ACISPlugin_IOperations_i.cc
index f2b1606111107e80e844cbf90c96d4a87742c8c3..193afa28fdf713967188b489c4328a67938ca9ac 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++ )
Standard_Integer aLength = aHSeq->Length();
aSeq->length( aLength );
for( Standard_Integer i = 1; i <= aLength; i++ )
- aSeq[i-1] = GetObject( H
ANDLE_NAMESPACE(
GEOM_Object)::DownCast( aHSeq->Value(i) ) );
+ aSeq[i-1] = GetObject( H
andle(::
GEOM_Object)::DownCast( aHSeq->Value(i) ) );
return aSeq._retn();
}
return aSeq._retn();
}
diff --git
a/src/ACISPlugin_ImportDriver.cxx
b/src/ACISPlugin_ImportDriver.cxx
index 21262fca08fadd856b5f3c0b43cedb6d2a19cc24..c45431ce6eee72d5eeed8c934644e3eaea2ac8e5 100644
(file)
--- a/
src/ACISPlugin_ImportDriver.cxx
+++ b/
src/ACISPlugin_ImportDriver.cxx
@@
-29,7
+29,7
@@
#include <GEOM_Function.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOM_Function.hxx>
#include <GEOMImpl_Types.hxx>
-// O
O
CT includes
+// O
C
CT includes
#include <AcisAttr_AttribGenName.hxx>
#include <AcisEnt_Attrib.hxx>
#include <IFSelect_ReturnStatus.hxx>
#include <AcisAttr_AttribGenName.hxx>
#include <AcisEnt_Attrib.hxx>
#include <IFSelect_ReturnStatus.hxx>
@@
-78,7
+78,7
@@
ACISPlugin_ImportDriver::ACISPlugin_ImportDriver()
//function : Execute
//purpose :
//=======================================================================
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer ACISPlugin_ImportDriver::Execute(
LOGBOOK
& log ) const
+Standard_Integer ACISPlugin_ImportDriver::Execute(
Handle(TFunction_Logbook)
& log ) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@
-161,11
+161,7
@@
Standard_Integer ACISPlugin_ImportDriver::Execute( LOGBOOK& log ) const
aFunction->SetValue( aResShape );
aFunction->SetValue( aResShape );
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
log->SetTouched(Label());
-#endif
return 1;
}
return 1;
}
@@
-198,4
+194,4
@@
GetCreationInformation( std::string& theOperationName,
return true;
}
return true;
}
-
OCCT_
IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver );
diff --git
a/src/ACISPlugin_ImportDriver.hxx
b/src/ACISPlugin_ImportDriver.hxx
index e5d5f7f854fc1f9012735cf82aada296dbec5613..2219f508834260dbba4c30b0d662020661ca0084 100644
(file)
--- a/
src/ACISPlugin_ImportDriver.hxx
+++ b/
src/ACISPlugin_ImportDriver.hxx
@@
-32,14
+32,14
@@
public:
~ACISPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
~ACISPlugin_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 );
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
-
OCCT_
DEFINE_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver )
+
DEFINE_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver )
};
#endif // _ACISPlugin_ImportDriver_HXX
};
#endif // _ACISPlugin_ImportDriver_HXX