ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-29 10:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compilation problem because of using standard libraries

Browse Source
This commit is contained in:
vsr 2008-03-11 09:53:47 +00:00
parent e774330f08
commit b5d171ec22
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOMBase/GEOMBase.cxx
View File

@ -913,7 +913,7 @@ QString GEOMBase::GetName( GEOM::GEOM_Object_ptr theObj )
CORBA::String_var anIOR = SalomeApp_Application::orb()->object_to_string( theObj ); CORBA::String_var anIOR = SalomeApp_Application::orb()->object_to_string( theObj );
if ( strcmp(anIOR.in(), "") != 0 ) if ( strcmp(anIOR.in(), "") != 0 )
{ {
_PTR(SObject) aSObj ( appStudy->studyDS()->FindObjectIOR( string( anIOR ) ) ); _PTR(SObject) aSObj ( appStudy->studyDS()->FindObjectIOR( std::string( anIOR ) ) );
_PTR(GenericAttribute) anAttr; _PTR(GenericAttribute) anAttr;

18
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -162,7 +162,7 @@ void GEOMBase_Helper::erase( const ObjectList& objList, const bool updateView )
void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView ) void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView )
{ {
if ( !object->_is_nil() ) { if ( !object->_is_nil() ) {
string entry = getEntry( object ); std::string entry = getEntry( object );
getDisplayer()->Erase( new SALOME_InteractiveObject( getDisplayer()->Erase( new SALOME_InteractiveObject(
entry.c_str(), "GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView ); entry.c_str(), "GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView );
} }
@ -201,7 +201,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
// Enable activisation of selection // Enable activisation of selection
getDisplayer()->SetToActivate( true ); getDisplayer()->SetToActivate( true );
string entry = getEntry( object ); std::string entry = getEntry( object );
getDisplayer()->Redisplay(new SALOME_InteractiveObject getDisplayer()->Redisplay(new SALOME_InteractiveObject
(entry.c_str(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false); (entry.c_str(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false);
} }
@ -211,7 +211,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
if ( aDoc && aDoc->studyDS() ) { if ( aDoc && aDoc->studyDS() ) {
_PTR(Study) aStudy = aDoc->studyDS(); _PTR(Study) aStudy = aDoc->studyDS();
CORBA::String_var objStr = SalomeApp_Application::orb()->object_to_string(object); CORBA::String_var objStr = SalomeApp_Application::orb()->object_to_string(object);
_PTR(SObject) aSObj (aStudy->FindObjectIOR(string(objStr.in()))); _PTR(SObject) aSObj (aStudy->FindObjectIOR(std::string(objStr.in())));
if ( aSObj ) { if ( aSObj ) {
_PTR(ChildIterator) anIt ( aStudy->NewChildIterator( aSObj ) ); _PTR(ChildIterator) anIt ( aStudy->NewChildIterator( aSObj ) );
for ( anIt->InitEx( true ); anIt->More(); anIt->Next() ) { for ( anIt->InitEx( true ); anIt->More(); anIt->Next() ) {
@ -219,7 +219,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
(GeometryGUI::ClientSObjectToObject(anIt->Value())); (GeometryGUI::ClientSObjectToObject(anIt->Value()));
if ( !CORBA::is_nil( aChild ) ) { if ( !CORBA::is_nil( aChild ) ) {
if ( !aChild->_is_nil() ) { if ( !aChild->_is_nil() ) {
string entry = getEntry( aChild ); std::string entry = getEntry( aChild );
getDisplayer()->Redisplay( new SALOME_InteractiveObject( getDisplayer()->Redisplay( new SALOME_InteractiveObject(
entry.c_str(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false ); entry.c_str(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false );
} }
@ -440,7 +440,7 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const int theMo
GEOM::GEOM_Object_ptr anObj = *anIter; GEOM::GEOM_Object_ptr anObj = *anIter;
if ( anObj->_is_nil() ) if ( anObj->_is_nil() )
continue; continue;
string aEntry = getEntry( anObj ); std::string aEntry = getEntry( anObj );
if ( aEntry != "" ) if ( aEntry != "" )
aListOfIO.Append( new SALOME_InteractiveObject( aListOfIO.Append( new SALOME_InteractiveObject(
aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ).toLatin1().constData() ) ) ); aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ).toLatin1().constData() ) ) );
@ -579,7 +579,7 @@ char* GEOMBase_Helper::getEntry( GEOM::GEOM_Object_ptr object ) const
SalomeApp_Study* study = getStudy(); SalomeApp_Study* study = getStudy();
if ( study ) { if ( study ) {
char * objIOR = GEOMBase::GetIORFromObject( object ); char * objIOR = GEOMBase::GetIORFromObject( object );
string IOR( objIOR ); std::string IOR( objIOR );
free( objIOR ); free( objIOR );
if ( IOR != "" ) { if ( IOR != "" ) {
_PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
@ -619,7 +619,7 @@ void GEOMBase_Helper::clearShapeBuffer( GEOM::GEOM_Object_ptr theObj )
return; return;
_PTR(Study) aStudy = getStudy()->studyDS(); _PTR(Study) aStudy = getStudy()->studyDS();
_PTR(SObject) aSObj ( aStudy->FindObjectIOR( string( IOR ) ) ); _PTR(SObject) aSObj ( aStudy->FindObjectIOR( std::string( IOR ) ) );
if ( !aSObj ) if ( !aSObj )
return; return;
@ -1003,7 +1003,7 @@ bool GEOMBase_Helper::selectObjects( ObjectList& objects )
ObjectList::iterator anIter; ObjectList::iterator anIter;
for ( anIter = objects.begin(); anIter != objects.end(); ++anIter ) for ( anIter = objects.begin(); anIter != objects.end(); ++anIter )
{ {
string entry = getEntry( *anIter ); std::string entry = getEntry( *anIter );
QString aEntry( entry.c_str() ); QString aEntry( entry.c_str() );
LightApp_DataOwner* anOwher = new LightApp_DataOwner( aEntry ); LightApp_DataOwner* anOwher = new LightApp_DataOwner( aEntry );
aList.append( anOwher ); aList.append( anOwher );
@ -1034,7 +1034,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather( GEOM::GEOM_Object_ptr
dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ); SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
_PTR(Study) aDStudy = appStudy->studyDS(); _PTR(Study) aDStudy = appStudy->studyDS();
string IOR = GEOMBase::GetIORFromObject( theFather ); std::string IOR = GEOMBase::GetIORFromObject( theFather );
_PTR(SObject) SObj ( aDStudy->FindObjectIOR( IOR ) ); _PTR(SObject) SObj ( aDStudy->FindObjectIOR( IOR ) );
bool inStudy = false; bool inStudy = false;

2
src/GEOMGUI/GEOM_Displayer.h
View File

@ -176,7 +176,7 @@ protected:
protected: protected:
Handle(SALOME_InteractiveObject) myIO; Handle(SALOME_InteractiveObject) myIO;
TopoDS_Shape myShape; TopoDS_Shape myShape;
string myName; std::string myName;
int myType; int myType;
SALOME_View* myViewFrame; SALOME_View* myViewFrame;