From a9c715063980d7a3fe088414bd84ba261dcdc125 Mon Sep 17 00:00:00 2001 From: mkr Date: Wed, 24 May 2006 07:37:08 +0000 Subject: [PATCH] Modifications to avoid compilation errors about convertion of std::string to QString. --- src/SalomeApp/SalomeApp_Study.cxx | 2 +- src/Session/Session_ServerCheck.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx index 3d693f374..d1b6e2647 100644 --- a/src/SalomeApp/SalomeApp_Study.cxx +++ b/src/SalomeApp/SalomeApp_Study.cxx @@ -704,7 +704,7 @@ QString SalomeApp_Study::getNameOfSavePoint(int savePoint) { _PTR(AttributeParameter) AP = studyDS()->GetCommonParameters(getVisualComponentName(), savePoint); _PTR(IParameters) ip = ClientFactory::getIParameters(AP); - return ip->getProperty("AP_SAVEPOINT_NAME"); + return ip->getProperty("AP_SAVEPOINT_NAME").c_str(); } /*! diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx index ac4c59c1b..3d758ae8c 100644 --- a/src/Session/Session_ServerCheck.cxx +++ b/src/Session/Session_ServerCheck.cxx @@ -362,7 +362,7 @@ void Session_ServerCheck::run() SALOME_NamingService &NS = *SINGLETON_::Instance(); ASSERT( SINGLETON_::IsAlreadyExisting() ); NS.init_orb( orb ); - QString containerName = QString( "/Containers/%1/FactoryServer" ).arg( GetHostname() ); + QString containerName = QString( "/Containers/%1/FactoryServer" ).arg( GetHostname().c_str() ); CORBA::Object_var obj = NS.Resolve( containerName.latin1() ); Engines::Container_var FScontainer = Engines::Container::_narrow( obj ); if ( !CORBA::is_nil( FScontainer ) ) { @@ -413,7 +413,7 @@ void Session_ServerCheck::run() SALOME_NamingService &NS = *SINGLETON_::Instance(); ASSERT( SINGLETON_::IsAlreadyExisting() ); NS.init_orb( orb ); - QString containerName = QString( "/Containers/%1/FactoryServerPy" ).arg( GetHostname() ); + QString containerName = QString( "/Containers/%1/FactoryServerPy" ).arg( GetHostname().c_str() ); CORBA::Object_var obj = NS.Resolve( containerName.latin1() ); Engines::Container_var FSPcontainer = Engines::Container::_narrow( obj ); if ( !CORBA::is_nil( FSPcontainer ) ) { @@ -464,7 +464,7 @@ void Session_ServerCheck::run() SALOME_NamingService &NS = *SINGLETON_::Instance(); ASSERT( SINGLETON_::IsAlreadyExisting() ); NS.init_orb( orb ); - QString containerName = QString( "/Containers/%1/SuperVisionContainer" ).arg( GetHostname() ); + QString containerName = QString( "/Containers/%1/SuperVisionContainer" ).arg( GetHostname().c_str() ); CORBA::Object_var obj = NS.Resolve( containerName.latin1() ); Engines::Container_var SVcontainer = Engines::Container::_narrow( obj ); if ( !CORBA::is_nil( SVcontainer ) ) { -- 2.39.2