From 287d3751852dfebc6a196977605b6e8fb2506f5a Mon Sep 17 00:00:00 2001 From: mkr Date: Fri, 17 Mar 2006 12:44:28 +0000 Subject: [PATCH] To avoid compilation errors about conversion between std::string and QString. --- src/SalomeApp/SalomeApp_DataModel.cxx | 4 ++-- src/SalomeApp/SalomeApp_Study.cxx | 2 +- src/SalomeApp/SalomeApp_VisualState.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SalomeApp/SalomeApp_DataModel.cxx b/src/SalomeApp/SalomeApp_DataModel.cxx index 2a043ff19..79e75ca10 100644 --- a/src/SalomeApp/SalomeApp_DataModel.cxx +++ b/src/SalomeApp/SalomeApp_DataModel.cxx @@ -64,7 +64,7 @@ SalomeApp_DataModelSync::SalomeApp_DataModelSync( _PTR( Study ) aStudy, SUIT_Dat bool SalomeApp_DataModelSync::isCorrect( const kerPtr& so ) const { kerPtr refObj; - QString name = so->GetName(); + QString name = so->GetName().c_str(); bool res = so && ( so->GetName().size() || so->ReferencedObject( refObj ) ); return res; } @@ -116,7 +116,7 @@ void SalomeApp_DataModelSync::deleteItemWithChildren( const suitPtr& p ) const bool SalomeApp_DataModelSync::isEqual( const kerPtr& p, const suitPtr& q ) const { LightApp_DataObject* obj = dynamic_cast( q ); - return ( !p && !q ) || ( obj && isCorrect( p ) && p->GetID()==obj->entry() ); + return ( !p && !q ) || ( obj && isCorrect( p ) && p->GetID().c_str()==obj->entry() ); } kerPtr SalomeApp_DataModelSync::nullSrc() const diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx index be3e37d11..fa686e4b2 100644 --- a/src/SalomeApp/SalomeApp_Study.cxx +++ b/src/SalomeApp/SalomeApp_Study.cxx @@ -710,7 +710,7 @@ QString SalomeApp_Study::getNameOfSavePoint(int savePoint) { _PTR(AttributeParameter) AP = studyDS()->GetCommonParameters(getVisualComponentName(), savePoint); SALOMEDS_IParameters ip(AP); - return ip.getProperty("AP_SAVEPOINT_NAME"); + return ip.getProperty("AP_SAVEPOINT_NAME").c_str(); } //================================================================ diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx index ff00dbc88..ffb35f74d 100644 --- a/src/SalomeApp/SalomeApp_VisualState.cxx +++ b/src/SalomeApp/SalomeApp_VisualState.cxx @@ -135,7 +135,7 @@ int SalomeApp_VisualState::storeState() QPtrVector views = vm->getViews(); for(int i = 0; icaption() ); + ip.append( viewerEntry, views[i]->caption().latin1() ); ip.append( viewerEntry, views[i]->getVisualParameters().latin1() ); } } -- 2.39.2